From f107e962924f0ac0a25ede09598acb3032210f54 Mon Sep 17 00:00:00 2001 From: sayterdarkwynd Date: Tue, 15 Nov 2016 23:10:31 -0500 Subject: [PATCH] additions --- .../isn_atmoscondenser.object | 104 +++++++++--------- .../isn_resource_generator.lua | 71 +++++++----- 2 files changed, 95 insertions(+), 80 deletions(-) diff --git a/objects/power/isn_atmoscondenser/isn_atmoscondenser.object b/objects/power/isn_atmoscondenser/isn_atmoscondenser.object index d8830eef9e3..8794b054c07 100644 --- a/objects/power/isn_atmoscondenser/isn_atmoscondenser.object +++ b/objects/power/isn_atmoscondenser/isn_atmoscondenser.object @@ -34,98 +34,102 @@ // Common "commonOutputs" : [ "liquidwater", "fu_oxygen", "fu_hydrogen", "fu_nitrogen" ], - "uncommonOutputs" : [ "fu_carbon", "fu_salt" ], + "uncommonOutputs" : [ "fu_carbon", "fu_salt", "berliniteore", "ff_mercury", "silverore", "goldore" ], "rareOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample" ], // Biome Special + + "fungusOutputs" : [ "liquidpoison", "fu_oxygen", "fu_hydrogen", "fu_nitrogen" ], + "fungusuncommonOutputs" : [ "fu_carbon", "agaranichor", "geneticmaterial", "cellmateria" ], + "fungusrareOutputs" : [ "liquidbioooze", "liquidpus", "mineralsample", "dnasample" ], "aetherOutputs" : [ "liquidaether", "fu_nitrogen", "fu_hydrogen", "liquidpoison", "uraniumore", "liquidsulphuricacid" ], "aetheruncommonOutputs" : [ "mutagene1", "mutagene2", "fu_salt", "sulphur" ], - "aetherrareOutputs" : [ "mutagene3", "xithriciteore" ], + "aetherrareOutputs" : [ "shadowgasliquid", "mutagene3", "xithriciteore", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample" ], - "moonOutputs" : [ "fu_carbon", "rawminerals" ], - "moonuncommonOutputs" : [ "helium3gasliquid", "moonstoneore", "liquidfuel" ], - "moonrareOutputs" : [ "mineralsample", "unstableparticles" ], + "moonOutputs" : [ "fu_carbon", "rawminerals", "fu_hydrogen", "fu_nitrogen", "solidfuel" ], + "moonuncommonOutputs" : [ "helium3gasliquid", "moonstoneore", "liquidfuel" ], + "moonrareOutputs" : [ "mineralsample", "obsidianshard", "fu_carbon" ], - "atropusOutputs" : [ "liquidpus", "liquidblood", "fu_oxygen", "fleshstrand", "geneticmaterial", "nutrientpaste" ], - "atropusuncommonOutputs" : [ "larva", "methanol", "biospore", "cellmateria" ], - "atropusrareOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmatter", "mineralsample", "deuterium", "tritium", "dnasample" ], + "atropusOutputs" : [ "liquidpus", "liquidblood", "fu_oxygen", "fleshstrand", "geneticmaterial", "tissueculture" ], + "atropusuncommonOutputs" : [ "larva", "methanol", "biospore", "cellmateria", "aliencompound" ], + "atropusrareOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmatter", "mineralsample", "deuterium", "tritium", "dnasample", "quietusore" ], "gasOutputs" : [ "helium3gasliquid", "shadowgasliquid", "liquidpoison", "fu_hydrogen", "fu_nitrogen" ], - "gasuncommonOutputs" : [ "rawminerals", "fu_hydrogen", "fu_nitrogen"], - "gasrareOutputs" : [ "liquidmetallichydrogen" ], + "gasuncommonOutputs" : [ "rawminerals", "fu_hydrogen", "fu_nitrogen", "aliencompound" ], + "gasrareOutputs" : [ "fu_hydrogenmetallic", "tritium", "unstableparticles" ], "bogOutputs" : [ "swampwater", "fu_oxygen", "algaegreen", "liquidwater", "fu_hydrogen", "fu_nitrogen" ], "boguncommonOutputs" : [ "cellmateria", "fu_carbon", "fu_salt" ], - "bograreOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample" ], + "bograreOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample", "deuterium" ], "chromaticOutputs" : [ "fu_oxygen", "liquidwater", "toxicwaste", "fu_mulch", "chromadirtmaterial" ], - "chromaticuncommonOutputs" : [ "uraniumore", "lead", "aliencompound" ], - "chromaticrareOutputs" : [ "plutoniumore", "mutagene4", "neptuniumore", "thoriumore" ], + "chromaticuncommonOutputs" : [ "uraniumore", "lead", "aliencompound", "fu_nitrogen", "fu_hydrogen" ], + "chromaticrareOutputs" : [ "plutoniumore", "mutagene4", "neptuniumore", "thoriumore", "tritium" ], - "crystalOutputs" : [ "liquidorganicsoup", "crystalsandmaterial", "crystal" ], - "crystaluncommonOutputs" : [ "liquidcrystal", "mutagene1" ], - "crystalrareOutputs" : [ "icecrystal", "lunarishard" ], + "crystalOutputs" : [ "liquidorganicsoup", "crystalsandmaterial", "fu_nitrogen", "fu_hydrogen", "fu_oxygen" ], + "crystaluncommonOutputs" : [ "crystal", "liquidcrystal", "mutagene1", "fu_carbon", "ff_silicon" ], + "crystalrareOutputs" : [ "icecrystal", "solarishard", "tritium", "aliencompound" ], - "desertOutputs" : [ "sand", "fu_oxygen", "liquidoil", "calichewall" ], - "desertuncommonOutputs" : [ "ff_silicon", "liquidwater", "fu_hydrogen" ], - "desertrareOutputs" : [ "saltpeter" ], + "desertOutputs" : [ "sand", "fu_oxygen", "liquidoil", "calichewall", "fu_hydrogen", "fu_nitrogen" ], + "desertuncommonOutputs" : [ "fu_carbon", "fu_salt", "berliniteore", "ff_mercury", "silverore", "goldore", "ff_silicon", "liquidwater", "fu_hydrogen" ], + "desertrareOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample", "saltpeter" ], - "iceOutputs" : [ "fu_nitrogen", "snowflake", "fu_hydrogen", "liquidwater" ], - "iceuncommonOutputs" : [ "methanol", "iodine", "liquidnitrogenitem", "icecrystal" ], - "icerareOutputs" : [ "mutagene3", "isogenore" ], + "iceOutputs" : [ "fu_nitrogen", "snowflake", "fu_hydrogen", "liquidwater", "fu_carbon", "fu_salt" ], + "iceuncommonOutputs" : [ "methanol", "iodine", "liquidnitrogenitem", "icecrystal", "fu_oxygen" ], + "icerareOutputs" : [ "mutagene3", "isogenore", "tritium", "aliencompound" ], - "nitrogenOutputs" : [ "liquidnitrogenitem", "fu_nitrogen", "liquidwater" ], - "nitrogenuncommonOutputs" : [ "aliencompound", "mutagene1" ], - "nitrogenrareOutputs" : [ "mutagene2" ], + "nitrogenOutputs" : [ "liquidnitrogenitem", "fu_nitrogen", "liquidwater", "fu_carbon", "fu_salt" ], + "nitrogenuncommonOutputs" : [ "aliencompound", "mutagene1", "fu_oxygen", "fu_hydrogen" ], + "nitrogenrareOutputs" : [ "mutagene2", "icecrystal", "tritium", "aliencompound" ], - "infernusOutputs" : [ "lava", "fu_carbon", "sulphur" ], - "infernusuncommonOutputs" : [ "fu_nitrogen", "ff_mercury" ], - "infernusrareOutputs" : [ "magnesiumsulfate", "pyreiteore" ], + "infernusOutputs" : [ "lava", "fu_carbon", "sulphur", "corefragmentore" ], + "infernusuncommonOutputs" : [ "fu_nitrogen", "ff_mercury", "fu_carbon", "ammoniumsulfate" ], + "infernusrareOutputs" : [ "magnesiumsulfate", "pyreiteore", "tritium", "aliencompound" ], "radiationOutputs" : [ "liquidpoison", "uraniumore", "toxicwaste" ], "radiationuncommonOutputs" : [ "fu_carbon", "plutoniumore", "alienwoodsap", "neptuniumore", "thoriumore" ], "radiationrareOutputs" : [ "calciumnitrate", "tritium", "liquidirradium", "irradiumore" ], - "lightlessOutputs" : [ "fu_nitrogen", "fu_oxygen" ], - "lightlessuncommonOutputs" : [ "fu_carbon", "triangliumore" ], - "lightlessrareOutputs" : [ "effigiumore", "blooddiamond" ], + "lightlessOutputs" : [ "liquidwater", "fu_hydrogen", "fu_nitrogen", "fu_oxygen" ], + "lightlessuncommonOutputs" : [ "fu_carbon", "triangliumore", "ff_silicon" ], + "lightlessrareOutputs" : [ "effigiumore", "blooddiamond", "tritium", "aliencompound" ], - "metallicOutputs" : [ "liquidironfu", "ironore", "ff_spareparts", "tungstenore", "metallic", "bolt" ], - "metallicuncommonOutputs" : [ "titaniumore", "magnesiumpowder" ], - "metallicrareOutputs" : [ "durasteelore", "densiniumore" ], + "metallicOutputs" : [ "ironore", "ff_spareparts", "tungstenore", "metallic", "bolt", "wire" ], + "metallicuncommonOutputs" : [ "liquidironfu", "titaniumore", "magnesiumpowder", "mineralsample" ], + "metallicrareOutputs" : [ "durasteelore", "tritium", "stickofram", "cpu", "processor", "aichip" ], "protoOutputs" : [ "cellmateria", "fu_salt", "fu_oxygen", "fu_hydrogen" ], - "protouncommonOutputs" : [ "biospore", "mineralsample", "dnasample" ], - "protorareOutputs" : [ "vialproto", "protociteore" ], + "protouncommonOutputs" : [ "biospore", "mineralsample", "dnasample", "fu_nitrogen", "fu_carbon" ], + "protorareOutputs" : [ "vialproto", "protociteore", "tritium", "aliencompound", "deuterium" ], "penumbraOutputs" : [ "cellmateria", "fu_nitrogen", "fu_oxygen", "glowfibre" ], - "penumbrauncommonOutputs" : [ "liquidorganicsoup", "shadowgasliquid" ], - "penumbrarareOutputs" : [ "penumbriteore", "liquidalienjuice" ], + "penumbrauncommonOutputs" : [ "liquidorganicsoup", "shadowgasliquid", "blobbushjelly" ], + "penumbrarareOutputs" : [ "penumbriteore", "liquidalienjuice", "tritium", "deuterium", "fu_carbon" ], "slimeOutputs" : [ "liquidslime", "mascagniteore", "tissueculture", "geneticmaterial", "slimematerial" ], "slimeuncommonOutputs" : [ "ff_resin", "greenslime", "liquidalienjuice" ], - "slimerareOutputs" : [ "endomorphicjelly", "cellmatter" ], + "slimerareOutputs" : [ "endomorphicjelly", "cellmatter", "tritium", "deuterium" ], "strangeseaOutputs" : [ "geneticmaterial", "fu_salt", "tissueculture" ], "strangeseauncommonOutputs" : [ "ff_mercury", "cellmatter", "liquidalienjuice" ], - "strangesearareOutputs" : [ "ff_resin", "corruptionore" ], + "strangesearareOutputs" : [ "ff_resin", "corruptionore", "obsidianshard", "tritium" ], "oceanOutputs" : [ "fu_salt", "sand", "fu_oxygen", "seaweed", "cellmateria" ], - "oceanuncommonOutputs" : [ "iodine", "calciumnitrate", "coralfragment", "cellmatter" ], - "oceanrareOutputs" : [ "laboil", "biospore"], + "oceanuncommonOutputs" : [ "laboil", "iodine", "calciumnitrate", "coralfragment", "cellmatter" ], + "oceanrareOutputs" : [ "helium3gasliquid", "shadowgasliquid", "cellmateria", "geneticmaterial", "mineralsample", "deuterium", "tritium", "dnasample", ], - "sulphuricOutputs" : [ "liquidsulphuricacid", "ff_mercury" ], - "sulphuricuncommonOutputs" : [ "phosphorus", "liquidblacktar" ], - "sulphuricrareOutputs" : [ "liquidmercury" ], + "sulphuricOutputs" : [ "liquidsulphuricacid", "ff_mercury", "fu_hydrogen", "fu_nitrogen", "liquidpoison" ], + "sulphuricuncommonOutputs" : [ "phosphorus", "liquidblacktar", "cinnabarore", "methanol" ], + "sulphuricrareOutputs" : [ "liquidmercury", "tritium", "neptuniumore", "fu_oxygen" ], "tarballOutputs" : [ "liquidblacktar", "liquidoil", "corefragmentore", "fu_hydrogen", "sulphur", "lead" ], - "tarballuncommonOutputs" : [ "ff_resin", "mutagene1" ], - "tarballrareOutputs" : [ "mutagene2", "aliencompound", "cinnabarore" ], + "tarballuncommonOutputs" : [ "laboil", "ff_resin", "mutagene1", "fu_carbon", "ff_silicon" ], + "tarballrareOutputs" : [ "mutagene2", "aliencompound", "cinnabarore", "tritium", "thoriumore" ], - "toxicOutputs" : [ "ammoniumsulfate", "toxicwaste", "alienwoodsap" ], - "toxicuncommonOutputs" : [ "venomsample", "ff_mercury", "liquidalienjuice" ], - "toxicrareOutputs" : [ "liquidorganisoup", "liquidmercury"], + "toxicOutputs" : [ "ammoniumsulfate", "toxicwaste", "alienwoodsap", "fu_hydrogen", "fu_nitrogen", "methanol", "liquidpoison" ], + "toxicuncommonOutputs" : [ "venomsample", "ff_mercury", "liquidalienjuice", "liquidbioooze" ], + "toxicrareOutputs" : [ "liquidorganisoup", "liquidmercury", "tritium", "uraniumore", "plutoniumore" ], "animation" : "/objects/power/isn_resource_generator.animation", diff --git a/objects/power/isn_atmoscondenser/isn_resource_generator.lua b/objects/power/isn_atmoscondenser/isn_resource_generator.lua index 46846863e4b..8a4620dab47 100644 --- a/objects/power/isn_atmoscondenser/isn_resource_generator.lua +++ b/objects/power/isn_atmoscondenser/isn_resource_generator.lua @@ -26,7 +26,7 @@ if self.timer <= 0 then if world.type() == "aethersea" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("aetherrareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("aetheruncommonOutputs")) self.timer = 3.5 @@ -37,18 +37,18 @@ if self.timer <= 0 then elseif world.type() == "moon" or world.type() == "moon_desert" or world.type()== "moon_shadow" or world.type()=="moon_stone" or world.type()=="moon_volcanic" or world.type()=="moon_toxic" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("moonrareOutputs")) - self.timer = 5 + self.timer = 8 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("moonuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("moonOutputs")) - self.timer = 2 + self.timer = 3 end elseif world.type() == "atropus" or world.type() == "atropusdark" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("atropusrareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("atropusuncommonOutputs")) self.timer = 3.5 @@ -59,10 +59,10 @@ if self.timer <= 0 then elseif world.type() == "fugasgiant" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("gasrareOutputs")) - self.timer = 5 + self.timer = 7 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("gascuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("gasOutputs")) self.timer = 2 @@ -81,10 +81,10 @@ if self.timer <= 0 then elseif world.type() == "chromatic" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("chromaticrareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("chromaticuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("chromaticOutputs")) self.timer = 2 @@ -92,13 +92,13 @@ if self.timer <= 0 then elseif world.type() == "crystalmoon" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("crystalrareOutputs")) - self.timer = 5 + self.timer = 7 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("crystaluncommonOutputs")) - self.timer = 3.5 + self.timer = 5.5 else output = util.randomFromList(config.getParameter("crystalOutputs")) - self.timer = 2 + self.timer = 4 end elseif world.type() == "desert" or world.type() == "desertwastes" or world.type() == "desertwastesdark" then if rarityroll == 100 then @@ -114,7 +114,7 @@ if self.timer <= 0 then elseif world.type() == "icewaste" or world.type() == "icewastedark" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("icerareOutputs")) - self.timer = 5 + self.timer = 8 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("iceuncommonOutputs")) self.timer = 3.5 @@ -125,10 +125,10 @@ if self.timer <= 0 then elseif world.type() == "nitrogensea" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("nitrogenrareOutputs")) - self.timer = 5 + self.timer = 8 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("nitrogenuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("nitrogenOutputs")) self.timer = 2 @@ -136,10 +136,10 @@ if self.timer <= 0 then elseif world.type() == "infernus" or world.type() == "infernusdark" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("infernusrareOutputs")) - self.timer = 5 + self.timer = 8 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("infernusuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("infernusOutputs")) self.timer = 2 @@ -147,10 +147,10 @@ if self.timer <= 0 then elseif world.type() == "slimeworld" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("slimerareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("slimeuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("slimeOutputs")) self.timer = 2 @@ -158,10 +158,10 @@ if self.timer <= 0 then elseif world.type() == "strangesea" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("strangesearareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("strangeseauncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("strangeseaOutputs")) self.timer = 2 @@ -191,10 +191,10 @@ if self.timer <= 0 then elseif world.type() == "tarball" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("tarballrareOutputs")) - self.timer = 5 + self.timer = 7 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("tarballuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("tarballOutputs")) self.timer = 2 @@ -235,10 +235,10 @@ if self.timer <= 0 then elseif world.type() == "penumbra" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("penumbrarareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("penumbrauncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("penumbraOutputs")) self.timer = 2 @@ -246,10 +246,10 @@ if self.timer <= 0 then elseif world.type() == "protoworld" or world.type() == "protoworlddark" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("protorareOutputs")) - self.timer = 5 + self.timer = 6 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("protouncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("protoOutputs")) self.timer = 2 @@ -257,14 +257,25 @@ if self.timer <= 0 then elseif world.type() == "irradiated" then if rarityroll == 100 then output = util.randomFromList(config.getParameter("radiationrareOutputs")) - self.timer = 5 + self.timer = 7 elseif rarityroll >= 79 then output = util.randomFromList(config.getParameter("radiationuncommonOutputs")) - self.timer = 3.5 + self.timer = 4.5 else output = util.randomFromList(config.getParameter("radiationOutputs")) self.timer = 2 - end + end + elseif world.type() == "fungus" then + if rarityroll == 100 then + output = util.randomFromList(config.getParameter("fungusrareOutputs")) + self.timer = 5.3 + elseif rarityroll >= 79 then + output = util.randomFromList(config.getParameter("fungusuncommonOutputs")) + self.timer = 3.7 + else + output = util.randomFromList(config.getParameter("fungusOutputs")) + self.timer = 2 + end else if rarityroll == 100 then output = util.randomFromList(config.getParameter("rareOutputs"))