From d7744ebff8a340f4977c7db1fe7bb32d52a78cd5 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 18 Mar 2024 23:44:46 -0500 Subject: [PATCH 01/17] Paraclesian's shouldn't have drivers license Update data/mods/Xedra_Evolved/player/hobbies.json Update hobbies.json Arvore start Co-Authored-By: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../paraclesians/arvore_mutations.json | 12 ++++ data/mods/Xedra_Evolved/player/hobbies.json | 67 +++++++++++++++++++ .../Xedra_Evolved/player/professions.json | 6 ++ 3 files changed, 85 insertions(+) create mode 100644 data/mods/Xedra_Evolved/player/hobbies.json diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index 46dd008dd46c5..b899eb07747af 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -129,6 +129,18 @@ "spells_learned": [ [ "arvore_nurture_the_green", 1 ] ], "//": "This only causes growth in existing plants. Growing new plants from nothing should be advanced mutations/spells." }, + { + "type": "mutation", + "id": "ARVORE_ROOT_AND_SOIL", + "name": { "str": "Nurturing the Green" }, + "points": 2, + "visibility": 0, + "ugliness": 0, + "description": "Arvore with this ability have a seed pocket on their body that over time fills with a set of from this region of the world. Each time new seeds appear they will all be of the same type, but the types will vary at random.", + "category": [ "ARVORE" ], + "spells_learned": [ [ "arvore_root_and_soil_spell", 1 ] ], + "//": "This is currently character creation only, ideally there will be ways to get this later in game." + }, { "type": "mutation", "id": "ARVORE_SUMMON_WOOD_WALL", diff --git a/data/mods/Xedra_Evolved/player/hobbies.json b/data/mods/Xedra_Evolved/player/hobbies.json new file mode 100644 index 0000000000000..5953817f3b8ff --- /dev/null +++ b/data/mods/Xedra_Evolved/player/hobbies.json @@ -0,0 +1,67 @@ +[ + { + "type": "profession", + "subtype": "hobby", + "id": "PARACLESIAN_BIRTH", + "name": "Paraclesian Birth", + "description": "By dint of your birth you already have some knowledge of how the universe really works.", + "points": 1, + "skills": [ { "level": 3, "name": "deduction" } ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "HOMULLUS_SOCIAL", + "name": "Born with the gift of gab.", + "description": "You've never met another person but already you are ready for the conversations that will ensue.", + "points": 1, + "skills": [ { "level": 3, "name": "social" } ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "UNDINE_MOVEMENT", + "name": "Knack of formless movement.", + "description": "Water takes on the shape of whatever opening is given to it. You were born with this knowledge and way of moving.", + "points": 2, + "proficiencies": [ "prof_parkour" ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "SYLPH_EVERYWHERE_NOWHERE", + "name": "Everywhere and nowhere.", + "description": "Air expands to fill every space it encounters and by filling the space it becomes diffuse and impossible to grasp. Would you slip through the fingers of those who grasp at you?", + "points": 3, + "skills": [ { "level": 3, "name": "dodge" } ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "ARVORE_ROOT_AND_SOIL", + "name": "The way of root and soil.", + "description": "A gift from your birth world? A quirk of nature? For reasons unknown to you, you can sprout seeds from this planet. You can't control what seeds you get, however.", + "points": 1, + "traits": [ "SEED_BEARER" ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "SALAMANDER_FIRE_DANCE", + "name": "Fire dances with itself.", + "description": "At your birth you already danced a flaming path, enthralled with your own capacity for destruction and change.", + "points": 4, + "traits": [ "PYROMANIA", "DEFT" ], + "skills": [ { "level": 1, "name": "unarmed" } ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "IERDE_MEDITATION", + "name": "What does the stone dream of?", + "description": "Before you were born, your thoughts and dreams were those of stone. When this world sucks you into it's highs and lows, you can remember the eternity that is stone.", + "points": 3, + "//": "Trait grants an EOC that doing 30 minutes of meditation resets your morale to zero. Consider making IERDE abilities that function better or only at morales between the range of -15 and 15.", + "traits": [ "STONE_MEDITATIONS" ] + } +] diff --git a/data/mods/Xedra_Evolved/player/professions.json b/data/mods/Xedra_Evolved/player/professions.json index b8de147648eed..642e07f975690 100644 --- a/data/mods/Xedra_Evolved/player/professions.json +++ b/data/mods/Xedra_Evolved/player/professions.json @@ -502,6 +502,7 @@ "traits": [ "IERDE" ], "pets": [ { "name": "mon_stoneling", "amount": 1 } ], "recipes": [ "mutagen_earthkin", "cthonic_poultice" ], + "hobbies": [ "PARACLESIAN_BIRTH", "IERDE_MEDITATION" ], "items": { "both": { "entries": [ @@ -528,6 +529,7 @@ "traits": [ "ARVORE" ], "pets": [ { "name": "mon_vineling", "amount": 1 } ], "recipes": [ "mutagen_plantkin", "verdant_poultice" ], + "hobbies": [ "PARACLESIAN_BIRTH", "ARVORE_ROOT_AND_SOIL" ], "items": { "both": { "entries": [ @@ -554,6 +556,7 @@ "traits": [ "UNDINE" ], "pets": [ { "name": "mon_spitting_lizard", "amount": 1 } ], "recipes": [ "mutagen_waterkin", "cerulean_poultice" ], + "hobbies": [ "PARACLESIAN_BIRTH", "UNDINE_MOVEMENT" ], "items": { "both": { "entries": [ @@ -580,6 +583,7 @@ "traits": [ "SALAMANDER" ], "pets": [ { "name": "mon_salamander_tiny", "amount": 1 } ], "recipes": [ "mutagen_flamekin", "charred_sacrifice" ], + "hobbies": [ "PARACLESIAN_BIRTH", "SALAMANDER_FIRE_DANCE" ], "items": { "both": { "entries": [ @@ -606,6 +610,7 @@ "traits": [ "HOMULLUS", "HOMULLUS_MINIMIZED_MUTATIONS" ], "pets": [ { "name": "mon_zoomorphic_figure_small", "amount": 1 } ], "recipes": [ "mutagen_dollkin", "doll_repair_paste" ], + "hobbies": [ "PARACLESIAN_BIRTH", "HOMULLUS_SOCIAL" ], "items": { "both": { "entries": [ @@ -632,6 +637,7 @@ "traits": [ "SYLPH" ], "pets": [ { "name": "mon_dragonfly_fae", "amount": 1 } ], "recipes": [ "mutagen_airkin", "ethereal_draught" ], + "hobbies": [ "PARACLESIAN_BIRTH", "SYLPH_EVERYWHERE_NOWHERE" ], "items": { "both": { "entries": [ From a2b809d3ff2288c40b0d77396c29de068ae7018c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:51:49 -0500 Subject: [PATCH 02/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json --- .../Xedra_Evolved/mutations/paraclesians/arvore_mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index b899eb07747af..53bdcd9ae2535 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -131,7 +131,7 @@ }, { "type": "mutation", - "id": "ARVORE_ROOT_AND_SOIL", + "id": "ARVORE_NURTURE_GREEN", "name": { "str": "Nurturing the Green" }, "points": 2, "visibility": 0, From 49f5e8beb54723b79819b71fdee5c0232c221d9f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:53:43 -0500 Subject: [PATCH 03/17] Apply suggestions from code review --- .../mutations/paraclesians/arvore_mutations.json | 2 +- data/mods/Xedra_Evolved/player/hobbies.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index 53bdcd9ae2535..cbe8a65df7e34 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -131,7 +131,7 @@ }, { "type": "mutation", - "id": "ARVORE_NURTURE_GREEN", + "id": "ARVORE_SEED_BEARER", "name": { "str": "Nurturing the Green" }, "points": 2, "visibility": 0, diff --git a/data/mods/Xedra_Evolved/player/hobbies.json b/data/mods/Xedra_Evolved/player/hobbies.json index 5953817f3b8ff..6609c294735f4 100644 --- a/data/mods/Xedra_Evolved/player/hobbies.json +++ b/data/mods/Xedra_Evolved/player/hobbies.json @@ -38,8 +38,8 @@ { "type": "profession", "subtype": "hobby", - "id": "ARVORE_ROOT_AND_SOIL", - "name": "The way of root and soil.", + "id": "ARVORE_NURTURE_GREEN", + "name": "Born a seedbearer.", "description": "A gift from your birth world? A quirk of nature? For reasons unknown to you, you can sprout seeds from this planet. You can't control what seeds you get, however.", "points": 1, "traits": [ "SEED_BEARER" ] From c645d5cd4af7b3c22502ac09a99841a6a272624b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 19:54:39 -0500 Subject: [PATCH 04/17] Update data/mods/Xedra_Evolved/player/professions.json --- data/mods/Xedra_Evolved/player/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/player/professions.json b/data/mods/Xedra_Evolved/player/professions.json index 642e07f975690..1b48dd151a553 100644 --- a/data/mods/Xedra_Evolved/player/professions.json +++ b/data/mods/Xedra_Evolved/player/professions.json @@ -529,7 +529,7 @@ "traits": [ "ARVORE" ], "pets": [ { "name": "mon_vineling", "amount": 1 } ], "recipes": [ "mutagen_plantkin", "verdant_poultice" ], - "hobbies": [ "PARACLESIAN_BIRTH", "ARVORE_ROOT_AND_SOIL" ], + "hobbies": [ "PARACLESIAN_BIRTH", "ARVORE_NURTURE_GREEN" ], "items": { "both": { "entries": [ From ce86d6507987c597305a61e9426a6d7831b8d9a8 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 22:39:14 -0500 Subject: [PATCH 05/17] Ierde meditation --- .../mutations/paraclesians/ierde_eocs.json | 23 +++++++++++++++++++ .../paraclesians/ierde_mutations.json | 12 ++++++++++ 2 files changed, 35 insertions(+) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 027deb10eee76..93c0d88f8772d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -27,6 +27,29 @@ } ] }, + { + "type": "effect_on_condition", + "id": "EOC_IERDE_STONE_MEDITATIONS", + "condition": { + "or": [ + { + "condition": { "math": [ "u_val('morale')", "<", "-50" ] }, + "msg_on": { "text": "Everything is terrible but this shall pass.", "rating": "mixed" } + }, + { + "condition": { "math": [ "u_val('morale')", "<", "50" ] }, + "msg_on": { "text": "Everything is wonderful and this too shall pass.", "rating": "mixed" } + } + ] + }, + "effect": [ { "u_add_morale": { "math": [ "u_val('morale')", "0" ] } } ], + "false_effect": [ + { + "u_message": "You are already in the mindset of stone. Patient and eternal.", + "type": "mixed" + } + ] + }, { "type": "effect_on_condition", "id": "EOC_IERDE_DETECT_NEARBY_MONSTERS_EARTH_OFF", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json index 1b85eb6d36fdf..7978d7ba3240b 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json @@ -568,6 +568,18 @@ "threshreq": [ "THRESH_IERDE" ], "enchantments": [ "ench_ierde_no_mind_problems" ] }, + { + "type": "mutation", + "id": "IERDE_STONE_MEDITATIONS", + "name": { "str": "Stone Meditations" }, + "points": 1, + "visibility": 0, + "ugliness": 0, + "description": "The Ierde meditates on the nature of stone and removes themselves from the highs and lows of mortal emotions.", + "category": [ "IERDE" ], + "active": true, + "activated_eocs": [ "EOC_IERDE_STONE_MEDITATIONS" ] + }, { "type": "mutation", "id": "IERDE_STONE_FORM", From 333250edc2a92fabc2be3cce0087a65c1e2e1603 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:06:27 -0500 Subject: [PATCH 06/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 93c0d88f8772d..70d655e719e32 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -43,12 +43,7 @@ ] }, "effect": [ { "u_add_morale": { "math": [ "u_val('morale')", "0" ] } } ], - "false_effect": [ - { - "u_message": "You are already in the mindset of stone. Patient and eternal.", - "type": "mixed" - } - ] + "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] }, { "type": "effect_on_condition", From 86d5f2d087de609b8998c01143fb535d4f5a6c6c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:33:53 -0500 Subject: [PATCH 07/17] Update ierde_eocs.json --- data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 93c0d88f8772d..16e695bb47475 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -42,7 +42,7 @@ } ] }, - "effect": [ { "u_add_morale": { "math": [ "u_val('morale')", "0" ] } } ], + "effect": [ { "math": [ "u_val('morale')", "=", "0" ] } ], "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", From 3113eb4cfe6a57a62589db7379f3119bfcf1b39d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:47:04 -0500 Subject: [PATCH 08/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 1e232d3961aa5..4483b3bfbe917 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -65,12 +65,7 @@ ] }, "effect": [ { "math": [ "u_val('morale')", "=", "0" ] } ], - "false_effect": [ - { - "u_message": "You are already in the mindset of stone. Patient and eternal.", - "type": "mixed" - } - ] + "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] }, { "type": "effect_on_condition", From e46432980731a9b260a45f73a653877c6927a500 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:35:47 -0500 Subject: [PATCH 09/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json --- .../mutations/paraclesians/ierde_eocs.json | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 4483b3bfbe917..68815200f5bdd 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -49,24 +49,7 @@ } ] }, - { - "type": "effect_on_condition", - "id": "EOC_IERDE_STONE_MEDITATIONS", - "condition": { - "or": [ - { - "condition": { "math": [ "u_val('morale')", "<", "-50" ] }, - "msg_on": { "text": "Everything is terrible but this shall pass.", "rating": "mixed" } - }, - { - "condition": { "math": [ "u_val('morale')", "<", "50" ] }, - "msg_on": { "text": "Everything is wonderful and this too shall pass.", "rating": "mixed" } - } - ] - }, - "effect": [ { "math": [ "u_val('morale')", "=", "0" ] } ], - "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] - }, +something like this is accepted when creating a new game { "type": "effect_on_condition", "id": "EOC_IERDE_DETECT_NEARBY_MONSTERS_EARTH_OFF", From 90f545653925cef7f38f289772105c38ab6436ce Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:36:03 -0500 Subject: [PATCH 10/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json --- data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 68815200f5bdd..8c13d85c9ef40 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -49,7 +49,6 @@ } ] }, -something like this is accepted when creating a new game { "type": "effect_on_condition", "id": "EOC_IERDE_DETECT_NEARBY_MONSTERS_EARTH_OFF", From 6a50f979d85101bd38c098aae21b2fb339586a22 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:06:31 -0500 Subject: [PATCH 11/17] Update ierde_eocs.json --- .../mutations/paraclesians/ierde_eocs.json | 106 ++++++++++++++++-- 1 file changed, 96 insertions(+), 10 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 4483b3bfbe917..3dbec8535873f 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -50,21 +50,107 @@ ] }, { - "type": "effect_on_condition", "id": "EOC_IERDE_STONE_MEDITATIONS", + "type": "effect_on_condition", "condition": { "or": [ - { - "condition": { "math": [ "u_val('morale')", "<", "-50" ] }, - "msg_on": { "text": "Everything is terrible but this shall pass.", "rating": "mixed" } - }, - { - "condition": { "math": [ "u_val('morale')", "<", "50" ] }, - "msg_on": { "text": "Everything is wonderful and this too shall pass.", "rating": "mixed" } - } + { "condition": { "math": [ "u_val('morale')", "==", "0" ] } }, + { "condition": { "math": [ "u_val('morale')", "<", "-50" ] } }, + { "condition": { "math": [ "u_val('morale')", ">", "50" ] } } ] }, - "effect": [ { "math": [ "u_val('morale')", "=", "0" ] } ], + "effect": [ { "u_lose_morale": "morale_food_good" }, + { "u_lose_morale": "morale_food_hot" }, + { "u_lose_morale": "morale_chat" }, + { "u_lose_morale": "morale_ate_with_table" }, + { "u_lose_morale": "morale_ate_without_table" }, + { "u_lose_morale": "morale_music" }, + { "u_lose_morale": "morale_honey" }, + { "u_lose_morale": "morale_game" }, + { "u_lose_morale": "morale_marloss" }, + { "u_lose_morale": "morale_mutagen" }, + { "u_lose_morale": "morale_feeling_good" }, + { "u_lose_morale": "morale_support" }, + { "u_lose_morale": "morale_photos" }, + { "u_lose_morale": "morale_craving_nicotine" }, + { "u_lose_morale": "morale_craving_caffeine" }, + { "u_lose_morale": "morale_craving_alcohol" }, + { "u_lose_morale": "morale_craving_opiate" }, + { "u_lose_morale": "morale_craving_speed" }, + { "u_lose_morale": "morale_craving_cocaine" }, + { "u_lose_morale": "morale_craving_crack" }, + { "u_lose_morale": "morale_craving_mutagen" }, + { "u_lose_morale": "morale_craving_diazepam" }, + { "u_lose_morale": "morale_craving_marloss" }, + { "u_lose_morale": "morale_food_bad" }, + { "u_lose_morale": "morale_cannibal" }, + { "u_lose_morale": "morale_demicannibal" }, + { "u_lose_morale": "morale_vegetarian" }, + { "u_lose_morale": "morale_antiveggy" }, + { "u_lose_morale": "morale_meatarian" }, + { "u_lose_morale": "morale_antimeat" }, + { "u_lose_morale": "morale_antifruit" }, + { "u_lose_morale": "morale_lactose" }, + { "u_lose_morale": "morale_antijunk" }, + { "u_lose_morale": "morale_antiwheat" }, + { "u_lose_morale": "morale_sweettooth" }, + { "u_lose_morale": "morale_no_digest" }, + { "u_lose_morale": "morale_wet" }, + { "u_lose_morale": "morale_dried_off" }, + { "u_lose_morale": "morale_cold" }, + { "u_lose_morale": "morale_hot" }, + { "u_lose_morale": "morale_feeling_bad" }, + { "u_lose_morale": "morale_bad_protein_bar" }, + { "u_lose_morale": "morale_killed_innocent" }, + { "u_lose_morale": "morale_killed_friend" }, + { "u_lose_morale": "morale_killed_monster" }, + { "u_lose_morale": "morale_mutilate_corpse" }, + { "u_lose_morale": "morale_mutagen_elf" }, + { "u_lose_morale": "morale_mutagen_chimera" }, + { "u_lose_morale": "morale_mutagen_mutation" }, + { "u_lose_morale": "morale_moodswing" }, + { "u_lose_morale": "morale_book" }, + { "u_lose_morale": "morale_comfy" }, + { "u_lose_morale": "morale_scream" }, + { "u_lose_morale": "morale_perm_masochist" }, + { "u_lose_morale": "morale_perm_radiophile" }, + { "u_lose_morale": "morale_perm_noface" }, + { "u_lose_morale": "morale_perm_fpmode_on" }, + { "u_lose_morale": "morale_perm_hoarder" }, + { "u_lose_morale": "morale_perm_fancy" }, + { "u_lose_morale": "morale_perm_optimist" }, + { "u_lose_morale": "morale_perm_badtemper" }, + { "u_lose_morale": "morale_perm_numb" }, + { "u_lose_morale": "morale_perm_constrained" }, + { "u_lose_morale": "morale_perm_nomad" }, + { "u_lose_morale": "morale_game_found_kitten" }, + { "u_lose_morale": "morale_haircut" }, + { "u_lose_morale": "morale_shave" }, + { "u_lose_morale": "morale_vomited" }, + { "u_lose_morale": "morale_play_with_pet" }, + { "u_lose_morale": "morale_pyromania_startfire" }, + { "u_lose_morale": "morale_pyromania_nearfire" }, + { "u_lose_morale": "morale_pyromania_nofire" }, + { "u_lose_morale": "morale_killer_has_killed" }, + { "u_lose_morale": "morale_killer_need_to_kill" }, + { "u_lose_morale": "morale_perm_filthy" }, + { "u_lose_morale": "morale_butcher" }, + { "u_lose_morale": "morale_gravedigger" }, + { "u_lose_morale": "morale_funeral" }, + { "u_lose_morale": "morale_tree_communion" }, + { "u_lose_morale": "morale_accomplishment" }, + { "u_lose_morale": "morale_failure" }, + { "u_lose_morale": "morale_perm_debug" }, + { "u_lose_morale": "morale_nightmare" }, + { "u_lose_morale": "morale_migo_bio_tech" }, + { "u_lose_morale": "morale_impossible_shape" }, + { "u_lose_morale": "morale_afs_drugs" }, + { "u_lose_morale": "morale_social" }, + { "u_lose_morale": "morale_asocial" }, + { "u_lose_morale": "morale_bile" }, + { "u_lose_morale": "morale_sunrise" }, + { "u_lose_morale": "morale_sunset" } + ], "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] }, { From e8d4a36648e91efd66841d72ad7d8303d9354078 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:17:23 -0500 Subject: [PATCH 12/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 3dbec8535873f..8513130742cb2 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -59,7 +59,8 @@ { "condition": { "math": [ "u_val('morale')", ">", "50" ] } } ] }, - "effect": [ { "u_lose_morale": "morale_food_good" }, + "effect": [ + { "u_lose_morale": "morale_food_good" }, { "u_lose_morale": "morale_food_hot" }, { "u_lose_morale": "morale_chat" }, { "u_lose_morale": "morale_ate_with_table" }, From 68e0eeff9c87d4cf2e5541d7ae4eb2ed2d9d2455 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 11 Sep 2024 09:17:30 -0500 Subject: [PATCH 13/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 8513130742cb2..21975f5077985 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -151,7 +151,7 @@ { "u_lose_morale": "morale_bile" }, { "u_lose_morale": "morale_sunrise" }, { "u_lose_morale": "morale_sunset" } - ], + ], "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] }, { From 2aeb76591f3f1874945754f3b274ddd7b29043a4 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 14 Sep 2024 15:55:36 -0500 Subject: [PATCH 14/17] Good enough to ship --- .../mutations/paraclesians/ierde_eocs.json | 105 ------------------ .../paraclesians/ierde_mutations.json | 6 +- 2 files changed, 2 insertions(+), 109 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 21975f5077985..8c13d85c9ef40 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -49,111 +49,6 @@ } ] }, - { - "id": "EOC_IERDE_STONE_MEDITATIONS", - "type": "effect_on_condition", - "condition": { - "or": [ - { "condition": { "math": [ "u_val('morale')", "==", "0" ] } }, - { "condition": { "math": [ "u_val('morale')", "<", "-50" ] } }, - { "condition": { "math": [ "u_val('morale')", ">", "50" ] } } - ] - }, - "effect": [ - { "u_lose_morale": "morale_food_good" }, - { "u_lose_morale": "morale_food_hot" }, - { "u_lose_morale": "morale_chat" }, - { "u_lose_morale": "morale_ate_with_table" }, - { "u_lose_morale": "morale_ate_without_table" }, - { "u_lose_morale": "morale_music" }, - { "u_lose_morale": "morale_honey" }, - { "u_lose_morale": "morale_game" }, - { "u_lose_morale": "morale_marloss" }, - { "u_lose_morale": "morale_mutagen" }, - { "u_lose_morale": "morale_feeling_good" }, - { "u_lose_morale": "morale_support" }, - { "u_lose_morale": "morale_photos" }, - { "u_lose_morale": "morale_craving_nicotine" }, - { "u_lose_morale": "morale_craving_caffeine" }, - { "u_lose_morale": "morale_craving_alcohol" }, - { "u_lose_morale": "morale_craving_opiate" }, - { "u_lose_morale": "morale_craving_speed" }, - { "u_lose_morale": "morale_craving_cocaine" }, - { "u_lose_morale": "morale_craving_crack" }, - { "u_lose_morale": "morale_craving_mutagen" }, - { "u_lose_morale": "morale_craving_diazepam" }, - { "u_lose_morale": "morale_craving_marloss" }, - { "u_lose_morale": "morale_food_bad" }, - { "u_lose_morale": "morale_cannibal" }, - { "u_lose_morale": "morale_demicannibal" }, - { "u_lose_morale": "morale_vegetarian" }, - { "u_lose_morale": "morale_antiveggy" }, - { "u_lose_morale": "morale_meatarian" }, - { "u_lose_morale": "morale_antimeat" }, - { "u_lose_morale": "morale_antifruit" }, - { "u_lose_morale": "morale_lactose" }, - { "u_lose_morale": "morale_antijunk" }, - { "u_lose_morale": "morale_antiwheat" }, - { "u_lose_morale": "morale_sweettooth" }, - { "u_lose_morale": "morale_no_digest" }, - { "u_lose_morale": "morale_wet" }, - { "u_lose_morale": "morale_dried_off" }, - { "u_lose_morale": "morale_cold" }, - { "u_lose_morale": "morale_hot" }, - { "u_lose_morale": "morale_feeling_bad" }, - { "u_lose_morale": "morale_bad_protein_bar" }, - { "u_lose_morale": "morale_killed_innocent" }, - { "u_lose_morale": "morale_killed_friend" }, - { "u_lose_morale": "morale_killed_monster" }, - { "u_lose_morale": "morale_mutilate_corpse" }, - { "u_lose_morale": "morale_mutagen_elf" }, - { "u_lose_morale": "morale_mutagen_chimera" }, - { "u_lose_morale": "morale_mutagen_mutation" }, - { "u_lose_morale": "morale_moodswing" }, - { "u_lose_morale": "morale_book" }, - { "u_lose_morale": "morale_comfy" }, - { "u_lose_morale": "morale_scream" }, - { "u_lose_morale": "morale_perm_masochist" }, - { "u_lose_morale": "morale_perm_radiophile" }, - { "u_lose_morale": "morale_perm_noface" }, - { "u_lose_morale": "morale_perm_fpmode_on" }, - { "u_lose_morale": "morale_perm_hoarder" }, - { "u_lose_morale": "morale_perm_fancy" }, - { "u_lose_morale": "morale_perm_optimist" }, - { "u_lose_morale": "morale_perm_badtemper" }, - { "u_lose_morale": "morale_perm_numb" }, - { "u_lose_morale": "morale_perm_constrained" }, - { "u_lose_morale": "morale_perm_nomad" }, - { "u_lose_morale": "morale_game_found_kitten" }, - { "u_lose_morale": "morale_haircut" }, - { "u_lose_morale": "morale_shave" }, - { "u_lose_morale": "morale_vomited" }, - { "u_lose_morale": "morale_play_with_pet" }, - { "u_lose_morale": "morale_pyromania_startfire" }, - { "u_lose_morale": "morale_pyromania_nearfire" }, - { "u_lose_morale": "morale_pyromania_nofire" }, - { "u_lose_morale": "morale_killer_has_killed" }, - { "u_lose_morale": "morale_killer_need_to_kill" }, - { "u_lose_morale": "morale_perm_filthy" }, - { "u_lose_morale": "morale_butcher" }, - { "u_lose_morale": "morale_gravedigger" }, - { "u_lose_morale": "morale_funeral" }, - { "u_lose_morale": "morale_tree_communion" }, - { "u_lose_morale": "morale_accomplishment" }, - { "u_lose_morale": "morale_failure" }, - { "u_lose_morale": "morale_perm_debug" }, - { "u_lose_morale": "morale_nightmare" }, - { "u_lose_morale": "morale_migo_bio_tech" }, - { "u_lose_morale": "morale_impossible_shape" }, - { "u_lose_morale": "morale_afs_drugs" }, - { "u_lose_morale": "morale_social" }, - { "u_lose_morale": "morale_asocial" }, - { "u_lose_morale": "morale_bile" }, - { "u_lose_morale": "morale_sunrise" }, - { "u_lose_morale": "morale_sunset" } - ], - "false_effect": [ { "u_message": "You are already in the mindset of stone. Patient and eternal.", "type": "mixed" } ] - }, { "type": "effect_on_condition", "id": "EOC_IERDE_DETECT_NEARBY_MONSTERS_EARTH_OFF", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json index 1c0e00e2cab55..49b2d61487010 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json @@ -619,10 +619,8 @@ "points": 1, "visibility": 0, "ugliness": 0, - "description": "The Ierde meditates on the nature of stone and removes themselves from the highs and lows of mortal emotions.", - "category": [ "IERDE" ], - "active": true, - "activated_eocs": [ "EOC_IERDE_STONE_MEDITATIONS" ] + "description": "[ WIP Does nothing ]The Ierde meditates on the nature of stone and removes themselves from the highs and lows of mortal emotions.", + "category": [ "IERDE" ] }, { "type": "mutation", From e877adbc1ad62a172a09ff46d6b106e6d73a3f89 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:27:02 -0500 Subject: [PATCH 15/17] Update hobbies.json --- data/mods/Xedra_Evolved/player/hobbies.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/player/hobbies.json b/data/mods/Xedra_Evolved/player/hobbies.json index 6609c294735f4..f7e7bbe3d6ec5 100644 --- a/data/mods/Xedra_Evolved/player/hobbies.json +++ b/data/mods/Xedra_Evolved/player/hobbies.json @@ -15,7 +15,7 @@ "name": "Born with the gift of gab.", "description": "You've never met another person but already you are ready for the conversations that will ensue.", "points": 1, - "skills": [ { "level": 3, "name": "social" } ] + "skills": [ { "level": 3, "name": "speech" } ] }, { "type": "profession", @@ -42,7 +42,7 @@ "name": "Born a seedbearer.", "description": "A gift from your birth world? A quirk of nature? For reasons unknown to you, you can sprout seeds from this planet. You can't control what seeds you get, however.", "points": 1, - "traits": [ "SEED_BEARER" ] + "traits": [ "ARVORE_SEED_BEARER" ] }, { "type": "profession", @@ -62,6 +62,6 @@ "description": "Before you were born, your thoughts and dreams were those of stone. When this world sucks you into it's highs and lows, you can remember the eternity that is stone.", "points": 3, "//": "Trait grants an EOC that doing 30 minutes of meditation resets your morale to zero. Consider making IERDE abilities that function better or only at morales between the range of -15 and 15.", - "traits": [ "STONE_MEDITATIONS" ] + "traits": [ "IERDE_STONE_MEDITATIONS" ] } ] From 0fca5a4ccd0098db6a72288e098c093504e27660 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:23:22 -0500 Subject: [PATCH 16/17] Update data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json --- .../Xedra_Evolved/mutations/paraclesians/arvore_mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index aebfd5dcd96a0..840f3c73379f7 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -132,7 +132,7 @@ { "type": "mutation", "id": "ARVORE_SEED_BEARER", - "name": { "str": "Nurturing the Green" }, + "name": { "str": "Seed Bearer" }, "points": 2, "visibility": 0, "ugliness": 0, From 6ac2e21ffb4b9c291de5bb62c800a291db5ace33 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:33:41 -0500 Subject: [PATCH 17/17] Seed Bearer --- .../mutations/paraclesians/arvore_eocs.json | 13 +++++++++++++ .../paraclesians/arvore_mutation_spells.json | 14 ++++++++++++++ .../mutations/paraclesians/arvore_mutations.json | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json index c1dfff5baa82d..21bf5f8f8a7b9 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json @@ -259,6 +259,19 @@ "effect": [ { "u_cast_spell": { "id": "arvore_traverse_the_wilds_real" }, "targeted": true } ], "false_effect": { "u_message": "You need to be in a forest or swamp to traverse the wilds.", "type": "bad" } }, + { + "type": "effect_on_condition", + "id": "EOC_ARVORE_SEED_BEARER", + "condition": { + "and": [ + "u_is_outside", + { "test_eoc": "EOC_CONDITION_CHECK_ARVORE_ON_NATURAL_TERRAIN" }, + { "test_eoc": "EOC_CONDITION_CHECK_ARVORE_IN_THE_WILD" } + ] + }, + "effect": [ { "u_cast_spell": { "id": "arvore_seed_bearer_real" } } ], + "false_effect": [ { "u_message": "You must be surrounded by the wild to call forth regional seeds.", "type": "bad" } ] + }, { "type": "effect_on_condition", "id": "EOC_ARVORE_GOBLIN_FRUIT", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json index f4b914abeadfe..66f2d0ca2b492 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json @@ -352,6 +352,20 @@ "max_duration": 1080000, "duration_increment": 36000 }, + { + "id": "arvore_seed_bearer_real", + "type": "SPELL", + "name": "Seed Bearer Real", + "description": "The actual spell that calls forth seeds. It's a bug if you have it.", + "skill": "deduction", + "flags": [ "SPAWN_GROUP" ], + "valid_targets": [ "self" ], + "effect": "spawn_item", + "effect_str": "farming_seeds", + "shape": "blast", + "min_damage": 1, + "max_damage": 1 + }, { "id": "arvore_summon_preservation_container", "type": "SPELL", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index aebfd5dcd96a0..eeb7afca966f4 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -138,7 +138,7 @@ "ugliness": 0, "description": "Arvore with this ability have a seed pocket on their body that over time fills with a set of from this region of the world. Each time new seeds appear they will all be of the same type, but the types will vary at random.", "category": [ "ARVORE" ], - "spells_learned": [ [ "arvore_root_and_soil_spell", 1 ] ], + "activated_eocs": [ "EOC_ARVORE_SEED_BEARER_activated" ], "//": "This is currently character creation only, ideally there will be ways to get this later in game." }, {