From 7e2f9261ec721c9e29385c946b82d763237cf112 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 14 Oct 2023 18:31:31 -0500 Subject: [PATCH 01/19] cattle feed nerf nailery is now edible by robots sweetscoop price nerf --- items/generic/produce/nailery.consumable | 12 ++++++++---- items/generic/produce/sweetscoop.consumable | 2 +- objects/farmables/sweetscoop/sweetscoopseed.object | 2 +- .../poison_effects/cattlepoison/cattlepoison.lua | 4 +++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/items/generic/produce/nailery.consumable b/items/generic/produce/nailery.consumable index d7f70898213..3878d6d4570 100644 --- a/items/generic/produce/nailery.consumable +++ b/items/generic/produce/nailery.consumable @@ -4,18 +4,22 @@ "category": "food", "rarity": "Common", "price": 5, - "maxStack": 1000, + "foodValue": 10, "tooltipKind": "food", - "description": "Craft into bombs, or extract for iron.\n^yellow;^reset;^red;Poisons^reset;: 5s", + "description": "Craft into bombs, or extract for iron.\n^yellow;^reset;^red;Poison^reset;: 5s\n^yellow;Type: Robot Food^reset;", "shortdescription": "Nailery", - //"learnBlueprintsOnPickup": ["nailbomb"], + "eventCategory": "eventCrop", + "builder": "/items/buildscripts/buildfood.lua", "effects": [ [{ "effect": "weakpoison", "duration": 5 + }, + { + "effect": "robot_food" }] ], - "blockingEffects": ["weakpoison"] + "blockingEffects": ["wellfed"] } diff --git a/items/generic/produce/sweetscoop.consumable b/items/generic/produce/sweetscoop.consumable index ee55fc199a4..572781fd8c9 100644 --- a/items/generic/produce/sweetscoop.consumable +++ b/items/generic/produce/sweetscoop.consumable @@ -3,7 +3,7 @@ "inventoryIcon": "sweetscoop.png", "category": "food", "rarity": "Uncommon", - "price": 60, + "price": 10, "foodValue": 40, "tooltipKind": "food", diff --git a/objects/farmables/sweetscoop/sweetscoopseed.object b/objects/farmables/sweetscoop/sweetscoopseed.object index 73e63f3fbc8..fb58300915a 100644 --- a/objects/farmables/sweetscoop/sweetscoopseed.object +++ b/objects/farmables/sweetscoop/sweetscoopseed.object @@ -7,7 +7,7 @@ "shortdescription" : "Sweetscoop Seed", "objectType" : "farmable", "printable" : false, - "price" : 45, + "price" : 15, "apexDescription" : "It has the consistency and feel of a banana but tastes like a pie.", "avianDescription" : "This tastes like something a human would eat around one of their holidays.", diff --git a/stats/effects/fu_tileeffects/poison_effects/cattlepoison/cattlepoison.lua b/stats/effects/fu_tileeffects/poison_effects/cattlepoison/cattlepoison.lua index 735a7b612c3..e887520cc90 100644 --- a/stats/effects/fu_tileeffects/poison_effects/cattlepoison/cattlepoison.lua +++ b/stats/effects/fu_tileeffects/poison_effects/cattlepoison/cattlepoison.lua @@ -30,6 +30,8 @@ function update(dt) damageSourceKind = "poison", sourceEntityId = entity.id() }) + status.removeEphemeralEffect("wellfed") + if status.resourcePercentage("food") > 0.60 then status.setResourcePercentage("food", 0.60) end end effect.setParentDirectives("fade=EEEEEE="..self.tickTimer * 0.4) -end \ No newline at end of file +end From b12c906be9861dc73cf06d777eb184c851765313 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Mon, 18 Mar 2024 14:13:53 -0500 Subject: [PATCH 02/19] fix monster/npc fall damage --- monsters/dungeon/toyhorse/toyhorse.monstertype | 4 ++-- .../tentaclespawnerish/bloodbag/tentaclespawner2.monstertype | 4 ++-- .../floatingshoggoth/floatingshoggoth.monstertype | 4 ++-- .../walkers/crabcanoish/shadowcrab/shadowcrab.monstertype | 4 ++-- .../mandrafloraish/bandraflora3/bandraflora3.monstertype | 4 ++-- .../minishoggoths/minishoggothnew/minishoggoth.monstertype | 4 ++-- monsters/walkers/orbideish/ravager.monstertype | 4 ++-- monsters/walkers/poptopish/illumitop/illumitop.monstertype | 4 +++- monsters/walkers/poptopish/slimetop/slimetop.monstertype | 4 +++- monsters/walkers/toumingoish/chromingo.monstertype | 4 ++-- npcs/base.npctype.patch | 5 +++++ stats/monster_primary.lua | 3 ++- 12 files changed, 29 insertions(+), 19 deletions(-) diff --git a/monsters/dungeon/toyhorse/toyhorse.monstertype b/monsters/dungeon/toyhorse/toyhorse.monstertype index 27f4ec0b5ad..37333b6c8b0 100644 --- a/monsters/dungeon/toyhorse/toyhorse.monstertype +++ b/monsters/dungeon/toyhorse/toyhorse.monstertype @@ -181,8 +181,8 @@ "poisonStatusImmunity" : { "baseValue" : 1.0 }, - "fallDamageMultiplier" : { - "baseValue" : 1.5 + "monsterFallDamageMultiplier" : { + "baseValue" : 0.5 } }, diff --git a/monsters/flyers/tentaclespawnerish/bloodbag/tentaclespawner2.monstertype b/monsters/flyers/tentaclespawnerish/bloodbag/tentaclespawner2.monstertype index 95aa303a1db..f1d9867d700 100644 --- a/monsters/flyers/tentaclespawnerish/bloodbag/tentaclespawner2.monstertype +++ b/monsters/flyers/tentaclespawnerish/bloodbag/tentaclespawner2.monstertype @@ -229,8 +229,8 @@ "poisonStatusImmunity" : { "baseValue" : 1.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 } }, diff --git a/monsters/flyers/tentaclespawnerish/floatingshoggoth/floatingshoggoth.monstertype b/monsters/flyers/tentaclespawnerish/floatingshoggoth/floatingshoggoth.monstertype index 49cd8d38a37..906d038017f 100644 --- a/monsters/flyers/tentaclespawnerish/floatingshoggoth/floatingshoggoth.monstertype +++ b/monsters/flyers/tentaclespawnerish/floatingshoggoth/floatingshoggoth.monstertype @@ -256,8 +256,8 @@ "poisonStatusImmunity" : { "baseValue" : 1.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 }, "bleedingImmunity" : { "baseValue" : 1 }, "linerifleResistance" : { "baseValue" : 0.9 }, diff --git a/monsters/walkers/crabcanoish/shadowcrab/shadowcrab.monstertype b/monsters/walkers/crabcanoish/shadowcrab/shadowcrab.monstertype index 4189afbf5fe..fc41a5dee45 100644 --- a/monsters/walkers/crabcanoish/shadowcrab/shadowcrab.monstertype +++ b/monsters/walkers/crabcanoish/shadowcrab/shadowcrab.monstertype @@ -236,8 +236,8 @@ "poisonStatusImmunity" : { "baseValue" : 0.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0.0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 } }, diff --git a/monsters/walkers/mandrafloraish/bandraflora3/bandraflora3.monstertype b/monsters/walkers/mandrafloraish/bandraflora3/bandraflora3.monstertype index 735af17de0d..45def0c1cdf 100644 --- a/monsters/walkers/mandrafloraish/bandraflora3/bandraflora3.monstertype +++ b/monsters/walkers/mandrafloraish/bandraflora3/bandraflora3.monstertype @@ -284,8 +284,8 @@ "poisonStatusImmunity" : { "baseValue" : 1 }, - "fallDamageMultiplier" : { - "baseValue" : 0.01 + "monsterFallDamageMultiplier" : { + "baseValue" : -0.99 } }, diff --git a/monsters/walkers/minishoggoths/minishoggothnew/minishoggoth.monstertype b/monsters/walkers/minishoggoths/minishoggothnew/minishoggoth.monstertype index 95ed53ce580..842c1a25407 100644 --- a/monsters/walkers/minishoggoths/minishoggothnew/minishoggoth.monstertype +++ b/monsters/walkers/minishoggoths/minishoggothnew/minishoggoth.monstertype @@ -314,8 +314,8 @@ "poisonStatusImmunity" : { "baseValue" : 1.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 }, "powerMultiplier" : { "baseValue" : 1.0 diff --git a/monsters/walkers/orbideish/ravager.monstertype b/monsters/walkers/orbideish/ravager.monstertype index 89ca702c693..3a7ea0ec163 100644 --- a/monsters/walkers/orbideish/ravager.monstertype +++ b/monsters/walkers/orbideish/ravager.monstertype @@ -323,8 +323,8 @@ "poisonStatusImmunity" : { "baseValue" : 1.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 } }, diff --git a/monsters/walkers/poptopish/illumitop/illumitop.monstertype b/monsters/walkers/poptopish/illumitop/illumitop.monstertype index 3852ac8a410..ffef76152b4 100644 --- a/monsters/walkers/poptopish/illumitop/illumitop.monstertype +++ b/monsters/walkers/poptopish/illumitop/illumitop.monstertype @@ -233,7 +233,9 @@ "physicalResistance" : { "baseValue" : 0.0 }, - "fallDamageMultiplier" : { "baseValue" : 0.0 }, + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 + }, "fireResistance" : { "baseValue" : 0.42 }, diff --git a/monsters/walkers/poptopish/slimetop/slimetop.monstertype b/monsters/walkers/poptopish/slimetop/slimetop.monstertype index d27be2820a5..d750f700896 100644 --- a/monsters/walkers/poptopish/slimetop/slimetop.monstertype +++ b/monsters/walkers/poptopish/slimetop/slimetop.monstertype @@ -250,7 +250,9 @@ "physicalResistance" : { "baseValue" : 0.3 }, - "fallDamageMultiplier" : { "baseValue" : 0.0 }, + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 + }, "fireResistance" : { "baseValue" : -0.5 }, diff --git a/monsters/walkers/toumingoish/chromingo.monstertype b/monsters/walkers/toumingoish/chromingo.monstertype index 77e84262afd..334953a3665 100644 --- a/monsters/walkers/toumingoish/chromingo.monstertype +++ b/monsters/walkers/toumingoish/chromingo.monstertype @@ -218,8 +218,8 @@ "poisonStatusImmunity" : { "baseValue" : 0.0 }, - "fallDamageMultiplier" : { - "baseValue" : 0.0 + "monsterFallDamageMultiplier" : { + "baseValue" : -1.0 } }, diff --git a/npcs/base.npctype.patch b/npcs/base.npctype.patch index b4a445fabbd..401fb3ff6e5 100644 --- a/npcs/base.npctype.patch +++ b/npcs/base.npctype.patch @@ -108,6 +108,11 @@ "path" : "/statusControllerSettings/primaryScriptSources/-", "value" : "/scripts/fr_raceEffects.lua" }, + { + "op" : "add", + "path" : "/statusControllerSettings/stats/fallDamageMultiplier", + "value" : { "baseValue": 1.0 } + }, { "op" : "add", "path" : "/statusControllerSettings/statusProperties/mouthPosition", diff --git a/stats/monster_primary.lua b/stats/monster_primary.lua index 542736b4e17..ee80df247b3 100644 --- a/stats/monster_primary.lua +++ b/stats/monster_primary.lua @@ -154,7 +154,8 @@ function update(dt) local damage = (self.fallDistance - minimumFallDistance) * fallDistanceDamageFactor damage = damage * (1.0 + (world.gravity(mcontroller.position()) - baseGravity) * gravityDiffFactor) damage = damage * healthRatio - damage = damage * status.stat("fallDamageMultiplier") + -- values are shifted by one because you can't easily add a stat base value to every monster + damage = damage * (status.stat("monsterFallDamageMultiplier") + 1.0) status.applySelfDamageRequest({ damageType = "IgnoresDef", damage = damage, From e343bcee673a995eb6a0f937cd62f0849da11365 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Mon, 25 Mar 2024 07:17:25 -0500 Subject: [PATCH 03/19] don't do that --- biomes/underground_detached/precursorunderground.biome | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biomes/underground_detached/precursorunderground.biome b/biomes/underground_detached/precursorunderground.biome index 7dcb91bd188..bdc819e9336 100644 --- a/biomes/underground_detached/precursorunderground.biome +++ b/biomes/underground_detached/precursorunderground.biome @@ -139,7 +139,7 @@ "type" : "object", "objectSets" : [ { - "pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "ancientconsole" ], [0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ] ], + "pool" : [ [0.35, "invisiblelight"], [0.35, "invisiblesparker"], [0.35, "teslaspike"], [0.35, "tesla"], [0.35, "coppersupport"],[0.35, "junctionbox" ], [0.55, "device1" ], [0.35, "metallicmachine1" ],[0.35, "metallicmachine2" ],[0.35, "metallicmachine3" ],[0.35, "metallicmachine4" ],[0.35, "metallicmachine5" ],[0.35, "metallicmachine6" ],[0.35, "metallicmachine7" ],[0.35, "tetrapod" ],[0.35, "tech2" ],[0.35, "outpostcargocrate" ],[0.35, "outpostcargocrateshort" ],[0.35, "outpostgenerator" ],[0.35, "outpostconsole" ],[0.35, "outpostradardish" ],[0.35, "outpostsecurityconsole" ],[0.35, "outposttank" ],[0.35, "roofvent" ],[0.35, "outpostlamp" ],[0.35, "sawblade2" ],[0.35, "ancientbouldertrap" ],[0.35, "airbooster" ],[0.35, "wreckconsole1" ], [0.35, "wreckconsole2" ], [0.35, "wreckconsole3" ], [ 0.35, "wreckturbine2" ], [ 0.35, "wreckturbines" ], [ 0.35, "ancienticetrap" ], [ 0.35, "ancientpillar" ], [ 0.35, "ancientcrystaltrap" ], [ 0.35, "jumpbooster" ], [ 0.35, "powerbooster" ], [ 0.35, "speedbooster" ] ], "parameters" : { } } ] From 6c5c7277251996dfb70bb467136dc03b61a57d12 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Mon, 25 Mar 2024 11:30:39 -0500 Subject: [PATCH 04/19] swimming script ignores flyers --- stats/effects/swimming/swimming.lua | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/stats/effects/swimming/swimming.lua b/stats/effects/swimming/swimming.lua index 0205fa01caf..138e1ee9d03 100644 --- a/stats/effects/swimming/swimming.lua +++ b/stats/effects/swimming/swimming.lua @@ -1,5 +1,10 @@ require "/scripts/unifiedGravMod.lua" function init() + self.baseparams = mcontroller.baseParameters() + if not (self.baseparams.gravityEnabled and self.baseparams.collisionEnabled) then + effect.expire() + return + end -- params unifiedGravMod.init() handle=effect.addStatModifierGroup({}) @@ -100,6 +105,10 @@ function allowedType() -- check entity type from provided list end function update(dt) + if not (self.baseparams.gravityEnabled and self.baseparams.collisionEnabled) then + effect.expire() + return + end -- params applyBonusSpeed() -- check if bonus speed is active @@ -235,5 +244,7 @@ function setMonsterAbilities() end function uninit() - effect.removeStatModifierGroup(handle) -end \ No newline at end of file + if handle then + effect.removeStatModifierGroup(handle) + end +end From fe2c6611d47337c0d10304063e6c388e0a48c1a7 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Thu, 26 Sep 2024 10:44:38 -0500 Subject: [PATCH 05/19] update block descriptions --- items/materials/direstone.matitem.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/direstone.matitem.patch b/items/materials/direstone.matitem.patch index 6e8bf8eb227..32b63c01b94 100644 --- a/items/materials/direstone.matitem.patch +++ b/items/materials/direstone.matitem.patch @@ -2,6 +2,6 @@ { "op": "replace", "path": "/description", - "value": "Little wormlike forms wriggle beneath the surface of this glassy stone.\n^green;Extractable^reset;, ^red;Smeltable^reset;." + "value": "Little wormlike forms wriggle beneath the surface of this glassy stone.\n^green;Extractable^reset;, ^orange;Crushable^reset;, ^red;Smeltable^reset;." } ] From e22bf3689d3dd1e3c8b38d1e2b3a847c382b78d9 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Tue, 1 Oct 2024 16:16:15 -0500 Subject: [PATCH 06/19] why --- interface/scripted/mmupgrade/mmupgradegui.lua | 3 +-- interface/scripted/mmutility/mmutility.lua | 13 +------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/interface/scripted/mmupgrade/mmupgradegui.lua b/interface/scripted/mmupgrade/mmupgradegui.lua index 7055c4584d6..13ef79adf01 100644 --- a/interface/scripted/mmupgrade/mmupgradegui.lua +++ b/interface/scripted/mmupgrade/mmupgradegui.lua @@ -1,5 +1,4 @@ require "/scripts/util.lua" -require "/interface/scripted/mmutility/mmutility.lua" function init() self.baseStats = { @@ -122,7 +121,7 @@ function giveRacialManipulator() mm.parameters.upgrades[#mm.parameters.upgrades + 1] = "liquidcollection" end if manip.rangeBonus then - status.setStatusProperty("bonusBeamGunRadius", getMMRange(mm)) + status.setStatusProperty("bonusBeamGunRadius", manip.rangeBonus+status.statusProperty("bonusBeamGunRadius", 0)) end local newcfg = root.itemConfig(manip.item).config diff --git a/interface/scripted/mmutility/mmutility.lua b/interface/scripted/mmutility/mmutility.lua index b19917fa5e8..ea8a8133eec 100644 --- a/interface/scripted/mmutility/mmutility.lua +++ b/interface/scripted/mmutility/mmutility.lua @@ -54,7 +54,7 @@ function swapMM(name) paintSizeCap(getMaxSize(swapItem)+1) -- Set the bonus radius to that of the new MM - status.setStatusProperty("bonusBeamGunRadius", getMMRange(swapItem)) + status.setStatusProperty("bonusBeamGunRadius", (root.itemConfig(mm).config.rangeBonus or 0)+getStatBonus(mm, "bonusBeamGunRadius")) -- Transfer wiremode and paintmode upgrades (as they should be permanent) -- Also handles granting of the liquidcollection upgrade if it is enabled by default on the new MM @@ -67,15 +67,6 @@ function swapMM(name) updateMM() end -function getMMRange(mm) - if mm.config then - mmConfig = mm - else - mmConfig = root.itemConfig(mm) - end - return (mmConfig.config.rangeBonus or 0)+getStatBonus(mmConfig, "bonusBeamGunRadius") -end - function swapTool(name) local tool = self.tools[name] local toolItem = player.essentialItem(tool) @@ -256,8 +247,6 @@ end function getStat(item, stat) if item.parameters[stat] ~= nil then return item.parameters[stat] - elseif item.config then - return item.config[stat] else return root.itemConfig(item).config[stat] end From cdd83e070fe794d241661c470c30988330577d1f Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Wed, 23 Oct 2024 10:08:31 -0500 Subject: [PATCH 07/19] remove forced gravity from lush dungeons --- dungeons/other/outpost/medic1.dungeon | 1 - dungeons/other/outpost/starterhouse.dungeon | 1 - 2 files changed, 2 deletions(-) diff --git a/dungeons/other/outpost/medic1.dungeon b/dungeons/other/outpost/medic1.dungeon index 84a9b71b76f..325e18273ce 100644 --- a/dungeons/other/outpost/medic1.dungeon +++ b/dungeons/other/outpost/medic1.dungeon @@ -6,7 +6,6 @@ "anchor" : [ "medic1" ], - "gravity" : 80, "maxRadius" : 1000000, "maxParts" : 100, "protected" : true diff --git a/dungeons/other/outpost/starterhouse.dungeon b/dungeons/other/outpost/starterhouse.dungeon index 33ddf809d05..5bf6134bfcd 100644 --- a/dungeons/other/outpost/starterhouse.dungeon +++ b/dungeons/other/outpost/starterhouse.dungeon @@ -6,7 +6,6 @@ "anchor" : [ "starterhouse" ], - "gravity" : 80, "maxRadius" : 1000000, "maxParts" : 100, "protected" : false From 2bf67d59215cc0ea8e3beea8e0b9c01fcb4fbaa1 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Wed, 23 Oct 2024 16:05:06 -0500 Subject: [PATCH 08/19] rename skath ship images to be properly used by intro cinematic --- cinematics/story/{ => smallship}/skathShip.png | Bin cinematics/story/{ => smallship}/skathShip2.png | Bin cinematics/story/{ => smallship}/skathShip3.png | Bin cinematics/story/{ => smallship}/skathShip4.png | Bin 4 files changed, 0 insertions(+), 0 deletions(-) rename cinematics/story/{ => smallship}/skathShip.png (100%) rename cinematics/story/{ => smallship}/skathShip2.png (100%) rename cinematics/story/{ => smallship}/skathShip3.png (100%) rename cinematics/story/{ => smallship}/skathShip4.png (100%) diff --git a/cinematics/story/skathShip.png b/cinematics/story/smallship/skathShip.png similarity index 100% rename from cinematics/story/skathShip.png rename to cinematics/story/smallship/skathShip.png diff --git a/cinematics/story/skathShip2.png b/cinematics/story/smallship/skathShip2.png similarity index 100% rename from cinematics/story/skathShip2.png rename to cinematics/story/smallship/skathShip2.png diff --git a/cinematics/story/skathShip3.png b/cinematics/story/smallship/skathShip3.png similarity index 100% rename from cinematics/story/skathShip3.png rename to cinematics/story/smallship/skathShip3.png diff --git a/cinematics/story/skathShip4.png b/cinematics/story/smallship/skathShip4.png similarity index 100% rename from cinematics/story/skathShip4.png rename to cinematics/story/smallship/skathShip4.png From c5d6908bed14556ad416ab6d6326a363770c1e6c Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Thu, 24 Oct 2024 14:24:01 -0500 Subject: [PATCH 09/19] goof --- interface/scripted/mmutility/mmutility.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/scripted/mmutility/mmutility.lua b/interface/scripted/mmutility/mmutility.lua index ea8a8133eec..f92a7cd80e1 100644 --- a/interface/scripted/mmutility/mmutility.lua +++ b/interface/scripted/mmutility/mmutility.lua @@ -54,7 +54,7 @@ function swapMM(name) paintSizeCap(getMaxSize(swapItem)+1) -- Set the bonus radius to that of the new MM - status.setStatusProperty("bonusBeamGunRadius", (root.itemConfig(mm).config.rangeBonus or 0)+getStatBonus(mm, "bonusBeamGunRadius")) + status.setStatusProperty("bonusBeamGunRadius", (root.itemConfig(swapItem).config.rangeBonus or 0)+getStatBonus(swapItem, "bonusBeamGunRadius")) -- Transfer wiremode and paintmode upgrades (as they should be permanent) -- Also handles granting of the liquidcollection upgrade if it is enabled by default on the new MM From 8b43c61326b2129de9c923197dfd57c72ecfba89 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 2 Nov 2024 09:55:39 -0500 Subject: [PATCH 10/19] fix freeze error --- stats/effects/fu_effects/freeze/freeze.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stats/effects/fu_effects/freeze/freeze.lua b/stats/effects/fu_effects/freeze/freeze.lua index 772349dffb2..3c08308b886 100644 --- a/stats/effects/fu_effects/freeze/freeze.lua +++ b/stats/effects/fu_effects/freeze/freeze.lua @@ -1,3 +1,5 @@ +require "/stats/effects/fu_statusUtil.lua" + function init() if (status.stat("iceResistance")>=config.getParameter("resistanceThreshold",0.75)) then effect.expire() From 8721746ea814b58feca87d716ef7ca559ba406ee Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Wed, 13 Nov 2024 14:50:33 -0600 Subject: [PATCH 11/19] add groups to hand crafting recipes for compatibility --- recipes/emptyhands/boneaxe.recipe | 2 +- recipes/emptyhands/boneblade.recipe | 2 +- recipes/emptyhands/bonebow.recipe | 2 +- recipes/emptyhands/bonechest.recipe | 4 ++-- recipes/emptyhands/bonefists.recipe | 2 +- recipes/emptyhands/bonehammer.recipe | 2 +- recipes/emptyhands/bonehead.recipe | 4 ++-- recipes/emptyhands/bonelegs.recipe | 4 ++-- recipes/emptyhands/bonemace.recipe | 2 +- recipes/emptyhands/bonepickaxe.recipe | 2 +- recipes/emptyhands/boneshield.recipe | 2 +- recipes/emptyhands/bonespear.recipe | 2 +- recipes/emptyhands/bonespur.recipe | 2 +- recipes/emptyhands/bonesword.recipe | 2 +- recipes/emptyhands/clay.recipe | 2 +- recipes/emptyhands/flagcat.recipe | 2 +- recipes/emptyhands/flagelduukhar.recipe | 2 +- recipes/emptyhands/flagfufenerox.recipe | 2 +- recipes/emptyhands/flagjuux.recipe | 2 +- recipes/emptyhands/flagkirhos.recipe | 2 +- recipes/emptyhands/flagmantizi.recipe | 2 +- recipes/emptyhands/flagnightar.recipe | 2 +- recipes/emptyhands/flagshadow.recipe | 2 +- recipes/emptyhands/flagskath.recipe | 2 +- recipes/emptyhands/flagslimeperson.recipe | 2 +- recipes/emptyhands/flagthelusian.recipe | 2 +- recipes/emptyhands/fu_defaultunlockdiagnoser.recipe | 2 +- recipes/emptyhands/fubonescythe.recipe | 2 +- recipes/emptyhands/fuflamewand.recipe | 4 ++-- recipes/emptyhands/fuprotectorateflag.recipe | 4 ++-- recipes/emptyhands/glassball.recipe | 2 +- recipes/emptyhands/logbook.recipe | 2 +- recipes/emptyhands/primitiveshield.recipe | 2 +- recipes/emptyhands/skathforge1.recipe | 2 +- recipes/emptyhands/skathworktable1.recipe | 2 +- recipes/emptyhands/slimegoo.recipe | 2 +- recipes/emptyhands/stickynotepadfu.recipe | 2 +- recipes/emptyhands/stoneaxe.recipe | 2 +- recipes/emptyhands/stonebroadsword.recipe | 2 +- recipes/emptyhands/stonedagger.recipe | 2 +- recipes/emptyhands/stonegreataxe.recipe | 2 +- recipes/emptyhands/stonehammer.recipe | 2 +- recipes/emptyhands/stonemace.recipe | 2 +- recipes/emptyhands/stonescythe.recipe | 2 +- recipes/emptyhands/stoneshortspear.recipe | 2 +- recipes/emptyhands/stoneshortsword.recipe | 2 +- recipes/emptyhands/stonespear.recipe | 2 +- recipes/emptyhands/woodenboomerang.recipe | 2 +- recipes/emptyhands/woodenkatana.recipe | 2 +- recipes/emptyhands/woodenmace.recipe | 2 +- recipes/emptyhands/xibulb_alpha.recipe | 2 +- recipes/emptyhands/xibulb_basic.recipe | 2 +- recipes/emptyhands/xibulb_mutant.recipe | 2 +- 53 files changed, 58 insertions(+), 58 deletions(-) diff --git a/recipes/emptyhands/boneaxe.recipe b/recipes/emptyhands/boneaxe.recipe index cf1ed19ab51..087fbfdf419 100644 --- a/recipes/emptyhands/boneaxe.recipe +++ b/recipes/emptyhands/boneaxe.recipe @@ -7,5 +7,5 @@ "item" : "fuboneaxe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/boneblade.recipe b/recipes/emptyhands/boneblade.recipe index 3e3c2d6c5bd..ebbe7e3728e 100644 --- a/recipes/emptyhands/boneblade.recipe +++ b/recipes/emptyhands/boneblade.recipe @@ -7,5 +7,5 @@ "item" : "boneblade", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonebow.recipe b/recipes/emptyhands/bonebow.recipe index f1a621b18a8..9ea3fed4aab 100644 --- a/recipes/emptyhands/bonebow.recipe +++ b/recipes/emptyhands/bonebow.recipe @@ -5,5 +5,5 @@ { "item" : "plantfibre", "count" : 5 } ], "output" : { "item" : "bonebow", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonechest.recipe b/recipes/emptyhands/bonechest.recipe index 25f4da9bc79..b3e7e7f44aa 100644 --- a/recipes/emptyhands/bonechest.recipe +++ b/recipes/emptyhands/bonechest.recipe @@ -8,5 +8,5 @@ "item" : "fubonearmorchest", "count" : 1 }, - "groups" : [ "plain", "primitive" ] -} \ No newline at end of file + "groups" : [ "plain", "primitive", "armours" ] +} diff --git a/recipes/emptyhands/bonefists.recipe b/recipes/emptyhands/bonefists.recipe index ee6827c7fa6..6b9af658c2d 100644 --- a/recipes/emptyhands/bonefists.recipe +++ b/recipes/emptyhands/bonefists.recipe @@ -7,5 +7,5 @@ "item" : "fuboneclaws", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonehammer.recipe b/recipes/emptyhands/bonehammer.recipe index 7915e8bfa83..c853fa2d283 100644 --- a/recipes/emptyhands/bonehammer.recipe +++ b/recipes/emptyhands/bonehammer.recipe @@ -8,5 +8,5 @@ "item" : "fubonehammer", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonehead.recipe b/recipes/emptyhands/bonehead.recipe index 6a3b516837d..3827092b830 100644 --- a/recipes/emptyhands/bonehead.recipe +++ b/recipes/emptyhands/bonehead.recipe @@ -8,5 +8,5 @@ "item" : "fubonearmorhead", "count" : 1 }, - "groups" : [ "plain", "primitive" ] -} \ No newline at end of file + "groups" : [ "plain", "primitive", "armours" ] +} diff --git a/recipes/emptyhands/bonelegs.recipe b/recipes/emptyhands/bonelegs.recipe index 127331612af..cad6a7a4525 100644 --- a/recipes/emptyhands/bonelegs.recipe +++ b/recipes/emptyhands/bonelegs.recipe @@ -8,5 +8,5 @@ "item" : "fubonearmorlegs", "count" : 1 }, - "groups" : [ "plain", "primitive" ] -} \ No newline at end of file + "groups" : [ "plain", "primitive", "armours" ] +} diff --git a/recipes/emptyhands/bonemace.recipe b/recipes/emptyhands/bonemace.recipe index c8cd9e6b8d3..e9585ce3b7c 100644 --- a/recipes/emptyhands/bonemace.recipe +++ b/recipes/emptyhands/bonemace.recipe @@ -4,5 +4,5 @@ { "item" : "leather", "count" : 1 } ], "output" : { "item" : "bonemace", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonepickaxe.recipe b/recipes/emptyhands/bonepickaxe.recipe index 9bfe098709a..62d7e2d6298 100644 --- a/recipes/emptyhands/bonepickaxe.recipe +++ b/recipes/emptyhands/bonepickaxe.recipe @@ -8,5 +8,5 @@ "item" : "fubonepickaxe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/boneshield.recipe b/recipes/emptyhands/boneshield.recipe index 2c4724fdebd..6e03f24516b 100644 --- a/recipes/emptyhands/boneshield.recipe +++ b/recipes/emptyhands/boneshield.recipe @@ -8,5 +8,5 @@ "item" : "fuboneshield", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "armours" ] } diff --git a/recipes/emptyhands/bonespear.recipe b/recipes/emptyhands/bonespear.recipe index 4333a7f79b4..0aadb64d307 100644 --- a/recipes/emptyhands/bonespear.recipe +++ b/recipes/emptyhands/bonespear.recipe @@ -7,5 +7,5 @@ "item" : "fubonespear", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonespur.recipe b/recipes/emptyhands/bonespur.recipe index 02be23c1878..c28ba470923 100644 --- a/recipes/emptyhands/bonespur.recipe +++ b/recipes/emptyhands/bonespur.recipe @@ -7,5 +7,5 @@ "item" : "bonespur", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/bonesword.recipe b/recipes/emptyhands/bonesword.recipe index a70b1adfa31..b15b62d33f9 100644 --- a/recipes/emptyhands/bonesword.recipe +++ b/recipes/emptyhands/bonesword.recipe @@ -8,5 +8,5 @@ "item" : "fubonesword", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/clay.recipe b/recipes/emptyhands/clay.recipe index fd6e9a3f076..4f0c72b020f 100644 --- a/recipes/emptyhands/clay.recipe +++ b/recipes/emptyhands/clay.recipe @@ -7,5 +7,5 @@ "item" : "clay", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "materials", "all" ] } diff --git a/recipes/emptyhands/flagcat.recipe b/recipes/emptyhands/flagcat.recipe index c43db6ba044..26025e37b05 100644 --- a/recipes/emptyhands/flagcat.recipe +++ b/recipes/emptyhands/flagcat.recipe @@ -8,5 +8,5 @@ "item" : "flagcat", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagelduukhar.recipe b/recipes/emptyhands/flagelduukhar.recipe index a275048774b..7ece129f08c 100644 --- a/recipes/emptyhands/flagelduukhar.recipe +++ b/recipes/emptyhands/flagelduukhar.recipe @@ -7,5 +7,5 @@ "item" : "flagelduukhar", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagfufenerox.recipe b/recipes/emptyhands/flagfufenerox.recipe index 075a4dc6ddd..69ffeaaf866 100644 --- a/recipes/emptyhands/flagfufenerox.recipe +++ b/recipes/emptyhands/flagfufenerox.recipe @@ -7,5 +7,5 @@ "item" : "flagfufenerox", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagjuux.recipe b/recipes/emptyhands/flagjuux.recipe index fed5da2d508..b3bc7e73199 100644 --- a/recipes/emptyhands/flagjuux.recipe +++ b/recipes/emptyhands/flagjuux.recipe @@ -7,5 +7,5 @@ "item" : "flagjuux", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagkirhos.recipe b/recipes/emptyhands/flagkirhos.recipe index 618173a4b23..6d952134b0e 100644 --- a/recipes/emptyhands/flagkirhos.recipe +++ b/recipes/emptyhands/flagkirhos.recipe @@ -7,5 +7,5 @@ "item" : "flagkirhos", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagmantizi.recipe b/recipes/emptyhands/flagmantizi.recipe index a0a1935924b..15f70fdc0cb 100644 --- a/recipes/emptyhands/flagmantizi.recipe +++ b/recipes/emptyhands/flagmantizi.recipe @@ -7,5 +7,5 @@ "item" : "flagmantizi", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagnightar.recipe b/recipes/emptyhands/flagnightar.recipe index cb61d95ddbc..0b0a607b5f1 100644 --- a/recipes/emptyhands/flagnightar.recipe +++ b/recipes/emptyhands/flagnightar.recipe @@ -7,5 +7,5 @@ "item" : "flagnightar", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagshadow.recipe b/recipes/emptyhands/flagshadow.recipe index e44797a1d87..594e47086cd 100644 --- a/recipes/emptyhands/flagshadow.recipe +++ b/recipes/emptyhands/flagshadow.recipe @@ -7,5 +7,5 @@ "item" : "flagshadow", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagskath.recipe b/recipes/emptyhands/flagskath.recipe index fe0d2205404..f63f74fda06 100644 --- a/recipes/emptyhands/flagskath.recipe +++ b/recipes/emptyhands/flagskath.recipe @@ -7,5 +7,5 @@ "item" : "flagskath", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagslimeperson.recipe b/recipes/emptyhands/flagslimeperson.recipe index 4a85e73f1e3..85fe1a554db 100644 --- a/recipes/emptyhands/flagslimeperson.recipe +++ b/recipes/emptyhands/flagslimeperson.recipe @@ -6,5 +6,5 @@ "item" : "flagslimeperson", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/flagthelusian.recipe b/recipes/emptyhands/flagthelusian.recipe index 3f8c80b7371..f63e5744149 100644 --- a/recipes/emptyhands/flagthelusian.recipe +++ b/recipes/emptyhands/flagthelusian.recipe @@ -7,5 +7,5 @@ "item" : "flagthelusian", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/fu_defaultunlockdiagnoser.recipe b/recipes/emptyhands/fu_defaultunlockdiagnoser.recipe index a4b74dd2b25..19b27073e0b 100644 --- a/recipes/emptyhands/fu_defaultunlockdiagnoser.recipe +++ b/recipes/emptyhands/fu_defaultunlockdiagnoser.recipe @@ -4,5 +4,5 @@ "item" : "fu_defaultunlockdiagnoser", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "tools", "all" ] } diff --git a/recipes/emptyhands/fubonescythe.recipe b/recipes/emptyhands/fubonescythe.recipe index 21cb0eb3f02..aeb1666443a 100644 --- a/recipes/emptyhands/fubonescythe.recipe +++ b/recipes/emptyhands/fubonescythe.recipe @@ -8,5 +8,5 @@ "item" : "fubonescythe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/fuflamewand.recipe b/recipes/emptyhands/fuflamewand.recipe index 87ee5285ac8..e3ee5e710ee 100644 --- a/recipes/emptyhands/fuflamewand.recipe +++ b/recipes/emptyhands/fuflamewand.recipe @@ -9,5 +9,5 @@ "item" : "fuflamewand", "count" : 1 }, - "groups" : [ "plain", "primitive" ] -} \ No newline at end of file + "groups" : [ "plain", "primitive", "weapons" ] +} diff --git a/recipes/emptyhands/fuprotectorateflag.recipe b/recipes/emptyhands/fuprotectorateflag.recipe index 184328f7f1c..b8d5e13cfea 100644 --- a/recipes/emptyhands/fuprotectorateflag.recipe +++ b/recipes/emptyhands/fuprotectorateflag.recipe @@ -7,5 +7,5 @@ "item" : "fuprotectorateflag", "count" : 1 }, - "groups" : [ "plain", "all" ] -} \ No newline at end of file + "groups" : [ "plain", "objects", "all" ] +} diff --git a/recipes/emptyhands/glassball.recipe b/recipes/emptyhands/glassball.recipe index 9927ca2a878..3a2019582ee 100644 --- a/recipes/emptyhands/glassball.recipe +++ b/recipes/emptyhands/glassball.recipe @@ -6,5 +6,5 @@ "item" : "glassball", "count" : 10 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "consumables" ] } diff --git a/recipes/emptyhands/logbook.recipe b/recipes/emptyhands/logbook.recipe index 326a525d5c3..292ea9dec62 100644 --- a/recipes/emptyhands/logbook.recipe +++ b/recipes/emptyhands/logbook.recipe @@ -7,5 +7,5 @@ "item" : "xcodexlogbook", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "tools", "all" ] } diff --git a/recipes/emptyhands/primitiveshield.recipe b/recipes/emptyhands/primitiveshield.recipe index ca274f74f4d..e0fb259b89d 100644 --- a/recipes/emptyhands/primitiveshield.recipe +++ b/recipes/emptyhands/primitiveshield.recipe @@ -7,5 +7,5 @@ "item" : "primitiveshield", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "armours" ] } diff --git a/recipes/emptyhands/skathforge1.recipe b/recipes/emptyhands/skathforge1.recipe index ed371cb6d99..9de43b42bcd 100644 --- a/recipes/emptyhands/skathforge1.recipe +++ b/recipes/emptyhands/skathforge1.recipe @@ -9,5 +9,5 @@ "item" : "skathforge1", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all", "tools" ] } diff --git a/recipes/emptyhands/skathworktable1.recipe b/recipes/emptyhands/skathworktable1.recipe index b857c10dd5f..dbe727eb1fc 100644 --- a/recipes/emptyhands/skathworktable1.recipe +++ b/recipes/emptyhands/skathworktable1.recipe @@ -8,5 +8,5 @@ "item" : "skathworktable1", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all", "tools" ] } diff --git a/recipes/emptyhands/slimegoo.recipe b/recipes/emptyhands/slimegoo.recipe index bacb6691c5c..53b32ba9a5c 100644 --- a/recipes/emptyhands/slimegoo.recipe +++ b/recipes/emptyhands/slimegoo.recipe @@ -6,6 +6,6 @@ "item" : "slimegoo", "count" : 1 }, - "groups" : [ "plain", "all" ], + "groups" : [ "plain", "other", "all" ], "duration" : 2 } diff --git a/recipes/emptyhands/stickynotepadfu.recipe b/recipes/emptyhands/stickynotepadfu.recipe index 511a2da42de..e0eea453119 100644 --- a/recipes/emptyhands/stickynotepadfu.recipe +++ b/recipes/emptyhands/stickynotepadfu.recipe @@ -5,4 +5,4 @@ ], "output" : {"item" : "stickynotepadfu", "count" : 10}, "groups" : ["plain", "all", "other", "mod"] -} \ No newline at end of file +} diff --git a/recipes/emptyhands/stoneaxe.recipe b/recipes/emptyhands/stoneaxe.recipe index f5775945b8d..0eb791cd89d 100644 --- a/recipes/emptyhands/stoneaxe.recipe +++ b/recipes/emptyhands/stoneaxe.recipe @@ -8,5 +8,5 @@ "item" : "stoneaxe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonebroadsword.recipe b/recipes/emptyhands/stonebroadsword.recipe index bf46b575d2f..0e7ee9c377a 100644 --- a/recipes/emptyhands/stonebroadsword.recipe +++ b/recipes/emptyhands/stonebroadsword.recipe @@ -8,5 +8,5 @@ "item" : "stonebroadsword", "count" : 1 }, - "groups" : ["plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonedagger.recipe b/recipes/emptyhands/stonedagger.recipe index 7b62616ba0c..48ccd315d98 100644 --- a/recipes/emptyhands/stonedagger.recipe +++ b/recipes/emptyhands/stonedagger.recipe @@ -8,5 +8,5 @@ "item" : "stonedagger", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonegreataxe.recipe b/recipes/emptyhands/stonegreataxe.recipe index 167cbf10b9f..72ae3437c49 100644 --- a/recipes/emptyhands/stonegreataxe.recipe +++ b/recipes/emptyhands/stonegreataxe.recipe @@ -8,5 +8,5 @@ "item" : "stonegreataxe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonehammer.recipe b/recipes/emptyhands/stonehammer.recipe index ed10ecf6183..0501f7f9e0c 100644 --- a/recipes/emptyhands/stonehammer.recipe +++ b/recipes/emptyhands/stonehammer.recipe @@ -8,5 +8,5 @@ "item" : "stonehammer", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonemace.recipe b/recipes/emptyhands/stonemace.recipe index e51ee81f2e4..d44d27afc70 100644 --- a/recipes/emptyhands/stonemace.recipe +++ b/recipes/emptyhands/stonemace.recipe @@ -8,5 +8,5 @@ "item" : "stonemace", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonescythe.recipe b/recipes/emptyhands/stonescythe.recipe index 44e7d246e8f..ac98c170beb 100644 --- a/recipes/emptyhands/stonescythe.recipe +++ b/recipes/emptyhands/stonescythe.recipe @@ -8,5 +8,5 @@ "item" : "stonescythe", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stoneshortspear.recipe b/recipes/emptyhands/stoneshortspear.recipe index 675f9cee318..6f35f40b4b0 100644 --- a/recipes/emptyhands/stoneshortspear.recipe +++ b/recipes/emptyhands/stoneshortspear.recipe @@ -8,5 +8,5 @@ "item" : "stoneshortspear", "count" : 1 }, - "groups" : ["plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stoneshortsword.recipe b/recipes/emptyhands/stoneshortsword.recipe index 18eeed3cf19..83c9cf01d72 100644 --- a/recipes/emptyhands/stoneshortsword.recipe +++ b/recipes/emptyhands/stoneshortsword.recipe @@ -8,5 +8,5 @@ "item" : "stoneshortsword", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/stonespear.recipe b/recipes/emptyhands/stonespear.recipe index 0e3be13fcfb..a2d80bbeea4 100644 --- a/recipes/emptyhands/stonespear.recipe +++ b/recipes/emptyhands/stonespear.recipe @@ -8,5 +8,5 @@ "item" : "stonespear", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/woodenboomerang.recipe b/recipes/emptyhands/woodenboomerang.recipe index fa40b321132..b50875124ce 100644 --- a/recipes/emptyhands/woodenboomerang.recipe +++ b/recipes/emptyhands/woodenboomerang.recipe @@ -6,5 +6,5 @@ "item" : "woodenboomerang", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/woodenkatana.recipe b/recipes/emptyhands/woodenkatana.recipe index ac0e5cbc17a..fe938620327 100644 --- a/recipes/emptyhands/woodenkatana.recipe +++ b/recipes/emptyhands/woodenkatana.recipe @@ -6,5 +6,5 @@ "item" : "woodenkatana", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/woodenmace.recipe b/recipes/emptyhands/woodenmace.recipe index bf4282241da..39add5d4782 100644 --- a/recipes/emptyhands/woodenmace.recipe +++ b/recipes/emptyhands/woodenmace.recipe @@ -6,5 +6,5 @@ "item" : "woodenmace", "count" : 1 }, - "groups" : [ "plain", "primitive" ] + "groups" : [ "plain", "primitive", "weapons" ] } diff --git a/recipes/emptyhands/xibulb_alpha.recipe b/recipes/emptyhands/xibulb_alpha.recipe index fbee5c65f2e..1d1aa62de35 100644 --- a/recipes/emptyhands/xibulb_alpha.recipe +++ b/recipes/emptyhands/xibulb_alpha.recipe @@ -7,5 +7,5 @@ "item" : "xi_bulb3", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/xibulb_basic.recipe b/recipes/emptyhands/xibulb_basic.recipe index 180d41a29cc..0958bcc4b7f 100644 --- a/recipes/emptyhands/xibulb_basic.recipe +++ b/recipes/emptyhands/xibulb_basic.recipe @@ -6,5 +6,5 @@ "item" : "xi_bulb", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } diff --git a/recipes/emptyhands/xibulb_mutant.recipe b/recipes/emptyhands/xibulb_mutant.recipe index 5b1abb9070e..8ef2c55903b 100644 --- a/recipes/emptyhands/xibulb_mutant.recipe +++ b/recipes/emptyhands/xibulb_mutant.recipe @@ -7,5 +7,5 @@ "item" : "xi_bulb2", "count" : 1 }, - "groups" : [ "plain", "all" ] + "groups" : [ "plain", "objects", "all" ] } From 7cdf962db16d113d33f59434408d735c0cf95759 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 16 Nov 2024 10:33:50 -0600 Subject: [PATCH 12/19] failsafe --- interface/scripted/mmutility/mmutility.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/scripted/mmutility/mmutility.lua b/interface/scripted/mmutility/mmutility.lua index f92a7cd80e1..a30f12efd98 100644 --- a/interface/scripted/mmutility/mmutility.lua +++ b/interface/scripted/mmutility/mmutility.lua @@ -48,7 +48,7 @@ function swapMM(name) if not swapItem then swapItem = self.currentMM.parameters.originalMM or root.createItem(getBaseManip()) else - swapItem.parameters.originalMM = currentlyBase and self.currentMM or self.currentMM.parameters.originalMM + swapItem.parameters.originalMM = (currentlyBase and self.currentMM or self.currentMM.parameters.originalMM) or root.createItem(getBaseManip()) end paintSizeCap(getMaxSize(swapItem)+1) From 3a0162c101e4f118a7f239fa8315c42d04d86711 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 16 Nov 2024 10:53:59 -0600 Subject: [PATCH 13/19] extraction recipe tweaks remove recipes from items that are crushable and siftable re-add direstone crushing update block descriptions --- items/materials/blackslimematerial.matitem | 2 +- items/materials/brick.matitem.patch | 10 +++--- items/materials/candyblock.matitem.patch | 14 ++++---- items/materials/coral2material.matitem | 2 +- objects/generic/centrifuge_recipes.config | 39 +++++++++------------- 5 files changed, 29 insertions(+), 38 deletions(-) diff --git a/items/materials/blackslimematerial.matitem b/items/materials/blackslimematerial.matitem index 9e0644cc569..3e97dfccc9e 100644 --- a/items/materials/blackslimematerial.matitem +++ b/items/materials/blackslimematerial.matitem @@ -10,6 +10,6 @@ 2.0 ], "shortdescription": "Black Slime", - "description": "This is just gross. Seriously. It's all gloppy and toxic!\n^green;Extractable^reset;.", + "description": "This is just gross. Seriously. It's all gloppy and toxic!\n^green;Extractable^reset;, ^yellow;Centrifugable^reset;.", "materialId": 6544 } diff --git a/items/materials/brick.matitem.patch b/items/materials/brick.matitem.patch index 5e86cc00e7c..f578c29282d 100644 --- a/items/materials/brick.matitem.patch +++ b/items/materials/brick.matitem.patch @@ -1,7 +1,7 @@ [ -{ - "op": "replace", - "path": "/description", - "value": "Small but perfectly formed bricks made from clay. \n^orange;Crushable^reset;." -} + { + "op": "replace", + "path": "/description", + "value": "Small but perfectly formed bricks made from clay.\n^orange;Crushable^reset;." + } ] diff --git a/items/materials/candyblock.matitem.patch b/items/materials/candyblock.matitem.patch index d790a55ba6e..62d5a25cd69 100644 --- a/items/materials/candyblock.matitem.patch +++ b/items/materials/candyblock.matitem.patch @@ -1,7 +1,7 @@ -[ - { - "op": "replace", - "path": "/description", - "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, \n^orange;Crushable^reset;." - } -] +[ + { + "op": "replace", + "path": "/description", + "value": "Sweet-smelling rock candy!\n^green;Extractable^reset;, ^orange;Crushable^reset;." + } +] diff --git a/items/materials/coral2material.matitem b/items/materials/coral2material.matitem index 1f8f60d3037..439290ca90d 100644 --- a/items/materials/coral2material.matitem +++ b/items/materials/coral2material.matitem @@ -9,7 +9,7 @@ 2.5, 2.0 ], - "description": "A block of delicate coral.\n^green;Extractable^reset;, ^orange;Siftable^reset;.", + "description": "A block of delicate coral.\n^green;Extractable^reset;, ^orange;Crushable^reset;.", "shortdescription": "Delicate Coral", "materialId": 6548 } diff --git a/objects/generic/centrifuge_recipes.config b/objects/generic/centrifuge_recipes.config index 7380a565dc6..e492dd54c5c 100644 --- a/objects/generic/centrifuge_recipes.config +++ b/objects/generic/centrifuge_recipes.config @@ -42,16 +42,6 @@ "algaegreen": ["common", 3], "fu_salt": ["common", 3] }, - "coral2material": { - "bone": ["common", 3], - "coralfragment": ["common", 3], - "fu_salt": ["common", 3], - - "cellmatter": ["rare", 1], - - "calciumnitrate": ["rarest", 1] - - }, "glasssandmaterial": { "biospore": ["rarest", 2], "lead": ["rarest", 2], @@ -832,20 +822,6 @@ "gravelmaterial": ["common", 2], "cobblestonematerial": ["common", 2] }, - "bioblockmaterial": { - "sand": ["uncommon", 2], - "sand2": ["uncommon", 2], - - "gravelmaterial": ["common", 2], - "cobblestonematerial": ["common", 2] - }, - "bioblock2material": { - "sand": ["uncommon", 2], - "sand2": ["uncommon", 2], - - "gravelmaterial": ["common", 2], - "cobblestonematerial": ["common", 2] - }, "tarstonematerial": { "fu_carbon": ["rarest", 1], @@ -1028,6 +1004,21 @@ "coalore": ["common", 3], "copperore": ["common", 3] }, + "direstone": { + "tungstenore": ["rarest", 2], + "goldore": ["rarest", 2], + + "corefragmentore": ["rare", 3], + "liquidoil": ["rare", 3], + "lead": ["rare", 3], + + "silverore": ["uncommon", 3], + "copperore": ["uncommon", 3], + "ironore": ["uncommon", 3], + + "cobblestonematerial": ["common", 2], + "gravelmaterial": ["common", 2] + }, "conglomeratematerial": { "goldore": ["rarest", 3], "magnesiumsulfate" : ["rarest", 3], From a370a2c28fad27b7243d111728d886da3882a53b Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 16 Nov 2024 20:58:49 -0600 Subject: [PATCH 14/19] make terramart eggs expensive again --- .../outpost/terramart/terramart.object.patch | 77 ++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/objects/outpost/terramart/terramart.object.patch b/objects/outpost/terramart/terramart.object.patch index 5bdabc72934..4b5cdbb3a94 100644 --- a/objects/outpost/terramart/terramart.object.patch +++ b/objects/outpost/terramart/terramart.object.patch @@ -1,4 +1,77 @@ -[{ +[ + [{ + "op": "test", + "path": "/interactData/items/1/item", + "value": "henegg" + }, { + "op": "add", + "path": "/interactData/items/1/price", + "value": 1000 + }], + [{ + "op": "test", + "path": "/interactData/items/2/item", + "value": "robothenegg" + }, { + "op": "add", + "path": "/interactData/items/2/price", + "value": 1000 + }], + [{ + "op": "test", + "path": "/interactData/items/3/item", + "value": "mooshiegg" + }, { + "op": "add", + "path": "/interactData/items/3/price", + "value": 2000 + }], + [{ + "op": "test", + "path": "/interactData/items/4/item", + "value": "fluffaloegg" + }, { + "op": "add", + "path": "/interactData/items/4/price", + "value": 2000 + }], + [{ + "op": "test", + "path": "/interactData/items/5/item", + "value": "firefluffaloegg" + }, { + "op": "add", + "path": "/interactData/items/5/price", + "value": 2500 + }], + [{ + "op": "test", + "path": "/interactData/items/6/item", + "value": "poisonfluffaloegg" + }, { + "op": "add", + "path": "/interactData/items/6/price", + "value": 2500 + }], + [{ + "op": "test", + "path": "/interactData/items/7/item", + "value": "icefluffaloegg" + }, { + "op": "add", + "path": "/interactData/items/7/price", + "value": 2500 + }], + [{ + "op": "test", + "path": "/interactData/items/8/item", + "value": "electricfluffaloegg" + }, { + "op": "add", + "path": "/interactData/items/8/price", + "value": 2500 + }], + { "op": "add", "path": "/interactData/items/-", "value": { @@ -80,4 +153,4 @@ "path":"/slimepersonDescription", "value":"A useful source of supplies for farming. Could be quite beneficial." } -] \ No newline at end of file +] From 4fe18220d01cece0ccf91511910f5c267af070c6 Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sat, 16 Nov 2024 22:18:31 -0600 Subject: [PATCH 15/19] shut up sail --- stats/effects/erchiussickness/erchiussickness.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stats/effects/erchiussickness/erchiussickness.lua b/stats/effects/erchiussickness/erchiussickness.lua index ff7bb90dbd4..08bbaa1ba44 100644 --- a/stats/effects/erchiussickness/erchiussickness.lua +++ b/stats/effects/erchiussickness/erchiussickness.lua @@ -27,6 +27,7 @@ function init() self.findMonster = util.uniqueEntityTracker(self.monsterUniqueId, 0.2) self.saturation = 0 self.dps = 0 + self.didSpawn = false self.spawnTimer = 0.5 end @@ -55,7 +56,7 @@ function update(dt) local monsterPosition = self.findMonster() if monsterPosition then - if not self.messaged then + if not self.messaged and self.didSpawn then world.sendEntityMessage(entity.id(), "queueRadioMessage", "erchiussickness") self.messaged = true end @@ -99,6 +100,7 @@ function update(dt) keepAlive = true } world.spawnMonster(self.spawnGhost, vec2.add(mcontroller.position(), config.getParameter("ghostSpawnOffset")), parameters) + self.didSpawn = true self.spawnTimer = 1.0 end end From b7e07e87e5ea2af81a458a259414e070a8caa01a Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Mon, 18 Nov 2024 10:06:01 -0600 Subject: [PATCH 16/19] tweak fall damage again --- stats/monster_primary.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stats/monster_primary.lua b/stats/monster_primary.lua index ee80df247b3..211efe797a7 100644 --- a/stats/monster_primary.lua +++ b/stats/monster_primary.lua @@ -149,7 +149,10 @@ function update(dt) if self.fallDistance > minimumFallDistance and -self.lastYVelocity > minimumFallVel and mcontroller.onGround() and not inLiquid() then --fall damage is proportional to max health, with 100.0 being the player's standard - local healthRatio = math.sqrt(status.stat("maxHealth") / 100.0) + local healthRatio = status.stat("maxHealth") / 100.0 + if healthRatio > 1.0 then + healthRatio = math.sqrt(healthRatio) + end local damage = (self.fallDistance - minimumFallDistance) * fallDistanceDamageFactor damage = damage * (1.0 + (world.gravity(mcontroller.position()) - baseGravity) * gravityDiffFactor) From 9e19a800ee507b7f6bd2461b56a8a095abde382a Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sun, 24 Nov 2024 17:16:21 -0600 Subject: [PATCH 17/19] fix misleading hunger information --- interface/scripted/statWindow/extraStatsWindow.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/scripted/statWindow/extraStatsWindow.lua b/interface/scripted/statWindow/extraStatsWindow.lua index 050140034a9..000a6f8cd2d 100644 --- a/interface/scripted/statWindow/extraStatsWindow.lua +++ b/interface/scripted/statWindow/extraStatsWindow.lua @@ -48,12 +48,9 @@ function update() elseif type == "food" then local foodVal=status.isResource("food") and status.resourceMax("food") or 0 if foodVal~=0 then + if value > 0 then value=0 end value=math.abs(shorten(foodVal/(value*60.0))) - if value % 1 == 0 then - widget.setText(stat, tostring(math.floor(value))) - else - widget.setText(stat, tostring(value)) - end + widget.setText(stat, tostring(value)) else widget.setText(stat, "---") end From fbbda287fd18fee2ba9f49848e747d398f9087ab Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Sun, 24 Nov 2024 17:48:05 -0600 Subject: [PATCH 18/19] Revert "fix misleading hunger information" This reverts commit 9e19a800ee507b7f6bd2461b56a8a095abde382a. --- interface/scripted/statWindow/extraStatsWindow.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/scripted/statWindow/extraStatsWindow.lua b/interface/scripted/statWindow/extraStatsWindow.lua index 000a6f8cd2d..050140034a9 100644 --- a/interface/scripted/statWindow/extraStatsWindow.lua +++ b/interface/scripted/statWindow/extraStatsWindow.lua @@ -48,9 +48,12 @@ function update() elseif type == "food" then local foodVal=status.isResource("food") and status.resourceMax("food") or 0 if foodVal~=0 then - if value > 0 then value=0 end value=math.abs(shorten(foodVal/(value*60.0))) - widget.setText(stat, tostring(value)) + if value % 1 == 0 then + widget.setText(stat, tostring(math.floor(value))) + else + widget.setText(stat, tostring(value)) + end else widget.setText(stat, "---") end From bef6e30cbc97b4013bd71cae842cc82b2831aa5d Mon Sep 17 00:00:00 2001 From: giantcavespider Date: Wed, 27 Nov 2024 20:43:10 -0600 Subject: [PATCH 19/19] make madness adult poptop pet use correct monster --- .../madness/gene/madnessadultpoptop/madnessadultpoptop.object | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spawners/madness/gene/madnessadultpoptop/madnessadultpoptop.object b/spawners/madness/gene/madnessadultpoptop/madnessadultpoptop.object index 34d21e18a74..beeede722a7 100644 --- a/spawners/madness/gene/madnessadultpoptop/madnessadultpoptop.object +++ b/spawners/madness/gene/madnessadultpoptop/madnessadultpoptop.object @@ -21,7 +21,7 @@ ], "botspawner" : { - "type" : "poptopmadnesspet", + "type" : "adultpoptopmadnesspet", "monsterImage":"/monsters/walkers/adultpoptop/adultpoptop.png:idle.1?" },