From dc2ee1e3318152a94d227b75a2c4655d29f7c248 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 10:59:54 +0000 Subject: [PATCH 1/4] Change ++ to single string \",[ \n\r]+\"\+\+\" to ++" --- .../effects_on_condition/addictions_eocs.json | 2 +- .../effects_on_condition/bionic_eocs.json | 4 +-- .../misc_effect_on_condition.json | 2 +- .../mutation_eocs/mutation_effect_eocs.json | 10 +++--- .../portal_storm_effect_on_condition.json | 24 ++++++-------- .../vitrification_effect_on_condition.json | 14 ++++---- .../npc_eocs/generic_npc_eocs.json | 2 +- .../npc_eocs/isherwood_barry_rescue_eocs.json | 2 +- .../furniture_and_terrain/terrain-traps.json | 2 +- data/json/items/tool/science.json | 2 +- data/json/monster_special_attacks/spells.json | 4 +-- .../Lighthouse_Family/NPC_lighthouse_man.json | 14 ++++---- data/json/npcs/TALK_TEST.json | 2 +- data/json/npcs/computers/TALK_MSU14.json | 2 +- .../godco/members/NPC_Katherine_Weaver.json | 2 +- data/json/npcs/godco/shared_effects.json | 5 +-- .../isherwood_farm/NPC_Chris_Isherwood.json | 20 ++++++------ .../isherwood_farm/NPC_Luke_Isherwood.json | 2 +- .../npcs/random_encounters/john_bailey.json | 2 +- .../beggars/BEGGAR_2_Dino_Dave.json | 4 +-- .../surface_refugees/NPC_Alonso_Lautrec.json | 2 +- .../NPC_Boris_Borichenko.json | 2 +- .../surface_refugees/NPC_Fatima_Al_Jadir.json | 2 +- .../surface_refugees/NPC_Jenny_Forcette.json | 6 ++-- .../surface_refugees/NPC_Uyen_Tran.json | 4 +-- .../surface_refugees/shared_dialogue.json | 2 +- .../NPC_free_merchant_teamster.json | 2 +- .../free_merchant_shopkeep_missions.json | 2 +- .../npcs/robofac/NPC_Cranberry_Foster.json | 6 ++-- .../robofac_intercom_missions.json | 12 +++---- .../robofac_intercom_trades.json | 32 +++++++++---------- .../npcs/tacoma_ranch/Nunez/Arrival_code.json | 2 +- 32 files changed, 93 insertions(+), 102 deletions(-) diff --git a/data/json/effects_on_condition/addictions_eocs.json b/data/json/effects_on_condition/addictions_eocs.json index d0be2bae356fd..47a73d39fe864 100644 --- a/data/json/effects_on_condition/addictions_eocs.json +++ b/data/json/effects_on_condition/addictions_eocs.json @@ -42,7 +42,7 @@ "id": "EOC_SLEEP_ADDICTION", "//": "Actual effects processed in player::can_sleep(). Here, only prolong this addiction longer than usual.", "condition": { "and": [ { "one_in_chance": 2 }, { "math": [ "u_addiction_turns('sleeping pill') < 0" ] } ] }, - "effect": { "math": [ "u_addiction_turns('sleeping pill')", "++" ] } + "effect": { "math": [ "u_addiction_turns('sleeping pill')++" ] } }, { "type": "effect_on_condition", diff --git a/data/json/effects_on_condition/bionic_eocs.json b/data/json/effects_on_condition/bionic_eocs.json index db2173bd02f7a..824367a517142 100644 --- a/data/json/effects_on_condition/bionic_eocs.json +++ b/data/json/effects_on_condition/bionic_eocs.json @@ -42,7 +42,7 @@ "effect": [ { "u_message": "Your malfunctioning bionic causes you to spasm and fall to the floor!", "type": "bad" }, { "sound_effect": "elec_crackle_high", "id": "bionics", "volume": 100 }, - { "math": [ "u_pain()", "++" ] }, + { "math": [ "u_pain()++" ] }, { "u_add_effect": "stunned", "duration": 1 }, { "u_add_effect": "downed", "duration": 1, "force": true } ] @@ -84,7 +84,7 @@ "recurrence": [ "25 minutes", "1 hours 15 minutes" ], "condition": { "and": [ { "u_has_bionics": "bio_sleepy" }, { "not": { "u_has_effect": "sleep" } } ] }, "deactivate_condition": { "not": { "u_has_bionics": "bio_sleepy" } }, - "effect": { "math": [ "u_val('sleepiness')", "++" ] } + "effect": { "math": [ "u_val('sleepiness')++" ] } }, { "type": "effect_on_condition", diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json index bfddef828f4fc..0313b746ed635 100644 --- a/data/json/effects_on_condition/misc_effect_on_condition.json +++ b/data/json/effects_on_condition/misc_effect_on_condition.json @@ -48,7 +48,7 @@ "id": "EOC_mininuke_record", "eoc_type": "EVENT", "required_event": "activates_mininuke", - "effect": [ { "math": [ "u_mininuke_activated", "++" ] } ] + "effect": [ { "math": [ "u_mininuke_activated++" ] } ] }, { "id": "EOC_DEATH_SWITCH", diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json index 305411f8a5954..2a88ccc358857 100644 --- a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json +++ b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json @@ -73,7 +73,7 @@ { "u_forget_recipe": "prac_unmute_bird" } ], "false_effect": [ - { "math": [ "u_progress_unmute_bird", "++" ] }, + { "math": [ "u_progress_unmute_bird++" ] }, { "u_message": "Restricting your range to the apes' feels demeaning, and you decide to take a break before you start plucking out your feathers in frustration." } @@ -92,7 +92,7 @@ { "u_forget_recipe": "prac_unmute_ceph" } ], "false_effect": [ - { "math": [ "u_progress_unmute_ceph", "++" ] }, + { "math": [ "u_progress_unmute_ceph++" ] }, { "u_message": "Draw air into your mantle, close your throat, rehearse your sentence, exhale and contort your beak just so." } @@ -111,7 +111,7 @@ { "u_forget_recipe": "prac_unmute_gastropod" } ], "false_effect": [ - { "math": [ "u_progress_unmute_gastropod", "++" ] }, + { "math": [ "u_progress_unmute_gastropod++" ] }, { "u_message": "If you rub your tongue against your palate like this is makes a `th` - or at least, a `thrksrkkk`, but it's a start. Ignore the taste of blood, there's work to be done." } @@ -130,7 +130,7 @@ { "u_forget_recipe": "prac_unmute_insect" } ], "false_effect": [ - { "math": [ "u_progress_unmute_insect", "++" ] }, + { "math": [ "u_progress_unmute_insect++" ] }, { "u_message": "You have all these new moving parts in your not-mouth, but they are struggling under the strain you put them under." } @@ -149,7 +149,7 @@ { "u_forget_recipe": "prac_unmute_slime" } ], "false_effect": [ - { "math": [ "u_progress_unmute_slime", "++" ] }, + { "math": [ "u_progress_unmute_slime++" ] }, { "u_message": "Do you need teeth, lungs? You fall back into your resting shape in exasperation. This will take long." } diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json index 5a6e495f90383..15fefe7721797 100644 --- a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json @@ -242,7 +242,7 @@ { "remove_active_mission": "MISSION_INVESTIGATE_PORTAL_DUNGEON" }, { "remove_active_mission": "MISSION_INVESTIGATE_PORTAL_STORM_CENTER" }, { "alter_timed_events": "portal_dungeon_entrance" }, - { "math": [ "u_counter_portal_storm_counter", "++" ] }, + { "math": [ "u_counter_portal_storm_counter++" ] }, { "math": [ "talked_to_storm = 0" ] }, { "trigger_event": "u_var_changed", @@ -275,9 +275,9 @@ "id": "EOC_PORTAL_EXPAND", "condition": { "math": [ "portal_storm_distance != 0" ] }, "effect": [ - { "math": [ "portal_storm_distant_distance", "++" ] }, - { "math": [ "portal_storm_close_distance", "++" ] }, - { "math": [ "portal_storm_distance", "++" ] } + { "math": [ "portal_storm_distant_distance++" ] }, + { "math": [ "portal_storm_close_distance++" ] }, + { "math": [ "portal_storm_distance++" ] } ], "false_effect": [ { "math": [ "portal_storm_distant_distance = 201" ] }, @@ -379,7 +379,7 @@ "or": [ { "is_weather": "distant_portal_storm" }, { "is_weather": "near_portal_storm" }, { "is_weather": "portal_storm" } ] } }, - "effect": [ { "math": [ "u_ire", "++" ] }, { "u_message": "PORTAL_STORM_WITNESSED", "snippet": true } ] + "effect": [ { "math": [ "u_ire++" ] }, { "u_message": "PORTAL_STORM_WITNESSED", "snippet": true } ] }, { "type": "effect_on_condition", @@ -974,7 +974,7 @@ "type": "effect_on_condition", "id": "EOC_PORTAL_STORM_DUNGEON_NEXT_LEVEL", "effect": [ - { "math": [ "portal_dungeon_level", "++" ] }, + { "math": [ "portal_dungeon_level++" ] }, { "mapgen_update": "portal_dungeon_cleanup", "target_var": { "global_val": "dungeon_loc" } }, { "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true }, { "run_eocs": [ "EOC_PORTAL_STORM_DUNGEON_REFLECTION_SPAWN", "capture_generic_nre_anomaly" ] }, @@ -1276,7 +1276,7 @@ } }, "effect": [ - { "math": [ "u_portal_storm_record", "++" ] }, + { "math": [ "u_portal_storm_record++" ] }, { "run_eocs": [ { @@ -1315,10 +1315,7 @@ "id": "capture_generic_nre_anomaly", "global": true, "condition": { "u_has_items": { "item": "nre_recorder", "charges": 1 } }, - "effect": [ - { "math": [ "u_generic_nre_anomaly", "++" ] }, - { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } - ] + "effect": [ { "math": [ "u_generic_nre_anomaly++" ] }, { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } ] }, { "type": "effect_on_condition", @@ -1352,10 +1349,7 @@ } ] }, - "effect": [ - { "math": [ "u_generic_nre_anomaly", "++" ] }, - { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } - ] + "effect": [ { "math": [ "u_generic_nre_anomaly++" ] }, { "u_message": "The NRE recorder emits a sharp beep!", "type": "info" } ] }, { "type": "effect_on_condition", diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json index 4a481724cbc1a..fbe7e755ed627 100644 --- a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json @@ -201,7 +201,7 @@ "case": 1, "effect": [ { "u_message": "Vitrifaction_Ambient_1", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 3, "max_bonus": 50 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -210,7 +210,7 @@ "case": 2, "effect": [ { "u_message": "Vitrifaction_Ambient_2", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 5, "max_bonus": 99 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -219,7 +219,7 @@ "case": 3, "effect": [ { "u_message": "Vitrifaction_Ambient_3", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 7, "max_bonus": 99 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -228,7 +228,7 @@ "case": 4, "effect": [ { "u_message": "Vitrifaction_Ambient_4", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 10, "max_bonus": 99 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -237,7 +237,7 @@ "case": 5, "effect": [ { "u_message": "Vitrifaction_Ambient_5", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 15, "max_bonus": 99 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -246,7 +246,7 @@ "case": 6, "effect": [ { "u_message": "Vitrifaction_Ambient_6", "snippet": true, "type": "good" }, - { "math": [ "u_vitri_glassed", "++" ] }, + { "math": [ "u_vitri_glassed++" ] }, { "u_add_morale": "morale_vitri_placid", "bonus": 20, "max_bonus": 99 }, { "run_eocs": "EOC_queue_vitrified_int_drain" } ] @@ -295,7 +295,7 @@ "id": "EOC_vitrified_int_drain", "condition": { "and": [ { "x_in_y_chance": { "x": 1, "y": 2 } }, { "math": [ "u_vitri_glassed >= 5" ] } ] }, "effect": [ - { "math": [ "u_vitri_vitrified", "++" ] }, + { "math": [ "u_vitri_vitrified++" ] }, { "u_add_effect": "VITRIFYING", "duration": "PERMANENT", "intensity": { "math": [ "u_vitri_vitrified" ] } }, { "math": [ "u_vitri_glassed = 0" ] } ] diff --git a/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json b/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json index f490ff60fa508..f7134d4692dcf 100644 --- a/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json @@ -153,7 +153,7 @@ }, "effect": [ { "u_spawn_npc": "hells_raiders_assassin", "real_count": 1, "min_radius": 15, "max_radius": 25 }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json index 6c7434e48f664..cb4e0006d6180 100644 --- a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json @@ -434,7 +434,7 @@ "deactivate_condition": { "math": [ "isherwood_luke_truck_status > 1" ] }, "effect": [ { "mapgen_update": "LUKE_REMOVE_TRUCK", "om_terrain": "trailhead_shack_z0" }, - { "math": [ "isherwood_luke_truck_status", "++" ] } + { "math": [ "isherwood_luke_truck_status++" ] } ], "false_effect": [ { "run_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] }, diff --git a/data/json/furniture_and_terrain/terrain-traps.json b/data/json/furniture_and_terrain/terrain-traps.json index 401916ba2639f..a67c740900207 100644 --- a/data/json/furniture_and_terrain/terrain-traps.json +++ b/data/json/furniture_and_terrain/terrain-traps.json @@ -140,7 +140,7 @@ "and": [ { "u_has_items": { "item": "human_sample", "count": 1 } }, { "u_has_mission": "BEM_human_sample_mission" } ] }, "effect": [ - { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed", "++" ] }, + { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed++" ] }, { "u_message": "You prepare the drop as instructed", "popup": true }, { "u_consume_item": "human_sample", "count": 1 }, { "finish_mission": "BEM_human_sample_mission", "success": true } diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 7c4ed25576bea..a51373785f617 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -1339,7 +1339,7 @@ "condition": { "not": { "one_in_chance": 3 } }, "effect": [ { "u_message": "You have a slight feeling of being watched." }, - { "math": [ "u_migo_interest_interest_migo_interest", "++" ] } + { "math": [ "u_migo_interest_interest_migo_interest++" ] } ] }, { diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 1070e56799617..3d8de1f502ced 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -702,7 +702,7 @@ ], "false_effect": [ { "math": [ "u_pain()", "+=", "3" ] }, - { "math": [ "u_madness", "++" ] }, + { "math": [ "u_madness++" ] }, { "u_message": "You can't look away from the impossible shape, staring at it is making you feel sick, you have to get away!" } @@ -910,7 +910,7 @@ "effect": [ { "u_message": "Your reflection uses your bond to feast on your essence." }, { "math": [ "u_val('sleepiness') = min(u_val('sleepiness') + portal_dungeon_reflect_strength, 1200)" ] }, - { "math": [ "portal_dungeon_reflect_strength", "++" ] } + { "math": [ "portal_dungeon_reflect_strength++" ] } ] }, { diff --git a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json index 31d43813be0e1..55a34c85ca94e 100644 --- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json +++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json @@ -134,7 +134,7 @@ { "npc_at_om_location": "lighthouse_ground" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] } + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] } }, { "text": "Yes. First floor is clear.", @@ -146,7 +146,7 @@ { "npc_at_om_location": "lighthouse_z1" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] } + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] } }, { "text": "Yes. Second floor is clear.", @@ -158,7 +158,7 @@ { "npc_at_om_location": "lighthouse_z2" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] } + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] } }, { "text": "Yes. Third floor is clear.", @@ -170,7 +170,7 @@ { "npc_at_om_location": "lighthouse_z3" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] } + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] } }, { "text": "Yes. Fourth floor is clear.", @@ -182,7 +182,7 @@ { "npc_at_om_location": "lighthouse_z4" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] } + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] } }, { "text": "Yes. Top floor is clear.", @@ -193,7 +193,7 @@ { "npc_at_om_location": "lighthouse_z5" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }, + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] }, "topic": "TALK_lighthouse_man_cleaned_done" }, { @@ -205,7 +205,7 @@ { "npc_at_om_location": "lighthouse_ground" } ] }, - "effect": { "math": [ "n_count_cleaning_lighthouse_man", "++" ] }, + "effect": { "math": [ "n_count_cleaning_lighthouse_man++" ] }, "topic": "TALK_MISSION_INQUIRE" }, { "text": "Not yet.", "topic": "TALK_DONE" } diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json index 8a71626d94c11..0a1a51624a96e 100644 --- a/data/json/npcs/TALK_TEST.json +++ b/data/json/npcs/TALK_TEST.json @@ -875,7 +875,7 @@ { "text": "This is a math test response that increments by 1.", "topic": "TALK_DONE", - "effect": { "math": [ "u_test_var_compare_test_test", "++" ] } + "effect": { "math": [ "u_test_var_compare_test_test++" ] } }, { "text": "This is an math test response that increments by 2.", diff --git a/data/json/npcs/computers/TALK_MSU14.json b/data/json/npcs/computers/TALK_MSU14.json index 122b11f65fdbd..db73904fd3d88 100644 --- a/data/json/npcs/computers/TALK_MSU14.json +++ b/data/json/npcs/computers/TALK_MSU14.json @@ -114,7 +114,7 @@ "effect": [ { "run_eocs": [ "capture_generic_nre_anomaly" ] }, { "u_spawn_item": "melchior_science_doc", "count": 1 }, - { "math": [ "u_counter_robofac_knowledge_dimensional_heuristics", "++" ] } + { "math": [ "u_counter_robofac_knowledge_dimensional_heuristics++" ] } ], "topic": "TALK_DONE" } diff --git a/data/json/npcs/godco/members/NPC_Katherine_Weaver.json b/data/json/npcs/godco/members/NPC_Katherine_Weaver.json index 7ba627959bd11..d4886c44c2785 100644 --- a/data/json/npcs/godco/members/NPC_Katherine_Weaver.json +++ b/data/json/npcs/godco/members/NPC_Katherine_Weaver.json @@ -321,7 +321,7 @@ "type": "talk_topic", "id": "TALK_GODCO_Katherine_Angry_Pressed", "dynamic_line": "&Katherine scowls with anger at you. \"This is the exact reason I don't want to talk to you, now go away!\"", - "speaker_effect": [ { "effect": { "math": [ "n_npc_anger()", "++" ] } } ], + "speaker_effect": [ { "effect": { "math": [ "n_npc_anger()++" ] } } ], "responses": [ { "text": "Fuck's sake , I'm leaving!", "topic": "TALK_DONE" } ] } ] diff --git a/data/json/npcs/godco/shared_effects.json b/data/json/npcs/godco/shared_effects.json index 5eeafd15a3267..873c4bd554fa5 100644 --- a/data/json/npcs/godco/shared_effects.json +++ b/data/json/npcs/godco/shared_effects.json @@ -29,10 +29,7 @@ { "//": "Just coming and saying hi regularly will give you a small boost to value.", "condition": { "not": { "npc_has_effect": "npc_value_interaction_timer_short" } }, - "effect": [ - { "npc_add_effect": "npc_value_interaction_timer_short", "duration": "30 hours" }, - { "math": [ "n_npc_value()", "++" ] } - ] + "effect": [ { "npc_add_effect": "npc_value_interaction_timer_short", "duration": "30 hours" }, { "math": [ "n_npc_value()++" ] } ] } ], "responses": [ diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index 7d66c1e41b0e7..580da0df6fd26 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -414,7 +414,7 @@ "effect": [ { "math": [ "isherwood_family_coming = 0" ] }, { "run_eocs": "isherwood_mission_initialization_eoc" }, - { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } + { "math": [ "npc_isherwood_barry_rescue_attempts++" ] } ], "topic": "TALK_DONE" }, @@ -450,7 +450,7 @@ "effect": [ { "math": [ "isherwood_family_coming = 0" ] }, { "run_eocs": "isherwood_mission_initialization_eoc" }, - { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } + { "math": [ "npc_isherwood_barry_rescue_attempts++" ] } ], "topic": "TALK_DONE" } @@ -479,7 +479,7 @@ { "math": [ "isherwood_family_coming = 0" ] }, { "run_eocs": "isherwood_mission_lisa_coming", "time_in_future": "1 hour" }, { "run_eocs": "isherwood_mission_initialization_eoc" }, - { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } + { "math": [ "npc_isherwood_barry_rescue_attempts++" ] } ], "topic": "TALK_DONE" }, @@ -574,7 +574,7 @@ "effect": [ { "math": [ "isherwood_family_coming = 1" ] }, { "run_eocs": "isherwood_mission_initialization_eoc" }, - { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } + { "math": [ "npc_isherwood_barry_rescue_attempts++" ] } ], "topic": "TALK_DONE" }, @@ -637,25 +637,25 @@ { "text": "[5 Riot Armor] I've got enough riot armor for everyone.", "condition": { "and": [ { "u_has_item": "armor_riot" }, { "math": [ "isherwood_gear_retrival_armor_body_count < 5" ] } ] }, - "effect": [ { "u_consume_item": "armor_riot" }, { "math": [ "isherwood_gear_retrival_armor_body_count", "++" ] } ], + "effect": [ { "u_consume_item": "armor_riot" }, { "math": [ "isherwood_gear_retrival_armor_body_count++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { "text": "[5 Riot Helmet] These crowd control helmets should help a lot.", "condition": { "and": [ { "u_has_item": "helmet_riot" }, { "math": [ "isherwood_gear_retrival_helmet_count < 5" ] } ] }, - "effect": [ { "u_consume_item": "helmet_riot" }, { "math": [ "isherwood_gear_retrival_helmet_count", "++" ] } ], + "effect": [ { "u_consume_item": "helmet_riot" }, { "math": [ "isherwood_gear_retrival_helmet_count++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { "text": "[5 Riot Arm Guard] I hope these armguards won't interfere with people's aim.", "condition": { "and": [ { "u_has_item": "armor_riot_arm" }, { "math": [ "isherwood_gear_retrival_armor_arm_count < 5" ] } ] }, - "effect": [ { "u_consume_item": "armor_riot_arm" }, { "math": [ "isherwood_gear_retrival_armor_arm_count", "++" ] } ], + "effect": [ { "u_consume_item": "armor_riot_arm" }, { "math": [ "isherwood_gear_retrival_armor_arm_count++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { "text": "[5 Riot Leg Guard] I've got these leg guards to keep people from getting hobbled.", "condition": { "and": [ { "u_has_item": "armor_riot_leg" }, { "math": [ "isherwood_gear_retrival_armor_leg_count < 5" ] } ] }, - "effect": [ { "u_consume_item": "armor_riot_leg" }, { "math": [ "isherwood_gear_retrival_armor_leg_count", "++" ] } ], + "effect": [ { "u_consume_item": "armor_riot_leg" }, { "math": [ "isherwood_gear_retrival_armor_leg_count++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { @@ -765,7 +765,7 @@ "responses": [ { "text": "All right. Let's kick some alien butt.", - "effect": [ { "run_eocs": "isherwood_mission_initialization_eoc" }, { "math": [ "npc_isherwood_barry_rescue_attempts", "++" ] } ], + "effect": [ { "run_eocs": "isherwood_mission_initialization_eoc" }, { "math": [ "npc_isherwood_barry_rescue_attempts++" ] } ], "topic": "TALK_DONE" }, { @@ -848,7 +848,7 @@ "end": { "effect": [ { "run_eocs": "isherwood_mission_wall_finished", "time_in_future": "24 hours" }, - { "math": [ "isherwood_wall_status", "++" ] } + { "math": [ "isherwood_wall_status++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 376199e529f7e..8a21e7a0ceb8c 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -548,7 +548,7 @@ "place_vehicles": [ { "vehicle": "truck_trailer_explosives", "chance": 100, "rotation": 270, "x": [ 7 ], "y": [ 7 ] } ] } }, - "end": { "effect": [ { "math": [ "isherwood_luke_truck_coming", "++" ] } ] }, + "end": { "effect": [ { "math": [ "isherwood_luke_truck_coming++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], "//2": "Dialogue for this mission is handled externally.", "dialogue": { diff --git a/data/json/npcs/random_encounters/john_bailey.json b/data/json/npcs/random_encounters/john_bailey.json index 09a0ea83a3765..24685d179965a 100644 --- a/data/json/npcs/random_encounters/john_bailey.json +++ b/data/json/npcs/random_encounters/john_bailey.json @@ -574,7 +574,7 @@ "text": "Sure, let's talk trade.", "topic": "TALK_TRAIN", "condition": { "math": [ "npc_John_Bailey_taught <= 3" ] }, - "effect": { "math": [ "npc_John_Bailey_taught", "++" ] } + "effect": { "math": [ "npc_John_Bailey_taught++" ] } }, { "text": "I'll bear that in mind. What did you say you were doing here?", "topic": "TALK_RC_John_Bailey_2" }, { "text": "Thanks, I'll think about it. ", "topic": "TALK_NONE" }, diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json index 6e31aecd5cb38..b1022f408a910 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json @@ -408,8 +408,8 @@ "//": "todo2: migrate u refugee happiness to global", "end": { "effect": [ - { "math": [ "dave_castle_stage", "++" ] }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] }, + { "math": [ "dave_castle_stage++" ] }, + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] }, { "mapgen_update": "refcenter_unlock_roofstairs", "om_terrain": "evac_center_13" }, { "mapgen_update": "beggar_2_remove_lobbycardboard", "om_terrain": "evac_center_18" } ] diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json index e53f00b8becb1..0c230b90562a1 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json @@ -258,7 +258,7 @@ "topic": "TALK_REFUGEE_Alonso_CalledOut3", "effect": [ { "npc_add_var": "general_none_Alonso_accent", "value": "accepted" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] }, { "text": "", "topic": "TALK_NONE" }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index 6ab68e4e681f0..abca854b8bea2 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -496,7 +496,7 @@ "responses": [ { "text": "Good to hear. I'm sure everyone will appreciate that place being cleaned up.", "topic": "TALK_DONE" } ], "speaker_effect": { "effect": [ - { "math": [ "u_mission_cleanup_promises_Boris_mission_1", "++" ] }, + { "math": [ "u_mission_cleanup_promises_Boris_mission_1++" ] }, { "npc_add_var": "mission_Boris_mission_1_cleanup_asked", "value": "yes" } ] } diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json index 60400e09bbf88..4bd067f2db293 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json @@ -305,7 +305,7 @@ "effect": [ { "u_spawn_item": "FMCNote", "count": 5 }, { "u_add_var": "mission_flag_Fatima_Mission1", "value": "yes" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } } diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json index cad748809d8fe..6483dafd04bbf 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json @@ -619,7 +619,7 @@ "effect": [ { "u_spawn_item": "FMCNote", "count": 4 }, { "u_add_var": "mission_completed_Jenny_mission_2", "value": "yes" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } }, @@ -649,7 +649,7 @@ "effect": [ { "u_spawn_item": "FMCNote", "count": 5 }, { "u_add_var": "mission_completed_Jenny_mission_2", "value": "yes" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } }, @@ -680,7 +680,7 @@ { "u_spawn_item": "FMCNote", "count": 5 }, { "u_add_var": "mission_completed_Jenny_mission_3", "value": "yes" }, { "math": [ "n_timer_flag_Jenny_project_timer = time('now')" ] }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } } diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json index eea127f4724da..f08f70908ed05 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json @@ -293,7 +293,7 @@ "effect": [ { "u_spawn_item": "FMCNote", "count": 8 }, { "u_add_var": "mission_flag_Uyen_Mission1", "value": "yes" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } }, @@ -325,7 +325,7 @@ "effect": [ { "u_spawn_item": "FMCNote", "count": 7 }, { "u_add_var": "mission_flag_Uyen_Mission2", "value": "yes" }, - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] } + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] } ] } }, diff --git a/data/json/npcs/refugee_center/surface_refugees/shared_dialogue.json b/data/json/npcs/refugee_center/surface_refugees/shared_dialogue.json index 78ec529fb3a6b..4e073acbbad17 100644 --- a/data/json/npcs/refugee_center/surface_refugees/shared_dialogue.json +++ b/data/json/npcs/refugee_center/surface_refugees/shared_dialogue.json @@ -34,7 +34,7 @@ "speaker_effect": { "effect": [ { "npc_add_var": "mission_Boris_mission_1_cleanup_asked", "value": "yes" }, - { "math": [ "u_mission_cleanup_promises_Boris_mission_1", "++" ] } + { "math": [ "u_mission_cleanup_promises_Boris_mission_1++" ] } ] }, "responses": [ diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json index 5f52cb57f3a60..32b426f9f56d8 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json @@ -292,7 +292,7 @@ "speaker_effect": { "effect": [ { "npc_add_var": "mission_Boris_mission_1_cleanup_asked", "value": "yes" }, - { "math": [ "u_mission_cleanup_promises_Boris_mission_1", "++" ] } + { "math": [ "u_mission_cleanup_promises_Boris_mission_1++" ] } ] }, "responses": [ diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json index cb274ef607e7a..6ff5a05a5c9a6 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json @@ -342,7 +342,7 @@ "text": "[5 merch] Five merch for someone sounds fair to me.", "condition": { "u_has_items": { "item": "FMCNote", "count": 5 } }, "effect": [ - { "math": [ "u_mission_cleanup_promises_Boris_mission_1", "++" ] }, + { "math": [ "u_mission_cleanup_promises_Boris_mission_1++" ] }, { "npc_add_var": "mission_Boris_mission_1_cleanup_asked", "value": "yes" }, { "u_consume_item": "FMCNote", "count": 5, "popup": true } ], diff --git a/data/json/npcs/robofac/NPC_Cranberry_Foster.json b/data/json/npcs/robofac/NPC_Cranberry_Foster.json index fdb5ab1853fa2..3cc9e0970b017 100644 --- a/data/json/npcs/robofac/NPC_Cranberry_Foster.json +++ b/data/json/npcs/robofac/NPC_Cranberry_Foster.json @@ -697,8 +697,8 @@ "effect": [ { "u_consume_item": "gold_small", "count": 200 }, { "u_spawn_item": "RobofacCoin", "count": 8 }, - { "math": [ "n_npc_trust()", "++" ] }, - { "math": [ "n_npc_value()", "++" ] } + { "math": [ "n_npc_trust()++" ] }, + { "math": [ "n_npc_value()++" ] } ], "topic": "TALK_ROBOFAC_MERC_1_GOLD_MISSION_TRADE" }, @@ -768,7 +768,7 @@ "end": { "effect": [ "stop_following", - { "math": [ "u_favor_owed_to_u_robofac_merc_1_favor", "++" ] }, + { "math": [ "u_favor_owed_to_u_robofac_merc_1_favor++" ] }, { "npc_lose_var": "general_robofac_merc_1_temporal_follower" }, { "u_add_var": "general_robofac_merc_1_helped_with_missions", "value": "yes" }, { "math": [ "n_npc_trust()", "+=", "2" ] }, diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index 29147a9e1e25f..761a861cbc6a4 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -246,7 +246,7 @@ "monster": { "M": { "monster": "mon_robofac_prototype" } } } }, - "end": { "effect": { "math": [ "u_hub01_completed_missions", "++" ] } }, + "end": { "effect": { "math": [ "u_hub01_completed_missions++" ] } }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { @@ -367,7 +367,7 @@ "effect": [ { "u_spawn_item": "RobofacCoin", "count": 4 }, { "u_add_var": "dialogue_intercom_completed_robofac_intercom_2", "value": "yes" }, - { "math": [ "u_hub01_completed_missions", "++" ] } + { "math": [ "u_hub01_completed_missions++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], @@ -464,7 +464,7 @@ "effect": [ { "u_spawn_item": "RobofacCoin", "count": 8 }, { "u_add_var": "dialogue_intercom_completed_robofac_intercom_3", "value": "yes" }, - { "math": [ "u_hub01_completed_missions", "++" ] } + { "math": [ "u_hub01_completed_missions++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], @@ -708,7 +708,7 @@ "end": { "effect": [ { "u_add_var": "dialogue_intercom_completed_robofac_intercom_robot_sm_1", "value": "yes" }, - { "math": [ "u_hub01_completed_missions", "++" ] } + { "math": [ "u_hub01_completed_missions++" ] } ] }, "fail": { "effect": [ { "u_add_var": "dialogue_intercom_completed_robofac_intercom_robot_sm_1", "value": "no" } ] }, @@ -819,7 +819,7 @@ "end": { "effect": [ { "u_add_var": "dialogue_intercom_completed_robofac_intercom_portal_sm_1", "value": "yes" }, - { "math": [ "u_hub01_completed_missions", "++" ] } + { "math": [ "u_hub01_completed_missions++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], @@ -919,7 +919,7 @@ "effect": [ { "u_spawn_item": "RobofacCoin", "count": 5 }, { "u_add_var": "dialogue_intercom_completed_robofac_intercom_lixa_sm_1", "value": "yes" }, - { "math": [ "u_hub01_completed_missions", "++" ] } + { "math": [ "u_hub01_completed_missions++" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 6654ddb83529a..304ee0f28cb0c 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -58,7 +58,7 @@ "condition": { "u_has_items": { "item": "nre_anomaly_printout_data", "count": 1 } }, "effect": [ { "u_consume_item": "nre_anomaly_printout_data", "count": 1, "popup": true }, - { "math": [ "u_portal_storm_recordings_sold", "++" ] }, + { "math": [ "u_portal_storm_recordings_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 10 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_PORTAL_STORM_DATA_Large" @@ -68,7 +68,7 @@ "condition": { "u_has_items": { "item": "large_printout_portal_storm_data", "count": 1 } }, "effect": [ { "u_consume_item": "large_printout_portal_storm_data", "count": 1, "popup": true }, - { "math": [ "u_portal_storm_recordings_sold", "++" ] }, + { "math": [ "u_portal_storm_recordings_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 18 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_PORTAL_STORM_DATA_Large" @@ -83,8 +83,8 @@ }, "effect": [ { "u_consume_item": "medium_printout_portal_storm_data", "count": 1, "popup": true }, - { "math": [ "portal_storm_medium_data_sold", "++" ] }, - { "math": [ "u_portal_storm_recordings_sold", "++" ] }, + { "math": [ "portal_storm_medium_data_sold++" ] }, + { "math": [ "u_portal_storm_recordings_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 5 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_PORTAL_STORM_DATA_Medium" @@ -100,8 +100,8 @@ }, "effect": [ { "u_consume_item": "small_printout_portal_storm_data", "count": 1, "popup": true }, - { "math": [ "portal_storm_small_data_sold", "++" ] }, - { "math": [ "u_portal_storm_recordings_sold", "++" ] }, + { "math": [ "portal_storm_small_data_sold++" ] }, + { "math": [ "u_portal_storm_recordings_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 1 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_PORTAL_STORM_DATA_Small" @@ -255,7 +255,7 @@ "condition": { "u_has_items": { "item": "broken_yrax_trifacet", "count": 1 } }, "effect": [ { "u_consume_item": "broken_yrax_trifacet", "count": 1, "popup": true }, - { "math": [ "u_broken_yrax_trifacet_sold", "++" ] }, + { "math": [ "u_broken_yrax_trifacet_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 1 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_YRAX_TRIFACET" @@ -265,7 +265,7 @@ "condition": { "and": [ { "u_has_items": { "item": "broken_yrax_triakis", "count": 1 } } ] }, "effect": [ { "u_consume_item": "broken_yrax_triakis", "count": 1, "popup": true }, - { "math": [ "u_broken_yrax_triakis_sold", "++" ] }, + { "math": [ "u_broken_yrax_triakis_sold++" ] }, { "u_spend_cash": -1000 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_YRAX_TRIAKIS" @@ -275,7 +275,7 @@ "condition": { "and": [ { "u_has_items": { "item": "broken_golden_monolith", "count": 1 } } ] }, "effect": [ { "u_consume_item": "broken_golden_monolith", "count": 1, "popup": true }, - { "math": [ "u_broken_golden_monolith_sold", "++" ] }, + { "math": [ "u_broken_golden_monolith_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 7 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_GOLDEN_MONOLITH" @@ -285,7 +285,7 @@ "condition": { "and": [ { "u_has_items": { "item": "broken_yrax_delta", "count": 1 } } ] }, "effect": [ { "u_consume_item": "broken_yrax_delta", "count": 1, "popup": true }, - { "math": [ "u_broken_yrax_delta_sold", "++" ] }, + { "math": [ "u_broken_yrax_delta_sold++" ] }, { "u_spend_cash": -200 } ], "topic": "TALK_ROBOFAC_INTERCOM_BROKEN_YRAX_DELTA" @@ -295,7 +295,7 @@ "condition": { "u_has_items": { "item": "broken_yrax_quadraphract_leg", "count": 1 } }, "effect": [ { "u_consume_item": "broken_yrax_quadraphract_leg", "count": 1, "popup": true }, - { "math": [ "u_broken_yrax_quadraphract_leg_sold", "++" ] }, + { "math": [ "u_broken_yrax_quadraphract_leg_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 5 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_YRAX_QUADRAPHRACT_LEG" @@ -305,7 +305,7 @@ "condition": { "u_has_items": { "item": "broken_yrax_quadraphract", "count": 1 } }, "effect": [ { "u_consume_item": "broken_yrax_quadraphract", "count": 1, "popup": true }, - { "math": [ "u_broken_yrax_quadraphract_sold", "++" ] }, + { "math": [ "u_broken_yrax_quadraphract_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 25 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_YRAX_QUADRAPHRACT" @@ -315,7 +315,7 @@ "condition": { "u_has_items": { "item": "bot_yrax_trifacet", "count": 1 } }, "effect": [ { "u_consume_item": "bot_yrax_trifacet", "count": 1, "popup": true }, - { "math": [ "u_bot_yrax_trifacet_sold", "++" ] }, + { "math": [ "u_bot_yrax_trifacet_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 2 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BOT_YRAX_TRIFACET" @@ -325,7 +325,7 @@ "condition": { "u_has_items": { "item": "bot_yrax_triakis", "count": 1 } }, "effect": [ { "u_consume_item": "bot_yrax_triakis", "count": 1, "popup": true }, - { "math": [ "u_bot_yrax_triakis_sold", "++" ] }, + { "math": [ "u_bot_yrax_triakis_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 1 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BOT_YRAX_TRIAKIS" @@ -335,7 +335,7 @@ "condition": { "u_has_items": { "item": "bot_golden_monolith", "count": 1 } }, "effect": [ { "u_consume_item": "bot_golden_monolith", "count": 1, "popup": true }, - { "math": [ "u_bot_golden_monolith_sold", "++" ] }, + { "math": [ "u_bot_golden_monolith_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 16 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BOT_GOLDEN_MONOLITH" @@ -345,7 +345,7 @@ "condition": { "u_has_items": { "item": "bot_yrax_delta", "count": 1 } }, "effect": [ { "u_consume_item": "bot_yrax_delta", "count": 1, "popup": true }, - { "math": [ "u_bot_yrax_delta_sold", "++" ] }, + { "math": [ "u_bot_yrax_delta_sold++" ] }, { "u_spawn_item": "RobofacCoin", "count": 1 } ], "topic": "TALK_ROBOFAC_INTERCOM_SELL_BOT_YRAX_DELTA" diff --git a/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json b/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json index ec07e9e4ef03f..88710ab29f262 100644 --- a/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json +++ b/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json @@ -3,7 +3,7 @@ "id": "EOC_Nunez_Travel_To_Tacoma", "type": "effect_on_condition", "effect": [ - { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] }, + { "math": [ "u_counter_refugee_center_refugee_happiness++" ] }, { "mapgen_update": "tacoma_nunez_trailer_arrive", "om_terrain": "ranch_camp_55", From f51b1392c9bf9380fb16d4c1ff99ad6f11de4051 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:04:01 +0000 Subject: [PATCH 2/4] Change ++ to single string in /mods \",[ \n\r]+\"\+\+\" to ++" --- .../mods/Aftershock/effects_on_condition.json | 2 +- .../Aftershock/items/armor/energy_shield.json | 2 +- .../electrokinesis_concentration_eocs.json | 2 +- .../BombasticPerks/corefiles/core_eocs.json | 2 +- .../Defense_Mode/dialogue/menu_screen.json | 2 +- .../effects_on_condition/wave_eocs.json | 2 +- .../bombastic_perks/perks.json | 2 +- .../EOC/danger_clock_eoc.json | 2 +- .../Isolation-Protocol/EOC/elevator_eoc.json | 2 +- .../mutation_eocs/limb_changing_eocs.json | 8 +-- .../eoc_premonition_instances.json | 12 ++-- .../defense_mode/premonition_instances.json | 2 +- .../electrokinesis_concentration_eocs.json | 2 +- data/mods/Perk_melee/EOC/leveling.json | 2 +- data/mods/Sky_Island/EOCs.json | 10 +-- data/mods/Sky_Island/missions_and_mapgen.json | 46 ++++++------- data/mods/Sky_Island/sickness_checks.json | 2 +- data/mods/TEST_DATA/EOC.json | 4 +- data/mods/TEST_DATA/effect_on_condition.json | 42 +++++------- .../Xedra_Evolved/enchantments/armor.json | 2 +- .../eocs/abyssal_hunger_eocs.json | 4 +- data/mods/Xedra_Evolved/eocs/dreamsmith.json | 4 +- .../Xedra_Evolved/eocs/give_a_class_eoc.json | 8 +-- .../eocs/magic_potential_eoc.json | 10 +-- data/mods/Xedra_Evolved/eocs/misc_eoc.json | 2 +- .../playable_changeling_advancement_eocs.json | 2 +- .../Xedra_Evolved/eocs/shapeshifter_eocs.json | 2 +- .../eocs/spell_learning_eoc.json | 12 ++-- .../mutations/paraclesians/ierde_eocs.json | 8 +-- .../mutations/playable_changeling_eocs.json | 2 +- .../mutations/xe_lilin_trait_eocs.json | 30 ++------- data/mods/Xedra_Evolved/npc/boann.json | 66 +++++++++---------- 32 files changed, 135 insertions(+), 165 deletions(-) diff --git a/data/mods/Aftershock/effects_on_condition.json b/data/mods/Aftershock/effects_on_condition.json index b758c8f4294e2..d6572d643574d 100644 --- a/data/mods/Aftershock/effects_on_condition.json +++ b/data/mods/Aftershock/effects_on_condition.json @@ -38,7 +38,7 @@ } ] }, - { "math": [ "u_flag_motion_sensor_afs_motion_sensor_ping", "++" ] }, + { "math": [ "u_flag_motion_sensor_afs_motion_sensor_ping++" ] }, { "run_eocs": "afs_motion_sensor_eoc_end_ping", "time_in_future": "2 seconds" } ] }, diff --git a/data/mods/Aftershock/items/armor/energy_shield.json b/data/mods/Aftershock/items/armor/energy_shield.json index 394385217b179..cb61beaf42fb3 100644 --- a/data/mods/Aftershock/items/armor/energy_shield.json +++ b/data/mods/Aftershock/items/armor/energy_shield.json @@ -210,7 +210,7 @@ { "if": { "math": [ "u_proceed_shield", "==", "1" ] }, "then": [ - { "math": [ "n_shield_turn", "++" ] }, + { "math": [ "n_shield_turn++" ] }, { "if": { "and": [ { "math": [ "n_SHIELD_REGEN", "!=", "0" ] }, { "math": [ "n_shield_turn/n_SHIELD_REGEN_RATE", ">", "1" ] } ] diff --git a/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json b/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json index 27cb44fc35a8c..6534423d3be1c 100644 --- a/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json +++ b/data/mods/Aftershock/spells/psionics/electrokinesis_concentration_eocs.json @@ -235,7 +235,7 @@ { "id": "EOC_AFS_ELECTROKIN_PERSONAL_BATTERY_INV_SCANNER_COUNTER", "condition": { "math": [ "n_val('power') < n_val('power_max')" ] }, - "effect": [ { "math": [ "u_afs_electrokin_personal_battery_count", "++" ] } ] + "effect": [ { "math": [ "u_afs_electrokin_personal_battery_count++" ] } ] } ] }, diff --git a/data/mods/BombasticPerks/corefiles/core_eocs.json b/data/mods/BombasticPerks/corefiles/core_eocs.json index 39c06b4567cf1..fd114289c5e95 100644 --- a/data/mods/BombasticPerks/corefiles/core_eocs.json +++ b/data/mods/BombasticPerks/corefiles/core_eocs.json @@ -74,6 +74,6 @@ { "type": "effect_on_condition", "id": "EOC_give_perk_point", - "effect": [ { "math": [ "u_num_perks", "++" ] } ] + "effect": [ { "math": [ "u_num_perks++" ] } ] } ] diff --git a/data/mods/Defense_Mode/dialogue/menu_screen.json b/data/mods/Defense_Mode/dialogue/menu_screen.json index 44fd3a6e5a354..4b16427efbc62 100644 --- a/data/mods/Defense_Mode/dialogue/menu_screen.json +++ b/data/mods/Defense_Mode/dialogue/menu_screen.json @@ -474,7 +474,7 @@ "responses": [ { "text": "Increase by 1", - "effect": { "math": [ "diffulty_modifier", "++" ] }, + "effect": { "math": [ "diffulty_modifier++" ] }, "topic": "TALK_DEFENSE_MODE_CUSTOM_DIFFICULTY_MENU" }, { diff --git a/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json b/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json index b2228a8096d46..294c017181ae3 100644 --- a/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json +++ b/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json @@ -6,7 +6,7 @@ "global": true, "effect": [ { "u_teleport": { "global_val": "your_spawnpoint" } }, - { "math": [ "wave_number", "++" ] }, + { "math": [ "wave_number++" ] }, { "u_message": "Welcome to wave !", "type": "bad", "popup": false }, { "run_eocs": "DEFENSE_MODE_WAVE_SPECIAL_DECIDER" } ] diff --git a/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json b/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json index e15f0bc14f625..dc719001c6ebe 100644 --- a/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json +++ b/data/mods/Defense_Mode/mod_interactions/bombastic_perks/perks.json @@ -69,7 +69,7 @@ "points": 0, "description": "You're like a cat, and it always seemed to you like you've had nine lives. When things get rough, by pure luck or divine intervention, you can get out of it.", "category": [ "perk" ], - "processed_eocs": [ { "id": "extra_life_addup", "effect": { "math": [ "revivication_counter", "++" ] } } ] + "processed_eocs": [ { "id": "extra_life_addup", "effect": { "math": [ "revivication_counter++" ] } } ] }, { "type": "mutation", diff --git a/data/mods/Isolation-Protocol/EOC/danger_clock_eoc.json b/data/mods/Isolation-Protocol/EOC/danger_clock_eoc.json index 9f884d82811b0..5c41a4fb00f21 100644 --- a/data/mods/Isolation-Protocol/EOC/danger_clock_eoc.json +++ b/data/mods/Isolation-Protocol/EOC/danger_clock_eoc.json @@ -5,7 +5,7 @@ "recurrence": "3 minutes", "global": true, "condition": { "not": { "or": [ { "u_at_om_location": "iso_hallway_safe" }, { "u_at_om_location": "iso_elevator_safe" } ] } }, - "effect": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER", "++" ] }, { "math": [ "u_ISO_DANGER", "++" ] } ] + "effect": [ { "math": [ "u_ISO_CURRENT_LEVEL_DANGER++" ] }, { "math": [ "u_ISO_DANGER++" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json index c2847e9dc9c7e..ece5dc784edfb 100644 --- a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json +++ b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json @@ -11,7 +11,7 @@ "type": "effect_on_condition", "id": "EOC_ISO_ELEVATOR", "effect": [ - { "math": [ "ISO_CURRENT_LEVEL", "++" ] }, + { "math": [ "ISO_CURRENT_LEVEL++" ] }, { "math": [ "u_ISO_CURRENT_LEVEL_DANGER = 0" ] }, { "u_message": "The elevator starts moving before you can touch the panel.", "popup": true }, { "run_eocs": [ "EOC_ISO_DECIDE_LEVEL" ] } diff --git a/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json b/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json index a469617c529ac..f26d2bfba8bf6 100644 --- a/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json +++ b/data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json @@ -93,7 +93,7 @@ "then": [ { "u_message": "", "snippet": true }, { "u_lose_effect": "sleep" }, - { "math": [ "u_progress_pre_eyes_insect", "++" ] }, + { "math": [ "u_progress_pre_eyes_insect++" ] }, { "math": [ "u_limb_progress_timer = time('now')" ] } ], "else": [ @@ -146,7 +146,7 @@ "then": [ { "u_message": "", "snippet": true }, { "u_lose_effect": "sleep" }, - { "math": [ "u_progress_eyes_insect", "++" ] }, + { "math": [ "u_progress_eyes_insect++" ] }, { "math": [ "u_limb_progress_timer = time('now')" ] } ], "else": [ @@ -206,7 +206,7 @@ "then": [ { "u_message": "", "snippet": true, "popup": true }, { "u_lose_effect": "sleep" }, - { "math": [ "u_progress_pre_arm_feathers", "++" ] }, + { "math": [ "u_progress_pre_arm_feathers++" ] }, { "math": [ "u_limb_progress_timer = time('now')" ] } ], "else": [ @@ -265,7 +265,7 @@ "then": [ { "u_message": "", "snippet": true }, { "u_lose_effect": "sleep" }, - { "math": [ "u_progress_wings_bird", "++" ] }, + { "math": [ "u_progress_wings_bird++" ] }, { "math": [ "u_limb_progress_timer = time('now')" ] } ], "else": [ diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json index 391b1342048ef..4fd516de49715 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json @@ -157,7 +157,7 @@ "max_radius": 25, "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { @@ -172,7 +172,7 @@ "max_radius": 40, "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { @@ -231,7 +231,7 @@ "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you.", "spawn_message_plural": "Rough-looking people step out of hiding and begin rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { @@ -247,7 +247,7 @@ "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you.", "spawn_message_plural": "Rough-looking people step out of hiding and begin rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { @@ -305,7 +305,7 @@ "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you.", "spawn_message_plural": "Rough-looking people step out of hiding and begin rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { @@ -321,7 +321,7 @@ "spawn_message": "A rough-looking person steps out of hiding and begins rapidly approaching you.", "spawn_message_plural": "Rough-looking people step out of hiding and begin rapidly approaching you." }, - { "math": [ "u_bandit_assassins_sent", "++" ] } + { "math": [ "u_bandit_assassins_sent++" ] } ] }, { diff --git a/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json b/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json index 89e0ef95e76e1..b90eec61c5391 100644 --- a/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json +++ b/data/mods/MindOverMatter/mod_interactions/defense_mode/premonition_instances.json @@ -36,7 +36,7 @@ "global": true, "effect": [ { "u_teleport": { "global_val": "your_spawnpoint" } }, - { "math": [ "wave_number", "++" ] }, + { "math": [ "wave_number++" ] }, { "u_message": "Welcome to wave !", "type": "bad", "popup": false }, { "run_eocs": "DEFENSE_MODE_WAVE_SPECIAL_DECIDER" } ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json index 915b63ca571b9..a11850d424660 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json @@ -426,7 +426,7 @@ { "id": "EOC_ELECTROKIN_PERSONAL_BATTERY_GET_ITEM_COUNT_2", "condition": { "math": [ "n_val('power')", "<", "n_val('power_max')" ] }, - "effect": [ { "math": [ "u_electrokin_personal_battery_item_count", "++" ] } ] + "effect": [ { "math": [ "u_electrokin_personal_battery_item_count++" ] } ] } ] } diff --git a/data/mods/Perk_melee/EOC/leveling.json b/data/mods/Perk_melee/EOC/leveling.json index 1c6b327362330..69ec988bd0fb3 100644 --- a/data/mods/Perk_melee/EOC/leveling.json +++ b/data/mods/Perk_melee/EOC/leveling.json @@ -52,6 +52,6 @@ { "type": "effect_on_condition", "id": "EOC_give_ma_perk_point", - "effect": [ { "math": [ "u_num_ma_perks", "++" ] } ] + "effect": [ { "math": [ "u_num_ma_perks++" ] } ] } ] diff --git a/data/mods/Sky_Island/EOCs.json b/data/mods/Sky_Island/EOCs.json index a55a9c9f9742e..2a3140d0a3476 100644 --- a/data/mods/Sky_Island/EOCs.json +++ b/data/mods/Sky_Island/EOCs.json @@ -85,7 +85,7 @@ }, { "u_teleport": { "global_val": "OM_HQ_origin" }, "force": true }, { "u_remove_item_with": "warphome" }, - { "math": [ "raidstotal", "++" ] }, + { "math": [ "raidstotal++" ] }, { "u_lose_trait": "awayfromhome" }, { "u_lose_effect": "warpsickness" }, { "u_lose_effect": "warpdisintegration" }, @@ -199,7 +199,7 @@ "u_query": "This will teleport you back to your sky island. Any items inside the room will be teleported home alongside you. Are you ready to leave?", "default": false }, - "effect": [ { "math": [ "raidswon", "++" ] }, { "math": [ "gettokens = 1" ] }, { "run_eocs": [ "EOC_return_OM_teleport_item" ] } ] + "effect": [ { "math": [ "raidswon++" ] }, { "math": [ "gettokens = 1" ] }, { "run_eocs": [ "EOC_return_OM_teleport_item" ] } ] }, { "type": "effect_on_condition", @@ -217,7 +217,7 @@ "default": false }, "effect": [ - { "math": [ "raidswon", "++" ] }, + { "math": [ "raidswon++" ] }, { "math": [ "gettokens = 1" ] }, { "u_consume_item": "warp_vortex_token", "count": 1 }, { "run_eocs": [ "EOC_return_OM_teleport_item" ] } @@ -231,7 +231,7 @@ "u_query": "This will teleport you back to your sky island. Any items not on your person WILL BE LOST. Are you ready to leave?", "default": false }, - "effect": [ { "math": [ "raidswon", "++" ] }, { "math": [ "gettokens = 1" ] }, { "run_eocs": [ "EOC_return_OM_teleport" ] } ] + "effect": [ { "math": [ "raidswon++" ] }, { "math": [ "gettokens = 1" ] }, { "run_eocs": [ "EOC_return_OM_teleport" ] } ] }, { "type": "effect_on_condition", @@ -292,7 +292,7 @@ { "u_add_effect": "downed", "duration": 1 }, { "run_eocs": [ "EOC_death_heal" ] }, { "u_spawn_item": "corpse_painful" }, - { "math": [ "raidslost", "++" ] }, + { "math": [ "raidslost++" ] }, { "run_eocs": "EOC_return_OM_teleport", "time_in_future": "1 s" }, { "u_message": "You feel the icy grip of death begin to take you, and the world whirls and rushes past. Reality bends and at the peak of your last mortal moment, something snags you and hauls you through space and time. Your mind has been preserved, at cost, and your body is not far behind.", diff --git a/data/mods/Sky_Island/missions_and_mapgen.json b/data/mods/Sky_Island/missions_and_mapgen.json index d622f8b348bec..10280d0494fd6 100644 --- a/data/mods/Sky_Island/missions_and_mapgen.json +++ b/data/mods/Sky_Island/missions_and_mapgen.json @@ -460,7 +460,7 @@ "assign_mission_target": { "var": { "global_val": "OM_missionspot" } }, "update_mapgen": { "place_nested": [ { "chunks": [ "mx_treasuregoal" ], "x": [ 0, 13 ], "y": [ 0, 13 ] } ] } }, - "end": { "effect": [ { "run_eocs": "EOC_bonuspulse" }, { "math": [ "u_missionswon", "++" ] } ] } + "end": { "effect": [ { "run_eocs": "EOC_bonuspulse" }, { "math": [ "u_missionswon++" ] } ] } }, { "id": "MISSION_BONUS_KILL_LIGHT", @@ -480,7 +480,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 3 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -509,7 +509,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 4 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -546,7 +546,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 4 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -583,7 +583,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 5 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -628,7 +628,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 5 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -673,7 +673,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 8 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -700,7 +700,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 10 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -729,7 +729,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 10 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -766,7 +766,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 12 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -803,7 +803,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 12 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -830,7 +830,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 9 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -860,7 +860,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 12 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -885,7 +885,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 9 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -910,7 +910,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 6 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -941,7 +941,7 @@ }, "end": { "effect": [ - { "math": [ "u_missionswon", "++" ] }, + { "math": [ "u_missionswon++" ] }, { "math": [ "totalbonus = 12 + total_difficulty_bonus" ] }, { "u_message": "It's done. They're all dead. Warp shards filter in from seams in reality. Your reward rains down on you.", @@ -962,7 +962,7 @@ "monster_kill_goal": 10, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_ZED2", @@ -974,7 +974,7 @@ "monster_kill_goal": 50, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 3 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 3 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_ZED3", @@ -986,7 +986,7 @@ "monster_kill_goal": 100, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 5 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 5 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_MIGO", @@ -998,7 +998,7 @@ "monster_kill_goal": 1, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 3 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 3 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_NETHER", @@ -1010,7 +1010,7 @@ "monster_kill_goal": 3, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 4 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 4 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_BIRD", @@ -1022,7 +1022,7 @@ "monster_kill_goal": 5, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } }, { "id": "MISSION_BONUS_SLAUGHTER_MAMMAL", @@ -1034,7 +1034,7 @@ "monster_kill_goal": 5, "difficulty": 0, "value": 0, - "end": { "effect": [ { "math": [ "slaughterswon", "++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } + "end": { "effect": [ { "math": [ "slaughterswon++" ] }, { "u_spawn_item": "warptoken", "count": 1 } ] } }, { "type": "mapgen", diff --git a/data/mods/Sky_Island/sickness_checks.json b/data/mods/Sky_Island/sickness_checks.json index 4be02267a6f7a..8c75e0d19458b 100644 --- a/data/mods/Sky_Island/sickness_checks.json +++ b/data/mods/Sky_Island/sickness_checks.json @@ -7,7 +7,7 @@ "condition": { "u_has_trait": "awayfromhome" }, "deactivate_condition": { "not": { "u_has_trait": "awayfromhome" } }, "effect": [ - { "math": [ "timeawayfromhome", "++" ] }, + { "math": [ "timeawayfromhome++" ] }, { "math": [ "readablepulsesleft = 9 - timeawayfromhome" ] }, { "math": [ "readablesicknessintervals = currentpulselength / 60" ] }, { "run_eocs": [ "EOC_sicknesscheck" ] } diff --git a/data/mods/TEST_DATA/EOC.json b/data/mods/TEST_DATA/EOC.json index c70b520b0c7a0..af8444e0ce456 100644 --- a/data/mods/TEST_DATA/EOC.json +++ b/data/mods/TEST_DATA/EOC.json @@ -206,7 +206,7 @@ { "type": "effect_on_condition", "id": "EOC_until_nested", - "effect": [ { "math": [ "u_context", "++" ] }, { "math": [ "key1 = u_context" ] } ] + "effect": [ { "math": [ "u_context++" ] }, { "math": [ "key1 = u_context" ] } ] }, { "type": "effect_on_condition", @@ -592,7 +592,7 @@ "type": "effect_on_condition", "id": "EOC_increment_var", "//": "tests adding a variable to the player", - "effect": [ { "math": [ "u_activitiy_incrementer", "++" ] } ] + "effect": [ { "math": [ "u_activitiy_incrementer++" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/TEST_DATA/effect_on_condition.json b/data/mods/TEST_DATA/effect_on_condition.json index 67baea0281c22..5f33dc36880a9 100644 --- a/data/mods/TEST_DATA/effect_on_condition.json +++ b/data/mods/TEST_DATA/effect_on_condition.json @@ -51,12 +51,12 @@ { "type": "effect_on_condition", "id": "EOC_A", - "effect": [ { "math": [ "run_eocs_1", "++" ] } ] + "effect": [ { "math": [ "run_eocs_1++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_B", - "effect": [ { "math": [ "run_eocs_1", "++" ] } ] + "effect": [ { "math": [ "run_eocs_1++" ] } ] }, { "type": "effect_on_condition", @@ -67,12 +67,12 @@ { "type": "effect_on_condition", "id": "EOC_C", - "effect": [ { "math": [ "run_eocs_2", "++" ] } ] + "effect": [ { "math": [ "run_eocs_2++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_D", - "effect": [ { "math": [ "run_eocs_2", "++" ] } ] + "effect": [ { "math": [ "run_eocs_2++" ] } ] }, { "type": "effect_on_condition", @@ -83,12 +83,12 @@ { "type": "effect_on_condition", "id": "EOC_E", - "effect": [ { "math": [ "run_eocs_3", "++" ] } ] + "effect": [ { "math": [ "run_eocs_3++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_F", - "effect": [ { "math": [ "run_eocs_3", "++" ] } ] + "effect": [ { "math": [ "run_eocs_3++" ] } ] }, { "type": "effect_on_condition", @@ -99,12 +99,12 @@ { "type": "effect_on_condition", "id": "EOC_I", - "effect": [ { "math": [ "run_eocs_5", "++" ] } ] + "effect": [ { "math": [ "run_eocs_5++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_J", - "effect": [ { "math": [ "run_eocs_5", "++" ] } ] + "effect": [ { "math": [ "run_eocs_5++" ] } ] }, { "type": "effect_on_condition", @@ -168,17 +168,11 @@ "type": "effect_on_condition", "id": "EOC_compare_string_test", "effect": [ - { "if": { "compare_string": [ "yes", "yes" ] }, "then": { "math": [ "eoc_compare_string_test_1", "++" ] } }, - { "if": { "compare_string": [ "yes", "no" ] }, "else": { "math": [ "eoc_compare_string_test_2", "++" ] } }, - { - "if": { "compare_string": [ "yes", "yes", "yes" ] }, - "then": { "math": [ "eoc_compare_string_test_3", "++" ] } - }, - { - "if": { "compare_string": [ "yes", "yes", "no" ] }, - "then": { "math": [ "eoc_compare_string_test_4", "++" ] } - }, - { "if": { "compare_string": [ "yes", "no", "eh" ] }, "else": { "math": [ "eoc_compare_string_test_5", "++" ] } } + { "if": { "compare_string": [ "yes", "yes" ] }, "then": { "math": [ "eoc_compare_string_test_1++" ] } }, + { "if": { "compare_string": [ "yes", "no" ] }, "else": { "math": [ "eoc_compare_string_test_2++" ] } }, + { "if": { "compare_string": [ "yes", "yes", "yes" ] }, "then": { "math": [ "eoc_compare_string_test_3++" ] } }, + { "if": { "compare_string": [ "yes", "yes", "no" ] }, "then": { "math": [ "eoc_compare_string_test_4++" ] } }, + { "if": { "compare_string": [ "yes", "no", "eh" ] }, "else": { "math": [ "eoc_compare_string_test_5++" ] } } ] }, { @@ -187,23 +181,23 @@ "effect": [ { "if": { "compare_string_match_all": [ "yes", "yes" ] }, - "then": { "math": [ "eoc_compare_string_match_all_test_1", "++" ] } + "then": { "math": [ "eoc_compare_string_match_all_test_1++" ] } }, { "if": { "compare_string_match_all": [ "yes", "no" ] }, - "else": { "math": [ "eoc_compare_string_match_all_test_2", "++" ] } + "else": { "math": [ "eoc_compare_string_match_all_test_2++" ] } }, { "if": { "compare_string_match_all": [ "yes", "yes", "yes" ] }, - "then": { "math": [ "eoc_compare_string_match_all_test_3", "++" ] } + "then": { "math": [ "eoc_compare_string_match_all_test_3++" ] } }, { "if": { "compare_string_match_all": [ "yes", "yes", "no" ] }, - "else": { "math": [ "eoc_compare_string_match_all_test_4", "++" ] } + "else": { "math": [ "eoc_compare_string_match_all_test_4++" ] } }, { "if": { "compare_string_match_all": [ "yes", "no", "eh" ] }, - "else": { "math": [ "eoc_compare_string_match_all_test_5", "++" ] } + "else": { "math": [ "eoc_compare_string_match_all_test_5++" ] } } ] } diff --git a/data/mods/Xedra_Evolved/enchantments/armor.json b/data/mods/Xedra_Evolved/enchantments/armor.json index 7df85a9ffcec7..2327c8287c9fe 100644 --- a/data/mods/Xedra_Evolved/enchantments/armor.json +++ b/data/mods/Xedra_Evolved/enchantments/armor.json @@ -107,7 +107,7 @@ "id": "INCREASE_BERSERKER", "condition": { "u_has_items": { "item": "dreamforged_knuckle_berserk", "count": 1 } }, "deactivate_condition": { "not": { "u_has_items": { "item": "dreamforged_knuckle_berserk", "count": 1 } } }, - "effect": [ { "u_message": "BERSERK +1.", "type": "debug" }, { "math": [ "BERSERKER", "++" ] } ] + "effect": [ { "u_message": "BERSERK +1.", "type": "debug" }, { "math": [ "BERSERKER++" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json b/data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json index 3bb26cb1903d2..eed7fe5613e0a 100644 --- a/data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json @@ -41,7 +41,7 @@ "id": "EOC_ENTER_ABYSSAL_HUNGER_NEXT_LEVEL", "condition": { "math": [ "abyssal_hunger_level < 5" ] }, "effect": [ - { "math": [ "abyssal_hunger_level", "++" ] }, + { "math": [ "abyssal_hunger_level++" ] }, { "mapgen_update": "abyssal_hunger_cleanup", "target_var": { "global_val": "dungeon_loc" } }, { "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true }, { "mapgen_update": "abyssal_hunger_dungeon", "target_var": { "global_val": "dungeon_loc" } }, @@ -66,7 +66,7 @@ { "u_message": "You move through the monster's innards and reach another empty space." } ], "false_effect": [ - { "math": [ "abyssal_hunger_level", "++" ] }, + { "math": [ "abyssal_hunger_level++" ] }, { "mapgen_update": "abyssal_hunger_cleanup", "target_var": { "global_val": "dungeon_loc" } }, { "u_teleport": { "global_val": "dungeon_start" }, "fail_message": "Something is very wrong!", "force": true }, { "mapgen_update": "abyssal_hunger_brain", "target_var": { "global_val": "dungeon_loc" } }, diff --git a/data/mods/Xedra_Evolved/eocs/dreamsmith.json b/data/mods/Xedra_Evolved/eocs/dreamsmith.json index 5ebb71ec32235..8848eb1b4d6d3 100644 --- a/data/mods/Xedra_Evolved/eocs/dreamsmith.json +++ b/data/mods/Xedra_Evolved/eocs/dreamsmith.json @@ -36,9 +36,9 @@ "condition": { "and": [ { "u_has_trait": "DREAMSMITH" }, { "test_eoc": "EOC_CONDITION_BANNED_DREAM_MAGIC_TRAITS" } ] }, "effect": [ { "math": [ "DREAMSMITH_RECIPE_SCORE", "+=", "DREAMSMITH_RECIPE_SCORE_TRAINS" ] }, - { "math": [ "DREAMSMITH_RECIPE_SCORE_TRAINS", "++" ] }, + { "math": [ "DREAMSMITH_RECIPE_SCORE_TRAINS++" ] }, { "math": [ "DREAMSMITH_RECIPE_SCORE_SUPER", "+=", "DREAMSMITH_RECIPE_SCORE_TRAINS_SUPER" ] }, - { "math": [ "DREAMSMITH_RECIPE_SCORE_TRAINS_SUPER", "++" ] }, + { "math": [ "DREAMSMITH_RECIPE_SCORE_TRAINS_SUPER++" ] }, { "run_eocs": "EOC_DREAMSMITHS_RECIPES_ENCH" }, { "run_eocs": "EOC_DREAMSMITHS_RECIPES_SUPER" } ], diff --git a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json index 71cc40e0e662a..1828af00591d4 100644 --- a/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/give_a_class_eoc.json @@ -33,7 +33,7 @@ { "math": [ "inventor_dreamsmith_sequence == 0" ] } ] }, - "then": [ { "math": [ "allow_sequence = 0" ] }, { "math": [ "eater_dreamer_sequence", "++" ] } ] + "then": [ { "math": [ "allow_sequence = 0" ] }, { "math": [ "eater_dreamer_sequence++" ] } ] }, { "if": { @@ -45,7 +45,7 @@ { "math": [ "inventor_dreamsmith_sequence == 0" ] } ] }, - "then": [ { "math": [ "allow_sequence = 0" ] }, { "math": [ "inventor_dreamsmith_sequence", "++" ] } ] + "then": [ { "math": [ "allow_sequence = 0" ] }, { "math": [ "inventor_dreamsmith_sequence++" ] } ] } ] }, @@ -72,7 +72,7 @@ { "if": { "and": [ { "not": { "u_has_trait": "EATER" } }, { "not": { "u_has_trait": "DREAMER" } } ] }, "then": [ - { "math": [ "eater_dreamer_sequence", "++" ] }, + { "math": [ "eater_dreamer_sequence++" ] }, { "switch": { "math": [ "eater_dreamer_sequence" ] }, "cases": [ @@ -134,7 +134,7 @@ "required_event": "character_wakes_up", "condition": { "math": [ "inventor_dreamsmith_sequence > 0" ] }, "effect": [ - { "math": [ "inventor_dreamsmith_sequence", "++" ] }, + { "math": [ "inventor_dreamsmith_sequence++" ] }, { "if": { "and": [ { "not": { "u_has_trait": "INVENTOR" } }, { "not": { "u_has_trait": "DREAMSMITH" } } ] }, "then": [ diff --git a/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json b/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json index 04d9e9cb039c2..ca354ca74b920 100644 --- a/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/magic_potential_eoc.json @@ -7,7 +7,7 @@ { "if": { "math": [ "u_hp('ALL') / 6 == u_hp_max('torso') / 2" ] }, "then": [ - { "math": [ "magic_potential", "++" ] }, + { "math": [ "magic_potential++" ] }, { "u_message": "Got magic potential from wounds, magic_potential: ", "type": "debug" @@ -17,7 +17,7 @@ { "if": { "math": [ "u_pain() > 250" ] }, "then": [ - { "math": [ "magic_potential", "++" ] }, + { "math": [ "magic_potential++" ] }, { "u_message": "Got magic potential from pain, magic_potential: ", "type": "debug" @@ -27,7 +27,7 @@ { "if": { "math": [ "u_val('morale') < -100" ] }, "then": [ - { "math": [ "magic_potential", "++" ] }, + { "math": [ "magic_potential++" ] }, { "u_message": "Got magic potential from depression, magic_potential: ", "type": "debug" @@ -37,7 +37,7 @@ { "if": { "and": [ { "math": [ "u_counter_portal_storm_counter > 0" ] }, { "math": [ "magic_potential_from_ps == 0" ] } ] }, "then": [ - { "math": [ "magic_potential", "++" ] }, + { "math": [ "magic_potential++" ] }, { "math": [ "magic_potential_from_ps = 1" ] }, { "u_message": "Got magic potential from witnessing the portal storm, magic_potential: ", @@ -48,7 +48,7 @@ { "if": { "u_has_effect": "taint" }, "then": [ - { "math": [ "magic_potential", "++" ] }, + { "math": [ "magic_potential++" ] }, { "u_message": "Got magic potential from tainted mind, magic_potential: ", "type": "debug" diff --git a/data/mods/Xedra_Evolved/eocs/misc_eoc.json b/data/mods/Xedra_Evolved/eocs/misc_eoc.json index 817cabe9df6c5..81db753040280 100644 --- a/data/mods/Xedra_Evolved/eocs/misc_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/misc_eoc.json @@ -142,7 +142,7 @@ } }, "effect": [ - { "math": [ "u_stormwrought_blood_charge", "++" ] }, + { "math": [ "u_stormwrought_blood_charge++" ] }, { "run_eocs": [ { diff --git a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json index db0d04261b0ce..8279f21377591 100644 --- a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json @@ -16,7 +16,7 @@ } ] }, - "effect": { "math": [ "u_changeling_advancement_dreams_counter", "++" ] } + "effect": { "math": [ "u_changeling_advancement_dreams_counter++" ] } }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json index dea355e89e01e..a7e740a9e2833 100644 --- a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json @@ -139,7 +139,7 @@ "type": "effect_on_condition", "id": "EOC_WEREWOLF_HYBRID_FORM_healing", "effect": [ - { "math": [ "u_werewolf_healing_tick_counter", "++" ] }, + { "math": [ "u_werewolf_healing_tick_counter++" ] }, { "if": { "math": [ "u_werewolf_healing_tick_counter >= 6" ] }, "then": [ diff --git a/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json b/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json index 61594eff38b1b..16f83374fe508 100644 --- a/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json @@ -33,7 +33,7 @@ { "if": { "and": [ { "u_has_trait": "EATER" }, { "compare_string": [ "EATER", { "context_val": "school" } ] } ] }, "then": [ - { "math": [ "xe_eater_leveling", "++" ] }, + { "math": [ "xe_eater_leveling++" ] }, { "u_message": "Got a new level for eater, xe_eater_leveling: ", "type": "debug" @@ -43,7 +43,7 @@ { "if": { "and": [ { "u_has_trait": "DREAMER" }, { "compare_string": [ "DREAMER", { "context_val": "school" } ] } ] }, "then": [ - { "math": [ "xe_dreamer_leveling", "++" ] }, + { "math": [ "xe_dreamer_leveling++" ] }, { "u_message": "Got a new level for dreamer, xe_dreamer_leveling: ", "type": "debug" @@ -175,25 +175,25 @@ { "type": "effect_on_condition", "id": "EOC_XE_GIVE_SPELL_1", - "effect": [ { "math": [ "u_spell_level(_xe_spell_1)", "++" ] } ] + "effect": [ { "math": [ "u_spell_level(_xe_spell_1)++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_XE_GIVE_SPELL_2", "condition": { "math": [ "u_skill('deduction') >= 3" ] }, - "effect": [ { "math": [ "u_spell_level(_xe_spell_2)", "++" ] } ] + "effect": [ { "math": [ "u_spell_level(_xe_spell_2)++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_XE_GIVE_SPELL_3", "condition": { "math": [ "u_skill('deduction') >= 6" ] }, - "effect": [ { "math": [ "u_spell_level(_xe_spell_3)", "++" ] } ] + "effect": [ { "math": [ "u_spell_level(_xe_spell_3)++" ] } ] }, { "type": "effect_on_condition", "id": "EOC_XE_GIVE_SPELL_4", "condition": { "math": [ "u_skill('deduction') >= 8" ] }, - "effect": [ { "math": [ "u_spell_level(_xe_spell_4)", "++" ] } ] + "effect": [ { "math": [ "u_spell_level(_xe_spell_4)++" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index d86987bfa0903..4828392bc90db 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -660,10 +660,10 @@ "required_event": "character_takes_damage", "condition": { "u_has_trait": "IERDE_NO_BROKEN_BONES" }, "effect": [ - { "if": { "math": [ "u_hp('arm_r')", "==", "0" ] }, "then": { "math": [ "u_hp('arm_r')", "++" ] } }, - { "if": { "math": [ "u_hp('arm_l')", "==", "0" ] }, "then": { "math": [ "u_hp('arm_l')", "++" ] } }, - { "if": { "math": [ "u_hp('leg_r')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_r')", "++" ] } }, - { "if": { "math": [ "u_hp('leg_l')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_l')", "++" ] } } + { "if": { "math": [ "u_hp('arm_r')", "==", "0" ] }, "then": { "math": [ "u_hp('arm_r')++" ] } }, + { "if": { "math": [ "u_hp('arm_l')", "==", "0" ] }, "then": { "math": [ "u_hp('arm_l')++" ] } }, + { "if": { "math": [ "u_hp('leg_r')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_r')++" ] } }, + { "if": { "math": [ "u_hp('leg_l')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_l')++" ] } } ] } ] diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index 7621b70da6089..08658c79eaf1a 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -559,7 +559,7 @@ ] }, "deactivate_condition": { "not": { "u_has_trait": "BROWNIE_HOMEBODY" } }, - "effect": [ { "math": [ "u_brownie_homebody_speed_bonus", "++" ] }, { "math": [ "u_brownie_sense_intruders", "++" ] } ] + "effect": [ { "math": [ "u_brownie_homebody_speed_bonus++" ] }, { "math": [ "u_brownie_sense_intruders++" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json b/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json index 7b5550cd226f4..b031986768d15 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin_trait_eocs.json @@ -298,30 +298,12 @@ "effect": [ { "math": [ "u_vitamin('lilin_ruach_vitamin')", "-=", "100 * lilin_has_ruach_efficiency()" ] }, { "u_message": "You feel icy pinpricks on your skin as your wounds heal.", "type": "mixed" }, - { - "if": { "math": [ "u_hp('torso') < u_hp_max('torso')" ] }, - "then": { "math": [ "u_hp('torso')", "++" ] } - }, - { - "if": { "math": [ "u_hp('head') < u_hp_max('head')" ] }, - "then": { "math": [ "u_hp('head')", "++" ] } - }, - { - "if": { "math": [ "u_hp('arm_l') < u_hp_max('arm_l')" ] }, - "then": { "math": [ "u_hp('arm_l')", "++" ] } - }, - { - "if": { "math": [ "u_hp('arm_r') < u_hp_max('arm_r')" ] }, - "then": { "math": [ "u_hp('arm_r')", "++" ] } - }, - { - "if": { "math": [ "u_hp('leg_l') < u_hp_max('leg_l')" ] }, - "then": { "math": [ "u_hp('leg_l')", "++" ] } - }, - { - "if": { "math": [ "u_hp('leg_r') < u_hp_max('leg_r')" ] }, - "then": { "math": [ "u_hp('leg_r')", "++" ] } - }, + { "if": { "math": [ "u_hp('torso') < u_hp_max('torso')" ] }, "then": { "math": [ "u_hp('torso')++" ] } }, + { "if": { "math": [ "u_hp('head') < u_hp_max('head')" ] }, "then": { "math": [ "u_hp('head')++" ] } }, + { "if": { "math": [ "u_hp('arm_l') < u_hp_max('arm_l')" ] }, "then": { "math": [ "u_hp('arm_l')++" ] } }, + { "if": { "math": [ "u_hp('arm_r') < u_hp_max('arm_r')" ] }, "then": { "math": [ "u_hp('arm_r')++" ] } }, + { "if": { "math": [ "u_hp('leg_l') < u_hp_max('leg_l')" ] }, "then": { "math": [ "u_hp('leg_l')++" ] } }, + { "if": { "math": [ "u_hp('leg_r') < u_hp_max('leg_r')" ] }, "then": { "math": [ "u_hp('leg_r')++" ] } }, { "if": { "and": [ diff --git a/data/mods/Xedra_Evolved/npc/boann.json b/data/mods/Xedra_Evolved/npc/boann.json index 076535d070b0b..7e041ffa1c348 100644 --- a/data/mods/Xedra_Evolved/npc/boann.json +++ b/data/mods/Xedra_Evolved/npc/boann.json @@ -109,7 +109,7 @@ { "u_consume_item": "jabberwock_heart", "count": 1, "popup": true }, { "u_buy_monster": "mon_melian_mantis_mount", "count": 1, "name": "Bladepetal" }, { "u_spawn_item": "horse_tack", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_add_var": "completed_boann_bring_jabberwock_heart", "value": "yes" }, { "finish_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART", "success": true } ], @@ -120,7 +120,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_lords_for_boann" } ] }, "effect": [ { "u_add_trait": "CALL_DAFFODIL" }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_lords_for_boann" }, { "u_add_var": "completed_boann_kill_two_lords", "value": "yes" } ], @@ -131,7 +131,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_dogthing_for_boann" } ] }, "effect": [ { "u_spawn_item": "spellbook_hedge_clairvoyance_cone", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_dogthing_for_boann" }, { "u_add_var": "completed_boann_kill_dogthing", "value": "yes" } ], @@ -142,7 +142,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_five_mi_go_guards_for_boann" } ] }, "effect": [ { "u_spawn_item": "mana_recharge_sphere", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_five_mi_go_guards_for_boann" }, { "u_add_var": "completed_boann_kill_five_mi_go_guards", "value": "yes" } ], @@ -153,7 +153,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_armored_centipede_for_boann" } ] }, "effect": [ { "u_spawn_item": "boann_insignia", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_armored_centipede_for_boann" }, { "u_add_var": "completed_boann_kill_armored_centipede", "value": "yes" } ], @@ -164,7 +164,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_automaton_for_boann" } ] }, "effect": [ { "u_spawn_item": "winter_lord_estoc", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_automaton_for_boann" }, { "u_add_var": "completed_boann_kill_dreamforged_automaton", "value": "yes" } ], @@ -180,7 +180,7 @@ { "u_spawn_item": "gauntlets_verdant", "count": 1 }, { "u_spawn_item": "boots_verdant", "count": 1 }, { "u_spawn_item": "cloak_verdant", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_add_var": "completed_boann_bring_triffid_heart", "value": "yes" }, { "finish_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN", "success": true } ], @@ -191,7 +191,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_titan_beetle_for_boann" } ] }, "effect": [ { "u_spawn_item": "väinämöinens_kantele", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_titan_beetle_for_boann" }, { "u_add_var": "completed_boann_kill_titan_beetle", "value": "yes" } ], @@ -205,7 +205,7 @@ "effect": [ { "u_consume_item": "shadow_singularity_piece", "count": 1, "popup": true }, { "u_spawn_item": "boann_banner", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_add_var": "completed_boann_bring_shadow_piece", "value": "yes" }, { "finish_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN", "success": true } ], @@ -216,7 +216,7 @@ "condition": { "compare_string": [ "yes", { "u_val": "killed_star_crown_hound_for_boann" } ] }, "effect": [ { "u_spawn_item": "dream_attuning_necklace", "count": 1 }, - { "math": [ "Boann_Quests_Completed", "++" ] }, + { "math": [ "Boann_Quests_Completed++" ] }, { "u_lose_var": "killed_star_crown_hound_for_boann" }, { "u_add_var": "completed_boann_kill_star_crown_hound", "value": "yes" } ], @@ -433,7 +433,7 @@ { "text": "I'll do it. Where's the Jabberwock?", "condition": { "not": { "u_has_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" } }, - "effect": [ { "assign_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_BRING_BOANN_JABBERWOCK_HEART_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_BRING_BOANN_JABBERWOCK_HEART_ADVICE" }, @@ -448,7 +448,7 @@ { "text": "I'll do it. Where's the Jabberwock?", "condition": { "not": { "u_has_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" } }, - "effect": [ { "assign_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_BRING_BOANN_JABBERWOCK_HEART" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_BRING_BOANN_JABBERWOCK_HEART_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -482,7 +482,7 @@ { "text": "I'll do it.", "condition": { "not": { "u_has_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_TWO_MARCH_LORDS_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_TWO_MARCH_LORDS_ADVICE" }, @@ -497,7 +497,7 @@ { "text": "I'll do it.", "condition": { "not": { "u_has_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_TWO_MARCH_LORDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_TWO_MARCH_LORDS_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -531,7 +531,7 @@ { "text": "I'll do it. Where's the dog?", "condition": { "not": { "u_has_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_DOGTHING_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_DOGTHING_ADVICE" }, @@ -546,7 +546,7 @@ { "text": "I'll do it. Where's the dog?", "condition": { "not": { "u_has_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_DOGTHING_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_DOGTHING_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -580,7 +580,7 @@ { "text": "I'll do it. Where's the guards?", "condition": { "not": { "u_has_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_FIVE_MI_GO_GUARDS_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_FIVE_MI_GO_GUARDS_ADVICE" }, @@ -595,7 +595,7 @@ { "text": "I'll do it. Where's the guards?", "condition": { "not": { "u_has_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_FIVE_MI_GO_GUARDS_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_FIVE_MI_GO_GUARDS_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -629,7 +629,7 @@ { "text": "I'll do it. Where's the centipede?", "condition": { "not": { "u_has_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_ARMORED_CENTIPEDE_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_ARMORED_CENTIPEDE_ADVICE" }, @@ -644,7 +644,7 @@ { "text": "I'll do it. Where's the centipede?", "condition": { "not": { "u_has_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_ARMORED_CENTIPEDE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_ARMORED_CENTIPEDE_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -678,7 +678,7 @@ { "text": "I'll do it. Where's the automaton?", "condition": { "not": { "u_has_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_DREAMFORGED_AUTOMATON_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_DREAMFORGED_AUTOMATON_ADVICE" }, @@ -693,7 +693,7 @@ { "text": "I'll do it. Where's the automaton?", "condition": { "not": { "u_has_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_DREAMFORGED_AUTOMATON_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_DREAMFORGED_AUTOMATON_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -727,7 +727,7 @@ { "text": "I'll do it. Where's the triffids?", "condition": { "not": { "u_has_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_GET_TRIFFID_HEART_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_GET_TRIFFID_HEART_ADVICE" }, @@ -742,7 +742,7 @@ { "text": "I'll do it. Where's the triffids?", "condition": { "not": { "u_has_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_GET_TRIFFID_HEART_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_GET_TRIFFID_HEART_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -776,7 +776,7 @@ { "text": "I'll do it. Where's the beetle?", "condition": { "not": { "u_has_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_TITAN_BEETLE_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_TITAN_BEETLE_ADVICE" }, @@ -791,7 +791,7 @@ { "text": "I'll do it. Where's the beetle?", "condition": { "not": { "u_has_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_TITAN_BEETLE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_TITAN_BEETLE_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -825,10 +825,7 @@ { "text": "I'll do it.", "condition": { "not": { "u_has_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" } }, - "effect": [ - { "assign_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" }, - { "math": [ "Boann_Quests_Accepted", "++" ] } - ], + "effect": [ { "assign_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_GET_SHADOW_SINGULARITY_PIECE_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_GET_SHADOW_SINGULARITY_PIECE_ADVICE" }, @@ -843,10 +840,7 @@ { "text": "I'll do it.", "condition": { "not": { "u_has_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" } }, - "effect": [ - { "assign_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" }, - { "math": [ "Boann_Quests_Accepted", "++" ] } - ], + "effect": [ { "assign_mission": "MISSION_GET_SHADOW_SINGULARITY_PIECE_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_GET_SHADOW_SINGULARITY_PIECE_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, @@ -880,7 +874,7 @@ { "text": "I'll do it. Where's the hound?", "condition": { "not": { "u_has_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_STAR_CROWN_HOUND_ACCEPTED" }, { "text": "Do you have any advice?", "topic": "TALK_KILL_STAR_CROWN_HOUND_ADVICE" }, @@ -895,7 +889,7 @@ { "text": "I'll do it. Where's the hound?", "condition": { "not": { "u_has_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" } }, - "effect": [ { "assign_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted", "++" ] } ], + "effect": [ { "assign_mission": "MISSION_KILL_STAR_CROWN_HOUND_FOR_BOANN" }, { "math": [ "Boann_Quests_Accepted++" ] } ], "topic": "TALK_KILL_STAR_CROWN_HOUND_ACCEPTED" }, { "text": "Can I see the other quests first?", "topic": "TALK_QUEST_LIST" }, From 9090a1cae2641a8311452798077129049ce178dd Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:07:09 +0000 Subject: [PATCH 3/4] Change -- to single string \",[ \n\r]+\"\-\-\" to --" --- data/json/effects_on_condition/addictions_eocs.json | 8 ++++---- .../robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/effects_on_condition/addictions_eocs.json b/data/json/effects_on_condition/addictions_eocs.json index 47a73d39fe864..3c2f04d319b00 100644 --- a/data/json/effects_on_condition/addictions_eocs.json +++ b/data/json/effects_on_condition/addictions_eocs.json @@ -21,7 +21,7 @@ { "math": [ "rand(10) < u_addiction_intensity('caffeine')" ] } ] }, - "then": { "math": [ "u_val('stim')", "--" ] } + "then": { "math": [ "u_val('stim')--" ] } }, { "if": { @@ -51,7 +51,7 @@ "effect": [ { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 }, { "u_message": "You daydream about luscious pink berries as big as your fist.", "type": "info" }, - { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } } + { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } } ] }, { @@ -61,7 +61,7 @@ "effect": [ { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 }, { "u_message": "You daydream about nutty cyan seeds as big as your hand.", "type": "info" }, - { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } } + { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } } ] }, { @@ -71,7 +71,7 @@ "effect": [ { "u_add_morale": "morale_craving_marloss", "bonus": -5, "max_bonus": -30 }, { "u_message": "You daydream about succulent, pale golden gel, sweet but light.", "type": "info" }, - { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')", "--" ] } } + { "if": { "math": [ "u_val('focus') > 40" ] }, "then": { "math": [ "u_val('focus')--" ] } } ] }, { diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json b/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json index da6058374ff81..8a21f0a5c33b6 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json @@ -168,7 +168,7 @@ "dynamic_line": "Oh yes of course, think this should be all, well that's all there is anyhow.", "speaker_effect": { "effect": [ - { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed", "--" ] }, + { "math": [ "u_counter_BEM_BEM_human_sample_reward_owed--" ] }, { "u_add_faction_trust": 1 }, { "u_spawn_item": "RobofacCoin", "count": 2 } ] From 65aae22a6d001beb61f8125e793bcfeabed8ee98 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:09:12 +0000 Subject: [PATCH 4/4] Change -- to single string in /mods \",[ \n\r]+\"\-\-\" to --" --- data/mods/Aftershock/player/bionic_eocs.json | 2 +- data/mods/BombasticPerks/perkmenu.json | 2 +- .../Defense_Mode/dialogue/menu_screen.json | 2 +- .../effects_on_condition/backend_eocs.json | 2 +- .../bombastic_perks/perkmenu.json | 16 ++++---- .../eoc_premonition_instances.json | 2 +- .../electrokinesis_concentration_eocs.json | 2 +- data/mods/Perk_melee/menu.json | 2 +- data/mods/TEST_DATA/EOC.json | 2 +- data/mods/TEST_DATA/addictions.json | 2 +- data/mods/Xedra_Evolved/eocs/eoc_riddles.json | 40 +++++++++---------- .../playable_changeling_advancement_eocs.json | 10 ++--- .../Xedra_Evolved/eocs/shapeshifter_eocs.json | 2 +- .../eocs/spell_learning_eoc.json | 4 +- .../bombastic_perks/perks/perk_menu.json | 14 +++---- .../mutations/playable_changeling_eocs.json | 4 +- .../mutations/xe_lilin_eocs.json | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) diff --git a/data/mods/Aftershock/player/bionic_eocs.json b/data/mods/Aftershock/player/bionic_eocs.json index 11064d94ad63f..ad28e8894ff08 100644 --- a/data/mods/Aftershock/player/bionic_eocs.json +++ b/data/mods/Aftershock/player/bionic_eocs.json @@ -84,7 +84,7 @@ "type": "effect_on_condition", "id": "afs_eoc_chemhealing_pkill", "condition": { "one_in_chance": 40 }, - "effect": [ { "math": [ "u_pain()", "--" ] } ] + "effect": [ { "math": [ "u_pain()--" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/BombasticPerks/perkmenu.json b/data/mods/BombasticPerks/perkmenu.json index 67bfde2d7d06d..a3b5700e9cbd3 100644 --- a/data/mods/BombasticPerks/perkmenu.json +++ b/data/mods/BombasticPerks/perkmenu.json @@ -2015,7 +2015,7 @@ "failure_topic": "TALK_PERK_MENU_FAIL", "effect": [ { "u_mutate_towards": { "context_val": "trait_id" }, "category": "ANY", "use_vitamins": false }, - { "math": [ "u_num_perks", "--" ] } + { "math": [ "u_num_perks--" ] } ] }, { diff --git a/data/mods/Defense_Mode/dialogue/menu_screen.json b/data/mods/Defense_Mode/dialogue/menu_screen.json index 4b16427efbc62..bc8f56535766f 100644 --- a/data/mods/Defense_Mode/dialogue/menu_screen.json +++ b/data/mods/Defense_Mode/dialogue/menu_screen.json @@ -484,7 +484,7 @@ }, { "text": "Decrease by 1", - "effect": { "math": [ "diffulty_modifier", "--" ] }, + "effect": { "math": [ "diffulty_modifier--" ] }, "topic": "TALK_DEFENSE_MODE_CUSTOM_DIFFICULTY_MENU" }, { diff --git a/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json b/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json index c069c966142ef..adec2409dd0aa 100644 --- a/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json +++ b/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json @@ -90,7 +90,7 @@ { "math": [ "u_pain() = 0" ] }, { "math": [ "u_val('sleepiness') = 0" ] }, { "math": [ "u_val('stamina') = 8500" ] }, - { "math": [ "revivication_counter", "--" ] }, + { "math": [ "revivication_counter--" ] }, { "u_cast_spell": { "id": "remove_opponents" } }, { "u_message": "For an instant that is also an eternity, you exist only in an empty void. Then you feel something vast, alien, and merciless reach through a preexisting connection to give you just enough energy to exist. Its motives for doing so are not likely to be benign.", diff --git a/data/mods/Magiclysm/mod_interactions/bombastic_perks/perkmenu.json b/data/mods/Magiclysm/mod_interactions/bombastic_perks/perkmenu.json index 7d92c033ca354..764c5b1e95972 100644 --- a/data/mods/Magiclysm/mod_interactions/bombastic_perks/perkmenu.json +++ b/data/mods/Magiclysm/mod_interactions/bombastic_perks/perkmenu.json @@ -55,7 +55,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_animist" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_animist" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -71,7 +71,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_magus" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_magus" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -87,7 +87,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_stormshaper" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_stormshaper" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -103,7 +103,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_kelvinist" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_kelvinist" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -119,7 +119,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_earthshaper" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_earthshaper" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -135,7 +135,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_technomancer" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_technomancer" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -151,7 +151,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_druid" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_druid" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -167,7 +167,7 @@ "topic": "TALK_PERK_MENU_MAIN", "condition": { "math": [ "u_num_perks > 0" ] }, "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_caster_level_up_biomancer" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_caster_level_up_biomancer" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json index 4fd516de49715..5717f60ff830b 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json @@ -43,7 +43,7 @@ "type": "effect_on_condition", "id": "EOC_LIEUTENANT_SPAWN_SHADOW_ACTUAL", "effect": [ - { "math": [ "u_Shadow_Lurking", "--" ] }, + { "math": [ "u_Shadow_Lurking--" ] }, { "u_spawn_monster": "mon_lieutenant_shadow", "real_count": 1, "min_radius": 10, "max_radius": 15 }, { "run_eocs": "EOC_LIEUTENANT_SPAWN_SHADOW_MESSAGE", "time_in_future": 1 } ] diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json index a11850d424660..24e2345649010 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json @@ -446,7 +446,7 @@ ] }, "effect": [ - { "math": [ "u_electrokin_personal_battery_item_count", "--" ] }, + { "math": [ "u_electrokin_personal_battery_item_count--" ] }, { "run_eocs": "EOC_ELECTROKIN_PERSONAL_BATTERY_EFFECT_AMMEND_ITEM_COUNT" } ] }, diff --git a/data/mods/Perk_melee/menu.json b/data/mods/Perk_melee/menu.json index 3824717209b4b..a931e0bed5310 100644 --- a/data/mods/Perk_melee/menu.json +++ b/data/mods/Perk_melee/menu.json @@ -696,7 +696,7 @@ "failure_topic": "TALK_NONE", "effect": [ { "u_mutate_towards": { "context_val": "trait_id" }, "category": "ANY", "use_vitamins": false }, - { "math": [ "u_num_ma_perks", "--" ] } + { "math": [ "u_num_ma_perks--" ] } ] }, { diff --git a/data/mods/TEST_DATA/EOC.json b/data/mods/TEST_DATA/EOC.json index af8444e0ce456..e4a0a77f69559 100644 --- a/data/mods/TEST_DATA/EOC.json +++ b/data/mods/TEST_DATA/EOC.json @@ -520,7 +520,7 @@ "id": "EOC_math_test_greater_increment", "condition": { "math": [ "math_test > 0" ] }, "effect": [ { "math": [ "math_test", "+=", "1" ] } ], - "false_effect": [ { "math": [ "math_test", "--" ] } ] + "false_effect": [ { "math": [ "math_test--" ] } ] }, { "type": "effect_on_condition", diff --git a/data/mods/TEST_DATA/addictions.json b/data/mods/TEST_DATA/addictions.json index 27735f9080ee0..f06b42b3d6e7b 100644 --- a/data/mods/TEST_DATA/addictions.json +++ b/data/mods/TEST_DATA/addictions.json @@ -12,7 +12,7 @@ { "math": [ "rand(10) < u_addiction_intensity('test_caffeine') * -10" ] } ] }, - "then": { "math": [ "u_val('stim')", "--" ] } + "then": { "math": [ "u_val('stim')--" ] } }, { "if": { diff --git a/data/mods/Xedra_Evolved/eocs/eoc_riddles.json b/data/mods/Xedra_Evolved/eocs/eoc_riddles.json index f53400578b46b..b709d9099dc6e 100644 --- a/data/mods/Xedra_Evolved/eocs/eoc_riddles.json +++ b/data/mods/Xedra_Evolved/eocs/eoc_riddles.json @@ -34,7 +34,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_01", "effect": [ - { "math": [ "xe_riddle_01", "--" ] }, + { "math": [ "xe_riddle_01--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "All or Nothing?", "names": [ "All", "Nothing" ] } ] }, @@ -42,7 +42,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_02", "effect": [ - { "math": [ "xe_riddle_02", "--" ] }, + { "math": [ "xe_riddle_02--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Dead or Alive?", "names": [ "Dead", "Alive" ] } ] }, @@ -50,7 +50,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_03", "effect": [ - { "math": [ "xe_riddle_03", "--" ] }, + { "math": [ "xe_riddle_03--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Deep or Shallow?", "names": [ "Deep", "Shallow" ] } ] }, @@ -58,7 +58,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_04", "effect": [ - { "math": [ "xe_riddle_04", "--" ] }, + { "math": [ "xe_riddle_04--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Dusk or Dawn?", "names": [ "Dusk", "Dawn" ] } ] }, @@ -66,7 +66,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_05", "effect": [ - { "math": [ "xe_riddle_05", "--" ] }, + { "math": [ "xe_riddle_05--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Enemy or Friend?", "names": [ "Enemy", "Friend" ] } ] }, @@ -74,7 +74,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_06", "effect": [ - { "math": [ "xe_riddle_06", "--" ] }, + { "math": [ "xe_riddle_06--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Even or Odd?", "names": [ "Even", "Odd" ] } ] }, @@ -82,7 +82,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_07", "effect": [ - { "math": [ "xe_riddle_07", "--" ] }, + { "math": [ "xe_riddle_07--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Fail or Success?", "names": [ "Fail", "Success" ] } ] }, @@ -90,7 +90,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_08", "effect": [ - { "math": [ "xe_riddle_08", "--" ] }, + { "math": [ "xe_riddle_08--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Guilty or Innocent?", @@ -102,7 +102,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_09", "effect": [ - { "math": [ "xe_riddle_09", "--" ] }, + { "math": [ "xe_riddle_09--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Hero or Coward?", "names": [ "Hero", "Coward" ] } ] }, @@ -110,7 +110,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_10", "effect": [ - { "math": [ "xe_riddle_10", "--" ] }, + { "math": [ "xe_riddle_10--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Hope or Despair?", "names": [ "Hope", "Despair" ] } ] }, @@ -118,7 +118,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_11", "effect": [ - { "math": [ "xe_riddle_11", "--" ] }, + { "math": [ "xe_riddle_11--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Inner or Outer?", "names": [ "Inner", "Outer" ] } ] }, @@ -126,7 +126,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_12", "effect": [ - { "math": [ "xe_riddle_12", "--" ] }, + { "math": [ "xe_riddle_12--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Victory or Defeat?", @@ -138,7 +138,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_13", "effect": [ - { "math": [ "xe_riddle_13", "--" ] }, + { "math": [ "xe_riddle_13--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Madness or Sanity?", @@ -150,7 +150,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_14", "effect": [ - { "math": [ "xe_riddle_14", "--" ] }, + { "math": [ "xe_riddle_14--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Oppressed or Oppressor?", @@ -162,7 +162,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_15", "effect": [ - { "math": [ "xe_riddle_15", "--" ] }, + { "math": [ "xe_riddle_15--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Rapid or Slow?", "names": [ "Rapid", "Slow" ] } ] }, @@ -170,7 +170,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_16", "effect": [ - { "math": [ "xe_riddle_16", "--" ] }, + { "math": [ "xe_riddle_16--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Remember or Forget?", @@ -182,7 +182,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_17", "effect": [ - { "math": [ "xe_riddle_17", "--" ] }, + { "math": [ "xe_riddle_17--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "The Beginning or The End?", @@ -194,7 +194,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_18", "effect": [ - { "math": [ "xe_riddle_18", "--" ] }, + { "math": [ "xe_riddle_18--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Truth or Lie?", "names": [ "Truth", "Lie" ] } ] }, @@ -202,7 +202,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_19", "effect": [ - { "math": [ "xe_riddle_19", "--" ] }, + { "math": [ "xe_riddle_19--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "War or Peace?", "names": [ "War", "Peace" ] } ] }, @@ -210,7 +210,7 @@ "type": "effect_on_condition", "id": "EOC_XE_RIDDLE_20", "effect": [ - { "math": [ "xe_riddle_20", "--" ] }, + { "math": [ "xe_riddle_20--" ] }, { "run_eoc_selector": [ "EOC_NONE", "EOC_NONE" ], "title": "Yes or No?", "names": [ "Yes", "No" ] } ] }, diff --git a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json index 8279f21377591..ef923af2fe31e 100644 --- a/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/playable_changeling_advancement_eocs.json @@ -102,7 +102,7 @@ { "u_mutate": 0 }, { "math": [ "u_vitamin('mutagen_fair_folk_noble')", "-=", "2500" ] }, { "math": [ "u_vitamin('mutagen')", "-=", "1000" ] }, - { "math": [ "u_changeling_advancement_dreams_counter", "--" ] } + { "math": [ "u_changeling_advancement_dreams_counter--" ] } ] }, { @@ -123,7 +123,7 @@ { "u_mutate": 0 }, { "math": [ "u_vitamin('mutagen_fair_folk_commoner_brownie')", "-=", "2500" ] }, { "math": [ "u_vitamin('mutagen')", "-=", "1000" ] }, - { "math": [ "u_changeling_advancement_dreams_counter", "--" ] } + { "math": [ "u_changeling_advancement_dreams_counter--" ] } ] }, { @@ -144,7 +144,7 @@ { "u_mutate": 0 }, { "math": [ "u_vitamin('mutagen_fair_folk_commoner_pooka')", "-=", "2500" ] }, { "math": [ "u_vitamin('mutagen')", "-=", "1000" ] }, - { "math": [ "u_changeling_advancement_dreams_counter", "--" ] } + { "math": [ "u_changeling_advancement_dreams_counter--" ] } ] }, { @@ -165,7 +165,7 @@ { "u_mutate": 0 }, { "math": [ "u_vitamin('mutagen_fair_folk_commoner_selkie')", "-=", "2500" ] }, { "math": [ "u_vitamin('mutagen')", "-=", "1000" ] }, - { "math": [ "u_changeling_advancement_dreams_counter", "--" ] } + { "math": [ "u_changeling_advancement_dreams_counter--" ] } ] }, { @@ -186,7 +186,7 @@ { "u_mutate": 0 }, { "math": [ "u_vitamin('mutagen_fair_folk_commoner_trow')", "-=", "2500" ] }, { "math": [ "u_vitamin('mutagen')", "-=", "1000" ] }, - { "math": [ "u_changeling_advancement_dreams_counter", "--" ] } + { "math": [ "u_changeling_advancement_dreams_counter--" ] } ] } ] diff --git a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json index a7e740a9e2833..eab055f2cdc4f 100644 --- a/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json +++ b/data/mods/Xedra_Evolved/eocs/shapeshifter_eocs.json @@ -144,7 +144,7 @@ "if": { "math": [ "u_werewolf_healing_tick_counter >= 6" ] }, "then": [ { "math": [ "u_werewolf_healing_tick_counter", "-=", "6" ] }, - { "if": { "math": [ "u_pain() >= 1" ] }, "then": { "math": [ "u_pain()", "--" ] } }, + { "if": { "math": [ "u_pain() >= 1" ] }, "then": { "math": [ "u_pain()--" ] } }, { "if": { "math": [ "u_vitamin('redcells') < 0" ] }, "then": { "math": [ "u_vitamin('redcells')", "+=", "150" ] } diff --git a/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json b/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json index 16f83374fe508..ff715821e0e2d 100644 --- a/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/spell_learning_eoc.json @@ -103,7 +103,7 @@ } ] }, - { "math": [ "xe_eater_leveling", "--" ] }, + { "math": [ "xe_eater_leveling--" ] }, { "run_eocs": [ "EOC_XE_GIVE_SPELL_SELECTOR" ] } ] }, @@ -145,7 +145,7 @@ } ] }, - { "math": [ "xe_dreamer_leveling", "--" ] }, + { "math": [ "xe_dreamer_leveling--" ] }, { "run_eocs": [ "EOC_XE_GIVE_SPELL_SELECTOR" ] } ] }, diff --git a/data/mods/Xedra_Evolved/mod_interactions/bombastic_perks/perks/perk_menu.json b/data/mods/Xedra_Evolved/mod_interactions/bombastic_perks/perks/perk_menu.json index 32ca8b3186e87..5863ddcdd9c09 100644 --- a/data/mods/Xedra_Evolved/mod_interactions/bombastic_perks/perks/perk_menu.json +++ b/data/mods/Xedra_Evolved/mod_interactions/bombastic_perks/perks/perk_menu.json @@ -21,7 +21,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY1" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY1" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -49,7 +49,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY2" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY2" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -77,7 +77,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY3" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY3" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -111,7 +111,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY3_COLD_IRON" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY3_COLD_IRON" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -139,7 +139,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY4" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY4" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -167,7 +167,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_ALCHEMY5" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_ALCHEMY5" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } @@ -195,7 +195,7 @@ "condition": { "math": [ "u_num_perks > 0" ] }, "failure_explanation": "Requirements Not Met", "failure_topic": "TALK_PERK_MENU_FAIL", - "effect": [ { "u_add_trait": "perk_LOW_INT_MANA" }, { "math": [ "u_num_perks", "--" ] } ] + "effect": [ { "u_add_trait": "perk_LOW_INT_MANA" }, { "math": [ "u_num_perks--" ] } ] }, { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Quit.", "topic": "TALK_DONE" } diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index 08658c79eaf1a..c02a5ee5b6785 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -663,7 +663,7 @@ } ] }, - "effect": [ { "math": [ "u_brownie_homebody_speed_bonus", "--" ] }, { "math": [ "u_brownie_sense_intruders = 0" ] } ] + "effect": [ { "math": [ "u_brownie_homebody_speed_bonus--" ] }, { "math": [ "u_brownie_sense_intruders = 0" ] } ] }, { "type": "effect_on_condition", @@ -792,7 +792,7 @@ "1 + u_has_trait('POOKA_SHAPESHIFT_GOOD') + (u_has_trait('POOKA_SHAPESHIFT_GOOD2') * 2) + (u_has_trait('POOKA_SHAPESHIFT_GOOD3') * 4) + (u_sum_traits_of_category_char_has('FAIR_FOLK_COMMONER_POOKA') / 50)" ] }, - "effect": [ { "math": [ "u_val('mana')", "--" ] } ] + "effect": [ { "math": [ "u_val('mana')--" ] } ] } ] } diff --git a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json index f49a76c0dbbfb..316995fe0b13f 100644 --- a/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/xe_lilin_eocs.json @@ -64,7 +64,7 @@ "condition": { "and": [ { "u_has_trait": "LILIN_TRAITS" }, { "math": [ "u_vitamin('lilin_ruach_vitamin') >= 1" ] } ] }, "effect": [ { "u_lose_effect": "effect_lilin_no_ruach" }, - { "math": [ "u_vitamin('lilin_ruach_vitamin')", "--" ] }, + { "math": [ "u_vitamin('lilin_ruach_vitamin')--" ] }, { "if": { "math": [ "u_vitamin('lilin_ruach_vitamin') == 0" ] }, "then": { "u_add_effect": "effect_lilin_no_ruach", "duration": "PERMANENT", "intensity": 1 }