Merge remote-tracking branch 'darkademic/dev'

Inq8 · Feb 25, 2024 · 6228a42 · 6228a42
2 parents fd722d4 + b954206
commit 6228a42
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/mods/ca/maps/tfca/tfca-rules-base.yaml b/mods/ca/maps/tfca/tfca-rules-base.yaml
@@ -430,18 +430,23 @@ SEAL:
 		Weapon: Uzi
 		LocalOffset: 427,0,341
 	-WithDecoration@COMMANDOSKULL:
-	-Armament@sapper:
-	-AmmoPool:
-	-ReloadAmmoPoolCA:
+	-Armament@C4Place:
+	-Armament@C4Prepare:
+	-AmmoPool@PreparedC4:
+	-AmmoPool@C4:
+	-ReloadAmmoPoolCA@C4:
+	-ReloadAmmoPoolCA@PreparedC4:
+	-GrantConditionOnAttack@PreparingC4:
 	-Demolition:
+	-TargetSpecificOrderVoice:
 	Guard:
 		-Voice:
 	Passenger:
 		-Voice:
 	AttackMove:
 		-Voice:
 	AttackFrontal:
-		-Voice:
+		Voice: Action
 	-AnnounceOnKill:
 	PortableChronoCA:
 		ChargeDelay: 375

diff --git a/mods/ca/weapons/custom/scrinfestation.yaml b/mods/ca/weapons/custom/scrinfestation.yaml
@@ -104,3 +104,15 @@ TurretDiscs:
 	Warhead@1Dam: SpreadDamage
 		Versus:
 			None: 170
+
+BruteAttack:
+	ReloadDelay: 70
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 10000
+		Versus:
+			None: 100
+			Light: 60
+			Heavy: 75
+			Concrete: 35
+			Wood: 25