From 8f026c574b860a7f384e14986c9930a16cf0c0cc Mon Sep 17 00:00:00 2001 From: UndeadZeratul Date: Thu, 22 Jun 2023 19:05:07 -0500 Subject: [PATCH] Add Raw Steel as potential crafting material --- MENUDEF | 2 ++ ZSCRIPT.zsc | 1 + sprites/materials/STMTA0.png | Bin 0 -> 561 bytes .../recipes/materials/rawSteel.zsc | 19 ++++++++++++++++++ zscript/universalreloader/spawnHandler.zsc | 4 ++-- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 sprites/materials/STMTA0.png create mode 100644 zscript/universalreloader/recipes/materials/rawSteel.zsc diff --git a/MENUDEF b/MENUDEF index d3c4137..10e63a8 100644 --- a/MENUDEF +++ b/MENUDEF @@ -1,12 +1,14 @@ OptionValue "ProjectileMaterial" { 0, "$URL_NO_MATERIAL" 1, "$TAG_RAWLEAD" + 2, "$TAG_RAWSTEEL" } OptionValue "CasingMaterial" { 0, "$URL_NO_MATERIAL" 1, "$TAG_RAWBRASS" 2, "$TAG_RAWPLASTIC" + 3, "$TAG_RAWSTEEL" } OptionValue "PowderMaterial" { diff --git a/ZSCRIPT.zsc b/ZSCRIPT.zsc index 3a4889a..73d9375 100644 --- a/ZSCRIPT.zsc +++ b/ZSCRIPT.zsc @@ -18,3 +18,4 @@ version "4.10" #include "zscript/universalreloader/recipes/materials/rawLead.zsc" #include "zscript/universalreloader/recipes/materials/rawPlastic.zsc" #include "zscript/universalreloader/recipes/materials/rawPowder.zsc" +#include "zscript/universalreloader/recipes/materials/rawSteel.zsc" diff --git a/sprites/materials/STMTA0.png b/sprites/materials/STMTA0.png new file mode 100644 index 0000000000000000000000000000000000000000..cae4b377f8f8874aa68d8001fff9ed8a649b644b GIT binary patch literal 561 zcmV-10?z%3P)EX>4Tx04R}tkv&MmKpe$iQ?)7;2aAe0WT;LS zL`6DE6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JWDYS_7 z;J6>}?mh0_0Ya_BRI_6eP&La)L?dE4vnu*t(S<<_A&ef0nR+a_m_pm}bq^0;??ODQ z{kcC!pOQ5h;1P-Em~L3a8^p7lmd<&fIKT>$LVQj~Uy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j>PB7dj7-*a~C- z000?DL_t&t*JI4f%lps9#>QY~X2u{SB*Xv!CP4!=A|!`y00000NkvXXu0mjfDHY{w literal 0 HcmV?d00001 diff --git a/zscript/universalreloader/recipes/materials/rawSteel.zsc b/zscript/universalreloader/recipes/materials/rawSteel.zsc new file mode 100644 index 0000000..a91330b --- /dev/null +++ b/zscript/universalreloader/recipes/materials/rawSteel.zsc @@ -0,0 +1,19 @@ +class HDRel_RawSteel : HDRel_CasingMaterial +{ + Default + { + Tag "Steel Materials"; + Inventory.Icon "STMTA0"; + Inventory.PickupMessage "Picked up some steel materials."; + HDRel_CraftingMaterial.PileMessage "Picked up a ball of steel."; + HDRel_CraftingMaterial.PileType PType_Ball; + HDPickup.Bulk 0.28; + } + + States + { + Spawn: + STMT A -1; + Stop; + } +} \ No newline at end of file diff --git a/zscript/universalreloader/spawnHandler.zsc b/zscript/universalreloader/spawnHandler.zsc index e5f7194..97af72d 100644 --- a/zscript/universalreloader/spawnHandler.zsc +++ b/zscript/universalreloader/spawnHandler.zsc @@ -200,8 +200,8 @@ class URLSpawnHandler : EventHandler { // Crafting Recipes //--------------------- - string projectileMats[2] = { "", "HDRel_RawLead" }; - string casingMats[3] = { "", "HDRel_RawBrass", "HDRel_RawPlastic" }; + string projectileMats[3] = { "", "HDRel_RawLead", "HDRel_RawSteel" }; + string casingMats[4] = { "", "HDRel_RawBrass", "HDRel_RawPlastic", "HDRel_RawSteel" }; string powderMats[2] = { "", "HDRel_RawPowder" }; // Crafting Result; Projectile mat, cost, produced;