Skip to content

Commit

Permalink
Clay rework
Browse files Browse the repository at this point in the history 
Additions:
Clay Lamp
Clay Signs
Clay Window Box (with sapling or mushroom)
Clay Urns (small and large)
Mushroom Bed
Subtle skin color variations (default, darker, lighter, greyed)

Changes:
Revised Hearths models, from clay to stone visual
All old clay models revamped to a new visual standard, white with cyan stripes and dots. (Clay Well, Clay Chest, Clay Input Bin, Clay Market Shelf, Clay Pots [with cattail, sapling and giple], Clay Mushroom Garden, Potter Kiln)
Potter Wheel visually revised, from clay to wood. Recipe uses wood to craft it instead of clay

Fixes:
Pop up of "Glory level X achieved" displayed +1 higher than the correct value
Goblins on other kingdoms would bug if sent to train as geomancer with the bunnies
Summons should not attract citizens to talk with while in combat

Fixes for ACE:
Cattail fiber is spinnable (for weaver) again
Fixed food items not being recognized as edible food
  • Loading branch information
@BrunoSupremo
BrunoSupremo committed Mar 14, 2023
1 parent 3b19943 commit 91c284b
Show file tree
Hide file tree
Showing 328 changed files with 4,373 additions and 411 deletions.
4 changes: 0 additions & 4 deletions components/firefly_goblin/firefly_goblin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,6 @@ function FireflyGoblin:add_goblin_worker_abilities()
end

function FireflyGoblin:_remove_goblin_listeners()
if self.waiting_for_combat_listener then
self.waiting_for_combat_listener:destroy()
self.waiting_for_combat_listener = nil
end
if self.job_has_changed then
self.job_has_changed:destroy()
self.job_has_changed = nil
Expand Down
40 changes: 40 additions & 0 deletions components/summon/summon.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
local SummonComponent = class()

function SummonComponent:post_activate()
radiant.entities.add_buff(self._entity, "swamp_goblins:buffs:despawn:in_2h")

self._combat_battery_listener = radiant.events.listen(self._entity, 'stonehearth:combat:in_combat_changed', self, self._in_combat_changed)
end

function SummonComponent:_in_combat_changed(context)
--when out of combat, they should talk with random citizens
--but when they spawn or while switching targets, they are idle (a 1 frame of no combat)
--so the timer is just a buffer to skip those frames and avoid trying to talk on those
if context.in_combat then
if self._conversation_timer then
self._conversation_timer:destroy()
self._conversation_timer = nil
end
self._entity:get_component('stonehearth:expendable_resources'):
set_value('social_satisfaction', 99)
else
local delayed_function = function ()
self._entity:get_component('stonehearth:expendable_resources'):
set_value('social_satisfaction', 0)
end
self._conversation_timer = stonehearth.calendar:set_timer("SummonComponent delay adding conversation_component", "1m+4m", delayed_function)
end
end

function SummonComponent:destroy()
if self._combat_battery_listener then
self._combat_battery_listener:destroy()
self._combat_battery_listener = nil
end
if self._conversation_timer then
self._conversation_timer:destroy()
self._conversation_timer = nil
end
end

return SummonComponent
4 changes: 2 additions & 2 deletions components/warrior_hearth/warrior_hearth.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,13 @@ function WarriorHearth:_on_wave_member_died(entity)
if self._sv.current_wave and not next(self._sv.current_wave) then
-- Everyone defeated! Go to next level.
if not self.current_wave_abandoned then
self._sv.glory_level = self._sv.glory_level + 1

stonehearth.bulletin_board:post_bulletin(radiant.entities.get_player_id(self._entity))
:set_data({title = "i18n(stonehearth:data.commands.spawn_glory_wave.glory_level_achieved_bulletin)"})
:add_i18n_data("glory_level", self._sv.glory_level)
:set_close_on_handle(true)
:set_active_duration("2h")

self._sv.glory_level = self._sv.glory_level + 1
end
self._sv.current_wave = nil
self:toggle_command_buttons(true)
Expand Down
8 changes: 2 additions & 6 deletions data/biome/swamp_generation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@
"iron_ore": "#90B0D0",
"silver_ore": "#CCCCCC",
"gold_ore": "#FFD700",
"coal": "#021C24",
"marble": "#DEDEDE",
"clay": "#492A16"
"coal": "#021C24"
},
"wet": {
"null": "#FF00FF",
Expand Down Expand Up @@ -92,9 +90,7 @@
"iron_ore": "#90B0D0",
"silver_ore": "#CCCCCC",
"gold_ore": "#FFD700",
"coal": "#021C24",
"marble": "#DEDEDE",
"clay": "#492A16"
"coal": "#021C24"
}
},
"terrain": {
Expand Down
28 changes: 28 additions & 0 deletions data/effects/green_fire/candle/smaller_candle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type" : "effect",
"tracks": {
"cubemitter": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":0,
"y":0.9,
"z":0,
"rx":90,
"ry":0,
"rz":0
}
},
"light": {
"type": "light",
"light": "/swamp_goblins/data/horde/animatedlights/green_fire/tiny.json",
"transforms": {
"x":0,
"y":0.9,
"z":0
},
"shadows": false
}
}
}
26 changes: 8 additions & 18 deletions data/effects/hearth/hearth.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":-1.95,
"y":0.8,
"x":-2.05,
"y":0.7,
"z":-1.95,
"rx":90,
"ry":0,
Expand All @@ -20,7 +20,7 @@
"loop": true,
"transforms": {
"x":1.95,
"y":0.8,
"y":0.7,
"z":-1.95,
"rx":90,
"ry":0,
Expand All @@ -32,9 +32,9 @@
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":-1.95,
"y":0.8,
"z":1.95,
"x":-2.05,
"y":0.7,
"z":2.05,
"rx":90,
"ry":0,
"rz":0
Expand All @@ -46,8 +46,8 @@
"loop": true,
"transforms": {
"x":1.95,
"y":0.8,
"z":1.95,
"y":0.7,
"z":2.05,
"rx":90,
"ry":0,
"rz":0
Expand Down Expand Up @@ -83,16 +83,6 @@
"rz": 0
}
},
"glow_extreme": {
"type": "cubemitter",
"cubemitter": "/stonehearth/data/horde/particles/fire/fire_green/fire.green.glow_extreme.cubemitter.json",
"loop": true,
"transforms": { "x": 0, "y": 0.5, "z": 0,
"rx": 90,
"ry": 0,
"rz": 0
}
},
"cubemitter": {
"type": "cubemitter",
"cubemitter": "/stonehearth/data/horde/particles/fire/fire_green/fire.green.main.cubemitter.json",
Expand Down
77 changes: 77 additions & 0 deletions data/effects/shrine/book_blessed.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"type": "effect",
"tracks": {
"glowing_letters": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/shrine/book/glowing_letters.json",
"loop": true,
"transforms": { "x": 0.6, "y": 3.16, "z": 1.4,
"rx": 90,
"ry": 0,
"rz": 0
}
},
"glowing_letters2": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/shrine/book/glowing_letters.json",
"loop": true,
"transforms": { "x": -0.8, "y": 3.16, "z": 1.4,
"rx": 90,
"ry": 0,
"rz": 0
}
},
"dust": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/shrine/book/dust.json",
"loop": true,
"transforms": { "x": 0, "y": 3, "z": 1.25,
"rx": 90,
"ry": 0,
"rz": 0
}
},
"ball": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/shrine/book/ball.json",
"loop": true,
"transforms": { "x": 0, "y": 0, "z": 1,
"rx": 0,
"ry": 0,
"rz": 0
}
},
"ball2": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/shrine/book/ball.json",
"loop": true,
"start_time":2000,
"transforms": { "x": 0, "y": 0, "z": 1,
"rx": 0,
"ry": 0,
"rz": 0
}
},
"light_main": {
"type": "light",
"light": "/rayyas_children/data/horde/animatedlights/shrine/shrine.exotic_trade.soft.large.animatedlight.json",
"transforms": { "x": 0, "y": 8, "z": 1 },
"shadows": true
},
"light_small1": {
"type": "light",
"light": "/rayyas_children/data/horde/animatedlights/shrine/shrine.exotic_trade.soft.small.animatedlight.json",
"transforms": { "x": 0, "y": 2, "z": 1},
"shadows": false
},
"sound": {
"type": "sound_effect",
"loop": true,
"start_time": 400,
"min_distance": 35,
"falloff": 2,
"volume": 65,
"track": "stonehearth:sounds:firepit_blessed"
}
}
}
57 changes: 57 additions & 0 deletions data/effects/shrine/tall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "effect",
"tracks": {
"corner1": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":-2.3,
"y":2,
"z":-2.1,
"rx":90,
"ry":0,
"rz":0
}
},
"corner2": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":2.1,
"y":2,
"z":-2.1,
"rx":90,
"ry":0,
"rz":0
}
},
"corner3": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":-2.3,
"y":2,
"z":2.3,
"rx":90,
"ry":0,
"rz":0
}
},
"corner4": {
"type": "cubemitter",
"cubemitter": "/swamp_goblins/data/horde/particles/green_fire/tiny.json",
"loop": true,
"transforms": {
"x":2.1,
"y":2,
"z":2.3,
"rx":90,
"ry":0,
"rz":0
}
}
}
}
Loading

0 comments on commit 91c284b

Please sign in to comment.