diff --git a/LANGUAGE.en b/LANGUAGE.en index 701ccd4..96a881f 100644 --- a/LANGUAGE.en +++ b/LANGUAGE.en @@ -1,26 +1,43 @@ [enu default] // Options Menu Labels -URL_MENU = "Universal Reloader Options"; +URL_MENU = "Universal Reloader Options"; -URL_ENABLED = "Enabled"; -URL_DISABLED = "Disabled"; +URL_ENABLED = "Enabled"; +URL_DISABLED = "Disabled"; -URL_PROJECTILE = "Projectile"; -URL_CASING = "Casing"; -URL_POWDER = "Powder"; +URL_PROJECTILE = "Projectile"; +URL_CASING = "Casing"; +URL_POWDER = "Powder"; -URL_CRAFTING_MATERIAL = "Crafting Material"; -URL_MATERIAL_COST = "Material Cost"; -URL_DISASSEMBLE_RATIO = "Percent Returned when Disassembling"; +URL_CRAFTING_MATERIAL = "Crafting Material"; +URL_MATERIAL_COST = "Material Cost"; +URL_DISASSEMBLE_RATIO = "Percent Returned when Disassembling"; -URL_RESET = "Reset options"; -URL_RESET_ALL = "Reset all options"; +URL_RESET = "Reset options"; +URL_RESET_ALL = "Reset all options"; -// Crafting Materials -URL_NO_MATERIAL = "No Material"; -TAG_RAWBRASS = "Raw Brass"; -TAG_RAWLEAD = "Raw Lead"; -TAG_RAWPLASTIC = "Raw Plastic"; -TAG_RAWPOWDER = "Raw Powder"; -TAG_RAW_STEEL = "Raw Steel"; \ No newline at end of file +URL_NO_MATERIAL = "No Material"; + +// Item Tags +TAG_RAWBRASS = "Brass"; +TAG_RAWLEAD = "Lead"; +TAG_RAWPLASTIC = "Plastic"; +TAG_RAWPOWDER = "Powder"; +TAG_RAWSTEEL = "Steel"; +TAG_UNIVERSAL_RELOADER = "Universal Reloading Device"; +TAG_GUNSMITH_POUCH = "Gunsmith's Pouch"; + +// Pickup Messages +PICKUP_RAWBRASS = "Picked up some brass materials."; +PICKUP_RAWLEAD = "Picked up some lead materials."; +PICKUP_RAWPLASTIC = "Picked up some plastic materials."; +PICKUP_RAWPOWDER = "Picked up some powder."; +PICKUP_RAWSTEEL = "Picked up some steel materials."; +PICKUP_PILE_RAWBRASS = "Picked up a ball of brass."; +PICKUP_PILE_RAWLEAD = "Picked up a ball of lead."; +PICKUP_PILE_RAWPLASTIC = "Picked up a pile of plastic."; +PICKUP_PILE_RAWPOWDER = "Picked up a pile of powder."; +PICKUP_PILE_RAWSTEEL = "Picked up a ball of steel."; +PICKUP_UNIVERSAL_RELOADER = "Picked up a universal reloading device."; +PICKUP_GUNSMITH_POUCH = "Picked up a gunsmith's pouch, for all your gunpowder!"; diff --git a/zscript/gunsmithpouch/gunsmithpouch.zsc b/zscript/gunsmithpouch/gunsmithpouch.zsc index f398c74..a7bee94 100644 --- a/zscript/gunsmithpouch/gunsmithpouch.zsc +++ b/zscript/gunsmithpouch/gunsmithpouch.zsc @@ -5,10 +5,10 @@ const HDLD_GSPouch = "gsp"; //================================================== class GunsmithPouch : HDBackpack { default { - tag "Gunsmith's Pouch"; + tag "$TAG_GUNSMITH_POUCH"; HDBackpack.MaxCapacity 200; Inventory.Icon "GSPPA0"; - Inventory.PickupMessage "Picked up a gunsmith's pouch, for all your gunpowder!"; + Inventory.PickupMessage "$PICKUP_GUNSMITH_POUCH"; scale 0.6; hdweapon.wornlayer 0; hdweapon.refid HDLD_GSPouch; diff --git a/zscript/gunsmithpouch/gunsmithpouch_hud.zsc b/zscript/gunsmithpouch/gunsmithpouch_hud.zsc index 6c20d9d..57aa700 100644 --- a/zscript/gunsmithpouch/gunsmithpouch_hud.zsc +++ b/zscript/gunsmithpouch/gunsmithpouch_hud.zsc @@ -6,7 +6,7 @@ extend class GunsmithPouch { { int BaseOffset = -80; - sb.DrawString(sb.pSmallFont, "\c[DarkBrown][] [] [] \c[DarkGreen]Gunsmith Pouch\c[DarkBrown] [] [] []", (0, BaseOffset), sb.DI_SCREEN_CENTER | sb.DI_TEXT_ALIGN_CENTER); + sb.DrawString(sb.pSmallFont, "\c[DarkBrown][] [] [] \c[DarkGreen]"..StringTable.localize("$TAG_GUNSMITH_POUCH").."\c[DarkBrown] [] [] []", (0, BaseOffset), sb.DI_SCREEN_CENTER | sb.DI_TEXT_ALIGN_CENTER); string BulkString = "Total Bulk: \cf"..int(Storage.TotalBulk).."\c-"; if (weaponstatus[GSP_AMOUNT] > 1) { BulkString = BulkString.." --- Pouches: \cf"..weaponstatus[GSP_AMOUNT].."\c-"; } sb.DrawString(sb.pSmallFont, BulkString, (0, BaseOffset + 10), sb.DI_SCREEN_CENTER | sb.DI_TEXT_ALIGN_CENTER); diff --git a/zscript/universalreloader/items/universalReloader.zsc b/zscript/universalreloader/items/universalReloader.zsc index 240b1c3..ff981b0 100644 --- a/zscript/universalreloader/items/universalReloader.zsc +++ b/zscript/universalreloader/items/universalReloader.zsc @@ -266,10 +266,10 @@ class HDUniversalReloader : HDWeapon +HDWEAPON.FITSINBACKPACK +HDWEAPON.DONTFISTONDROP Inventory.PickupSound "misc/w_pkup"; - Inventory.PickupMessage "Picked up a universal reloading device."; + Inventory.PickupMessage "$PICKUP_UNIVERSAL_RELOADER"; Scale 0.6; HDWeapon.RefId "url"; - Tag "Universal reloading device"; + Tag "$TAG_UNIVERSAL_RELOADER"; } void addRecipes(Array newRecipes) { diff --git a/zscript/universalreloader/recipes/base/craftingMaterials.zsc b/zscript/universalreloader/recipes/base/craftingMaterials.zsc index e08b9d7..5afb1d4 100644 --- a/zscript/universalreloader/recipes/base/craftingMaterials.zsc +++ b/zscript/universalreloader/recipes/base/craftingMaterials.zsc @@ -14,7 +14,7 @@ class HDRel_CraftingMaterial : HDAmmo abstract override string PickupMessage() { - return Amount > 1 ? PileMessage : default.PickupMsg; + return StringTable.localize(Amount > 1 ? PileMessage : default.PickupMsg); } override void SplitPickup() diff --git a/zscript/universalreloader/recipes/materials/rawBrass.zsc b/zscript/universalreloader/recipes/materials/rawBrass.zsc index c70ab0c..ef73177 100644 --- a/zscript/universalreloader/recipes/materials/rawBrass.zsc +++ b/zscript/universalreloader/recipes/materials/rawBrass.zsc @@ -2,10 +2,10 @@ class HDRel_RawBrass : HDRel_CraftingMaterial { Default { - Tag "Brass"; + Tag "$TAG_RAWBRASS"; Inventory.Icon "BRMTA0"; - Inventory.PickupMessage "Picked up some brass materials."; - HDRel_CraftingMaterial.PileMessage "Picked up a ball of brass."; + Inventory.PickupMessage "$PICKUP_RAWBRASS"; + HDRel_CraftingMaterial.PileMessage "$PICKUP_PILE_RAWBRASS"; HDRel_CraftingMaterial.PileType PType_Ball; HDPickup.Bulk 0.20; } diff --git a/zscript/universalreloader/recipes/materials/rawLead.zsc b/zscript/universalreloader/recipes/materials/rawLead.zsc index 0941df0..d69931f 100644 --- a/zscript/universalreloader/recipes/materials/rawLead.zsc +++ b/zscript/universalreloader/recipes/materials/rawLead.zsc @@ -2,10 +2,10 @@ class HDRel_RawLead : HDRel_CraftingMaterial { Default { - Tag "Lead"; + Tag "$TAG_RAWLEAD"; Inventory.Icon "LEADA0"; - Inventory.PickupMessage "Picked up some lead materials."; - HDRel_CraftingMaterial.PileMessage "Picked up a ball of lead."; + Inventory.PickupMessage "$PICKUP_RAWLEAD"; + HDRel_CraftingMaterial.PileMessage "$PICKUP_PILE_RAWLEAD"; HDRel_CraftingMaterial.PileType PType_Ball; HDPickup.Bulk 0.25; Scale 0.8; diff --git a/zscript/universalreloader/recipes/materials/rawPlastic.zsc b/zscript/universalreloader/recipes/materials/rawPlastic.zsc index 77d0923..92c983c 100644 --- a/zscript/universalreloader/recipes/materials/rawPlastic.zsc +++ b/zscript/universalreloader/recipes/materials/rawPlastic.zsc @@ -2,10 +2,10 @@ class HDRel_RawPlastic : HDRel_CraftingMaterial { Default { - Tag "Plastic"; + Tag "$TAG_RAWPLASTIC"; Inventory.Icon "PLTCA0"; - Inventory.PickupMessage "Picked up some plastic materials."; - HDRel_CraftingMaterial.PileMessage "Picked up a pile of plastic."; + Inventory.PickupMessage "$PICKUP_RAWPLASTIC"; + HDRel_CraftingMaterial.PileMessage "$PICKUP_PILE_RAWPLASTIC"; HDRel_CraftingMaterial.PileType PType_None; HDPickup.Bulk 0.11; Scale 0.4; diff --git a/zscript/universalreloader/recipes/materials/rawPowder.zsc b/zscript/universalreloader/recipes/materials/rawPowder.zsc index 4871667..dedb7e1 100644 --- a/zscript/universalreloader/recipes/materials/rawPowder.zsc +++ b/zscript/universalreloader/recipes/materials/rawPowder.zsc @@ -2,10 +2,10 @@ class HDRel_RawPowder : HDRel_CraftingMaterial { Default { - Tag "Powder"; + Tag "$TAG_RAWPOWDER"; Inventory.Icon "PWDRA0"; - Inventory.PickupMessage "Picked up some powder."; - HDRel_CraftingMaterial.PileMessage "Picked up a pile of powder."; + Inventory.PickupMessage "$PICKUP_RAWPOWDER"; + HDRel_CraftingMaterial.PileMessage "$PICKUP_PILE_RAWPOWDER"; HDRel_CraftingMaterial.PileType PType_Pile; HDPickup.Bulk 0.08; } diff --git a/zscript/universalreloader/recipes/materials/rawSteel.zsc b/zscript/universalreloader/recipes/materials/rawSteel.zsc index d1c4979..3ff55b8 100644 --- a/zscript/universalreloader/recipes/materials/rawSteel.zsc +++ b/zscript/universalreloader/recipes/materials/rawSteel.zsc @@ -2,10 +2,10 @@ class HDRel_RawSteel : HDRel_CraftingMaterial { Default { - Tag "Steel"; + Tag "$TAG_RAWSTEEL"; Inventory.Icon "STMTA0"; - Inventory.PickupMessage "Picked up some steel materials."; - HDRel_CraftingMaterial.PileMessage "Picked up a ball of steel."; + Inventory.PickupMessage "$PICKUP_RAWSTEEL"; + HDRel_CraftingMaterial.PileMessage "$PICKUP_PILE_RAWSTEEL"; HDRel_CraftingMaterial.PileType PType_Ball; HDPickup.Bulk 0.28; }