From 7e0920e224a2e6b72598ec4d409a1bfc144e8627 Mon Sep 17 00:00:00 2001 From: sayterdarkwynd Date: Tue, 22 Oct 2024 14:03:47 -0400 Subject: [PATCH] trough radiomessages --- objects/crafting/eggstra/eggincubator/incubator.lua | 3 --- objects/crafting/eggstra/largetrough/irontrough.object | 3 ++- objects/crafting/eggstra/largetrough/largetrough.object | 3 ++- objects/glitch/trough/trough.object.patch | 5 +++++ radiomessages/tutorial.radiomessages.patch | 8 ++++++++ scripts/actions/monsters/farmable.config | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/objects/crafting/eggstra/eggincubator/incubator.lua b/objects/crafting/eggstra/eggincubator/incubator.lua index 2d90c4f3f4f..c316a62fbe2 100644 --- a/objects/crafting/eggstra/eggincubator/incubator.lua +++ b/objects/crafting/eggstra/eggincubator/incubator.lua @@ -7,13 +7,10 @@ function init() -- egg type? self.entityId=entity.id() self.centrifugeType = config.getParameter("centrifugeType") - incubation = config.getParameter("incubation") - spawnMod = math.random(10) -- + config.getParameter("spawnModValue") -- change this to check the egg instead. each egg has a spawnMod that influences its hatch time end - function fillAmount() if type(self.entityId) ~= "number" then return nil end diff --git a/objects/crafting/eggstra/largetrough/irontrough.object b/objects/crafting/eggstra/largetrough/irontrough.object index ff723d97686..30997002313 100644 --- a/objects/crafting/eggstra/largetrough/irontrough.object +++ b/objects/crafting/eggstra/largetrough/irontrough.object @@ -35,5 +35,6 @@ "uiConfig": "/interface/chests/chest.config", "frameCooldown": 5, "autoCloseCooldown": 3600, - "itemAgeMultiplier" : 0.0 + "itemAgeMultiplier" : 0.0, + "radioMessagesOnPickup" : ["fu_useTrough"] } diff --git a/objects/crafting/eggstra/largetrough/largetrough.object b/objects/crafting/eggstra/largetrough/largetrough.object index bcf24f4d9df..5992ea921ac 100644 --- a/objects/crafting/eggstra/largetrough/largetrough.object +++ b/objects/crafting/eggstra/largetrough/largetrough.object @@ -35,5 +35,6 @@ "uiConfig": "/interface/chests/chest.config", "frameCooldown": 5, "autoCloseCooldown": 3600, - "itemAgeMultiplier" : 0.0 + "itemAgeMultiplier" : 0.0, + "radioMessagesOnPickup" : ["fu_useTrough"] } \ No newline at end of file diff --git a/objects/glitch/trough/trough.object.patch b/objects/glitch/trough/trough.object.patch index 7f2c53b60d5..6d0caa267ed 100644 --- a/objects/glitch/trough/trough.object.patch +++ b/objects/glitch/trough/trough.object.patch @@ -33,5 +33,10 @@ "op": "add", "path": "/itemAgeMultiplier", "value": 0.0 + }, + { + "op": "add", + "path": "/radioMessagesOnPickup", + "value": ["fu_useTrough"] } ] \ No newline at end of file diff --git a/radiomessages/tutorial.radiomessages.patch b/radiomessages/tutorial.radiomessages.patch index ae52c85739c..89cc47ff0af 100644 --- a/radiomessages/tutorial.radiomessages.patch +++ b/radiomessages/tutorial.radiomessages.patch @@ -117,5 +117,13 @@ "type" : "tutorial", "text" : "^cyan;Kevin^reset; insists he was given this award for the best-selling album of all time among Mantizi culture :^yellow;'Holy Crap, Look At The Size of that Sandwich!'^reset;. No proof has ever been provided. It is best to assume this is bullshit." } + }, + { + "op": "add", + "path": "/fu_useTrough", + "value": { + "type" : "tutorial", + "text" : "^orange;Troughs^reset; provide a place to store food for your farm animals. When one of them becomes hungry, they will seek food there. With enough food they'll become happy, which increases their chance to produce offspring if a viable mate is nearby!" + } } ] diff --git a/scripts/actions/monsters/farmable.config b/scripts/actions/monsters/farmable.config index 3a986239767..847e5ccf4e7 100644 --- a/scripts/actions/monsters/farmable.config +++ b/scripts/actions/monsters/farmable.config @@ -149,7 +149,7 @@ "yellowfoot", "zathitails", "dunestalk", - "avikanspices", + "avikanspices", "kirifruit", "nakatibark", "pirufrond",