diff --git a/objects/generic/extractionlab_recipes.config b/objects/generic/extractionlab_recipes.config index ef145f1e4a..546d55c7a8 100644 --- a/objects/generic/extractionlab_recipes.config +++ b/objects/generic/extractionlab_recipes.config @@ -2,9 +2,7 @@ //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]}}, diff --git a/quests/madness/madnessdata.lua b/quests/madness/madnessdata.lua index e229dfa01f..8a5c0b97e6 100644 --- a/quests/madness/madnessdata.lua +++ b/quests/madness/madnessdata.lua @@ -22,7 +22,6 @@ function init() self.timerCounter = 0 self.timerCounterGenes = 0 --xi specific self.environmentTimer = 0 - self.timer = 10.0 -- was zero, instant event on plopping in. giving players a short grace period. some of us teleport around a LOT. for _,effect in ipairs(status.activeUniqueStatusEffectSummary()) do if effect[1]=="mad" then @@ -40,7 +39,6 @@ function init() storage.crazycarrycooldown=math.max(storage.crazycarrycooldown or 0,10.0) - --make sure the annoying sounds dont flood status.removeEphemeralEffect("partytime5madness") status.removeEphemeralEffect("partytime5") @@ -63,7 +61,6 @@ function init() local elementalTypes=root.assetJson("/damage/elementaltypes.config") local buffer={} - --storage.armorSetData=storage.armorSetData or {}--moved into a separate setup fuPersistentEffectRecorder.init() @@ -563,9 +560,7 @@ function update(dt) self.degradeTotal = 1 end end - self.timerDegrade = math.max(self.timerDegrade - dt,0.0) - (self.protheonCount * 4) - if (status.stat("freudBonus") > 0 ) then -- player is inside an Instafreud or has consumed an item that temporarily acts like one self.degradeTotal = self.madnessCount / 300 + (self.protheonCount) + status.stat("freudBonus") + (status.stat("mentalProtection")/20) displayBar() @@ -575,7 +570,6 @@ function update(dt) else disableBar() end - -- apply bonus loss from anti-madness effects even if not above X madness. This always applies, as a benefit of the Mental Protection stat. self.bonusTimer = math.max(self.bonusTimer - dt,0) if self.bonusTimer <= 0.0 then @@ -585,9 +579,7 @@ function update(dt) end self.bonusTimer = 30.0 end - end - ---------------------------------------------------------------------------------- -- passive research gain based on Play Time function checkPassiveTimerBonus()