From aff2302a56e7a93e61c104009279bbe05560c9ef Mon Sep 17 00:00:00 2001 From: Bruno Date: Sun, 10 Feb 2019 21:04:36 -0200 Subject: [PATCH] Slowed fisher and new container Nerfed fishing speed Coconut, fish and pearl containers changed from simple decorations to actual storage like chests Shortened Miranda start dialogues Fixed beachball --- archipelago_biome_server.lua | 2 +- .../data/fishing/fishing.json | 10 ++--- .../returning_crop_trader_encounter.json | 25 ------------ archipelago_selected/manifest.json | 3 -- data/fishing/fishing.json | 39 +++++++++++-------- .../fish_container/fish_container.json | 6 ++- .../fruit_container/fruit_container.json | 6 ++- .../pearl_container/pearl_container.json | 6 ++- entities/toys/beachball/beachball_ghost.json | 2 +- entities/toys/beachball/beachball_iconic.json | 28 +++++++++---- jobs/cook/recipes/fruit_container_recipe.json | 2 +- jobs/fisher/fisher.lua | 12 +++++- .../fisher/recipes/fish_container_recipe.json | 2 +- .../recipes/pearl_container_recipe.json | 2 +- locales/en.json | 31 ++++++++------- locales/pt-BR.json | 23 ++++++----- manifest.json | 16 ++++++-- ui/data/stockpile_fish_filters.json | 18 +++++++++ ui/data/stockpile_fruit_filters.json | 24 ++++++++++++ ui/data/stockpile_pearl_filters.json | 24 ++++++++++++ 20 files changed, 188 insertions(+), 93 deletions(-) delete mode 100644 archipelago_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json create mode 100644 ui/data/stockpile_fish_filters.json create mode 100644 ui/data/stockpile_fruit_filters.json create mode 100644 ui/data/stockpile_pearl_filters.json diff --git a/archipelago_biome_server.lua b/archipelago_biome_server.lua index 41a7a2f..9f54cf4 100644 --- a/archipelago_biome_server.lua +++ b/archipelago_biome_server.lua @@ -1,5 +1,5 @@ archipelago_biome = {} -print("Archipelago Biome Mod version 19.1.27") +print("Archipelago Biome Mod version 19.2.10") function archipelago_biome:_on_required_loaded() end diff --git a/archipelago_selected/data/fishing/fishing.json b/archipelago_selected/data/fishing/fishing.json index d29a9c0..1231166 100644 --- a/archipelago_selected/data/fishing/fishing.json +++ b/archipelago_selected/data/fishing/fishing.json @@ -11,7 +11,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":8, - "effort":100, + "effort":104, "xp":13 } }, @@ -19,7 +19,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":16, - "effort":80, + "effort":88, "xp":11 } }, @@ -27,7 +27,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":24, - "effort":60, + "effort":72, "xp":9 } }, @@ -35,7 +35,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":32, - "effort":40, + "effort":56, "xp":7 } }, @@ -43,7 +43,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":40, - "effort":20, + "effort":40, "xp":5 } } diff --git a/archipelago_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json b/archipelago_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json deleted file mode 100644 index 308b6e6..0000000 --- a/archipelago_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "script_info": { - "data": { - "min_days_before_return": 2, - "max_days_before_return": 2, - "mixintypes": { - "wants": "override" - }, - "wants": { - "archipelago_biome:decoration:fish_container": { - "min": 3, - "max": 5 - }, - "archipelago_biome:decoration:fruit_container": { - "min": 5, - "max": 8 - }, - "archipelago_biome:decoration:pearl_container": { - "min": 2, - "max": 2 - } - } - } - } -} \ No newline at end of file diff --git a/archipelago_selected/manifest.json b/archipelago_selected/manifest.json index fc29e69..7dab4ab 100644 --- a/archipelago_selected/manifest.json +++ b/archipelago_selected/manifest.json @@ -14,9 +14,6 @@ "stonehearth/data/gm/campaigns/goblin_war/arcs/trigger/raidcamp/encounters/create_camp/stockpile.json":"file(data/gm/campaigns/goblin_war/arcs/trigger/raidcamp/encounters/create_camp/stockpile.json)", "stonehearth/data/gm/campaigns/goblin_war/arcs/trigger/raidcamp/encounters/create_camp/wood_stockpile.json":"file(data/gm/campaigns/goblin_war/arcs/trigger/raidcamp/encounters/create_camp/beachball.json)", "stonehearth/data/gm/campaigns/goblin_war/arcs/challenge/forward_scouts/encounters/create_scout_camp/goblin_tent.json":"file(data/gm/campaigns/goblin_war/arcs/challenge/forward_scouts/encounters/create_scout_camp/goblin_tent.json)", - - "stonehearth/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json": "file(data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json)", - "rayyas_children/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json":"file(data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json)", "stonehearth/entities/landmark/summon_stone_block_surface/summon_stone_block_surface_ghost.json": "file(entities/landmark/summon_stone_block_surface/summon_stone_block_surface_ghost.json)", "stonehearth/entities/landmark/summon_stone_patch_surface/summon_stone_patch_surface.json": "file(entities/landmark/summon_stone_patch_surface/summon_stone_patch_surface.json)", diff --git a/data/fishing/fishing.json b/data/fishing/fishing.json index 3db616e..f5cc08e 100644 --- a/data/fishing/fishing.json +++ b/data/fishing/fishing.json @@ -53,13 +53,13 @@ "default_fish":{ "alias":"archipelago_biome:food:fish", "weight":100, - "effort":100, + "effort":104, "xp":13 }, "big_fish":{ "alias":"archipelago_biome:food:big_fish", "weight":4, - "effort":200, + "effort":208, "xp":26 }, "turtle_shield":{ @@ -89,7 +89,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":4, - "effort":100, + "effort":104, "xp":13 } }, @@ -97,13 +97,13 @@ "default_fish":{ "alias":"archipelago_biome:food:fish", "weight":100, - "effort":80, + "effort":88, "xp":11 }, "big_fish":{ "alias":"archipelago_biome:food:big_fish", "weight":8, - "effort":160, + "effort":176, "xp":22 }, "ice_cube":{ @@ -118,7 +118,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":8, - "effort":80, + "effort":88, "xp":11 } }, @@ -126,13 +126,13 @@ "default_fish":{ "alias":"archipelago_biome:food:fish", "weight":100, - "effort":60, + "effort":72, "xp":9 }, "big_fish":{ "alias":"archipelago_biome:food:big_fish", "weight":12, - "effort":120, + "effort":144, "xp":18 }, "ice_cube":{ @@ -147,7 +147,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":12, - "effort":60, + "effort":72, "xp":9 } }, @@ -155,13 +155,13 @@ "default_fish":{ "alias":"archipelago_biome:food:fish", "weight":100, - "effort":40, + "effort":56, "xp":7 }, "big_fish":{ "alias":"archipelago_biome:food:big_fish", "weight":16, - "effort":80, + "effort":112, "xp":14 }, "ice_cube":{ @@ -176,7 +176,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":16, - "effort":40, + "effort":56, "xp":7 } }, @@ -184,13 +184,13 @@ "default_fish":{ "alias":"archipelago_biome:food:fish", "weight":100, - "effort":20, + "effort":40, "xp":5 }, "big_fish":{ "alias":"archipelago_biome:food:big_fish", "weight":20, - "effort":40, + "effort":80, "xp":10 }, "dusty_tome":{ @@ -203,13 +203,18 @@ "is_kingdom_exclusive":[ "rayyas_children:kingdoms:rayyas_children" ], - "effort":10, + "bulletin":{ + "title":"i18n(stonehearth:entities.loot.dusty_tome.display_name)", + "message":"i18n(archipelago_biome:data.fishing.dusty_tome.message)", + "image":"/stonehearth/entities/loot/dusty_tome/dusty_tome.png" + }, + "effort":20, "xp":1 }, "gold_chest":{ "alias":"stonehearth:loot:gold", "weight":5, - "effort":10, + "effort":15, "xp":1 }, "nemo":{ @@ -236,7 +241,7 @@ "tropical_fish":{ "alias":"archipelago_biome:food:tropical_fish", "weight":20, - "effort":20, + "effort":40, "xp":5 } } diff --git a/entities/decoration/fish_container/fish_container.json b/entities/decoration/fish_container/fish_container.json index 23eac19..906f9f4 100644 --- a/entities/decoration/fish_container/fish_container.json +++ b/entities/decoration/fish_container/fish_container.json @@ -2,6 +2,10 @@ "type": "entity", "mixins": "file(fish_container_ghost.json)", "components": { + "stonehearth:storage": { + "capacity": 16, + "filter_list": "archipelago_biome:ui:stockpile:fish_filters" + }, "stonehearth:entity_forms": { "iconic_form": "file(fish_container_iconic.json)", "ghost_form": "file(fish_container_ghost.json)", @@ -26,7 +30,7 @@ }, "entity_data": { "stonehearth:net_worth": { - "value_in_gold": 21, + "value_in_gold": 9, "rarity": "common", "shop_info": { "buyable": false, diff --git a/entities/decoration/fruit_container/fruit_container.json b/entities/decoration/fruit_container/fruit_container.json index 2d6e6db..a46646f 100644 --- a/entities/decoration/fruit_container/fruit_container.json +++ b/entities/decoration/fruit_container/fruit_container.json @@ -2,6 +2,10 @@ "type": "entity", "mixins": "file(fruit_container_ghost.json)", "components": { + "stonehearth:storage": { + "capacity": 16, + "filter_list": "archipelago_biome:ui:stockpile:fruit_filters" + }, "stonehearth:entity_forms": { "iconic_form": "file(fruit_container_iconic.json)", "ghost_form": "file(fruit_container_ghost.json)", @@ -26,7 +30,7 @@ }, "entity_data": { "stonehearth:net_worth": { - "value_in_gold": 21, + "value_in_gold": 9, "rarity": "common", "shop_info": { "buyable": false, diff --git a/entities/decoration/pearl_container/pearl_container.json b/entities/decoration/pearl_container/pearl_container.json index 9cdc0df..1e2c2e6 100644 --- a/entities/decoration/pearl_container/pearl_container.json +++ b/entities/decoration/pearl_container/pearl_container.json @@ -2,6 +2,10 @@ "type": "entity", "mixins": "file(pearl_container_ghost.json)", "components": { + "stonehearth:storage": { + "capacity": 16, + "filter_list": "archipelago_biome:ui:stockpile:pearl_filters" + }, "stonehearth:entity_forms": { "iconic_form": "file(pearl_container_iconic.json)", "ghost_form": "file(pearl_container_ghost.json)", @@ -26,7 +30,7 @@ }, "entity_data": { "stonehearth:net_worth": { - "value_in_gold": 75, + "value_in_gold": 21, "rarity": "common", "shop_info": { "buyable": false, diff --git a/entities/toys/beachball/beachball_ghost.json b/entities/toys/beachball/beachball_ghost.json index 4d98016..86c19d0 100644 --- a/entities/toys/beachball/beachball_ghost.json +++ b/entities/toys/beachball/beachball_ghost.json @@ -1,5 +1,5 @@ { - "mixins": "stonehearth:mixins:item_properties", + "mixins": "stonehearth:mixins:placed_object", "type": "entity", "components": { "model_variants": { diff --git a/entities/toys/beachball/beachball_iconic.json b/entities/toys/beachball/beachball_iconic.json index 0661d2c..7692f7e 100644 --- a/entities/toys/beachball/beachball_iconic.json +++ b/entities/toys/beachball/beachball_iconic.json @@ -1,9 +1,23 @@ { - "type": "entity", - "mixins": "file(beachball_ghost.json)", - "entity_data": { - "stonehearth:catalog": { - "is_item": true - } - } + "type": "entity", + "mixins": "stonehearth:mixins:item_properties", + "components": { + "model_variants": { + "default": { + "models": [ + "file(beachball.qb)" + ] + } + }, + "mob": { + "model_origin": {"x": -0.05, "y": 0, "z": 0.05 } + } + }, + "entity_data": { + "stonehearth:catalog": { + "is_item": true, + "category": "trophy", + "subject_override": "archipelago_biome:toys:beachball" + } + } } \ No newline at end of file diff --git a/jobs/cook/recipes/fruit_container_recipe.json b/jobs/cook/recipes/fruit_container_recipe.json index df541a9..17fe717 100644 --- a/jobs/cook/recipes/fruit_container_recipe.json +++ b/jobs/cook/recipes/fruit_container_recipe.json @@ -13,7 +13,7 @@ }, { "uri": "archipelago_biome:food:coconut", - "count" : 4 + "count" : 1 } ], "produces": [ diff --git a/jobs/fisher/fisher.lua b/jobs/fisher/fisher.lua index 876e6d6..40669ec 100644 --- a/jobs/fisher/fisher.lua +++ b/jobs/fisher/fisher.lua @@ -18,13 +18,23 @@ function FisherClass:activate() self.biome_alias = stonehearth.world_generation:get_biome_alias() self.player_id = radiant.entities.get_player_id(self._sv._entity) self.kingdom_alias = stonehearth.player:get_kingdom(self.player_id) + self:add_fishing_data() end function FisherClass:post_activate() - self.fishing_data = radiant.resources.load_json(self._job_component:get_job_data().fishing_data, true) + self:add_fishing_data() +end + +function FisherClass:add_fishing_data() + if not self.fishing_data then + if self._job_component and self._job_component:get_job_data() then + self.fishing_data = radiant.resources.load_json(self._job_component:get_job_data().fishing_data, true) + end + end end function FisherClass:chose_random_fish() + self:add_fishing_data() local function has_filter( key, value ) local valid = false for i,v in ipairs(key) do diff --git a/jobs/fisher/recipes/fish_container_recipe.json b/jobs/fisher/recipes/fish_container_recipe.json index 573306e..da0d786 100644 --- a/jobs/fisher/recipes/fish_container_recipe.json +++ b/jobs/fisher/recipes/fish_container_recipe.json @@ -15,7 +15,7 @@ }, { "material": "raw fish_meat", - "count": 4 + "count": 1 } ], "produces": [ diff --git a/jobs/fisher/recipes/pearl_container_recipe.json b/jobs/fisher/recipes/pearl_container_recipe.json index c4f9200..85ba982 100644 --- a/jobs/fisher/recipes/pearl_container_recipe.json +++ b/jobs/fisher/recipes/pearl_container_recipe.json @@ -15,7 +15,7 @@ }, { "uri": "archipelago_biome:resources:pearl", - "count": 4 + "count": 1 } ], "produces": [ diff --git a/locales/en.json b/locales/en.json index 7454601..c8144ba 100644 --- a/locales/en.json +++ b/locales/en.json @@ -126,7 +126,7 @@ }, "fish_container": { "display_name": "Fish Container", - "description": "Ready to be exported" + "description": "Store up to 16 fish" }, "fancy_fisher_sign": { "display_name": "Ornate Fisher's Sign", @@ -144,9 +144,9 @@ }, "fruit_container": { "display_name": "Coconut Container", - "description": "Ready to be exported", + "description": "Store up to 16 coconuts", "recipe": { - "description": "Easier to sell your coconuts this way.", + "description": "Store up to 16 coconuts", "flavor": "Ready to be exported" } }, @@ -160,11 +160,11 @@ }, "magma":{ "display_name":"Magma Block", - "description":"Super hot, glowing red, half solid, magma. Do not touch.", + "description":"Super hot, glowing red, half solid, magma. Do not touch." }, "pearl_container": { "display_name": "Pearl Container", - "description": "Ready to be exported" + "description": "Store up to 16 pearls" }, "pirate_flag": { "display_name": "Pirate Flag", @@ -679,7 +679,7 @@ }, "fish_container_recipe": { "recipe_name": "Fish Container", - "description": "Easier to sell your fish this way.", + "description": "Store up to 16 fish", "flavor": "Ready to be exported" }, "fish_quiver_recipe": { @@ -693,7 +693,7 @@ }, "pearl_container_recipe": { "recipe_name": "Pearl Container", - "description": "Easier to sell your pearls this way.", + "description": "Store up to 16 pearls", "flavor": "Ready to be exported" }, "sashimi_recipe": { @@ -813,15 +813,15 @@ "seasons":{ "dry":{ "display_name":"Dry Season", - "description":"Dry season in the Archipelago is a sunny season, lasting long eight months. Perfect for vacations, though some strong wind and rain can also happen.", + "description":"Dry season in the Archipelago is a sunny season, lasting long eight months. Perfect for vacations, though some strong wind and rain can also happen." }, "hurricane":{ "display_name":"Hurricane Season", - "description":"Hurricane season in the Archipelago is a dangerous season, lasting only one month. Windy and stormy at best.", + "description":"Hurricane season in the Archipelago is a dangerous season, lasting only one month. Windy and stormy at best." }, "wet":{ "display_name":"Wet Season", - "description":"Wet season in the Archipelago is a rainy season, lasting three months. Rain and wind, rarely sunny days", + "description":"Wet season in the Archipelago is a rainy season, lasting three months. Rain and wind, rarely sunny days" } } } @@ -855,6 +855,9 @@ "nemo":{ "title":"Finding a fish", "message":"The fisher just got this cute lost clownfish." + }, + "dusty_tome":{ + "message":"A very old book, valuable to desert towns. It is a mistery how it is still dusty and not wet..." } }, "monster_tuning": { @@ -878,15 +881,15 @@ "title": "A help from the seas", "message_start": "Hey, nice to meet you! I'm Miranda. Want some help?
I can talk about a few things if you are new here in the islands.", "message_decline": "Well, take care.
Good luck.", - "message_accept": "Yes! Finally someone accepted my help!
Er... I mean, follow me!", - "message_trees": "You will start looking for wood and food, right?
Here we have both with palm trees!
When you harvest them you get coconuts. Those don't fill much though.
Harvesting it a second time (while it has no coconuts) will instead chop it for wood.", + "message_accept": "Yes! Finally someone accepted my help!
Follow me!", + "message_trees": "Start looking for wood and food, right?
We have both in palm trees!
When you harvest them you first get coconuts only.
Harvesting it a second time (while it has no coconuts) will instead chop it for wood.", "message_oysters": "Oh, and these big oysters are awesome. Only a fisher can harvest them and their pearls sell for a good amount.
Rumours mention rare black pearls, but I never saw one myself.", "message_broken_boats": "Take a look around and you may find some shipwrecks.
You can scavenger those and find good treasures.", - "message_bye": "That's all for now.
I'll return later to check how you guys are doing.
I need to take advantage of this good wind and set sail, my ship will not fill itself with goods and treasures.
Bye bye and good luck.", + "message_bye": "That's all for now.
I'll return later to check how you guys are doing.
Bye bye and good luck.", "na_message_start": "Hey, guys from the snow! How do I know you came from the snow? Look at you, fully clothed for snow!..
I'm Miranda, by the way. Want some help?
I can talk about a few things as you are new here in the islands.", "na_message_decline": "Well, take care.
Good luck. And try to take easy on the heavy clothes!", - "na_message_bye": "That's all for now.
I'll return later to check how you guys are doing. I hope the sun will not have cooked you in your heavy clothes until then!
I need to take advantage of this good wind and set sail, my ship will not fill itself with goods and treasures.
Bye bye and good luck." + "na_message_bye": "That's all for now.
I'll return later to check how you guys are doing. I hope the sun will not have cooked you in your heavy clothes until then!
Bye bye and good luck." } } }, diff --git a/locales/pt-BR.json b/locales/pt-BR.json index da2caf4..0cf8a83 100644 --- a/locales/pt-BR.json +++ b/locales/pt-BR.json @@ -126,7 +126,7 @@ }, "fish_container":{ "display_name":"Caixote de peixes", - "description":"Pronto pra ser exportado" + "description":"Armazena até 16 peixes" }, "fancy_fisher_sign": { "display_name": "Placa Chique do Pescador", @@ -144,9 +144,9 @@ }, "fruit_container":{ "display_name":"Caixote de Cocos", - "description":"Pronto pra ser exportado", + "description":"Armazena até 16 cocos", "recipe":{ - "description":"É mais fácil vender os cocos assim.", + "description":"Armazena até 16 cocos", "flavor":"Pronto pra ser exportado" } }, @@ -164,7 +164,7 @@ }, "pearl_container":{ "display_name":"Caixote de pérolas", - "description":"Pronto pra ser exportado" + "description":"Armazena até 16 pérolas" }, "pirate_flag":{ "display_name":"Bandeira Pirata", @@ -679,7 +679,7 @@ }, "fish_container_recipe":{ "recipe_name":"Caixote de Peixes", - "description":"É mais fácil vender os peixes assim.", + "description":"Armazena até 16 peixes", "flavor":"Pronto pra ser exportado" }, "fish_quiver_recipe": { @@ -693,7 +693,7 @@ }, "pearl_container_recipe":{ "recipe_name":"Caixote de Pérolas", - "description":"É mais fácil vender as pérolas assim.", + "description":"Armazena até 16 pérolas", "flavor":"Pronto pra ser exportado" }, "sashimi_recipe":{ @@ -855,6 +855,9 @@ "nemo":{ "title":"Procurando um peixe", "message":"O pescador acabou de pegar esse peixinho palhaço perdido." + }, + "dusty_tome":{ + "message":"Um livro bem velho, valioso para cidades do deserto. É um mistério como ainda está empoeirado e não molhado..." } }, "monster_tuning":{ @@ -877,15 +880,15 @@ "title":"Uma ajuda do mar", "message_start":"Ei, prazer em te conhecer! Sou a Miranda. Quer uma ajuda?
Posso te falar sobre algumas coisas se for novo aqui nas ilhas.", "message_decline":"Bom, se cuida.
Boa sorte.", - "message_accept":"Isso! Finalmente aceitaram minha ajuda!
Er... Quero dizer, me siga!", - "message_trees":"Vai começar procurando madeira e comida, né?
Aqui temos os dois com palmeiras!
Quando você colher elas vai pegar cocos. Mas eles não enchem muito
Ao tentar colher uma segunda vez (enquanto não há cocos) irá cortar ela pra pegar madeira.", + "message_accept":"Isso! Finalmente aceitaram minha ajuda!
Me siga!", + "message_trees":"Vai começar procurando madeira e comida, né?
Temos os dois nas palmeiras!
Quando você colher elas vai pegar cocos.
Ao tentar colher uma segunda vez (enquanto não há cocos) irá cortar ela pra pegar madeira.", "message_oysters":"Ah, e essas ostras gigantes são incríveis. Apenas um pescador pode colhê-las e suas pérolas vendem por um bom preço.
Rumores mencionam raras pérolas negras, mas eu nunca vi uma.", "message_broken_boats":"Dê uma olhada ao redor e você pode encontrar alguns naufrágios azarados.
Você pode quebra-los e encontrar bons tesouros.", - "message_bye":"Isso é tudo por enquanto.
Eu vou voltar mais tarde para verificar como vocês estão indo.
Preciso aproveitar este vento bom e navegar, meu navio não vai se encher sozinho de mercadorias e tesouros.
Tchau tchau e boa sorte.", + "message_bye":"Isso é tudo por enquanto.
Eu vou voltar mais tarde para verificar como vocês estão indo.
Tchau tchau e boa sorte.", "na_message_start": "Ei caras da neve! Como eu sei que você veio da neve? Olhe para você, completamente vestido para neve!..
A propósito, sou Miranda. Quer ajuda?
Eu posso falar sobre algumas coisas como você é novo aqui nas ilhas.", "na_message_decline": "Bem, tome cuidado.
Boa sorte. E tente pegar leve nas roupas pesadas!", - "na_message_bye": "Isso é tudo por enquanto.
Eu vou voltar mais tarde para verificar como vocês estão indo. Espero que o sol não tenha te cozido em suas roupas pesadas até lá!
Preciso aproveitar este vento bom e navegar, meu navio não vai se encher sozinho de mercadorias e tesouros.
Tchau tchau e boa sorte." + "na_message_bye": "Isso é tudo por enquanto.
Eu vou voltar mais tarde para verificar como vocês estão indo. Espero que o sol não tenha te cozido em suas roupas pesadas até lá!
Tchau tchau e boa sorte." } } }, diff --git a/manifest.json b/manifest.json index 7c1aeec..e1f7b9d 100644 --- a/manifest.json +++ b/manifest.json @@ -235,8 +235,11 @@ "trees:smalea:stem": "file(entities/trees/smalea/stem)", "trees:smalea:bud": "file(entities/trees/smalea/bud)", - "ui:input_box:fish_filters": "file(ui/data/input_box_fish_filters.json)", - "ui:input_box:food_bin_filters": "file(ui/data/input_box_food_bin_filters.json)", + "ui:input_box:fish_filters": "file(ui/data/input_box_fish_filters.json)", + "ui:input_box:food_bin_filters":"file(ui/data/input_box_food_bin_filters.json)", + "ui:stockpile:fish_filters": "file(ui/data/stockpile_fish_filters.json)", + "ui:stockpile:fruit_filters": "file(ui/data/stockpile_fruit_filters.json)", + "ui:stockpile:pearl_filters": "file(ui/data/stockpile_pearl_filters.json)", "weapons:bubble_shot": "file(entities/weapons/bubble_shot)", "weapons:crab_pincer": "file(entities/weapons/crab_pincer)", @@ -249,6 +252,9 @@ "jobs:firefly_fisher": "file(jobs/fisher/fisher_description.json)", }, "mixintos": { + "archipelago_biome:armor:fish_quiver":"stonehearth_ace:mixins:armor:quiver_arrows", + "archipelago_biome:armor:turtle_shield":"stonehearth_ace:mixins:armor:shield", + "stonehearth:biome:index": "file(data/biome/index.json)", "stonehearth:terrain_blocks" : "file(data/terrain/terrain_blocks.json)", @@ -395,7 +401,10 @@ "stonehearth:ui:input_box:filters": "file(ui/data/input_box_filters.json)", - "brewerymod/manifest.json": "file(modding_mods/brewerymod/manifest.json)" + "archipelago_biome:weapons:crab_pincer":"stonehearth_ace:mixins:weapons:mainhand", + "archipelago_biome:weapons:slap_fish": "stonehearth_ace:mixins:weapons:mainhand", + + "brewerymod/manifest.json": "file(modding_mods/brewerymod/manifest.json)" }, "overrides": { "stonehearth/data/rigs/entities/humans/animations/female/fishing_start.json": "file(data/rigs/entities/humans/animations/female/fishing_start.json)", @@ -420,6 +429,7 @@ "stonehearth/data/rigs/entities/rabbit_biped/effects/sitting_on_chair_drink.json": "file(data/rigs/entities/rabbit_biped/effects/sitting_on_chair_drink.json)", "stonehearth/data/rigs/entities/critters/rabbit/effects/sitting_drink.json":"file(data/rigs/entities/critters/rabbit/effects/sitting_drink.json)", + "stonehearth/data/rigs/entities/critters/beetle/effects/sitting_drink.json":"file(data/rigs/entities/critters/rabbit/effects/sitting_drink.json)", "stonehearth/ui/shell/select_settlement/map.js": "file(ui/shell/select_settlement/map.js)" }, diff --git a/ui/data/stockpile_fish_filters.json b/ui/data/stockpile_fish_filters.json new file mode 100644 index 0000000..1f90df5 --- /dev/null +++ b/ui/data/stockpile_fish_filters.json @@ -0,0 +1,18 @@ +{ + "type": "index", + "stockpile": { + "food_and_drink": { + "display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.food_and_drink)", + "filter": "food_and_drink", + "ordinal": 4, + "categories": { + "fish": { + "ordinal": 1, + "display_name": "i18n(archipelago_biome:entities.food.fish.display_name)", + "icon": "/archipelago_biome/entities/food/fish/fish.png", + "filter": "cooking_ingredient fish_meat" + } + } + } + } +} \ No newline at end of file diff --git a/ui/data/stockpile_fruit_filters.json b/ui/data/stockpile_fruit_filters.json new file mode 100644 index 0000000..95b7c19 --- /dev/null +++ b/ui/data/stockpile_fruit_filters.json @@ -0,0 +1,24 @@ +{ + "type": "index", + "stockpile": { + "food_and_drink": { + "display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.food_and_drink)", + "filter": "food_and_drink", + "ordinal": 4, + "categories": { + "coconut": { + "ordinal": 100.016641, + "display_name": "i18n(archipelago_biome:entities.food.coconut.display_name)", + "icon": "/archipelago_biome/entities/food/coconut/coconut.png", + "filter": "raw_food coconut" + }, + "papaya_basket": { + "ordinal": 100.026641, + "display_name": "i18n(archipelago_biome:entities.food.papaya_basket.display_name)", + "icon": "/archipelago_biome/entities/food/papaya/papaya_basket/papaya_basket.png", + "filter": "raw_food papaya" + } + } + } + } +} \ No newline at end of file diff --git a/ui/data/stockpile_pearl_filters.json b/ui/data/stockpile_pearl_filters.json new file mode 100644 index 0000000..be28067 --- /dev/null +++ b/ui/data/stockpile_pearl_filters.json @@ -0,0 +1,24 @@ +{ + "type": "index", + "stockpile": { + "food_and_drink": { + "display_name": "i18n(stonehearth:ui.game.zones_mode.stockpile.filters.wealth)", + "filter": "wealth", + "ordinal": 5, + "categories": { + "pearl": { + "ordinal": 100.016641, + "display_name": "i18n(archipelago_biome:entities.resources.pearl.display_name)", + "icon": "/archipelago_biome/entities/resources/pearl/pearl.png", + "filter": "pearl stockpile_trophy" + }, + "black_pearl": { + "ordinal": 100.026641, + "display_name": "i18n(archipelago_biome:entities.resources.black_pearl.display_name)", + "icon": "/archipelago_biome/entities/resources/black_pearl/black_pearl.png", + "filter": "black_pearl stockpile_trophy" + } + } + } + } +} \ No newline at end of file