Skip to content

Commit

Permalink
giant bone axe recipe
Browse files Browse the repository at this point in the history
Additions:
Fisher recipe to craft (vanilla) giant bone axe

Fixes:
Seaweed seeds were named hibiscus seeds
Fisher error about facing/direction
  • Loading branch information
BrunoSupremo committed Nov 11, 2022
1 parent c59f9fd commit 1d006fb
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 12 deletions.
4 changes: 3 additions & 1 deletion ai/actions/fisher/turn_to_face_water_action.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ function TurnToFaceWater:run(ai, entity, args)
local fisher_field_component = args.dock:get_component("archipelago_biome:fisher_field")
if fisher_field_component then
local water_location = fisher_field_component:get_water_direction(radiant.entities.get_world_grid_location(entity))
entity:get_component('mob'):turn_to_face_point(water_location)
if water_location then
entity:get_component('mob'):turn_to_face_point(water_location)
end
face = radiant.entities.get_facing(entity)
else
face = radiant.entities.get_facing(args.dock)
Expand Down
6 changes: 3 additions & 3 deletions archipelago_biome_server.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
archipelago_biome = {}
print("Archipelago Biome Mod version 22.8.13")
print("Archipelago Biome Mod version 22.11.10")

--[[
fisher village
fisher village, landmark, ~3x3 chunks
spawn whale, maybe from turtle rig. or as a fancy and decorated landmark
spawn whale, poyo rig. or as a fancy and decorated landmark
wave effect for storm weather
rework pirate hat
Expand Down
2 changes: 1 addition & 1 deletion call_handlers/fishing_call_handler.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ end

function FishingCallHandler:choose_new_fish_location(session, response)
stonehearth.selection:select_xz_region("fish_zone")
:use_designation_marquee(Color4(129, 192, 165, 255))
:use_designation_marquee(Color4(100, 150, 200, 255))
:set_cursor('archipelago_biome:cursors:zone_fish')
:set_invalid_cursor('archipelago_biome:cursors:zone_fish_invalid')
:require_unblocked(true)
Expand Down
3 changes: 3 additions & 0 deletions jobs/fisher/recipes/recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
},
"fish_quiver": {
"recipe": "file(weapons/fish_quiver_recipe.json)"
},
"giant_bone_axe": {
"recipe": "file(weapons/giant_bone_axe_recipe.json)"
}
}
}
Expand Down
30 changes: 30 additions & 0 deletions jobs/fisher/recipes/weapons/giant_bone_axe_recipe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "recipe",
"effort": 66,
"work_units": 2,
"recipe_name": "i18n(stonehearth:entities.weapons.giant_bone_axe.display_name)",
"description": "i18n(stonehearth:entities.weapons.giant_bone_axe.description)",
"flavor": "",
"portrait": "/stonehearth/entities/weapons/giant_bone_axe/giant_bone_axe.png",
"workshop": "archipelago_biome:fisher:workbench",
"level_requirement": 6,
"ingredients": [
{
"material": "pelt resource",
"count": 2
},
{
"material": "fiber resource",
"count": 2
},
{
"uri": "archipelago_biome:food:big_fish",
"count": 5
}
],
"produces": [
{
"item": "stonehearth:weapons:giant_bone_axe"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"type": "recipe",
"effort": 32,
"work_units": 5,
"recipe_name": "i18n(archipelago_biome:jobs.herbalist.recipes.hibiscus_transmute_recipe.recipe_name)",
"recipe_name": "i18n(archipelago_biome:jobs.herbalist.recipes.seaweed_transmute_recipe.recipe_name)",
"description": "i18n(stonehearth:jobs.herbalist.recipes.brightbell_transmute_recipe.description)",
"flavor": "i18n(stonehearth:jobs.herbalist.recipes.brightbell_transmute_recipe.flavor)",
"portrait": "/archipelago_biome/entities/beach/seaweed/seed/seed.png",
Expand Down
4 changes: 2 additions & 2 deletions renderers/fisher_field/fisher_field.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ function FisherFieldRenderer:initialize(render_entity, datastore)
self._datastore = datastore

self._zone_renderer = ZoneRenderer(render_entity)
:set_designation_colors(Color4(129, 192, 165, 255), Color4(129, 192, 165, 255))
:set_ground_colors(Color4(77, 62, 38, 10), Color4(77, 62, 38, 30))
:set_designation_colors(Color4(100, 150, 200, 255), Color4(100, 150, 200, 255))
:set_ground_colors(Color4(50, 75, 100, 10), Color4(50, 75, 100, 30))

self._datastore_trace = self._datastore:trace_data('rendering fisher field')
:on_changed(
Expand Down
7 changes: 3 additions & 4 deletions update_log.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
Additions:
Fish stall. Input storage for 12 fish.
Fisher recipe to craft (vanilla) giant bone axe

Changes:
Fish zones can't be draw on deep water. It can go on the water edge or in shallow water.

Changes for ACE:


Fixes:
(for Firefly mod) Fixed fisher article on goblinpedia
Seaweed seeds were named hibiscus seeds
Fisher error about facing/direction
(for ACE mod)

0 comments on commit 1d006fb

Please sign in to comment.