From e61437ea173585fb8b2a1bcf03e40166fe55d22a Mon Sep 17 00:00:00 2001 From: Ramza13 <52087122+Ramza13@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:37:42 -0500 Subject: [PATCH] Fixes --- .../mapgen_eocs/furniture_eocs.json | 10 +- .../mutation_eocs/changing_eocs.json | 2 +- .../portal_dependent_effect_on_condition.json | 135 ++--- .../portal_storm_effect_on_condition.json | 62 +- .../npc_eocs/generic_npc_eocs.json | 28 +- .../npc_eocs/hallucination_eocs.json | 26 +- .../furniture_nether_monster.json | 11 +- data/json/monster_special_attacks/spells.json | 6 +- data/json/npcs/missiondef.json | 6 +- .../random_event_eocs.json | 6 +- .../effects_on_condition/wave_eocs.json | 36 +- .../effectoncondition/eoc_awakening.json | 556 +++++++++--------- .../eoc_nether_attunement_events.json | 162 ++--- data/mods/Sky_Island/missions_and_mapgen.json | 24 +- data/mods/Xedra_Evolved/eocs/eoc_riddles.json | 20 +- .../mutations/mutation_eocs.json | 4 +- .../portal_storm_effect_on_condition.json | 8 +- src/npctalk.cpp | 14 +- 18 files changed, 543 insertions(+), 573 deletions(-) diff --git a/data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json b/data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json index b769500abae73..058c6e8ac4b17 100644 --- a/data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json +++ b/data/json/effects_on_condition/mapgen_eocs/furniture_eocs.json @@ -72,7 +72,7 @@ "global": true, "effect": { "weighted_list_eocs": [ - [ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, { "const": 1000 } ], + [ { "id": "slots_lose", "effect": { "u_message": "Oh, you lost!", "popup": true } }, 1000 ], [ { "id": "three_cherries", @@ -82,7 +82,7 @@ { "run_eocs": "slot_machine_win_payout" } ] }, - { "const": 200 } + 200 ], [ { @@ -93,7 +93,7 @@ { "run_eocs": "slot_machine_win_payout" } ] }, - { "const": 50 } + 50 ], [ { @@ -104,7 +104,7 @@ { "run_eocs": "slot_machine_win_payout" } ] }, - { "const": 20 } + 20 ], [ { @@ -115,7 +115,7 @@ { "run_eocs": "slot_machine_win_payout" } ] }, - { "const": 1 } + 1 ] ] } diff --git a/data/json/effects_on_condition/mutation_eocs/changing_eocs.json b/data/json/effects_on_condition/mutation_eocs/changing_eocs.json index 6a1bd8b51ad51..3aa85d4cd5073 100644 --- a/data/json/effects_on_condition/mutation_eocs/changing_eocs.json +++ b/data/json/effects_on_condition/mutation_eocs/changing_eocs.json @@ -13,7 +13,7 @@ "deactivate_condition": { "u_has_flag": "CHANGING" }, "effect": [ { - "weighted_list_eocs": [ [ "changing_failed", { "const": 2500 } ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ] + "weighted_list_eocs": [ [ "changing_failed", 2500 ], [ "changing_successful", { "u_val": "vitamin", "name": "mutagen" } ] ] } ] }, diff --git a/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json index dce498ac240ff..9e62005705224 100644 --- a/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json +++ b/data/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json @@ -37,17 +37,17 @@ "condition": { "math": [ "ps_str", ">", "4" ] }, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", { "const": 10 } ], - [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ], + [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 6 ], + [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 3 ], + [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE", 1 ] ] }, "false_effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", { "const": 10 } ], - [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", { "const": 5 } ], - [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", { "const": 2 } ] + [ "EOC_PORTAL_DEPENDENT_MESSAGES_GOOD", 10 ], + [ "EOC_PORTAL_DEPENDENT_MORALE_GOOD", 5 ], + [ "EOC_PORTAL_DEPENDENT_FOCUS_GOOD", 2 ] ] } } @@ -81,15 +81,13 @@ "condition": { "days_since_cataclysm": 60 }, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", { "const": 4 } ], - [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_3", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_4", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", 4 ], + [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", 3 ], + [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_3", 2 ], + [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_4", 1 ] ] }, - "false_effect": { - "weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", { "const": 2 } ], [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", { "const": 1 } ] ] - } + "false_effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_1", 2 ], [ "EOC_PORTAL_DEPENDENT_ACCEPTANCE_2", 1 ] ] } } ] } @@ -220,27 +218,27 @@ "condition": { "not": { "u_has_trait": "REALITY_GRASP" } }, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", { "const": 18 } ], - [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", { "const": 5 } ], - [ "EOC_PORTAL_DEPENDENT_SHAKES", { "const": 4 } ], - [ "EOC_PORTAL_DEPENDENT_NAUSEA", { "const": 4 } ], - [ "EOC_PORTAL_DEPENDENT_STUN", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_DOWNED", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_STATS_BAD", { "const": 3 } ], - [ "EOC_PORTAL_TELEPORT_STUCK_START", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_PAIN", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 18 ], + [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 6 ], + [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 5 ], + [ "EOC_PORTAL_DEPENDENT_SHAKES", 4 ], + [ "EOC_PORTAL_DEPENDENT_NAUSEA", 4 ], + [ "EOC_PORTAL_DEPENDENT_STUN", 3 ], + [ "EOC_PORTAL_DEPENDENT_DOWNED", 3 ], + [ "EOC_PORTAL_DEPENDENT_STATS_BAD", 3 ], + [ "EOC_PORTAL_TELEPORT_STUCK_START", 3 ], + [ "EOC_PORTAL_DEPENDENT_PAIN", 2 ], + [ "EOC_PORTAL_DEPENDENT_PAIN_CONSTANT", 1 ], + [ "EOC_PORTAL_DEPENDENT_DAMAGE_CONSTANT", 1 ] ] }, "false_effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", { "const": 10 } ], - [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_SHAKES", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_NAUSEA", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_MESSAGES_BAD", 10 ], + [ "EOC_PORTAL_DEPENDENT_MORALE_BAD", 3 ], + [ "EOC_PORTAL_DEPENDENT_FOCUS_BAD", 2 ], + [ "EOC_PORTAL_DEPENDENT_SHAKES", 1 ], + [ "EOC_PORTAL_DEPENDENT_NAUSEA", 1 ] ] } } @@ -283,10 +281,10 @@ "id": "EOC_PORTAL_DEPENDENT_STATS_EFFECTS", "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_STR_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_DEX_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_PER_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_INT_BAD", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_STR_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_DEX_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_PER_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_INT_BAD", 1 ] ] } } @@ -421,11 +419,11 @@ "condition": { "not": { "u_has_effect": "sleep" } }, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_MESSAGES_VARIED_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_MESSAGES_VARIED_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_MESSAGES_STR_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_MESSAGES_DEX_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_MESSAGES_PER_BAD", 1 ], + [ "EOC_PORTAL_DEPENDENT_MESSAGES_INT_BAD", 1 ] ] }, "false_effect": [ { "u_message": "PORTAL_DEPENDENT_MESSAGES_DREAMS", "snippet": true, "type": "mixed" } ] @@ -479,9 +477,9 @@ "case": 0, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 16 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 3 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 16 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 3 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 1 ] ] } }, @@ -489,9 +487,9 @@ "case": 1, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 12 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 2 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 6 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 12 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 2 ] ] } }, @@ -499,10 +497,10 @@ "case": 2, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 5 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 12 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 2 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_0", 1 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 5 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 12 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 2 ] ] } }, @@ -510,10 +508,10 @@ "case": 3, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 5 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 12 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 1 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_1", 2 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 5 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 12 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 1 ] ] } }, @@ -521,9 +519,9 @@ "case": 4, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 12 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_2", 2 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 6 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 12 ] ] } } @@ -635,9 +633,9 @@ "case": 5, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 10 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 4 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 6 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 10 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 4 ] ] } }, @@ -645,9 +643,9 @@ "case": 6, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 4 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 8 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 8 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 4 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 8 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 8 ] ] } }, @@ -655,19 +653,16 @@ "case": 7, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", { "const": 1 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 6 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 13 } ] + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_3", 1 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 6 ], + [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 13 ] ] } }, { "case": 8, "effect": { - "weighted_list_eocs": [ - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", { "const": 2 } ], - [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", { "const": 18 } ] - ] + "weighted_list_eocs": [ [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_4", 2 ], [ "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5", 18 ] ] } }, { "case": 9, "effect": [ { "run_eocs": "EOC_PORTAL_DEPENDENT_DUNGEON_REWARD_5" } ] } 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 7413a191a6e94..5fd1120a547e3 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 @@ -241,13 +241,7 @@ { "type": "effect_on_condition", "id": "EOC_WORSEN_PORTAL_STORM", - "effect": { - "weighted_list_eocs": [ - [ "EOC_PORTAL_STRENGTHEN", { "const": 1 } ], - [ "EOC_PORTAL_LENGTHEN", { "const": 1 } ], - [ "EOC_PORTAL_EXPAND", { "const": 3 } ] - ] - } + "effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_STRENGTHEN", 1 ], [ "EOC_PORTAL_LENGTHEN", 1 ], [ "EOC_PORTAL_EXPAND", 3 ] ] } }, { "type": "effect_on_condition", @@ -304,14 +298,14 @@ "deactivate_condition": { "not": { "is_weather": "portal_storm" } }, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_GRASS_CHANGE", { "const": 10 } ], - [ "EOC_PORTAL_LIGHT", { "const": 2 } ], - [ "EOC_PORTAL_ABSENCE", { "const": 4 } ], - [ "EOC_PORTAL_IMPOSSIBLE_SHAPE", { "const": 5 } ], - [ "EOC_PORTAL_FLATLANDER", { "const": 5 } ], - [ "EOC_PORTAL_MEMORIES", { "const": 1 } ], - [ "EOC_PORTAL_GIANT_APPENDAGE", { "const": 1 } ], - [ "EOC_PORTAL_NPC", { "const": 1 } ] + [ "EOC_PORTAL_GRASS_CHANGE", 10 ], + [ "EOC_PORTAL_LIGHT", 2 ], + [ "EOC_PORTAL_ABSENCE", 4 ], + [ "EOC_PORTAL_IMPOSSIBLE_SHAPE", 5 ], + [ "EOC_PORTAL_FLATLANDER", 5 ], + [ "EOC_PORTAL_MEMORIES", 1 ], + [ "EOC_PORTAL_GIANT_APPENDAGE", 1 ], + [ "EOC_PORTAL_NPC", 1 ] ] } }, @@ -339,14 +333,14 @@ { "run_eocs": "EOC_PORTAL_MESSAGE" }, { "weighted_list_eocs": [ - [ "EOC_PORTAL_TELEPORT_STUCK_START", { "const": 2 } ], - [ "EOC_PORTAL_PAIN", { "const": 2 } ], - [ "EOC_PORTAL_HALLUCINATOR", { "const": 2 } ], - [ "EOC_PORTAL_SMOKE", { "const": 2 } ], - [ "EOC_PORTAL_SWARM_STRUCTURE", { "const": 2 } ], - [ "EOC_PORTAL_TAUNT", { "const": 1 } ], - [ "EOC_PORTAL_SHIFTING_MASS", { "const": 1 } ], - [ "EOC_PORTAL_ARTIFACT_WEAK", { "const": 1 } ] + [ "EOC_PORTAL_TELEPORT_STUCK_START", 2 ], + [ "EOC_PORTAL_PAIN", 2 ], + [ "EOC_PORTAL_HALLUCINATOR", 2 ], + [ "EOC_PORTAL_SMOKE", 2 ], + [ "EOC_PORTAL_SWARM_STRUCTURE", 2 ], + [ "EOC_PORTAL_TAUNT", 1 ], + [ "EOC_PORTAL_SHIFTING_MASS", 1 ], + [ "EOC_PORTAL_ARTIFACT_WEAK", 1 ] ] } ] @@ -411,9 +405,7 @@ "id": "EOC_PORTAL_STORM_MESSAGE_INDOOR_OUTDOOR_3", "condition": "u_is_outside", "effect": { "u_message": "PORTAL_STORM_MESSAGES_3", "snippet": true }, - "false_effect": { - "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_3", { "const": 1 } ], [ "EOC_PORTAL_STORM_VOICES_3", { "const": 1 } ] ] - } + "false_effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_3", 1 ], [ "EOC_PORTAL_STORM_VOICES_3", 1 ] ] } } } }, @@ -424,9 +416,7 @@ "id": "EOC_PORTAL_STORM_MESSAGE_INDOOR_OUTDOOR_2", "condition": "u_is_outside", "effect": { "u_message": "PORTAL_STORM_MESSAGES_2", "snippet": true }, - "false_effect": { - "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_2", { "const": 1 } ], [ "EOC_PORTAL_STORM_VOICES_2", { "const": 1 } ] ] - } + "false_effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_2", 1 ], [ "EOC_PORTAL_STORM_VOICES_2", 1 ] ] } } } }, @@ -437,9 +427,7 @@ "id": "EOC_PORTAL_STORM_MESSAGE_INDOOR_OUTDOOR_1", "condition": "u_is_outside", "effect": { "u_message": "PORTAL_STORM_MESSAGES_1", "snippet": true }, - "false_effect": { - "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_1", { "const": 1 } ], [ "EOC_PORTAL_STORM_VOICES_1", { "const": 1 } ] ] - } + "false_effect": { "weighted_list_eocs": [ [ "EOC_PORTAL_STORM_INDOOR_MESSAGES_1", 1 ], [ "EOC_PORTAL_STORM_VOICES_1", 1 ] ] } } } } @@ -1081,9 +1069,9 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_PORTAL_DUNGEON_REWARD_WEAKENED_INERTIA", { "const": 1 } ], - [ "EOC_PORTAL_DUNGEON_REWARD_WARPED_VIEWPOINT", { "const": 1 } ], - [ "EOC_PORTAL_DUNGEON_REWARD_WEAKENED_GRAVITY", { "const": 1 } ] + [ "EOC_PORTAL_DUNGEON_REWARD_WEAKENED_INERTIA", 1 ], + [ "EOC_PORTAL_DUNGEON_REWARD_WARPED_VIEWPOINT", 1 ], + [ "EOC_PORTAL_DUNGEON_REWARD_WEAKENED_GRAVITY", 1 ] ] }, { @@ -1179,8 +1167,8 @@ { "math": [ "ps_effect_length", "=", "u_val('time: 3 h')" ] }, { "weighted_list_eocs": [ - [ "EOC_PORTAL_DUNGEON_PUNISHMENT_STRENGTHENED_INERTIA", { "const": 10 } ], - [ "EOC_PORTAL_DUNGEON_PUNISHMENT_NARROW_VIEWPOINT", { "const": 10 } ] + [ "EOC_PORTAL_DUNGEON_PUNISHMENT_STRENGTHENED_INERTIA", 10 ], + [ "EOC_PORTAL_DUNGEON_PUNISHMENT_NARROW_VIEWPOINT", 10 ] ] } ] 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 9e5e9f1cf18f9..285d580006155 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 @@ -12,7 +12,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_RELIC" } }, - { "const": 1 } + 1 ], [ { @@ -20,7 +20,7 @@ "condition": { "u_has_trait": "GETS_RANDOM_MISSION" }, "effect": { "offer_mission": "MISSION_GET_RECORD_ACCOUNTING" } }, - { "const": 1 } + 1 ], [ { @@ -28,7 +28,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_INHALER" } }, - { "const": 1 } + 1 ], [ { @@ -36,7 +36,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_ANTIBIOTICS" } }, - { "const": 1 } + 1 ], [ { @@ -44,7 +44,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_FLAG" } }, - { "const": 1 } + 1 ], [ { @@ -52,7 +52,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_RECORD_WEATHER" } }, - { "const": 1 } + 1 ], [ { @@ -60,7 +60,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_GET_SOFTWARE" } }, - { "const": 1 } + 1 ], [ { @@ -68,7 +68,7 @@ "condition": { "u_has_trait": "GETS_RANDOM_MISSION" }, "effect": { "offer_mission": "MISSION_GET_RECORD_PATIENT" } }, - { "const": 1 } + 1 ], [ { @@ -76,7 +76,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_KILL_JABBERWOCK" } }, - { "const": 1 } + 1 ], [ { @@ -84,7 +84,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_KILL_ZOMBIE_MOM" } }, - { "const": 1 } + 1 ], [ { @@ -92,7 +92,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_RESCUE_DOG" } }, - { "const": 1 } + 1 ], [ { @@ -100,7 +100,7 @@ "condition": { "u_has_trait": "GETS_RANDOM_MISSION" }, "effect": { "offer_mission": "MISSION_PROVE_YOU_ARE_A_SURVIVOR" } }, - { "const": 1 } + 1 ], [ { @@ -108,7 +108,7 @@ "condition": { "or": [ { "u_has_trait": "GETS_RANDOM_MISSION" }, { "u_has_trait": "GETS_RANDOM_MISSION_NOMOVE" } ] }, "effect": { "offer_mission": "MISSION_LEARN_ABOUT_CATTAIL_JELLY" } }, - { "const": 1 } + 1 ], [ { @@ -116,7 +116,7 @@ "condition": { "u_has_trait": "GETS_RANDOM_MISSION" }, "effect": { "offer_mission": "MISSION_PYROMANIAC" } }, - { "const": 1 } + 1 ] ] }, diff --git a/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json b/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json index 3b5a6216ef866..763b27fe8cdbe 100644 --- a/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/hallucination_eocs.json @@ -13,11 +13,7 @@ }, "effect": [ { - "weighted_list_eocs": [ - [ "minor_hallucinations", { "const": 10 } ], - [ "intermediate_hallucinations", { "const": 6 } ], - [ "bad_hallucinations", { "const": 4 } ] - ] + "weighted_list_eocs": [ [ "minor_hallucinations", 10 ], [ "intermediate_hallucinations", 6 ], [ "bad_hallucinations", 4 ] ] } ] }, @@ -27,11 +23,11 @@ "effect": [ { "weighted_list_eocs": [ - [ "paranoid", { "const": 75 } ], - [ "grandiose", { "const": 25 } ], - [ "self_talk", { "const": 14 } ], - [ "weapon_talk_hallucination", { "const": 14 } ], - [ "false_npc_talk", { "const": 12 } ] + [ "paranoid", 75 ], + [ "grandiose", 25 ], + [ "self_talk", 14 ], + [ "weapon_talk_hallucination", 14 ], + [ "false_npc_talk", 12 ] ] } ] @@ -41,20 +37,14 @@ "id": "intermediate_hallucinations", "effect": [ { - "weighted_list_eocs": [ - [ "self_shout", { "const": 30 } ], - [ "hear_false_sound", { "const": 20 } ], - [ "formication", { "const": 20 } ], - [ "numbness", { "const": 15 } ], - [ "shaking", { "const": 10 } ] - ] + "weighted_list_eocs": [ [ "self_shout", 30 ], [ "hear_false_sound", 20 ], [ "formication", 20 ], [ "numbness", 15 ], [ "shaking", 10 ] ] } ] }, { "type": "effect_on_condition", "id": "bad_hallucinations", - "effect": [ { "weighted_list_eocs": [ [ "creature_hallucinations", { "const": 20 } ], [ "visuals", { "const": 10 } ] ] } ] + "effect": [ { "weighted_list_eocs": [ [ "creature_hallucinations", 20 ], [ "visuals", 10 ] ] } ] }, { "type": "effect_on_condition", diff --git a/data/json/furniture_and_terrain/furniture_nether_monster.json b/data/json/furniture_and_terrain/furniture_nether_monster.json index dabb44046e946..126dbba240dee 100644 --- a/data/json/furniture_and_terrain/furniture_nether_monster.json +++ b/data/json/furniture_and_terrain/furniture_nether_monster.json @@ -54,27 +54,24 @@ "effect": [ { "weighted_list_eocs": [ - [ - { "id": "admire", "effect": { "u_message": "You admire the lily. Isn't it beautiful?", "popup": true } }, - { "const": 15 } - ], + [ { "id": "admire", "effect": { "u_message": "You admire the lily. Isn't it beautiful?", "popup": true } }, 15 ], [ { "id": "admire_2", "effect": { "u_message": "You worship the lily, and feel truly fulfilled.", "popup": true } }, - { "const": 10 } + 10 ], [ { "id": "admire_3", "effect": { "u_message": "You bow to the lily, and gain immense satisfaction in having done so.", "popup": true } }, - { "const": 5 } + 5 ], [ { "id": "admire_4", "effect": { "u_message": "You focus on the lily and realize it truly is perfection *incarnate*.", "popup": true } }, - { "const": 2 } + 2 ] ] } diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index bb4aaeb4a9747..8f986abff97b6 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -645,11 +645,7 @@ ], "false_effect": [ { - "weighted_list_eocs": [ - [ "EOC_shifting_mass_attack", { "const": 2 } ], - [ "EOC_PORTAL_TELEPORT_STUCK_START", { "const": 2 } ], - [ "EOC_PORTAL_INCORPOREAL", { "const": 1 } ] - ] + "weighted_list_eocs": [ [ "EOC_shifting_mass_attack", 2 ], [ "EOC_PORTAL_TELEPORT_STUCK_START", 2 ], [ "EOC_PORTAL_INCORPOREAL", 1 ] ] }, { "u_message": "For an instant you feel the absence's hunger upon you." } ] diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json index 4372ff1366155..1cbffaa6c71cb 100644 --- a/data/json/npcs/missiondef.json +++ b/data/json/npcs/missiondef.json @@ -331,11 +331,7 @@ "effect": [ "stop_following", { - "weighted_list_eocs": [ - [ { "id": "get_katana" }, { "const": 5 } ], - [ { "id": "get_deagle_44" }, { "const": 10 } ], - [ { "id": "get_m4_carbine" }, { "const": 6 } ] - ] + "weighted_list_eocs": [ [ { "id": "get_katana" }, 5 ], [ { "id": "get_deagle_44" }, 10 ], [ { "id": "get_m4_carbine" }, 6 ] ] } ] }, diff --git a/data/mods/Defense_Mode/effects_on_condition/random_event_eocs.json b/data/mods/Defense_Mode/effects_on_condition/random_event_eocs.json index 916c010e231d1..e126159c03192 100644 --- a/data/mods/Defense_Mode/effects_on_condition/random_event_eocs.json +++ b/data/mods/Defense_Mode/effects_on_condition/random_event_eocs.json @@ -14,9 +14,9 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_DEFENSE_MODE_RANDOM_NPC", { "const": 10 } ], - [ "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER", { "const": 6 } ], - [ "EOC_DEFENSE_MODE_BANDIT_ATTACK", { "const": 1 } ] + [ "EOC_DEFENSE_MODE_RANDOM_NPC", 10 ], + [ "EOC_DEFENSE_MODE_RANDOM_NPC_ROBBER", 6 ], + [ "EOC_DEFENSE_MODE_BANDIT_ATTACK", 1 ] ] } ] 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 10450f06a5bc5..e6aa527dadf19 100644 --- a/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json +++ b/data/mods/Defense_Mode/effects_on_condition/wave_eocs.json @@ -48,24 +48,24 @@ "effect": [ { "weighted_list_eocs": [ - [ "DEFENSE_MODE_WAVE_SPAWN_ZOMBIES", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_SPECIAL_ZOMBIES", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_SPIDERS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_ROBOTS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_TRIFFIDS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_SUBSPACE", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_DINOS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_LIZARDFOLK", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_GOLEMS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_CANDY", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_MYTHOS", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_EXODII", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_XEDRA", { "const": 1 } ], - [ "DEFENSE_MODE_WAVE_SPAWN_AFTERSHOCK", { "const": 1 } ] + [ "DEFENSE_MODE_WAVE_SPAWN_ZOMBIES", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_SPECIAL_ZOMBIES", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_SPIDERS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_ROBOTS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_TRIFFIDS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_SUBSPACE", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_DINOS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_LIZARDFOLK", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_GOLEMS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_GOBLINS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_ORCS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_MEGAFAUNA", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_PSYCHICS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_CANDY", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_MYTHOS", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_EXODII", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_XEDRA", 1 ], + [ "DEFENSE_MODE_WAVE_SPAWN_AFTERSHOCK", 1 ] ] } ] diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json index aa39c253f8c1e..6a5b9fdcbc8b2 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json @@ -562,15 +562,15 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_BIOKIN_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_CLAIR_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_ELECTRO_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_PHOTOKIN_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_PYROKIN_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_TELEKIN_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_TEEP_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_TELEPORT_MATRIX_AWAKENING_3", { "const": 1 } ], - [ "EOC_VITAKIN_MATRIX_AWAKENING_3", { "const": 1 } ] + [ "EOC_BIOKIN_MATRIX_AWAKENING_3", 1 ], + [ "EOC_CLAIR_MATRIX_AWAKENING_3", 1 ], + [ "EOC_ELECTRO_MATRIX_AWAKENING_3", 1 ], + [ "EOC_PHOTOKIN_MATRIX_AWAKENING_3", 1 ], + [ "EOC_PYROKIN_MATRIX_AWAKENING_3", 1 ], + [ "EOC_TELEKIN_MATRIX_AWAKENING_3", 1 ], + [ "EOC_TEEP_MATRIX_AWAKENING_3", 1 ], + [ "EOC_TELEPORT_MATRIX_AWAKENING_3", 1 ], + [ "EOC_VITAKIN_MATRIX_AWAKENING_3", 1 ] ] }, { "u_assign_activity": "ACT_CRYSTAL_AWAKENING_MEDITATION", "duration": 5 }, @@ -598,16 +598,16 @@ "case": 1, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 110 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 110 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -615,16 +615,16 @@ "case": 2, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 90 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 90 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -632,16 +632,16 @@ "case": 3, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 70 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 70 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -649,16 +649,16 @@ "case": 4, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 60 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 60 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -666,16 +666,16 @@ "case": 5, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 45 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 45 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -683,16 +683,16 @@ "case": 6, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 30 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 30 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -700,16 +700,16 @@ "case": 8, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 25 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 25 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -717,16 +717,16 @@ "case": 10, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 20 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 20 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -734,16 +734,16 @@ "case": 15, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 10 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 10 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } } @@ -771,16 +771,16 @@ "case": 1, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 120 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 120 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -788,16 +788,16 @@ "case": 2, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 90 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 90 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -805,16 +805,16 @@ "case": 3, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 70 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 70 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -822,16 +822,16 @@ "case": 4, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 60 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 60 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -839,16 +839,16 @@ "case": 5, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 45 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 45 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -856,16 +856,16 @@ "case": 6, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 30 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 30 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -873,16 +873,16 @@ "case": 8, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 25 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 25 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -890,16 +890,16 @@ "case": 10, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 20 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 20 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -907,15 +907,15 @@ "case": 15, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 10 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 10 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } } @@ -943,16 +943,16 @@ "case": 1, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 120 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 120 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -960,16 +960,16 @@ "case": 2, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 90 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 90 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -977,16 +977,16 @@ "case": 3, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 70 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 70 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -994,16 +994,16 @@ "case": 4, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 60 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 60 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -1011,16 +1011,16 @@ "case": 5, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 45 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 45 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -1028,16 +1028,16 @@ "case": 6, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 30 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 30 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -1045,16 +1045,16 @@ "case": 8, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 25 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 25 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -1062,16 +1062,16 @@ "case": 10, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 20 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 20 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } }, @@ -1079,16 +1079,16 @@ "case": 15, "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_NULL_AWAKENING", { "const": 10 } ], - [ "EOC_PORTAL_BIOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_CLAIR_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_ELECTRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PHOTOKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PYRO_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TELEKIN_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_TEEP_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_PORTER_AWAKENING", { "const": 1 } ], - [ "EOC_PORTAL_VITA_AWAKENING", { "const": 1 } ] + [ "EOC_PORTAL_NULL_AWAKENING", 10 ], + [ "EOC_PORTAL_BIOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_CLAIR_AWAKENING", 1 ], + [ "EOC_PORTAL_ELECTRO_AWAKENING", 1 ], + [ "EOC_PORTAL_PHOTOKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_PYRO_AWAKENING", 1 ], + [ "EOC_PORTAL_TELEKIN_AWAKENING", 1 ], + [ "EOC_PORTAL_TEEP_AWAKENING", 1 ], + [ "EOC_PORTAL_PORTER_AWAKENING", 1 ], + [ "EOC_PORTAL_VITA_AWAKENING", 1 ] ] } } diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json index 50c03abd4e83e..91964a24fc621 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json @@ -70,9 +70,9 @@ "case": 15, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ] ] } }, @@ -80,11 +80,11 @@ "case": 25, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ] ] } }, @@ -92,12 +92,12 @@ "case": 50, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ] ] } }, @@ -105,13 +105,13 @@ "case": 70, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ] ] } }, @@ -119,15 +119,15 @@ "case": 85, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", { "const": 3 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", 3 ] ] } }, @@ -135,17 +135,17 @@ "case": 100, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_BREATHING", { "const": 3 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_BREATHING", 3 ] ] } }, @@ -153,19 +153,19 @@ "case": 100, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_BREATHING", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_HALLUCINATIONS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_FORCE_WAVE", { "const": 3 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_BREATHING", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_HALLUCINATIONS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_FORCE_WAVE", 3 ] ] } }, @@ -173,20 +173,20 @@ "case": 150, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_BREATHING", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_HALLUCINATIONS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_FORCE_WAVE", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_NO_PSIONICS", { "const": 2 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_BREATHING", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_HALLUCINATIONS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_FORCE_WAVE", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_NO_PSIONICS", 2 ] ] } }, @@ -194,19 +194,19 @@ "case": 200, "effect": { "weighted_list_eocs": [ - [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", { "const": 6 } ], - [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", { "const": 4 } ], - [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", { "const": 8 } ], - [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", { "const": 5 } ], - [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", { "const": 3 } ], - [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_BREATHING", { "const": 3 } ], - [ "EOC_NETHER_EFFECT_CHECK_NO_PSIONICS", { "const": 2 } ], - [ "EOC_NETHER_EFFECT_CHECK_SUMMON_HOUNDS", { "const": 1 } ] + [ "EOC_DRAIN_EFFECT_CHECK_HEADACHE", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT", 6 ], + [ "EOC_NETHER_EFFECT_CHECK_COLD_WIND", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE", 4 ], + [ "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED", 8 ], + [ "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS", 5 ], + [ "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_FATIGUE", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_TELEPORT_LOCK", 3 ], + [ "EOC_DRAIN_EFFECT_CHECK_WEAKNESS", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_BREATHING", 3 ], + [ "EOC_NETHER_EFFECT_CHECK_NO_PSIONICS", 2 ], + [ "EOC_NETHER_EFFECT_CHECK_SUMMON_HOUNDS", 1 ] ] } } diff --git a/data/mods/Sky_Island/missions_and_mapgen.json b/data/mods/Sky_Island/missions_and_mapgen.json index bfbb86cea9a3a..18234fce66024 100644 --- a/data/mods/Sky_Island/missions_and_mapgen.json +++ b/data/mods/Sky_Island/missions_and_mapgen.json @@ -16,7 +16,7 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_Location1w", { "const": 15 } ], + [ "EOC_Location1w", 15 ], [ "EOC_Location2w", { "global_val": "var", "var_name": "hardmissions", "default": 0 } ], [ "EOC_Location3w", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ] ] @@ -30,7 +30,7 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_Location1e", { "const": 15 } ], + [ "EOC_Location1e", 15 ], [ "EOC_Location2e", { "global_val": "var", "var_name": "hardmissions", "default": 0 } ], [ "EOC_Location3e", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ] ] @@ -44,7 +44,7 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_Location1m", { "const": 15 } ], + [ "EOC_Location1m", 15 ], [ "EOC_Location2m", { "global_val": "var", "var_name": "hardmissions", "default": 0 } ], [ "EOC_Location3m", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ] ] @@ -71,13 +71,13 @@ "effect": [ { "weighted_list_eocs": [ - [ "EOC_slaughtermission1", { "const": 10 } ], - [ "EOC_slaughtermission2", { "const": 20 } ], + [ "EOC_slaughtermission1", 10 ], + [ "EOC_slaughtermission2", 20 ], [ "EOC_slaughtermission3", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ], [ "EOC_slaughtermission4", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ], [ "EOC_slaughtermission5", { "global_val": "var", "var_name": "hardmissions", "default": 0 } ], - [ "EOC_slaughtermission6", { "const": 5 } ], - [ "EOC_slaughtermission7", { "const": 5 } ] + [ "EOC_slaughtermission6", 5 ], + [ "EOC_slaughtermission7", 5 ] ] } ] @@ -95,11 +95,11 @@ }, { "weighted_list_eocs": [ - [ "EOC_bonusmission_1", { "const": 45 } ], - [ "EOC_bonusmission_2", { "const": 15 } ], - [ "EOC_bonusmission_3", { "const": 10 } ], - [ "EOC_bonusmission_4", { "const": 15 } ], - [ "EOC_bonusmission_5", { "const": 10 } ], + [ "EOC_bonusmission_1", 45 ], + [ "EOC_bonusmission_2", 15 ], + [ "EOC_bonusmission_3", 10 ], + [ "EOC_bonusmission_4", 15 ], + [ "EOC_bonusmission_5", 10 ], [ "EOC_bonusmission_6", { "global_val": "var", "var_name": "hardmissions", "default": 0 } ], [ "EOC_bonusmission_7", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ], [ "EOC_bonusmission_8", { "global_val": "var", "var_name": "hardermissions", "default": 0 } ], diff --git a/data/mods/Xedra_Evolved/eocs/eoc_riddles.json b/data/mods/Xedra_Evolved/eocs/eoc_riddles.json index 4cda03fc66526..a4d42874aea63 100644 --- a/data/mods/Xedra_Evolved/eocs/eoc_riddles.json +++ b/data/mods/Xedra_Evolved/eocs/eoc_riddles.json @@ -221,11 +221,11 @@ "//2": "dreamer is an allusion of king, ruler or noble, when eater is soldier and layman", "effect": { "weighted_list_eocs": [ - [ "EOC_XE_ED_RIDDLE_1", { "const": 1 } ], - [ "EOC_XE_ED_RIDDLE_2", { "const": 1 } ], - [ "EOC_XE_ED_RIDDLE_3", { "const": 1 } ], - [ "EOC_XE_ED_RIDDLE_4", { "const": 1 } ], - [ "EOC_XE_ED_RIDDLE_5", { "const": 1 } ] + [ "EOC_XE_ED_RIDDLE_1", 1 ], + [ "EOC_XE_ED_RIDDLE_2", 1 ], + [ "EOC_XE_ED_RIDDLE_3", 1 ], + [ "EOC_XE_ED_RIDDLE_4", 1 ], + [ "EOC_XE_ED_RIDDLE_5", 1 ] ] } }, @@ -342,11 +342,11 @@ "id": "EOC_XE_RUN_RIDDLE_INVENTOR_DREAMSMITH", "effect": { "weighted_list_eocs": [ - [ "EOC_XE_ID_RIDDLE_1", { "const": 1 } ], - [ "EOC_XE_ID_RIDDLE_2", { "const": 1 } ], - [ "EOC_XE_ID_RIDDLE_3", { "const": 1 } ], - [ "EOC_XE_ID_RIDDLE_4", { "const": 1 } ], - [ "EOC_XE_ID_RIDDLE_5", { "const": 1 } ] + [ "EOC_XE_ID_RIDDLE_1", 1 ], + [ "EOC_XE_ID_RIDDLE_2", 1 ], + [ "EOC_XE_ID_RIDDLE_3", 1 ], + [ "EOC_XE_ID_RIDDLE_4", 1 ], + [ "EOC_XE_ID_RIDDLE_5", 1 ] ] } }, diff --git a/data/mods/Xedra_Evolved/mutations/mutation_eocs.json b/data/mods/Xedra_Evolved/mutations/mutation_eocs.json index 0584ff6d22b7d..eb3b45e9a2785 100644 --- a/data/mods/Xedra_Evolved/mutations/mutation_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/mutation_eocs.json @@ -15,8 +15,8 @@ "run_eocs": { "id": "eoc_eggsac_mantain_or_remove_switch", "condition": { "u_has_trait": "EGGSAC_SURVIVABLE" }, - "effect": { "weighted_list_eocs": [ [ "eggsac_mantain", { "const": 10 } ], [ "eggsac_remove", { "u_val": "strength" } ] ] }, - "false_effect": { "weighted_list_eocs": [ [ "eggsac_mantain", { "const": 25 } ], [ "eggsac_remove", { "u_val": "strength" } ] ] } + "effect": { "weighted_list_eocs": [ [ "eggsac_mantain", 10 ], [ "eggsac_remove", { "u_val": "strength" } ] ] }, + "false_effect": { "weighted_list_eocs": [ [ "eggsac_mantain", 25 ], [ "eggsac_remove", { "u_val": "strength" } ] ] } } } }, diff --git a/data/mods/innawood/portal_storm_effect_on_condition.json b/data/mods/innawood/portal_storm_effect_on_condition.json index 4769c97f49120..76950e3b636b7 100644 --- a/data/mods/innawood/portal_storm_effect_on_condition.json +++ b/data/mods/innawood/portal_storm_effect_on_condition.json @@ -27,10 +27,10 @@ "id": "EOC_WORSEN_PORTAL_STORM", "effect": { "weighted_list_eocs": [ - [ "EOC_PORTAL_STRENGTHEN", { "const": 3 } ], - [ "EOC_PORTAL_LENGTHEN", { "const": 3 } ], - [ "EOC_PORTAL_WEAKEN", { "const": 3 } ], - [ "EOC_PORTAL_SHORTEN", { "const": 3 } ] + [ "EOC_PORTAL_STRENGTHEN", 3 ], + [ "EOC_PORTAL_LENGTHEN", 3 ], + [ "EOC_PORTAL_WEAKEN", 3 ], + [ "EOC_PORTAL_SHORTEN", 3 ] ] } }, diff --git a/src/npctalk.cpp b/src/npctalk.cpp index fca6803de52fc..765b857f39b98 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -5258,9 +5258,17 @@ void talk_effect_fun_t::set_weighted_list_eocs( const JsonObject &jo, std::vector>> eoc_pairs; for( JsonArray ja : jo.get_array( member ) ) { JsonValue eoc = ja.next_value(); - JsonObject weight = ja.next_object(); - eoc_pairs.emplace_back( effect_on_conditions::load_inline_eoc( eoc, "" ), - conditional_t::get_get_dbl( weight ) ); + if( ja.test_int() ) { + int weight = ja.next_int(); + eoc_pairs.emplace_back( effect_on_conditions::load_inline_eoc( eoc, + "" ), [weight]( dialogue const & ) { + return weight; + } ); + } else { + JsonObject weight = ja.next_object(); + eoc_pairs.emplace_back( effect_on_conditions::load_inline_eoc( eoc, "" ), + conditional_t::get_get_dbl( weight ) ); + } } function = [eoc_pairs]( dialogue & d ) { weighted_int_list eocs;