diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index 3ffb640744..61df53e7ce 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/mods/d2k/maps/atreides-01a/map.yaml @@ -64,38 +64,38 @@ Actors: Actor0: trike Location: 15,8 Owner: Atreides - Actor1: rifle + Actor1: light_inf Location: 13,9 Owner: Atreides - Actor2: rifle + Actor2: light_inf Location: 25,9 Owner: Harkonnen - Actor3: rifle + Actor3: light_inf Location: 16,10 Owner: Atreides Actor4: trike Location: 9,11 Owner: Atreides - Actor6: rifle + Actor6: light_inf Location: 15,11 Owner: Atreides Actor7: trike Location: 9,13 Owner: Atreides - Actor8: rifle + Actor8: light_inf Location: 15,13 Owner: Atreides - Actor9: rifle + Actor9: light_inf Location: 14,14 Owner: Atreides Facing: 128 - Actor10: rifle + Actor10: light_inf Location: 12,19 Owner: Harkonnen - Actor11: rifle + Actor11: light_inf Location: 29,19 Owner: Harkonnen - Actor12: rifle + Actor12: light_inf Location: 19,20 Owner: Harkonnen Actor13: spicebloom @@ -104,7 +104,7 @@ Actors: Actor14: wormspawner Location: 7,23 Owner: Creeps - AtreidesConyard: conyard + AtreidesConyard: construction_yard Location: 11,11 Owner: Atreides HarkonnenWaypoint1: waypoint @@ -144,7 +144,7 @@ Rules: WormManager: Minimum: 1 Maximum: 1 - conyard: + construction_yard: Production: Produces: Building concreteb: @@ -153,13 +153,13 @@ Rules: barracks: Buildable: Prerequisites: ~disabled - light: + light_factory: Buildable: Prerequisites: ~disabled - heavy: + heavy_factory: Buildable: Prerequisites: ~disabled - guntower: + medium_gun_turret: Buildable: Prerequisites: ~disabled wall: diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index 8e670cdba3..c70996760b 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/mods/d2k/maps/atreides-01b/map.yaml @@ -61,22 +61,22 @@ Players: Enemies: Atreides Actors: - Actor0: rifle + Actor0: light_inf Location: 2,2 Owner: Harkonnen - Actor1: rifle + Actor1: light_inf Location: 21,2 Owner: Harkonnen Actor2: wormspawner Location: 4,3 Owner: Creeps - Actor3: rifle + Actor3: light_inf Location: 2,6 Owner: Harkonnen - Actor4: rifle + Actor4: light_inf Location: 11,7 Owner: Atreides - Actor5: rifle + Actor5: light_inf Location: 14,8 Owner: Atreides Actor6: trike @@ -85,22 +85,22 @@ Actors: Actor7: trike Location: 8,9 Owner: Atreides - Actor9: rifle + Actor9: light_inf Location: 14,10 Owner: Atreides Actor10: trike Location: 14,12 Owner: Atreides - Actor11: rifle + Actor11: light_inf Location: 7,13 Owner: Atreides - Actor12: rifle + Actor12: light_inf Location: 12,15 Owner: Atreides - Actor13: rifle + Actor13: light_inf Location: 28,20 Owner: Harkonnen - AtreidesConyard: conyard + AtreidesConyard: construction_yard Location: 10,10 Owner: Atreides HarkonnenWaypoint1: waypoint @@ -143,7 +143,7 @@ Rules: WormManager: Minimum: 1 Maximum: 1 - conyard: + construction_yard: Production: Produces: Building concreteb: @@ -152,13 +152,13 @@ Rules: barracks: Buildable: Prerequisites: ~disabled - light: + light_factory: Buildable: Prerequisites: ~disabled - heavy: + heavy_factory: Buildable: Prerequisites: ~disabled - guntower: + medium_gun_turret: Buildable: Prerequisites: ~disabled wall: diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index ab67831c2a..71b5f9daf7 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/mods/d2k/maps/shellmap/map.yaml @@ -2,7 +2,7 @@ MapFormat: 7 RequiresMod: d2k -Title: Tuck's Sietch +Title: D2k Shellmap Description: Static Shellmap @@ -61,7 +61,7 @@ Actors: Actor29: concretea Location: 54,59 Owner: Neutral - Actor30: power + Actor30: wind_trap Location: 54,58 Owner: Atreides Actor31: concretea @@ -70,10 +70,10 @@ Actors: Actor32: silo Location: 54,62 Owner: Atreides - Actor33: guntower + Actor33: medium_gun_turret Location: 54,63 Owner: Atreides - Actor34: siegetank + Actor34: siege_tank Location: 54,56 Owner: Atreides Facing: 24 @@ -92,7 +92,7 @@ Actors: Actor39: barracks Location: 48,37 Owner: Creeps - Actor40: rockettower + Actor40: large_gun_turret Location: 46,39 Owner: Creeps Actor41: sardaukar @@ -125,7 +125,7 @@ Rules: Maximum: 1 MusicPlaylist: BackgroundMusic: options - rockettower: + large_gun_turret: Power: Amount: 100 diff --git a/mods/d2k/rules/ai.yaml b/mods/d2k/rules/ai.yaml index 931f40fabd..ba771f4236 100644 --- a/mods/d2k/rules/ai.yaml +++ b/mods/d2k/rules/ai.yaml @@ -7,21 +7,21 @@ Player: BuildingCommonNames: ConstructionYard: conyard Refinery: refinery - Power: power - VehiclesFactory: light, heavy, starport - Production: light, heavy, barracks, starport + Power: wind_trap + VehiclesFactory: light_factory, heavy_factory, starport + Production: light_factory, heavy_factory, barracks, starport Silo: silo UnitsCommonNames: Mcv: mcv BuildingLimits: refinery: 4 barracks: 1 - light: 1 - heavy: 1 - research: 1 - repair: 1 - radar: 1 - hightech: 1 + light_factory: 1 + heavy_factory: 1 + research_centre: 1 + repair_pad: 1 + outpost: 1 + high_tech_factory: 1 palace: 1 upgrade.barracks: 1 upgrade.light: 1 @@ -30,24 +30,24 @@ Player: BuildingFractions: refinery: 20.1% barracks: 0.1% - light: 0.1% - heavy: 0.1% - radar: 0.1% - hightech: 0.1% + light_factory: 0.1% + heavy_factory: 0.1% + outpost: 0.1% + high_tech_factory: 0.1% starport: 0.1% - research: 0.1% - repair: 0.1% - guntower: 8% - rockettower: 6% - power: 10% + research_centre: 0.1% + repair_pad: 0.1% + medium_gun_turret: 8% + large_gun_turret: 6% + wind_trap: 10% upgrade.barracks: 0.1% upgrade.light: 0.1% upgrade.heavy: 0.1% upgrade.hightech: 0.1% UnitsToBuild: carryall: 1% - rifle: 6% - bazooka: 5% + light_inf: 6% + trooper: 5% medic: 1% fremen: 0.5% sardaukar: 1.5% @@ -56,23 +56,23 @@ Player: grenadier: 1% trike.starport: 5% quad.starport: 7.5% - siegetank.starport: 5% - missiletank.starport: 7.5% - combata.starport: 15% - combath.starport: 15% - combato.starport: 15% - sonictank: 10% - devast: 10% - deviatortank: 7.5% + siege_tank.starport: 5% + missile_tank.starport: 7.5% + combat_tank_a.starport: 15% + combat_tank_h.starport: 15% + combat_tank_o.starport: 15% + sonic_tank: 10% + devastator: 10% + deviator: 7.5% trike: 10% raider: 10% quad: 15% - siegetank: 10% - missiletank: 15% - stealthraider: 5% - combata: 100% - combath: 100% - combato: 100% + siege_tank: 10% + missile_tank: 15% + stealth_raider: 5% + combat_tank_a: 100% + combat_tank_h: 100% + combat_tank_o: 100% UnitLimits: harvester: 8 SquadSize: 8 @@ -136,21 +136,21 @@ Player: BuildingCommonNames: ConstructionYard: conyard Refinery: refinery - Power: power - VehiclesFactory: light, heavy, starport - Production: light, heavy, barracks, starport + Power: wind_trap + VehiclesFactory: light_factory, heavy_factory, starport + Production: light_factory, heavy_factory, barracks, starport Silo: silo UnitsCommonNames: Mcv: mcv BuildingLimits: refinery: 4 barracks: 1 - light: 1 - heavy: 1 - research: 1 - repair: 1 - radar: 1 - hightech: 1 + light_factory: 1 + heavy_factory: 1 + research_centre: 1 + repair_pad: 1 + outpost: 1 + high_tech_factory: 1 palace: 1 upgrade.barracks: 1 upgrade.light: 1 @@ -159,24 +159,24 @@ Player: BuildingFractions: refinery: 20.1% barracks: 0.1% - light: 0.1% - heavy: 0.1% - radar: 0.1% - hightech: 0.1% - repair: 0.1% + light_factory: 0.1% + heavy_factory: 0.1% + outpost: 0.1% + high_tech_factory: 0.1% + repair_pad: 0.1% starport: 0.1% palace: 0.1% - guntower: 5% - rockettower: 10% - power: 12% + medium_gun_turret: 5% + large_gun_turret: 10% + wind_trap: 12% upgrade.barracks: 0.1% upgrade.light: 0.1% upgrade.heavy: 0.1% upgrade.hightech: 0.1% UnitsToBuild: carryall: 1% - rifle: 2% - bazooka: 2% + light_inf: 2% + trooper: 2% medic: 0.5% fremen: 0.25% sardaukar: 1% @@ -185,23 +185,23 @@ Player: harvester: 1% trike.starport: 7.5% quad.starport: 12.5% - siegetank.starport: 5% - missiletank.starport: 7.5% - combata.starport: 15% - combath.starport: 15% - combato.starport: 15% - sonictank: 50% - devast: 40% - deviatortank: 5% + siege_tank.starport: 5% + missile_tank.starport: 7.5% + combat_tank_a.starport: 15% + combat_tank_h.starport: 15% + combat_tank_o.starport: 15% + sonic_tank: 50% + devastator: 40% + deviator: 5% trike: 15% raider: 15% quad: 25% - siegetank: 10% - missiletank: 15% - stealthraider: 5% - combata: 100% - combath: 100% - combato: 100% + siege_tank: 10% + missile_tank: 15% + stealth_raider: 5% + combat_tank_a: 100% + combat_tank_h: 100% + combat_tank_o: 100% UnitLimits: harvester: 8 SquadSize: 6 @@ -265,21 +265,21 @@ Player: BuildingCommonNames: ConstructionYard: conyard Refinery: refinery - Power: power - VehiclesFactory: light, heavy, starport - Production: light, heavy, barracks, starport + Power: wind_trap + VehiclesFactory: light_factory, heavy_factory, starport + Production: light_factory, heavy_factory, barracks, starport Silo: silo UnitsCommonNames: Mcv: mcv BuildingLimits: refinery: 4 barracks: 1 - light: 1 - heavy: 1 - research: 1 - repair: 1 - radar: 1 - hightech: 1 + light_factory: 1 + heavy_factory: 1 + research_centre: 1 + repair_pad: 1 + outpost: 1 + high_tech_factory: 1 palace: 1 upgrade.barracks: 1 upgrade.light: 1 @@ -288,24 +288,24 @@ Player: BuildingFractions: refinery: 20.1% barracks: 0.1% - light: 0.1% - heavy: 0.1% - repair: 0.1% - radar: 0.1% - hightech: 0.1% - research: 0.1% + light_factory: 0.1% + heavy_factory: 0.1% + repair_pad: 0.1% + outpost: 0.1% + high_tech_factory: 0.1% + research_centre: 0.1% palace: 0.1% - guntower: 4% - rockettower: 12% - power: 10% + medium_gun_turret: 4% + large_gun_turret: 12% + wind_trap: 10% upgrade.barracks: 0.1% upgrade.light: 0.1% upgrade.heavy: 0.1% upgrade.hightech: 0.1% UnitsToBuild: carryall: 1% - rifle: 15% - bazooka: 13% + light_inf: 15% + trooper: 13% medic: 2% fremen: 1% sardaukar: 3% @@ -314,23 +314,23 @@ Player: harvester: 1% trike.starport: 5% quad.starport: 7.5% - siegetank.starport: 5% - missiletank.starport: 7.5% - combata.starport: 15% - combath.starport: 15% - combato.starport: 15% - sonictank: 10% - devast: 10% - deviatortank: 7.5% + siege_tank.starport: 5% + missile_tank.starport: 7.5% + combat_tank_a.starport: 15% + combat_tank_h.starport: 15% + combat_tank_o.starport: 15% + sonic_tank: 10% + devastator: 10% + deviator: 7.5% trike: 10% raider: 10% quad: 15% - siegetank: 10% - missiletank: 15% - stealthraider: 7.5% - combata: 100% - combath: 100% - combato: 100% + siege_tank: 10% + missile_tank: 15% + stealth_raider: 7.5% + combat_tank_a: 100% + combat_tank_h: 100% + combat_tank_o: 100% UnitLimits: harvester: 8 SquadSize: 10 diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 6f1a71670a..2ffaa9ade9 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -15,7 +15,7 @@ carryall.reinforce: ROT: 4 Speed: 160 LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune - RepairBuildings: repair + RepairBuildings: repair_pad RearmBuildings: Repulsable: False LandAltitude: 100 @@ -51,7 +51,7 @@ carryall.infantry: Plane: ROT: 4 Speed: 280 - RepairBuildings: repair + RepairBuildings: repair_pad RearmBuildings: Repulsable: False AirborneUpgrades: airborne @@ -76,7 +76,7 @@ frigate: Plane: ROT: 5 Speed: 350 - RepairBuildings: repair + RepairBuildings: repair_pad RearmBuildings: Repulsable: False AirborneUpgrades: airborne @@ -93,7 +93,7 @@ frigate: FlyAwayOnIdle: RejectsOrders: -orni: +ornithopter: Inherits: ^Plane Valued: Cost: 1000 @@ -117,11 +117,11 @@ orni: InitialFacing: 20 ROT: 6 Speed: 280 - RepairBuildings: repair + RepairBuildings: repair_pad RearmBuildings: AirborneUpgrades: airborne SpawnActorOnDeath: - Actor: orni.husk + Actor: ornithopter.husk SelectionDecorations: Selectable: Bounds: 32,32 @@ -136,7 +136,7 @@ orni: Voiced: VoiceSet: GenericVoice -orni.bomber: +ornithopter.bomber: Inherits: ^Plane AttackBomber: Armament: @@ -148,7 +148,7 @@ orni.bomber: Plane: ROT: 5 Speed: 350 - RepairBuildings: repair + RepairBuildings: repair_pad RearmBuildings: Repulsable: False AirborneUpgrades: airborne @@ -157,12 +157,12 @@ orni.bomber: Tooltip: Name: Ornithopter SpawnActorOnDeath: - Actor: orni.bomber.husk + Actor: ornithopter.bomber.husk RejectsOrders: RenderSprites: - Image: orni + Image: ornithopter -orni.husk: +ornithopter.husk: Inherits: ^AircraftHusk Tooltip: Name: Ornithopter @@ -173,9 +173,9 @@ orni.husk: RearmBuildings: AirborneUpgrades: airborne RenderSprites: - Image: orni + Image: ornithopter -orni.bomber.husk: +ornithopter.bomber.husk: Inherits: ^AircraftHusk Tooltip: Name: Ornithopter @@ -186,7 +186,7 @@ orni.bomber.husk: RearmBuildings: AirborneUpgrades: airborne RenderSprites: - Image: orni + Image: ornithopter carryall.husk: Inherits: ^AircraftHusk diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 271f808ceb..15ac1e794c 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -274,7 +274,7 @@ WithBuildingExplosion: RepairableBuilding: EmitInfantryOnSell: - ActorTypes: rifle,rifle,rifle,rifle,rifle,bazooka,bazooka,bazooka,engineer + ActorTypes: light_inf,light_inf,light_inf,light_inf,light_inf,trooper,trooper,trooper,engineer MustBeDestroyed: RequiredForShortGame: true FrozenUnderFog: diff --git a/mods/d2k/rules/husks.yaml b/mods/d2k/rules/husks.yaml index 0e145b199c..7ce2aed9fd 100644 --- a/mods/d2k/rules/husks.yaml +++ b/mods/d2k/rules/husks.yaml @@ -14,54 +14,54 @@ harvester.husk: TransformOnCapture: IntoActor: harvester -siegetank.husk: +siege_tank.husk: Inherits: ^VehicleHusk ThrowsParticle@turret: Anim: turret TransformOnCapture: - IntoActor: siegetank + IntoActor: siege_tank -missiletank.husk: +missile_tank.husk: Inherits: ^VehicleHusk TransformOnCapture: - IntoActor: missiletank + IntoActor: missile_tank -sonictank.husk: +sonic_tank.husk: Inherits: ^VehicleHusk TransformOnCapture: - IntoActor: sonictank + IntoActor: sonic_tank -devast.husk: +devastator.husk: Inherits: ^VehicleHusk Health: HP: 125 TransformOnCapture: - IntoActor: devast + IntoActor: devastator -deviatortank.husk: +deviator.husk: Inherits: ^VehicleHusk TransformOnCapture: - IntoActor: deviatortank + IntoActor: deviator -^combat.husk: +^combat_tank.husk: Inherits: ^VehicleHusk Health: HP: 100 ThrowsParticle@turret: Anim: turret -combata.husk: - Inherits: ^combat.husk +combat_tank_a.husk: + Inherits: ^combat_tank.husk TransformOnCapture: - IntoActor: combata + IntoActor: combat_tank_a -combath.husk: - Inherits: ^combat.husk +combat_tank_h.husk: + Inherits: ^combat_tank.husk TransformOnCapture: - IntoActor: combath + IntoActor: combat_tank_h -combato.husk: - Inherits: ^combat.husk +combat_tank_o.husk: + Inherits: ^combat_tank.husk TransformOnCapture: - IntoActor: combato + IntoActor: combat_tank_o diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 94269e32d2..7b0d78a270 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -1,4 +1,4 @@ -rifle: +light_inf: Inherits: ^Infantry Buildable: Queue: Infantry @@ -6,7 +6,7 @@ rifle: Valued: Cost: 100 Tooltip: - Name: Rifleman + Name: Light Infantry Description: General-purpose infantry\n Strong vs Infantry\n Weak vs Vehicles, Artillery Health: HP: 50 @@ -48,7 +48,7 @@ engineer: Voiced: VoiceSet: EngineerVoice -bazooka: +trooper: Inherits: ^Infantry Buildable: Queue: Infantry @@ -144,7 +144,7 @@ grenadier: Buildable: Queue: Infantry BuildPaletteOrder: 80 - Prerequisites: ~barracks.atreides, upgrade.barracks, hightech, ~techlevel.medium + Prerequisites: ~barracks.atreides, upgrade.barracks, high_tech_factory, ~techlevel.medium Valued: Cost: 160 Tooltip: @@ -178,7 +178,7 @@ sardaukar: Cost: 400 Tooltip: Name: Sardaukar - Description: Elite asssault infantry\n Strong vs Infantry, Vehicles\n Weak vs Artillery + Description: Elite assault infantry\n Strong vs Infantry, Vehicles\n Weak vs Artillery Health: HP: 100 Mobile: diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index 7ae809c92b..9ed2bb5c68 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -43,30 +43,30 @@ crate: Prerequisites: techlevel.medium, Light, Outpost GiveUnitCrateAction@CombatA: SelectionShares: 10 - Units: combata + Units: combat_tank_a ValidFactions: atreides Prerequisites: techlevel.low, Heavy GiveUnitCrateAction@CombatH: SelectionShares: 10 - Units: combath + Units: combat_tank_h ValidFactions: harkonnen Prerequisites: techlevel.low, Heavy GiveUnitCrateAction@CombatO: SelectionShares: 10 - Units: combato + Units: combat_tank_o ValidFactions: ordos Prerequisites: techlevel.low, Heavy GiveUnitCrateAction@SiegeTank: SelectionShares: 10 - Units: siegetank + Units: siege_tank Prerequisites: techlevel.medium, Heavy, Outpost GiveUnitCrateAction@MissileTank: SelectionShares: 10 - Units: missiletank + Units: missile_tank Prerequisites: techlevel.high, Hitech GiveUnitCrateAction@StealthRaider: SelectionShares: 7 - Units: stealthraider + Units: stealth_raider ValidFactions: ordos Prerequisites: techlevel.medium, Hitech GiveUnitCrateAction@Fremen: @@ -86,17 +86,17 @@ crate: Prerequisites: techlevel.high, Palace GiveUnitCrateAction@SonicTank: SelectionShares: 5 - Units: sonictank + Units: sonic_tank ValidFactions: atreides Prerequisites: techlevel.high, Research GiveUnitCrateAction@Devast: SelectionShares: 2 - Units: devast + Units: devastator ValidFactions: harkonnen Prerequisites: techlevel.high, Research GiveUnitCrateAction@DeviatorTank: SelectionShares: 5 - Units: deviatortank + Units: deviator ValidFactions: ordos Prerequisites: techlevel.high, Research GiveMcvCrateAction: @@ -203,7 +203,7 @@ upgrade.light: Description: Unlocks additional light units Buildable: BuildPaletteOrder: 50 - Prerequisites: light + Prerequisites: light_factory Queue: Upgrade BuildLimit: 1 Valued: @@ -222,7 +222,7 @@ upgrade.heavy: Description: Unlocks advanced technology and heavy weapons Buildable: BuildPaletteOrder: 50 - Prerequisites: heavy + Prerequisites: heavy_factory Queue: Upgrade BuildLimit: 1 Valued: diff --git a/mods/d2k/rules/starport.yaml b/mods/d2k/rules/starport.yaml index 9ae4bc671a..bde7f616c1 100644 --- a/mods/d2k/rules/starport.yaml +++ b/mods/d2k/rules/starport.yaml @@ -1,7 +1,7 @@ mcv.starport: Inherits: mcv Buildable: - Prerequisites: repair + Prerequisites: repair_pad Queue: Starport Valued: Cost: 2500 @@ -35,53 +35,53 @@ quad.starport: RenderSprites: Image: quad -siegetank.starport: - Inherits: siegetank +siege_tank.starport: + Inherits: siege_tank Buildable: Queue: Starport Valued: Cost: 1075 RenderSprites: - Image: siegetank + Image: siege_tank -missiletank.starport: - Inherits: missiletank +missile_tank.starport: + Inherits: missile_tank Buildable: Queue: Starport Valued: Cost: 1250 RenderSprites: - Image: missiletank + Image: missile_tank -combata.starport: - Inherits: combata +combat_tank_a.starport: + Inherits: combat_tank_a Buildable: Prerequisites: ~starport.atreides Queue: Starport Valued: Cost: 875 RenderSprites: - Image: combata + Image: combat_tank_a -combath.starport: - Inherits: combath +combat_tank_h.starport: + Inherits: combat_tank_h Buildable: Prerequisites: ~starport.harkonnen Queue: Starport Valued: Cost: 875 RenderSprites: - Image: combath + Image: combat_tank_h -combato.starport: - Inherits: combato +combat_tank_o.starport: + Inherits: combat_tank_o Buildable: Prerequisites: ~starport.ordos Queue: Starport Valued: Cost: 875 RenderSprites: - Image: combato + Image: combat_tank_o carryall.starport: Inherits: carryall diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 2bb5fda9a6..2d8bc89915 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -36,7 +36,7 @@ concreteb: Buildable: Prerequisites: upgrade.conyard -conyard: +construction_yard: Inherits: ^Building Building: Footprint: xxx xxx @@ -77,7 +77,7 @@ conyard: Palette: d2k PrimaryBuilding: -power: +wind_trap: Inherits: ^Building Buildable: Queue: Building @@ -87,7 +87,7 @@ power: Valued: Cost: 300 Tooltip: - Name: Windtrap + Name: Wind Trap Description: Provides power for other structures Building: Footprint: xx xx @@ -114,7 +114,7 @@ power: barracks: Inherits: ^Building Buildable: - Prerequisites: power + Prerequisites: wind_trap Queue: Building BuildPaletteOrder: 40 Selectable: @@ -170,7 +170,7 @@ barracks: refinery: Inherits: ^Building Buildable: - Prerequisites: power + Prerequisites: wind_trap Queue: Building BuildPaletteOrder: 20 Selectable: @@ -258,7 +258,7 @@ silo: MustBeDestroyed: RequiredForShortGame: false -light: +light_factory: Inherits: ^Building Buildable: Prerequisites: refinery @@ -315,7 +315,7 @@ light: Power: Amount: -20 -heavy: +heavy_factory: Inherits: ^Building Buildable: Prerequisites: refinery @@ -375,7 +375,7 @@ heavy: SelectionDecorations: VisualBounds: 96,96 -radar: +outpost: Inherits: ^Building RequiresPower: CanPowerDown: @@ -406,10 +406,10 @@ radar: Range: 6 RenderDetectionCircle: RenderSprites: - Image: radar.harkonnen + Image: outpost.harkonnen FactionImages: - atreides: radar.atreides - ordos: radar.ordos + atreides: outpost.atreides + ordos: outpost.ordos WithIdleOverlay@DISH: Sequence: idle-dish PauseOnLowPower: yes @@ -425,7 +425,7 @@ starport: Name: Starport Description: Dropzone for quick reinforcements, at a price.\n Requires power to operate Buildable: - Prerequisites: heavy, radar, ~techlevel.high + Prerequisites: heavy_factory, outpost, ~techlevel.high Queue: Building BuildPaletteOrder: 80 Building: @@ -522,7 +522,7 @@ wall: Pieces: 3, 7 Range: 2c0, 5c0 -guntower: +medium_gun_turret: Inherits: ^Defense Buildable: Queue: Building @@ -564,11 +564,11 @@ guntower: SelectionDecorations: VisualBounds: 32,40,0,-8 -rockettower: +large_gun_turret: Inherits: ^Defense Buildable: Queue: Building - Prerequisites: radar, upgrade.conyard, ~techlevel.medium + Prerequisites: outpost, upgrade.conyard, ~techlevel.medium BuildPaletteOrder: 120 Valued: Cost: 850 @@ -607,11 +607,11 @@ rockettower: SelectionDecorations: VisualBounds: 32,40,0,-8 -repair: +repair_pad: Inherits: ^Building Buildable: Queue: Building - Prerequisites: heavy, upgrade.heavy, ~techlevel.medium + Prerequisites: heavy_factory, upgrade.heavy, ~techlevel.medium BuildPaletteOrder: 130 Valued: Cost: 500 @@ -639,20 +639,20 @@ repair: RallyPoint: Offset: 1,3 RenderSprites: - Image: repair.harkonnen + Image: repair_pad.harkonnen FactionImages: - atreides: repair.atreides - ordos: repair.ordos + atreides: repair_pad.atreides + ordos: repair_pad.ordos WithRepairOverlay: Palette: effect75alpha Power: Amount: -10 ProvidesPrerequisite@buildingname: -hightech: +high_tech_factory: Inherits: ^Building Buildable: - Prerequisites: radar, ~techlevel.medium + Prerequisites: outpost, ~techlevel.medium Queue: Building BuildPaletteOrder: 110 Selectable: @@ -693,7 +693,7 @@ hightech: ChargeTime: 180 SquadSize: 3 LongDesc: Ornithopters hit the target with parabombs - UnitType: orni.bomber + UnitType: ornithopter.bomber SelectTargetSound: DisplayBeacon: True CameraActor: camera @@ -704,11 +704,11 @@ hightech: SelectionDecorations: VisualBounds: 96,96 -research: +research_centre: Inherits: ^Building Buildable: Queue: Building - Prerequisites: radar, heavy, upgrade.heavy, ~techlevel.high + Prerequisites: outpost, heavy_factory, upgrade.heavy, ~techlevel.high BuildPaletteOrder: 140 Selectable: Bounds: 96,64,0,16 @@ -725,7 +725,7 @@ research: ChargeTime: 180 Description: Paratroopers LongDesc: A Carryall drops a squad of Infantry \nanywhere on the map - DropItems: RIFLE, RIFLE, BAZOOKA, BAZOOKA, ENGINEER, BAZOOKA, RIFLE, RIFLE + DropItems: light_inf, light_inf, trooper, trooper, engineer, trooper, light_inf, light_inf SelectTargetSound: FlareType: Building: @@ -754,7 +754,7 @@ research: palace: Inherits: ^Building Buildable: - Prerequisites: research, ~techlevel.high + Prerequisites: research_centre, ~techlevel.high Queue: Building BuildPaletteOrder: 150 Selectable: @@ -795,7 +795,7 @@ palace: Prerequisites: ~techlevel.superweapons, ~palace.nuke ChargeTime: 300 Description: Death Hand - LongDesc: Launches a nuclear missile at a target location + LongDesc: Launches an atomic missile at a target location BeginChargeSound: HI_PREP.AUD EndChargeSound: HI_DHRDY.AUD SelectTargetSound: @@ -814,7 +814,7 @@ palace: ProvidesPrerequisite@buildingname: conyard.atreides: - Inherits: conyard + Inherits: construction_yard Buildable: Queue: Building BuildPaletteOrder: 1000 @@ -825,7 +825,7 @@ conyard.atreides: -FactionImages: conyard.harkonnen: - Inherits: conyard + Inherits: construction_yard Buildable: Queue: Building BuildPaletteOrder: 1000 @@ -836,7 +836,7 @@ conyard.harkonnen: -FactionImages: conyard.ordos: - Inherits: conyard + Inherits: construction_yard Buildable: Queue: Building BuildPaletteOrder: 1000 diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index e9cbec4226..29d427b7c8 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -1,7 +1,7 @@ mcv: Inherits: ^Vehicle Buildable: - Prerequisites: repair, upgrade.heavy, ~techlevel.medium + Prerequisites: repair_pad, upgrade.heavy, ~techlevel.medium Queue: Armor BuildPaletteOrder: 110 Valued: @@ -29,7 +29,7 @@ mcv: EmptyWeapon: UnitExplodeLarge Transforms: Facing: 16 - IntoActor: conyard + IntoActor: construction_yard Offset: -1,-1 TransformSounds: BUILD1.WAV NoTransformNotification: CannotDeploy @@ -76,7 +76,7 @@ harvester: Weapon: UnitExplodeLarge EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: - Actor: Harvester.Husk + Actor: harvester.Husk WithHarvestOverlay: Palette: effect50alpha WithDockingAnimation: @@ -94,8 +94,8 @@ trike: Valued: Cost: 250 Tooltip: - Name: Scout Trike - Description: Fast Scout\n Strong vs Infantry\n Weak vs Tanks, Aircraft + Name: Trike + Description: Fast scout\n Strong vs Infantry\n Weak vs Tanks, Aircraft Selectable: Class: trike Health: @@ -153,7 +153,7 @@ quad: AttractsWorms: Intensity: 470 -siegetank: +siege_tank: Inherits: ^Tank Buildable: Queue: Armor @@ -194,22 +194,20 @@ siegetank: Selectable: Class: siegetank SpawnActorOnDeath: - Actor: siegetank.husk + Actor: siege_tank.husk AttractsWorms: Intensity: 600 - RenderSprites: - Image: SIEGETANK -missiletank: +missile_tank: Inherits: ^Tank Valued: Cost: 1000 Tooltip: - Name: Rocket Tank + Name: Missile Tank Description: Rocket Artillery\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft Buildable: Queue: Armor - Prerequisites: ~heavy.missiletank, upgrade.heavy, research, ~techlevel.high + Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre, ~techlevel.high BuildPaletteOrder: 60 Mobile: Speed: 64 @@ -233,16 +231,16 @@ missiletank: Selectable: Class: missiletank SpawnActorOnDeath: - Actor: missiletank.husk + Actor: missile_tank.husk AttractsWorms: Intensity: 600 -sonictank: +sonic_tank: Inherits: ^Vehicle Buildable: Queue: Armor BuildPaletteOrder: 100 - Prerequisites: ~heavy.atreides, research, ~techlevel.high + Prerequisites: ~heavy.atreides, research_centre, ~techlevel.high Valued: Cost: 1250 Tooltip: @@ -266,16 +264,16 @@ sonictank: Weapon: UnitExplodeLarge EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: - Actor: sonictank.husk + Actor: sonic_tank.husk AttractsWorms: Intensity: 600 -devast: +devastator: Inherits: ^Tank Buildable: Queue: Armor BuildPaletteOrder: 100 - Prerequisites: ~heavy.harkonnen, research, ~techlevel.high + Prerequisites: ~heavy.harkonnen, research_centre, ~techlevel.high Valued: Cost: 1200 Tooltip: @@ -303,7 +301,7 @@ devast: Weapon: UnitExplodeLarge EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: - Actor: devast.husk + Actor: devastator.husk AttractsWorms: Intensity: 700 SelectionDecorations: @@ -342,10 +340,10 @@ raider: AttractsWorms: Intensity: 420 -stealthraider: +stealth_raider: Inherits: raider Buildable: - Prerequisites: ~light.ordos, upgrade.light, hightech, ~techlevel.medium + Prerequisites: ~light.ordos, upgrade.light, high_tech_factory, ~techlevel.medium BuildPaletteOrder: 30 Valued: Cost: 400 @@ -361,7 +359,7 @@ stealthraider: InitialStance: HoldFire -MustBeDestroyed: -deviatortank: +deviator: Inherits: ^Tank Valued: Cost: 1000 @@ -371,7 +369,7 @@ deviatortank: Buildable: Queue: Armor BuildPaletteOrder: 50 - Prerequisites: ~heavy.ordos, research, ~techlevel.high + Prerequisites: ~heavy.ordos, research_centre, ~techlevel.high Mobile: ROT: 3 Speed: 64 @@ -391,11 +389,11 @@ deviatortank: Weapon: UnitExplodeLarge EmptyWeapon: UnitExplodeLarge SpawnActorOnDeath: - Actor: deviatortank.husk + Actor: deviator.husk AttractsWorms: Intensity: 600 -^combat: +^combat_tank: Inherits: ^Tank Buildable: Queue: Armor @@ -436,17 +434,17 @@ deviatortank: AttractsWorms: Intensity: 520 -combata: - Inherits: ^combat +combat_tank_a: + Inherits: ^combat_tank Buildable: Prerequisites: ~heavy.atreides Armament: Weapon: 80mm_A SpawnActorOnDeath: - Actor: combata.husk + Actor: combat_tank_a.husk -combath: - Inherits: ^combat +combat_tank_h: + Inherits: ^combat_tank Buildable: Prerequisites: ~heavy.harkonnen Armament: @@ -461,10 +459,10 @@ combath: Health: HP: 440 SpawnActorOnDeath: - Actor: combath.husk + Actor: combat_tank_h.husk -combato: - Inherits: ^combat +combat_tank_o: + Inherits: ^combat_tank Buildable: Prerequisites: ~heavy.ordos Turreted: @@ -476,5 +474,5 @@ combato: ROT: 8 Crushes: crate, infantry SpawnActorOnDeath: - Actor: combato.husk + Actor: combat_tank_o.husk diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index 7608919683..c8ac3b0a0b 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -91,7 +91,7 @@ World: ClassName: Light Support Factions: atreides BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, grenadier, trike, quad + SupportActors: light_inf, light_inf, light_inf, trooper, grenadier, trike, quad InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@lightharkonnen: @@ -99,7 +99,7 @@ World: ClassName: Light Support Factions: harkonnen BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, bazooka, trike, quad + SupportActors: light_inf, light_inf, light_inf, trooper, trooper, trike, quad InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@lightordos: @@ -107,7 +107,7 @@ World: ClassName: Light Support Factions: ordos BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, engineer, raider, quad + SupportActors: light_inf, light_inf, light_inf, trooper, engineer, raider, quad InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@heavyatreides: @@ -115,7 +115,7 @@ World: ClassName: Heavy Support Factions: atreides BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, grenadier, trike, combata, missiletank + SupportActors: light_inf, light_inf, light_inf, trooper, grenadier, trike, combat_tank_a, missile_tank InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@heavyharkonnen: @@ -123,7 +123,7 @@ World: ClassName: Heavy Support Factions: harkonnen BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, engineer, quad, combath, siegetank + SupportActors: light_inf, light_inf, light_inf, trooper, engineer, quad, combat_tank_h, siege_tank InnerSupportRadius: 3 OuterSupportRadius: 5 MPStartUnits@heavyordos: @@ -131,7 +131,7 @@ World: ClassName: Heavy Support Factions: ordos BaseActor: mcv - SupportActors: rifle, rifle, rifle, bazooka, engineer, raider, combato, missiletank + SupportActors: light_inf, light_inf, light_inf, trooper, engineer, raider, combat_tank_o, missile_tank InnerSupportRadius: 3 OuterSupportRadius: 5 SpawnMPUnits: diff --git a/mods/d2k/sequences/aircraft.yaml b/mods/d2k/sequences/aircraft.yaml index bdbf974858..56086a17ac 100644 --- a/mods/d2k/sequences/aircraft.yaml +++ b/mods/d2k/sequences/aircraft.yaml @@ -10,7 +10,7 @@ carryall: Offset: -30,-24 -orni: +ornithopter: idle: DATA.R8 Start: 1955 Facings: -32 diff --git a/mods/d2k/sequences/infantry.yaml b/mods/d2k/sequences/infantry.yaml index 950b6a1ae5..e0f59cdbc3 100644 --- a/mods/d2k/sequences/infantry.yaml +++ b/mods/d2k/sequences/infantry.yaml @@ -1,4 +1,4 @@ -rifle: +light_inf: stand: DATA.R8 Start: 206 Facings: -8 @@ -59,7 +59,7 @@ rifle: Start: 4011 Offset: -30,-24 -bazooka: +trooper: stand: DATA.R8 Start: 458 Facings: -8 diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index d310ff9724..a975984138 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -21,7 +21,7 @@ wall: Start: 4063 Offset: -30,-24 -guntower: +medium_gun_turret: idle: DATA.R8 Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587 Length: 16 @@ -44,7 +44,7 @@ guntower: Start: 4069 Offset: -30,-24 -rockettower: +large_gun_turret: idle: DATA.R8 Frames: 2573, 2576, 2574, 2584, 2577, 2578, 2588, 2581, 2575, 2585, 2579, 2580, 2586, 2582, 2583, 2587 Length: 16 @@ -101,7 +101,7 @@ conyard.atreides: Start: 4046 Offset: -30,-24 -repair.atreides: +repair_pad.atreides: make: DATA.R8 Start: 4370 Length: 10 @@ -134,7 +134,7 @@ repair.atreides: Start: 4096 Offset: -30,-24 -repair.harkonnen: +repair_pad.harkonnen: make: DATA.R8 Start: 4370 Length: 10 @@ -167,7 +167,7 @@ repair.harkonnen: Start: 4097 Offset: -30,-24 -repair.ordos: +repair_pad.ordos: make: DATA.R8 Start: 4370 Length: 10 @@ -310,7 +310,7 @@ barracks.atreides: Start: 4059 Offset: -30,-24 -radar.atreides: +outpost.atreides: idle: DATA.R8 Start: 2521 Offset: -48,80 @@ -798,7 +798,7 @@ barracks.harkonnen: Start: 4060 Offset: -30,-24 -radar.harkonnen: +outpost.harkonnen: idle: DATA.R8 Start: 2681 Offset: -48,80 @@ -1195,7 +1195,7 @@ barracks.ordos: Start: 4061 Offset: -30,-24 -radar.ordos: +outpost.ordos: idle: DATA.R8 Start: 2841 Offset: -48,80 diff --git a/mods/d2k/sequences/vehicles.yaml b/mods/d2k/sequences/vehicles.yaml index f0b78a5bfa..85e7eb5f0f 100644 --- a/mods/d2k/sequences/vehicles.yaml +++ b/mods/d2k/sequences/vehicles.yaml @@ -65,7 +65,7 @@ quad: Start: 4018 Offset: -30,-24 -siegetank: +siege_tank: idle: DATA.R8 Start: 1763 Facings: -32 @@ -80,7 +80,7 @@ siegetank: Start: 4026 Offset: -30,-24 -siegetank.husk: +siege_tank.husk: idle: DATA.R8 Start: 1763 Facings: -32 @@ -90,7 +90,7 @@ siegetank.husk: Facings: -32 ZOffset: -512 -missiletank: +missile_tank: idle: DATA.R8 Start: 1603 Facings: -32 @@ -98,13 +98,13 @@ missiletank: Start: 4024 Offset: -30,-24 -missiletank.husk: +missile_tank.husk: idle: DATA.R8 Start: 1603 Facings: -32 ZOffset: -512 -sonictank: +sonic_tank: idle: DATA.R8 Start: 1827 Facings: -32 @@ -112,13 +112,13 @@ sonictank: Start: 4027 Offset: -30,-24 -sonictank.husk: +sonic_tank.husk: idle: DATA.R8 Start: 1827 Facings: -32 ZOffset: -512 -combata: +combat_tank_a: idle: DATA.R8 Start: 1731 Facings: -32 @@ -134,7 +134,7 @@ combata: Start: 4020 Offset: -30,-24 -combata.husk: +combat_tank_a.husk: idle: DATA.R8 Start: 1731 Facings: -32 @@ -144,7 +144,7 @@ combata.husk: Facings: -32 ZOffset: -512 -combath: +combat_tank_h: idle: DATA.R8 Start: 2051 Facings: -32 @@ -160,7 +160,7 @@ combath: Start: 4021 Offset: -30,-24 -combath.husk: +combat_tank_h.husk: idle: DATA.R8 Start: 2051 Facings: -32 @@ -170,7 +170,7 @@ combath.husk: Facings: -32 ZOffset: -512 -combato: +combat_tank_o: idle: DATA.R8 Start: 2453 Facings: -32 @@ -186,7 +186,7 @@ combato: Start: 4022 Offset: -30,-24 -combato.husk: +combat_tank_o.husk: idle: DATA.R8 Start: 2453 Facings: -32 @@ -196,7 +196,7 @@ combato.husk: Facings: -32 ZOffset: -512 -devast: +devastator: idle: DATA.R8 Start: 2083 Facings: -32 @@ -209,7 +209,7 @@ devast: Start: 4028 Offset: -30,-24 -devast.husk: +devastator.husk: idle: DATA.R8 Start: 2083 Facings: -32 @@ -231,7 +231,7 @@ raider: Start: 4017 Offset: -30,-24 -stealthraider: +stealth_raider: idle: DATA.R8 Start: 2421 Facings: -32 @@ -245,7 +245,7 @@ stealthraider: BlendMode: Additive icon: raidersicon.shp # 4282 in 1.06 DATA.R8 -deviatortank: +deviator: idle: DATA.R8 Start: 2389 Facings: -32 @@ -253,7 +253,7 @@ deviatortank: Start: 4025 Offset: -30,-24 -deviatortank.husk: +deviator.husk: idle: DATA.R8 Start: 2389 Facings: -32