diff --git a/data/mods/Aftershock/player/afs_techniques.json b/data/mods/Aftershock/player/afs_techniques.json index 2929f2ac7502c..3bb4fe7ef77af 100644 --- a/data/mods/Aftershock/player/afs_techniques.json +++ b/data/mods/Aftershock/player/afs_techniques.json @@ -5,7 +5,7 @@ "name": "Pressure Crunch", "unarmed_allowed": true, "melee_allowed": true, - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "crit_tec": true, "mult_bonuses": [ [ "damage", "bash", 1.5 ] ], "stun_dur": 3, diff --git a/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json b/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json index 7c683e2dbf5ca..3076eb851f048 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_Bladework.json @@ -28,7 +28,7 @@ "description": "Increased accuracy along with minor cut and stab damage with piercing capability.", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "flat_bonuses": [ [ "damage", "stab", 1 ], [ "damage", "cut", 1 ], [ "arpen", "stab", 1 ], [ "arpen", "cut", 1 ] ] } ], @@ -39,7 +39,7 @@ "description": "Additional DMG, and Arpen per stack. Max of 5 stacks", "unarmed_allowed": false, "melee_allowed": true, - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "buff_duration": 1, "max_stacks": 4, "flat_bonuses": [ [ "damage", "stab", 0.25 ], [ "damage", "cut", 0.5 ], [ "arpen", "cut", 1 ] ] @@ -78,8 +78,7 @@ "type": "technique", "id": "tec_crt_blade_normal", "name": "Shimmer Flurry", - "min_unarmed": 1, - "min_melee": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 }, { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "damage", "bash", 0.8 ], [ "damage", "cut", 0.7 ], [ "damage", "stab", 0.6 ] ], @@ -89,8 +88,7 @@ "type": "technique", "id": "tec_crt_blade_rapid", "name": "Tipped Intent", - "min_unarmed": 2, - "min_melee": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 }, { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.77 ], [ "damage", "bash", 0.55 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.88 ] ], @@ -100,8 +98,7 @@ "type": "technique", "id": "tec_crt_blade_precise", "name": "Decisive Blow", - "min_unarmed": 3, - "min_melee": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 }, { "name": "melee", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.0 ] ], @@ -113,8 +110,7 @@ "type": "technique", "id": "tec_crt_blade_arpen", "name": "End Slash", - "min_unarmed": 5, - "min_melee": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 }, { "name": "melee", "level": 5 } ], "weighting": 2, "unarmed_allowed": true, "melee_allowed": true, diff --git a/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json b/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json index 5f5ebb72b93fd..7bc496f0ac8ea 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json @@ -44,7 +44,7 @@ "description": "+0.05 armor and other small bonuses per stack. Max of 10 stacks", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 }], "buff_duration": 10, "max_stacks": 10, "flat_bonuses": [ @@ -87,8 +87,7 @@ "type": "technique", "id": "tec_crt_enforcement_normal", "name": "Harsh Reprimand", - "min_unarmed": 1, - "min_melee": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 }, { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "damage", "bash", 1 ], [ "damage", "cut", 1 ], [ "damage", "stab", 1 ] ], @@ -100,8 +99,7 @@ "type": "technique", "id": "tec_crt_enforcement_rapid", "name": "Forced Compliance", - "min_unarmed": 3, - "min_melee": 2, + "skill_requirements": [ { "name": "unarmed", "level": 3 }, { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 1.04 ], [ "damage", "bash", 1 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.05 ] ], @@ -112,8 +110,7 @@ "type": "technique", "id": "tec_crt_enforcement_brutal", "name": "Roomsweeper", - "min_unarmed": 4, - "min_melee": 3, + "skill_requirements": [ { "name": "unarmed", "level": 4 }, { "name": "melee", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 1.35 ], [ "damage", "bash", 1.15 ], [ "damage", "cut", 1.05 ], [ "damage", "stab", 1.0 ] ], diff --git a/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json b/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json index c59d6fdf2bc79..fe4f7cce6746b 100644 --- a/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json +++ b/data/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json @@ -56,7 +56,7 @@ "description": "+Atk Speed and other small bonuses based on DEX per stack. Max of 5 stacks", "unarmed_allowed": true, "melee_allowed": true, - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, "max_stacks": 10, "flat_bonuses": [ [ "movecost", "dex", -0.05 ], [ "movecost", 0.1 ], [ "damage", "stab", 0.1 ] ], @@ -77,7 +77,7 @@ "type": "technique", "id": "tec_crt_cqb_normal", "name": "Measured Footwork", - "min_unarmed": 1, + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": false, "mult_bonuses": [ [ "movecost", 0.85 ], [ "damage", "bash", 0.8 ], [ "damage", "cut", 1.025 ], [ "damage", "stab", 1.05 ] ], @@ -88,7 +88,7 @@ "type": "technique", "id": "tec_crt_cqb_rapid", "name": "Rapid Burst", - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.7 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.7 ], [ "damage", "stab", 0.8 ] ], @@ -99,7 +99,7 @@ "type": "technique", "id": "tec_crt_cqb_rapid_wp", "name": "Joint Pain", - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.75 ] ], @@ -110,7 +110,7 @@ "type": "technique", "id": "tec_crt_cqb_precise", "name": "Rapid Jab", - "min_unarmed": 4, + "skill_requirements": [ { "name": "unarmed", "level": 4 } ], "unarmed_allowed": true, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.8 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 1.1 ], [ "damage", "stab", 1.25 ] ], @@ -123,7 +123,7 @@ "type": "technique", "id": "tec_crt_cqb_arpen", "name": "Calculated Pierce", - "min_unarmed": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "weighting": 2, "unarmed_allowed": true, "melee_allowed": true, diff --git a/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json b/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json index c6e3a52c72920..24b3738778380 100644 --- a/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json +++ b/data/mods/CRT_EXPANSION/martial/crt_gun_techniques.json @@ -3,7 +3,7 @@ "type": "technique", "id": "Pistol Whip", "name": "HOOK", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.95 ], [ "damage", "bash", 0.88 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ], "flat_bonuses": [ [ "movecost", "per", -0.25 ] ], @@ -15,7 +15,7 @@ "type": "technique", "id": "INERTIAL", "name": "Crowd Control", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "melee_allowed": true, "knockback_dist": 1, "mult_bonuses": [ [ "movecost", 0.6 ], [ "damage", "bash", 0.5 ], [ "damage", "cut", 0.5 ], [ "damage", "stab", 0.5 ] ], diff --git a/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json b/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json index 44c2b458ccf62..54115bfbf546c 100644 --- a/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json +++ b/data/mods/CRT_EXPANSION/martial/dragonslayertechn.json @@ -3,7 +3,7 @@ "type": "technique", "id": "BERSERK", "name": "BERSERK", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "mult_bonuses": [ [ "movecost", 0.3 ], [ "damage", "bash", 0.77 ], [ "damage", "cut", 0.77 ], [ "damage", "stab", 0.77 ] ], @@ -21,7 +21,7 @@ "type": "technique", "id": "DSINERTIAL", "name": "SWEEPER", - "min_melee": 4, + "skill_requirements": [ { "name": "melee", "level": 4 } ], "unarmed_allowed": false, "melee_allowed": true, "knockback_dist": 1, @@ -40,7 +40,7 @@ "type": "technique", "id": "DSBI", "name": "BISECTION", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, diff --git a/data/mods/CRT_EXPANSION/martial/generaltechn.json b/data/mods/CRT_EXPANSION/martial/generaltechn.json index d51b206e6e452..942c3d3e4c220 100644 --- a/data/mods/CRT_EXPANSION/martial/generaltechn.json +++ b/data/mods/CRT_EXPANSION/martial/generaltechn.json @@ -13,7 +13,7 @@ "type": "technique", "id": "INERTIAL", "name": "INERTIAL SWING", - "min_melee": 4, + "skill_requirements": [ { "name": "melee", "level": 4 } ], "unarmed_allowed": true, "melee_allowed": true, "knockback_dist": 1, @@ -32,7 +32,7 @@ "type": "technique", "id": "CHOP", "name": "CHOP", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -51,7 +51,7 @@ "type": "technique", "id": "SMASH", "name": "SMASH", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -70,7 +70,7 @@ "type": "technique", "id": "UHAND", "name": "UNDERHAND", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, @@ -100,7 +100,7 @@ "type": "technique", "id": "SSHOVE", "name": "SHIELDED SHOVE", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "knockback_dist": 2, @@ -113,7 +113,7 @@ "type": "technique", "id": "TEAR", "name": "TEAR", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "crit_tec": true, diff --git a/data/mods/CRT_EXPANSION/martial/stabtechn.json b/data/mods/CRT_EXPANSION/martial/stabtechn.json index df168194afa8a..7f9677dfcfd7c 100644 --- a/data/mods/CRT_EXPANSION/martial/stabtechn.json +++ b/data/mods/CRT_EXPANSION/martial/stabtechn.json @@ -3,7 +3,7 @@ "type": "technique", "id": "THRUST", "name": "THRUST", - "min_melee": 1, + "skill_requirements": [ { "name": "melee", "level": 1 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, @@ -17,7 +17,7 @@ "type": "technique", "id": "LUNGE", "name": "LUNGE", - "min_melee": 2, + "skill_requirements": [ { "name": "melee", "level": 2 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": true, @@ -31,7 +31,7 @@ "type": "technique", "id": "PROD", "name": "PROD", - "min_melee": 3, + "skill_requirements": [ { "name": "melee", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, @@ -45,7 +45,7 @@ "type": "technique", "id": "PROBE", "name": "PROBE", - "min_unarmed": 3, + "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "unarmed_allowed": false, "melee_allowed": true, "crit_tec": false, diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json index a65af0309383e..130d1ba5828a1 100644 --- a/data/mods/MMA/martialarts.json +++ b/data/mods/MMA/martialarts.json @@ -13,7 +13,6 @@ "id": "mma_buff_panzer_static", "name": "Schatten Folgen", "description": "\"Shadow Tracking\"\nAs a künstler, you are trained to stay in your target's blind spot.\n\n+1 Dodge attemps, Dodge Skill increased by 12%% of Perception.", - "min_unarmed": 0, "unarmed_allowed": true, "melee_allowed": true, "bonus_dodges": 1, @@ -25,7 +24,7 @@ "id": "mma_buff_panzer_ondodge", "name": "Einzug Rüstungen", "description": "\"Armor Penetration\"\nBy attuning to the rhythm of your opponent, you can strike where their guard is the weakest.\n+5 bash Armor Penetration.\nLasts 2 turns.", - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "unarmed_allowed": true, "melee_allowed": true, "buff_duration": 2, diff --git a/data/mods/MMA/techniques.json b/data/mods/MMA/techniques.json index b46117254f870..790246fce2a3d 100644 --- a/data/mods/MMA/techniques.json +++ b/data/mods/MMA/techniques.json @@ -5,7 +5,7 @@ "name": "Ausstoß", "//": "Outer Thrust.", "messages": [ "You redirect %s's attack against them", " redirects %s's attack against them" ], - "min_unarmed": 4, + "skill_requirements": [ { "name": "unarmed", "level": 4 } ], "melee_allowed": true, "unarmed_allowed": true, "dodge_counter": true, @@ -18,7 +18,6 @@ "name": "Kumai Sharinraku", "//": "No translation on wiki. It's a Somersault Kick.", "messages": [ "You jump and somersault kick %s", " jump and somersault kick %s" ], - "min_unarmed": 0, "melee_allowed": true, "unarmed_allowed": true, "mult_bonuses": [ [ "damage", "bash", 1.2 ] ] @@ -29,7 +28,7 @@ "name": "Herzschlag", "//": "Heart Strike. Alita's signature attack.", "messages": [ "You hit %s with a powerful vibro-punch", " hits %s with a powerful vibro-punch" ], - "min_unarmed": 5, + "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "melee_allowed": true, "unarmed_allowed": true, "crit_tec": true, @@ -43,7 +42,7 @@ "name": "Geschoss Schlag", "//": "Missile Blow.", "messages": [ "You launch a supersonic punch at %s", " launches a supersonic punch at %s" ], - "min_unarmed": 2, + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "melee_allowed": true, "unarmed_allowed": true, "mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]