From 70f6789888ef0b81ff18713731c46a4926b90381 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Wed, 18 Sep 2024 09:16:19 +0200 Subject: [PATCH] chore: adjust demonic partner book text --- .../assets/occultism/lang/en_us.json | 8 ++--- .../familiar_rituals/demonic_partner.json | 12 ++++---- .../familiar_rituals/DemonicPartnerEntry.java | 29 ++++++++++--------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/generated/resources/assets/occultism/lang/en_us.json b/src/generated/resources/assets/occultism/lang/en_us.json index 40bb627a1..05f47222f 100644 --- a/src/generated/resources/assets/occultism/lang/en_us.json +++ b/src/generated/resources/assets/occultism/lang/en_us.json @@ -232,14 +232,14 @@ "book.occultism.dictionary_of_spirits.crafting_rituals.overview.intro.title": "Binding Rituals", "book.occultism.dictionary_of_spirits.crafting_rituals.overview.name": "Binding Rituals", "book.occultism.dictionary_of_spirits.crafting_rituals.return_to_rituals.name": "Return to Rituals Category", - "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.text": "The Demonic Partner - a Husband or Wife - can fight for you and help with household chores.\n\\\n\\\nRight-Click with any cookable food and they will use their magic to cook it.\n\\\n\\\nRight-Click with a potion to get the effect for a significantly longer time.\n", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.text": "The Demonic Partner - a Husband or Wife - can fight for you and split your household chores.\n\\\n\\\nRight-Click with any cookable food and they will use their magic to cook it.\n\\\n\\\nRight-Click with a potion to get the effect for a significantly longer time.\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.about.title": "Demonic Partner", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description": "A demonic Household?", - "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.text": "Magicians practicing the occult are a diverse crowd, coming from all creeds and all corners of the world. However one thing unites them all - they are as lonely as any human without a partner.\n\\\n\\\nOf course being a magician, there is a way to solve this problem once and for all.\n", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.text": "Magicians practicing the occult are a diverse crowd, coming from all creeds and all corners of the world. However one thing unites them all - they are as lonely as any human without a partner.\n\\\n\\\nOf course being a magician, the dating pool is larger than for most people, meeting all kinds of otherworldly beings, besides humans.\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description.title": "Demonic Partner", - "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.text": "As beings of immense powers Demons can have it all ... except love.\\\nNo demon will freely admit this, but at times they are impressed by the power and strength that some mortal occultists acquire. And in such cases, the impossible can happen - the demon can fall in love with a mortal.\n", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.text": "As beings of immense powers Demons can have it all ... even love.\\\nIn rare cases a Demon is so impressed by a mortal that they stay in touch. And in even rarer cases, take them on a date. And in such cases, the most unlikely thing can happen - love between a Spirit and a mortal.\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description2.title": "Demonic Partner", - "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.text": "Demons, of course, deal in contracts, and what better contract than a marriage contract?\n", + "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.text": "Demons, of course, like to deal in contracts, and what better contract than a marriage contract?\\\nBeware however, Spirits are all about commitment, so this is a permanent bond.\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.description3.title": "Demonic Partner", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.text": "The Demonic Partner Chapter is part of the Familiar Category of this book because of the similarities, however a Partner is obviously not a familiar.\n\\\n\\\nAs such, they also cannot be stored in a [](item://occultism:familiar_ring). You can, however, use a [](item://occultism:soul_gem) as for any other being.\n", "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.familiar.title": "Not a Familiar", diff --git a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json index eda43ed06..ee9cf74a1 100644 --- a/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json +++ b/src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/entries/familiar_rituals/demonic_partner.json @@ -76,8 +76,8 @@ "type": "modonomicon:none" }, "default_rotation": -45.0, - "entity_id": "occultism:demonic_wife", - "name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.wife.title", + "entity_id": "occultism:demonic_husband", + "name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.husband.title", "offset": 0.0, "rotate": true, "scale": 1.0, @@ -89,7 +89,7 @@ "condition": { "type": "modonomicon:none" }, - "recipe_id_1": "occultism:ritual/summon_demonic_wife", + "recipe_id_1": "occultism:ritual/summon_demonic_husband", "text": "", "title1": "", "title2": "" @@ -101,8 +101,8 @@ "type": "modonomicon:none" }, "default_rotation": -45.0, - "entity_id": "occultism:demonic_husband", - "name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.husband.title", + "entity_id": "occultism:demonic_wife", + "name": "book.occultism.dictionary_of_spirits.familiar_rituals.demonic_partner.wife.title", "offset": 0.0, "rotate": true, "scale": 1.0, @@ -114,7 +114,7 @@ "condition": { "type": "modonomicon:none" }, - "recipe_id_1": "occultism:ritual/summon_demonic_husband", + "recipe_id_1": "occultism:ritual/summon_demonic_wife", "text": "", "title1": "", "title2": "" diff --git a/src/main/java/com/klikli_dev/occultism/datagen/book/familiar_rituals/DemonicPartnerEntry.java b/src/main/java/com/klikli_dev/occultism/datagen/book/familiar_rituals/DemonicPartnerEntry.java index 52708e917..a06d1ec18 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/book/familiar_rituals/DemonicPartnerEntry.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/book/familiar_rituals/DemonicPartnerEntry.java @@ -32,7 +32,7 @@ protected void generatePages() { Magicians practicing the occult are a diverse crowd, coming from all creeds and all corners of the world. However one thing unites them all - they are as lonely as any human without a partner. \\ \\ - Of course being a magician, there is a way to solve this problem once and for all. + Of course being a magician, the dating pool is larger than for most people, meeting all kinds of otherworldly beings, besides humans. """); this.page("description2", () -> BookTextPageModel.create() @@ -41,8 +41,8 @@ protected void generatePages() { ); this.pageTitle("Demonic Partner"); this.pageText(""" - As beings of immense powers Demons can have it all ... except love.\\ - No demon will freely admit this, but at times they are impressed by the power and strength that some mortal occultists acquire. And in such cases, the impossible can happen - the demon can fall in love with a mortal. + As beings of immense powers Demons can have it all ... even love.\\ + In rare cases a Demon is so impressed by a mortal that they stay in touch. And in even rarer cases, take them on a date. And in such cases, the most unlikely thing can happen - love between a Spirit and a mortal. """); this.page("description3", () -> BookTextPageModel.create() @@ -51,7 +51,8 @@ protected void generatePages() { ); this.pageTitle("Demonic Partner"); this.pageText(""" - Demons, of course, deal in contracts, and what better contract than a marriage contract? + Demons, of course, like to deal in contracts, and what better contract than a marriage contract?\\ + Beware however, Spirits are all about commitment, so this is a permanent bond. """); this.page("about", () -> BookTextPageModel.create() @@ -60,7 +61,7 @@ protected void generatePages() { ); this.pageTitle("Demonic Partner"); this.pageText(""" - The Demonic Partner - a Husband or Wife - can fight for you and help with household chores. + The Demonic Partner - a Husband or Wife - can fight for you and split your household chores. \\ \\ Right-Click with any cookable food and they will use their magic to cook it. @@ -84,26 +85,26 @@ protected void generatePages() { this.itemLink(OccultismItems.SOUL_GEM_ITEM.get()) ); - this.page("wife", () -> BookEntityPageModel.create() - .withEntityId("occultism:demonic_wife") + this.page("husband", () -> BookEntityPageModel.create() + .withEntityId("occultism:demonic_husband") .withEntityName(this.context().pageTitle()) ); - this.pageTitle("Demonic Wife"); - + this.pageTitle("Demonic Husband"); this.page("ritual1", () -> BookRitualRecipePageModel.create() - .withRecipeId1(this.modLoc("ritual/summon_demonic_wife")) + .withRecipeId1(this.modLoc("ritual/summon_demonic_husband")) ); - this.page("husband", () -> BookEntityPageModel.create() - .withEntityId("occultism:demonic_husband") + this.page("wife", () -> BookEntityPageModel.create() + .withEntityId("occultism:demonic_wife") .withEntityName(this.context().pageTitle()) ); - this.pageTitle("Demonic Husband"); + this.pageTitle("Demonic Wife"); this.page("ritual2", () -> BookRitualRecipePageModel.create() - .withRecipeId1(this.modLoc("ritual/summon_demonic_husband")) + .withRecipeId1(this.modLoc("ritual/summon_demonic_wife")) ); + } @Override