Merge pull request #9459 from reaperrr/d2k-power-misc

Change D2k power draw and various other aspects to match original

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

mods/d2k/rules/arrakis.yaml

@@ -69,8 +69,7 @@ sietch:
 	-DamagedWithoutFoundation:
 	-GivesBuildableArea:
 	-Sellable:
-	-ExternalCapturable:
+	-Capturable:
-	-ExternalCapturableBar:
 	Power:
 		Amount: 0
 	ProvidesPrerequisite@buildingname:

mods/d2k/rules/defaults.yaml

@@ -248,8 +248,8 @@
 		BuildSounds: BUILD1.WAV
 		Adjacent: 3
 	GivesBuildableArea:
-	ExternalCapturable:
+	Capturable:
-	ExternalCapturableBar:
+		CaptureThreshold: 1.0
 	SoundOnDamageTransition:
 		DamagedSounds: EXPLSML1.WAV
 		DestroyedSounds: EXPLHG1.WAV
@@ -284,7 +284,6 @@
 	AttackTurreted:
 	AutoTarget:
 	RenderRangeCircle:
-	RenderDetectionCircle:
 	-GivesBuildableArea:
 	-WithCrumbleOverlay:
 	-WithMakeAnimation:

mods/d2k/rules/infantry.yaml

@@ -19,8 +19,6 @@ light_inf:
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
-	AttractsWorms:
-		Intensity: 120
 
 engineer:
 	Inherits: ^Infantry
@@ -42,13 +40,9 @@ engineer:
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
-	ExternalCaptures:
-		Type: building
 	Captures:
-		CaptureTypes: husk
+		CaptureTypes: building, husk
 	-AutoTarget:
-	AttractsWorms:
-		Intensity: 180
 	Voiced:
 		VoiceSet: EngineerVoice
 
@@ -75,8 +69,6 @@ trooper:
 	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot
-	AttractsWorms:
-		Intensity: 180
 
 medic:
 	Inherits: ^Infantry
@@ -106,8 +98,6 @@ medic:
 		AttackSequence: heal
 	Passenger:
 		PipType: Blue
-	AttractsWorms:
-		Intensity: 180
 	Voiced:
 		VoiceSet: EngineerVoice
 
@@ -139,8 +129,8 @@ fremen:
 	WithInfantryBody:
 		AttackSequence: shoot
 	Cloak:
-		InitialDelay: 250
+		InitialDelay: 85
-		CloakDelay: 250
+		CloakDelay: 85
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
 		IsPlayerPalette: true
@@ -176,8 +166,6 @@ grenadier:
 	Explodes:
 		Weapon: GrenDeath
 		EmptyWeapon: GrenDeath
-	AttractsWorms:
-		Intensity: 180
 
 sardaukar:
 	Inherits: ^Infantry
@@ -205,8 +193,6 @@ sardaukar:
 	Armament@SECONDARY:
 		Weapon: M_HMG
 	AttackFrontal:
-	AttractsWorms:
-		Intensity: 180
 	Voiced:
 		VoiceSet: GenericVoice
 	Explodes:
@@ -234,8 +220,13 @@ saboteur:
 	C4Demolition:
 		C4Delay: 45
 	-AutoTarget:
-	AttractsWorms:
+	Cloak:
-		Intensity: 120
+		InitialDelay: 85
+		CloakDelay: 85
+		CloakSound: STEALTH1.WAV
+		UncloakSound: STEALTH2.WAV
+		UncloakOnMove: true
+		IsPlayerPalette: true
 	Voiced:
 		VoiceSet: SaboteurVoice
 

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:
@@ -113,7 +115,7 @@ wind_trap:
 	WithIdleOverlay@ZAPS:
 		Sequence: idle-zaps
 	Power:
-		Amount: 100
+		Amount: 200
 	ScalePowerWithHealth:
 	ProvidesPrerequisite@buildingname:
 
@@ -143,7 +145,7 @@ barracks:
 	RevealsShroud:
 		Range: 5c0
 	RallyPoint:
-		Offset: 1,3
+		Offset: 1,2
 	Exit@1:
 		SpawnOffset: 352,576,0
 		ExitCell: 0,2
@@ -167,7 +169,7 @@ barracks:
 		Prerequisite: barracks.medics
 		Factions: atreides, ordos
 	Power:
-		Amount: -20
+		Amount: -30
 	RenderSprites:
 		Image: barracks.harkonnen
 		FactionImages:
@@ -224,7 +226,7 @@ refinery:
 		Sequence: smoke
 		Palette: effectAdditive
 	Power:
-		Amount: -30
+		Amount: -75
 	WithIdleOverlay@TOP:
 		Sequence: idle-top
 	ProvidesPrerequisite@buildingname:
@@ -266,7 +268,7 @@ silo:
 		Capacity: 2000
 	-EmitInfantryOnSell:
 	Power:
-		Amount: -5
+		Amount: -15
 	MustBeDestroyed:
 		RequiredForShortGame: false
 	ThrowsShrapnel:
@@ -331,7 +333,7 @@ light_factory:
 	WithIdleOverlay@TOP:
 		Sequence: idle-top
 	Power:
-		Amount: -20
+		Amount: -125
 
 heavy_factory:
 	Inherits: ^Building
@@ -390,7 +392,7 @@ heavy_factory:
 	WithIdleOverlay@TOP:
 		Sequence: idle-top
 	Power:
-		Amount: -30
+		Amount: -150
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 96,96
@@ -424,9 +426,6 @@ outpost:
 	RevealsShroud:
 		Range: 10c0
 	ProvidesRadar:
-	DetectCloaked:
-		Range: 6c0
-	RenderDetectionCircle:
 	RenderSprites:
 		Image: outpost.harkonnen
 		FactionImages:
@@ -436,7 +435,7 @@ outpost:
 		Sequence: idle-dish
 		PauseOnLowPower: yes
 	Power:
-		Amount: -40
+		Amount: -125
 	ProvidesPrerequisite@buildingname:
 
 starport:
@@ -497,7 +496,7 @@ starport:
 		Prerequisite: starport.harkonnen
 		Factions: harkonnen
 	Power:
-		Amount: -40
+		Amount: -150
 	ProvidesPrerequisite@buildingname:
 
 wall:
@@ -532,7 +531,7 @@ wall:
 		CrushClasses: Concretewall
 	BlocksProjectiles:
 	LineBuild:
-		Range: 8
+		Range: 5
 		NodeTypes: wall, turret
 	LineBuildNode:
 		Types: wall
@@ -585,10 +584,8 @@ medium_gun_turret:
 		Weapon: 110mm_Gun
 		LocalOffset: 512,0,432
 		MuzzleSequence: muzzle
-	DetectCloaked:
-		Range: 5c0
 	Power:
-		Amount: -20
+		Amount: -50
 	SelectionDecorations:
 		VisualBounds: 32,40,0,-8
 
@@ -630,10 +627,8 @@ large_gun_turret:
 	RequiresPower:
 	CanPowerDown:
 	DisabledOverlay:
-	DetectCloaked:
-		Range: 6c0
 	Power:
-		Amount: -30
+		Amount: -60
 	SelectionDecorations:
 		VisualBounds: 32,40,0,-8
 
@@ -678,7 +673,7 @@ repair_pad:
 	WithRepairOverlay:
 		Palette: effect75alpha
 	Power:
-		Amount: -10
+		Amount: -50
 	ProvidesPrerequisite@buildingname:
 
 high_tech_factory:
@@ -734,7 +729,7 @@ high_tech_factory:
 	WithProductionOverlay@WELDING:
 		Sequence: production-welding
 	Power:
-		Amount: -40
+		Amount: -75
 	SelectionDecorations:
 		VisualBounds: 96,96
 
@@ -771,7 +766,7 @@ research_centre:
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
 	Power:
-		Amount: -40
+		Amount: -175
 	ProvidesPrerequisite@buildingname:
 	SelectionDecorations:
 		VisualBounds: 96,80
@@ -808,11 +803,8 @@ palace:
 			atreides: palace.atreides
 			ordos: palace.ordos
 			corrino: palace.corrino
-	RenderDetectionCircle:
-	DetectCloaked:
-		Range: 4c0
 	Power:
-		Amount: -50
+		Amount: -200
 	ProvidesPrerequisite@nuke:
 		Prerequisite: palace.nuke
 		Factions: harkonnen

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
+		PipCount: 7
-		Capacity: 40
+		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