diff --git a/data/json/martialarts.json b/data/json/martialarts.json index e5a989619c7a8..b2076d244ea85 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -62,7 +62,8 @@ "tec_aikido_blockdisarm", "tec_aikido_dodgethrow", "tec_aikido_blockthrow" - ] + ], + "weapons": [ "bagh_nakha", "bio_claws_weapon", "cestus", "knuckle_brass", "knuckle_nail", "knuckle_steel" ] }, { "type": "martial_art", diff --git a/data/json/techniques.json b/data/json/techniques.json index 7eafe492e7026..478725b37bf77 100644 --- a/data/json/techniques.json +++ b/data/json/techniques.json @@ -214,6 +214,8 @@ "messages": [ "You block and smoothly disarm %s", " blocks and smoothly disarms %s" ], "min_unarmed": 4, "unarmed_allowed": true, + "melee_allowed": true, + "unarmed_weapons_allowed": false, "block_counter": true, "crit_ok": true, "disarms": true, @@ -228,6 +230,8 @@ "messages": [ "You block and smoothly throw %s", " blocks and smoothly throws %s" ], "min_unarmed": 0, "unarmed_allowed": true, + "melee_allowed": true, + "unarmed_weapons_allowed": false, "block_counter": true, "crit_ok": true, "down_dur": 1, @@ -241,6 +245,8 @@ "messages": [ "You dodge and smoothly throw %s", " dodges and smoothly throws %s" ], "min_unarmed": 2, "unarmed_allowed": true, + "melee_allowed": true, + "unarmed_weapons_allowed": false, "dodge_counter": true, "crit_ok": true, "down_dur": 1, @@ -254,6 +260,8 @@ "messages": [ "You dodge and smoothly disarm %s", " dodges and smoothly disarms %s" ], "min_unarmed": 4, "unarmed_allowed": true, + "melee_allowed": true, + "unarmed_weapons_allowed": false, "dodge_counter": true, "crit_ok": true, "disarms": true, @@ -271,6 +279,8 @@ ], "min_unarmed": 3, "unarmed_allowed": true, + "melee_allowed": true, + "unarmed_weapons_allowed": false, "defensive": true, "grab_break": true },