Oh yeah, ammo pickups for it too.

This commit is contained in:
Mari the Deer 2020-01-30 03:49:00 +01:00
commit 22aaebc398
4 changed files with 37 additions and 7 deletions

View file

@ -745,18 +745,18 @@ T_HELLCLUSTERS = "Hellblazer Crackshots";
T_HELLBURNINATORS = "Hellblazer Ravagers";
T_HELLNUKES = "Hellblazer Warheads";
T_SPARKUNIT = "Sparkster Charge";
T_XSBBULLET = "1.150 XSB Bullet";
T_XSBMAG = "1.150 XSB Magazine";
T_CANDYMAG = "Candygun Magazine";
T_CANDYMAG = "Candy Gun Magazine";
T_CANDYSPARE = "Candy Gun Spare";
T_YNYKRONAMMO = "Exotic Crystal";
T_BLASTSUIT = "Blast Suit";
T_EMBIGGENER = "Hammerspace Embiggener";
T_FABRICATOR = "Ammo Fabricator";
T_LOOTBOX = "Chancebox";
T_TIER1 = "(Common Tier)";
T_TIER2 = "(Rare Tier)";
T_TIER3 = "(Very Rare Tier)";
T_TIER4 = "(Gold Tier)";
T_TIER1 = "(Common)";
T_TIER2 = "(Rare)";
T_TIER3 = "(Very Rare)";
T_TIER4 = "(Super Rare)";
T_GHOSTARTI = "Ghost Artifact";
T_GRAVITYS = "Gravity Suppressor";
T_TETRAHEALTH = "Health Tetrahedron";

View file

@ -94,6 +94,20 @@ Model "TinyCandyBeam"
FrameIndex XZW1 A 0 0
}
Model "CandyGunAmmo"
{
Path "models"
Model 0 "ExplodiumMag_d.3d"
Skin 0 "CandyGun.png"
Scale 0.03 0.03 0.03
PitchOffset 30
ZOffset 16
ROTATING
FrameIndex XZW1 A 0 0
}
Model "CandyGun"
{
Path "models"

View file

@ -380,10 +380,20 @@ Class CandyGunAmmo : Ammo
{
Default
{
Tag "$T_CANDYMAG";
Inventory.PickupMessage "$T_CANDYMAG";
Stamina 80000;
Inventory.Amount 1;
Inventory.MaxAmount 8;
Ammo.BackpackAmount 0;
+FLOATBOB;
FloatBobStrength 0.25;
}
States
{
Spawn:
XZW1 A -1;
Stop;
}
}
@ -391,6 +401,7 @@ Class CandyGunSpares : Ammo
{
Default
{
Tag "$T_CANDYSPARE";
Stamina 150000;
Inventory.Amount 1;
Inventory.MaxAmount 4;

View file

@ -1172,10 +1172,15 @@ Class SWWMHandler : EventHandler
if ( (e.Replacee is 'Pistol') || (e.Replacee is 'GoldWand') || (e.Replacee is 'FWeapFist') || (e.Replacee is 'CWeapMace') || (e.Replacee is 'MWeapWand') ) e.Replacement = 'ExplodiumGun';
else if ( (e.Replacee is 'BFG9000') || (e.Replacee is 'Mace') )
{
/*if ( Random[Replacements](0,1) ) e.Replacement = 'Ynykron';
/*if ( !Random[Replacements](0,2) ) e.Replacement = 'Ynykron';
else */e.Replacement = 'CandyGun';
}
else if ( e.Replacee is 'MWeaponPiece1' ) e.Replacement = 'CandyGun';
else if ( (e.Replacee == 'CellPack') || (e.Replacee == 'SkullRodHefty') )
{
/*if ( Random[Replacements](0,2) ) e.Replacement = 'SilverBulletAmmo';
else */e.Replacement = 'CandyGunAmmo';
}
}
override void NetworkProcess( ConsoleEvent e )