bug fix

Fixed crab traps being locked/unusable after save and reload
Fixed invisible object (fish) sold by merchants

Linked fishing data to the fisher_description.json file, allowing individual kingdoms to have their own loot
Added 4th level perk for the fisher

archipelago_biome_server.lua

@@ -1,6 +1,5 @@
 archipelago_biome = {}
-local log = radiant.log.create_logger('version')
-log:error("Archipelago Biome Mod version 19.1.20")
+print("Archipelago Biome Mod version 19.1.27")
 
 function archipelago_biome:_on_required_loaded()
 end
@@ -32,6 +31,5 @@ end
 radiant.events.listen_once(radiant, 'radiant:services:init', archipelago_biome, archipelago_biome._on_services_init)
 radiant.events.listen_once(radiant, 'radiant:required_loaded', archipelago_biome, archipelago_biome._on_required_loaded)
 radiant.events.listen_once(radiant, 'stonehearth:biome_set', archipelago_biome, archipelago_biome._on_biome_set)
-radiant.util.set_global_config('mods.directory.cfm.enabled', false)
-radiant.util.set_global_config('mods.steam_workshop.cfm.enabled', false)
+
 return archipelago_biome

components/crab_spawner/crab_spawner.lua

@@ -25,7 +25,11 @@ function ArchipelagoCrabSpawner:activate()
 		self._on_added_to_world_listener = radiant.events.listen(self._entity, 'archipelago_biome:in_the_water', self, self.activate_the_spawner)
 	end
 
-	self:ready_to_harvest(false)
+	if self:has_child() then
+		self:ready_to_harvest(true)
+	else
+		self:ready_to_harvest(false)
+	end
 end
 
 function ArchipelagoCrabSpawner:activate_the_spawner()
@@ -60,15 +64,21 @@ function ArchipelagoCrabSpawner:spawner_removed()
 	end
 end
 
-function ArchipelagoCrabSpawner:try_to_spawn_crab()
-	-- log:error("try_to_spawn_crab")
+function ArchipelagoCrabSpawner:has_child()
 	local ec = self._entity:get_component("entity_container")
 	if ec then
 		for id, child in ec:each_child() do
 			--if it has a child (trapped) it should do nothing, just wait until it is harvested.
-			return
+			return true
 		end
 	end
+	return false
+end
+
+function ArchipelagoCrabSpawner:try_to_spawn_crab()
+	if self:has_child() then
+		return
+	end	
 	local location = radiant.entities.get_world_grid_location(self._entity)
 	if not location then
 		-- log:error("try_to_spawn_crab nil location")

entities/food/big_fish/big_fish.json

@@ -15,8 +15,12 @@
 		},
 		"stonehearth:net_worth": {
 			"value_in_gold": 7,
+			"rarity": "common",
 			"shop_info": {
+				"buyable": true,
+				"sellable": true,
 				"shopkeeper_level": 2,
+				"shopkeeper_type": "caravan"
 			}
 		},
 		"stonehearth:catalog": {

entities/food/fish/fish.json

@@ -22,6 +22,16 @@
 		}
 	},
 	"entity_data": {
+		"stonehearth:net_worth": {
+			"value_in_gold": 3,
+			"rarity": "common",
+			"shop_info": {
+				"buyable": true,
+				"sellable": true,
+				"shopkeeper_level": 1,
+				"shopkeeper_type": "caravan"
+			}
+		},
 		"stonehearth:catalog": {
 			"display_name": "i18n(archipelago_biome:entities.food.fish.display_name)",
 			"description": "i18n(archipelago_biome:entities.food.fish.description)",

entities/food/nemo/nemo.json

@@ -18,8 +18,12 @@
 		},
 		"stonehearth:net_worth": {
 			"value_in_gold": 30,
+			"rarity": "common",
 			"shop_info": {
-				"buyable": false
+				"buyable": false,
+				"sellable": true,
+				"shopkeeper_level": 1,
+				"shopkeeper_type": "caravan"
 			}
 		},
 		"stonehearth:catalog": {

entities/food/tropical_fish/tropical_fish.json

@@ -74,8 +74,12 @@
 	"entity_data": {
 		"stonehearth:net_worth": {
 			"value_in_gold": 4,
+			"rarity": "common",
 			"shop_info": {
-				"shopkeeper_level": 2
+				"buyable": true,
+				"sellable": true,
+				"shopkeeper_level": 2,
+				"shopkeeper_type": "caravan"
 			}
 		},
 		"stonehearth:catalog": {

jobs/fisher/fisher.lua

@@ -15,12 +15,15 @@ end
 
 function FisherClass:activate()
 	BaseJob.activate(self)
-	self.fishing_data = radiant.resources.load_json("archipelago_biome:data:fishing", true)
 	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)
 end
 
+function FisherClass:post_activate()
+	self.fishing_data = radiant.resources.load_json(self._job_component:get_job_data().fishing_data, true)
+end
+
 function FisherClass:chose_random_fish()
 	local function has_filter( key, value )
 		local valid = false

jobs/fisher/fisher_description.json

@@ -46,6 +46,7 @@
 		"craft_level_5": 15,
 		"craft_level_6": 17
 	},
+	"fishing_data": "archipelago_biome:data:fishing",
 	"max_level": 6,
 	"level_data": {
 		"1": {
@@ -80,6 +81,17 @@
 					"level": 3
 				}
 			]
+		},
+		"4": {
+			"perks": [
+				{
+					"name": "i18n(archipelago_biome:jobs.fisher.fisher_description.level_4.perk_name)",
+					"id": "crafter_recipe_unlock_4",
+					"icon": "file(images/faster_fishing_perk.png)",
+					"description": "i18n(archipelago_biome:jobs.fisher.fisher_description.level_4.perk_description)",
+					"level": 4
+				}
+			]
 		}
 	}
 }

jobs/index.json

@@ -1,7 +1,8 @@
 {
 	"jobs": {
 		"archipelago_biome:jobs:fisher": {
-			"description": "archipelago_biome:jobs:fisher"
+			"description": "archipelago_biome:jobs:fisher",
+			"firefly_job":"shared"
 		}
 	}
 }

locales/en.json

@@ -628,6 +628,10 @@
 				"level_3": {
 					"perk_name": "Cooking",
 					"perk_description": "With a small firepit, the fisher can cook basic recipes."
+				},
+				"level_4": {
+					"perk_name": "Faster",
+					"perk_description": "With each level, fishing gets faster, with less time waiting for a bite."
 				}
 			},
 			"fisher_bucket": {

locales/pt-BR.json

@@ -628,6 +628,10 @@
 				"level_3": {
 					"perk_name": "Cozinhando",
 					"perk_description": "Com uma fogueirinha, o pescador consegue cozinhar receitas básicas."
+				},
+				"level_4": {
+					"perk_name": "Mais rápido",
+					"perk_description": "A cada nível, pescar fica mais rápido, com menos tempo esperando uma mordida."
 				}
 			},
 			"fisher_bucket":{

manifest.json

@@ -138,7 +138,6 @@
 
 		"jobs:index":	"file(jobs/index.json)",
 		"jobs:fisher":	"file(jobs/fisher/fisher_description.json)",
-		"jobs:firefly_fisher":	"file(jobs/fisher/firefly_fisher_description.json)",
 		"fisher:rod":		"file(jobs/fisher/fisher_rod/fisher_rod.json)",
 		"fisher:talisman":	"file(jobs/fisher/fisher_bucket/fisher_bucket_talisman.json)",
 		"fisher:workbench":	"file(jobs/fisher/fisher_workbench)",
@@ -246,7 +245,8 @@
 	},
 	"deprecated_aliases": {
 		"decoration:hammock":"file(entities/decoration/hammock)",
-		"landmark:summon_stone:minor:tropical_island": "file(entities/landmark/summon_stone_tropical_island)"
+		"landmark:summon_stone:minor:tropical_island": "file(entities/landmark/summon_stone_tropical_island)",
+		"jobs:firefly_fisher":	"file(jobs/fisher/fisher_description.json)",
 	},
 	"mixintos": {
 		"stonehearth:biome:index": "file(data/biome/index.json)",
@@ -310,7 +310,6 @@
 		"stonehearth:farmer:all_crops": "file(services/server/farming/data/all_crops.json)",
 
 		"stonehearth:jobs:index": "archipelago_biome:jobs:index",
-		"swamp_goblins:jobs:index": "file(jobs/firefly_index.json)",
 		"stonehearth/jobs/blacksmith/recipes/recipes.json":			"file(jobs/blacksmith/recipes)",
 		"stonehearth/jobs/carpenter/recipes/recipes.json":			"file(jobs/carpenter/recipes)",
 		"stonehearth/jobs/cook/recipes/recipes.json":				"file(jobs/cook/recipes)",

mixins/fish/fish.json

@@ -9,16 +9,6 @@
 			},
 			"rotten_entity_alias": "archipelago_biome:food:fish:rotten"
 		},
-		"stonehearth:net_worth": {
-			"value_in_gold": 3,
-			"rarity": "common",
-			"shop_info": {
-				"buyable": true,
-				"sellable": true,
-				"shopkeeper_level": 1,
-				"shopkeeper_type": "caravan"
-			}
-		},
 		"stonehearth:catalog": {
 			"is_item": true,
 			"category": "cooking_ingredient",