From 23431e1c6af127382e68ad7a1e519c99d5554ba2 Mon Sep 17 00:00:00 2001 From: Shydow Date: Fri, 17 Nov 2023 08:05:46 -0600 Subject: [PATCH 1/2] Bugfixes: Tea planters now give fresh tea leaves Fixed typos in gather flora Updated references to PetrolCan to Recipe.GetItemTypes.Petrol Updated recipes that reference HCLabbig to point to anchored version Swapped anchor professional lab recipe result to be correct Removed duplication of latex gloves from examine biowaste --- .../media/lua/client/PlantsGrowing.lua | 2 + .../media/lua/server/FloraHCExtra.lua | 2 +- .../media/scripts/Hydrocraft/HC_Barrels.txt | 4 +- .../scripts/Hydrocraft/HC_Blueprints.txt | 2 +- .../scripts/Hydrocraft/HC_Boneworking.txt | 4 +- .../media/scripts/Hydrocraft/HC_Centifuge.txt | 2 +- .../media/scripts/Hydrocraft/HC_Chemistry.txt | 72 +++++++++---------- .../scripts/Hydrocraft/HC_Drugs Meth.txt | 8 +-- .../scripts/Hydrocraft/HC_Drugs Tobacco.txt | 2 +- .../scripts/Hydrocraft/HC_Food Flour.txt | 10 +-- .../media/scripts/Hydrocraft/HC_Food Salt.txt | 2 +- .../media/scripts/Hydrocraft/HC_Lab.txt | 4 +- .../scripts/Hydrocraft/HC_Microbiology.txt | 1 + .../scripts/Hydrocraft/HC_Programing.txt | 18 ++--- .../scripts/Hydrocraft/HC_Stoneworking.txt | 18 ++--- .../media/scripts/Hydrocraft/HC_Travel.txt | 16 ++--- .../Hydrocraft/HC_Weapons Explosives.txt | 2 +- .../scripts/Hydrocraft/HC_Weapons Flame.txt | 2 +- 18 files changed, 87 insertions(+), 84 deletions(-) diff --git a/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua b/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua index e6f3119b..bdcbe360 100644 --- a/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua +++ b/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua @@ -89,6 +89,8 @@ function recipe_NDPlantsHarvest(items, result, player) altSeedName = "Hydrocraft.HCTomatilloseeds"; elseif plantName == "Grape" then altName = "Grapes"; + elseif plantName == "Tea" then + altName = "Teafresh"; end --Main product counts diff --git a/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua b/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua index f00120a7..8b46ce98 100644 --- a/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua +++ b/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua @@ -28,7 +28,7 @@ if (getGameTime():getMonth() + 1) > 10 or (getGameTime():getMonth() + 1) < 3 the else -- no winter normal luck + all items - low = {'Hydrocraft.HCAcorn','Hydrocraft.HCFlax','Base.BerryGeneric1','"Base.BerryGeneric2','Base.BerryGeneric1','Base.BerryGeneric3','Base.BerryGeneric4','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCClover','Hydrocraft.HCFern','Hydrocraft.HCFiddleheadfern','Hydrocraft.HCYewbough','Hydrocraft.HCSprucebough','Hydrocraft.HCElmbough','Hydrocraft.HCAlderbough','Hydrocraft.HCWillowbranch','Base.TreeBranch','Base.Twigs','Hydrocraft.HCFirbough','Hydrocraft.HCPinebough','Hydrocraft.HCMapleleaf','Hydrocraft.HCHickoryleaves','Hydrocraft.HCOakleaves','Hydrocraft.HCClover','Hydrocraft.HCWillowbark','Hydrocraft.HCBirchbark','Hydrocraft.HCBark','Hydrocraft.HCStraw','Hydrocraft.HCGrass','Hydrocraft.HCNettles'} + low = {'Hydrocraft.HCAcorn','Hydrocraft.HCFlax','Base.BerryGeneric1','Base.BerryGeneric2','Base.BerryGeneric3','Base.BerryGeneric4','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCClover','Hydrocraft.HCFern','Hydrocraft.HCFiddleheadfern','Hydrocraft.HCYewbough','Hydrocraft.HCSprucebough','Hydrocraft.HCElmbough','Hydrocraft.HCAlderbough','Hydrocraft.HCWillowbranch','Base.TreeBranch','Base.Twigs','Hydrocraft.HCFirbough','Hydrocraft.HCPinebough','Hydrocraft.HCMapleleaf','Hydrocraft.HCHickoryleaves','Hydrocraft.HCOakleaves','Hydrocraft.HCClover','Hydrocraft.HCWillowbark','Hydrocraft.HCBirchbark','Hydrocraft.HCBark','Hydrocraft.HCStraw','Hydrocraft.HCGrass','Hydrocraft.HCNettles'} medium = {'Hydrocraft.HCBleedingheart','Hydrocraft.HCCrabapple','Hydrocraft.HCSeaberry','Hydrocraft.HCBlackcurrant','Hydrocraft.HCRedcurrant','Hydrocraft.HCCrampbarkberry','Hydrocraft.HCGooseberry','Hydrocraft.HCHuckleberry','Hydrocraft.HCCranberry','Hydrocraft.HCArrowwoodberry','Hydrocraft.HCRaspberry','Hydrocraft.HCSumacberry','Hydrocraft.HCCrowberry','Hydrocraft.HCBlackthornberry','Hydrocraft.HCHawthornfruit','farming.Cabbage','farming.Potato','Base.Corn','Hydrocraft.HCTetterwort','Hydrocraft.HCMazus','Hydrocraft.HCCamellia','Hydrocraft.HCMorningglory','Hydrocraft.HCStrelitzia','Hydrocraft.HCColumbine','Hydrocraft.HCCinquefoils','Hydrocraft.HCChrysanthemum','Base.Log','Hydrocraft.HCSunflower','Hydrocraft.HCRhododendron','Hydrocraft.HCCalily','Hydrocraft.HCMagnolia','Hydrocraft.HCCarnation','Hydrocraft.HCBluedaisy','Hydrocraft.HCBlewitshroom','Hydrocraft.HCAnemome','Hydrocraft.HCDaffodil','Hydrocraft.HCTulip','Hydrocraft.HCPansy','Hydrocraft.HCDaisy','Hydrocraft.HCIris','Hydrocraft.HCWolfsbane','Hydrocraft.HCMandrake','Hydrocraft.HCBelladonna','Hydrocraft.HCLobstershroom','Hydrocraft.HCYellowmorelshroom','Hydrocraft.HCWitchshatshroom','Base.MushroomGeneric7','Base.MushroomGeneric6','Base.MushroomGeneric5','Base.MushroomGeneric4','Base.MushroomGeneric3','Base.MushroomGeneric2','Base.MushroomGeneric1','Base.Rosehips','Hydrocraft.HCValerian','Hydrocraft.HCCamomile','Hydrocraft.HCLavender','Hydrocraft.HCSpeedwell','Hydrocraft.HCDogwood','Hydrocraft.HCChantrelle','Hydrocraft.HCChicory','Hydrocraft.HCMulberry','Hydrocraft.HCMulberryleaf','Hydrocraft.HCKvann','Hydrocraft.HCHolly','Hydrocraft.HCJutestems','Hydrocraft.HCAcorn','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCFlaxflower','Hydrocraft.HCFlax'} good = {'Base.Lemon','Base.Apple','Hydrocraft.HCRaspberry','Hydrocraft.HCOakLog','Hydrocraft.HCCamellia','Hydrocraft.HCCandleberry','Hydrocraft.HCRosebud','Hydrocraft.HCLavender'} end diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt index 49e393f4..aa6c6cde 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt @@ -833,7 +833,7 @@ recipe Seal Biowaste recipe Fill Empty Metal Barrel With Gasoline { - PetrolCan=20, + [Recipe.GetItemTypes.Petrol]=20, HCBarrelmetalempty, keep HCFunnel/HCGlassfunnel, Result:HCBarrelmetalgasoline, @@ -854,7 +854,7 @@ recipe Fill Empty Metal Barrel With Gasoline recipe Fill Empty Gasoline Barrel With Gasoline { - PetrolCan=20, + [Recipe.GetItemTypes.Petrol]=20, HCGasolinebarrelempty, keep HCFunnel/HCGlassfunnel, Result:HCGasolinebarrelfull, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt index ca47de84..786db25f 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt @@ -956,7 +956,7 @@ recipe Research Blue Meth SkillRequired:Doctor=4, Notebook, Pencil/Pen, - keep HCLabbig, + keep HCLabbig2, keep HCBookchemistry, keep HCBookpharmacology, keep HCBookaluminumworking, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt index fe613732..301cc6d4 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt @@ -686,7 +686,7 @@ recipe Make Bone Powder recipe Make Bone Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCBone/HCZombiebones, CanBeDoneFromFloor:true, Result:HCBonepowder=2, @@ -710,7 +710,7 @@ recipe Make Shell Powder recipe Make Shell Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCMusselshell, CanBeDoneFromFloor:true, Result:HCShellpowder=2, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt index a7c0bc56..13631997 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt @@ -81,7 +81,7 @@ recipe Use Centrifiuge recipe Use Electrolyzer { keep HCElectrolyzer, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCObsidianpowder=12, NeedToBeLearn:true, Result:HCIronpowder, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt index b9041211..de77c2fd 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt @@ -721,7 +721,7 @@ recipe Make Chalk Powder recipe Make Chalk Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCChalk/HCChalkrock, CanBeDoneFromFloor:true, Result:HCChalkpowder=2, @@ -745,7 +745,7 @@ recipe Make Charcoal Powder recipe Make Charcoal Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], Charcoal, CanBeDoneFromFloor:true, Result:HCCharcoalpowder=2, @@ -770,7 +770,7 @@ recipe Make Graphite Powder recipe Make Graphite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCGraphite, CanBeDoneFromFloor:true, Result:HCGraphitepowder=2, @@ -795,7 +795,7 @@ recipe Make Saltpeter Powder recipe Make Saltpeter Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCSaltpeter, CanBeDoneFromFloor:true, Result:HCSaltpeterpowder=2, @@ -820,7 +820,7 @@ recipe Make Sulphur Powder recipe Make Sulphur Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCSulphur, CanBeDoneFromFloor:true, Result:HCSulphurpowder=2, @@ -845,7 +845,7 @@ recipe Make Copper Powder recipe Make Copper Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCCopperore, CanBeDoneFromFloor:true, Result:HCCopperpowder=2, @@ -870,7 +870,7 @@ recipe Make Tin Powder recipe Make Tin Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCTinore, CanBeDoneFromFloor:true, Result:HCTinpowder=2, @@ -895,7 +895,7 @@ recipe Make Lead Powder recipe Make Lead Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCLeadore, CanBeDoneFromFloor:true, Result:HCLeadpowder=2, @@ -920,7 +920,7 @@ recipe Make Iron Powder recipe Make Iron Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCIronore, CanBeDoneFromFloor:true, Result:HCIronpowder=2, @@ -945,7 +945,7 @@ recipe Make Magnetite Powder recipe Make Magnetite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCMagnetite, CanBeDoneFromFloor:true, Result:HCMagnetitepowder=2, @@ -970,7 +970,7 @@ recipe Make Meteorite Powder recipe Make Meteorite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCMeteorite, CanBeDoneFromFloor:true, Result:HCMeteoritepowder=2, @@ -995,7 +995,7 @@ recipe Make Silver Powder recipe Make Silver Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCSilverore, CanBeDoneFromFloor:true, Result:HCSilverpowder=2, @@ -1020,7 +1020,7 @@ recipe Make Gold Powder recipe Make Gold Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCGoldore, CanBeDoneFromFloor:true, Result:HCGoldpowder=2, @@ -1045,7 +1045,7 @@ recipe Make Aluminum Powder recipe Make Aluminum Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCBauxiteore, CanBeDoneFromFloor:true, Result:HCAluminumpowder=2, @@ -1070,7 +1070,7 @@ recipe Make Zinc Powder recipe Make Zinc Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCZincore, CanBeDoneFromFloor:true, Result:HCZincpowder=2, @@ -1095,7 +1095,7 @@ recipe Make Nickel Powder recipe Make Nickel Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCNickelore, CanBeDoneFromFloor:true, Result:HCNickelpowder=2, @@ -1120,7 +1120,7 @@ recipe Make Cobalt Powder recipe Make Cobalt Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCCobaltore, CanBeDoneFromFloor:true, Result:HCCobaltpowder=2, @@ -1145,7 +1145,7 @@ recipe Make Chrome Powder recipe Make Chrome Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCChromeore, CanBeDoneFromFloor:true, Result:HCChromepowder=2, @@ -1170,7 +1170,7 @@ recipe Make Tungsten Powder recipe Make Tungsten Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCTungstenore, CanBeDoneFromFloor:true, Result:HCTungstenpowder=2, @@ -1184,7 +1184,7 @@ recipe Make Tungsten Powder recipe Make Titanium Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCTitaniumore, CanBeDoneFromFloor:true, Result:HCTitaniumpowder=2, @@ -1222,7 +1222,7 @@ recipe Make Phosphorus Powder recipe Make Phosphorus Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCBerlinite/HCLapislazuli, CanBeDoneFromFloor:true, Result:HCPhosphoruspowder=2, @@ -1247,7 +1247,7 @@ recipe Make Lithium Powder recipe Make Lithium Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCLithiumore, CanBeDoneFromFloor:true, Result:HCLithiumpowder=2, @@ -1272,7 +1272,7 @@ recipe Make Lapis Lazuli Powder recipe Make Lapis Lazuli Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCLapislazuli, CanBeDoneFromFloor:true, Result:HCLapislazulipowder=2, @@ -1297,7 +1297,7 @@ recipe Make Azurite Powder recipe Make Azurite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCAzurite, CanBeDoneFromFloor:true, Result:HCAzuritepowder=2, @@ -1322,7 +1322,7 @@ recipe Make Jade Powder recipe Make Jade Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCJade, CanBeDoneFromFloor:true, Result:HCJadepowder=2, @@ -1347,7 +1347,7 @@ recipe Make Malachite Powder recipe Make Malachite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCMalachite, CanBeDoneFromFloor:true, Result:HCMalachitepowder=2, @@ -1372,7 +1372,7 @@ recipe Make Marble Powder recipe Make Marble Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCMarble, CanBeDoneFromFloor:true, Result:HCMarblepowder=2, @@ -1397,7 +1397,7 @@ recipe Make Albite Powder recipe Make Albite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCAlbite, CanBeDoneFromFloor:true, Result:HCAlbitepowder=2, @@ -1422,7 +1422,7 @@ recipe Make Feldspar Powder recipe Make Feldspar Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCFeldspar, CanBeDoneFromFloor:true, Result:HCFeldsparpowder=2, @@ -1447,7 +1447,7 @@ recipe Make Gypsum Powder recipe Make Gypsum Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCGypsum, CanBeDoneFromFloor:true, Result:HCGypsumpowder=2, @@ -1472,7 +1472,7 @@ recipe Make Diatomite Powder recipe Make Diatomite Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCDiatomite, CanBeDoneFromFloor:true, Result:HCDiatomitepowder=2, @@ -1496,7 +1496,7 @@ recipe Make Trona Powder recipe Make Trona Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCTrona, CanBeDoneFromFloor:true, Result:HCTronapowder=2, @@ -1533,7 +1533,7 @@ recipe Make Thermite { Sparklers=10, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:HCThermite=2, NeedToBeLearn:true, @@ -1598,7 +1598,7 @@ recipe Fill Ammonal in Bag recipe Make Ephedrin Powder { - keep HCLab/HCMedicallab, + keep HCLab2/HCMedicallab2, HCEphedrine=15, Result:HCEphedrinepowder, CanBeDoneFromFloor:true, @@ -1611,7 +1611,7 @@ recipe Make Ephedrin Powder recipe Make Ephedrin Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCEphedrine=15, CanBeDoneFromFloor:true, Result:HCEphedrinepowder=2, @@ -2052,7 +2052,7 @@ recipe Grind Solid Fuel Cube recipe Grind Solid Fuel Cube { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCSolidfuelcube, CanBeDoneFromFloor:true, Result:HCHexapowder=2, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Meth.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Meth.txt index b19abbb2..9b2f7797 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Meth.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Meth.txt @@ -80,7 +80,7 @@ recipe Make Homemade Crystal Meth recipe Cook Blue Meth { SkillRequired:Doctor=6, - keep HCLabbig, + keep HCLabbig2, keep HazmatSuit/HCImprovisedhazmat, BakingTray=5, HCAluminumpowder=5, @@ -99,7 +99,7 @@ recipe Cook Blue Meth recipe Cook Blue Meth { SkillRequired:Doctor=6, - keep HCLabbig, + keep HCLabbig2, keep HazmatSuit/HCImprovisedhazmat, BakingTray=5, HCAluminumpowder=5, @@ -117,7 +117,7 @@ recipe Cook Blue Meth recipe Cook Blue Meth { SkillRequired:Doctor=6, - keep HCLabbig, + keep HCLabbig2, keep HazmatSuit/HCImprovisedhazmat, BakingTray=5, HCAluminumpowder=5, @@ -135,7 +135,7 @@ recipe Cook Blue Meth recipe Cook Blue Meth { SkillRequired:Doctor=6, - keep HCLabbig, + keep HCLabbig2, keep HazmatSuit/HCImprovisedhazmat, BakingTray=5, HCAluminumpowder=5, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Tobacco.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Tobacco.txt index 8165fdd4..25f60bd1 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Tobacco.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Drugs Tobacco.txt @@ -356,7 +356,7 @@ recipe Grind Tobacco recipe Grind Tobacco { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCTobaccoleafdry, CanBeDoneFromFloor:true, Result:HCTobacco=2, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Flour.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Flour.txt index b7ed57b6..9f376e5e 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Flour.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Flour.txt @@ -925,7 +925,7 @@ recipe Grind Acorn Flour HCAcornsoaked=24, HCFlourempty=2, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Flour=2, Time:600, @@ -938,7 +938,7 @@ recipe Grind Corn Flour SkillRequired:Cooking=5, Corn/HCCornred/HCCornblue/HCCornwhite=5, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Cornflour=2, Time:600, @@ -952,7 +952,7 @@ recipe Grind Rice Flour Rice/HCRicebrown=2, HCFlourempty=2, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:HCRiceflour=2, Time:600, @@ -980,7 +980,7 @@ recipe Grind Rice with Chaff HCChaffrice=2, HCRiceempty=2, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:HCRicebrown=2, OnCreate:recipe_hcchaff2, @@ -995,7 +995,7 @@ recipe Grind Rice with Chaff HCChaffrice=2, HCRiceempty=2, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Rice=2, OnCreate:recipe_hcchaffbran, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Salt.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Salt.txt index ac68acdd..43df17c2 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Salt.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Food Salt.txt @@ -429,7 +429,7 @@ recipe Make Salt Powder recipe Make Salt Powder { keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCRocksalt, CanBeDoneFromFloor:true, Result:HCSaltpowder=10, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Lab.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Lab.txt index 2cf7b2c1..35190dd0 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Lab.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Lab.txt @@ -700,9 +700,9 @@ recipe Anchor Laboratory recipe Anchor Professional Lab { - HCLabbig2, + HCLabbig, CanBeDoneFromFloor:true, - Result:HCLabbig, + Result:HCLabbig2, Time:100, Category:Anchor, } diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Microbiology.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Microbiology.txt index cceff232..387300f3 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Microbiology.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Microbiology.txt @@ -222,6 +222,7 @@ recipe Examine Biowaste keep HCMedicallab2, HCPetribiowaste, Result:HCLatexgloves, + RemoveResultItem:true, CanBeDoneFromFloor:true, Time:250, NeedToBeLearn:true, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Programing.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Programing.txt index e8f8ed52..af510bc0 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Programing.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Programing.txt @@ -133,7 +133,7 @@ recipe Make Desktop Computer recipe Write Computer Program { SkillRequired:Electricity=5, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCFloppy, keep HCBookbiology, keep HCBookmicrobiology, @@ -151,7 +151,7 @@ recipe Write Computer Program recipe Write Computer Program { SkillRequired:Electricity=6, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCFloppy, keep HCFloppygraphics, keep HCBookcalculus, @@ -171,7 +171,7 @@ recipe Write Computer Program recipe Write Computer Program { SkillRequired:Electricity=6, - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCFloppy, keep HCFloppyaudio, keep HCBookcalculus, @@ -190,7 +190,7 @@ recipe Write Computer Program recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame1, keep HCComputerdesktop, CanBeDoneFromFloor:true, @@ -202,7 +202,7 @@ recipe Play Computer Game recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame2, keep HCComputerdesktop, CanBeDoneFromFloor:true, @@ -215,7 +215,7 @@ recipe Play Computer Game recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame3, keep HCComputerdesktop, CanBeDoneFromFloor:true, @@ -228,7 +228,7 @@ recipe Play Computer Game recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame4, keep HCComputerdesktop, CanBeDoneFromFloor:true, @@ -241,7 +241,7 @@ recipe Play Computer Game recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame5, keep HCComputerdesktop, CanBeDoneFromFloor:true, @@ -254,7 +254,7 @@ recipe Play Computer Game recipe Play Computer Game { - PetrolCan, + [Recipe.GetItemTypes.Petrol], HCPCgame6, keep HCComputerdesktop, CanBeDoneFromFloor:true, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Stoneworking.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Stoneworking.txt index ab77e620..edc1d033 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Stoneworking.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Stoneworking.txt @@ -757,7 +757,7 @@ recipe Make Gravel { EmptySandbag, Stone=10, - PetrolCan=4, + [Recipe.GetItemTypes.Petrol]=4, keep HCStampmillgen, Result:Gravelbag, NeedToBeLearn:true, @@ -783,7 +783,7 @@ recipe Make Gravel EmptySandbag=2, Stone=10, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Gravelbag=2, NeedToBeLearn:true, @@ -797,7 +797,7 @@ recipe Make Gravel EmptySandbag=2, SharpedStone=15, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Gravelbag=2, NeedToBeLearn:true, @@ -874,7 +874,7 @@ recipe Make Gravel { HCWoodenbucket, Stone=10, - PetrolCan=4, + [Recipe.GetItemTypes.Petrol]=4, keep HCStampmillgen, Result:HCWoodenbucketgravel, NeedToBeLearn:true, @@ -900,7 +900,7 @@ recipe Make Gravel HCWoodenbucket=2, Stone=10, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:HCWoodenbucketgravel=2, NeedToBeLearn:true, @@ -952,7 +952,7 @@ recipe Make Sand { EmptySandbag, HCSandstone=10, - PetrolCan=4, + [Recipe.GetItemTypes.Petrol]=4, keep HCStampmillgen, Result:Sandbag, NeedToBeLearn:true, @@ -978,7 +978,7 @@ recipe Make Sand EmptySandbag=2, HCSandstone=10, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:Sandbag=2, NeedToBeLearn:true, @@ -1030,7 +1030,7 @@ recipe Make Sand { HCWoodenbucket, HCSandstone=10, - PetrolCan=4, + [Recipe.GetItemTypes.Petrol]=4, keep HCStampmillgen, Result:HCWoodenbucketsand, NeedToBeLearn:true, @@ -1056,7 +1056,7 @@ recipe Make Sand HCWoodenbucket=2, HCSandstone=10, keep HCMacerator, - PetrolCan, + [Recipe.GetItemTypes.Petrol], CanBeDoneFromFloor:true, Result:HCWoodenbucketsand=2, NeedToBeLearn:true, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Travel.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Travel.txt index ff2d8737..41353494 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Travel.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Travel.txt @@ -89,7 +89,7 @@ recipe Travel to Bedford Falls keep HCHelicopterL/HCHelicopterR, keep HCMap, keep HCCompass, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, keep HCTicketBF, Result:HCToyhelicopter, CanBeDoneFromFloor:true, @@ -106,7 +106,7 @@ recipe Travel to Crossroads keep HCMap, keep HCCompass, keep HCTicketCR, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -122,7 +122,7 @@ recipe Travel to New Denver keep HCMap, keep HCCompass, keep HCTicketND, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -138,7 +138,7 @@ recipe Travel to Valley Station keep HCMap, keep HCCompass, keep HCTicketVS, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -153,7 +153,7 @@ recipe Travel to Bedford Falls keep HCHelicopterL/HCHelicopterR, keep HCGPS, keep HCTicketBF, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -168,7 +168,7 @@ recipe Travel to Crossroads keep HCHelicopterL/HCHelicopterR, keep HCGPS, keep HCTicketCR, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -183,7 +183,7 @@ recipe Travel to New Denver keep HCHelicopterL/HCHelicopterR, keep HCGPS, keep HCTicketND, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, @@ -198,7 +198,7 @@ recipe Travel to Valley Station keep HCHelicopterL/HCHelicopterR, keep HCGPS, keep HCTicketVS, - PetrolCan=16, + [Recipe.GetItemTypes.Petrol]=16, Result:HCToyhelicopter, CanBeDoneFromFloor:true, Time:500.0, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Explosives.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Explosives.txt index b4689607..f43d7718 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Explosives.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Explosives.txt @@ -786,7 +786,7 @@ recipe Make Dynamite HCSawdust=3, HCMotoroil, GunPowder=3, - keep HCLab/HCLabbig, + keep HCLab2/HCLabbig2, CanBeDoneFromFloor:true, NeedToBeLearn:true, Result:HCDynamite=3, diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Flame.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Flame.txt index bb58da19..d49af4eb 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Flame.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapons Flame.txt @@ -185,7 +185,7 @@ recipe Make Pot With Soap recipe Make Napalm { HCPotmoltensoap, - PetrolCan=2, + [Recipe.GetItemTypes.Petrol]=2, Result:HCPotnapalm, Time:40.0, Category:Chemistry, From c8827e90b80973053f52cf0a51136d1bdc5fd473 Mon Sep 17 00:00:00 2001 From: Shydow Date: Fri, 17 Nov 2023 08:13:08 -0600 Subject: [PATCH 2/2] Missed file in previous commit --- .../Hydrocraft/media/scripts/Hydrocraft/HC_Weapon Ranged.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapon Ranged.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapon Ranged.txt index 262ee77f..4b71c21e 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapon Ranged.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Weapon Ranged.txt @@ -21,7 +21,7 @@ module Hydrocraft DisplayName = Bone Arrowhead, Icon = HCBonearrowhead, Type = Normal, - Weight = 0.1, + Weight = 0.01, DisplayCategory = CraftAmmo, }