OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Swap slots of Ray-Khom and Mortal Rifle.

Browse source
This commit is contained in:
Mari the Deer 2022-05-08 00:19:55 +02:00
commit e270e4de2c
14 changed files with 176 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

188
zscript/dlc1/swwm_ammoitems_dlc.zsc
View file

@ -310,6 +310,83 @@ Class SparksterRAmmo3 : SparksterRAmmo
}
}
Class RayBolt : MagAmmo
{
Default
{
//$Title Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Tag "$T_RAYBOLT";
MagAmmo.PickupTag "RAYBOLT";
Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png";
MagAmmo.ParentAmmo "RayAmmo";
MagAmmo.ClipSize 10;
Inventory.MaxAmount 15;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class RayBolt2 : RayBolt
{
Default
{
//$Title 2x Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Inventory.Amount 2;
}
}
Class RayBolt5 : RayBolt
{
Default
{
//$Title 5x Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Inventory.Amount 5;
}
}
Class RayAmmo : SWWMAmmo
{
Default
{
//$Title Ray-Khom Mag
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayAmmo.png
//$Icon ammo
Tag "$T_RAYAMMO";
SWWMAmmo.PickupTag "RAYAMMO";
Stamina 90000;
Inventory.Icon "graphics/HUD/Icons/A_RayAmmo.png";
Inventory.Amount 1;
Inventory.MaxAmount 3;
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 5;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "RayBolt";
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class MisterRound : MagAmmo
{
Default
@ -389,7 +466,7 @@ Class MisterAmmo : SWWMAmmo
//$Icon ammo
Tag "$T_MRAMMO";
SWWMAmmo.PickupTag "MRAMMO";
Stamina 120000;
Stamina 150000;
Inventory.Icon "graphics/HUD/Icons/A_MRAmmo.png";
Inventory.Amount 1;
Inventory.MaxAmount 2;
@ -419,7 +496,7 @@ Class MisterGAmmo : SWWMAmmo
//$Icon ammo
Tag "$T_MRGRENADE";
SWWMAmmo.PickupTag "MRGRENADE";
Stamina 90000;
Stamina 120000;
Inventory.Icon "graphics/HUD/Icons/A_MRGrenade.png";
Inventory.Amount 1;
Inventory.MaxAmount 3;
@ -460,113 +537,6 @@ Class MisterGAmmo3 : MisterGAmmo
}
}
Class RayBolt : MagAmmo
{
Default
{
//$Title Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Tag "$T_RAYBOLT";
MagAmmo.PickupTag "RAYBOLT";
Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png";
MagAmmo.ParentAmmo "RayAmmo";
MagAmmo.ClipSize 10;
Inventory.MaxAmount 15;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class RayBolt2 : RayBolt
{
Default
{
//$Title 2x Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Inventory.Amount 2;
}
}
Class RayBolt5 : RayBolt
{
Default
{
//$Title 5x Ray-Khom Bolt
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBolt.png
//$Icon ammo
Inventory.Amount 5;
}
}
Class RayAmmo : SWWMAmmo
{
Default
{
//$Title Ray-Khom Mag
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayAmmo.png
//$Icon ammo
Tag "$T_RAYAMMO";
SWWMAmmo.PickupTag "RAYAMMO";
Stamina 150000;
Inventory.Icon "graphics/HUD/Icons/A_RayAmmo.png";
Inventory.Amount 1;
Inventory.MaxAmount 3;
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 5;
Ammo.DropAmount 1;
SWWMAmmo.MagAmmoType "RayBolt";
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class RayBattery : SWWMAmmo
{
Default
{
//$Title Ray-Khom Battery
//$Group Ammo
//$Sprite graphics/HUD/Icons/A_RayBattery.png
//$Icon ammo
Tag "$T_RAYBATTERY";
SWWMAmmo.PickupTag "RAYBATTERY";
Stamina 320000;
Inventory.Icon "graphics/HUD/Icons/A_RayBattery.png";
Inventory.Amount 1;
Inventory.MaxAmount 2;
Inventory.PickupFlash "SWWMPickupFlash";
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 4;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
Accuracy 90;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
Class UltimatePod : MagAmmo
{
Default

10
zscript/dlc1/swwm_mister.zsc
View file

@ -1,5 +1,5 @@
// Plutoni Inc. Mortal Rifle (from UnSX 2)
// Slot 8, shared spawn with Silver Bullet JET
// Slot 9, spawns shared with Candygun
Class MisterRifle : SWWMWeapon
{
@ -21,18 +21,18 @@ Class MisterRifle : SWWMWeapon
SWWMWeapon.Tooltip "$TT_MORTALRIFLE";
SWWMWeapon.GetLine "getmortalrifle";
Inventory.Icon "graphics/HUD/Icons/W_MortalRifle.png";
Weapon.SlotNumber 8;
Weapon.SlotNumber 9;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 850;
Weapon.SelectionOrder 750;
Weapon.AmmoType1 "MisterAmmo";
Weapon.AmmoGive1 1;
Weapon.AmmoType2 "MisterGAmmo";
Weapon.AmmoGive2 1;
SWWMWeapon.DropAmmoType "MisterAmmo";
MisterRifle.ClipCount 30;
Stamina 500000;
Stamina 1600000;
+SWWMWEAPON.NOFIRSTGIVE;
+WEAPON.EXPLOSIVE;
+WEAPON.BFG;
}
States
{

14
zscript/dlc1/swwm_thiccbolts.zsc
View file

@ -1,5 +1,5 @@
// Kmonn Shunna Ray-Khom (from UnSX series)
// Slot 9, spawns shared with Candygun
// Slot 8, shared spawn with Silver Bullet JET
Class RayKhom : SWWMWeapon
{
@ -7,7 +7,6 @@ Class RayKhom : SWWMWeapon
bool chambered;
Property ClipCount : clipcount;
Property ClipCount2 : clipcount2;
Default
{
@ -21,21 +20,16 @@ Class RayKhom : SWWMWeapon
SWWMWeapon.Tooltip "$TT_RAYKHOM";
SWWMWeapon.GetLine "getraykhom";
Inventory.Icon "graphics/HUD/Icons/W_RayKhom.png";
Weapon.SlotNumber 9;
Weapon.SlotNumber 8;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 750;
Weapon.SelectionOrder 850;
Weapon.AmmoType1 "RayAmmo";
Weapon.AmmoGive1 1;
Weapon.AmmoType2 "RayBattery";
Weapon.AmmoGive2 0;
SWWMWeapon.DropAmmoType "RayAmmo";
RayKhom.ClipCount 20;
RayKhom.ClipCount2 500;
Stamina 1600000;
Stamina 500000;
+SWWMWEAPON.NOFIRSTGIVE;
+WEAPON.PRIMARY_USES_BOTH;
+WEAPON.EXPLOSIVE;
+WEAPON.BFG;
}
States
{

9
zscript/items/swwm_ammospawn.zsc
View file

@ -201,15 +201,14 @@ Class SWWMCellAmmoSmall : SWWMAmmoSpawner
static Class<Actor> PickAmmo( bool notondemand = false )
{
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBattery';
if ( !Random[Replacements](0,2) )
{
if ( !Random[Replacements](0,3) )
{
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBolt2';
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return 'CandyGunBullets';
}
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBolt2';
if ( notondemand || SWWMUtility.ItemExists('SilverBullet') ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2';
}
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo';
@ -231,8 +230,8 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
}
if ( Random[Replacements](0,1) )
{
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( notondemand || SWWMUtility.ItemExists('RayKhom') ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo';
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo';
if ( notondemand || SWWMUtility.ItemExists('MisterRifle') ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
}
if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('SilverBullet')) )
{