ACE and Trapper+ compatibilities

Clay bed appeal increased from 3 to 15
Added ACE armor and weapon effects to goblins armors and weapons (thanks Tobles)

Fixed incompatibilities with ACE commands, which affected water well building, bee keeping, and Trapper+ workbenches interactions

entities/furniture/clay/bed/bed.json

@@ -57,7 +57,7 @@
 			}
 		},
 		"stonehearth:appeal": {
-			"appeal": 3
+			"appeal": 15
 		},
 		"stonehearth:item_quality": {
 			"variable_quality": true

jobs/common/ace_abilities.json

@@ -0,0 +1,12 @@
+{
+	"type": "entity",
+	"components" : {
+		"stonehearth:equipment_piece" : {
+			"injected_ai" : {
+				"ai_packs" : [
+					"stonehearth_ace:ai_pack:transform"
+				]
+			}
+		}
+	}
+}

manifest.json

@@ -755,7 +755,28 @@
 		"swamp_goblins/entities/construction/clay_water_well/clay_water_well_ghost.json":		"stonehearth_ace/swamp_goblins/entities/construction/ace_water_well_ghost.json",
 		"swamp_goblins/entities/construction/wooden_water_well/wooden_water_well_ghost.json":	"stonehearth_ace/swamp_goblins/entities/construction/ace_water_well_ghost.json",
 		"swamp_goblins/jobs/bonesmith/recipes/recipes.json":"stonehearth_ace/swamp_goblins/jobs/bonesmith/ace_recipes/ace_recipes.json",
-		"swamp_goblins/jobs/worker/upgraded_outfit/upgraded_outfit.json":"stonehearth_ace/swamp_goblins/jobs/worker/upgraded_outfit/ace_buffs.json"
+		"swamp_goblins/jobs/worker/upgraded_outfit/upgraded_outfit.json":"stonehearth_ace/swamp_goblins/jobs/worker/upgraded_outfit/ace_buffs.json",
+		"swamp_goblins/jobs/bonesmith/bonesmith_abilities/bonesmith_abilities.json":		"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json",
+		"swamp_goblins/jobs/earthmaster/earthmaster_abilities/earthmaster_abilities.json":	"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json",
+		"swamp_goblins/jobs/scavenger/scavenger_abilities/scavenger_abilities.json":		"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json",
+		"swamp_goblins/jobs/shaman/shaman_abilities/shaman_abilities.json":					"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json",
+		"swamp_goblins/jobs/worker/goblin_worker_abilities.json":							"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json",
+    	"swamp_goblins:armor:flower_helmet":		"stonehearth_ace:mixins:armor:light_armor_helmet",
+    	"swamp_goblins:armor:log_armor":			"stonehearth_ace:mixins:armor:light_armor_torso",
+    	"swamp_goblins:armor:log_helmet":			"stonehearth_ace:mixins:armor:light_armor_helmet",
+    	"swamp_goblins:armor:leather_armor":		"stonehearth_ace:mixins:armor:light_armor_torso",
+    	"swamp_goblins:armor:leather_helmet":		"stonehearth_ace:mixins:armor:light_armor_helmet",
+    	"swamp_goblins:armor:full_leather_helmet":	"stonehearth_ace:mixins:armor:light_armor_helmet",
+    	"swamp_goblins:armor:varanus_armor":		"stonehearth_ace:mixins:armor:heavy_armor_torso",
+    	"swamp_goblins:armor:varanus_helmet":		"stonehearth_ace:mixins:armor:heavy_armor_helmet",
+    	"swamp_goblins:armor:horn_helmet":			"stonehearth_ace:mixins:armor:heavy_armor_helmet",
+    	"swamp_goblins:weapons:spear":			"stonehearth_ace:mixins:weapons:twohanded_shaken_minor",
+    	"swamp_goblins:weapons:crude_axe":		"stonehearth_ace:mixins:weapons:mainhand_hacking",
+    	"swamp_goblins:weapons:skull_basher":	"stonehearth_ace:mixins:weapons:mainhand_fracture_minor",
+    	"swamp_goblins:weapons:stone_maul":		"stonehearth_ace:mixins:weapons:mainhand_fracture",
+    	"swamp_goblins:weapons:giant_bone_mace":"stonehearth_ace:mixins:weapons:mainhand_fracture_major",
+    	"swamp_goblins:weapons:giant_bone_axe":	"stonehearth_ace:mixins:weapons:twohanded_open_wounds_major",
+    	"swamp_goblins:weapons:magma_sword":	"stonehearth_ace:mixins:weapons:twohanded_shaken_major"
 	},
 	"functions": {
 		"play_music": {
@@ -830,8 +851,7 @@
 		"stonehearth_ace/swamp_goblins/entities/construction/ace_water_well_ghost.json":"swamp_goblins/entities/construction/ace_water_well_ghost.json",
 		"stonehearth_ace/swamp_goblins/jobs/bonesmith/ace_recipes/ace_recipes.json":"swamp_goblins/jobs/bonesmith/ace_recipes/ace_recipes.json",
 		"stonehearth_ace/swamp_goblins/jobs/worker/upgraded_outfit/ace_buffs.json":	"swamp_goblins/jobs/worker/upgraded_outfit/ace_buffs.json",
-
-		"goblin_foods/jobs/shaman/recipes/recipes.json":"swamp_goblins/jobs/shaman/recipes/goblin_foods_mod_patch.json"
+		"stonehearth_ace/swamp_goblins/jobs/common/ace_abilities.json":	"swamp_goblins/jobs/common/ace_abilities.json"
 	},
 	"controllers": {
 		"class:beast_tamer":	"file(jobs/beast_tamer/beast_tamer.lua)",

swamp_goblins_server.lua

@@ -1,5 +1,5 @@
 swamp_goblins = {}
-print("Swamp Goblins Mod version 20.5.11")
+print("Swamp Goblins Mod version 20.7.6")
 
 --[[
 

update_log.txt

@@ -3,6 +3,9 @@ Additions:
 Changes:
 New icon for the travel ui button (thanks Findersword)
 Beast Tamers summons are moddable now (other modders can easily change the animals)
+Clay bed appeal increased from 3 to 15
+Added ACE armor and weapon effects to goblins armors and weapons (thanks Tobles)
 
 Fixes:
-Warrior Hearth challengers with bugged names
+Warrior Hearth challengers with bugged names
+Fixed incompatibilities with ACE commands, which affected water well building, bee keeping, and Trapper+ workbenches interactions