diff --git a/Contents/mods/Hydrocraft/media/lua/server/Items/Distributions_HC.lua b/Contents/mods/Hydrocraft/media/lua/server/Items/Distributions_HC.lua index b8f53ab5..3d087fd7 100644 --- a/Contents/mods/Hydrocraft/media/lua/server/Items/Distributions_HC.lua +++ b/Contents/mods/Hydrocraft/media/lua/server/Items/Distributions_HC.lua @@ -29,9 +29,9 @@ local crate_items = { "Hydrocraft.HCForklift", 0.2, "Hydrocraft.HCStepladder", 0.2, "Hydrocraft.HCScissorlift", 0.2, - "Hydrocraft.HCBicycle", 0.8, + "Hydrocraft.HCBicycle", 1, "Hydrocraft.HCWeldinghose", 1.3, - "Hydrocraft.HCWeldingtank", 1.3, + "Hydrocraft.HCWeldingtank", 1.5, "Hydrocraft.HCXbowbolt", 1.8, "Hydrocraft.HCArrow", 1.8, "Hydrocraft.HCSteelpipebox", 1.0, diff --git a/Contents/mods/Hydrocraft/media/lua/server/RockHCExtra.lua b/Contents/mods/Hydrocraft/media/lua/server/RockHCExtra.lua index 8a2dce17..32ab0c15 100644 --- a/Contents/mods/Hydrocraft/media/lua/server/RockHCExtra.lua +++ b/Contents/mods/Hydrocraft/media/lua/server/RockHCExtra.lua @@ -21,48 +21,64 @@ skill = player:getPerkLevel(Perks.PlantScavenging); if chance <= dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCSandstone"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashlarge"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); + elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashlarge"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCMetalArrowhead"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashmedium"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); + elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashmedium"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(3); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCBauxiteore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashsmall"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); + elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashsmall"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); elseif secondChance == 2 then player:getInventory():AddItem("Base.ScrapMetal"); end elseif chance <= dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCIronore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCLeadore"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); + elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCLeadore"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCCopperore"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTinore"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl5+dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2) if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCCoal"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCStonearrowhead"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl4+dirtLvl5+dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCRocksalt"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCSandstone"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl3+dirtLvl4+dirtLvl5+dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCMetalArrowhead"); + player:getInventory():AddItems("Hydrocraft.HCRedclay",1); elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCLimestone"); + player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl2+dirtLvl3+dirtLvl4+dirtLvl5+dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCRedclay"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCGreyclay"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCRedclay",1); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCGreyclay",1); end elseif chance <= dirtLvl1+dirtLvl2+dirtLvl3+dirtLvl4+dirtLvl5+dirtLvl6+dirtLvl7+dirtLvl8+dirtLvl9+dirtLvl10 then secondChance = ZombRand(2); @@ -210,10 +226,10 @@ end function HCDarkmine(items, result, player) local pl = getPlayer(); -pl:getXp():AddXP(Perks.Strength, 5); -pl:getXp():AddXP(Perks.Fitness, 5); +pl:getXp():AddXP(Perks.Strength, 10); +pl:getXp():AddXP(Perks.Fitness, 10); -player:getStats():setEndurance(player:getStats():getEndurance() - 0.01) +player:getStats():setEndurance(player:getStats():getEndurance() - 0.15) skill = player:getPerkLevel(Perks.PlantScavenging); for i=1,5,1 do @@ -234,63 +250,63 @@ for i=1,5,1 do secondChance = 0; if chance <= darkLvl10 then secondChance = ZombRand(7); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCGoldore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTrashlarge"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCZincore"); - elseif secondChance == 3 then player:getInventory():AddItem("Hydrocraft.HCTungstenore"); - elseif secondChance == 4 then player:getInventory():AddItem("Hydrocraft.HCTitaniumore"); - elseif secondChance == 5 then player:getInventory():AddItem("Hydrocraft.HCBerlinite"); - elseif secondChance == 6 then player:getInventory():AddItem("Hydrocraft.HCDiatomite"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCGoldore",2); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCTrashlarge",2); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCZincore",2); + elseif secondChance == 3 then player:getInventory():AddItems("Hydrocraft.HCTungstenore",2); + elseif secondChance == 4 then player:getInventory():AddItems("Hydrocraft.HCTitaniumore",2); + elseif secondChance == 5 then player:getInventory():AddItems("Hydrocraft.HCBerlinite",2); + elseif secondChance == 6 then player:getInventory():AddItems("Hydrocraft.HCDiatomite",2); end elseif chance <= darkLvl9+darkLvl10 then secondChance = ZombRand(7); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCSilverore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCLithiumore"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCTrona"); - elseif secondChance == 3 then player:getInventory():AddItem("Hydrocraft.HCTrashmedium"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCSilverore",2); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCLithiumore",2); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCTrona",2); + elseif secondChance == 3 then player:getInventory():AddItems("Hydrocraft.HCTrashmedium",2); elseif secondChance == 4 then player:getInventory():AddItem("Hydrocraft.HCTitaniumore"); - elseif secondChance == 5 then player:getInventory():AddItem("Hydrocraft.HCChromeore"); + elseif secondChance == 5 then player:getInventory():AddItems("Hydrocraft.HCChromeore",2); end elseif chance <= darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(8); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCBauxiteore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCCinnabar"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCMagnetite"); - elseif secondChance == 3 then player:getInventory():AddItem("Hydrocraft.HCZincore"); - elseif secondChance == 4 then player:getInventory():AddItem("Hydrocraft.HCNickelore"); - elseif secondChance == 5 then player:getInventory():AddItem("Hydrocraft.HCDiatomite"); - elseif secondChance == 6 then player:getInventory():AddItem("Hydrocraft.HCTrashsmall"); - elseif secondChance == 7 then player:getInventory():AddItem("Hydrocraft.HCAlbite"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCBauxiteore",3); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCCinnabar",3); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCMagnetite",3); + elseif secondChance == 3 then player:getInventory():AddItems("Hydrocraft.HCZincore",3); + elseif secondChance == 4 then player:getInventory():AddItems("Hydrocraft.HCNickelore",3); + elseif secondChance == 5 then player:getInventory():AddItems("Hydrocraft.HCDiatomite",3); + elseif secondChance == 6 then player:getInventory():AddItems("Hydrocraft.HCTrashsmall",3); + elseif secondChance == 7 then player:getInventory():AddItems("Hydrocraft.HCAlbite",3); end elseif chance <= darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(5); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCIronore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCLeadore"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCSaltpeter"); - elseif secondChance == 3 then player:getInventory():AddItem("Hydrocraft.HCSulphur"); - elseif secondChance == 4 then player:getInventory():AddItem("Hydrocraft.HCTrashlarge"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCIronore",3); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCLeadore",3); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCSaltpeter",3); + elseif secondChance == 3 then player:getInventory():AddItems("Hydrocraft.HCSulphur",3); + elseif secondChance == 4 then player:getInventory():AddItems("Hydrocraft.HCTrashlarge",3); end elseif chance <= darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(6); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCCopperore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTinore"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCGypsum"); - elseif secondChance == 3 then player:getInventory():AddItem("Hydrocraft.HCAzurite"); - elseif secondChance == 4 then player:getInventory():AddItem("Hydrocraft.HCMalachite"); - elseif secondChance == 5 then player:getInventory():AddItem("Hydrocraft.HCCobaltore"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCCopperore",3); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCTinore",3); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCGypsum",3); + elseif secondChance == 3 then player:getInventory():AddItems("Hydrocraft.HCAzurite",3); + elseif secondChance == 4 then player:getInventory():AddItems("Hydrocraft.HCMalachite",3); + elseif secondChance == 5 then player:getInventory():AddItems("Hydrocraft.HCCobaltore",3); end elseif chance <= darkLvl5+darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(3) - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCZincore"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCTar"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCGraphite"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCZincore",3); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCTar",3); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCGraphite",3); end elseif chance <= darkLvl4+darkLvl5+darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(4); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCBorax"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCFeldspar"); - elseif secondChance == 2 then player:getInventory():AddItem("Hydrocraft.HCRocksalt"); - elseif secondChance == 3 then player:getInventory():AddItem("Base.ScrapMetal"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCBorax",3); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCFeldspar",3); + elseif secondChance == 2 then player:getInventory():AddItems("Hydrocraft.HCRocksalt",3); + elseif secondChance == 3 then player:getInventory():AddItems("Base.ScrapMetal",3); end elseif chance <= darkLvl3+darkLvl4+darkLvl5+darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(3); @@ -307,13 +323,13 @@ for i=1,5,1 do end elseif chance <= darkLvl1+darkLvl2+darkLvl3+darkLvl4+darkLvl5+darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(2); - if secondChance == 0 then player:getInventory():AddItem("Hydrocraft.HCRedclay"); - elseif secondChance == 1 then player:getInventory():AddItem("Hydrocraft.HCGreyclay"); + if secondChance == 0 then player:getInventory():AddItems("Hydrocraft.HCRedclay",5); + elseif secondChance == 1 then player:getInventory():AddItems("Hydrocraft.HCGreyclay",5); end elseif chance <= darkLvl0+darkLvl1+darkLvl2+darkLvl3+darkLvl4+darkLvl5+darkLvl6+darkLvl7+darkLvl8+darkLvl9+darkLvl10 then secondChance = ZombRand(2); if secondChance == 0 then player:getInventory():AddItem("Base.SharpedStone"); - elseif secondChance == 1 then player:getInventory():AddItem("Base.Stone"); + elseif secondChance == 1 then player:getInventory():AddItems("Base.Stone",5); end end end diff --git a/Contents/mods/Hydrocraft/media/lua/server/XpSystem/HCGetXP.lua b/Contents/mods/Hydrocraft/media/lua/server/XpSystem/HCGetXP.lua index 16521b9d..e129c14c 100644 --- a/Contents/mods/Hydrocraft/media/lua/server/XpSystem/HCGetXP.lua +++ b/Contents/mods/Hydrocraft/media/lua/server/XpSystem/HCGetXP.lua @@ -175,4 +175,12 @@ end function HCTailoring_OnGiveManyXP(recipe, ingredients, result, player) player:getXp():AddXP(Perks.Tailoring, 10); +end + +function HCMaintenance_OnGiveXP(recipe, ingredients, result, player) + player:getXp():AddXP(Perks.Maintenance, 10); +end + +function HCMaintenance_OnGiveManyXP(recipe, ingredients, result, player) + player:getXp():AddXP(Perks.Maintenance, 25); end \ No newline at end of file diff --git a/Contents/mods/Hydrocraft/media/scripts/Candlemaking.txt b/Contents/mods/Hydrocraft/media/scripts/Candlemaking.txt index b411639c..07d05a8e 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Candlemaking.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Candlemaking.txt @@ -87,7 +87,7 @@ item HCMininghat { Weight = 0.5, Type = Drainable, - UseDelta = 0.1, + UseDelta = 0.01, ReplaceOnDeplete = HCHardhat, DisplayName = Candle Mining Hat, icon = HCMininghat, @@ -107,7 +107,7 @@ item HCMininghatlamppowered { Weight = 0.5, Type = Drainable, - UseDelta = 0.3, + UseDelta = 0.05, ReplaceOnDeplete = HCMininghatlampdead, DisplayName = Flashlight Mining Hat with Power, icon = HCMininghat2, diff --git a/Contents/mods/Hydrocraft/media/scripts/Mining.txt b/Contents/mods/Hydrocraft/media/scripts/Mining.txt index 6f71190d..224461d5 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Mining.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Mining.txt @@ -823,6 +823,17 @@ recipe Dig Quarry OnGiveXP:HCHunger_OnGiveXP, } +recipe Dig Quarry + { + PickAxe, + CanBeDoneFromFloor:true, + Result:HCQuarrystone, + NeedToBeLearn:true, + Time:5000, + Category:Stoneworking, + OnGiveXP:HCHunger_OnGiveXP, + } + recipe Anchor Quarry { HCQuarrystone, @@ -869,7 +880,7 @@ recipe Mine CanBeDoneFromFloor:true, Result:HCDirt, NeedToBeLearn:true, - Time:300, + Time:100, Category:Stoneworking, OnCreate:HCMine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -882,7 +893,7 @@ recipe Mine CanBeDoneFromFloor:true, Result:HCDirt, NeedToBeLearn:true, - Time:150, + Time:10, Category:Stoneworking, OnCreate:HCMine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -900,7 +911,7 @@ recipe Mine CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:1000, + Time:300, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -914,7 +925,33 @@ recipe Mine CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:500, + Time:80, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + keep HCDarkmineB, + keep Shovel/Shovel2/PickAxe, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:1000, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + keep HCDarkmineB, + HCMiningdrillpowered/HCMiningchiselpowered, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:800, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -931,7 +968,7 @@ recipe Mine CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:750, + Time:250, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -945,7 +982,33 @@ recipe Mine CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:350, + Time:150, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + keep HCDarkmine2B, + keep Shovel/Shovel2/PickAxe, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:900, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + keep HCDarkmine2B, + HCMiningdrillpowered/HCMiningchiselpowered, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:750, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -960,13 +1023,13 @@ recipe Mine { HCMininghat/HCMininghatlamppowered, Charcoal=1, - Water=10, + Water=2, keep HCDarkmine3B, keep Shovel/Shovel2/PickAxe, CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:500, + Time:50, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -976,13 +1039,43 @@ recipe Mine { HCMininghat/HCMininghatlamppowered, Charcoal=1, - Water=10, + Water=2, keep HCDarkmine3B, HCMiningdrillpowered/HCMiningchiselpowered, CanBeDoneFromFloor:true, Result:Stone, NeedToBeLearn:true, - Time:250, + Time:5, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + Charcoal=1, + Water=2, + keep HCDarkmine3B, + keep Shovel/Shovel2/PickAxe, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:800, + Category:Stoneworking, + OnCreate:HCDarkmine, + OnGiveXP:HCPlantScavenging_OnGiveXP, + } + +recipe Mine without light + { + Charcoal=1, + Water=2, + keep HCDarkmine3B, + HCMiningdrillpowered/HCMiningchiselpowered, + CanBeDoneFromFloor:true, + Result:Stone, + NeedToBeLearn:true, + Time:650, Category:Stoneworking, OnCreate:HCDarkmine, OnGiveXP:HCPlantScavenging_OnGiveXP, @@ -995,9 +1088,9 @@ recipe Mine Iron keep HCIronMineB, keep Shovel/Shovel2/PickAxe, CanBeDoneFromFloor:true, - Result:HCIronore, + Result:HCIronore=5, NeedToBeLearn:true, - Time:250, + Time:750, Category:Stoneworking, OnGiveXP:HCPlantScavenging_OnGiveXP, } @@ -1007,9 +1100,9 @@ recipe Mine Coal keep HCCoalMineB, keep Shovel/Shovel2/PickAxe, CanBeDoneFromFloor:true, - Result:HCCoal, + Result:HCCoal=5, NeedToBeLearn:true, - Time:250, + Time:750, Category:Stoneworking, OnGiveXP:HCPlantScavenging_OnGiveXP, } @@ -1049,10 +1142,10 @@ recipe Mine Stone keep HCQuarrystone2, keep PickAxe, CanBeDoneFromFloor:true, - Result:Stone, + Result:Stone=3, OnCreate:HCMineStone, NeedToBeLearn:true, - Time:250, + Time:500, Category:Stoneworking, OnGiveXP:HCPlantScavenging_OnGiveXP, } diff --git a/Contents/mods/Hydrocraft/media/scripts/Seeds.txt b/Contents/mods/Hydrocraft/media/scripts/Seeds.txt index 987c8464..03d584c5 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Seeds.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Seeds.txt @@ -1501,7 +1501,7 @@ item HCBeetsugarseedpacket { OnTest:HCNearHerbatable, keep HCSieve/HCFloursieve, - Popcorn/Cereal/HCHerbs, + Popcorn/Cereal/HCHerbs/HCDirt, CanBeDoneFromFloor:true, Time:200, Category:Farming, diff --git a/Contents/mods/Hydrocraft/media/scripts/Smithing.txt b/Contents/mods/Hydrocraft/media/scripts/Smithing.txt index 0d6ab545..2cf406e2 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Smithing.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Smithing.txt @@ -791,7 +791,7 @@ recipe Unpack Pallet of Steel Pipes recipe Pack Pallet of Steel Pipes { - HCSteelpipe=12, + HCSteelpipe=48, HCRopethick, HCWoodenpallet, CanBeDoneFromFloor:true, @@ -2846,4 +2846,36 @@ recipe Unpack Pallet of Metal Bars OnCreate:recipe_hcpallet, } +recipe Smash Steel + { + SkillRequired:Metalworking=3, + HCSteelingot, + keep HCSmithyhammertitanium, + keep Tongs, + keep HCWorkgloves/HCOvenmitts, + keep HCAnvil2/HCAnvillead2, + CanBeDoneFromFloor:true, + Result:HCIronpowder, + Time:200.0, + NeedToBeLearn:true, + Category:Smithing, + OnGiveXP:HCMaintenance_OnGiveXP, + } + +recipe Make Colander + { + SkillRequired:Metalworking=4, + Wire=5, + keep HCSmithyhammeriron, + keep Tongs, + keep HCWorkgloves/HCOvenmitts, + keep HCAnvil2/HCAnvillead2, + CanBeDoneFromFloor:true, + Result:HCColander, + Time:1000.0, + NeedToBeLearn:false, + Category:Smithing, + OnGiveXP:HCMaintenance_OnGiveManyXP, + } + } diff --git a/Contents/mods/Hydrocraft/media/scripts/Weapons Hammers.txt b/Contents/mods/Hydrocraft/media/scripts/Weapons Hammers.txt index 99c5c695..b1b50c1f 100644 --- a/Contents/mods/Hydrocraft/media/scripts/Weapons Hammers.txt +++ b/Contents/mods/Hydrocraft/media/scripts/Weapons Hammers.txt @@ -737,8 +737,8 @@ recipe Make Steel Sledgehammer recipe Make Titanium Smithy Hammer { - SkillRequired:Maintenance=4, - HCTitaniumingot, + SkillRequired:Maintenance=3, + HCTitaniumingot=4, WoodenStick, keep HCSmithyhammersteel/HCSmithyhammertitanium, keep Tongs,