Marisa Kirisame
eb2ee7b29f
- Reduce number of collectibles (some might come back in the future).
- Merge both DLC weaponsets into one, removing redundant weapons.
- Readjust prices of some items.
- Initial work on collectibles (currently Frispy Corn is done).
- Added bigfont for main menu, based on Source Han Sans.
- Reduced default HUD margin to 10.
- Added blob shadows.
- Added precise crosshair drawing.
- Tweaked decals, imported more stuff from UT.
- Swapped the Ynykron impact decal for something better.
- Fixes to slope alignment code.
- Implemented headpats for MBF Helper Dogs and Cacodemons.
- Implemented partial HDoom support, with love and headpats.
- Fix various string functions breaking on unicode.
- Added cracktro-style text scroll to Titlemap.
- Fixed handling of healthbars for friendly monsters.
- Workaround for maps that use the old author name hack (" - by: " separator).
- Fixed Silver Bullet not autoswitching on first pickup.
- Fixed misalignment of Silver Bullet zoomed aim.
- Silver Bullet is unchambered on first pickup, consistent with Candygun.
- Adjusted collision sizes of all items across the board.
- Implemented "Use To Pickup" to work around any issues introduced by the previous change.
- Swapped CHANF_LOOPING for CHANF_LOOP in many cases, this was a typo.
- Tweaked Biospark arc lengths, for balance and higher performance.
- Fix misaligned fire offsets of some weapons (most noticeable on Wallbuster).
- Prettified the loading disclaimers for BD and HDoom.
- Add pickup flash to all items.
- Add custom key models for Doom and Heretic.
- Fix blown kisses giving you "need key" messages.
- Fix worn armor and embiggeners not being removed on scripted inventory resets.
- Remove all references to the no longer planned Radio.
- Workaround for gzdoom devbuild quirk where MenuSound changed its argument type.
- Added timezone to fake clock.
- Fix some times and dates in said clock.
- SWWM blood now also hits ceilings.
- Added default properties to DLC ammo and weapon stubs.
- Lore entries for collectibles and dlc weapons (incomplete).
- Massive amount of typo fixes across the board.
292 lines
4.6 KiB
Text
292 lines
4.6 KiB
Text
// All DLC weapon ammo pickups
|
|
|
|
Class SMW05Ammo : Ammo
|
|
{
|
|
Mixin SWWMShellAmmo;
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_SMW05BULLET";
|
|
Stamina 300;
|
|
Inventory.Icon "graphics/HUD/Icons/A_SMW05Ammo.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 120;
|
|
Ammo.BackpackAmount 6;
|
|
Ammo.DropAmount 6;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class SMW05SmallAmmo : SMW05Ammo
|
|
{
|
|
Default
|
|
{
|
|
Inventory.Amount 6;
|
|
}
|
|
}
|
|
|
|
Class SMW05BigAmmo : SMW05Ammo
|
|
{
|
|
Default
|
|
{
|
|
Inventory.Amount 30;
|
|
}
|
|
}
|
|
|
|
Class SheenAmmo : Ammo
|
|
{
|
|
Mixin SWWMShellAmmo;
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_SHEENBULLET";
|
|
Stamina 400;
|
|
Inventory.Icon "graphics/HUD/Icons/A_SheenAmmo.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 600;
|
|
Ammo.BackpackAmount 50;
|
|
Ammo.DropAmount 100;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class SheenSmallAmmo: SheenAmmo
|
|
{
|
|
Default
|
|
{
|
|
Inventory.Amount 50;
|
|
}
|
|
}
|
|
|
|
Class SheenBigAmmo : SheenAmmo
|
|
{
|
|
Default
|
|
{
|
|
Inventory.Amount 200;
|
|
}
|
|
}
|
|
|
|
Class QuadravolAmmo : Ammo
|
|
{
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_QUADAMMO";
|
|
Inventory.PickupMessage "$T_QUADAMMO";
|
|
Stamina 10000;
|
|
Inventory.Icon "graphics/HUD/Icons/A_QuadAmmo.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 6;
|
|
Ammo.BackpackAmount 1;
|
|
Ammo.DropAmount 1;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class QuadravolAmmoBundleSpawn : Actor
|
|
{
|
|
override void PostBeginPlay()
|
|
{
|
|
if ( bCOUNTSECRET ) level.total_secrets--;
|
|
int bnd = Random[Bundle](2,3);
|
|
for ( int i=0; i<3; i++ )
|
|
{
|
|
let a = Spawn("QuadravolAmmo",Vec3Angle(6,i*(360/bnd)));
|
|
a.special = special;
|
|
a.angle = i*(360/bnd);
|
|
a.FloatBobPhase = FloatBobPhase;
|
|
for ( int j=0; j<5; j++ ) a.args[j] = args[j];
|
|
if ( bCOUNTSECRET )
|
|
{
|
|
a.bCOUNTSECRET = true;
|
|
level.total_secrets++;
|
|
}
|
|
}
|
|
Destroy();
|
|
}
|
|
}
|
|
|
|
Class DarkCanister : Ammo
|
|
{
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_DARKAMMO";
|
|
Inventory.PickupMessage "$T_DARKAMMO";
|
|
Stamina 20000;
|
|
Inventory.Icon "graphics/HUD/Icons/A_DarkAmmo.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 5;
|
|
Ammo.BackpackAmount 1;
|
|
Ammo.DropAmount 1;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class EMPCore : Ammo
|
|
{
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_EMPCORE";
|
|
Inventory.PickupMessage "$T_EMPCORE";
|
|
Stamina 60000;
|
|
Inventory.Icon "graphics/HUD/Icons/A_EMPCore.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 10;
|
|
Ammo.BackpackAmount 0;
|
|
Ammo.DropAmount 1;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class EMPCoreBundleSpawn : Actor
|
|
{
|
|
override void PostBeginPlay()
|
|
{
|
|
if ( bCOUNTSECRET ) level.total_secrets--;
|
|
int bnd = Random[Bundle](2,3);
|
|
for ( int i=0; i<3; i++ )
|
|
{
|
|
let a = Spawn("EMPCore",Vec3Angle(6,i*(360/bnd)));
|
|
a.special = special;
|
|
a.angle = i*(360/bnd);
|
|
a.FloatBobPhase = FloatBobPhase;
|
|
for ( int j=0; j<5; j++ ) a.args[j] = args[j];
|
|
if ( bCOUNTSECRET )
|
|
{
|
|
a.bCOUNTSECRET = true;
|
|
level.total_secrets++;
|
|
}
|
|
}
|
|
Destroy();
|
|
}
|
|
}
|
|
|
|
Class RayBolt : MagAmmo
|
|
{
|
|
Default
|
|
{
|
|
Tag "$T_RAYBOLT";
|
|
Inventory.PickupMessage "$T_RAYBOLT";
|
|
Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png";
|
|
MagAmmo.ParentAmmo "RayAmmo";
|
|
MagAmmo.ClipSize 20;
|
|
Inventory.MaxAmount 40;
|
|
Inventory.InterHubAmount 40;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class RayAmmo : Ammo
|
|
{
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_RAYAMMO";
|
|
Inventory.PickupMessage "$T_RAYAMMO";
|
|
Stamina 150000;
|
|
Inventory.Icon "graphics/HUD/Icons/A_RayAmmo.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 4;
|
|
Ammo.BackpackAmount 0;
|
|
Ammo.DropAmount 1;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|
|
|
|
Class RayBattery : Ammo
|
|
{
|
|
Mixin SWWMAmmo;
|
|
Mixin SWWMOverlapPickupSound;
|
|
Mixin SWWMUseToPickup;
|
|
|
|
Default
|
|
{
|
|
Tag "$T_RAYBATTERY";
|
|
Inventory.PickupMessage "$T_RAYBATTERY";
|
|
Stamina 320000;
|
|
Inventory.Icon "graphics/HUD/Icons/A_RayBattery.png";
|
|
Inventory.Amount 1;
|
|
Inventory.MaxAmount 2;
|
|
Inventory.PickupFlash "SWWMPickupFlash";
|
|
Ammo.BackpackAmount 0;
|
|
Ammo.DropAmount 1;
|
|
+INVENTORY.IGNORESKILL;
|
|
+FLOATBOB;
|
|
FloatBobStrength 0.25;
|
|
}
|
|
States
|
|
{
|
|
Spawn:
|
|
XZW1 A -1;
|
|
Stop;
|
|
}
|
|
}
|