From d43dd54ab6dc46ecdab99d67bf3a4ae5dc0a04a1 Mon Sep 17 00:00:00 2001 From: SoScared Date: Tue, 20 Nov 2018 23:06:51 +0100 Subject: [PATCH] group unit yamls and sort out veterancy duplicates --- mods/ura/mod.yaml | 9 +- mods/ura/rules/{ => units}/aircraft.yaml | 0 mods/ura/rules/{ => units}/infantry.yaml | 34 -------- mods/ura/rules/{ => units}/ships.yaml | 0 mods/ura/rules/{ => units}/vehicles.yaml | 68 --------------- mods/ura/rules/units/veterancy.yaml | 105 +++++++++++++++++++++++ 6 files changed, 110 insertions(+), 106 deletions(-) rename mods/ura/rules/{ => units}/aircraft.yaml (100%) rename mods/ura/rules/{ => units}/infantry.yaml (97%) rename mods/ura/rules/{ => units}/ships.yaml (100%) rename mods/ura/rules/{ => units}/vehicles.yaml (95%) create mode 100644 mods/ura/rules/units/veterancy.yaml diff --git a/mods/ura/mod.yaml b/mods/ura/mod.yaml index c8ec4b1..d25ef17 100644 --- a/mods/ura/mod.yaml +++ b/mods/ura/mod.yaml @@ -52,19 +52,20 @@ Rules: ura|rules/ai/ai-easy.yaml ura|rules/ai/ai-unknown.yaml ura|rules/ai/player-bonuses-ai.yaml - ura|rules/aircraft.yaml + ura|rules/units/aircraft.yaml + ura|rules/units/infantry.yaml + ura|rules/units/ships.yaml + ura|rules/units/vehicles.yaml + ura|rules/units/veterancy.yaml ura|rules/civilian.yaml ura|rules/decoration.yaml ura|rules/defaults.yaml ura|rules/fakes.yaml ura|rules/husks.yaml - ura|rules/infantry.yaml ura|rules/palettes.yaml ura|rules/player.yaml - ura|rules/ships.yaml ura|rules/structures.yaml ura|rules/upgrades.yaml - ura|rules/vehicles.yaml ura|rules/world.yaml Sequences: diff --git a/mods/ura/rules/aircraft.yaml b/mods/ura/rules/units/aircraft.yaml similarity index 100% rename from mods/ura/rules/aircraft.yaml rename to mods/ura/rules/units/aircraft.yaml diff --git a/mods/ura/rules/infantry.yaml b/mods/ura/rules/units/infantry.yaml similarity index 97% rename from mods/ura/rules/infantry.yaml rename to mods/ura/rules/units/infantry.yaml index 78f3661..1defda0 100644 --- a/mods/ura/rules/infantry.yaml +++ b/mods/ura/rules/units/infantry.yaml @@ -99,14 +99,6 @@ E1: ProducibleWithLevel: Prerequisites: barracks.upgraded -E1.Rank1: - Inherits: E1 - -Buildable: - ProducibleWithLevel: - Prerequisites: techlevel.infonly - RenderSprites: - Image: E1 - E2: Inherits: ^Soldier Inherits@AUTOTARGET: ^AutoTargetGround @@ -207,14 +199,6 @@ E3: ProducibleWithLevel: Prerequisites: barracks.upgraded -E3.Rank1: - Inherits: E3 - -Buildable: - ProducibleWithLevel: - Prerequisites: techlevel.infonly - RenderSprites: - Image: E3 - E4: Inherits: ^Soldier Inherits@AUTOTARGET: ^AutoTargetGround @@ -391,16 +375,6 @@ SPY.England: ProducibleWithLevel: Prerequisites: techlevel.infonly -SPY.England.rank2: - Inherits: SPY.England - Buildable: - Prerequisites: ~infantry.england, dome, ~tent, ~mediumdome.upgraded - RenderSprites: - Image: spy.england.rank2 - ProducibleWithLevel: - Prerequisites: ~techlevel.medium - InitialLevels: 2 - MEDI: Inherits: ^Soldier Tooltip: @@ -815,14 +789,6 @@ SNIPER: ProducibleWithLevel: Prerequisites: techlevel.infonly, ~radardome.upgraded -SNIPER.Rank1: - Inherits: SNIPER - -Buildable: - ProducibleWithLevel: - Prerequisites: techlevel.infonly - RenderSprites: - Image: SNIPER - EINSTEIN: Inherits: ^CivInfantry Tooltip: diff --git a/mods/ura/rules/ships.yaml b/mods/ura/rules/units/ships.yaml similarity index 100% rename from mods/ura/rules/ships.yaml rename to mods/ura/rules/units/ships.yaml diff --git a/mods/ura/rules/vehicles.yaml b/mods/ura/rules/units/vehicles.yaml similarity index 95% rename from mods/ura/rules/vehicles.yaml rename to mods/ura/rules/units/vehicles.yaml index 7c48b24..e62b6b4 100644 --- a/mods/ura/rules/vehicles.yaml +++ b/mods/ura/rules/units/vehicles.yaml @@ -194,30 +194,6 @@ TRUK: ProducibleWithLevel: Prerequisites: warfactory.upgraded -1TNK.rank2: - Inherits: 1TNK - Buildable: - Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded - RenderSprites: - Image: 1tnk.rank2 - SpawnActorOnDeath: - Actor: 1TNK.rank2.Husk - ProducibleWithLevel: - Prerequisites: ~techlevel.low - InitialLevels: 2 - -1TNK.rank3: - Inherits: 1TNK - Buildable: - Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded - RenderSprites: - Image: 1tnk.rank3 - SpawnActorOnDeath: - Actor: 1TNK.rank3.Husk - ProducibleWithLevel: - Prerequisites: ~techlevel.low - InitialLevels: 3 - 2TNK: Inherits: ^TrackedVehicle Inherits@GAINSEXPERIENCE: ^GainsDoubleExperience @@ -283,18 +259,6 @@ TRUK: ProducibleWithLevel: Prerequisites: warfactory.upgraded, servicedepot.upgraded -2TNK.rank2: - Inherits: 2TNK - Buildable: - Prerequisites: fix, ~vehicles.allies, ~!vehicles.germany, ~techlevel.medium, ~highfix.upgraded - RenderSprites: - Image: 2tnk.rank2 - SpawnActorOnDeath: - Actor: 2TNK.rank2.Husk - ProducibleWithLevel: - Prerequisites: ~techlevel.medium - InitialLevels: 2 - 2TNK.Ger: Inherits: 2TNK Buildable: @@ -317,18 +281,6 @@ TRUK: SpawnActorOnDeath: Actor: 2TNK.Ger.Husk -2TNK.Ger.rank2: - Inherits: 2TNK.Ger - Buildable: - Prerequisites: fix, ~vehicles.germany, ~techlevel.medium, ~highfix.upgraded - RenderSprites: - Image: 2tnk.ger.rank2 - SpawnActorOnDeath: - Actor: 2TNK.Ger.rank2.Husk - ProducibleWithLevel: - Prerequisites: ~techlevel.medium - InitialLevels: 2 - 3TNK: Inherits: ^TrackedVehicle Inherits@GAINSEXPERIENCE: ^GainsDoubleExperience @@ -788,26 +740,6 @@ JEEP: InvalidTargets: NoAutoTarget RequiresCondition: ifv-sniper || ifv-tanya -JEEP.2rank: - Inherits: JEEP - Buildable: - Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded - RenderSprites: - Image: jeep.2rank - ProducibleWithLevel: - Prerequisites: ~techlevel.low - InitialLevels: 2 - -JEEP.3rank: - Inherits: JEEP - Buildable: - Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded - RenderSprites: - Image: jeep.3rank - ProducibleWithLevel: - Prerequisites: ~techlevel.low - InitialLevels: 3 - FTRK: Inherits: ^Vehicle Inherits@GAINSEXPERIENCE: ^GainsExperience diff --git a/mods/ura/rules/units/veterancy.yaml b/mods/ura/rules/units/veterancy.yaml new file mode 100644 index 0000000..aa292ea --- /dev/null +++ b/mods/ura/rules/units/veterancy.yaml @@ -0,0 +1,105 @@ +# Infantry + +E1.Rank1: + Inherits: E1 + -Buildable: + ProducibleWithLevel: + Prerequisites: techlevel.infonly + RenderSprites: + Image: E1 + +E3.Rank1: + Inherits: E3 + -Buildable: + ProducibleWithLevel: + Prerequisites: techlevel.infonly + RenderSprites: + Image: E3 + +SPY.England.rank2: + Inherits: SPY.England + Buildable: + Prerequisites: ~infantry.england, dome, ~tent, ~mediumdome.upgraded + RenderSprites: + Image: spy.england.rank2 + ProducibleWithLevel: + Prerequisites: ~techlevel.medium + InitialLevels: 2 + +SNIPER.Rank1: + Inherits: SNIPER + -Buildable: + ProducibleWithLevel: + Prerequisites: techlevel.infonly + RenderSprites: + Image: SNIPER + +# Vehicles + +1TNK.rank2: + Inherits: 1TNK + Buildable: + Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded + RenderSprites: + Image: 1tnk.rank2 + SpawnActorOnDeath: + Actor: 1TNK.rank2.Husk + ProducibleWithLevel: + Prerequisites: ~techlevel.low + InitialLevels: 2 + +1TNK.rank3: + Inherits: 1TNK + Buildable: + Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded + RenderSprites: + Image: 1tnk.rank3 + SpawnActorOnDeath: + Actor: 1TNK.rank3.Husk + ProducibleWithLevel: + Prerequisites: ~techlevel.low + InitialLevels: 3 + +2TNK.rank2: + Inherits: 2TNK + Buildable: + Prerequisites: fix, ~vehicles.allies, ~!vehicles.germany, ~techlevel.medium, ~highfix.upgraded + RenderSprites: + Image: 2tnk.rank2 + SpawnActorOnDeath: + Actor: 2TNK.rank2.Husk + ProducibleWithLevel: + Prerequisites: ~techlevel.medium + InitialLevels: 2 + +2TNK.Ger.rank2: + Inherits: 2TNK.Ger + Buildable: + Prerequisites: fix, ~vehicles.germany, ~techlevel.medium, ~highfix.upgraded + RenderSprites: + Image: 2tnk.ger.rank2 + SpawnActorOnDeath: + Actor: 2TNK.Ger.rank2.Husk + ProducibleWithLevel: + Prerequisites: ~techlevel.medium + InitialLevels: 2 + +JEEP.2rank: + Inherits: JEEP + Buildable: + Prerequisites: ~vehicles.allies, ~techlevel.low, ~mediumfix.upgraded, ~!highfix.upgraded + RenderSprites: + Image: jeep.2rank + ProducibleWithLevel: + Prerequisites: ~techlevel.low + InitialLevels: 2 + +JEEP.3rank: + Inherits: JEEP + Buildable: + Prerequisites: ~vehicles.allies, ~techlevel.low, ~highfix.upgraded + RenderSprites: + Image: jeep.3rank + ProducibleWithLevel: + Prerequisites: ~techlevel.low + InitialLevels: 3 \ No newline at end of file