diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/blazing.json b/data/mods/BombasticPerks/perkdata/enchanting_master/blazing.json deleted file mode 100644 index efbb41ed8cfab..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/blazing.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_BLAZING", - "type": "json_flag", - "info": "Blazing Enchantment", - "item_suffix": " (Blazing)" - }, - { - "id": "EOC_enchanting_master_init_blazing", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_BLAZING" } - }, - { - "id": "EOC_enchanting_master_remove_blazing", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_BLAZING" } - }, - { - "id": "EOC_enchanting_master_blazing", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "effect": [ - { "npc_location_variable": { "context_val": "loc" } }, - { - "u_cast_spell": { "id": "spell_enchanting_master_blazing", "min_level": 0, "max_level": 0 }, - "loc": { "context_val": "loc" } - }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - }, - { - "id": "spell_enchanting_master_blazing", - "type": "SPELL", - "name": "blazing effect", - "description": "", - "effect": "attack", - "shape": "cone", - "valid_targets": [ "ally", "hostile", "ground" ], - "flags": [ "IGNITE_FLAMMABLE", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "spell_class": "perk_enchanting_master", - "min_aoe": 180, - "max_aoe": 180, - "min_range": 3, - "max_range": 3, - "min_damage": "u_val('intelligence') * 2 + u_val('strength')", - "max_damage": "u_val('intelligence') * 2 + u_val('strength')", - "base_casting_time": 0, - "base_energy_cost": 0, - "energy_source": "MANA", - "difficulty": 0, - "damage_type": "heat" - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/chilling.json b/data/mods/BombasticPerks/perkdata/enchanting_master/chilling.json deleted file mode 100644 index f725b2ed522cd..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/chilling.json +++ /dev/null @@ -1,53 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_CHILLING", - "type": "json_flag", - "info": "Chilling Enchantment", - "item_suffix": " (Chilling)" - }, - { - "id": "EOC_enchanting_master_init_chilling", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_CHILLING" } - }, - { - "id": "EOC_enchanting_master_remove_chilling", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_CHILLING" } - }, - { - "id": "EOC_enchanting_master_chilling", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "effect": [ - { "npc_location_variable": { "context_val": "loc" } }, - { - "u_cast_spell": { "id": "spell_enchanting_master_chilling", "min_level": 0, "max_level": 0 }, - "loc": { "context_val": "loc" } - }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - }, - { - "id": "spell_enchanting_master_chilling", - "type": "SPELL", - "name": "chilling effect", - "description": "", - "effect": "mod_moves", - "shape": "blast", - "valid_targets": [ "ally", "hostile", "ground" ], - "flags": [ "SILENT", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "spell_class": "perk_enchanting_master", - "min_range": 10, - "max_range": 10, - "min_damage": -50, - "max_damage": -50, - "base_casting_time": 0, - "base_energy_cost": 0, - "energy_source": "MANA", - "difficulty": 0 - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/corrupting.json b/data/mods/BombasticPerks/perkdata/enchanting_master/corrupting.json deleted file mode 100644 index 0d8e43f77657f..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/corrupting.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_CORRUPTING", - "type": "json_flag", - "info": "Corrupting Enchantment", - "item_suffix": " (Corrupting)" - }, - { - "id": "EOC_enchanting_master_init_corrupting", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_CORRUPTING" } - }, - { - "id": "EOC_enchanting_master_remove_corrupting", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_CORRUPTING" } - }, - { - "id": "EOC_enchanting_master_corrupting_on_kill_monster", - "type": "effect_on_condition", - "eoc_type": "EVENT", - "required_event": "character_kills_monster", - "condition": { "u_has_wielded_with_flag": "ITEM_ENCHANTMENT_CORRUPTING" }, - "effect": [ - { - "u_spawn_monster": { "context_val": "victim_type" }, - "real_count": 1, - "min_radius": 1, - "max_radius": 4, - "friendly": true, - "lifespan": [ "2 minutes", "5 minutes" ], - "spawn_message": "You corrupted your enemy!", - "spawn_message_plural": "You corrupted your enemies!", - "true_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" - } - ] - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/grim.json b/data/mods/BombasticPerks/perkdata/enchanting_master/grim.json deleted file mode 100644 index b44a22fdc6a82..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/grim.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_GRIM", - "type": "json_flag", - "info": "Grim Enchantment", - "item_suffix": " (Grim)" - }, - { - "id": "EOC_enchanting_master_init_grim", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_GRIM" } - }, - { - "id": "EOC_enchanting_master_remove_grim", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_GRIM" } - }, - { - "id": "EOC_enchanting_master_grim", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "effect": [ - { "math": [ "_miss_percentage", "=", "( n_hp_max('torso')-n_hp('torso') ) / n_hp_max('torso')" ] }, - { "math": [ "_prob", "=", "max(0.01, 0.5 * _miss_percentage * _miss_percentage )" ] }, - { - "if": { "math": [ "rng(0,1)", "<", "_prob" ] }, - "then": [ - { "npc_location_variable": { "context_val": "loc" } }, - { - "u_cast_spell": { "id": "spell_enchanting_master_grim", "min_level": 0, "max_level": 0 }, - "loc": { "context_val": "loc" } - }, - { "u_message": "You executed your enemy." }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - } - ] - }, - { - "id": "spell_enchanting_master_grim", - "type": "SPELL", - "name": "grim effect", - "description": "", - "valid_targets": [ "self", "ally", "hostile", "ground" ], - "min_damage": { "math": [ "u_val('strength') * 50" ] }, - "max_damage": { "math": [ "u_val('strength') * 50" ] }, - "min_range": 10, - "max_range": 10, - "effect": "attack", - "shape": "blast", - "damage_type": "pure", - "flags": [ "SILENT", "NO_FAIL" ] - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/kinetic.json b/data/mods/BombasticPerks/perkdata/enchanting_master/kinetic.json deleted file mode 100644 index 8076610fa9777..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/kinetic.json +++ /dev/null @@ -1,93 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_KINETIC", - "type": "json_flag", - "info": "Kinetic Enchantment", - "item_suffix": " (Kinetic)" - }, - { - "id": "EOC_enchanting_master_init_kinetic", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_KINETIC" } - }, - { - "id": "EOC_enchanting_master_remove_kinetic", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": [ { "npc_unset_flag": "ITEM_ENCHANTMENT_KINETIC" }, { "u_lose_effect": "conserved_damage" } ] - }, - { - "type": "effect_type", - "id": "conserved_damage", - "name": [ "Conserved Damage" ], - "desc": [ - "Your weapon has stored the excess force from a previous killing blow, and will apply it as bonus damage to your next attack. The energy will slowly fade over time, however." - ], - "apply_message": "You feel a surge of power coming into your weapon.", - "max_intensity": 100, - "max_effective_intensity": 100, - "int_decay_step": -1, - "int_decay_tick": 1, - "int_decay_remove": true - }, - { - "id": "EOC_enchanting_master_kinetic_on_kill_monster", - "type": "effect_on_condition", - "eoc_type": "EVENT", - "required_event": "character_kills_monster", - "condition": { "u_has_wielded_with_flag": "ITEM_ENCHANTMENT_KINETIC" }, - "effect": [ { "u_add_effect": "conserved_damage", "intensity": 100, "duration": "PERMANENT" } ] - }, - { - "id": "EOC_enchanting_master_kinetic_on_kill_character", - "type": "effect_on_condition", - "eoc_type": "EVENT", - "required_event": "character_kills_character", - "condition": { "u_has_wielded_with_flag": "ITEM_ENCHANTMENT_KINETIC" }, - "effect": [ { "u_add_effect": "conserved_damage", "intensity": 100, "duration": "PERMANENT" } ] - }, - { - "id": "EOC_enchanting_master_kinetic", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "condition": { "math": [ "u_effect_intensity('conserved_damage', 'bodypart': 'bp_null')", ">", "0" ] }, - "effect": [ - { "npc_location_variable": { "context_val": "loc" } }, - { "math": [ "_spell_level", "=", "floor(u_effect_intensity('conserved_damage', 'bodypart': 'bp_null') / 10)" ] }, - { "u_lose_effect": "conserved_damage" }, - { - "u_cast_spell": { - "id": "spell_enchanting_master_kinetic", - "min_level": { "context_val": "spell_level" }, - "max_level": { "context_val": "spell_level" } - }, - "loc": { "context_val": "loc" } - }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - }, - { - "id": "spell_enchanting_master_kinetic", - "type": "SPELL", - "name": "kinetic effect", - "description": "", - "effect": "attack", - "damage_type": "pure", - "shape": "blast", - "max_level": 10, - "valid_targets": [ "ally", "hostile", "ground" ], - "flags": [ "SILENT", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "spell_class": "perk_enchanting_master", - "min_range": 10, - "max_range": 10, - "min_damage": 0, - "max_damage": { "math": [ "u_val('strength') * 5" ] }, - "damage_increment": { "math": [ "u_val('strength') / 2" ] }, - "base_casting_time": 0, - "base_energy_cost": 0, - "energy_source": "MANA", - "difficulty": 0 - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/lucky.json b/data/mods/BombasticPerks/perkdata/enchanting_master/lucky.json deleted file mode 100644 index 162fd3dcd0e73..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/lucky.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_LUCKY", - "type": "json_flag", - "info": "Lucky Enchantment", - "item_suffix": " (Lucky)" - }, - { - "id": "EOC_enchanting_master_init_lucky", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_LUCKY" } - }, - { - "id": "EOC_enchanting_master_remove_lucky", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_LUCKY" } - }, - { - "type": "item_group", - "subtype": "distribution", - "id": "enchating_master_lucky_items", - "entries": [ { "item": "RobofacCoin", "prob": 50 }, { "item": "FMCNote", "prob": 50 } ] - }, - { - "id": "EOC_enchanting_master_lucky_spawn", - "type": "effect_on_condition", - "condition": { "x_in_y_chance": { "x": 1, "y": 10 } }, - "effect": [ - { "u_message": "You feel a sense of luck." }, - { "u_spawn_item": "enchating_master_lucky_items", "use_item_group": true, "suppress_message": true } - ] - }, - { - "id": "EOC_enchanting_master_lucky_on_kill_monster", - "type": "effect_on_condition", - "eoc_type": "EVENT", - "required_event": "character_kills_monster", - "condition": { "u_has_wielded_with_flag": "ITEM_ENCHANTMENT_LUCKY" }, - "effect": { "run_eocs": "EOC_enchanting_master_lucky_spawn" } - }, - { - "id": "EOC_enchanting_master_lucky_on_kill_character", - "type": "effect_on_condition", - "eoc_type": "EVENT", - "required_event": "character_kills_character", - "condition": { "u_has_wielded_with_flag": "ITEM_ENCHANTMENT_LUCKY" }, - "effect": { "run_eocs": "EOC_enchanting_master_lucky_spawn" } - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_on_hit_effect.json b/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_on_hit_effect.json deleted file mode 100644 index bcfbf8e397b13..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_on_hit_effect.json +++ /dev/null @@ -1,122 +0,0 @@ -[ - { - "type": "enchantment", - "id": "ench_enchanting_master", - "condition": "ALWAYS", - "hit_you_effect": [ { "id": "spell_enchanting_master_hit_you" } ] - }, - { - "id": "spell_enchanting_master_hit_you", - "type": "SPELL", - "name": "effect of enchanting weapon", - "description": "effect when you attack others", - "valid_targets": [ "self", "ally", "hostile", "ground" ], - "effect": "effect_on_condition", - "effect_str": "EOC_enchanting_master_hit_you", - "spell_class": "perk_enchanting_master", - "flags": [ "SILENT", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "shape": "blast", - "base_casting_time": 0, - "base_energy_cost": 0, - "min_range": 10, - "max_range": 10, - "energy_source": "MANA", - "difficulty": 0, - "max_level": 0, - "teachable": false - }, - { - "id": "EOC_enchanting_master_hit_you", - "type": "effect_on_condition", - "effect": [ - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_BLAZING", "eoc": "EOC_enchanting_master_blazing" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_CHILLING", "eoc": "EOC_enchanting_master_chilling" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_SHOCKING", "eoc": "EOC_enchanting_master_shocking" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_KINETIC", "eoc": "EOC_enchanting_master_kinetic" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_PROJECTING", "eoc": "EOC_enchanting_master_projecting" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_GRIM", "eoc": "EOC_enchanting_master_grim" } - }, - { - "run_eoc_with": "EOC_enchanting_master_ench_effect", - "variables": { "flag": "ITEM_ENCHANTMENT_VAMPIRIC", "eoc": "EOC_enchanting_master_vampiric" } - } - ] - }, - { - "id": "EOC_enchanting_master_ench_effect", - "type": "effect_on_condition", - "//": "In this eoc, u is the victim, npc is avatar.", - "//flag": "The required flag", - "//eoc": "The corresponding triggered eoc. In this eoc, u is avatar, npc is the victim since I thick this is more intuitive.", - "condition": { - "and": [ { "expects_vars": [ "flag", "eoc" ] }, { "npc_has_wielded_with_flag": { "context_val": "flag" } }, "u_exists" ] - }, - "effect": { - "run_eoc_with": { "id": "_EOC_enchanting_master_ench_effect", "effect": { "run_eocs": { "context_val": "eoc" } } }, - "alpha_talker": "npc", - "beta_talker": "u" - } - }, - { - "id": "EOC_enchanting_master_item_ench_trigger_count_minus_one", - "type": "effect_on_condition", - "//": "The trigger count will minus 1. If it becomes 0, the enchantment on this item will be removed.", - "effect": [ - { - "u_run_inv_eocs": "random", - "search_data": [ { "wielded_only": true } ], - "true_eocs": "EOC_enchanting_master_trigger_count_minus_one" - } - ] - }, - { - "id": "EOC_enchanting_master_trigger_count_minus_one", - "//": "-999 means infinite trigger count", - "type": "effect_on_condition", - "effect": [ - { - "if": { "math": [ "n_item_ench_trigger_count", "==", "-999" ] }, - "then": [ ], - "else": [ - { "math": [ "n_item_ench_trigger_count", "-=", "1" ] }, - { - "if": { "math": [ "n_item_ench_trigger_count", "<=", "0" ] }, - "then": [ - { "run_eocs": "EOC_enchanting_master_remove_ench" }, - { "message": "Your weapon loses power. Its glow fading into darkness.", "type": "warning" } - ], - "else": { - "if": { "math": [ "n_item_ench_trigger_count", "==", "floor(n_item_ench_total_trigger_count * 3 / 4)" ] }, - "then": { "message": "Your weapon hums with vibrant energy.", "type": "warning" }, - "else": { - "if": { "math": [ "n_item_ench_trigger_count", "==", "floor(n_item_ench_total_trigger_count * 2 / 4)" ] }, - "then": { "message": "Your weapon's energy flickers slightly, but it still maintains its potency.", "type": "warning" }, - "else": { - "if": { "math": [ "n_item_ench_trigger_count", "==", "floor(n_item_ench_total_trigger_count * 1 / 4)" ] }, - "then": { "message": "Your weapon's glow dims, its energy waning.", "type": "warning" } - } - } - } - } - ] - } - ] - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_selector.json b/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_selector.json deleted file mode 100644 index 63209586c372d..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/main_ench_selector.json +++ /dev/null @@ -1,192 +0,0 @@ -[ - { - "id": "spell_enchanting_master", - "type": "SPELL", - "name": "Enchating Weapon", - "description": "Enchant the weapon you wield. Mana cost is 500. You can choose from 3 random enchantments.", - "valid_targets": [ "self" ], - "effect": "effect_on_condition", - "effect_str": "EOC_enchanting_master", - "spell_class": "perk_enchanting_master", - "flags": [ "SILENT", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "shape": "blast", - "base_casting_time": 0, - "base_energy_cost": 0, - "energy_source": "MANA", - "difficulty": 0, - "max_level": 0, - "teachable": false - }, - { - "id": "EOC_enchanting_master", - "type": "effect_on_condition", - "effect": { - "if": "u_has_weapon", - "then": [ - { "math": [ "_mana_cost", "=", "500" ] }, - { - "if": { "math": [ "u_val('mana')", ">=", "_mana_cost" ] }, - "then": [ - { - "u_run_inv_eocs": "random", - "search_data": [ { "wielded_only": true } ], - "true_eocs": "EOC_enchanting_master_selector" - } - ], - "else": { "message": "You don not have enough mana.", "popup": true } - } - ], - "else": { "message": "You have not wield any weapons.", "popup": true } - } - }, - { - "id": "EOC_enchanting_master_init_ench", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "//1": "This will initilize trigger_count and item_ench_type", - "//2": "Other initializations should be done in EOC_enchanting_master_init_", - "condition": { "expects_vars": [ "type", "trigger_count" ] }, - "effect": [ - { "set_string_var": { "context_val": "type" }, "target_var": { "npc_val": "item_ench_type" } }, - { "set_string_var": { "context_val": "trigger_count" }, "target_var": { "npc_val": "item_ench_trigger_count" } }, - { - "set_string_var": { "context_val": "trigger_count" }, - "target_var": { "npc_val": "item_ench_total_trigger_count" } - }, - { - "set_string_var": "EOC_enchanting_master_init_", - "target_var": { "context_val": "init_eoc" }, - "parse_tags": true - }, - { "run_eocs": { "context_val": "init_eoc" } } - ] - }, - { - "id": "EOC_enchanting_master_remove_ench", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "//1": "This will remove trigger_count and item_ench_type", - "//2": "Other removements should be done in EOC_enchanting_master_remove_", - "effect": [ - { - "set_string_var": "EOC_enchanting_master_remove_", - "target_var": { "context_val": "remove_eoc" }, - "parse_tags": true - }, - { "run_eocs": { "context_val": "remove_eoc" } }, - { "npc_lose_var": "item_ench_total_trigger_count" }, - { "npc_lose_var": "item_ench_trigger_count" }, - { "npc_lose_var": "item_ench_type" } - ] - }, - { - "type": "jmath_function", - "id": "is_valid_ench_option", - "num_args": 1, - "return": "((_0 == _rand_1) + (_0 == _rand_2) + (_0 == _rand_3) ) > 0" - }, - { - "id": "EOC_enchanting_master_selector", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "//rand1 ~ rand3": "they are three different numbers that determine which 3 enchantments are shown in the menu", - "effect": { - "if": { "math": [ "has_var(n_item_ench_type)" ] }, - "then": { - "if": { "u_query": "Your weapon has been enchanted. Do you want to remove its enchantment?", "default": false }, - "then": { "run_eocs": "EOC_enchanting_master_remove_ench" } - }, - "else": { - "if": { "math": [ "n_val('count')", ">", "1" ] }, - "then": { "message": "You can not enchant more than one item", "popup": true }, - "else": [ - { "math": [ "_ench_num", "=", "9" ] }, - { "math": [ "u_val('mana')", "-=", "_mana_cost" ] }, - { "math": [ "_rand_1", "=", "1+rand(_ench_num-1)" ] }, - { "math": [ "_rand_2", "=", "1+rand(_ench_num-2)" ] }, - { "math": [ "_rand_2", "=", "(_rand_2 < _rand_1) ? _rand_2 : _rand_2 + 1" ] }, - { "math": [ "_rand_3", "=", "1+rand(_ench_num-3)" ] }, - { "math": [ "_rand_3", "=", "(_rand_3 < min(_rand_1, _rand_2)) ? _rand_3 : _rand_3 + 1" ] }, - { "math": [ "_rand_3", "=", "(_rand_3 < max(_rand_1, _rand_2)) ? _rand_3 : _rand_3 + 1" ] }, - { - "title": "Enchantment (Total trigger count)", - "hide_failing": true, - "allow_cancel": false, - "names": [ - "Blazing (10)", - "Chilling (20)", - "Shocking (20)", - "Kinetic (10)", - "Projecting (50)", - "Lucky (∞)", - "Grim (1)", - "Vampiric (15)", - "Corrupting (3)", - "Canceled" - ], - "descriptions": [ - "Blazing: This enchantment causes flames to spit forth from a weapon, burning enemies and terrain alike.", - "Chilling: Enemies struck with this enchantment are chilled, slowing their movement and attacks.", - "Shocking: Electricity arcs from a shocking weapon, dealing extra damage to all nearby enemies.", - "Kinetic: When an enemy is killed with a kinetic weapon, any excess force is stored in the weapon and will be applied to the next successful attack.", - "Projecting: With this enchantment melee weapons will gain extra reach.", - "Lucky: This powerful enchantment increases the fortune of whoever wields it. Enemies which are killed with a lucky weapon have a chance to drop extra loot.", - "Grim: This powerful enchantment possesses the power to instantly execute an enemy (deal damage equal to 90% of its hp). The effect is more likely to occur the weaker the enemy is.", - "Vampiric: This powerful enchantment leeches life force from enemies with each blow, funneling it back into the wearer.", - "Corrupting: This powerful enchantment possesses the ability to turn enemies to your will. When an enemy is killed with this weapon, there is a chance they will become corrupted instead of dying.", - "Cancel this effect will not return your mana." - ], - "run_eoc_selector": [ - { - "id": "EOC_enchanting_master_sel_blazing", - "condition": { "math": [ "is_valid_ench_option(1)" ] }, - "effect": { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "blazing", "trigger_count": "10" } } - }, - { - "id": "EOC_enchanting_master_sel_chilling", - "condition": { "math": [ "is_valid_ench_option(2)" ] }, - "effect": { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "chilling", "trigger_count": "20" } } - }, - { - "id": "EOC_enchanting_master_sel_shocking", - "condition": { "math": [ "is_valid_ench_option(3)" ] }, - "effect": { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "shocking", "trigger_count": "20" } } - }, - { - "id": "EOC_enchanting_master_sel_kinetic", - "condition": { "math": [ "is_valid_ench_option(4)" ] }, - "effect": { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "kinetic", "trigger_count": "10" } } - }, - { - "id": "EOC_enchanting_master_sel_projecting", - "condition": { "math": [ "is_valid_ench_option(5)" ] }, - "effect": [ { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "projecting", "trigger_count": "50" } } ] - }, - { - "id": "EOC_enchanting_master_sel_lucky", - "condition": { "math": [ "is_valid_ench_option(6)" ] }, - "effect": [ { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "lucky", "trigger_count": "-999" } } ] - }, - { - "id": "EOC_enchanting_master_sel_grim", - "condition": { "math": [ "is_valid_ench_option(7)" ] }, - "effect": [ { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "grim", "trigger_count": "1" } } ] - }, - { - "id": "EOC_enchanting_master_sel_vampiric", - "condition": { "math": [ "is_valid_ench_option(8)" ] }, - "effect": [ { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "vampiric", "trigger_count": "15" } } ] - }, - { - "id": "EOC_enchanting_master_sel_corrupting", - "condition": { "math": [ "is_valid_ench_option(9)" ] }, - "effect": [ { "run_eoc_with": "EOC_enchanting_master_init_ench", "variables": { "type": "corrupting", "trigger_count": "3" } } ] - }, - { "id": "EOC_enchanting_master_sel_canceled", "effect": [ ] } - ] - } - ] - } - } - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/projecting.json b/data/mods/BombasticPerks/perkdata/enchanting_master/projecting.json deleted file mode 100644 index e8a4e6e9d6114..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/projecting.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_PROJECTING", - "type": "json_flag", - "info": "Projecting Enchantment", - "item_suffix": " (Projecting)" - }, - { - "id": "EOC_enchanting_master_init_projecting", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "//1": "normal weapon -> REACH_ATTACK weapon", - "//2": "REACH_ATTACK weapon -> REACH3 weapon", - "effect": [ - { "npc_set_flag": "ITEM_ENCHANTMENT_PROJECTING" }, - { - "if": { "npc_has_flag": "REACH_ATTACK" }, - "then": [ - { "math": [ "n_already_reach_attack", "=", "1" ] }, - { - "if": { "npc_has_flag": "REACH3" }, - "then": [ { "math": [ "n_already_reach3", "=", "1" ] } ], - "else": { "npc_set_flag": "REACH3" } - } - ], - "else": { "npc_set_flag": "REACH_ATTACK" } - } - ] - }, - { - "id": "EOC_enchanting_master_remove_projecting", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": [ - { - "if": { "math": [ "has_var(n_already_reach_attack)" ] }, - "then": [ - { - "if": { "math": [ "has_var(n_already_reach3)" ] }, - "then": { "npc_lose_var": "already_reach3" }, - "else": { "npc_unset_flag": "REACH3" } - }, - { "npc_lose_var": "already_reach_attack" } - ], - "else": { "npc_unset_flag": "REACH_ATTACK" } - }, - { "npc_unset_flag": "ITEM_ENCHANTMENT_PROJECTING" } - ] - }, - { - "id": "EOC_enchanting_master_projecting", - "//": "triggered when a character attacks", - "type": "effect_on_condition", - "effect": { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/shocking.json b/data/mods/BombasticPerks/perkdata/enchanting_master/shocking.json deleted file mode 100644 index d121df5d59124..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/shocking.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_SHOCKING", - "type": "json_flag", - "info": "Shocking Enchantment", - "item_suffix": " (Shocking)" - }, - { - "id": "EOC_enchanting_master_init_shocking", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_SHOCKING" } - }, - { - "id": "EOC_enchanting_master_remove_shocking", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_SHOCKING" } - }, - { - "id": "EOC_enchanting_master_shocking", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "effect": [ - { "npc_location_variable": { "context_val": "loc" } }, - { - "u_cast_spell": { "id": "spell_enchanting_master_shocking", "min_level": 10, "max_level": 10 }, - "loc": { "context_val": "loc" } - }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - }, - { - "id": "spell_enchanting_master_shocking_base", - "type": "SPELL", - "name": "shocking effect base", - "description": "", - "effect": "attack", - "shape": "blast", - "valid_targets": [ "hostile" ], - "flags": [ "SILENT", "NO_PROJECTILE", "NO_FAIL", "NO_HANDS", "NO_LEGS" ], - "max_level": 0, - "min_damage": { "math": [ "u_val('intelligence') + u_val('strength')" ] }, - "max_damage": { "math": [ "u_val('intelligence') + u_val('strength')" ] }, - "min_range": 10, - "max_range": 10, - "spell_class": "perk_enchanting_master", - "base_casting_time": 0, - "base_energy_cost": 0, - "energy_source": "MANA", - "difficulty": 0, - "damage_type": "electric" - }, - { - "id": "spell_enchanting_master_shocking", - "type": "SPELL", - "name": "shocking effect", - "copy-from": "spell_enchanting_master_shocking_base", - "extra_effects": [ - { "id": "spell_enchanting_master_shocking_2" }, - { "id": "spell_enchanting_master_shocking_2" }, - { "id": "spell_enchanting_master_shocking_2" } - ], - "field_id": "none" - }, - { - "id": "spell_enchanting_master_shocking_2", - "type": "SPELL", - "name": "shocking effect 2", - "copy-from": "spell_enchanting_master_shocking_base", - "field_id": "none", - "flags": [ "RANDOM_TARGET" ], - "min_range": 2, - "max_range": 2 - } -] diff --git a/data/mods/BombasticPerks/perkdata/enchanting_master/vampiric.json b/data/mods/BombasticPerks/perkdata/enchanting_master/vampiric.json deleted file mode 100644 index a0bc12ed725a2..0000000000000 --- a/data/mods/BombasticPerks/perkdata/enchanting_master/vampiric.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "id": "ITEM_ENCHANTMENT_VAMPIRIC", - "type": "json_flag", - "info": "Vampiric Enchantment", - "item_suffix": " (Vampiric)" - }, - { - "id": "EOC_enchanting_master_init_vampiric", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_set_flag": "ITEM_ENCHANTMENT_VAMPIRIC" } - }, - { - "id": "EOC_enchanting_master_remove_vampiric", - "type": "effect_on_condition", - "//": "u is avatar, npc is item", - "effect": { "npc_unset_flag": "ITEM_ENCHANTMENT_VAMPIRIC" } - }, - { - "id": "EOC_enchanting_master_vampiric", - "//": "triggered when a character attacks", - "//1": "u is avatar, npc is the victim", - "type": "effect_on_condition", - "effect": [ - { - "switch": { "math": [ "rand(5)" ] }, - "cases": [ - { "case": 0, "effect": { "math": [ "u_hp('head')", "+=", "1" ] } }, - { "case": 1, "effect": { "math": [ "u_hp('torso')", "+=", "1" ] } }, - { "case": 2, "effect": { "math": [ "u_hp('arm_l')", "+=", "1" ] } }, - { "case": 3, "effect": { "math": [ "u_hp('arm_r')", "+=", "1" ] } }, - { "case": 4, "effect": { "math": [ "u_hp('leg_l')", "+=", "1" ] } }, - { "case": 5, "effect": { "math": [ "u_hp('leg_r')", "+=", "1" ] } } - ] - }, - { "run_eocs": "EOC_enchanting_master_item_ench_trigger_count_minus_one" } - ] - } -] diff --git a/data/mods/BombasticPerks/perkmenu.json b/data/mods/BombasticPerks/perkmenu.json index 1ec95d292b753..1523d476a5d56 100644 --- a/data/mods/BombasticPerks/perkmenu.json +++ b/data/mods/BombasticPerks/perkmenu.json @@ -960,32 +960,6 @@ ], "topic": "TALK_PERK_MENU_SELECT_PLAYSTYLE" }, - { - "condition": { - "and": [ - { "not": { "u_has_trait": "perk_enchanting_master" } }, - { - "or": [ { "mod_is_loaded": "magiclysm" }, { "mod_is_loaded": "mindovermatter" }, { "mod_is_loaded": "xedra_evolved" } ] - } - ] - }, - "text": "Gain []", - "effect": [ - { "set_string_var": "", "target_var": { "context_val": "trait_name" } }, - { - "set_string_var": "", - "target_var": { "context_val": "trait_description" } - }, - { "set_string_var": "perk_enchanting_master", "target_var": { "context_val": "trait_id" } }, - { - "set_string_var": "No Requirements", - "target_var": { "context_val": "trait_requirement_description" }, - "i18n": true - }, - { "set_condition": "perk_condition", "condition": { "math": [ "0", "==", "0" ] } } - ], - "topic": "TALK_PERK_MENU_SELECT_PLAYSTYLE" - }, { "text": "Lifestyle Perks", "topic": "TALK_PERK_MENU_MAIN" }, { "text": "Settings", "topic": "TALK_PERK_MENU_CONFIG" }, { "text": "Quit.", "topic": "TALK_DONE" } diff --git a/data/mods/BombasticPerks/perks.json b/data/mods/BombasticPerks/perks.json index 11712b7790065..920132f1f0324 100644 --- a/data/mods/BombasticPerks/perks.json +++ b/data/mods/BombasticPerks/perks.json @@ -575,16 +575,6 @@ { "condition": { "u_has_wielded_with_flag": "OLD_GUN" }, "values": [ { "value": "RANGED_DAMAGE", "multiply": 0.25 } ] } ] }, - { - "type": "mutation", - "id": "perk_enchanting_master", - "name": { "str": "Enchanting Master" }, - "points": 0, - "description": "You can temporarily enchant your weapons with magic, imbuing them with powerful capabilities.", - "category": [ "perk" ], - "spells_learned": [ [ "spell_enchanting_master", 0 ] ], - "enchantments": [ "ench_enchanting_master" ] - }, { "type": "mutation", "id": "perk_ascetic_empowerment",