Merge pull request #6821 from penev92/bleed_sandworm

Closes #2245

mods/cnc/rules/civilian.yaml

@@ -458,6 +458,7 @@ VICE:
 		MuzzleSplitFacings: 8
 	AttackFrontal:
 	AttackWander:
+		WanderMoveRadius: 2
 	RenderUnit:
 	WithMuzzleFlash:
 		SplitFacings: true

mods/d2k/maps/shellmap/map.yaml

@@ -33,13 +33,17 @@ Players:
 		Name: Atreides
 		Race: atreides
 		ColorRamp: 161,134,200
-		Allies: Neutral
 		Enemies: Harkonnen
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
 		Race: harkonnen
 		ColorRamp: 3,255,127
 		Enemies: Atreides
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Race: atreides
+		Enemies: Atreides, Harkonnen
 
 Actors:
 	Actor4: spicebloom
@@ -102,6 +106,9 @@ Actors:
 	Actor41: guntowera
 		Location: 46,39
 		Owner: Harkonnen
+	Actor42: wormspawner
+		Location: 46,64
+		Owner: Creeps
 
 Smudges:
 
@@ -114,6 +121,8 @@ Rules:
 		-MPStartLocations:
 		ResourceType@Spice:
 			ValuePerUnit: 0
+		WormManager:
+			Minimum: 1
 
 Sequences:
 

mods/d2k/mod.yaml

@@ -36,6 +36,7 @@ Rules:
 	./mods/d2k/rules/atreides.yaml
 	./mods/d2k/rules/harkonnen.yaml
 	./mods/d2k/rules/ordos.yaml
+	./mods/d2k/rules/arrakis.yaml
 
 Sequences:
 	./mods/d2k/sequences/aircraft.yaml

mods/d2k/notifications.yaml

@@ -31,6 +31,8 @@ Speech:
 		UnitLost: ULOST
 		BuildingLost: BLOST
 		BuildingCaptured: CAPT
+		WormSign: WSIGN
+		WormAttack: WATTK
 
 Sounds:
 	DefaultVariant: .WAV

mods/d2k/rules/arrakis.yaml

@@ -0,0 +1,53 @@
+SPICEBLOOM:
+	RenderBuilding:
+	Building:
+		Footprint: x
+		Dimensions: 1,1
+	AppearsOnRadar:
+	EditorAppearance:
+		RelativeToTopLeft: yes
+	ProximityCaptor:
+		Types: Tree
+	Tooltip:
+		Name: Spice Bloom
+	SeedsResource:
+		ResourceType: Spice
+		Interval: 75
+	WithActiveAnimation:
+	RadarColorFromTerrain:
+		Terrain: Spice
+	BodyOrientation:
+	WithMakeAnimation:
+
+SANDWORM:
+	Tooltip:
+		Name: Sandworm
+		Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite.
+	Health:
+		HP: 10000
+		Radius: 3
+	Armor:
+		Type: None
+	Mobile:
+		Speed: 50
+		TerrainSpeeds:
+			Sand: 100
+			Dune: 100
+			Spice: 100
+	TargetableUnit:
+		TargetTypes: Underground
+	RevealsShroud:
+		Range: 32c0
+	RenderUnit:
+	BodyOrientation:
+	HiddenUnderFog:
+	AppearsOnRadar:
+		UseLocation: yes
+	AttackSwallow:
+		AttackRequiresEnteringCell: true
+	AttackMove:
+	AttackWander:
+	AutoTarget:
+		ScanRadius: 32
+	Armament:
+		Weapon: WormJaw

mods/d2k/rules/misc.yaml

@@ -140,27 +140,6 @@ waypoint:
 	RenderEditorOnly:
 	BodyOrientation:
 
-SPICEBLOOM:
-	RenderBuilding:
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	AppearsOnRadar:
-	EditorAppearance:
-		RelativeToTopLeft: yes
-	ProximityCaptor:
-		Types: Tree
-	Tooltip:
-		Name: Spice Bloom
-	SeedsResource:
-		ResourceType: Spice
-		Interval: 75
-	WithActiveAnimation:
-	RadarColorFromTerrain:
-		Terrain: Spice
-	BodyOrientation:
-	WithMakeAnimation:
-
 CAMERA:
 	Immobile:
 		OccupiesSpace: false
@@ -170,3 +149,9 @@ CAMERA:
 		Range: 8c0
 	BodyOrientation:
 
+wormspawner:
+	Immobile:
+		OccupiesSpace: false
+	RenderEditorOnly:
+	BodyOrientation:
+	WormSpawner:

mods/d2k/rules/world.yaml

@@ -10,6 +10,7 @@ World:
 	ScreenShaker:
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
+	WormManager:
 	CrateSpawner:
 		Minimum: 0
 		Maximum: 2

mods/d2k/sequences/infantry.yaml

@@ -441,4 +441,22 @@ grenadier: # 2502 - 2749 in 1.06 DATA.R8
 		Facings: 8
 		Tick: 120
 	icon: grenadiericon
-		Start: 0 # 4281 in 1.06 DATA.R8
+		Start: 0 # 4281 in 1.06 DATA.R8
+
+sandworm:
+	mouth: DATA
+		Start: 3549
+		Length: 15
+		Tick: 100
+	sand: DATA
+		Start: 3565
+		Length: 20
+	idle: DATA
+		Start: 3586
+		Length: 35
+		Tick: 180
+		BlendMode: Additive
+	burrowed: DATA
+		Start: 39
+	icon: wormicon
+		Start: 0

mods/d2k/sequences/misc.yaml

@@ -267,6 +267,11 @@ waypoint:
 		Start: 0
 		Length: *
 
+wormspawner:
+	idle:
+		Start: 0
+		Length: *
+
 sietch:
 	idle: DATA
 		Start: 2998

mods/d2k/voices.yaml

@@ -78,4 +78,10 @@ SaboteurVoice:
 		Select: O_SSEL1,O_SSEL2,O_SSEL3
 		Move: O_SCONF1,O_SCONF2,O_SCONF3
 		Die: KILLGUY1,KILLGUY2,KILLGUY3,KILLGUY4,KILLGUY5,KILLGUY6,KILLGUY7,KILLGUY8,KILLGUY9
-	DisableVariants: Select, Move
+	DisableVariants: Select, Move
+
+WormVoice:
+	DefaultVariant: .WAV
+	Voices:
+		Select: WRMSIGN1
+		Move: WORM

mods/ts/rules/infantry.yaml

@@ -583,6 +583,7 @@ DOGGIE:
 		Weapon: FiendShard
 	AttackFrontal:
 	AttackWander:
+		WanderMoveRadius: 2
 
 VISSML:
 	Inherits: ^Infantry