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
BrunoSupremo · Feb 10, 2019 · aff2302 · aff2302
1 parent 85e2e86
commit aff2302
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 93 deletions.
diff --git 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
@@ -11,39 +11,39 @@
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":8,
-			"effort":100,
+			"effort":104,
 			"xp":13
 		}
 	},
 	"level_3":{
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":16,
-			"effort":80,
+			"effort":88,
 			"xp":11
 		}
 	},
 	"level_4":{
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":24,
-			"effort":60,
+			"effort":72,
 			"xp":9
 		}
 	},
 	"level_5":{
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":32,
-			"effort":40,
+			"effort":56,
 			"xp":7
 		}
 	},
 	"level_6":{
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":40,
-			"effort":20,
+			"effort":40,
 			"xp":5
 		}
 	}

diff --git a/...go_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json b/...go_selected/data/gm/campaigns/trader/arcs/encounters/returning_crop_trader_encounter.json
diff --git 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
@@ -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,21 +89,21 @@
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":4,
-			"effort":100,
+			"effort":104,
 			"xp":13
 		}
 	},
 	"level_3":{
 		"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,21 +118,21 @@
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":8,
-			"effort":80,
+			"effort":88,
 			"xp":11
 		}
 	},
 	"level_4":{
 		"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,21 +147,21 @@
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":12,
-			"effort":60,
+			"effort":72,
 			"xp":9
 		}
 	},
 	"level_5":{
 		"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,21 +176,21 @@
 		"tropical_fish":{
 			"alias":"archipelago_biome:food:tropical_fish",
 			"weight":16,
-			"effort":40,
+			"effort":56,
 			"xp":7
 		}
 	},
 	"level_6":{
 		"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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
+		}
+	}
 }
diff --git 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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 		},
 		{
 			"uri": "archipelago_biome:resources:pearl",
-			"count": 4
+			"count": 1
 		}
 	],
 	"produces": [