diff --git a/graphics/HUD/Icons/I_Embiggener.png b/graphics/HUD/Icons/I_Embiggener.png new file mode 100644 index 000000000..a756dbd0c Binary files /dev/null and b/graphics/HUD/Icons/I_Embiggener.png differ diff --git a/graphics/HUD/Icons/I_Omnisight.png b/graphics/HUD/Icons/I_Omnisight.png new file mode 100644 index 000000000..9589f5c6d Binary files /dev/null and b/graphics/HUD/Icons/I_Omnisight.png differ diff --git a/language.version b/language.version index 7526fb60a..2ef11bfdf 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r526 \cu(Fri 4 Jun 21:35:17 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r526 \cu(2021-06-04 21:35:17)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r527 \cu(Sat 5 Jun 01:28:10 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r527 \cu(2021-06-05 01:28:10)\c-"; diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index f41b9ca47..7c5e114c5 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -10,6 +10,10 @@ Class SMW05Ammo : Ammo Default { + //$Title 1x SMW.05 Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SMW05Ammo.png + //$Icon ammo Tag "$T_SMW05BULLET"; Stamina 300; Inventory.Icon "graphics/HUD/Icons/A_SMW05Ammo.png"; @@ -57,6 +61,10 @@ Class SMW05SmallAmmo : SMW05Ammo { Default { + //$Title 6x SMW.05 Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SMW05Ammo.png + //$Icon ammo Inventory.Amount 6; } } @@ -65,6 +73,10 @@ Class SMW05BigAmmo : SMW05Ammo { Default { + //$Title 30x SMW.05 Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SMW05Ammo.png + //$Icon ammo Inventory.Amount 30; } } @@ -90,6 +102,10 @@ Class SheenAmmo : Ammo Default { + //$Title 1x Sheen Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SheenAmmo.png + //$Icon ammo Tag "$T_SHEENBULLETS"; Stamina 400; Inventory.Icon "graphics/HUD/Icons/A_SheenAmmo.png"; @@ -114,6 +130,10 @@ Class SheenTinyAmmo : SheenAmmo { Default { + //$Title 10x Sheen Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SheenAmmo.png + //$Icon ammo Inventory.Amount 10; } } @@ -122,6 +142,10 @@ Class SheenSmallAmmo : SheenAmmo { Default { + //$Title 50x Sheen Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SheenAmmo.png + //$Icon ammo Inventory.Amount 50; } } @@ -130,6 +154,10 @@ Class SheenBigAmmo : SheenAmmo { Default { + //$Title 100x Sheen Bullets + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SheenAmmo.png + //$Icon ammo Inventory.Amount 100; } } @@ -143,6 +171,10 @@ Class QuadravolAmmo : Ammo Default { + //$Title Quadravol Ammo + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_QuadAmmo.png + //$Icon ammo Tag "$T_QUADAMMO"; Inventory.PickupMessage "$T_QUADAMMO"; Stamina 10000; @@ -202,6 +234,10 @@ Class DarkCanister : Ammo Default { + //$Title Dark Canister + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_DarkAmmo.png + //$Icon ammo Tag "$T_DARKAMMO"; Inventory.PickupMessage "$T_DARKAMMO"; Stamina 20000; @@ -236,6 +272,10 @@ Class EMPCore : Ammo Default { + //$Title EMP Core + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_EMPCore.png + //$Icon ammo Tag "$T_EMPCORE"; Inventory.PickupMessage "$T_EMPCORE"; Stamina 60000; @@ -290,6 +330,10 @@ Class RayBolt : MagAmmo { Default { + //$Title Ray-Khom Bolt + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_RayBolt.png + //$Icon ammo Tag "$T_RAYBOLT"; Inventory.PickupMessage "$T_RAYBOLT"; Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png"; @@ -339,6 +383,10 @@ Class RayAmmo : Ammo Default { + //$Title Ray-Khom Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_RayAmmo.png + //$Icon ammo Tag "$T_RAYAMMO"; Inventory.PickupMessage "$T_RAYAMMO"; Stamina 150000; @@ -374,6 +422,10 @@ Class RayBattery : Ammo Default { + //$Title Ray-Khom Battery + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_RayBattery.png + //$Icon ammo Tag "$T_RAYBATTERY"; Inventory.PickupMessage "$T_RAYBATTERY"; Stamina 320000; @@ -406,6 +458,10 @@ Class GrandSpear : MagAmmo { Default { + //$Title Grand Lance Spear + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_GrandSpear.png + //$Icon ammo Tag "$T_GRANDSPEAR"; Inventory.PickupMessage "$T_GRANDSPEAR"; Inventory.Icon "graphics/HUD/Icons/A_GrandSpear.png"; @@ -432,6 +488,10 @@ Class GrandAmmo : Ammo Default { + //$Title Grand Lance Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_GrandAmmo.png + //$Icon ammo Tag "$T_GRANDAMMO"; Inventory.PickupMessage "$T_GRANDAMMO"; Stamina 1200000; diff --git a/zscript/dlc1/swwm_blackfire.zsc b/zscript/dlc1/swwm_blackfire.zsc index 510ae8c90..43bb8d7fe 100644 --- a/zscript/dlc1/swwm_blackfire.zsc +++ b/zscript/dlc1/swwm_blackfire.zsc @@ -11,6 +11,10 @@ Class BlackfireIgniter : SWWMWeapon Default { + //$Title Blackfire Igniter + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Blackfire.png + //$Icon weapon Tag "$T_BLACKFIRE"; Inventory.PickupMessage "$T_BLACKFIRE"; Obituary "$O_BLACKFIRE"; diff --git a/zscript/dlc1/swwm_blastin.zsc b/zscript/dlc1/swwm_blastin.zsc index 54775fb04..bd725ca64 100644 --- a/zscript/dlc1/swwm_blastin.zsc +++ b/zscript/dlc1/swwm_blastin.zsc @@ -9,6 +9,10 @@ Class PlasmaBlast : SWWMWeapon Default { + //$Title Plasma Blaster + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_PlasmaBlast.png + //$Icon weapon Tag "$T_PLASMABLAST"; Inventory.PickupMessage "$T_PLASMABLAST"; Obituary "$O_PLASMABLAST"; diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index 2fb7769f5..02e53d947 100644 --- a/zscript/dlc1/swwm_hammertime.zsc +++ b/zscript/dlc1/swwm_hammertime.zsc @@ -5,6 +5,10 @@ Class ItamexHammer : SWWMWeapon { Default { + //$Title Itamex Hammer + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_ItamexHammer.png + //$Icon weapon Tag "$T_HAMMER"; Inventory.PickupMessage "$I_HAMMER"; Obituary "$O_HAMMER"; diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index 9abdcfc34..84081de0e 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -5,6 +5,10 @@ Class HeavyMahSheenGun : SWWMWeapon { Default { + //$Title Sheen HMG + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_SheenHMG.png + //$Icon weapon Tag "$T_SHEENHMG"; Inventory.PickupMessage "$I_SHEENHMG"; Obituary "$O_SHEENHMG"; diff --git a/zscript/dlc1/swwm_hugeassrailgun.zsc b/zscript/dlc1/swwm_hugeassrailgun.zsc index 69cbaad43..841ff9136 100644 --- a/zscript/dlc1/swwm_hugeassrailgun.zsc +++ b/zscript/dlc1/swwm_hugeassrailgun.zsc @@ -11,6 +11,10 @@ Class GrandLance : SWWMWeapon Default { + //$Title Grand Lance + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_GrandLance.png + //$Icon weapon Tag "$T_GRANDLANCE"; Inventory.PickupMessage "$T_GRANDLANCE"; Obituary "$O_GRANDLANCE"; diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc index 395bd7157..d93302c14 100644 --- a/zscript/dlc1/swwm_notashotgun.zsc +++ b/zscript/dlc1/swwm_notashotgun.zsc @@ -10,6 +10,10 @@ Class Quadravol : SWWMWeapon Default { + //$Title Quadravol + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Quadravol.png + //$Icon weapon Tag "$T_QUADRAVOL"; Inventory.PickupMessage "$I_QUADRAVOL"; Obituary "$O_QUADRAVOL"; diff --git a/zscript/dlc1/swwm_rebolber.zsc b/zscript/dlc1/swwm_rebolber.zsc index cd2f7c4cd..f3c8db6b6 100644 --- a/zscript/dlc1/swwm_rebolber.zsc +++ b/zscript/dlc1/swwm_rebolber.zsc @@ -9,6 +9,10 @@ Class PuntzerBeta : SWWMWeapon Default { + //$Title Puntzer Beta + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_PuntzerBeta.png + //$Icon weapon Tag "$T_PUNTZERBETA"; Inventory.PickupMessage "$I_PUNTZERBETA"; Obituary "$O_PUNTZERBETA"; diff --git a/zscript/dlc1/swwm_supermarioworld.zsc b/zscript/dlc1/swwm_supermarioworld.zsc index 7bc68c2ff..4b6b63814 100644 --- a/zscript/dlc1/swwm_supermarioworld.zsc +++ b/zscript/dlc1/swwm_supermarioworld.zsc @@ -10,6 +10,10 @@ Class PuntzerGamma : SWWMWeapon Default { + //$Title Puntzer Gamma + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_PuntzerGamma.png + //$Icon weapon Tag "$T_PUNTZERGAMMA"; Inventory.PickupMessage "$I_PUNTZERGAMMA"; Obituary "$O_PUNTZERGAMMA"; diff --git a/zscript/dlc1/swwm_thiccbolts.zsc b/zscript/dlc1/swwm_thiccbolts.zsc index 0475090c1..d97a0b6e7 100644 --- a/zscript/dlc1/swwm_thiccbolts.zsc +++ b/zscript/dlc1/swwm_thiccbolts.zsc @@ -11,6 +11,10 @@ Class RayKhom : SWWMWeapon Default { + //$Title Ray-Khom + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_RayKhom.png + //$Icon weapon Tag "$T_RAYKHOM"; Inventory.PickupMessage "$T_RAYKHOM"; Obituary "$O_RAYKHOM"; diff --git a/zscript/dlc1/swwm_veryveryfrightening.zsc b/zscript/dlc1/swwm_veryveryfrightening.zsc index 29e4a1976..13f601b46 100644 --- a/zscript/dlc1/swwm_veryveryfrightening.zsc +++ b/zscript/dlc1/swwm_veryveryfrightening.zsc @@ -11,6 +11,10 @@ Class EMPCarbine : SWWMWeapon Default { + //$Title EMP Carbine + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_EMPCarbine.png + //$Icon weapon Tag "$T_EMPCARBINE"; Inventory.PickupMessage "$I_EMPCARBINE"; Obituary "$O_EMPCARBINE"; diff --git a/zscript/items/swwm_ammoextra.zsc b/zscript/items/swwm_ammoextra.zsc index f1ee9ca3b..eca945610 100644 --- a/zscript/items/swwm_ammoextra.zsc +++ b/zscript/items/swwm_ammoextra.zsc @@ -238,6 +238,10 @@ Class FabricatorTier1 : AmmoFabricator Default { + //$Title Fabricator (Common) + //$Group Ammo + //$Sprite graphics/HUD/Icons/I_Fabricator1.png + //$Icon ammo Tag "$T_FABRICATOR1"; Stamina -2500; Inventory.Icon "graphics/HUD/Icons/I_Fabricator1.png"; @@ -255,6 +259,10 @@ Class FabricatorTier2 : AmmoFabricator Default { + //$Title Fabricator (Rare) + //$Group Ammo + //$Sprite graphics/HUD/Icons/I_Fabricator2.png + //$Icon ammo Tag "$T_FABRICATOR2"; Stamina -12000; Inventory.Icon "graphics/HUD/Icons/I_Fabricator2.png"; @@ -272,6 +280,10 @@ Class FabricatorTier3 : AmmoFabricator Default { + //$Title Fabricator (Very Rare) + //$Group Ammo + //$Sprite graphics/HUD/Icons/I_Fabricator3.png + //$Icon ammo Tag "$T_FABRICATOR3"; Stamina -80000; Inventory.Icon "graphics/HUD/Icons/I_Fabricator3.png"; @@ -287,6 +299,10 @@ Class FabricatorTier4 : AmmoFabricator { Default { + //$Title Fabricator (Super Rare) + //$Group Ammo + //$Sprite graphics/HUD/Icons/I_Fabricator4.png + //$Icon ammo Tag "$T_FABRICATOR4"; Stamina -1000000; Inventory.Icon "graphics/HUD/Icons/I_Fabricator4.png"; @@ -509,8 +525,13 @@ Class HammerspaceEmbiggener : Inventory Default { + //$Title Hammerspace Embiggener + //$Group Ammo + //$Sprite graphics/HUD/Icons/I_Embiggener.png + //$Icon ammo Tag "$T_EMBIGGENER"; Stamina -800000; + Inventory.Icon "graphics/HUD/Icons/I_Embiggener.png"; Inventory.PickupMessage "$T_EMBIGGENER"; Inventory.MaxAmount 8; Inventory.InterHubAmount 8; diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc index 147934c19..0f989b4ff 100644 --- a/zscript/items/swwm_ammoitems.zsc +++ b/zscript/items/swwm_ammoitems.zsc @@ -12,6 +12,10 @@ Class RedShell : Ammo Default { + //$Title 1x Red Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsNormal.png + //$Icon ammo Tag "$T_REDSHELLS"; Stamina 500; Inventory.Icon "graphics/HUD/Icons/A_ShellsNormal.png"; @@ -37,6 +41,10 @@ Class RedShell2 : RedShell { Default { + //$Title 2x Red Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsNormal.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -45,6 +53,10 @@ Class RedShell4 : RedShell { Default { + //$Title 4x Red Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsNormal.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -60,6 +72,10 @@ Class GreenShell : Ammo Default { + //$Title 1x Green Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsSlug.png + //$Icon ammo Tag "$T_GREENSHELLS"; Stamina 800; Inventory.Icon "graphics/HUD/Icons/A_ShellsSlug.png"; @@ -85,6 +101,10 @@ Class GreenShell2 : GreenShell { Default { + //$Title 2x Green Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsSlug.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -93,6 +113,10 @@ Class GreenShell4 : GreenShell { Default { + //$Title 4x Green Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsSlug.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -108,6 +132,10 @@ Class WhiteShell : Ammo Default { + //$Title 1x White Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsDragon.png + //$Icon ammo Tag "$T_WHITESHELLS"; Stamina 1000; Inventory.Icon "graphics/HUD/Icons/A_ShellsDragon.png"; @@ -132,6 +160,10 @@ Class WhiteShell2 : WhiteShell { Default { + //$Title 2x White Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsDragon.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -140,6 +172,10 @@ Class WhiteShell4 : WhiteShell { Default { + //$Title 3x White Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsDragon.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -155,6 +191,10 @@ Class BlueShell : Ammo Default { + //$Title 1x Blue Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsKinylum.png + //$Icon ammo Tag "$T_BLUESHELLS"; Stamina 2500; Inventory.Icon "graphics/HUD/Icons/A_ShellsKinylum.png"; @@ -180,6 +220,10 @@ Class BlueShell2 : BlueShell { Default { + //$Title 2x Blue Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsKinylum.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -188,6 +232,10 @@ Class BlueShell4 : BlueShell { Default { + //$Title 4x Blue Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsKinylum.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -203,6 +251,10 @@ Class BlackShell : Ammo Default { + //$Title 1x Black Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsFuck.png + //$Icon ammo Tag "$T_BLACKSHELLS"; Stamina 4000; Inventory.Icon "graphics/HUD/Icons/A_ShellsFuck.png"; @@ -228,6 +280,10 @@ Class BlackShell2 : BlackShell { Default { + //$Title 2x Black Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsFuck.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -236,6 +292,10 @@ Class BlackShell4 : BlackShell { Default { + //$Title 4x Black Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsFuck.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -251,6 +311,10 @@ Class PurpleShell : Ammo Default { + //$Title 1x Purple Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsBall.png + //$Icon ammo Tag "$T_PURPLESHELLS"; Stamina 1500; Inventory.Icon "graphics/HUD/Icons/A_ShellsBall.png"; @@ -276,6 +340,10 @@ Class PurpleShell2 : PurpleShell { Default { + //$Title 2x Purple Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsBall.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -284,6 +352,10 @@ Class PurpleShell4 : PurpleShell { Default { + //$Title 4x Purple Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsBall.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -339,6 +411,10 @@ Class GoldShell : Ammo Default { + //$Title 1x Gold Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsGold.png + //$Icon ammo Tag "$T_GOLDSHELLS"; Stamina -1000000; Inventory.Icon "graphics/HUD/Icons/A_ShellsGold.png"; @@ -364,6 +440,10 @@ Class GoldShell2 : GoldShell { Default { + //$Title 2x Gold Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsGold.png + //$Icon ammo Inventory.Amount 2; Radius 6; } @@ -372,6 +452,10 @@ Class GoldShell4 : GoldShell { Default { + //$Title 4x Gold Shells + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_ShellsGold.png + //$Icon ammo Inventory.Amount 4; Radius 6; } @@ -390,6 +474,10 @@ Class EvisceratorShell : Ammo Default { + //$Title Eviscerator Shell + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_Eviscerator.png + //$Icon ammo Tag "$T_EVISHELLS"; Inventory.PickupMessage "$T_EVISHELL"; Stamina 3000; @@ -422,6 +510,10 @@ Class EvisceratorSixPack : EvisceratorShell { Default { + //$Title Eviscerator Six-Pack + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_Eviscerator.png + //$Icon ammo Tag "$I_EVISHELLPAK"; Inventory.PickupMessage "$I_EVISHELLPAK"; Inventory.Amount 6; @@ -466,6 +558,10 @@ Class HellblazerMissiles : Ammo Default { + //$Title Hellblazer Missile + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerMissile.png + //$Icon ammo Tag "$T_HELLMISSILES"; Inventory.PickupMessage "$T_HELLMISSILE"; Stamina 8000; @@ -497,6 +593,10 @@ Class HellblazerMissileMag : HellblazerMissiles { Default { + //$Title Hellblazer Missile Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerMissile.png + //$Icon ammo Tag "$T_HELLMISSILEMAG"; Inventory.PickupMessage "$T_HELLMISSILEMAG"; Inventory.Amount 6; @@ -536,6 +636,10 @@ Class HellblazerCrackshots : Ammo Default { + //$Title Hellblazer Crackshot + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerCrackshot.png + //$Icon ammo Tag "$T_HELLCLUSTERS"; Inventory.PickupMessage "$T_HELLCLUSTER"; Stamina 15000; @@ -567,6 +671,10 @@ Class HellblazerCrackshotMag : HellblazerCrackshots { Default { + //$Title Hellblazer Crackshot Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerCrackshot.png + //$Icon ammo Tag "$T_HELLCLUSTERMAG"; Inventory.PickupMessage "$T_HELLCLUSTERMAG"; Inventory.Amount 3; @@ -584,6 +692,10 @@ Class HellblazerRavagers : Ammo Default { + //$Title Hellblazer Ravager + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerRavager.png + //$Icon ammo Tag "$T_HELLBURNINATORS"; Inventory.PickupMessage "$T_HELLBURNINATOR"; Stamina 25000; @@ -615,6 +727,10 @@ Class HellblazerRavagerMag : HellblazerRavagers { Default { + //$Title Hellblazer Ravager Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerRavager.png + //$Icon ammo Tag "$T_HELLBURNINATORMAG"; Inventory.PickupMessage "$T_HELLBURNINATORMAG"; Inventory.Amount 3; @@ -632,6 +748,10 @@ Class HellblazerWarheads : Ammo Default { + //$Title Hellblazer Warhead + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerWarhead.png + //$Icon ammo Tag "$T_HELLNUKES"; Inventory.PickupMessage "$T_HELLNUKE"; Stamina 40000; @@ -663,6 +783,10 @@ Class HellblazerWarheadMag : HellblazerWarheads { Default { + //$Title Hellblazer Warhead Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_HellblazerWarhead.png + //$Icon ammo Tag "$T_HELLNUKEMAG"; Inventory.PickupMessage "$T_HELLNUKEMAG"; Inventory.Amount 2; @@ -684,6 +808,10 @@ Class SparkUnit : Ammo Default { + //$Title Spark Unit + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_Sparkster.png + //$Icon ammo Tag "$T_SPARKUNIT"; Inventory.PickupMessage "$T_SPARKUNIT"; Stamina 50000; @@ -725,6 +853,10 @@ Class SilverBulletAmmo : Ammo Default { + //$Title Silver Bullet Mag (XSB) + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SilverBullet.png + //$Icon ammo Tag "$T_XSBMAG"; Inventory.PickupMessage "$T_XSBMAG"; Stamina 70000; @@ -773,6 +905,10 @@ Class SilverBulletAmmo2 : Ammo Default { + //$Title Silver Bullet Mag (FCB) + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SilverBullet2.png + //$Icon ammo Tag "$T_FCBMAG"; Inventory.PickupMessage "$T_FCBMAG"; Stamina 80000; @@ -816,6 +952,10 @@ Class SilverBullets : MagAmmo { Default { + //$Title Silver Bullet Round (XSB) + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SilverBulletBullet.png + //$Icon ammo Tag "$T_XSBBULLET"; Inventory.PickupMessage "$T_XSBBULLET"; Inventory.Icon "graphics/HUD/Icons/A_SilverBulletBullet.png"; @@ -838,6 +978,10 @@ Class SilverBullets2 : MagAmmo { Default { + //$Title Silver Bullet Round (FCB) + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_SilverBulletBullet2.png + //$Icon ammo Tag "$T_FCBBULLET"; Inventory.PickupMessage "$T_FCBBULLET"; Inventory.Icon "graphics/HUD/Icons/A_SilverBulletBullet2.png"; @@ -917,6 +1061,10 @@ Class CandyGunAmmo : Ammo Default { + //$Title Candy Gun Mag + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_CandyGun.png + //$Icon ammo Tag "$T_CANDYMAG"; Inventory.PickupMessage "$T_CANDYMAG"; Stamina 100000; @@ -960,6 +1108,10 @@ Class CandyGunBullets : MagAmmo { Default { + //$Title Candy Gun Round + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_CandyBullet.png + //$Icon ammo Tag "$T_CANDYBULLET"; Inventory.PickupMessage "$T_CANDYBULLET"; Inventory.Icon "graphics/HUD/Icons/A_CandyBullet.png"; @@ -1048,6 +1200,10 @@ Class YnykronAmmo : Ammo Default { + //$Title Ynykron Ammo + //$Group Ammo + //$Sprite graphics/HUD/Icons/A_Ynykron.png + //$Icon ammo Tag "$T_YNYKRONAMMO"; Inventory.PickupMessage "$T_YNYKRONAMMO"; Stamina 3000000; diff --git a/zscript/items/swwm_armor.zsc b/zscript/items/swwm_armor.zsc index 6804e1f7b..27493aaa8 100644 --- a/zscript/items/swwm_armor.zsc +++ b/zscript/items/swwm_armor.zsc @@ -27,6 +27,10 @@ Class ArmorNuggetItem : SWWMSpareArmor } Default { + //$Title Armor Nugget + //$Group Armor + //$Sprite graphics/HUD/Icons/I_ArmorNugget.png + //$Icon armour Tag "$T_NUGGETA"; Stamina 300; Inventory.Icon "graphics/HUD/Icons/I_ArmorNugget.png"; @@ -105,6 +109,10 @@ Class BlastSuitItem : SWWMSpareArmor } Default { + //$Title Blast Suit + //$Group Armor + //$Sprite graphics/HUD/Icons/I_BlastSuit.png + //$Icon armour Tag "$T_BLASTSUIT"; Stamina 40000; Inventory.Icon "graphics/HUD/Icons/I_BlastSuit.png"; @@ -155,6 +163,10 @@ Class WarArmorItem : SWWMSpareArmor } Default { + //$Title War Armor + //$Group Armor + //$Sprite graphics/HUD/Icons/I_WarArmor.png + //$Icon armour Tag "$T_WARARMOR"; Stamina 100000; Inventory.Icon "graphics/HUD/Icons/I_WarArmor.png"; diff --git a/zscript/items/swwm_health.zsc b/zscript/items/swwm_health.zsc index 58ed93f69..61053bc95 100644 --- a/zscript/items/swwm_health.zsc +++ b/zscript/items/swwm_health.zsc @@ -73,6 +73,10 @@ Class HealthNuggetItem : SWWMHealth } Default { + //$Title Health Nugget + //$Group Health + //$Sprite graphics/HUD/Icons/I_HealthNugget.png + //$Icon health Tag "$T_NUGGETH"; Stamina 200; Inventory.Icon "graphics/HUD/Icons/I_HealthNugget.png"; @@ -130,6 +134,10 @@ Class TetraHealthItem : SWWMHealth } Default { + //$Title Health Tetrahedron + //$Group Health + //$Sprite graphics/HUD/Icons/I_HealthTetra.png + //$Icon health Tag "$T_TETRAHEALTH"; Stamina 3000; Inventory.Icon "graphics/HUD/Icons/I_HealthTetra.png"; @@ -157,6 +165,10 @@ Class CubeHealthItem : SWWMHealth } Default { + //$Title Health Cube + //$Group Health + //$Sprite graphics/HUD/Icons/I_HealthCube.png + //$Icon health Tag "$T_CUBEHEALTH"; Stamina 8000; Inventory.Icon "graphics/HUD/Icons/I_HealthCube.png"; @@ -202,6 +214,10 @@ Class RefresherItem : SWWMHealth } Default { + //$Title Refresher + //$Group Health + //$Sprite graphics/HUD/Icons/I_Refresher.png + //$Icon health Tag "$T_REFRESHER"; Stamina 160000; Inventory.Icon "graphics/HUD/Icons/I_Refresher.png"; diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 346879de5..edbaafaf2 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -198,6 +198,10 @@ Class GrilledCheeseSandwich : Inventory Default { + //$Title Grilled Cheese Sandwich + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Sandwich.png + //$Icon powerup Tag "$T_SANDWICH"; Stamina 800000; Inventory.Icon "graphics/HUD/Icons/I_Sandwich.png"; @@ -442,6 +446,10 @@ Class GhostArtifact : Inventory Default { + //$Title Ghost Artifact + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Ghost.png + //$Icon powerup Tag "$T_GHOSTARTI"; Stamina 120000; Inventory.Icon "graphics/HUD/Icons/I_Ghost.png"; @@ -650,6 +658,10 @@ Class GravitySuppressor : Inventory Default { + //$Title Gravity Suppressor + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Gravity.png + //$Icon powerup Tag "$T_GRAVITYS"; Stamina 150000; Inventory.Icon "graphics/HUD/Icons/I_Gravity.png"; @@ -893,6 +905,10 @@ Class FuckingInvinciball : Inventory Default { + //$Title Invinciball + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Invinciball.png + //$Icon powerup Tag "$T_INVINCIBALL"; Stamina 640000; Inventory.Icon "graphics/HUD/Icons/I_Invinciball.png"; @@ -1177,6 +1193,10 @@ Class Ragekit : Inventory Default { + //$Title Ragekit + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Ragekit.png + //$Icon powerup Tag "$T_RAGEKIT"; Stamina 500000; Inventory.Icon "graphics/HUD/Icons/I_Ragekit.png"; @@ -1262,7 +1282,12 @@ Class Omnisight : Inventory } Default { + //$Title Omnisight + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Omnisight.png + //$Icon powerup Tag "$T_OMNISIGHT"; + Inventory.Icon "graphics/HUD/Icons/I_Omnisight.png"; Inventory.PickupSound "misc/p_pkup"; Inventory.PickupMessage "$I_OMNISIGHT"; Inventory.MaxAmount 1; @@ -1926,6 +1951,10 @@ Class SWWMLamp : Inventory } Default { + //$Title Lamp + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_LampOff.png + //$Icon powerup Tag "$T_LAMP"; Inventory.Icon "graphics/HUD/Icons/I_LampOff.png"; Inventory.PickupSound "misc/p_pkup"; @@ -2133,6 +2162,10 @@ Class EBarrier : Inventory Default { + //$Title Barrier + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Barrier.png + //$Icon powerup Tag "$T_BARRIER"; Stamina 80000; Inventory.Icon "graphics/HUD/Icons/I_Barrier.png"; @@ -2807,6 +2840,10 @@ Class Mykradvo : Inventory Default { + //$Title Mykradvo + //$Group Powerups + //$Sprite graphics/HUD/Icons/I_Mykradvo.png + //$Icon powerup Tag "$T_MYKRADVO"; Stamina 1200000; Inventory.Icon "graphics/HUD/Icons/I_Mykradvo.png"; diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc index 9c0f39b19..44ec9849b 100644 --- a/zscript/weapons/swwm_blazeit.zsc +++ b/zscript/weapons/swwm_blazeit.zsc @@ -645,6 +645,10 @@ Class Hellblazer : SWWMWeapon Default { + //$Title Hellblazer + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Hellblazer.png + //$Icon weapon Tag "$T_HELLBLAZER"; Inventory.PickupMessage "$I_HELLBLAZER"; Obituary "$O_HELLBLAZER"; diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index f56ffbc2a..f57df67b9 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -845,6 +845,10 @@ Class Wallbuster : SWWMWeapon Default { + //$Title Wallbuster + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Wallbuster.png + //$Icon weapon Tag "$T_WALLBUSTER"; Inventory.PickupMessage "$I_WALLBUSTER"; Obituary "$O_WALLBUSTER_RED"; diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index 6c325a257..9b3f849e9 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -278,6 +278,10 @@ Class Eviscerator : SWWMWeapon Default { + //$Title Eviscerator + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Eviscerator.png + //$Icon weapon Tag "$T_EVISCERATOR"; Inventory.PickupMessage "$I_EVISCERATOR"; Obituary "$O_EVISCERATOR"; diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index eda9acf77..e45f440fb 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -230,6 +230,10 @@ Class Ynykron : SWWMWeapon Default { + //$Title Ynykron + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Ynykron.png + //$Icon weapon Tag "$T_YNYKRON"; Inventory.PickupMessage "$T_YNYKRON"; Obituary "$O_YNYKRON"; diff --git a/zscript/weapons/swwm_deepdarkimpact.zsc b/zscript/weapons/swwm_deepdarkimpact.zsc index 97f8a2ce0..f38fe074b 100644 --- a/zscript/weapons/swwm_deepdarkimpact.zsc +++ b/zscript/weapons/swwm_deepdarkimpact.zsc @@ -319,6 +319,10 @@ Class DeepImpact : SWWMWeapon Default { + //$Title Deep Impact + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_DeepImpact.png + //$Icon weapon Tag "$T_DEEPIMPACT"; Inventory.PickupMessage "$I_DEEPIMPACT"; Obituary "$O_DEEPIMPACT_WEAK"; diff --git a/zscript/weapons/swwm_jackhammer.zsc b/zscript/weapons/swwm_jackhammer.zsc index 6a0063a31..7373c91cc 100644 --- a/zscript/weapons/swwm_jackhammer.zsc +++ b/zscript/weapons/swwm_jackhammer.zsc @@ -248,6 +248,10 @@ Class PusherWeapon : SWWMWeapon Default { + //$Title Pusher + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Pusher.png + //$Icon weapon Tag "$T_PUSHER"; Inventory.PickupMessage "$I_PUSHER"; Obituary "$O_PUSHER"; diff --git a/zscript/weapons/swwm_shot.zsc b/zscript/weapons/swwm_shot.zsc index 8f2fdf4ac..09604033e 100644 --- a/zscript/weapons/swwm_shot.zsc +++ b/zscript/weapons/swwm_shot.zsc @@ -873,6 +873,10 @@ Class Spreadgun : SWWMWeapon Default { + //$Title Spreadgun + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Spreadgun.png + //$Icon weapon Tag "$T_SPREADGUN"; Inventory.PickupMessage "$I_SPREADGUN"; Obituary "$O_SPREADGUN"; diff --git a/zscript/weapons/swwm_sparkyboi.zsc b/zscript/weapons/swwm_sparkyboi.zsc index 1cd466819..e39461925 100644 --- a/zscript/weapons/swwm_sparkyboi.zsc +++ b/zscript/weapons/swwm_sparkyboi.zsc @@ -246,6 +246,10 @@ Class Sparkster : SWWMWeapon Default { + //$Title Biospark Carbine + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_Sparkster.png + //$Icon weapon Tag "$T_SPARKSTER"; Inventory.PickupMessage "$I_SPARKSTER"; Obituary "$O_SPARKSTER"; diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index 9b54db3f1..66da89bb4 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -293,6 +293,10 @@ Class ExplodiumGun : SWWMWeapon Default { + //$Title Explodium Gun + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_ExplodiumGun.png + //$Icon weapon Tag "$T_EXPLODIUM"; Inventory.PickupMessage "$T_EXPLODIUM"; Obituary "$O_EXPLODIUM"; diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc index 510628afb..118a7bbd0 100644 --- a/zscript/weapons/swwm_tastytreat.zsc +++ b/zscript/weapons/swwm_tastytreat.zsc @@ -331,6 +331,10 @@ Class CandyGun : SWWMWeapon Default { + //$Title Candy Gun + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_CandyGun.png + //$Icon weapon Tag "$T_CANDYGUN"; Inventory.PickupMessage "$I_CANDYGUN"; Obituary "$O_CANDYGUN"; diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index 5fd724dc0..1976b2d30 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -928,6 +928,10 @@ Class SilverBullet : SWWMWeapon Default { + //$Title Silver Bullet JET + //$Group Weapons + //$Sprite graphics/HUD/Icons/W_SilverBullet.png + //$Icon weapon Tag "$T_SILVERBULLET"; Inventory.PickupMessage "$T_SILVERBULLET"; Obituary "$O_SILVERBULLET";