OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Consistently declare damagetypes as names.

Browse source
This commit is contained in:
Mari the Deer 2023-11-28 11:23:44 +01:00
commit a9b69e37f0
14 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
damtypes.txt
View file

@ -39,7 +39,7 @@ Sniped MiniBrass
Jet MiniWhite Jet MiniWhite
Dyratin MiniGrass Dyratin MiniGrass
Candy MiniPink Candy MiniPink
Mortal MiniCyanblu CoAb44 MiniCyanblu
Ynykron MiniPurb Ynykron MiniPurb
YnykronAlt MiniPurb YnykronAlt MiniPurb
Kabbadon MiniKabbadon Kabbadon MiniKabbadon

4
language.version
View file

@ -1,3 +1,3 @@
[default] [default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1028 \cu(Tue 28 Nov 11:23:31 CET 2023)\c-"; SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1029 \cu(Tue 28 Nov 11:23:44 CET 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r1028 \cu(2023-11-28 11:23:31)\c-"; SWWM_SHORTVER="\cw1.3pre r1029 \cu(2023-11-28 11:23:44)\c-";

2
zscript/dlc1/swwm_heavymahsheengun_fx.zsc
View file

@ -39,7 +39,7 @@ Class SheenTrail : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SHEENHMG"; Obituary "$O_SHEENHMG";
DamageType "Fire"; DamageType 'Fire';
+INTERPOLATEANGLES; +INTERPOLATEANGLES;
+FORCERADIUSDMG; +FORCERADIUSDMG;
+NODAMAGETHRUST; +NODAMAGETHRUST;

2
zscript/dlc1/swwm_mister.zsc
View file

@ -831,7 +831,7 @@ Class MisterRifle : SWWMWeapon
{ {
SWWMUtility.DoKnockback(mrt.HitList[i].HitActor,mrt.HitList[i].x+(0,0,0.025),80000); 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); 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) ) if ( !mrt.HitList[i].HitActor || (mrt.HitList[i].HitActor.Health <= 0) )
mrc.nkill++; mrc.nkill++;
} }

12
zscript/dlc1/swwm_mister_fx.zsc
View file

@ -177,7 +177,7 @@ Class MisterFuzzy : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_MORTALRIFLE"; Obituary "$O_MORTALRIFLE";
DamageType "Mortal"; DamageType 'CoAb44';
RenderStyle "Add"; RenderStyle "Add";
+NODAMAGETHRUST; +NODAMAGETHRUST;
+FORCERADIUSDMG; +FORCERADIUSDMG;
@ -305,7 +305,7 @@ Class MisterPop : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_MORTALRIFLE"; Obituary "$O_MORTALRIFLE";
DamageType "Mortal"; DamageType 'CoAb44';
RenderStyle "Add"; RenderStyle "Add";
Scale .2; Scale .2;
+FORCEXYBILLBOARD; +FORCEXYBILLBOARD;
@ -347,7 +347,7 @@ Class MisterBulletImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_MORTALRIFLE"; Obituary "$O_MORTALRIFLE";
DamageType "Mortal"; DamageType 'CoAb44';
RenderStyle "Add"; RenderStyle "Add";
Scale 1.5; Scale 1.5;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -797,7 +797,7 @@ Class MisterRailHit : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_MORTALRIFLE"; Obituary "$O_MORTALRIFLE";
DamageType 'Mortal'; DamageType 'CoAb44';
+FORCERADIUSDMG; +FORCERADIUSDMG;
+FOILINVUL; +FOILINVUL;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -857,7 +857,7 @@ Class MisterRailBeam : SWWMNonInteractiveActor
if ( !hit.hitactor ) continue; if ( !hit.hitactor ) continue;
SWWMUtility.DoKnockback(hit.hitactor,hit.x,12000); SWWMUtility.DoKnockback(hit.hitactor,hit.x,12000);
let p = SWWMPuff.Setup(hit.hitlocation,hit.x,self,target,hit.hitactor); 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)) ) if ( mrc && (!hit.hitactor || (hit.hitactor.Health <= 0)) )
mrc.nkill++; mrc.nkill++;
} }
@ -948,7 +948,7 @@ Class MisterGrenade : Actor
Default Default
{ {
Obituary "$O_MORTALRIFLEALT"; Obituary "$O_MORTALRIFLEALT";
DamageType 'Mortal'; DamageType 'CoAb44';
Radius 3; Radius 3;
Height 6; Height 6;
Speed 40; Speed 40;

2
zscript/dlc1/swwm_notashotgun_fx.zsc
View file

@ -315,7 +315,7 @@ Class QuadProj : Actor
Default Default
{ {
Obituary "$O_QUADRAVOL"; Obituary "$O_QUADRAVOL";
DamageType "Fire"; DamageType 'Fire';
Scale .5; Scale .5;
Radius 6; Radius 6;
Height 6; Height 6;

4
zscript/items/swwm_miscitems.zsc
View file

@ -502,7 +502,7 @@ Class SaltImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SALTSHOT"; Obituary "$O_SALTSHOT";
DamageType "Salt"; DamageType 'Salt';
RenderStyle "Add"; RenderStyle "Add";
Scale 1.8; Scale 1.8;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -568,7 +568,7 @@ Class SaltBeam : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SALTSHOT"; Obituary "$O_SALTSHOT";
DamageType "Salt"; DamageType 'Salt';
RenderStyle "Add"; RenderStyle "Add";
Stamina 9; Stamina 9;
Speed 32; Speed 32;

2
zscript/items/swwm_powerups_vip.zsc
View file

@ -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 ) override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive, Actor inflictor, Actor source, int flags )
{ {
if ( passive || (damage <= 0) ) return; 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) // max cap is the closest combination of 4s smaller than (2^31-1)
if ( damage > 44444444 ) newdamage = 444444444; if ( damage > 44444444 ) newdamage = 444444444;

4
zscript/weapons/swwm_deathlydeathcannon_altfx.zsc
View file

@ -326,7 +326,7 @@ Class YnykronLightningImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_YNYKRONALT"; Obituary "$O_YNYKRONALT";
DamageType "Electric"; DamageType 'Electric';
+FOILINVUL; +FOILINVUL;
+FORCERADIUSDMG; +FORCERADIUSDMG;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -857,7 +857,7 @@ Class YnykronSingularityExplosion : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_YNYKRONALT"; Obituary "$O_YNYKRONALT";
DamageType "YnykronAlt"; DamageType 'YnykronAlt';
RenderStyle "Add"; RenderStyle "Add";
Scale 5.; Scale 5.;
+NODAMAGETHRUST; +NODAMAGETHRUST;

4
zscript/weapons/swwm_deathlydeathcannon_fx.zsc
View file

@ -318,7 +318,7 @@ Class YnykronImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_YNYKRON"; Obituary "$O_YNYKRON";
DamageType "Ynykron"; DamageType 'Ynykron';
RenderStyle "Add"; RenderStyle "Add";
Scale 5.; Scale 5.;
+FORCEXYBILLBOARD; +FORCEXYBILLBOARD;
@ -822,7 +822,7 @@ Class YnykronBeam : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_YNYKRON"; Obituary "$O_YNYKRON";
DamageType "Ynykron"; DamageType 'Ynykron';
RenderStyle "Add"; RenderStyle "Add";
Alpha .4; Alpha .4;
Speed 128; Speed 128;

6
zscript/weapons/swwm_shot_fx.zsc
View file

@ -85,7 +85,7 @@ Class GoldenImpact : SWWMNonInteractiveActor
{ {
Default Default
{ {
DamageType "Explodium"; DamageType 'Explodium';
RenderStyle "Add"; RenderStyle "Add";
Scale 8.; Scale 8.;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -187,7 +187,7 @@ Class GoldenSubImpact : SWWMNonInteractiveActor
{ {
Default Default
{ {
DamageType "Explodium"; DamageType 'Explodium';
RenderStyle "Add"; RenderStyle "Add";
Scale 6.; Scale 6.;
Alpha .8; Alpha .8;
@ -285,7 +285,7 @@ Class GoldenSubSubImpact : SWWMNonInteractiveActor
{ {
Default Default
{ {
DamageType "Explodium"; DamageType 'Explodium';
RenderStyle "Add"; RenderStyle "Add";
Scale 3.; Scale 3.;
Alpha .6; Alpha .6;

12
zscript/weapons/swwm_sparkyboi_fx.zsc
View file

@ -353,7 +353,7 @@ Class BigBiospark : Actor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
RenderStyle "Add"; RenderStyle "Add";
Health 1200; Health 1200;
Radius 2; Radius 2;
@ -399,7 +399,7 @@ Class BiosparkBall : Actor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
RenderStyle "Add"; RenderStyle "Add";
Radius 2; Radius 2;
Height 4; Height 4;
@ -666,7 +666,7 @@ Class BiosparkBeamImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
RenderStyle "Add"; RenderStyle "Add";
+FOILINVUL; +FOILINVUL;
+FORCERADIUSDMG; +FORCERADIUSDMG;
@ -790,7 +790,7 @@ Class BiosparkComboImpactSub : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
RenderStyle "Add"; RenderStyle "Add";
Scale 1.4; Scale 1.4;
Alpha .4; Alpha .4;
@ -818,7 +818,7 @@ Class BiosparkComboImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
RenderStyle "Add"; RenderStyle "Add";
Scale 2.; Scale 2.;
+FOILINVUL; +FOILINVUL;
@ -1496,7 +1496,7 @@ Class BiosparkCore : Actor
Default Default
{ {
Obituary "$O_SPARKSTER"; Obituary "$O_SPARKSTER";
DamageType "Biospark"; DamageType 'Biospark';
PROJECTILE; PROJECTILE;
BounceType "Hexen"; BounceType "Hexen";
+CANBOUNCEWATER; +CANBOUNCEWATER;

6
zscript/weapons/swwm_splode_fx.zsc
View file

@ -35,7 +35,7 @@ Class ExplodiumMagArm : Actor
Default Default
{ {
Obituary "$O_EXPLODIUM"; Obituary "$O_EXPLODIUM";
DamageType "Explodium"; DamageType 'Explodium';
PROJECTILE; PROJECTILE;
+THRUACTORS; +THRUACTORS;
+BOUNCEONWALLS; +BOUNCEONWALLS;
@ -110,7 +110,7 @@ Class ExplodiumMagProj : Actor
Default Default
{ {
Obituary "$O_EXPLODIUM"; Obituary "$O_EXPLODIUM";
DamageType "Explodium"; DamageType 'Explodium';
Radius 2; Radius 2;
Height 4; Height 4;
Gravity 0.5; Gravity 0.5;
@ -490,7 +490,7 @@ Class ExplodiumBulletImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_EXPLODIUM"; Obituary "$O_EXPLODIUM";
DamageType "Explodium"; DamageType 'Explodium';
RenderStyle "Add"; RenderStyle "Add";
Scale 1.2; Scale 1.2;
+NODAMAGETHRUST; +NODAMAGETHRUST;

10
zscript/weapons/swwm_tastytreat_fx.zsc
View file

@ -176,7 +176,7 @@ Class CandyPop : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_CANDYGUN"; Obituary "$O_CANDYGUN";
DamageType "Candy"; DamageType 'Candy';
RenderStyle "Add"; RenderStyle "Add";
Scale 2.; Scale 2.;
+NODAMAGETHRUST; +NODAMAGETHRUST;
@ -293,7 +293,7 @@ Class CandyMagArm : Actor
Default Default
{ {
Obituary "$O_CANDYGUN"; Obituary "$O_CANDYGUN";
DamageType "Candy"; DamageType 'Candy';
PROJECTILE; PROJECTILE;
+THRUACTORS; +THRUACTORS;
+BOUNCEONWALLS; +BOUNCEONWALLS;
@ -451,7 +451,7 @@ Class CandyGunProj : Actor
Default Default
{ {
Obituary "$O_CANDYGUN"; Obituary "$O_CANDYGUN";
DamageType "Candy"; DamageType 'Candy';
Radius 3; Radius 3;
Height 6; Height 6;
Gravity 0.5; Gravity 0.5;
@ -591,7 +591,7 @@ Class CandyMagProj : Actor
Default Default
{ {
Obituary "$O_CANDYGUN"; Obituary "$O_CANDYGUN";
DamageType "Candy"; DamageType 'Candy';
Radius 2; Radius 2;
Height 4; Height 4;
Gravity 0.5; Gravity 0.5;
@ -724,7 +724,7 @@ Class CandyBulletImpact : SWWMNonInteractiveActor
Default Default
{ {
Obituary "$O_CANDYGUN"; Obituary "$O_CANDYGUN";
DamageType "Candy"; DamageType 'Candy';
RenderStyle "Add"; RenderStyle "Add";
Scale 2.5; Scale 2.5;
+NODAMAGETHRUST; +NODAMAGETHRUST;