race specific ProductionQueue audio

mods/d2k/TODO

@@ -28,7 +28,6 @@
 # make deviator change the allegiance of ememy units (currently shoots rockets)
 # allow frigate to deliver 5 units at once to starport
 # starport prices should vary
-# reinforcements have arrived is played twice when ordering via starport
 # fix shroud, currently falls back to 24x24 shadow from RA (Dune's 32x32 tiles differ completely from RA/CnC)
 # black spots on buildings should be fading team colors
 # gamefile extraction (setup/setup.z) from CD fails

mods/d2k/rules/atreides.yaml

@@ -6,6 +6,18 @@ CONYARDA:
 		IntoActor: mcva
 		Offset:1,1
 		Facing: 270
+	ProductionQueue@Building:
+		QueuedAudio: AI_BUILD.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		ReadyAudio: AI_BDRDY.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
+	ProductionQueue@Defense:
+		QueuedAudio: AI_BUILD.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		ReadyAudio: AI_BDRDY.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 PWRA:
 	Inherits: ^POWER
@@ -26,12 +38,24 @@ BARRA:
 	Buildable:
 		Prerequisites: pwra
 		Owner: atreides
+	ProductionQueue@Infantry:
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 HIGHTECHA:
 	Inherits: ^HIGHTECH
 	Buildable:
 		Prerequisites: radara
 		Owner: atreides
+	ProductionQueue@Plane:
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 RESEARCHA:
 	Inherits: ^RESEARCH
@@ -58,6 +82,12 @@ LIGHTA:
 		Owner: atreides
 	RenderBuildingWarFactory:
 		Image: LIGHTA
+	ProductionQueue@Vehicle:
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 HEAVYA:
 	Inherits: ^HEAVY
@@ -66,6 +96,12 @@ HEAVYA:
 		Owner: atreides
 	RenderBuildingWarFactory:
 		Image: HEAVYA
+	ProductionQueue@Vehicle:
+		ReadyAudio: AI_UNRDY.AUD
+		QueuedAudio:AI_TRAIN.AUD
+		OnHoldAudio: AI_HOLD.AUD
+		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 RADARA:
 	Inherits: ^RADAR
@@ -78,11 +114,14 @@ STARPORTA:
 	Buildable:
 		Prerequisites: radara
 		Owner: atreides
-	ProductionQueue:
+	ProductionAirdrop:
-		QueuedAudio: AI_ORDER.AUD
 		ReadyAudio: AI_REINF.AUD
+	ProductionQueue@Vehicle:
+		QueuedAudio: AI_ORDER.AUD
+		ReadyAudio: 
 		OnHoldAudio: AI_HOLD.AUD
 		CancelledAudio: AI_CANCL.AUD
+		BlockedAudio: AI_NROOM.AUD
 
 REPAIRA:
 	Inherits: ^REPAIR
@@ -99,7 +138,6 @@ MCVA:
 		Facing: 10
 		IntoActor: conyarda
 		Offset:-1,-1
-		TransformSounds: BUILD1.aud
 		NoTransformSounds: AI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -152,7 +190,7 @@ FREMEN:
 		Prerequisites: palacea
 	Selectable:
 		Bounds: 12,17,0,-6
-#		Voice: CommandoVoice
+		Voice: FremenVoice
 	Mobile:
 		Speed: 5
 	Health:

mods/d2k/rules/defaults.yaml

@@ -13,7 +13,7 @@
 		ROT: 5
 	SelectionDecorations:
 	Selectable: 
-		Voice: VehicleVoice
+		Voice: GenericVoice
 	TargetableUnit:
 		TargetTypes: Ground
 	Passenger: 
@@ -54,7 +54,7 @@
 		ROT: 5
 	SelectionDecorations:
 	Selectable: 
-		Voice: VehicleVoice
+		Voice: GenericVoice
 	TargetableUnit:
 		TargetTypes: Ground
 	Passenger: 
@@ -214,5 +214,4 @@
 	ProximityCaptor:
 		Types:Building
 	Sellable:
-	AcceptsSupplies:
 	GivesBounty:

mods/d2k/rules/harkonnen.yaml

@@ -6,6 +6,18 @@ CONYARDH:
 		IntoActor: mcvh
 		Offset:1,1
 		Facing: 270
+	ProductionQueue@Building:
+		QueuedAudio: HI_BUILD.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		ReadyAudio: HI_BDRDY.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
+	ProductionQueue@Defense:
+		QueuedAudio: HI_BUILD.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		ReadyAudio: HI_BDRDY.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 PWRH:
 	Inherits: ^POWER
@@ -26,12 +38,24 @@ BARRH:
 	Buildable:
 		Prerequisites: pwrh
 		Owner: harkonnen
+	ProductionQueue@Infantry:
+		ReadyAudio: HI_UNRDY.AUD
+		QueuedAudio:HI_TRAIN.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 HIGHTECHH:
 	Inherits: ^HIGHTECH
 	Buildable:
 		Prerequisites: radarh
 		Owner: harkonnen
+	ProductionQueue@Plane:
+		ReadyAudio: HI_UNRDY.AUD
+		QueuedAudio:HI_TRAIN.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 RESEARCHH:
 	Inherits: ^RESEARCH
@@ -58,6 +82,12 @@ LIGHTH:
 		Owner: harkonnen
 	RenderBuildingWarFactory:
 		Image: LIGHTH
+	ProductionQueue@Vehicle:
+		ReadyAudio: HI_UNRDY.AUD
+		QueuedAudio:HI_TRAIN.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 HEAVYH:
 	Inherits: ^HEAVY
@@ -66,6 +96,12 @@ HEAVYH:
 		Owner: harkonnen
 	RenderBuildingWarFactory:
 		Image: HEAVYH
+	ProductionQueue@Vehicle:
+		ReadyAudio: HI_UNRDY.AUD
+		QueuedAudio:HI_TRAIN.AUD
+		OnHoldAudio: HI_HOLD.AUD
+		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 RADARH:
 	Inherits: ^RADAR
@@ -78,11 +114,14 @@ STARPORTH:
 	Buildable:
 		Prerequisites: radarh
 		Owner: harkonnen
-	ProductionQueue:
+	ProductionAirdrop:
-		QueuedAudio: HI_ORDER.AUD
 		ReadyAudio: HI_REINF.AUD
+	ProductionQueue@Vehicle:
+		QueuedAudio: HI_ORDER.AUD
+		ReadyAudio: 
 		OnHoldAudio: HI_HOLD.AUD
 		CancelledAudio: HI_CANCL.AUD
+		BlockedAudio: HI_NROOM.AUD
 
 REPAIRH:
 	Inherits: ^REPAIR
@@ -99,7 +138,6 @@ MCVH:
 		Facing: 10
 		IntoActor: conyardh
 		Offset:-1,-1
-		TransformSounds:
 		NoTransformSounds: HI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -158,7 +196,6 @@ SARDAUKAR:
 		Name: Sardaukar
 		Description: Heavy infantry.
 	Selectable:
-#		Voice: TanyaVoice
 		Bounds: 12,17,0,-9
 	Health:
 		HP: 150

mods/d2k/rules/infantry.yaml

@@ -33,8 +33,8 @@ ENGINEER:
 		Name: Engineer
 		Description: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
-#		Voice: EngineerVoice
 		Bounds: 12,17,0,-9
+		Voice: EngineerVoice
 	Health:
 		HP: 25
 	Mobile:
@@ -84,7 +84,6 @@ THUMPER:
 		Name: Thumper
 		Description: Attracts sandsworm through vibrations.\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
-#		Voice: EngineerVoice
 		Bounds: 12,17,0,-9
 	Health:
 		HP: 25
@@ -116,10 +115,10 @@ THUMPING:
 		Cost: 400
 	Tooltip:
 		Name: Thumper
-	CustomSellValue:
+	-Capturable:
-		Value: 0
+	-CapturableBar:
+	-Sellable:
 	-GivesBuildableArea:
-	-EmitInfantryOnSell:
 	FreeActor:
 		Actor: SANDWORM
 		SpawnOffset: 1,2

mods/d2k/rules/ordos.yaml

@@ -6,6 +6,18 @@ CONYARDO:
 		IntoActor: mcvo
 		Offset:1,1
 		Facing: 270
+	ProductionQueue@Building:
+		QueuedAudio: OI_BUILD.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		ReadyAudio: OI_BDRDY.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
+	ProductionQueue@Defense:
+		QueuedAudio: OI_BUILD.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		ReadyAudio: OI_BDRDY.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 PWRO:
 	Inherits: ^POWER
@@ -26,12 +38,24 @@ BARRO:
 	Buildable:
 		Prerequisites: pwro
 		Owner: ordos
+	ProductionQueue@Infantry:
+		ReadyAudio: OI_UNRDY.AUD
+		QueuedAudio:OI_TRAIN.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 HIGHTECHO:
 	Inherits: ^HIGHTECH
 	Buildable:
 		Prerequisites: radaro
 		Owner: ordos
+	ProductionQueue@Plane:
+		ReadyAudio: OI_UNRDY.AUD
+		QueuedAudio:OI_TRAIN.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 RESEARCHO:
 	Inherits: ^RESEARCH
@@ -58,6 +82,12 @@ LIGHTO:
 		Owner: ordos
 	RenderBuildingWarFactory:
 		Image: LIGHTO
+	ProductionQueue@Vehicle:
+		ReadyAudio: OI_UNRDY.AUD
+		QueuedAudio:OI_TRAIN.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 HEAVYO:
 	Inherits: ^HEAVY
@@ -66,6 +96,12 @@ HEAVYO:
 		Owner: ordos
 	RenderBuildingWarFactory:
 		Image: HEAVYO
+	ProductionQueue@Vehicle:
+		ReadyAudio: OI_UNRDY.AUD
+		QueuedAudio:OI_TRAIN.AUD
+		OnHoldAudio: OI_HOLD.AUD
+		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 RADARO:
 	Inherits: ^RADAR
@@ -78,11 +114,14 @@ STARPORTO:
 	Buildable:
 		Prerequisites: radaro
 		Owner: ordos
-	ProductionQueue:
+	ProductionAirdrop:
-		QueuedAudio: OI_ORDER.AUD
 		ReadyAudio: OI_REINF.AUD
+	ProductionQueue@Vehicle:
+		QueuedAudio: OI_ORDER.AUD
+		ReadyAudio: 
 		OnHoldAudio: OI_HOLD.AUD
 		CancelledAudio: OI_CANCL.AUD
+		BlockedAudio: OI_NROOM.AUD
 
 REPAIRO:
 	Inherits: ^REPAIR
@@ -99,7 +138,6 @@ MCVO:
 		Facing: 10
 		IntoActor: conyardo
 		Offset:-1,-1
-		TransformSounds:
 		NoTransformSounds: OI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -181,7 +219,7 @@ SABOTEUR:
 		Name: Saboteur
 		Description: Sneaky infantry, armed with explosives.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
 	Selectable:
-#		Voice: TanyaVoice
+		Voice: SaboteurVoice
 		Bounds: 12,17,0,-9
 	Health:
 		HP: 100

mods/d2k/rules/structures.yaml

@@ -21,6 +21,14 @@
 		Value: 2500
 	BaseBuilding:
 	ProductionBar:
+	ProductionQueue@Building:
+		Type: Building
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionQueue@Defense:
+		Type: Defense
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
 
 ^POWER:
 	Inherits: ^Building
@@ -81,6 +89,10 @@
 		Produces: Infantry
 	PrimaryBuilding:
 	ProductionBar:
+	ProductionQueue@Infantry:
+		Type: Infantry
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
 
 ^HIGHTECH:
 	Inherits: ^Building
@@ -113,6 +125,10 @@
 		Produces: Plane
 	PrimaryBuilding:
 	ProductionBar:
+	ProductionQueue@Plane:
+		Type: Plane
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
 
 ^RESEARCH:
 	Inherits: ^Building
@@ -254,6 +270,10 @@
 		Produces: Vehicle
 	PrimaryBuilding:
 	ProductionBar:
+	ProductionQueue@Vehicle:
+		Type: Vehicle
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
 
 ^HEAVY:
 	Inherits: ^Building
@@ -287,6 +307,10 @@
 		Produces: Vehicle
 	PrimaryBuilding:
 	ProductionBar:
+	ProductionQueue@Vehicle:
+		Type: Vehicle
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
 
 ^RADAR:
 	RequiresPower:
@@ -344,11 +368,9 @@
 		ExitCell: 3,1
 	ProductionAirdrop:
 		Produces: Vehicle
-		ReadyAudio: AI_REINF.AUD
 		ActorType: frigate
-	ProductionQueue:
+	ProductionQueue@Vehicle:
 		Type: Vehicle
-		Group: Vehicle
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	ProductionBar:

mods/d2k/rules/system.yaml

@@ -1,51 +1,5 @@
-#TODO: Currently only uses the Atreides voices.
 Player:
 	TechTree:
-	ClassicProductionQueue@Building:
-		Type: Building
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
-		QueuedAudio: AI_BUILD.AUD
-		OnHoldAudio: AI_HOLD.AUD
-		ReadyAudio: AI_BDRDY.AUD
-		CancelledAudio: AI_CANCL.AUD
-		BlockedAudio: AI_NROOM.AUD
-	ClassicProductionQueue@Defense:
-		Type: Defense
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
-		QueuedAudio: AI_BUILD.AUD
-		OnHoldAudio: AI_HOLD.AUD
-		ReadyAudio: AI_BDRDY.AUD
-		CancelledAudio: AI_CANCL.AUD
-		BlockedAudio: AI_NROOM.AUD
-	ClassicProductionQueue@Vehicle:
-		Type: Vehicle
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
-		ReadyAudio: AI_UNRDY.AUD
-		QueuedAudio:AI_TRAIN.AUD
-		OnHoldAudio: AI_HOLD.AUD
-		CancelledAudio: AI_CANCL.AUD
-		BlockedAudio: AI_NROOM.AUD
-	ClassicProductionQueue@Infantry:
-		Type: Infantry
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
-		ReadyAudio: AI_UNRDY.AUD
-		QueuedAudio:AI_TRAIN.AUD
-		OnHoldAudio: AI_HOLD.AUD
-		CancelledAudio: AI_CANCL.AUD
-		BlockedAudio: AI_NROOM.AUD
-	ClassicProductionQueue@Plane:
-		Type: Plane
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
-		ReadyAudio: AI_UNRDY.AUD
-		QueuedAudio:AI_TRAIN.AUD
-		OnHoldAudio: AI_HOLD.AUD
-		CancelledAudio: AI_CANCL.AUD
-		BlockedAudio: AI_NROOM.AUD
 	PlaceBuilding:
 	SupportPowerManager:
 	ConquestVictoryConditions@Atreides:

mods/d2k/rules/vehicles.yaml

@@ -24,6 +24,8 @@
 	MustBeDestroyed:
 	BaseBuilding:
 	-AttackMove:
+	Transforms:
+		TransformSounds: BUILD1.aud
 
 HARVESTER:
 	Inherits: ^Vehicle

mods/d2k/voices.yaml

@@ -9,11 +9,79 @@ GenericVoice:
 		Select: G_SSEL1,G_SSEL2,G_SSEL3
 		Move: G_SCONF1,G_SCONF2,G_SCONF3
 
-VehicleVoice:
+AtreidesVehicleVoice:
 	Variants:
 		atreides: .AUD
+	Voices:
+		Select: A_VSEL1,A_VSEL2,A_VSEL3
+		Move: A_VCONF1,A_VCONF2,A_VCONF3
+
+AtreidesInfantryVoice:
+	Variants:
+		atreides: .AUD
+	Voices:
+		Select: A_ISEL1,A_ISEL2,A_ISEL3
+		Move: A_ICONF1,A_ICONF2,A_ICONF3
+
+AtreidesEngineerVoice:
+	Variants:
+		atreides: .AUD
+	Voices:
+		Select: A_ESEL1,A_ESEL2,A_ESEL3
+		Move: A_ECONF1,A_ECONF2,A_ECONF3
+
+FremenVoice:
+	Variants:
+		atreides: .AUD
+	Voices:
+		Select: A_FSEL1,A_FSEL2,A_FSEL3
+		Move: A_FCONF1,A_FCONF2,A_FCONF3
+
+HarkonnenVehicleVoice:
+	Variants:
 		harkonnen: .AUD
+	Voices:
+		Select: H_VSEL1,H_VSEL2,H_VSEL3
+		Move: H_VCONF1,H_VCONF2,H_VCONF3
+
+HarkonnenInfantryVoice:
+	Variants:
+		harkonnen: .AUD
+	Voices:
+		Select: H_ISEL1,H_ISEL2,H_ISEL3
+		Move: H_ICONF1,H_ICONF2,H_ICONF3
+
+HarkonnenEngineerVoice:
+	Variants:
+		harkonnen: .AUD
+	Voices:
+		Select: H_ESEL1,H_ESEL2,H_ESEL3
+		Move: H_ECONF1,H_ECONF2,H_ECONF3
+
+OrdosVehicleVoice:
+	Variants:
 		ordos: .AUD
 	Voices:
-		Select: G_SSEL1,G_SSEL2,G_SSEL3
+		Select: O_VSEL1,O_VSEL2,O_VSEL3
-		Move: G_SCONF1,G_SCONF2,G_SCONF3
+		Move: O_VCONF1,O_VCONF2,O_VCONF3
+
+OrdosInfantryVoice:
+	Variants:
+		ordos: .AUD
+	Voices:
+		Select: O_ISEL1,O_ISEL2,O_ISEL3
+		Move: O_ICONF1,O_ICONF2,O_ICONF3
+
+OrdosEngineerVoice:
+	Variants:
+		ordos: .AUD
+	Voices:
+		Select: O_ESEL1,O_ESEL2,O_ESEL3
+		Move: O_ECONF1,O_ECONF2,O_ECONF3
+
+SaboteurVoice:
+	Variants:
+		ordos: .AUD
+	Voices:
+		Select: O_SSEL1,O_SSEL2,O_SSEL3
+		Move: O_SCONF1,O_SCONF2,O_SCONF3