-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Added entries for chocolate and fruit trees to the book
- Allow replacing hollow shells - Properly limit number of abiltiies that can be stacked on a single frame to 4 - New bees have slightly smaller max ability values to start off with - Allow extracting a single item from shelves (Closes #95)
- Loading branch information
1 parent
a739521
commit 46785f4
Showing
8 changed files
with
269 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...life/common/FLTickCounterBlockEntity.java → ...ockentities/FLTickCounterBlockEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...sources/data/firmalife/patchouli_books/field_guide/en_us/entries/firmalife/chocolate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "__comment__": "This file was automatically created by mcresources", | ||
| "name": "Chocolate", | ||
| "category": "firmalife:firmalife", | ||
| "icon": "firmalife:food/dark_chocolate", | ||
| "pages": [ | ||
| { | ||
| "type": "patchouli:text", | ||
| "text": "$(thing)Chocolate-making$() takes a few processing steps, for not much of a reward. It's important to remember, when playing Firmalife, that being a chocolatier is for your personal enjoyment and pleasure, rather than for trying to extract maximum value from any given input." | ||
| }, | ||
| { | ||
| "type": "patchouli:text", | ||
| "text": "To start chocolate processing, cocoa beans must first be $(thing)roasted$() in an $(l:firmalife:firmalife/ovens)Oven$() to make $(thing)Roasted Cocoa Beans$(). Then, craft the roasted beans with a $(thing)Knife$() to split the beans into $(thing)Cocoa Powder$() and $(thing)Cocoa Powder$()." | ||
| }, | ||
| { | ||
| "type": "patchouli:text", | ||
| "text": "The $(l:firmalife:firmalife/mixing_bowl)Mixing Bowl$() is used to mix cocoa powder, butter, and sweetener (sugar or honey) to make $(thing)Chocolate Blends$(). The ratio of cocoa butter to powder determines what comes out:$(br)$(li)1 Powder, 1 Butter, 1 Sweetener: Milk Chocolate$()$(li)2 Powder, 1 Sweetener: Dark Chocolate$()$(li)2 Butter, 1 Sweetener: White Chocolate$()" | ||
| }, | ||
| { | ||
| "type": "firmalife:drying_recipe", | ||
| "recipe": "firmalife:drying/dark_chocolate", | ||
| "text": "Finally, chocolate is dried on a $(l:firmalife:firmalife/drying)Drying Mat$() to make $(thing)Chocolate$()." | ||
| } | ||
| ], | ||
| "read_by_default": true, | ||
| "sortnum": 19 | ||
| } |
178 changes: 178 additions & 0 deletions
178
...urces/data/firmalife/patchouli_books/field_guide/en_us/entries/firmalife/fruit_trees.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| { | ||
| "__comment__": "This file was automatically created by mcresources", | ||
| "name": "Firmalife Fruits", | ||
| "category": "firmalife:firmalife", | ||
| "icon": "firmalife:plant/fig_sapling", | ||
| "pages": [ | ||
| { | ||
| "type": "patchouli:text", | ||
| "text": "Firmalife adds some fruiting plants on top of those added by TFC." | ||
| }, | ||
| { | ||
| "type": "patchouli:text", | ||
| "text": "To improve readability, entries start on the next page." | ||
| }, | ||
| { | ||
| "type": "patchouli:text", | ||
| "anchor": "cocoa", | ||
| "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): 20 - 35 °C$(br)$(bold)$(l:mechanics/hydration)Rainfall$(): 220 - 400mm$(br2)Cocoa trees are used to make $(l:firmalife:firmalife/chocolate)Chocolate$().", | ||
| "title": "Cocoa Tree" | ||
| }, | ||
| { | ||
| "type": "tfc:multimultiblock", | ||
| "text": "The monthly stages of a Cocoa tree", | ||
| "multiblocks": [ | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/cocoa_leaves[lifecycle=dormant]", | ||
| "Y": "firmalife:plant/cocoa_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/cocoa_leaves[lifecycle=healthy]", | ||
| "Y": "firmalife:plant/cocoa_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/cocoa_leaves[lifecycle=flowering]", | ||
| "Y": "firmalife:plant/cocoa_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/cocoa_leaves[lifecycle=fruiting]", | ||
| "Y": "firmalife:plant/cocoa_branch[up=true,down=true]" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "patchouli:text", | ||
| "anchor": "fig", | ||
| "text": "$(bold)$(l:the_world/climate#temperature)Temperature$(): 20 - 35 °C$(br)$(bold)$(l:mechanics/hydration)Rainfall$(): 125 - 215mm$(br2)", | ||
| "title": "Fig Tree" | ||
| }, | ||
| { | ||
| "type": "tfc:multimultiblock", | ||
| "text": "The monthly stages of a Fig tree", | ||
| "multiblocks": [ | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/fig_leaves[lifecycle=dormant]", | ||
| "Y": "firmalife:plant/fig_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/fig_leaves[lifecycle=healthy]", | ||
| "Y": "firmalife:plant/fig_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/fig_leaves[lifecycle=flowering]", | ||
| "Y": "firmalife:plant/fig_branch[up=true,down=true]" | ||
| } | ||
| }, | ||
| { | ||
| "pattern": [ | ||
| [ | ||
| "X" | ||
| ], | ||
| [ | ||
| "Y" | ||
| ], | ||
| [ | ||
| "0" | ||
| ] | ||
| ], | ||
| "mapping": { | ||
| "X": "firmalife:plant/fig_leaves[lifecycle=fruiting]", | ||
| "Y": "firmalife:plant/fig_branch[up=true,down=true]" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "read_by_default": true, | ||
| "sortnum": 18 | ||
| } |