Added upgraded staff

Can now set speech bubbles to attacks (abilities) used Goblins will never spawn with just 1 spirit (2 or more)
BrunoSupremo · Oct 12, 2019 · f161e02 · f161e02
1 parent 00db133
commit f161e02
Show file tree

Hide file tree

Showing 28 changed files with 346 additions and 118 deletions.
diff --git a/data/effects/spirit_walker/upgraded_staff.json b/data/effects/spirit_walker/upgraded_staff.json
@@ -0,0 +1,15 @@
+{
+	"type": "effect",
+	"tracks": {
+		"upgraded_staff": {
+			"type": "cubemitter",
+			"cubemitter": "/swamp_goblins/data/horde/particles/spirit_walker/upgraded_staff.json",
+			"loop": true,
+			"transforms": { "x": 0, "y": 0, "z": 0,
+				"rx": 0,
+				"ry": 0,
+				"rz": 0
+			}
+		}
+	}
+}
diff --git a/data/firefly_clan_population.json b/data/firefly_clan_population.json
@@ -230,7 +230,7 @@
 						"max": 5
 					},
 					"spirit": {
-						"min": 1,
+						"min": 2,
 						"max": 8
 					}
 				}

diff --git a/data/horde/particles/spirit_walker/upgraded_staff.json b/data/horde/particles/spirit_walker/upgraded_staff.json
@@ -0,0 +1,72 @@
+{
+	"name": "droplets",
+	"duration": 8000,
+	"material": "materials/cubemitter_add_bloom.material.json",
+	"loops": true,
+	"emission": {
+		"rate": {
+			"kind": "CONSTANT",
+			"values": [50]
+		},
+		"angle": {
+			"kind": "CONSTANT",
+			"values": [0]
+		},
+		"origin": {
+			"surface": "POINT"
+		},
+		"translation_z": {
+			"kind": "CONSTANT",
+			"values": [-1.1]
+		}
+	},
+	"particle": {
+		"lifetime": {
+			"start": {
+				"kind": "RANDOM_BETWEEN",
+				"values": [1750, 2000]
+			}
+		},
+		"speed": {
+			"start": {
+				"kind": "CONSTANT",
+				"values": [2]
+			}
+		},
+		"scale": {
+			"start": {
+				"kind": "CONSTANT",
+				"values": [0.2]
+			},
+			"over_lifetime": {
+				"kind": "CURVE",
+				"values": [
+					[0, 1.5],
+					[0.03, 1.5],
+					[0.04, 1],
+					[1, 0]
+				]
+			}
+		},
+		"color": {
+			"over_lifetime": {
+				"kind": "CURVE",
+				"values": [
+					[0, 0.922, 0.935, 0.969],
+					[0.25, 0.174, 0.436, 0.948],
+					[1, 0.219, 0.179, 0.868]
+				]
+			},
+			"over_lifetime_a": {
+				"kind": "CURVE",
+				"values": [
+					[0, 0],
+					[0.02, 0.6],
+					[0.05, 0],
+					[0.5, 0.25],
+					[1, 0]
+				]
+			}
+		}
+	}
+}
diff --git a/jobs/beast_tamer/beast_tamer.lua b/jobs/beast_tamer/beast_tamer.lua
@@ -62,13 +62,11 @@ end
 function BeastTamerClass:summon_big_wolf(delay)
 	local uris = {"swamp_goblins:summons:big_wolf"}
 	self:summon_animals(delay, uris, 1, true)
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_big_wolf.png")
 end
 
 function BeastTamerClass:summon_dragon_aura(delay)
 	local uris = {"swamp_goblins:summons:dragon_aura"}
 	self:summon_animals(delay, uris, 1, true)
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_dragon_aura.png")
 end
 
 function BeastTamerClass:summon_firefly(delay, target)
@@ -86,13 +84,11 @@ function BeastTamerClass:summon_firefly(delay, target)
 			radiant.entities.add_buff(entity, "swamp_goblins:buffs:firefly_confusion")
 		end
 	end
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_firefly.png")
 end
 
 function BeastTamerClass:summon_varanus(delay)
 	local uris = {"swamp_goblins:summons:varanus"}
 	self:summon_animals(delay, uris, 2)
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_varanus.png")
 end
 
 function BeastTamerClass:summon_traps(delay, target)
@@ -115,7 +111,6 @@ function BeastTamerClass:summon_traps(delay, target)
 			end
 		end
 	end
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_traps.png")
 end
 
 function BeastTamerClass:summon_wildlife(delay)
@@ -130,13 +125,11 @@ function BeastTamerClass:summon_wildlife(delay)
 		"swamp_goblins:summons:squirrel"
 	}
 	self:summon_animals(delay, uris, 6)
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_wildlife.png")
 end
 
 function BeastTamerClass:summon_poyos(delay)
 	local uris = {"swamp_goblins:summons:poyo"}
 	self:summon_animals(delay, uris, 4)
-	self:thought_bubble("/swamp_goblins/jobs/beast_tamer/images/summon_poyos.png")
 end
 
 function BeastTamerClass:summon_animals(delay, uris, amount, has_attributes)
@@ -171,11 +164,4 @@ function BeastTamerClass:copy_menace(animal)
 	radiant.entities.set_attribute(animal, "courage", radiant.entities.get_attribute(self._sv._entity, "courage") +1)
 end
 
-function BeastTamerClass:thought_bubble(image)
-	self._sv._entity:add_component('stonehearth:thought_bubble')
-	:add_bubble(stonehearth.constants.thought_bubble.effects.INDICATOR,
-		stonehearth.constants.thought_bubble.priorities.HUNGER+1,
-		image, nil, '5m')
-end
-
 return BeastTamerClass
diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_big_wolf.json b/jobs/beast_tamer/beast_tamer_abilities/summon_big_wolf.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 1
+				"priority": 1,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_big_wolf.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_dragon_aura.json b/jobs/beast_tamer/beast_tamer_abilities/summon_dragon_aura.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 1
+				"priority": 1,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_dragon_aura.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_firefly.json b/jobs/beast_tamer/beast_tamer_abilities/summon_firefly.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 50000,
-				"priority": 2
+				"priority": 2,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_firefly.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_poyos.json b/jobs/beast_tamer/beast_tamer_abilities/summon_poyos.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 6
+				"priority": 6,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_poyos.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_traps.json b/jobs/beast_tamer/beast_tamer_abilities/summon_traps.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 4
+				"priority": 4,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_traps.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_varanus.json b/jobs/beast_tamer/beast_tamer_abilities/summon_varanus.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 3
+				"priority": 3,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_varanus.png"
 			}
 		]
 	}

diff --git a/jobs/beast_tamer/beast_tamer_abilities/summon_wildlife.json b/jobs/beast_tamer/beast_tamer_abilities/summon_wildlife.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 5
+				"priority": 5,
+				"image": "/swamp_goblins/jobs/beast_tamer/images/summon_wildlife.png"
 			}
 		]
 	}

diff --git a/jobs/earthmaster/recipes/equipments/upgraded_staff_recipe.json b/jobs/earthmaster/recipes/equipments/upgraded_staff_recipe.json
@@ -0,0 +1,27 @@
+{
+	"type": "recipe",
+	"effort": 66,
+	"work_units": 5,
+	"recipe_name": "i18n(swamp_goblins:jobs.spirit_walker.upgraded_staff.display_name)",
+	"description": "i18n(swamp_goblins:jobs.spirit_walker.upgraded_staff.description)",
+	"flavor": "i18n(swamp_goblins:jobs.spirit_walker.upgraded_staff.flavor)",
+	"portrait": "/swamp_goblins/jobs/spirit_walker/upgraded_staff/upgraded_staff.png",
+	"workshop": "swamp_goblins:earthmaster:workbench",
+	"work_effect": "fiddle",
+	"level_requirement": 4,
+	"ingredients": [
+		{
+			"uri": "swamp_goblins:spirit_walker:talisman",
+			"count": 1
+		},
+		{
+			"uri": "swamp_goblins:refined:jewel",
+			"count": 1
+		}
+	],
+	"produces": [
+		{
+			"item": "swamp_goblins:spirit_walker:upgraded_staff"
+		}
+	]
+}
diff --git a/jobs/earthmaster/recipes/recipes.json b/jobs/earthmaster/recipes/recipes.json
@@ -24,6 +24,9 @@
 			"recipes": {
 				"magma_sword": {
 					"recipe": "file(equipments/magma_sword_recipe.json)"
+				},
+				"upgraded_staff": {
+					"recipe": "file(equipments/upgraded_staff_recipe.json)"
 				}
 			}
 		},

diff --git a/jobs/spirit_walker/spirit_walker.lua b/jobs/spirit_walker/spirit_walker.lua
@@ -3,28 +3,27 @@ local SpiritWalkerClass = class()
 radiant.mixin(SpiritWalkerClass, ClericJob)
 local Point3 = _radiant.csg.Point3
 local conversation_subjects = {
-"stonehearth:subjects:cult",
-"stonehearth:subjects:darkness",
-"stonehearth:subjects:death",
-"stonehearth:cleric:talisman",
-"stonehearth:loot:dusty_tome",
-"stonehearth:npc:herald:untz",
-"stonehearth:monsters:forest:alligator",
-"swamp_goblins:beast_tamer:talisman",
-"swamp_goblins:bonesmith:talisman",
-"swamp_goblins:earthmaster:talisman",
-"swamp_goblins:scavenger:talisman",
-"swamp_goblins:shaman:talisman",
-"swamp_goblins:spirit_walker:talisman",
-"swamp_goblins:warrior:talisman"
+	"stonehearth:subjects:cult",
+	"stonehearth:subjects:darkness",
+	"stonehearth:subjects:death",
+	"stonehearth:cleric:talisman",
+	"stonehearth:loot:dusty_tome",
+	"stonehearth:npc:herald:untz",
+	"stonehearth:monsters:forest:alligator",
+	"swamp_goblins:beast_tamer:talisman",
+	"swamp_goblins:bonesmith:talisman",
+	"swamp_goblins:earthmaster:talisman",
+	"swamp_goblins:scavenger:talisman",
+	"swamp_goblins:shaman:talisman",
+	"swamp_goblins:spirit_walker:talisman",
+	"swamp_goblins:warrior:talisman"
 }
 
 function SpiritWalkerClass:summon_big_g(delay)
 	local summoning_delay = (delay * 33.3)
 	stonehearth.combat:set_timer("SpiritWalkerClass summoning_delay: big_g", summoning_delay, function()
 		self:create_spirit("swamp_goblins:summons:big_g", "double")
-		end)
-	self:thought_bubble("/swamp_goblins/jobs/spirit_walker/images/summon_big_g.png")
+	end)
 end
 
 function SpiritWalkerClass:summon_spirit(delay, amount)
@@ -37,15 +36,13 @@ function SpiritWalkerClass:summon_spirit(delay, amount)
 		local summoning_delay = (delay * 33.3 * offset)
 		stonehearth.combat:set_timer("SpiritWalkerClass summoning_delay: "..i, summoning_delay, function()
 			self:create_spirit("swamp_goblins:summons:goblin_spirit", "copy")
-			end)
+		end)
 	end
-	self:thought_bubble("/swamp_goblins/jobs/spirit_walker/images/summon_spirit.png")
 end
 
 function SpiritWalkerClass:summon_spirits(delay)
 	local spirit_amount = radiant.entities.get_attribute(self._sv._entity, "spirit")
 	self:summon_spirit(delay, spirit_amount)
-	self:thought_bubble("/swamp_goblins/jobs/spirit_walker/images/summon_spirits.png")
 end
 
 function SpiritWalkerClass:create_spirit(url, attributes)
@@ -71,7 +68,7 @@ function SpiritWalkerClass:create_spirit(url, attributes)
 		subjects:add_override({
 			subject = subject_uri,
 			sentiment = 1
-			})
+		})
 	end
 	radiant.entities.add_buff(spirit, "swamp_goblins:buffs:despawn:in_2h")
 end
@@ -100,11 +97,4 @@ function SpiritWalkerClass:dragon_aura(args)
 	radiant.events.trigger_async(stonehearth.job, 'swamp_goblins:spirit_walker_dragon_aura')
 end
 
-function SpiritWalkerClass:thought_bubble(image)
-	self._sv._entity:add_component('stonehearth:thought_bubble')
-	:add_bubble(stonehearth.constants.thought_bubble.effects.INDICATOR,
-		stonehearth.constants.thought_bubble.priorities.HUNGER+1,
-		image, nil, '5m')
-end
-
 return SpiritWalkerClass
diff --git a/jobs/spirit_walker/spirit_walker_abilities/summon_big_g.json b/jobs/spirit_walker/spirit_walker_abilities/summon_big_g.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 3
+				"priority": 3,
+				"image": "/swamp_goblins/jobs/spirit_walker/images/summon_big_g.png"
 			}
 		]
 	}

diff --git a/jobs/spirit_walker/spirit_walker_abilities/summon_spirit.json b/jobs/spirit_walker/spirit_walker_abilities/summon_spirit.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 5
+				"priority": 5,
+				"image": "/swamp_goblins/jobs/spirit_walker/images/summon_spirit.png"
 			}
 		]
 	}

diff --git a/jobs/spirit_walker/spirit_walker_abilities/summon_spirits.json b/jobs/spirit_walker/spirit_walker_abilities/summon_spirits.json
@@ -10,7 +10,8 @@
 				"effect": "emote_roar",
 				"active_frame": 60,
 				"cooldown": 70000,
-				"priority": 4
+				"priority": 4,
+				"image": "/swamp_goblins/jobs/spirit_walker/images/summon_spirits.png"
 			}
 		]
 	}

diff --git a/jobs/spirit_walker/spirit_walker_staff/spirit_walker_staff.json b/jobs/spirit_walker/spirit_walker_staff/spirit_walker_staff.json
@@ -18,7 +18,10 @@
 			"postures": [
 				"stonehearth:combat",
 				"stonehearth:patrol"
-			]
+			],
+			"ilevel": 4,
+			"roles": ["goblin_spirit_walker_job"],
+			"no_drop": true
 		}
 	},
 	"entity_data": {