Skip to content

Commit

Permalink
feat: add familiar resurrection
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jan 22, 2024
1 parent 064c565 commit dc99eaf
Show file tree
Hide file tree
Showing 29 changed files with 717 additions and 10 deletions.
29 changes: 27 additions & 2 deletions src/generated/resources/assets/occultism/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@
"book.occultism.dictionary_of_spirits.familiar_rituals.overview.ring.title": "Equipping Familiars",
"book.occultism.dictionary_of_spirits.familiar_rituals.overview.trading.text": "\"Familiars can be easily traded when in a [Familiar Ring](entry://crafting_rituals/craft_familiar_ring).\n\\\n\\\nWhen released, the spirit will recognize the person releasing them as their new master.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.overview.trading.title": "Equipping Familiars",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description": "How to bring back a familiar from the dead.",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description.text": "The resurrection is a relatively simple process. The soul shard is strengthened with [](item://occultism:otherworld_essence) until it is strong enough to allow the familiar to return to the mortal realm and create a new body for itself.\n\\\n\\\nThe essence is obtained by growing (lots of) Demons Dream plants.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description.title": "Resurrection",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.name": "Resurrecting Familiars",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.soul_shard.text": "If a familiar dies it does not merely return to the Otherworld. Due to the close connection to the summoner a splinter of the familiar's soul remains in the mortal realm.\n\\\n\\\nThis splinter - shard - can be used to re-summon the familiar more easily.\n",
"book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.soul_shard.title": "Soul Shards",
"book.occultism.dictionary_of_spirits.familiar_rituals.return_to_rituals.name": "Return to Rituals Category",
"book.occultism.dictionary_of_spirits.getting_started.books_of_binding.awakened_feather_recipe.text": "In order to craft [#](ad03fc)Books of Binding[#]() to summon spirits, you also need awakened feather. Simply drop any feather into [](item://occultism:spirit_fire) to awakened it.\n",
"book.occultism.dictionary_of_spirits.getting_started.books_of_binding.book_of_binding_bound_foliot_recipe.text": "Add the name of the spirit to summon to your book of binding by crafting it with the Dictionary of Spirits. The Dictionary will not be used up.\n",
Expand Down Expand Up @@ -303,7 +309,9 @@
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.intro2.text": "These Demons possess a wide variety of powers and useful skills, and for centuries magicians have sought to summon them for their own gain.\nThe first step on the journey to successfully summoning such an Entity is to learn how to interact with the Otherworld.\n",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.name": "Lifting the Veil",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.note_on_spirit_fire.text": "**Hint**: The otherworld materials you obtain by harvesting under the effects of[#](ad03fc)Third Eye[#]() **can be obtained more easily using [](item://occultism:spirit_fire)**. Proceed with the next entry in this book to learn more about spirit fire.\n",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight.text": "Demon's Dream is a herb that gives humans the [#](ad03fc)Third Eye[#](),\nallowing them to see where the [#](ad03fc)Otherworld[#]() intersects with our own.\nSeeds can be found **by breaking grass**.\n**Consuming** the grown fruit activates the ability.\n",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight.text": "Demon's Dream is a herb that gives humans the [#](ad03fc)Third Eye[#](),\nallowing them to see where the [#](ad03fc)Otherworld[#]() intersects with our own.\nSeeds can be found **by breaking grass**.\n**Consuming** the grown fruit activates the ability *with a certain chance*.\n",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight2.text": "Multiple Demon's Dream fruits or seeds can be compressed into an essence that is much more potent. It *guarantees* the [#](ad03fc)Third Eye[#]() and provides it for a longer amount of time, but comes with a lot of (positive and negative) side effects.\n",
"book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight3.text": "The essence can be purified in spirit fire (more on that later!) to obtain a version free from all negative side effects, while retaining the positive.\n",
"book.occultism.dictionary_of_spirits.getting_started.divination_rod.about_divination_rod.text": "The divination rod uses a spirit attuned gem attached to a wooden rod.\nThe gem resonates with the chosen material, and this movement is amplified by the wooden rod,\nallowing to detect nearby Otherworld materials. \n \n \nThe rod works by detecting resonance between real world and Otherworld materials.\nAttuned the rod to a real world material, and it will find the corresponding Otherworld block.\n",
"book.occultism.dictionary_of_spirits.getting_started.divination_rod.description": "Obtaining otherworld materials",
"book.occultism.dictionary_of_spirits.getting_started.divination_rod.divination_rod.text": "Otherworld materials play an important role in interacting with spirits.\nAs they are rare and not visible to the naked eye, finding them requires special tools.\nThe divination rod allows to find Otherworld materials based on their similarities to materials common to our world.\n",
Expand Down Expand Up @@ -351,6 +359,8 @@
"book.occultism.dictionary_of_spirits.getting_started.healing_spirits.description": "Fix up your spirit!",
"book.occultism.dictionary_of_spirits.getting_started.healing_spirits.name": "Healing Spirits",
"book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight.text": "Right-click a spirit with [](item://occultism:datura) to heal it.\n\\\n\\\nThis will work on **Familiars**, **Summoned Spirits** and also **Possessed Mobs**.\n",
"book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight2.text": "When compressing Demon's Dream fruits or seeds into essence, a much stronger instant healing effect can be achieved. This comes at the cost of efficiency: Feeding 9 fruits to a spirit in succession will heal it more than feeding it 9 fruits worth of essence.\n",
"book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight3.text": "Purifying the Demon's Dream Essence will yield a version that heals even more, negating the efficiency loss.\n",
"book.occultism.dictionary_of_spirits.getting_started.iesnium.description": "Myterious metals ...",
"book.occultism.dictionary_of_spirits.getting_started.iesnium.how.text": "Iesnium can only be mined with the [Infused Pickaxe](entry://getting_started/infused_pickaxe) or an [](item://occultism:iesnium_pickaxe) (about which you will learn later).\n\\\n\\\nAfter identifying a block that holds Iesnium, you can mine it with the pickaxe you created in the previous step.\n",
"book.occultism.dictionary_of_spirits.getting_started.iesnium.how.title": "How to mine it",
Expand Down Expand Up @@ -535,7 +545,7 @@
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.intro.text": "**Purpose:** Summon a [#](ad03fc)Foliot[#]()\n\\\n\\\nConsidered by most to be the simplest pentacle, [#](ad03fc)Aviar's Circle[#]() is easy to set up, but provides only a minimum of binding power and protection for the summoner.\n\\\n\\\nOnly the weakest [#](ad03fc)Foliot[#]() can be summoned in rituals using this pentacle.\n",
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.intro.title": "Aviar's Circle",
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.name": "Aviar's Circle",
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.uses.text": "- [Foliot Crusher](entry://summoning_rituals/summon_crusher_t1)\n- [Foliot Lumberjack](entry://summoning_rituals/summon_lumberjack)\n- [Foliot Transporter](entry://summoning_rituals/summon_transport_items)\n- [Foliot Janitor](entry://summoning_rituals/summon_cleaner)\n- [Otherstone Trader](entry://summoning_rituals/summon_otherstone_trader)\n- [Otherworld Sapling Trader](entry://summoning_rituals/summon_otherworld_sapling_trader)\n",
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.uses.text": "- [Foliot Crusher](entry://summoning_rituals/summon_crusher_t1)\n- [Foliot Lumberjack](entry://summoning_rituals/summon_lumberjack)\n- [Foliot Transporter](entry://summoning_rituals/summon_transport_items)\n- [Foliot Janitor](entry://summoning_rituals/summon_cleaner)\n- [Otherstone Trader](entry://summoning_rituals/summon_otherstone_trader)\n- [Otherworld Sapling Trader](entry://summoning_rituals/summon_otherworld_sapling_trader)\n- [Resurrect Familiar](entry://familiar_rituals/resurrection)\n",
"book.occultism.dictionary_of_spirits.pentacles.summon_foliot.uses.title": "Uses",
"book.occultism.dictionary_of_spirits.pentacles.summon_marid.intro.text": "**Purpose:** Summon a [#](ad03fc)Marid[#]()\n\\\n\\\n**Fatma's Incentivized Attraction** is a powerful pentacle, allowing to summon [#](ad03fc)Marid[#]() and bind them to the summoner's will.\n",
"book.occultism.dictionary_of_spirits.pentacles.summon_marid.intro.title": "Fatma's Incentivized Attraction",
Expand Down Expand Up @@ -928,14 +938,18 @@
"item.occultism.copper_dust": "Copper Dust",
"item.occultism.crushed_end_stone": "Crushed End Stone",
"item.occultism.datura": "Demon's Dream Fruit",
"item.occultism.datura.auto_tooltip": "Consumption may allow to see beyond the veil ... it may also cause general un-wellness.",
"item.occultism.datura_seeds": "Demon's Dream Seeds",
"item.occultism.datura_seeds.auto_tooltip": "Plant to grow Demon's Dream Fruit.\nConsumption may allow to see beyond the veil ... it may also cause general un-wellness.",
"item.occultism.debug_djinni_manage_machine": "Summon Debug Djinni Manage Machine",
"item.occultism.debug_djinni_test": "Summon Debug Djinni Test",
"item.occultism.debug_foliot_cleaner": "Summon Debug Foliot Janitor",
"item.occultism.debug_foliot_lumberjack": "Summon Debug Foliot Lumberjack",
"item.occultism.debug_foliot_trader": "Summon Debug Foliot Trader",
"item.occultism.debug_foliot_transport_items": "Summon Debug Foliot Transporter",
"item.occultism.debug_wand": "Debug Wand",
"item.occultism.demons_dream_essence": "Demon's Dream Essence",
"item.occultism.demons_dream_essence.auto_tooltip": "Consumption allows to see beyond the veil ... and a whole lot of other effects.",
"item.occultism.dimensional_matrix": "Dimensional Crystal Matrix",
"item.occultism.dimensional_matrix.tooltip": "%s is bound to this dimensional matrix.",
"item.occultism.divination_rod": "Divination Rod",
Expand Down Expand Up @@ -980,6 +994,8 @@
"item.occultism.otherstone_frame": "Otherstone Frame",
"item.occultism.otherstone_tablet": "Otherstone Tablet",
"item.occultism.otherworld_ashes": "Otherworld Ashes",
"item.occultism.otherworld_essence": "Otherworld Essence",
"item.occultism.otherworld_essence.auto_tooltip": "Purified Demon's Dream Essence, no longer provides any of the negative effects.",
"item.occultism.otherworld_goggles": "Otherworld Goggles",
"item.occultism.otherworld_sapling": "Otherworld Sapling",
"item.occultism.otherworld_sapling_natural": "Unstable Otherworld Sapling",
Expand Down Expand Up @@ -1077,6 +1093,8 @@
"item.occultism.ritual_dummy.possess_warden.tooltip": "The possessed Warden will always drop a echo shard and can drop anothers ancient stuff (smithing templates and discs) when killed.",
"item.occultism.ritual_dummy.possess_weak_shulker": "Ritual: Summon Possessed Weak Shulker",
"item.occultism.ritual_dummy.possess_weak_shulker.tooltip": "The possessed Weak Shulker will drop at least one chorus fruit when killed and can drop shulker shell.",
"item.occultism.ritual_dummy.resurrect_familiar": "Ritual: Resurrect Familiar",
"item.occultism.ritual_dummy.resurrect_familiar.tooltip": "Resurrects a Familiar from a Soul Shard.",
"item.occultism.ritual_dummy.summon_afrit_crusher": "Ritual: Summon Afrit Crusher",
"item.occultism.ritual_dummy.summon_afrit_crusher.tooltip": "The crusher is a spirit summoned to crush ores into dusts, effectively (more than) doubling the metal output. This crusher decays (much) slower than lower tier crushers.\n§7§oNote: Some recipes may require higher tier crushers.",
"item.occultism.ritual_dummy.summon_afrit_rain_weather": "Ritual: Rainy Weather",
Expand Down Expand Up @@ -1129,6 +1147,9 @@
"item.occultism.soul_gem.tooltip_empty": "Use on a creature to capture it.",
"item.occultism.soul_gem.tooltip_filled": "Contains a captured %s.",
"item.occultism.soul_gem_empty": "Empty Soul Gem",
"item.occultism.soul_shard": "Soul Shard",
"item.occultism.soul_shard.tooltip_empty": "Dropped by a Familiar after their untimely death. Can be used to resurrect it.",
"item.occultism.soul_shard.tooltip_filled": "Contains the soul of a %s.\nCan be used to resurrect it.",
"item.occultism.spawn_egg.afrit": "Afrit Spawn Egg",
"item.occultism.spawn_egg.afrit_wild": "Unbound Afrit Spawn Egg",
"item.occultism.spawn_egg.demonic_husband": "Demonic Husband Spawn Egg",
Expand Down Expand Up @@ -1484,6 +1505,10 @@
"ritual.occultism.possess_weak_shulker.finished": "Summoned possessed weak_shulker successfully.",
"ritual.occultism.possess_weak_shulker.interrupted": "Summoning of possessed weak_shulker interrupted.",
"ritual.occultism.possess_weak_shulker.started": "Started summoning possessed weak_shulker.",
"ritual.occultism.resurrect_familiar.conditions": "Not all requirements for this ritual are met.",
"ritual.occultism.resurrect_familiar.finished": "Successfully resurrected familiar.",
"ritual.occultism.resurrect_familiar.interrupted": "Resurrection interrupted.",
"ritual.occultism.resurrect_familiar.started": "Started resurrecting familiar.",
"ritual.occultism.ritual_help": "§lInvalid ritual!§r\nWere you trying to perform ritual: \"%s\"? Missing items:\n%s",
"ritual.occultism.sacrifice.axolotls": "Axolotl",
"ritual.occultism.sacrifice.bats": "Bat",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/demons_dream_essence"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/otherworld_essence"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "occultism:item/ritual_dummy"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "occultism:item/soul_shard"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"background_u_index": 0,
"background_v_index": 0,
"category": "occultism:familiar_rituals",
"description": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description",
"hide_while_locked": false,
"icon": {
"item": "occultism:soul_shard"
},
"name": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.name",
"pages": [
{
"type": "modonomicon:spotlight",
"anchor": "",
"item": {
"item": "occultism:soul_shard"
},
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.soul_shard.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.soul_shard.title"
},
{
"type": "modonomicon:text",
"anchor": "",
"show_title_separator": true,
"text": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description.text",
"title": "book.occultism.dictionary_of_spirits.familiar_rituals.resurrection.description.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:crafting_recipe",
"anchor": "",
"recipe_id_1": "occultism:crafting/demons_dream_essence_from_fruit",
"recipe_id_2": "occultism:crafting/demons_dream_essence_from_seeds",
"text": "",
"title1": "",
"title2": ""
},
{
"type": "occultism:spirit_fire_recipe",
"anchor": "",
"recipe_id_1": "occultism:spirit_fire/otherworld_essence",
"text": "",
"title1": "",
"title2": ""
},
{
"type": "occultism:ritual_recipe",
"anchor": "",
"recipe_id_1": "occultism:ritual/resurrect_familiar",
"text": "",
"title1": "",
"title2": ""
}
],
"parents": [
{
"draw_arrow": true,
"entry": "occultism:familiar_rituals/overview",
"line_enabled": true,
"line_reversed": false
}
],
"x": -8,
"y": -2
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,41 @@
"text": "book.occultism.dictionary_of_spirits.getting_started.demons_dream.note_on_spirit_fire.text",
"title": "",
"use_markdown_in_title": false
},
{
"type": "modonomicon:spotlight",
"anchor": "",
"item": {
"item": "occultism:demons_dream_essence"
},
"text": "book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight2.text",
"title": ""
},
{
"type": "modonomicon:crafting_recipe",
"anchor": "",
"recipe_id_1": "occultism:crafting/demons_dream_essence_from_fruit",
"recipe_id_2": "occultism:crafting/demons_dream_essence_from_seeds",
"text": "",
"title1": "",
"title2": ""
},
{
"type": "modonomicon:spotlight",
"anchor": "",
"item": {
"item": "occultism:demons_dream_essence"
},
"text": "book.occultism.dictionary_of_spirits.getting_started.demons_dream.spotlight3.text",
"title": ""
},
{
"type": "occultism:spirit_fire_recipe",
"anchor": "",
"recipe_id_1": "occultism:spirit_fire/otherworld_essence",
"text": "",
"title1": "",
"title2": ""
}
],
"parents": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@
},
"text": "book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight.text",
"title": ""
},
{
"type": "modonomicon:spotlight",
"anchor": "",
"item": {
"item": "occultism:demons_dream_essence"
},
"text": "book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight2.text",
"title": ""
},
{
"type": "modonomicon:spotlight",
"anchor": "",
"item": {
"item": "occultism:otherworld_essence"
},
"text": "book.occultism.dictionary_of_spirits.getting_started.healing_spirits.spotlight3.text",
"title": ""
}
],
"parents": [
Expand Down
Loading

0 comments on commit dc99eaf

Please sign in to comment.