Fixup Yuri Floating Disc Weapon

cookgreen · Dec 14, 2018 · 4626b20 · 4626b20
1 parent 3fe9f67
commit 4626b20
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 17 deletions.
diff --git a/mods/yr/weapons/missiles.yaml b/mods/yr/weapons/missiles.yaml
@@ -177,23 +177,6 @@ SubTorpedo:
 		ImpactSounds: gexpwasb.wav
 		ValidTargets: Ground
 
-
-DiskLaser:
-	Inherits: ^Missile
-	ReloadDelay: 50
-	Range:7c0
-	Report: vfloatta.wav
-	Warhead@1Dam: SpreadDamage
-		Damage: 25 
-
-DiskDrain:
-	Inherits: ^Missile
-	ReloadDelay: 50
-	Range:1c256
-	Report: bsenatta.wav, bsenattb.wav, bsenattc.wav, bsenattd.wav
-	Warhead@1Dam: SpreadDamage
-		Damage: 25 
-
 Maverick3:
 	Inherits: Maverick
 	Report: vmigatta.wav

diff --git a/mods/yr/weapons/zaps.yaml b/mods/yr/weapons/zaps.yaml
@@ -174,6 +174,50 @@ SuperComet:
 	Inherits: Comet
 	Warhead@1Dam: SpreadDamage
 		Damage: 150
+
+DiskLaser:
+	Inherits: Comet
+	ReloadDelay: 50
+	Range:7c0
+	Report: vfloatta.wav
+	Projectile: LaserZap
+		Width: 50
+		Duration: 15
+		Color: aa7990
+		UsePlayerColor: false
+	Warhead@1Dam: SpreadDamage
+		Damage: 25 
+		DamageTypes: RadiationDeath
+	Warhead@2Eff: CreateEffect
+		-Explosions: 
+		-ImpactSounds: 
+	Warhead@3EffWater: CreateEffect
+		-Explosions:
+		-ImpactSounds:
+	Warhead@4Smu: LeaveSmudge
+		-SmudgeType:
+
+DiskDrain:
+	Inherits: Comet
+	ReloadDelay: 50
+	Range:1c256
+	Projectile: LaserZap
+		Width: 50
+		Duration: 15
+		Color: aa7990
+		UsePlayerColor: false
+	Report: bsenatta.wav, bsenattb.wav, bsenattc.wav, bsenattd.wav
+	Warhead@1Dam: SpreadDamage
+		Damage: 25 
+		DamageTypes: RadiationDeath
+	Warhead@2Eff: CreateEffect
+		-Explosions: 
+		-ImpactSounds: 
+	Warhead@3EffWater: CreateEffect
+		-Explosions:
+		-ImpactSounds:
+	Warhead@4Smu: LeaveSmudge
+		-SmudgeType:
 
 RadBeamWeapon:
 	ValidTargets: Ground