From 4f339ba791a49bf0cba05bc59e96ae66462977ea Mon Sep 17 00:00:00 2001 From: Chorus System Date: Mon, 20 Nov 2023 16:16:58 -0500 Subject: [PATCH 1/4] Gave stab and cut damage to all unarmed martial arts --- data/json/martialarts.json | 64 +++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 1d4ccffce4d8..17e8e60a5c95 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -157,7 +157,10 @@ "name": "Boxing Stance", "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Bash damage, Blocked damge reduced by 50% of Strength.", "unarmed_allowed": true, - "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "stab", "scale": 2.0 } ] } ], "onmove_buffs": [ @@ -180,7 +183,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.25 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.25 }, + { "stat": "damage", "type": "cut", "scale": 1.25 }, + { "stat": "damage", "type": "stab", "scale": 1.25 } ] } ], "techniques": [ "tec_boxing_rapid", "tec_boxing_cross", "tec_boxing_upper", "tec_boxing_counter" ] @@ -234,7 +240,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, "max_stacks": 3, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.15 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.15 }, + { "stat": "damage", "type": "cut", "scale": 1.15 }, + { "stat": "damage", "type": "stab", "scale": 1.15 } ] } ], "onmove_buffs": [ @@ -272,7 +281,11 @@ "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, - { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 } + { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 } ] } ], @@ -326,7 +339,11 @@ "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 1, - "flat_bonuses": [ { "stat": "hit", "scale": 1.0 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "hit", "scale": 1.0 }, + { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "damage", "type": "stab", "scale": 2.0 } ] } ], "techniques": [ "tec_dragon_claw", "tec_dragon_blockcounter", "tec_dragon_dodgecounter", "tec_dragon_tail", "tec_dragon_strike" ] @@ -606,7 +623,11 @@ "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, - { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 } + { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 } ] }, { @@ -722,6 +743,8 @@ "buff_duration": 5, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": 0.25 }, + { "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": 0.25 }, + { "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": 0.25 }, { "stat": "block", "scaling-stat": "str", "scale": 0.5 } ] } @@ -821,6 +844,7 @@ "flat_bonuses": [ { "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 }, { "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 }, { "stat": "block", "scaling-stat": "per", "scale": 1.0 } ] } @@ -846,7 +870,8 @@ "flat_bonuses": [ { "stat": "dodge", "scale": -1.0 }, { "stat": "damage", "type": "cut", "scale": -1.0 }, - { "stat": "damage", "type": "bash", "scale": -1.0 } + { "stat": "damage", "type": "bash", "scale": -1.0 }, + { "stat": "damage", "type": "stab", "scale": -1.0 } ] } ], @@ -890,7 +915,10 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.1 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.1 }, + { "stat": "damage", "type": "cut", "scale": 1.1 }, + { "stat": "damage", "type": "stab", "scale": 1.1 } ] } ], "onhit_buffs": [ @@ -902,7 +930,11 @@ "unarmed_allowed": true, "req_buffs": [ "buff_pankration_ondodge" ], "buff_duration": 1, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.2 }, + { "stat": "damage", "type": "cut", "scale": 1.2 }, + { "stat": "damage", "type": "stab", "scale": 1.2 } + ] } ], "techniques": [ @@ -1054,7 +1086,11 @@ "name": "Unhindered", "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% bash damage when not using a weapon.", "unarmed_allowed": true, - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.33 } ] + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.33 }, + { "stat": "damage", "type": "cut", "scale": 1.33 }, + { "stat": "damage", "type": "stab", "scale": 1.33 } + ] } ], "techniques": [ @@ -1094,6 +1130,8 @@ "buff_duration": 2, "flat_bonuses": [ { "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 }, { "stat": "hit", "scaling-stat": "per", "scale": 0.2 } ] } @@ -1309,7 +1347,11 @@ "unarmed_allowed": true, "buff_duration": 2, "max_stacks": 5, - "flat_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "damage", "type": "stab", "scale": 2.0 } + ] } ], "onkill_buffs": [ From 661437bba347e81ff44ca9396232450bef8304d0 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:20:00 +0000 Subject: [PATCH 2/4] style(autofix.ci): automated formatting --- data/json/martialarts.json | 44 ++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 17e8e60a5c95..48b0bf53b249 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -157,10 +157,14 @@ "name": "Boxing Stance", "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Bash damage, Blocked damge reduced by 50% of Strength.", "unarmed_allowed": true, - "flat_bonuses": [ - { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 }, - { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, - { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "stab", "scale": 2.0 } ] + "flat_bonuses": [ + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, + { "stat": "damage", "type": "bash", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, + { "stat": "damage", "type": "cut", "scale": 2.0 }, + { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, + { "stat": "damage", "type": "stab", "scale": 2.0 } + ] } ], "onmove_buffs": [ @@ -183,10 +187,11 @@ "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.25 }, { "stat": "damage", "type": "cut", "scale": 1.25 }, - { "stat": "damage", "type": "stab", "scale": 1.25 } ] + { "stat": "damage", "type": "stab", "scale": 1.25 } + ] } ], "techniques": [ "tec_boxing_rapid", "tec_boxing_cross", "tec_boxing_upper", "tec_boxing_counter" ] @@ -240,10 +245,11 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, "max_stacks": 3, - "mult_bonuses": [ + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.15 }, { "stat": "damage", "type": "cut", "scale": 1.15 }, - { "stat": "damage", "type": "stab", "scale": 1.15 } ] + { "stat": "damage", "type": "stab", "scale": 1.15 } + ] } ], "onmove_buffs": [ @@ -339,11 +345,12 @@ "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 1, - "flat_bonuses": [ - { "stat": "hit", "scale": 1.0 }, + "flat_bonuses": [ + { "stat": "hit", "scale": 1.0 }, { "stat": "damage", "type": "bash", "scale": 2.0 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, - { "stat": "damage", "type": "stab", "scale": 2.0 } ] + { "stat": "damage", "type": "stab", "scale": 2.0 } + ] } ], "techniques": [ "tec_dragon_claw", "tec_dragon_blockcounter", "tec_dragon_dodgecounter", "tec_dragon_tail", "tec_dragon_strike" ] @@ -915,10 +922,11 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "buff_duration": 1, - "mult_bonuses": [ + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.1 }, { "stat": "damage", "type": "cut", "scale": 1.1 }, - { "stat": "damage", "type": "stab", "scale": 1.1 } ] + { "stat": "damage", "type": "stab", "scale": 1.1 } + ] } ], "onhit_buffs": [ @@ -930,11 +938,11 @@ "unarmed_allowed": true, "req_buffs": [ "buff_pankration_ondodge" ], "buff_duration": 1, - "mult_bonuses": [ + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 }, { "stat": "damage", "type": "cut", "scale": 1.2 }, { "stat": "damage", "type": "stab", "scale": 1.2 } - ] + ] } ], "techniques": [ @@ -1086,10 +1094,10 @@ "name": "Unhindered", "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% bash damage when not using a weapon.", "unarmed_allowed": true, - "mult_bonuses": [ + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.33 }, { "stat": "damage", "type": "cut", "scale": 1.33 }, - { "stat": "damage", "type": "stab", "scale": 1.33 } + { "stat": "damage", "type": "stab", "scale": 1.33 } ] } ], @@ -1347,7 +1355,7 @@ "unarmed_allowed": true, "buff_duration": 2, "max_stacks": 5, - "flat_bonuses": [ + "flat_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.0 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, { "stat": "damage", "type": "stab", "scale": 2.0 } From 9d7bacbfbc42435f2bac545cf590b9ea42b146a8 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 21 Nov 2023 08:59:00 -0600 Subject: [PATCH 3/4] Update data/json/martialarts.json --- data/json/martialarts.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 48b0bf53b249..f00918885241 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -160,9 +160,7 @@ "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 }, - { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "cut", "scale": 2.0 }, - { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "stab", "scale": 2.0 } ] } From 461deddffc5e434d264aab961a6d8c7d50c91288 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Sat, 25 Nov 2023 19:35:32 -0500 Subject: [PATCH 4/4] Edited descriptions Removed mention of bashing in descriptions for martial arts moves that now buff all three melee damage types. --- data/json/martialarts.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index f00918885241..18f143ac9769 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -155,7 +155,7 @@ { "id": "buff_boxing_static", "name": "Boxing Stance", - "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Bash damage, Blocked damge reduced by 50% of Strength.", + "description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Damage, Blocked damge reduced by 50% of Strength.", "unarmed_allowed": true, "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, @@ -181,7 +181,7 @@ { "id": "buff_boxing_ondodge", "name": "Counter Chance", - "description": "You've seen your chance. Now strike back!\n\n+25% Bash damage.\nLasts for 1 turn.", + "description": "You've seen your chance. Now strike back!\n\n+25% Damage.\nLasts for 1 turn.", "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "unarmed_allowed": true, "buff_duration": 1, @@ -238,7 +238,7 @@ { "id": "buff_capoeira_onmiss", "name": "Capoeira Tempo", - "description": "You didn't miss, it's just part of the dance and the best part is about to start!\n\n+15% Bash damage.\nLasts 2 turns. Stacks 3 times.", + "description": "You didn't miss, it's just part of the dance and the best part is about to start!\n\n+15% Damage.\nLasts 2 turns. Stacks 3 times.", "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 2, @@ -281,7 +281,7 @@ { "id": "buff_crane_static", "name": "Crane's Precision", - "description": "Your attacks strike at your opponents weakness with speed and precision instead of brute force.\nDexterity increases melee damage instead of Strength.\n\nBash damage increased by 75% of Dexterity but decreased by 75% of Strength.", + "description": "Your attacks strike at your opponents weakness with speed and precision instead of brute force.\nDexterity increases melee damage instead of Strength.\n\nDamage increased by 75% of Dexterity but decreased by 75% of Strength.", "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, @@ -339,7 +339,7 @@ { "id": "buff_dragon_onhit", "name": "Dragon's Flight", - "description": "Life and combat are a circle. An attack leads to a counter and to an attack once again. Seek to complete this loop.\n\n+1 Accuracy, +2 bash Damage.\nEnables \"Dragon Vortex Block\" and \"Dragon Wing Dodge\"\nLasts 1 turn.", + "description": "Life and combat are a circle. An attack leads to a counter and to an attack once again. Seek to complete this loop.\n\n+1 Accuracy, +2 Damage.\nEnables \"Dragon Vortex Block\" and \"Dragon Wing Dodge\"\nLasts 1 turn.", "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 1, @@ -624,7 +624,7 @@ { "id": "buff_leopard_static1", "name": "Leopard's Strategy", - "description": "You fight by overwhelming your opponents with speedy strikes that are much harder to defend against.\nDexterity increases melee damage instead of Strength.\n\nBash damage increased by 75% of Dexterity but decreased by 75% of Strength.", + "description": "You fight by overwhelming your opponents with speedy strikes that are much harder to defend against.\nDexterity increases melee damage instead of Strength.\n\nDamage increased by 75% of Dexterity but decreased by 75% of Strength.", "unarmed_allowed": true, "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 }, @@ -742,7 +742,7 @@ { "id": "buff_muay_thai_ongethit", "name": "Determination", - "description": "Taking a hit will not slow you down. You will outlast your opponent and win this fight.\n\n+Bash damage increased by 25% of Strength, blocked damage decreased by 50% of Strength.\nLasts 5 turns.", + "description": "Taking a hit will not slow you down. You will outlast your opponent and win this fight.\n\n+Damage increased by 25% of Strength, blocked damage decreased by 50% of Strength.\nLasts 5 turns.", "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "unarmed_allowed": true, "buff_duration": 5, @@ -844,7 +844,7 @@ { "id": "buff_niten_static", "name": "Niten Ichi-Ryu Stance", - "description": "Cautious watchful eyes\nmeasure and display your skill.\nPractice makes perfect.\n\nBash and Cut armor penetration increased by 50% of Perception, blocked damage reduced by 100% of Perception.", + "description": "Cautious watchful eyes\nmeasure and display your skill.\nPractice makes perfect.\n\nArmor penetration increased by 50% of Perception, blocked damage reduced by 100% of Perception.", "melee_allowed": true, "flat_bonuses": [ { "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 }, @@ -868,7 +868,7 @@ { "id": "buff_niten_onattack", "name": "Falling Leaf", - "description": "A sharp sword cuts true.\nAlthough, all things fade with time.\nRestraint hones your skills.\n\n-1.0 Dodge skill, -1 bash damage, -1 cut damage.\nLasts 1 turn. Stacks 5 times.", + "description": "A sharp sword cuts true.\nAlthough, all things fade with time.\nRestraint hones your skills.\n\n-1.0 Dodge skill, -1 damage, -1 damage.\nLasts 1 turn. Stacks 5 times.", "melee_allowed": true, "buff_duration": 1, "max_stacks": 5, @@ -916,7 +916,7 @@ { "id": "buff_pankration_ondodge", "name": "Counter Chance", - "description": "The enemy has presented an opening in their defense.\n+10% bash damage. Enables \"Close Combat\" buff.\nLasts 1 turn.", + "description": "The enemy has presented an opening in their defense.\n+10% damage. Enables \"Close Combat\" buff.\nLasts 1 turn.", "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "buff_duration": 1, @@ -931,7 +931,7 @@ { "id": "buff_pankration_oncrit", "name": "Close Combat", - "description": "You got your opponent right where you want them!\n\n+20% bash damage.\nLasts 1 turn.", + "description": "You got your opponent right where you want them!\n\n+20% damage.\nLasts 1 turn.", "skill_requirements": [ { "name": "unarmed", "level": 4 } ], "unarmed_allowed": true, "req_buffs": [ "buff_pankration_ondodge" ], @@ -1090,7 +1090,7 @@ { "id": "buff_taekwondo_static2", "name": "Unhindered", - "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% bash damage when not using a weapon.", + "description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% damage when not using a weapon.", "unarmed_allowed": true, "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.33 }, @@ -1130,7 +1130,7 @@ { "id": "buff_tai_chi_ondodge", "name": "Repulse the Monkey", - "description": "By perfectly positioning yourself and your opponent, you have become more accurate and can bypass your opponent's defenses.\n\nAccuracy increased by 20% of Perception, gain bash Armor Penetration equal to 50% of Perception.\nLasts 2 turns.", + "description": "By perfectly positioning yourself and your opponent, you have become more accurate and can bypass your opponent's defenses.\n\nAccuracy increased by 20% of Perception, gain Armor Penetration equal to 50% of Perception.\nLasts 2 turns.", "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 3 } ], "buff_duration": 2, @@ -1324,7 +1324,7 @@ { "id": "debug_elem_resist", "name": "Elemental resistance", - "description": "+Strength bash armor, +Dexterity acid armor, +Intelligence electricity armor, +Perception fire armor.", + "description": "+Strength physical armor, +Dexterity acid armor, +Intelligence electricity armor, +Perception fire armor.", "unarmed_allowed": true, "flat_bonuses": [ { "stat": "armor", "type": "bash", "scaling-stat": "str", "scale": 1.0 }, @@ -1349,7 +1349,7 @@ { "id": "debug_miss_buff", "name": "Getting Angry", - "description": "When I get my hands on you… +2 bash damage for 2 turns. Stacks 5 times.", + "description": "When I get my hands on you… +2 damage for 2 turns. Stacks 5 times.", "unarmed_allowed": true, "buff_duration": 2, "max_stacks": 5,