vic3: ship veterancy levels for 1.13.5

Author: amtep

src/vic3/data/naval_missions.rs

@@ -40,6 +40,8 @@ impl DbKind for NavalMissionType {
         vd.field_bool("piracy");
         vd.field_bool("port_bombardment");
 
+        vd.field_numeric("experience");
+
         vd.field_list_choice("intercept_targets", &["none", "hostile", "piracy", "all"]);
         vd.field_list_choice(
             "piracy_targets",

src/vic3/data/ships.rs

@@ -16,13 +16,18 @@ use crate::vic3::tables::modifs::maybe_warn_modifiable_capitalization;
 pub struct ShipType {}
 #[derive(Clone, Debug)]
 pub struct ShipGroup {}
+#[derive(Clone, Debug)]
+pub struct ShipVeterancyLevel {}
 
 inventory::submit! {
     ItemLoader::Normal(GameFlags::Vic3, Item::ShipType, ShipType::add)
 }
 inventory::submit! {
     ItemLoader::Normal(GameFlags::Vic3, Item::ShipGroup, ShipGroup::add)
 }
+inventory::submit! {
+    ItemLoader::Normal(GameFlags::Vic3, Item::ShipVeterancyLevel, ShipVeterancyLevel::add)
+}
 
 impl ShipType {
     pub fn add(db: &mut Db, key: Token, block: Block) {
@@ -34,6 +39,11 @@ impl ShipGroup {
         db.add(Item::ShipGroup, key, block, Box::new(Self {}));
     }
 }
+impl ShipVeterancyLevel {
+    pub fn add(db: &mut Db, key: Token, block: Block) {
+        db.add(Item::ShipVeterancyLevel, key, block, Box::new(Self {}));
+    }
+}
 
 impl DbKind for ShipType {
     fn validate(&self, key: &Token, block: &Block, data: &Everything) {
@@ -122,3 +132,18 @@ impl DbKind for ShipGroup {
         vd.field_choice("category", &["capital_group", "cruiser_group", "torpedo_group", "supply"]);
     }
 }
+
+impl DbKind for ShipVeterancyLevel {
+    fn validate(&self, key: &Token, block: &Block, data: &Everything) {
+        let mut vd = Validator::new(block, data);
+
+        data.verify_exists(Item::Localization, key);
+
+        vd.field_item("icon", Item::File);
+        vd.field_numeric("experience_threshold");
+        vd.field_validated_block("modifier", |block, data| {
+            let vd = Validator::new(block, data);
+            validate_modifs(block, data, ModifKinds::Ship, vd);
+        });
+    }
+}

src/vic3/effect_validation.rs

@@ -566,6 +566,7 @@ pub fn validate_create_military_formation(
     vd.field_choice("type", &["army", "fleet"]);
     let is_fleet = block.field_value_is("type", "fleet");
     vd.field_target("hq_region", sc, Scopes::StrategicRegion);
+    vd.field_target("supply_hub", sc, Scopes::State);
     vd.multi_field_validated_block("combat_unit", |block, data| {
         let mut vd = Validator::new(block, data);
         vd.field_target("type", sc, Scopes::CombatUnitType);

src/vic3/tables/misc.rs

@@ -284,6 +284,7 @@ pub const COMMON_DIRS: &[&str] = &[
     "common/ship_modifications",
     "common/ship_name_definitions",
     "common/ship_types",
+    "common/ship_veterancy_levels",
     "common/social_classes",
     "common/social_hierarchies",
     "common/state_traits",

src/vic3/tables/modifs.rs

@@ -1025,6 +1025,8 @@ const MODIF_TABLE: &[(&str, ModifKinds)] = &[
     ("country_ship_construction_efficiency_add", ModifKinds::Country),
     ("country_ship_construction_goods_cost_mult", ModifKinds::Country),
     ("country_ship_construction_progress_max_add", ModifKinds::Country),
+    ("country_ship_crew_starting_veterancy_experience_add", ModifKinds::Country),
+    ("country_ship_crew_starting_veterancy_experience_mult", ModifKinds::Country),
     ("country_society_tech_research_speed_mult", ModifKinds::Country),
     ("country_society_tech_spread_mult", ModifKinds::Country),
     ("country_state_religion_wages_mult", ModifKinds::Country),

src/vic3/tables/triggers.rs

@@ -878,7 +878,7 @@ const TRIGGER: &[(Scopes, &str, Trigger)] = &[
     (Scopes::Character, "is_heir", Removed("1.13", "replaced with `is_heir_of_own_country`")),
     (Scopes::Character, "is_heir_of_own_country", Boolean),
     (Scopes::Character, "is_historical", Boolean),
-    (Scopes::Treaty, "is_historical_treaty", Boolean),
+    (Scopes::Treaty.union(Scopes::TreatyOptions), "is_historical_treaty", Boolean),
     (Scopes::War, "is_holder_of_wargoal_in_war", Scope(Scopes::Country)),
     (Scopes::Country, "is_home_country_for", Scope(Scopes::Country)),
     (Scopes::StateRegion, "is_homeland", ScopeOrItem(Scopes::Culture, Item::Culture)),

tiger-tables/src/item.rs

@@ -545,6 +545,7 @@ pub enum Item {
     #[cfg(feature = "vic3")] ShipModificationSlot,
     #[cfg(feature = "vic3")] ShipNameDefinition,
     #[cfg(feature = "vic3")] ShipType,
+    #[cfg(feature = "vic3")] ShipVeterancyLevel,
     #[cfg(feature = "vic3")] SocialClass,
     #[cfg(feature = "vic3")] SocialHierarchy,
     #[cfg(feature = "vic3")] StateRegion,
@@ -1868,6 +1869,8 @@ impl Item {
             #[cfg(feature = "vic3")]
             Item::ShipType => "common/ship_types/",
             #[cfg(feature = "vic3")]
+            Item::ShipVeterancyLevel => "common/ship_veterancy_levels/",
+            #[cfg(feature = "vic3")]
             Item::SocialClass => "common/social_classes/",
             #[cfg(feature = "vic3")]
             Item::SocialHierarchy => "common/social_hierarchies/",