fixed fish trap

ace warm buff

archipelago_biome_server.lua

@@ -1,19 +1,18 @@
 archipelago_biome = {}
-print("Archipelago Biome Mod version 20.12.4")
+print("Archipelago Biome Mod version 20.12.5")
 
 --[[
 
 redo dock urgent, it is ugly
+	fish anywhere near water, docks will be just a prefered place
 
-add Ace warm system, tree farm system
+ace tree/bush farm system
 
 seaweed seeds
 
 add jellyfish
 rework pirate hat
 
-fish anywhere near water, docks will be just a prefered place
-
 Bugs:
 (vanilla) chairs stocked on fish only container because it has the "all" option set --too hard to fix
 

entities/decoration/magma/magma.json

@@ -52,6 +52,16 @@
 				}
 			]
 		},
+		"movement_modifier_shape": {
+			"modifier": -0.5,
+			"nav_preference_modifier": -0.5,
+			"region": [
+				{
+					"min": { "x": -1, "y": -1, "z": -1 },
+					"max": { "x": 2, "y": 3, "z": 2 }
+				}
+			]
+		},
 		"stonehearth:resource_node": {
 			"resource_loot_table": {
 				"entries": {

entities/decoration/magma/volcano_smoke.json

@@ -5,6 +5,19 @@
 		"stonehearth:mixins:placed_object"
 	],
 	"components": {
+		"stonehearth:entity_forms": {
+			"iconic_form": "file(volcano_smoke_iconic.json)",
+			"ghost_form": "file(volcano_smoke_ghost.json)",
+			"placeable_on_ground": true,
+			"hide_undeploy_ui": true
+		},
+		"model_variants": {
+			"default": {
+				"models": [
+					"/stonehearth/entities/resources/copper/copper_ore/copper_ore.qb"
+				]
+			}
+		},
 		"effect_list": {
 			"default": "archipelago_biome:effects:magma:volcano_smoke"
 		},
@@ -14,5 +27,11 @@
 			"region_origin": { "x": 0.5, "y": 0, "z": 0.5 },
 			"mob_collision_type": "clutter"
 		}
+	},
+	"entity_data": {
+		"stonehearth:catalog": {
+			"display_name": "i18n(archipelago_biome:entities.decoration.volcano_smoke.display_name)",
+			"description": "i18n(archipelago_biome:entities.decoration.volcano_smoke.description)"
+		}
 	}
 }

entities/decoration/magma/volcano_smoke_ghost.json

@@ -0,0 +1,22 @@
+{
+	"mixins": "stonehearth:mixins:placed_object",
+	"components": {
+		"model_variants": {
+			"default": {
+				"models": [
+					"/stonehearth/entities/resources/copper/copper_ore/copper_ore.qb"
+				]
+			}
+		},
+		"mob": {
+			"model_origin": { "x": 0, "y": 0, "z": 0 },
+			"region_origin": { "x": 0.5, "y": 0, "z": 0.5 }
+		}
+	},
+	"entity_data": {
+		"stonehearth:catalog": {
+			"display_name": "i18n(archipelago_biome:entities.decoration.volcano_smoke.display_name)",
+			"description": "i18n(archipelago_biome:entities.decoration.volcano_smoke.description)"
+		}
+	}
+}

entities/decoration/magma/volcano_smoke_iconic.json

@@ -0,0 +1,23 @@
+{
+	"mixins": "stonehearth:mixins:item_properties",
+	"type": "entity",
+	"components": {
+		"mob" : {
+			"model_origin" : { "x": 0, "y": 0, "z": 0 }
+		},
+		"model_variants": {
+			"default": {
+				"models": [
+					"/stonehearth/entities/resources/copper/copper_ore/copper_ore.qb"
+				]
+			}
+		}
+	},
+	"entity_data": {
+		"stonehearth:catalog": {
+			"is_item": true,
+			"display_name": "i18n(archipelago_biome:entities.decoration.volcano_smoke.display_name)",
+			"description": "i18n(archipelago_biome:entities.decoration.volcano_smoke.description)"
+		}
+	}
+}

entities/decoration/tiki_torch/tiki_torch.json

@@ -11,7 +11,15 @@
 			]
 		},
 		"stonehearth:lamp": {
-			"light_effect": "archipelago_biome:effects:tiki_torch_effect"
+			"light_effect": "archipelago_biome:effects:tiki_torch_effect",
+			"buff_source": true
+		},
+		"sensor_list": {
+			"sensors": {
+				"warmth": {
+					"radius": 8
+				}
+			}
 		},
 		"stonehearth:entity_forms": {
 			"iconic_form": "file(tiki_torch_iconic.json)",

jobs/fisher/ace_description.json

@@ -0,0 +1,16 @@
+{
+	"task_groups": [
+		"stonehearth_ace:task_groups:transform"
+	],
+	"initial_num_siege_weapons": {
+		"fish_trap": 3
+	},
+	"commands": {
+		"add_on_promote": [
+			"stonehearth_ace:commands:trapper:place_fish_trap"
+		],
+		"remove_on_demote": [
+			"stonehearth_ace:commands:trapper:place_fish_trap"
+		]
+	}
+}

jobs/fisher/fisher_description.json

@@ -47,17 +47,6 @@
 		"craft_level_6": 17
 	},
 	"max_level": 6,
-	"initial_num_siege_weapons": {
-		"fish_trap": 3
-	},
-	"commands": {
-		"add_on_promote": [
-			"stonehearth_ace:commands:trapper:place_fish_trap"
-		],
-		"remove_on_demote": [
-			"stonehearth_ace:commands:trapper:place_fish_trap"
-		]
-	},
 	"level_data": {
 		"1": {
 			"perks": [

locales/en.json

@@ -174,6 +174,10 @@
 				"display_name":"Magma Block",
 				"description":"Super hot, glowing red, half solid, magma. Do not touch."
 			},
+			"volcano_smoke":{
+				"display_name":"Smoke Source",
+				"description":"Infinite smoke generated from this object."
+			},
 			"pearl_container": {
 				"display_name": "Pearl Container",
 				"description": "Store up to 16 pearls"

manifest.json

@@ -449,6 +449,7 @@
 		"archipelago_biome:weapons:crab_pincer":"stonehearth_ace:mixins:weapons:mainhand",
 		"archipelago_biome:weapons:slap_fish":	"stonehearth_ace:mixins:weapons:mainhand",
 
+		"archipelago_biome:jobs:fisher":"stonehearth_ace/archipelago_biome/jobs/fisher/ace_description.json",
 		"archipelago_biome/jobs/fisher/fisher_abilities/fisher_abilities.json":"stonehearth_ace/archipelago_biome/jobs/common/ace_abilities.json",
 
 		"brewerymod/manifest.json":		"file(modding_mods/brewerymod/manifest.json)",
@@ -479,6 +480,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_ace/archipelago_biome/jobs/common/ace_abilities.json":	"archipelago_biome/jobs/common/ace_abilities.json",
+		"stonehearth_ace/archipelago_biome/jobs/fisher/ace_description.json":	"archipelago_biome/jobs/fisher/ace_description.json"
 	},
 	"controllers": {
 		"class:fisher": "file(jobs/fisher/fisher.lua)",

update_log.txt

@@ -1,8 +1,13 @@
 Additions:
-Fishing Net decoration (floor and wall variation)
 
 Changes:
+Volcano smoke emitter is located inside a volcano and can be easily moved or destroyed by players
+Hearthlings will avoid stepping on top of magma blocks
+
+Changes for ACE:
+Removed old ace fish trap recipe
+Fisher can use fish traps like the trapper
+Tiki Torches will give warm buffs for those around it
 
 Fixes:
-A bunch of objects hitboxes
 (for ACE mod)