From daef6283c17ca8a43c1d8af8175a0bf5657553b7 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 14 Jan 2016 21:55:32 +0100 Subject: [PATCH 1/3] Add Mercenaries and Smugglers to D2k Rename some structures. --- mods/d2k/rules/misc.yaml | 2 +- mods/d2k/rules/structures.yaml | 29 ++++++++++++++++++++++++++--- mods/d2k/rules/world.yaml | 8 ++++++++ mods/d2k/sequences/structures.yaml | 4 ++-- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index a23d97293a..75436f6c31 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -265,7 +265,7 @@ upgrade.heavy: FactionImages: atreides: heavy.atreides ordos: heavy.ordos - corrino: heavy.corrino + mercenary: heavy.mercenary ProvidesPrerequisite@upgradename: upgrade.hightech: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index f6384d6a35..555caae570 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -79,7 +79,8 @@ construction_yard: FactionImages: atreides: conyard.atreides ordos: conyard.ordos - corrino: conyard.corrino + smuggler: conyard.ordos + mercenary: conyard.ordos WithBuildingPlacedOverlay: Palette: d2k PrimaryBuilding: @@ -134,6 +135,8 @@ wind_trap: FactionImages: atreides: power.atreides ordos: power.ordos + smuggler: power.ordos + mercenary: power.ordos WithIdleOverlay@ZAPS: Sequence: idle-zaps Power: @@ -194,6 +197,8 @@ barracks: FactionImages: atreides: barracks.atreides ordos: barracks.ordos + smuggler: barracks.ordos + mercenary: barracks.ordos ProvidesPrerequisite@buildingname: GlobalUpgradable: Prerequisites: upgrade.barracks @@ -260,6 +265,8 @@ refinery: FactionImages: atreides: refinery.atreides ordos: refinery.ordos + smuggler: refinery.ordos + mercenary: refinery.ordos WithDockedOverlay@SMOKE: Sequence: smoke Power: @@ -297,6 +304,8 @@ silo: FactionImages: atreides: silo.atreides ordos: silo.ordos + smuggler: silo.ordos + mercenary: silo.ordos WithSpriteBody: WithSiloAnimation: StoresResources: @@ -343,6 +352,8 @@ light_factory: FactionImages: atreides: light.atreides ordos: light.ordos + smuggler: light.ordos + mercenary: light.ordos RallyPoint: Offset: 2,2 Exit@1: @@ -442,7 +453,8 @@ heavy_factory: FactionImages: atreides: heavy.atreides ordos: heavy.ordos - corrino: heavy.corrino + mercenary: heavy.mercenary + smuggler: heavy.ordos WithProductionOverlay@WELDING: Sequence: production-welding WithIdleOverlay@TOP: @@ -508,6 +520,8 @@ outpost: FactionImages: atreides: outpost.atreides ordos: outpost.ordos + smuggler: outpost.ordos + mercenary: outpost.ordos WithIdleOverlay@DISH: Sequence: idle-dish PauseOnLowPower: yes @@ -555,7 +569,8 @@ starport: FactionImages: atreides: starport.atreides ordos: starport.ordos - corrino: starport.corrino + smuggler: starport.smuggler + mercenary: starport.ordos WithDeliveryOverlay: Palette: starportlights ProductionBar: @@ -765,6 +780,8 @@ repair_pad: FactionImages: atreides: repair_pad.atreides ordos: repair_pad.ordos + smuggler: repair_pad.ordos + mercenary: repair_pad.ordos WithRepairOverlay: Palette: effect75alpha Power: @@ -806,6 +823,8 @@ high_tech_factory: FactionImages: atreides: hightech.atreides ordos: hightech.ordos + smuggler: hightech.ordos + mercenary: hightech.ordos ProvidesPrerequisite@upgrade: Prerequisite: hightech.atreides Factions: atreides @@ -869,6 +888,8 @@ research_centre: FactionImages: atreides: research.atreides ordos: research.ordos + smuggler: research.ordos + mercenary: research.ordos WithIdleOverlay@LIGHTS: Sequence: idle-lights Power: @@ -909,6 +930,8 @@ palace: atreides: palace.atreides ordos: palace.ordos corrino: palace.corrino + smuggler: palace.ordos + mercenary: palace.ordos Power: Amount: -200 ProvidesPrerequisite@nuke: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index cccd830cd7..c438bd6614 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -35,6 +35,14 @@ Name: Corrino InternalName: corrino Selectable: false + Faction@Mercenaries: + Name: Mercenaries + InternalName: mercenary + Selectable: false + Faction@Smugglers: + Name: Smugglers + InternalName: smuggler + Selectable: false ResourceType@Spice: ResourceType: 1 Palette: d2k diff --git a/mods/d2k/sequences/structures.yaml b/mods/d2k/sequences/structures.yaml index 5f651538b6..baba2a3eee 100644 --- a/mods/d2k/sequences/structures.yaml +++ b/mods/d2k/sequences/structures.yaml @@ -1497,7 +1497,7 @@ palace.corrino: Offset: -48,48 Tick: 100 -starport.corrino: +starport.smuggler: idle: DATA.R8 Start: 2999 Offset: -48,48 @@ -1541,7 +1541,7 @@ starport.corrino: Start: 4020 Offset: -30,-24 -heavy.corrino: +heavy.mercenary: idle: DATA.R8 Start: 3001 Offset: -48,64 From 930aeb71c4280d35412f332306b5edf8ec19267c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 14 Jan 2016 21:57:12 +0100 Subject: [PATCH 2/3] Some misc D2k cleanup C. Yard doesn't need DamagedWithoutFoundation, aircraft aren't selectable so they don't need a voice, ordos tank ROT matches default, RepairBuildings on carryall is redundant. --- mods/d2k/rules/aircraft.yaml | 1 - mods/d2k/rules/defaults.yaml | 2 -- mods/d2k/rules/structures.yaml | 1 + mods/d2k/rules/vehicles.yaml | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index af00814de3..6562818cd7 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -17,7 +17,6 @@ carryall.reinforce: ROT: 4 Speed: 144 # 112 * ~1.3 for balance reasons LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune - RepairBuildings: repair_pad Repulsable: False LandAltitude: 100 LandWhenIdle: False diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 68e9ead1b9..d57b687384 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -233,8 +233,6 @@ ActorLostNotification: AttackMove: DrawLineToTarget: - Voiced: - VoiceSet: GenericVoice WithFacingSpriteBody: WithShadow: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 555caae570..f6e2d29d84 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -43,6 +43,7 @@ concreteb: construction_yard: Inherits: ^Building + -DamagedWithoutFoundation: Building: Footprint: xxx xxx Dimensions: 3,2 diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index ed1b30e304..66bd001248 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -509,7 +509,6 @@ combat_tank_o: Weapon: 80mm_O Mobile: Speed: 85 - ROT: 5 Health: HP: 1800 SpawnActorOnDeath: From 0bfe9a701aff8bde725632b606cd19d60cfeea6a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 30 Jan 2016 17:45:03 +0100 Subject: [PATCH 3/3] Fix faction-specific upgraded factory images for mercenaries and smugglers --- mods/d2k/rules/misc.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index 75436f6c31..55a466d40f 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -223,6 +223,8 @@ upgrade.barracks: FactionImages: atreides: barracks.atreides ordos: barracks.ordos + mercenary: barracks.ordos + smuggler: barracks.ordos ProvidesPrerequisite@upgradename: upgrade.light: @@ -244,6 +246,8 @@ upgrade.light: FactionImages: atreides: light.atreides ordos: light.ordos + mercenary: light.ordos + smuggler: light.ordos ProvidesPrerequisite@upgradename: upgrade.heavy: @@ -266,6 +270,7 @@ upgrade.heavy: atreides: heavy.atreides ordos: heavy.ordos mercenary: heavy.mercenary + smuggler: heavy.ordos ProvidesPrerequisite@upgradename: upgrade.hightech: