diff --git a/damtypes.txt b/damtypes.txt index 71989a847..a0045baf2 100644 --- a/damtypes.txt +++ b/damtypes.txt @@ -39,7 +39,7 @@ Sniped MiniBrass Jet MiniWhite Dyratin MiniGrass Candy MiniPink -Mortal MiniCyanblu +CoAb44 MiniCyanblu Ynykron MiniPurb YnykronAlt MiniPurb Kabbadon MiniKabbadon diff --git a/language.version b/language.version index ed7405a53..9e46c89c6 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1028 \cu(Tue 28 Nov 11:23:31 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1028 \cu(2023-11-28 11:23:31)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1029 \cu(Tue 28 Nov 11:23:44 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1029 \cu(2023-11-28 11:23:44)\c-"; diff --git a/zscript/dlc1/swwm_heavymahsheengun_fx.zsc b/zscript/dlc1/swwm_heavymahsheengun_fx.zsc index dceb982dd..13aebf8bb 100644 --- a/zscript/dlc1/swwm_heavymahsheengun_fx.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun_fx.zsc @@ -39,7 +39,7 @@ Class SheenTrail : SWWMNonInteractiveActor Default { Obituary "$O_SHEENHMG"; - DamageType "Fire"; + DamageType 'Fire'; +INTERPOLATEANGLES; +FORCERADIUSDMG; +NODAMAGETHRUST; diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 14fc520b8..b5f0d476a 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -831,7 +831,7 @@ Class MisterRifle : SWWMWeapon { SWWMUtility.DoKnockback(mrt.HitList[i].HitActor,mrt.HitList[i].x+(0,0,0.025),80000); let p = SWWMPuff.Setup(mrt.HitList[i].HitLocation,mrt.HitList[i].x,invoker,self,mrt.HitList[i].HitActor); - mrt.HitList[i].HitActor.DamageMobj(p,self,4444,'Mortal',DMG_FOILINVUL|DMG_THRUSTLESS|DMG_INFLICTOR_IS_PUFF); + mrt.HitList[i].HitActor.DamageMobj(p,self,4444,'CoAb44',DMG_FOILINVUL|DMG_THRUSTLESS|DMG_INFLICTOR_IS_PUFF); if ( !mrt.HitList[i].HitActor || (mrt.HitList[i].HitActor.Health <= 0) ) mrc.nkill++; } diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index f9ed77f88..1d0ca88a8 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -177,7 +177,7 @@ Class MisterFuzzy : SWWMNonInteractiveActor Default { Obituary "$O_MORTALRIFLE"; - DamageType "Mortal"; + DamageType 'CoAb44'; RenderStyle "Add"; +NODAMAGETHRUST; +FORCERADIUSDMG; @@ -305,7 +305,7 @@ Class MisterPop : SWWMNonInteractiveActor Default { Obituary "$O_MORTALRIFLE"; - DamageType "Mortal"; + DamageType 'CoAb44'; RenderStyle "Add"; Scale .2; +FORCEXYBILLBOARD; @@ -347,7 +347,7 @@ Class MisterBulletImpact : SWWMNonInteractiveActor Default { Obituary "$O_MORTALRIFLE"; - DamageType "Mortal"; + DamageType 'CoAb44'; RenderStyle "Add"; Scale 1.5; +NODAMAGETHRUST; @@ -797,7 +797,7 @@ Class MisterRailHit : SWWMNonInteractiveActor Default { Obituary "$O_MORTALRIFLE"; - DamageType 'Mortal'; + DamageType 'CoAb44'; +FORCERADIUSDMG; +FOILINVUL; +NODAMAGETHRUST; @@ -857,7 +857,7 @@ Class MisterRailBeam : SWWMNonInteractiveActor if ( !hit.hitactor ) continue; SWWMUtility.DoKnockback(hit.hitactor,hit.x,12000); let p = SWWMPuff.Setup(hit.hitlocation,hit.x,self,target,hit.hitactor); - hit.hitactor.DamageMobj(p,target,44,'Mortal',DMG_THRUSTLESS|DMG_INFLICTOR_IS_PUFF); + hit.hitactor.DamageMobj(p,target,44,'CoAb44',DMG_THRUSTLESS|DMG_INFLICTOR_IS_PUFF); if ( mrc && (!hit.hitactor || (hit.hitactor.Health <= 0)) ) mrc.nkill++; } @@ -948,7 +948,7 @@ Class MisterGrenade : Actor Default { Obituary "$O_MORTALRIFLEALT"; - DamageType 'Mortal'; + DamageType 'CoAb44'; Radius 3; Height 6; Speed 40; diff --git a/zscript/dlc1/swwm_notashotgun_fx.zsc b/zscript/dlc1/swwm_notashotgun_fx.zsc index aa447be69..98983efc5 100644 --- a/zscript/dlc1/swwm_notashotgun_fx.zsc +++ b/zscript/dlc1/swwm_notashotgun_fx.zsc @@ -315,7 +315,7 @@ Class QuadProj : Actor Default { Obituary "$O_QUADRAVOL"; - DamageType "Fire"; + DamageType 'Fire'; Scale .5; Radius 6; Height 6; diff --git a/zscript/items/swwm_miscitems.zsc b/zscript/items/swwm_miscitems.zsc index 5f2f27445..301b31bd1 100644 --- a/zscript/items/swwm_miscitems.zsc +++ b/zscript/items/swwm_miscitems.zsc @@ -502,7 +502,7 @@ Class SaltImpact : SWWMNonInteractiveActor Default { Obituary "$O_SALTSHOT"; - DamageType "Salt"; + DamageType 'Salt'; RenderStyle "Add"; Scale 1.8; +NODAMAGETHRUST; @@ -568,7 +568,7 @@ Class SaltBeam : SWWMNonInteractiveActor Default { Obituary "$O_SALTSHOT"; - DamageType "Salt"; + DamageType 'Salt'; RenderStyle "Add"; Stamina 9; Speed 32; diff --git a/zscript/items/swwm_powerups_vip.zsc b/zscript/items/swwm_powerups_vip.zsc index 5f6aa0799..b83ab388f 100644 --- a/zscript/items/swwm_powerups_vip.zsc +++ b/zscript/items/swwm_powerups_vip.zsc @@ -874,7 +874,7 @@ Class AngeryPower : Powerup override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive, Actor inflictor, Actor source, int flags ) { if ( passive || (damage <= 0) ) return; - if ( damageType == 'Mortal' ) // can only be in 4s + if ( damageType == 'CoAb44' ) // can only be in 4s { // max cap is the closest combination of 4s smaller than (2^31-1) if ( damage > 44444444 ) newdamage = 444444444; diff --git a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc index 92955bf49..a9c7327aa 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc @@ -326,7 +326,7 @@ Class YnykronLightningImpact : SWWMNonInteractiveActor Default { Obituary "$O_YNYKRONALT"; - DamageType "Electric"; + DamageType 'Electric'; +FOILINVUL; +FORCERADIUSDMG; +NODAMAGETHRUST; @@ -857,7 +857,7 @@ Class YnykronSingularityExplosion : SWWMNonInteractiveActor Default { Obituary "$O_YNYKRONALT"; - DamageType "YnykronAlt"; + DamageType 'YnykronAlt'; RenderStyle "Add"; Scale 5.; +NODAMAGETHRUST; diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc index 87c449694..a907313b9 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc @@ -318,7 +318,7 @@ Class YnykronImpact : SWWMNonInteractiveActor Default { Obituary "$O_YNYKRON"; - DamageType "Ynykron"; + DamageType 'Ynykron'; RenderStyle "Add"; Scale 5.; +FORCEXYBILLBOARD; @@ -822,7 +822,7 @@ Class YnykronBeam : SWWMNonInteractiveActor Default { Obituary "$O_YNYKRON"; - DamageType "Ynykron"; + DamageType 'Ynykron'; RenderStyle "Add"; Alpha .4; Speed 128; diff --git a/zscript/weapons/swwm_shot_fx.zsc b/zscript/weapons/swwm_shot_fx.zsc index 8ab5f6c3a..b448fb3b1 100644 --- a/zscript/weapons/swwm_shot_fx.zsc +++ b/zscript/weapons/swwm_shot_fx.zsc @@ -85,7 +85,7 @@ Class GoldenImpact : SWWMNonInteractiveActor { Default { - DamageType "Explodium"; + DamageType 'Explodium'; RenderStyle "Add"; Scale 8.; +NODAMAGETHRUST; @@ -187,7 +187,7 @@ Class GoldenSubImpact : SWWMNonInteractiveActor { Default { - DamageType "Explodium"; + DamageType 'Explodium'; RenderStyle "Add"; Scale 6.; Alpha .8; @@ -285,7 +285,7 @@ Class GoldenSubSubImpact : SWWMNonInteractiveActor { Default { - DamageType "Explodium"; + DamageType 'Explodium'; RenderStyle "Add"; Scale 3.; Alpha .6; diff --git a/zscript/weapons/swwm_sparkyboi_fx.zsc b/zscript/weapons/swwm_sparkyboi_fx.zsc index 8f45e3c43..e6281c427 100644 --- a/zscript/weapons/swwm_sparkyboi_fx.zsc +++ b/zscript/weapons/swwm_sparkyboi_fx.zsc @@ -353,7 +353,7 @@ Class BigBiospark : Actor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; RenderStyle "Add"; Health 1200; Radius 2; @@ -399,7 +399,7 @@ Class BiosparkBall : Actor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; RenderStyle "Add"; Radius 2; Height 4; @@ -666,7 +666,7 @@ Class BiosparkBeamImpact : SWWMNonInteractiveActor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; RenderStyle "Add"; +FOILINVUL; +FORCERADIUSDMG; @@ -790,7 +790,7 @@ Class BiosparkComboImpactSub : SWWMNonInteractiveActor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; RenderStyle "Add"; Scale 1.4; Alpha .4; @@ -818,7 +818,7 @@ Class BiosparkComboImpact : SWWMNonInteractiveActor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; RenderStyle "Add"; Scale 2.; +FOILINVUL; @@ -1496,7 +1496,7 @@ Class BiosparkCore : Actor Default { Obituary "$O_SPARKSTER"; - DamageType "Biospark"; + DamageType 'Biospark'; PROJECTILE; BounceType "Hexen"; +CANBOUNCEWATER; diff --git a/zscript/weapons/swwm_splode_fx.zsc b/zscript/weapons/swwm_splode_fx.zsc index 57f0e3ca9..5a7dd5f52 100644 --- a/zscript/weapons/swwm_splode_fx.zsc +++ b/zscript/weapons/swwm_splode_fx.zsc @@ -35,7 +35,7 @@ Class ExplodiumMagArm : Actor Default { Obituary "$O_EXPLODIUM"; - DamageType "Explodium"; + DamageType 'Explodium'; PROJECTILE; +THRUACTORS; +BOUNCEONWALLS; @@ -110,7 +110,7 @@ Class ExplodiumMagProj : Actor Default { Obituary "$O_EXPLODIUM"; - DamageType "Explodium"; + DamageType 'Explodium'; Radius 2; Height 4; Gravity 0.5; @@ -490,7 +490,7 @@ Class ExplodiumBulletImpact : SWWMNonInteractiveActor Default { Obituary "$O_EXPLODIUM"; - DamageType "Explodium"; + DamageType 'Explodium'; RenderStyle "Add"; Scale 1.2; +NODAMAGETHRUST; diff --git a/zscript/weapons/swwm_tastytreat_fx.zsc b/zscript/weapons/swwm_tastytreat_fx.zsc index ac13c10aa..fb332e4fc 100644 --- a/zscript/weapons/swwm_tastytreat_fx.zsc +++ b/zscript/weapons/swwm_tastytreat_fx.zsc @@ -176,7 +176,7 @@ Class CandyPop : SWWMNonInteractiveActor Default { Obituary "$O_CANDYGUN"; - DamageType "Candy"; + DamageType 'Candy'; RenderStyle "Add"; Scale 2.; +NODAMAGETHRUST; @@ -293,7 +293,7 @@ Class CandyMagArm : Actor Default { Obituary "$O_CANDYGUN"; - DamageType "Candy"; + DamageType 'Candy'; PROJECTILE; +THRUACTORS; +BOUNCEONWALLS; @@ -451,7 +451,7 @@ Class CandyGunProj : Actor Default { Obituary "$O_CANDYGUN"; - DamageType "Candy"; + DamageType 'Candy'; Radius 3; Height 6; Gravity 0.5; @@ -591,7 +591,7 @@ Class CandyMagProj : Actor Default { Obituary "$O_CANDYGUN"; - DamageType "Candy"; + DamageType 'Candy'; Radius 2; Height 4; Gravity 0.5; @@ -724,7 +724,7 @@ Class CandyBulletImpact : SWWMNonInteractiveActor Default { Obituary "$O_CANDYGUN"; - DamageType "Candy"; + DamageType 'Candy'; RenderStyle "Add"; Scale 2.5; +NODAMAGETHRUST;