From b5331cec52a9b3b9a322405bc40d08da3c07e6ab Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 18 Dec 2023 11:23:38 -0500 Subject: [PATCH] Rename Personal Shield Generator sprites and refid --- LANGUAGE | 4 ++-- .../{PSG0A0.png => PSH0A0.png} | Bin .../{PSG0B0.png => PSH0B0.png} | Bin .../{PSG1A0.png => PSH1A0.png} | Bin .../{PSG1B0.png => PSH1B0.png} | Bin .../{PSG2A0.png => PSH2A0.png} | Bin .../{PSG2B0.png => PSH2B0.png} | Bin .../{PSG3A0.png => PSH3A0.png} | Bin .../{PSG3B0.png => PSH3B0.png} | Bin .../{PSG4A0.png => PSH4A0.png} | Bin .../{PSG4B0.png => PSH4B0.png} | Bin .../{PSG5A0.png => PSH5A0.png} | Bin .../{PSG5B0.png => PSH5B0.png} | Bin .../{PSG6A0.png => PSH6A0.png} | Bin .../{PSG6B0.png => PSH6B0.png} | Bin .../{PSG7A0.png => PSH7A0.png} | Bin .../{PSG7B0.png => PSH7B0.png} | Bin zscript/accensus/items/Personal Shield Generator.zs | 12 ++++++------ 18 files changed, 8 insertions(+), 8 deletions(-) rename sprites/Personal Shield Generator/{PSG0A0.png => PSH0A0.png} (100%) rename sprites/Personal Shield Generator/{PSG0B0.png => PSH0B0.png} (100%) rename sprites/Personal Shield Generator/{PSG1A0.png => PSH1A0.png} (100%) rename sprites/Personal Shield Generator/{PSG1B0.png => PSH1B0.png} (100%) rename sprites/Personal Shield Generator/{PSG2A0.png => PSH2A0.png} (100%) rename sprites/Personal Shield Generator/{PSG2B0.png => PSH2B0.png} (100%) rename sprites/Personal Shield Generator/{PSG3A0.png => PSH3A0.png} (100%) rename sprites/Personal Shield Generator/{PSG3B0.png => PSH3B0.png} (100%) rename sprites/Personal Shield Generator/{PSG4A0.png => PSH4A0.png} (100%) rename sprites/Personal Shield Generator/{PSG4B0.png => PSH4B0.png} (100%) rename sprites/Personal Shield Generator/{PSG5A0.png => PSH5A0.png} (100%) rename sprites/Personal Shield Generator/{PSG5B0.png => PSH5B0.png} (100%) rename sprites/Personal Shield Generator/{PSG6A0.png => PSH6A0.png} (100%) rename sprites/Personal Shield Generator/{PSG6B0.png => PSH6B0.png} (100%) rename sprites/Personal Shield Generator/{PSG7A0.png => PSH7A0.png} (100%) rename sprites/Personal Shield Generator/{PSG7B0.png => PSH7B0.png} (100%) diff --git a/LANGUAGE b/LANGUAGE index 711fc0b..8f3eaa5 100644 --- a/LANGUAGE +++ b/LANGUAGE @@ -233,7 +233,7 @@ TAG_WYVERN = "'Wyvern' .50 cal. Double-Barrel Rifle TAG_HACKEDRELOADER = "7.76mm Hacked Reloading Device"; TAG_LADDERLAUNCHER = "Ladder launcher"; TAG_MAGAZINERELOADER = "Magazine reloading device"; -TAG_PSG = "Personal Shield Generator"; +TAG_PSH = "Personal Shield Generator"; TAG_DEPLOYABLEBARRICADE = "Deployable barricade"; TAG_BOOSTERJETS = "Booster Jets"; TAG_DSD = "Dimensional Storage Device"; @@ -322,4 +322,4 @@ PICKUP_SUPERSTIM = "Picked up a super stimpack."; PICKUP_SUPPLYBEACON = "Picked up a supply drop beacon."; PICKUP_TELEPORTER = "Picked up a portable teleporter."; -SUPERSTIM_HELPTEXT = "\cd<<< \cjSUPER STIMPACK \cd>>>\c-\n\n\nSuper stimpacks give a rapid\nbut short boost to\nhealth regeneration.\n\n\Press altfire to use on someone else.\n\n\cgDO NOT OVERDOSE."; \ No newline at end of file +SUPERSTIM_HELPTEXT = "\cd<<< \cjSUPER STIMPACK \cd>>>\c-\n\n\nSuper stimpacks give a rapid\nbut short boost to\nhealth regeneration.\n\n\Press altfire to use on someone else.\n\n\cgDO NOT OVERDOSE."; diff --git a/sprites/Personal Shield Generator/PSG0A0.png b/sprites/Personal Shield Generator/PSH0A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG0A0.png rename to sprites/Personal Shield Generator/PSH0A0.png diff --git a/sprites/Personal Shield Generator/PSG0B0.png b/sprites/Personal Shield Generator/PSH0B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG0B0.png rename to sprites/Personal Shield Generator/PSH0B0.png diff --git a/sprites/Personal Shield Generator/PSG1A0.png b/sprites/Personal Shield Generator/PSH1A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG1A0.png rename to sprites/Personal Shield Generator/PSH1A0.png diff --git a/sprites/Personal Shield Generator/PSG1B0.png b/sprites/Personal Shield Generator/PSH1B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG1B0.png rename to sprites/Personal Shield Generator/PSH1B0.png diff --git a/sprites/Personal Shield Generator/PSG2A0.png b/sprites/Personal Shield Generator/PSH2A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG2A0.png rename to sprites/Personal Shield Generator/PSH2A0.png diff --git a/sprites/Personal Shield Generator/PSG2B0.png b/sprites/Personal Shield Generator/PSH2B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG2B0.png rename to sprites/Personal Shield Generator/PSH2B0.png diff --git a/sprites/Personal Shield Generator/PSG3A0.png b/sprites/Personal Shield Generator/PSH3A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG3A0.png rename to sprites/Personal Shield Generator/PSH3A0.png diff --git a/sprites/Personal Shield Generator/PSG3B0.png b/sprites/Personal Shield Generator/PSH3B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG3B0.png rename to sprites/Personal Shield Generator/PSH3B0.png diff --git a/sprites/Personal Shield Generator/PSG4A0.png b/sprites/Personal Shield Generator/PSH4A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG4A0.png rename to sprites/Personal Shield Generator/PSH4A0.png diff --git a/sprites/Personal Shield Generator/PSG4B0.png b/sprites/Personal Shield Generator/PSH4B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG4B0.png rename to sprites/Personal Shield Generator/PSH4B0.png diff --git a/sprites/Personal Shield Generator/PSG5A0.png b/sprites/Personal Shield Generator/PSH5A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG5A0.png rename to sprites/Personal Shield Generator/PSH5A0.png diff --git a/sprites/Personal Shield Generator/PSG5B0.png b/sprites/Personal Shield Generator/PSH5B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG5B0.png rename to sprites/Personal Shield Generator/PSH5B0.png diff --git a/sprites/Personal Shield Generator/PSG6A0.png b/sprites/Personal Shield Generator/PSH6A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG6A0.png rename to sprites/Personal Shield Generator/PSH6A0.png diff --git a/sprites/Personal Shield Generator/PSG6B0.png b/sprites/Personal Shield Generator/PSH6B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG6B0.png rename to sprites/Personal Shield Generator/PSH6B0.png diff --git a/sprites/Personal Shield Generator/PSG7A0.png b/sprites/Personal Shield Generator/PSH7A0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG7A0.png rename to sprites/Personal Shield Generator/PSH7A0.png diff --git a/sprites/Personal Shield Generator/PSG7B0.png b/sprites/Personal Shield Generator/PSH7B0.png similarity index 100% rename from sprites/Personal Shield Generator/PSG7B0.png rename to sprites/Personal Shield Generator/PSH7B0.png diff --git a/zscript/accensus/items/Personal Shield Generator.zs b/zscript/accensus/items/Personal Shield Generator.zs index 1034ddf..9feb0bc 100644 --- a/zscript/accensus/items/Personal Shield Generator.zs +++ b/zscript/accensus/items/Personal Shield Generator.zs @@ -32,7 +32,7 @@ class HDPersonalShieldGenerator : HDWeapon override HDWeapon GetSpareWeapon(actor newowner , bool reverse, bool doselect) { return GetSpareWeaponRegular(newowner, reverse, doselect); } override string, double GetPickupSprite() { - string main = "PSG"..min(Tiers, (WeaponStatus[PSProp_UpgradePoints])); + string main = "PSH"..min(Tiers, (WeaponStatus[PSProp_UpgradePoints])); return main..(GetBatteriesLoaded(1) > 0 && Enabled ? "B" : "A").."0", 0.2; } override string GetHelpText() @@ -609,11 +609,11 @@ class HDPersonalShieldGenerator : HDWeapon +INVENTORY.INVBAR +WEAPON.WIMPY_WEAPON -HDWEAPON.DROPTRANSLATION - Inventory.Icon "PSG0A0"; + Inventory.Icon "PSH0A0"; Inventory.PickupSound "weapons/pocket"; Inventory.PickupMessage "You picked up a personal shield generator."; - Tag "$TAG_PSG"; - HDWeapon.RefId "psg"; + Tag "$TAG_PSH"; + HDWeapon.RefId "psh"; Scale 0.35; HDWeapon.loadoutcodes " \cuelem - 0/1, Adds elemental resistance to the psg. @@ -626,10 +626,10 @@ class HDPersonalShieldGenerator : HDWeapon States { RegisterSprites: - PSG0 A 0; PSG1 A 0; PSG2 A 0; PSG3 A 0; PSG4 A 0; PSG5 A 0; PSG6 A 0; PSG7 A 0; + PSH0 A 0; PSH1 A 0; PSH2 A 0; PSH3 A 0; PSH4 A 0; PSH5 A 0; PSH6 A 0; PSH7 A 0; Spawn: - PSG0 A 1 + PSH0 A 1 { if (!invoker.owner && invoker.Enabled) {