Skip to content

Commit

Permalink
more ace updates
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoSupremo committed Dec 6, 2020
1 parent 1fa665a commit a80e259
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 12 deletions.
3 changes: 1 addition & 2 deletions archipelago_biome_server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ 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
ace tree/bush farm system
seaweed seeds
seaweed ace farm
add jellyfish
rework pirate hat
Expand Down
4 changes: 3 additions & 1 deletion entities/crops/palm_tree_crop/palm_tree_crop.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"palm_tree_4": "archipelago_biome:trees:palm:sapling"
},
"harvest_threshhold": "palm_tree_4",
"plant_overlay_effect": "stonehearth:effects:plant_crop_overlay_effect"
"plant_overlay_effect": "stonehearth:effects:plant_crop_overlay_effect",
"megacrop_chance": 0,
"auto_harvest": "place"
},
"stonehearth:growing": {
"growth_period": "1d",
Expand Down
12 changes: 12 additions & 0 deletions entities/decoration/magma/magma.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@
"max":6,
}
},
"stonehearth:buffs": {
"buffs": {
"stonehearth_ace:buffs:weather:warmth_source": true
}
},
"sensor_list": {
"sensors": {
"warmth": {
"radius": 8
}
}
},
"effect_list": {
"default": "archipelago_biome:effects:magma"
},
Expand Down
Binary file modified jobs/fisher/fisher_firepit/fisher_firepit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified jobs/fisher/fisher_firepit/fisher_firepit.qb
Binary file not shown.
5 changes: 5 additions & 0 deletions jobs/fisher/fisher_firepit/fisher_firepit_ghost.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
"models": [
"file(fisher_firepit.qb)"
]
},
"no_fuel": {
"models": [
"file(fisher_firepit_no_fuel.qb)"
]
}
}
},
Expand Down
Binary file not shown.
8 changes: 5 additions & 3 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,11 @@

"stonehearth:farmer:all_crops": "file(services/server/farming/data/all_crops.json)",

"archipelago_biome:fisher:firepit": "stonehearth_ace:mixins:workbench:cook_oven",

"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",

"stonehearth:jobs:index": "file(jobs/index.json)",
"nordlingmod:jobs:index":"file(jobs/index_nordlings.json)",
"stonehearth/jobs/blacksmith/recipes/recipes.json": "file(jobs/blacksmith/recipes)",
Expand Down Expand Up @@ -449,9 +454,6 @@
"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)",
"tower_defense/manifest.json": "file(modding_mods/tower_defense/manifest.json)"
},
Expand Down
5 changes: 4 additions & 1 deletion services/server/farming/data/all_crops.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"palm_tree": {
"crop_type": "archipelago_biome:crops:palm_tree_crop",
"ordinal": 12.99465,
"level_requirement": 5
"level_requirement": 5,
"field_types": {
"orchard": true
}
}
}
}
8 changes: 3 additions & 5 deletions update_log.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
Additions:

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
Updated fisher firepit model and now using ace fuel system
Palm trees are one of the new options for orchard farms while on the biome
Magma from volcanos give warm buff

Fixes:
(for ACE mod)

0 comments on commit a80e259

Please sign in to comment.