OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Mortal Rifle grenades should only have single pickups.

Browse source
This commit is contained in:
Mari the Deer 2022-09-20 22:48:48 +02:00
commit db9f61c3c9
12 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r487 \cu(Tue 20 Sep 21:08:07 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r487 \cu(2022-09-20 21:08:07)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r488 \cu(Tue 20 Sep 22:48:48 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r488 \cu(2022-09-20 22:48:48)\c-";

14
modeldef.dlcammo
View file

@ -365,7 +365,7 @@ Model "MisterGAmmo"
{
Path "models"
Model 0 "MortalGrenadeAmmo1_d.3d"
Model 0 "MortalGrenadeAmmo_d.3d"
Skin 0 "MortalGrenade.png"
Scale 0.03 0.03 0.03
ZOffset 16
@ -375,18 +375,6 @@ Model "MisterGAmmo"
FrameIndex XZW1 A 0 0
}
Model "MisterGAmmo2"
{
Path "models"
Model 0 "MortalGrenadeAmmo2_d.3d"
Skin 0 "MortalGrenade.png"
Scale 0.03 0.03 0.03
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
Model "UltimatePod"
{

BIN
models/MortalGrenadeAmmo2_a.3d
View file

Binary file not shown.

BIN
models/MortalGrenadeAmmo2_d.3d
View file

Binary file not shown.

0
models/MortalGrenadeAmmo1_a.3d → models/MortalGrenadeAmmo_a.3d
View file

0
models/MortalGrenadeAmmo1_d.3d → models/MortalGrenadeAmmo_d.3d
View file

BIN
sounds/dlc1/mister/mr_held_over.ogg Normal file
View file

Binary file not shown.

BIN
sounds/dlc1/mister/mr_hitg11.ogg
View file

Binary file not shown.

BIN
sounds/dlc1/mister/mr_hitg12.ogg
View file

Binary file not shown.

BIN
sounds/dlc1/mister/mr_hitg13.ogg
View file

Binary file not shown.

8
zscript/dlc1/swwm_ammoitems_dlc.zsc
View file

@ -391,14 +391,6 @@ Class MisterGAmmo : SWWMAmmo
Stop;
}
}
Class MisterGAmmo2 : MisterGAmmo
{
Default
{
Inventory.Amount 2;
Radius 3;
}
}
Class UltimatePod : MagAmmo
{

4
zscript/items/swwm_ammospawn.zsc
View file

@ -231,7 +231,7 @@ Class SWWMCellAmmoSmall : 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)?'MisterGAmmo':Random[Replacements](0,2)?'MisterRound':'MisterRound2';
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return Random[Replacements](0,1)?'MisterRound':'MisterRound2';
if ( aex ) return 'CandyGunBullets';
}
if ( Random[Replacements](0,1) )
@ -262,7 +262,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)?'MisterGAmmo2':Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( (!aex && bex) || (Random[Replacements](0,1) && bex) ) return !Random[Replacements](0,2)?'MisterGAmmo':Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( aex ) return Random[Replacements](0,2)?'CandyGunBullets3':'CandyGunAmmo';
}
if ( Random[Replacements](0,1) )