From a4f88e83aa929d73b8fdb57a9b93ed7aeca41552 Mon Sep 17 00:00:00 2001 From: sayterdarkwynd Date: Fri, 25 Oct 2024 10:54:38 -0400 Subject: [PATCH] madness gain item adjustment --- _FUversioning.config | 4 ++- objects/generic/extractionlab_recipes.config | 34 +++++++++++++++++++ scripts/actions/monsters/farmable.lua | 2 +- .../madness/madnessgainelder1.statuseffect | 2 +- .../madness/madnessgainelder2.statuseffect | 2 +- .../madness/madnessgainelder3.statuseffect | 2 +- .../madness/madnessgainpainting1.statuseffect | 2 +- .../madness/madnessgainpainting2.statuseffect | 2 +- .../madness/madnessgainpainting3.statuseffect | 2 +- 9 files changed, 44 insertions(+), 8 deletions(-) diff --git a/_FUversioning.config b/_FUversioning.config index 8aba0a7ff58..6e88b62754f 100644 --- a/_FUversioning.config +++ b/_FUversioning.config @@ -15,12 +15,14 @@ * added additional notices and microtutorials to the Science Outpost * changed the beam-in point for the Science Outpost to the teleporter position instead of the lower Coffee Dock * Troughs give a radiomessage when first picked up -* Farm animals now properly mate to produce offspring. Their hunger level directly influences this chance. +* Farm animals now properly mate to produce offspring. Their hunger level directly influences this chance, and can create one egg approximately every 4 minutes. * the Lab Centrifuge has had its size adjusted from 33 pixels wide, to 24. It should more properly fit on surfaces now. * Additionally, the Lab Centrifuage fullbright layer has been corrected. * updates Lab Centrifuge icon * Geology Tier nodes have new icons to make it clearer that they are tier progression nodes * icons for Research Trees have been updated +* adds some Maple32 extraction recipes +* corrects some madness gain items to account for the new deterioration method ^cyan;6.4.6^reset; ------------------ diff --git a/objects/generic/extractionlab_recipes.config b/objects/generic/extractionlab_recipes.config index f8fa1cdf8b0..ef145f1e4a8 100644 --- a/objects/generic/extractionlab_recipes.config +++ b/objects/generic/extractionlab_recipes.config @@ -2,6 +2,40 @@ //protheon {"inputs":{"protheonshard":1},"outputs":{"fuprecursorresource":[2,4,6]}}, + +//Maple32 +{"inputs":{"advancedmaterial":1},"outputs":{"funanofibre":[1,1,2]}}, +{"inputs":{"advancednanosilk":1},"outputs":{"funanofibre":[1,1,2]}}, +{"inputs":{"compositewire":1},"outputs":{"wire":[1,1,2]}}, +{"inputs":{"cursecloth":1},"outputs":{"funanofibre":[1,1,2]}}, +{"inputs":{"cursestring":1},"outputs":{"funanofibre":[1,1,2]}}, +{"inputs":{"darkwax":1},"outputs":{"ghostlywax":[1,1,2]}}, +{"inputs":{"deathbottle":1},"outputs":{"fuscienceresource":[1,2,3]}}, +{"inputs":{"deathenergy":1},"outputs":{"fuscienceresource":[1,2,3]}}, +{"inputs":{"deathenergycrystal":1},"outputs":{"fuscienceresource":[1,2,3]}}, +{"inputs":{"greengasbottle":1},"outputs":{"fuscienceresource":[1,2,3]}}, +{"inputs":{"lifebottle":1},"outputs":{"fuscienceresource":[2,4,6]}}, +{"inputs":{"lifeenergy":1},"outputs":{"fuscienceresource":[2,4,6]}}, +{"inputs":{"lifeenergy":1},"outputs":{"fuscienceresource":[2,4,6]}}, +{"inputs":{"lifeenergycrystal":1},"outputs":{"fuscienceresource":[1,1,2]}}, +{"inputs":{"m32detestabletablet":1},"outputs":{"fumadnessresource":[3,5,9]}}, +{"inputs":{"m32flameconsignedliterature":1},"outputs":{"fumadnessresource":[3,5,9]}}, +{"inputs":{"m32nectar":1},"outputs":{"fuscienceresource":[1,1,2]}}, +{"inputs":{"magmaswampgas":1},"outputs":{"fuscienceresource":[1,1,2]}}, +{"inputs":{"nanosilk":1},"outputs":{"funanofibre":[1,1,2]}}, +{"inputs":{"nuuadditive":1},"outputs":{"fuscienceresource":[1,1,2]}}, +{"inputs":{"nuucomposite":1},"outputs":{"fuscienceresource":[1,1,2]}}, +{"inputs":{"nuupowercell":1},"outputs":{"fuprocessor":[1,1,2]}}, +{"inputs":{"advancedmaterial":1},"outputs":{"advcircuit":[1,1,2]}}, +{"inputs":{"salt":1},"outputs":{"fu_salt":[1,1,2]}}, +{"inputs":{"sporgussample":1},"outputs":{"agaranichor":[1,1,2]}}, +{"inputs":{"daldiniumore":1},"outputs":{"exonite":[1,1,2]}}, +{"inputs":{"daldiniumbar":1},"outputs":{"exonite":[1,1,2]}}, +{"inputs":{"frostnucleus":1},"outputs":{"slimegem":[1,1,2]}}, +{"inputs":{"m32blooddiamond":1},"outputs":{"blooddiamond":[1,1,2]}}, +{"inputs":{"verdinoctbar":1},"outputs":{"effigiumbar":[1,1,2]}}, +{"inputs":{"verdinoctore":1},"outputs":{"effigiumore":[1,1,2]}}, + //space salvage {"inputs":{"salvagebody":1},"outputs":{"titaniumore":[1,1,2], "fuscienceresource":[5,6,10]}}, {"inputs":{"salvagelegs":1},"outputs":{"tungstenore":[1,1,2], "fuscienceresource":[5,6,10]}}, diff --git a/scripts/actions/monsters/farmable.lua b/scripts/actions/monsters/farmable.lua index c6b7c6e252d..c390ac221eb 100644 --- a/scripts/actions/monsters/farmable.lua +++ b/scripts/actions/monsters/farmable.lua @@ -251,7 +251,7 @@ function checkMate() if (self.eggType) and (self.d20 >= 19) then --creature is full enough, the wait timer is up, and the creature is currently capable of mating (has eaten at least once) if (storage.mateTimer <= 0) and (self.canMate) and (storage.food >= 45) then - storage.mateTimer = 120 - (storage.food/5) + storage.mateTimer = 240 - (storage.food/5) world.spawnItem( self.eggType, mcontroller.position(), 1 ) world.spawnProjectile("fu_egglay",mcontroller.position(), entity.id(), {0, 20}, false, configBombDrop) animator.playSound("harvest") diff --git a/stats/effects/fu_effects/madness/madnessgainelder1.statuseffect b/stats/effects/fu_effects/madness/madnessgainelder1.statuseffect index 883c1ffcad8..d02d9a7feb1 100644 --- a/stats/effects/fu_effects/madness/madnessgainelder1.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainelder1.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "paintingmadnessActive", "effectConfig" : { "baseValue" : 5, - "valBonus" : 10 + "valBonus" : 4 }, "defaultDuration" : 2, diff --git a/stats/effects/fu_effects/madness/madnessgainelder2.statuseffect b/stats/effects/fu_effects/madness/madnessgainelder2.statuseffect index c8d72673ff5..5c556be2ebe 100644 --- a/stats/effects/fu_effects/madness/madnessgainelder2.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainelder2.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "paintingmadnessActive", "effectConfig" : { "baseValue" : 7, - "valBonus" : 10 + "valBonus" : 8 }, "defaultDuration" : 2, diff --git a/stats/effects/fu_effects/madness/madnessgainelder3.statuseffect b/stats/effects/fu_effects/madness/madnessgainelder3.statuseffect index 3bba44c089d..31aaca2c35a 100644 --- a/stats/effects/fu_effects/madness/madnessgainelder3.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainelder3.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "paintingmadnessActive", "effectConfig" : { "baseValue" : 10, - "valBonus" : 10 + "valBonus" : 12 }, "defaultDuration" : 2, diff --git a/stats/effects/fu_effects/madness/madnessgainpainting1.statuseffect b/stats/effects/fu_effects/madness/madnessgainpainting1.statuseffect index 78eba59c4d9..1701c0c9e01 100644 --- a/stats/effects/fu_effects/madness/madnessgainpainting1.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainpainting1.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "eldermadnessActive", "effectConfig" : { "baseValue" : 1, - "valBonus" : 10 + "valBonus" : 3 }, "defaultDuration" : 2, diff --git a/stats/effects/fu_effects/madness/madnessgainpainting2.statuseffect b/stats/effects/fu_effects/madness/madnessgainpainting2.statuseffect index 7023e66cbd2..1332de4130f 100644 --- a/stats/effects/fu_effects/madness/madnessgainpainting2.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainpainting2.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "eldermadnessActive", "effectConfig" : { "baseValue" : 2, - "valBonus" : 10 + "valBonus" : 6 }, "defaultDuration" : 2, diff --git a/stats/effects/fu_effects/madness/madnessgainpainting3.statuseffect b/stats/effects/fu_effects/madness/madnessgainpainting3.statuseffect index 5d034a1918e..812923ac69e 100644 --- a/stats/effects/fu_effects/madness/madnessgainpainting3.statuseffect +++ b/stats/effects/fu_effects/madness/madnessgainpainting3.statuseffect @@ -3,7 +3,7 @@ "blockingStat" : "eldermadnessActive", "effectConfig" : { "baseValue" : 3, - "valBonus" : 10 + "valBonus" : 9 }, "defaultDuration" : 2,