Merge pull request #11397 from reaperrr/add-moebius

Add Moebius, Chan and Delphi to TD

mods/cnc/rules/civilian.yaml

@@ -456,45 +456,67 @@ BRIDGEHUT:
 
 C1:
 	Inherits: ^CivInfantry
-	Voiced:
-		VoiceSet: CivilianMaleVoice
+	Inherits@armed: ^ArmedCivilian
 
 C2:
 	Inherits: ^CivInfantry
-	Voiced:
-		VoiceSet: CivilianFemaleVoice
+	Inherits@armed: ^ArmedCivilian
 
 C3:
 	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
+	Voiced:
+		VoiceSet: CivilianFemaleVoice
 
 C4:
 	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
 	Voiced:
 		VoiceSet: CivilianFemaleVoice
 
 C5:
 	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
+	Voiced:
+		VoiceSet: CivilianFemaleVoice
 
 C6:
 	Inherits: ^CivInfantry
-	Voiced:
-		VoiceSet: CivilianFemaleVoice
+	Inherits@armed: ^ArmedCivilian
 
 C7:
 	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
 
 C8:
 	Inherits: ^CivInfantry
-	Voiced:
-		VoiceSet: CivilianFemaleVoice
+	Inherits@armed: ^ArmedCivilian
 
 C9:
 	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
 
 C10:
+	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
+
+DELPHI:
+	Inherits: ^CivInfantry
+	Inherits@armed: ^ArmedCivilian
+	Tooltip:
+		Name: Agent Delphi
+
+CHAN:
+	Inherits: ^CivInfantry
+	Tooltip:
+		Name: Dr. Chan
+
+MOEBIUS:
 	Inherits: ^CivInfantry
 	Voiced:
-		VoiceSet: CivilianFemaleVoice
+		VoiceSet: MoebiusVoice
+	Tooltip:
+		Name: Dr. Moebius
 
 VICE:
 	Inherits: ^Viceroid

mods/cnc/rules/defaults.yaml

@@ -291,9 +291,6 @@
 		HP: 25
 	RevealsShroud:
 		Range: 2c0
-	Armament:
-		Weapon: Pistol
-	AttackFrontal:
 	ActorLostNotification:
 		Notification: CivilianKilled
 		NotifyAll: true
@@ -302,6 +299,11 @@
 		CrushSound: squish2.aud
 	Voiced:
 		VoiceSet: CivilianMaleVoice
+
+^ArmedCivilian:
+	Armament:
+		Weapon: Pistol
+	AttackFrontal:
 	WithInfantryBody:
 		AttackSequence: shoot