diff --git a/language.version b/language.version index d9b7d8334..d3613d57b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r339 \cu(Thu 18 Aug 00:00:10 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r339 \cu(2022-08-18 00:00:10)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r340 \cu(Thu 18 Aug 08:53:39 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r340 \cu(2022-08-18 08:53:39)\c-"; diff --git a/modeldef.quadravol b/modeldef.quadravol index afba2dba9..fe944155e 100644 --- a/modeldef.quadravol +++ b/modeldef.quadravol @@ -1,3 +1,19 @@ +Model "QuadravolCasing" +{ + Path "models" + + Model 0 "QuadravolCasing_d.3d" + Skin 0 "QuadCell_Used.png" + Scale 0.02 0.02 0.02 + AngleOffset -90 + USEACTORPITCH + USEACTORROLL + + FrameIndex XZW1 A 0 0 + ZOffset 1 + FrameIndex XZW1 B 0 0 +} + Model "Quadravol" { Path "models" diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index 9d97fce58..4df58fbd8 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -58,7 +58,7 @@ Model "SheenCasing" USEACTORROLL FrameIndex XZW1 A 0 0 - ZOffset 0.5 + ZOffset 0.75 FrameIndex XZW1 B 0 0 } diff --git a/models/QuadCell_Used.png b/models/QuadCell_Used.png index 152afc051..123cf2f7b 100644 Binary files a/models/QuadCell_Used.png and b/models/QuadCell_Used.png differ diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index fd625ba76..3b1b10463 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -121,7 +121,11 @@ Class Quadravol : SWWMWeapon Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),-8*x+8*y-16*z); if ( invoker.wascharged ) { - Console.Printf("\cg// TODO - Drop Casing\c-"); + let c = Spawn("QuadravolCasing",origin); + c.angle = angle; + c.pitch = pitch-90; + c.vel = x*FRandom[Junk](-2.5,-1.5)+y*FRandom[Junk](.5,1.)-(0,0,FRandom[Junk](2.,5.)); + c.vel += vel*.5; return; } if ( invoker.Ammo1.Amount >= invoker.Ammo1.MaxAmount ) diff --git a/zscript/dlc1/swwm_notashotgun_fx.zsc b/zscript/dlc1/swwm_notashotgun_fx.zsc index d38c800c9..ec6cd4f6c 100644 --- a/zscript/dlc1/swwm_notashotgun_fx.zsc +++ b/zscript/dlc1/swwm_notashotgun_fx.zsc @@ -1,5 +1,18 @@ // Quadravol projectiles and effects +Class QuadravolCasing : SWWMCasing +{ + Default + { + BounceSound "quadshot/casing"; + } + override void PostBeginPlay() + { + Super.PostBeginPlay(); + heat = 0; + } +} + Class OnFireLight : PointLightFlickerRandomAttenuated { OnFire of;