From 70163e9c86efaf5c393127793bd5824de310d19c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:39:53 +0200 Subject: [PATCH 1/9] Change D2k building power draw/output to original values --- mods/d2k/rules/structures.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 98458dfc57..63d01bf0cb 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -113,7 +113,7 @@ wind_trap: WithIdleOverlay@ZAPS: Sequence: idle-zaps Power: - Amount: 100 + Amount: 200 ScalePowerWithHealth: ProvidesPrerequisite@buildingname: @@ -167,7 +167,7 @@ barracks: Prerequisite: barracks.medics Factions: atreides, ordos Power: - Amount: -20 + Amount: -30 RenderSprites: Image: barracks.harkonnen FactionImages: @@ -224,7 +224,7 @@ refinery: Sequence: smoke Palette: effectAdditive Power: - Amount: -30 + Amount: -75 WithIdleOverlay@TOP: Sequence: idle-top ProvidesPrerequisite@buildingname: @@ -266,7 +266,7 @@ silo: Capacity: 2000 -EmitInfantryOnSell: Power: - Amount: -5 + Amount: -15 MustBeDestroyed: RequiredForShortGame: false ThrowsShrapnel: @@ -331,7 +331,7 @@ light_factory: WithIdleOverlay@TOP: Sequence: idle-top Power: - Amount: -20 + Amount: -125 heavy_factory: Inherits: ^Building @@ -390,7 +390,7 @@ heavy_factory: WithIdleOverlay@TOP: Sequence: idle-top Power: - Amount: -30 + Amount: -150 ProvidesPrerequisite@buildingname: SelectionDecorations: VisualBounds: 96,96 @@ -436,7 +436,7 @@ outpost: Sequence: idle-dish PauseOnLowPower: yes Power: - Amount: -40 + Amount: -125 ProvidesPrerequisite@buildingname: starport: @@ -497,7 +497,7 @@ starport: Prerequisite: starport.harkonnen Factions: harkonnen Power: - Amount: -40 + Amount: -150 ProvidesPrerequisite@buildingname: wall: @@ -588,7 +588,7 @@ medium_gun_turret: DetectCloaked: Range: 5c0 Power: - Amount: -20 + Amount: -50 SelectionDecorations: VisualBounds: 32,40,0,-8 @@ -633,7 +633,7 @@ large_gun_turret: DetectCloaked: Range: 6c0 Power: - Amount: -30 + Amount: -60 SelectionDecorations: VisualBounds: 32,40,0,-8 @@ -678,7 +678,7 @@ repair_pad: WithRepairOverlay: Palette: effect75alpha Power: - Amount: -10 + Amount: -50 ProvidesPrerequisite@buildingname: high_tech_factory: @@ -734,7 +734,7 @@ high_tech_factory: WithProductionOverlay@WELDING: Sequence: production-welding Power: - Amount: -40 + Amount: -75 SelectionDecorations: VisualBounds: 96,96 @@ -771,7 +771,7 @@ research_centre: WithIdleOverlay@LIGHTS: Sequence: idle-lights Power: - Amount: -40 + Amount: -175 ProvidesPrerequisite@buildingname: SelectionDecorations: VisualBounds: 96,80 @@ -812,7 +812,7 @@ palace: DetectCloaked: Range: 4c0 Power: - Amount: -50 + Amount: -200 ProvidesPrerequisite@nuke: Prerequisite: palace.nuke Factions: harkonnen From e8defccd95b25e41ea17d3963fabccfe27a5aa8a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:40:27 +0200 Subject: [PATCH 2/9] Remove stealth detection from D2k buildings --- mods/d2k/rules/defaults.yaml | 1 - mods/d2k/rules/structures.yaml | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 5d618528d9..de51f9918a 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -284,7 +284,6 @@ AttackTurreted: AutoTarget: RenderRangeCircle: - RenderDetectionCircle: -GivesBuildableArea: -WithCrumbleOverlay: -WithMakeAnimation: diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 63d01bf0cb..43df00af21 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -424,9 +424,6 @@ outpost: RevealsShroud: Range: 10c0 ProvidesRadar: - DetectCloaked: - Range: 6c0 - RenderDetectionCircle: RenderSprites: Image: outpost.harkonnen FactionImages: @@ -585,8 +582,6 @@ medium_gun_turret: Weapon: 110mm_Gun LocalOffset: 512,0,432 MuzzleSequence: muzzle - DetectCloaked: - Range: 5c0 Power: Amount: -50 SelectionDecorations: @@ -630,8 +625,6 @@ large_gun_turret: RequiresPower: CanPowerDown: DisabledOverlay: - DetectCloaked: - Range: 6c0 Power: Amount: -60 SelectionDecorations: @@ -808,9 +801,6 @@ palace: atreides: palace.atreides ordos: palace.ordos corrino: palace.corrino - RenderDetectionCircle: - DetectCloaked: - Range: 4c0 Power: Amount: -200 ProvidesPrerequisite@nuke: From 6dd5e3b77af6ee3aaef31f4cd4d5408b621f5ce2 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:41:12 +0200 Subject: [PATCH 3/9] Reduce D2k wall line build range --- mods/d2k/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 43df00af21..49211b77c9 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -529,7 +529,7 @@ wall: CrushClasses: Concretewall BlocksProjectiles: LineBuild: - Range: 8 + Range: 5 NodeTypes: wall, turret LineBuildNode: Types: wall From 4292a054707ed86ab8d8403d992a70e8882a7c81 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:41:45 +0200 Subject: [PATCH 4/9] Tweak D2k barracks RallyPoint offset --- mods/d2k/rules/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 49211b77c9..9778d41305 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -143,7 +143,7 @@ barracks: RevealsShroud: Range: 5c0 RallyPoint: - Offset: 1,3 + Offset: 1,2 Exit@1: SpawnOffset: 352,576,0 ExitCell: 0,2 From 5d20a9e4f299b7dc343bdf52256ba2c551dd3574 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:42:40 +0200 Subject: [PATCH 5/9] Tweak emitted infantry types of D2k construction yard --- mods/d2k/rules/structures.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 9778d41305..899e8be2e2 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -67,6 +67,8 @@ construction_yard: Name: Construction Yard CustomSellValue: Value: 2000 + EmitInfantryOnSell: + ActorTypes: light_inf, light_inf, engineer BaseBuilding: ProductionBar: Power: From a94b8f5f0cfb6722ca49a0328d08d215a8aa2978 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:53:14 +0200 Subject: [PATCH 6/9] Enable self-healing on D2k MCV, Harvester and Devastator to match original Additionally change harvester PipCount and Capacity to match original. --- mods/d2k/rules/vehicles.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index f6dffa3d99..06302ee3d3 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -41,6 +41,10 @@ mcv: Intensity: 700 SelectionDecorations: VisualBounds: 42,42 + SelfHealing: + Step: 5 + Ticks: 3 + HealIfBelow: 50% harvester: Inherits: ^Vehicle @@ -60,8 +64,8 @@ harvester: Class: harvester Priority: 7 Harvester: - PipCount: 10 - Capacity: 40 + PipCount: 7 + Capacity: 28 HarvestFacings: 8 Resources: Spice UnloadTicksPerBale: 5 @@ -88,6 +92,10 @@ harvester: Intensity: 700 SelectionDecorations: VisualBounds: 42,42 + SelfHealing: + Step: 5 + Ticks: 3 + HealIfBelow: 50% trike: Inherits: ^Vehicle @@ -324,6 +332,10 @@ devastator: Intensity: 700 SelectionDecorations: VisualBounds: 44,38,0,0 + SelfHealing: + Step: 5 + Ticks: 3 + HealIfBelow: 50% raider: Inherits: ^Vehicle From efde2ab8ffa8d0ae74a8f9adaf0e6b1f5fbe2360 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:55:52 +0200 Subject: [PATCH 7/9] Enable Carryall self-healing --- mods/d2k/rules/aircraft.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index fd250b8921..a6afac7b36 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -38,6 +38,10 @@ carryall.reinforce: Automatic: False RenderSprites: Image: carryall + SelfHealing: + Step: 5 + Ticks: 3 + HealIfBelow: 50% carryall: Inherits: carryall.reinforce From 0629cde10fd73da5d3efacc9a7d2581a0efe58c0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:27:04 +0200 Subject: [PATCH 8/9] D2k implement classic engineer capturing, reduce Fremen cloak delay, add cloak to Saboteur --- mods/d2k/rules/arrakis.yaml | 3 +-- mods/d2k/rules/defaults.yaml | 4 ++-- mods/d2k/rules/infantry.yaml | 15 ++++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml index fafde1bb88..623591415b 100644 --- a/mods/d2k/rules/arrakis.yaml +++ b/mods/d2k/rules/arrakis.yaml @@ -69,8 +69,7 @@ sietch: -DamagedWithoutFoundation: -GivesBuildableArea: -Sellable: - -ExternalCapturable: - -ExternalCapturableBar: + -Capturable: Power: Amount: 0 ProvidesPrerequisite@buildingname: diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index de51f9918a..9850182443 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -248,8 +248,8 @@ BuildSounds: BUILD1.WAV Adjacent: 3 GivesBuildableArea: - ExternalCapturable: - ExternalCapturableBar: + Capturable: + CaptureThreshold: 1.0 SoundOnDamageTransition: DamagedSounds: EXPLSML1.WAV DestroyedSounds: EXPLHG1.WAV diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index 9395c5dc85..b7b252590e 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -42,10 +42,8 @@ engineer: Passenger: PipType: Yellow EngineerRepair: - ExternalCaptures: - Type: building Captures: - CaptureTypes: husk + CaptureTypes: building, husk -AutoTarget: AttractsWorms: Intensity: 180 @@ -139,8 +137,8 @@ fremen: WithInfantryBody: AttackSequence: shoot Cloak: - InitialDelay: 250 - CloakDelay: 250 + InitialDelay: 85 + CloakDelay: 85 CloakSound: STEALTH1.WAV UncloakSound: STEALTH2.WAV IsPlayerPalette: true @@ -236,6 +234,13 @@ saboteur: -AutoTarget: AttractsWorms: Intensity: 120 + Cloak: + InitialDelay: 85 + CloakDelay: 85 + CloakSound: STEALTH1.WAV + UncloakSound: STEALTH2.WAV + UncloakOnMove: true + IsPlayerPalette: true Voiced: VoiceSet: SaboteurVoice From 5646f4118f2aa2c589b20ae14125257a3c3f0b28 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 27 Sep 2015 16:25:06 +0200 Subject: [PATCH 9/9] Make D2k infantry no longer attract worms --- mods/d2k/rules/infantry.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml index b7b252590e..b8bfb8af76 100644 --- a/mods/d2k/rules/infantry.yaml +++ b/mods/d2k/rules/infantry.yaml @@ -19,8 +19,6 @@ light_inf: AttackFrontal: WithInfantryBody: AttackSequence: shoot - AttractsWorms: - Intensity: 120 engineer: Inherits: ^Infantry @@ -45,8 +43,6 @@ engineer: Captures: CaptureTypes: building, husk -AutoTarget: - AttractsWorms: - Intensity: 180 Voiced: VoiceSet: EngineerVoice @@ -73,8 +69,6 @@ trooper: AttackFrontal: WithInfantryBody: AttackSequence: shoot - AttractsWorms: - Intensity: 180 medic: Inherits: ^Infantry @@ -104,8 +98,6 @@ medic: AttackSequence: heal Passenger: PipType: Blue - AttractsWorms: - Intensity: 180 Voiced: VoiceSet: EngineerVoice @@ -174,8 +166,6 @@ grenadier: Explodes: Weapon: GrenDeath EmptyWeapon: GrenDeath - AttractsWorms: - Intensity: 180 sardaukar: Inherits: ^Infantry @@ -203,8 +193,6 @@ sardaukar: Armament@SECONDARY: Weapon: M_HMG AttackFrontal: - AttractsWorms: - Intensity: 180 Voiced: VoiceSet: GenericVoice Explodes: @@ -232,8 +220,6 @@ saboteur: C4Demolition: C4Delay: 45 -AutoTarget: - AttractsWorms: - Intensity: 120 Cloak: InitialDelay: 85 CloakDelay: 85