Skip to content

Commit

Permalink
whitespace culling
Browse files Browse the repository at this point in the history
  • Loading branch information
sayterdarkwynd committed Oct 25, 2024
1 parent c1c0045 commit 6339f08
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions objects/generic/extractionlab_recipes.config
Original file line number Diff line number Diff line change
Expand Up @@ -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]}},
Expand Down
8 changes: 0 additions & 8 deletions quests/madness/madnessdata.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand All @@ -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()

Expand Down Expand Up @@ -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()
Expand All @@ -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
Expand All @@ -585,9 +579,7 @@ function update(dt)
end
self.bonusTimer = 30.0
end

end

----------------------------------------------------------------------------------
-- passive research gain based on Play Time
function checkPassiveTimerBonus()
Expand Down

0 comments on commit 6339f08

Please sign in to comment.