OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Player and base weapons converted to IQM. Gestures are next.

Browse source
This commit is contained in:
Mari the Deer 2023-02-27 23:54:59 +01:00
commit 033bd2f824
139 changed files with 291 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zscript/dlc1/swwm_hammertime.zsc
View file

@ -212,7 +212,6 @@ Class ItamexHammer : SWWMWeapon
Obituary "$O_HAMMER";
SWWMWeapon.Tooltip "$TT_HAMMER";
SWWMWeapon.GetLine "getitamexhammer";
SWWMWeapon.BobFactor 1., .0001;
Weapon.SlotNumber 1;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 1200;

1
zscript/dlc1/swwm_heavymahsheengun.zsc
View file

@ -343,7 +343,6 @@ Class HeavyMahSheenGun : SWWMWeapon
Obituary "$O_SHEENHMG";
SWWMWeapon.Tooltip "$TT_SHEENHMG";
SWWMWeapon.GetLine "getheavymahsheengun";
SWWMWeapon.BobFactor 1., .0001;
Weapon.UpSound "sheen/select";
Weapon.SlotNumber 5;
Weapon.SlotPriority 2.;

1
zscript/dlc1/swwm_mister.zsc
View file

@ -1205,7 +1205,6 @@ Class MisterRifle : SWWMWeapon
Obituary "$O_MORTALRIFLE";
SWWMWeapon.Tooltip "$TT_MORTALRIFLE";
SWWMWeapon.GetLine "getmortalrifle";
SWWMWeapon.BobFactor 1., .0001;
Weapon.SlotNumber 9;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 850;

1
zscript/dlc1/swwm_notashotgun.zsc
View file

@ -415,7 +415,6 @@ Class Quadravol : SWWMWeapon
Obituary "$O_QUADRAVOL";
SWWMWeapon.Tooltip "$TT_QUADRAVOL";
SWWMWeapon.GetLine "getquadravol";
SWWMWeapon.BobFactor 1., .0001;
Weapon.SlotNumber 6;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 650;

2
zscript/weapons/swwm_baseweapon.zsc
View file

@ -706,7 +706,7 @@ Class SWWMWeapon : Weapon abstract
Weapon.SlotPriority 1.;
Inventory.RestrictedTo "Demolitionist";
Inventory.PickupFlash "SWWMRedPickupFlash";
SWWMWeapon.BobFactor 1., 1.;
SWWMWeapon.BobFactor 1., .0001;
+INVENTORY.IGNORESKILL;
+WEAPON.NOALERT;
+WEAPON.NODEATHINPUT;

5
zscript/weapons/swwm_blazeit.zsc
View file

@ -209,8 +209,9 @@ Class Hellblazer : SWWMWeapon
action void A_UpdatePickup()
{
// if not initialized, default to 3 loaded rockets
if ( !invoker.bInitialized ) frame = 3;
else frame = 6-invoker.clipcount;
int loaded = invoker.bInitialized?invoker.clipcount:3;
for ( int i=0; i<6; i++ )
A_ChangeModel("",0,"","",2+i,"models",(i>=loaded)?"":"HellblazerMissile.png",CMDL_USESURFACESKIN,-1);
}
action void A_CheckLockOn()

6
zscript/weapons/swwm_cbt.zsc
View file

@ -327,8 +327,8 @@ Class Wallbuster : SWWMWeapon
while ( gidx > 4 ) gidx -= 5;
idx = gidx+group*5;
if ( !invoker.loaded[idx] ) A_ChangeModel("",1,"","",4+i,"models","",CMDL_USESURFACESKIN,-1);
else if ( invoker.fired[idx] ) A_ChangeModel("",1,"","",4+i,"models","ShellNormal_Used.png",CMDL_USESURFACESKIN,-1);
else A_ChangeModel("",1,"","",4+i,"models","ShellNormal.png",CMDL_USESURFACESKIN,-1);
else if ( invoker.fired[idx] ) A_ChangeModel("",1,"","",4+i,"models","Shell_Normal_Used.png",CMDL_USESURFACESKIN,-1);
else A_ChangeModel("",1,"","",4+i,"models","Shell_Normal.png",CMDL_USESURFACESKIN,-1);
}
A_StartSound("wallbuster/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
}
@ -348,7 +348,7 @@ Class Wallbuster : SWWMWeapon
while ( gidx > 4 ) gidx -= 5;
idx = gidx+group*5;
if ( !invoker.loaded[idx] ) A_ChangeModel("",1,"","",4+i,"models","",CMDL_USESURFACESKIN,-1);
else A_ChangeModel("",1,"","",4+i,"models","ShellNormal.png",CMDL_USESURFACESKIN,-1);
else A_ChangeModel("",1,"","",4+i,"models","Shell_Normal.png",CMDL_USESURFACESKIN,-1);
}
A_StartSound("wallbuster/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
}

11
zscript/weapons/swwm_splode.zsc
View file

@ -380,7 +380,7 @@ Class ExplodiumGun : SWWMWeapon
XZW2 I 1;
XZW2 J 1
{
int layer = PSP_WEAPON+1;
int layer = PSP_WEAPON+2;
while ( player.FindPSprite(layer) ) layer++;
A_Overlay(layer,"Casing");
}
@ -392,7 +392,7 @@ Class ExplodiumGun : SWWMWeapon
XZWA K 1;
XZWA L 1
{
int layer = PSP_WEAPON+1;
int layer = PSP_WEAPON+2;
while ( player.FindPSprite(layer) ) layer++;
A_Overlay(layer,"Casing");
}
@ -520,12 +520,17 @@ Class ExplodiumGun : SWWMWeapon
Goto Ready;
CheckBullet:
XZW2 A 1;
XZW7 ABCDE 1;
XZW7 A 1 A_Overlay(PSP_WEAPON+1,"CheckBulletCasing");
XZW7 BCDE 1;
XZW7 F 1 A_StartSound("explodium/slideback",CHAN_WEAPON,CHANF_OVERLAP);
XZW7 GHIJKLMNOP 1;
XZW7 Q 1 A_StartSound("explodium/slideforward",CHAN_WEAPON,CHANF_OVERLAP);
XZW7 RS 1;
Goto Ready;
CheckBulletCasing:
XZWC QRSTUVWXYZ 1;
XZWD ABCDEFGHI 1;
Stop;
User1:
XZW2 A 1;
XZW7 TU 1;

10
zscript/weapons/swwm_tastytreat.zsc
View file

@ -438,7 +438,7 @@ Class CandyGun : SWWMWeapon
XZW2 I 1;
XZW2 J 1
{
int layer = PSP_WEAPON+1;
int layer = PSP_WEAPON+2;
while ( player.FindPSprite(layer) ) layer++;
A_Overlay(layer,"Casing");
}
@ -450,7 +450,7 @@ Class CandyGun : SWWMWeapon
XZWC K 1;
XZWC L 1
{
int layer = PSP_WEAPON+1;
int layer = PSP_WEAPON+2;
while ( player.FindPSprite(layer) ) layer++;
A_Overlay(layer,"Casing");
}
@ -630,12 +630,16 @@ Class CandyGun : SWWMWeapon
Goto Ready;
CheckBullet:
XZW2 A 1;
XZW7 ABCDE 1;
XZW7 A 1 A_Overlay(PSP_WEAPON+1,"CheckBulletCasing");
XZW7 BCDE 1;
XZW7 F 1 A_StartSound("explodium/slideback",CHAN_WEAPON,CHANF_OVERLAP);
XZW7 GHIJKLMNOP 1;
XZW7 Q 1 A_StartSound("explodium/slideforward",CHAN_WEAPON,CHANF_OVERLAP);
XZW7 RS 1;
Goto Ready;
CheckBulletCasing:
XZWF BCDEFGHIJKLMNOPQRST 1;
Stop;
User1:
XZW2 A 1;
XZW7 TU 1;