OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

All Mortal Rifle base models done. Animation next.

Browse source
This commit is contained in:
Mari the Deer 2022-09-07 19:46:56 +02:00
commit 1efaf7a6f9
344 changed files with 173 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

18
zscript/dlc1/swwm_ammoitems_dlc.zsc
View file

@ -302,6 +302,8 @@ Class MisterRound : MagAmmo
Inventory.MaxAmount 20;
+FLOATBOB;
FloatBobStrength 0.25;
Radius .5;
Height 20;
}
States
{
@ -315,6 +317,7 @@ Class MisterRound2 : MisterRound
Default
{
Inventory.Amount 2;
Radius .75;
}
}
Class MisterRound3 : MisterRound
@ -322,6 +325,7 @@ Class MisterRound3 : MisterRound
Default
{
Inventory.Amount 3;
Radius 1;
}
}
Class MisterRound5 : MisterRound
@ -329,6 +333,7 @@ Class MisterRound5 : MisterRound
Default
{
Inventory.Amount 5;
Radius 1.25;
}
}
Class MisterRound10 : MisterRound
@ -336,6 +341,7 @@ Class MisterRound10 : MisterRound
Default
{
Inventory.Amount 10;
Radius 1.5;
}
}
@ -355,6 +361,8 @@ Class MisterAmmo : SWWMAmmo
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
Radius 4;
Height 23;
}
States
{
@ -379,6 +387,8 @@ Class MisterGAmmo : SWWMAmmo
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
Radius 4;
Height 21;
}
States
{
@ -392,13 +402,7 @@ Class MisterGAmmo2 : MisterGAmmo
Default
{
Inventory.Amount 2;
}
}
Class MisterGAmmo3 : MisterGAmmo
{
Default
{
Inventory.Amount 3;
Radius 5;
}
}

2
zscript/items/swwm_ammospawn.zsc
View file

@ -273,7 +273,7 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
{
bool aex = SWWMUtility.ItemExists('CandyGun',ownedonly:enemydrop),
bex = SWWMUtility.ItemExists('MisterRifle',ownedonly:enemydrop);
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return !Random[Replacements](0,2)?'MisterGAmmo2':Random[Replacements](0,2)?'MisterRound10':'MisterAmmo';
if ( aex ) return Random[Replacements](0,3)?'CandyGunBullets3':'CandyGunAmmo';
}
bool aex = SWWMUtility.ItemExists('Sparkster',ownedonly:enemydrop),