diff --git a/README.md b/README.md index 799d83b..7c51057 100644 --- a/README.md +++ b/README.md @@ -54,13 +54,13 @@ python3 src/main.py path/to/config.json --export_dir path/to/export/dir The bot supports the following slash commands - -| Command | Description | -| --- | --- | -| `/fd ` | Get frame data of a particular character's move | +| Command | Description | +|----------------------------------------------------|-----------------------------------------------------------------| +| `/fd ` | Get frame data of a particular character's move | | `/ms ` | Find a character's moves that match a particular frame scenario | -| `/` | Get frame data for a particular character's move | -| `/feedback ` | Send feedback to the bot owner | -| `/help` | Get help on the bot's usage | +| `/ ` | Get frame data of a particular character's move | +| `/feedback ` | Send feedback to the bot owner | +| `/help` | Get help on the bot's usage | ## Testing diff --git a/src/frame_service/json_directory/tests/static/json_movelist/heihachi.json b/src/frame_service/json_directory/tests/static/json_movelist/heihachi.json index 3f1e636..760a68a 100644 --- a/src/frame_service/json_directory/tests/static/json_movelist/heihachi.json +++ b/src/frame_service/json_directory/tests/static/json_movelist/heihachi.json @@ -25,12 +25,12 @@ "image": "", "input": "1,1", "name": "", - "notes": "* Jail from 1st attack with 3f delay\n", - "on_block": "-5", - "on_ch": "+6", - "on_hit": "+6", + "notes": "* Jail from 1st attack\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-1", - "recovery": "r24", + "recovery": "", "startup": "i10", "target": "h,h", "video": "" @@ -43,12 +43,12 @@ "image": "", "input": "1,1,2", "name": "Flash Punch Combo", - "notes": "* Balcony Break\n* Combo from 1st hit with 12f delay\n", - "on_block": "-17", + "notes": "* Balcony Break\n* Combo from 1st hit\n", + "on_block": "", "on_ch": "+19a (+9)", "on_hit": "+19a (+9)", "parent": "Heihachi-1,1", - "recovery": "r37", + "recovery": "", "startup": "i10", "target": "h,h,m", "video": "" @@ -63,12 +63,12 @@ "image": "", "input": "1,1,WAR.2", "name": "Ultimate Flash Punch Combo", - "notes": "* Balcony Break\n* Combo from 1st hit with 12f delay\n* Chip damage on block\n", - "on_block": "-17", + "notes": "* Balcony Break\n* Combo from 1st hit\n* Chip damage on block\n", + "on_block": "", "on_ch": "28a (+2)", "on_hit": "28a (+2)", "parent": "Heihachi-1,1", - "recovery": "r37", + "recovery": "", "startup": "i10", "target": "h,h,m", "video": "" @@ -82,11 +82,11 @@ "input": "1+2", "name": "Demon Breath", "notes": "* Balcony Break\n", - "on_block": "-10", + "on_block": "", "on_ch": "+24a (+14)", "on_hit": "+24a (+14)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i12", "target": "m", "video": "" @@ -99,12 +99,12 @@ "image": "", "input": "1,2", "name": "One Two Strike", - "notes": "* Combo from 1st hit with 4f delay\n* Move can be delayed 3f\n", - "on_block": "-3", + "notes": "* Combo from 1st hit\n", + "on_block": "", "on_ch": "+8", "on_hit": "+8", "parent": "Heihachi-1", - "recovery": "r22", + "recovery": "", "startup": "i10", "target": "h,h", "video": "" @@ -117,12 +117,12 @@ "image": "", "input": "1,2,2", "name": "Back Fist Combo", - "notes": "* Combo from 1st hit\n* Enter FUJ -9 +4 r30 with D on frame 22\n", - "on_block": "-12", + "notes": "* Combo from 1st hit\n* Enter FUJ with D\n", + "on_block": "", "on_ch": "+4", "on_hit": "+4", "parent": "Heihachi-1,2", - "recovery": "r33", + "recovery": "", "startup": "i10", "target": "h,h,h", "video": "" @@ -135,12 +135,12 @@ "image": "", "input": "1,2,2~1", "name": "", - "notes": "* Combo from 2nd CH\n* Cancel to SS -5 -16 with D_U\n", - "on_block": "-11", - "on_ch": "+6", - "on_hit": "+6", + "notes": "* Cancel to SS with D_U\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-1,2", - "recovery": "r30", + "recovery": "", "startup": "i10", "target": "h,h,m", "video": "" @@ -153,12 +153,12 @@ "image": "", "input": "1,2,2~1,1+2", "name": "Demon Executioner Volley", - "notes": "* Balcony Break\n* Combo from 3rd hit\n* Combo from 2nd CH\n", - "on_block": "-13", + "notes": "* Balcony Break\n* Combo from 3rd hit\n", + "on_block": "", "on_ch": "+11a (+2)", "on_hit": "+11a (+2)", "parent": "Heihachi-1,2,2~1", - "recovery": "r34", + "recovery": "", "startup": "i10", "target": "h,h,m,m", "video": "" @@ -189,12 +189,12 @@ "image": "", "input": "1,2,4", "name": "Wailing Demon Otoko Geri", - "notes": "* Tornado\n* Combo from 2nd CH with 2f delay\n* Opponent recovers crouching\n", - "on_block": "-9", - "on_ch": "+52a", - "on_hit": "+16g", + "notes": "* Tornado\n", + "on_block": "", + "on_ch": "+16c", + "on_hit": "+16c", "parent": "Heihachi-1,2", - "recovery": "r33", + "recovery": "", "startup": "i10", "target": "h,h,h", "video": "" @@ -208,11 +208,11 @@ "input": "1+3", "name": "Neck Breaker", "notes": "* Homing\n* Throw break 1 or 2\n", - "on_block": "-3", + "on_block": "", "on_ch": "-1d", "on_hit": "-1d", "parent": "", - "recovery": "r25", + "recovery": "", "startup": "i12~14", "target": "t", "video": "" @@ -225,14 +225,14 @@ "image": "", "input": "1+4", "name": "Mishima Style Ultimate Technique: Warrior Instinct", - "notes": "* Reversal Break\n* Balcony Break\n* Can only be used once per match\n* Ultimate Count 3 required to use\n* Opponent recovers crouching on hit\n* Cannot cause a K.O\n", - "on_block": "+2", - "on_ch": "+21g", - "on_hit": "+21g", + "notes": "* Balcony Break\n* Can only be used once per match\n* WAR level 3 required to use?\n", + "on_block": "", + "on_ch": "+21c", + "on_hit": "+21c", "parent": "", - "recovery": "r28 WAR", + "recovery": "WAR", "startup": "i17", - "target": "SL", + "target": "SL?", "video": "" }, { @@ -243,12 +243,12 @@ "image": "", "input": "1,b+2", "name": "", - "notes": "* Combo from 1st CH with 3f delay\n* Input can be delayed 10f\n* Move can be delayed 7f\n* Enter FUJ r30 with D\n", - "on_block": "-2", - "on_ch": "+8", - "on_hit": "+8", + "notes": "* Enter FUJ with D\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-1", - "recovery": "r30", + "recovery": "", "startup": "i10", "target": "h,m", "video": "" @@ -261,14 +261,14 @@ "image": "", "input": "1,b+2,1", "name": "Demon Massacre", - "notes": "* Combo from 2nd CH\njs38~61", - "on_block": "-15", + "notes": "\n,js?~", + "on_block": "", "on_ch": "+30a (+20)", "on_hit": "+30a (+20)", "parent": "Heihachi-1,b+2", - "recovery": "r30", + "recovery": "", "startup": "i10", - "target": "h,m,m", + "target": "h,m,M?", "video": "" }, { @@ -279,12 +279,12 @@ "image": "", "input": "1,b+2,2", "name": "Demon Basara", - "notes": "* Spike\n* Head\n* Combo from 2nd hit\n", - "on_block": "-13", + "notes": "* Head\n* Combo from 2nd hit\n", + "on_block": "", "on_ch": "+6c", "on_hit": "+6c", "parent": "Heihachi-1,b+2", - "recovery": "r36", + "recovery": "", "startup": "i10", "target": "h,m,m", "video": "" @@ -297,12 +297,12 @@ "image": "", "input": "1,b+2,4", "name": "Demon Lair", - "notes": "* Balcony Break\n* Chip damage on block\njs17~39", - "on_block": "+5", + "notes": "* Chip damage on block\n,js?~", + "on_block": "", "on_ch": "+30a (+9)", "on_hit": "+30a (+9)", "parent": "Heihachi-1,b+2", - "recovery": "r41", + "recovery": "", "startup": "i10", "target": "h,m,m", "video": "" @@ -316,11 +316,11 @@ "input": "2", "name": "", "notes": "\n", - "on_block": "+0", - "on_ch": "-1", - "on_hit": "-1", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r19", + "recovery": "", "startup": "i11", "target": "h", "video": "" @@ -333,12 +333,12 @@ "image": "", "input": "2,2", "name": "Dogenkotsu", - "notes": "* Spike\n* Combo from 1st hit with 2f delay\n", - "on_block": "-8", + "notes": "* Combo from 1st hit\n", + "on_block": "", "on_ch": "+3c", "on_hit": "+3c", "parent": "Heihachi-2", - "recovery": "r33", + "recovery": "", "startup": "i11", "target": "h,m", "video": "" @@ -363,24 +363,6 @@ "target": "m", "video": "" }, - { - "alias": [], - "alt": [], - "damage": "", - "id": "Heihachi-2+3+4", - "image": "", - "input": "2+3+4", - "name": "Auger", - "notes": "\n", - "on_block": "", - "on_ch": "", - "on_hit": "", - "parent": "", - "recovery": "r50", - "startup": "", - "target": "", - "video": "" - }, { "alias": [], "alt": [], @@ -389,12 +371,12 @@ "image": "", "input": "2+4", "name": "Jumping Powerbomb", - "notes": "* Floor Break\n* Throw break 1 or 2\n* Side switch on break\n* Heihachi recovers BT on break\n", + "notes": "* Floor Break\n* Throw break 1 or 2\n", "on_block": "", "on_ch": "+0d", "on_hit": "+0d", "parent": "", - "recovery": "r25", + "recovery": "", "startup": "i12~14", "target": "t", "video": "" @@ -408,11 +390,11 @@ "input": "3", "name": "", "notes": "\n", - "on_block": "-4", - "on_ch": "+1", - "on_hit": "+1", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r29", + "recovery": "", "startup": "i15", "target": "m", "video": "" @@ -425,12 +407,12 @@ "image": "", "input": "3,2", "name": "Byakko Gekishin", - "notes": "* Combo from 1st hit with 1f delay\n* Enter FUJ -2 +9 r25 with D\n", - "on_block": "-13", + "notes": "* Combo from 1st hit\n* Enter FUJ with D\n", + "on_block": "", "on_ch": "-2", "on_hit": "-2", "parent": "Heihachi-3", - "recovery": "r31", + "recovery": "", "startup": "i15", "target": "m,m", "video": "" @@ -443,34 +425,32 @@ "image": "", "input": "4", "name": "Otoko Geri", - "notes": "* Tornado\n* Balcony Break\n* Opponent recovers crouching on hit\n", - "on_block": "-9", - "on_ch": "+52a", - "on_hit": "+16g", + "notes": "* Tornado\n* Balcony Break\n", + "on_block": "", + "on_ch": "+16c", + "on_hit": "+16c", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i15~16", "target": "h", "video": "" }, { "alias": [], - "alt": [ - "ws4~3" - ], + "alt": [], "damage": "25", "id": "Heihachi-4~3", "image": "", "input": "4~3", "name": "Demon Scissors", - "notes": "* Spike\njs10~37\nfs38~", - "on_block": "-11a", - "on_ch": "+21a", - "on_hit": "+21a", + "notes": "* Spike\njs?~", + "on_block": "", + "on_ch": "+20a", + "on_hit": "+20a", "parent": "", - "recovery": "r28 FUFT", + "recovery": "FUFT", "startup": "i35~37", - "target": "M", + "target": "M?", "video": "" }, { @@ -482,11 +462,11 @@ "input": "b+1", "name": "", "notes": "\n", - "on_block": "-9", - "on_ch": "+4", - "on_hit": "+4", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r30", + "recovery": "", "startup": "i14~15", "target": "m", "video": "" @@ -499,12 +479,12 @@ "image": "", "input": "b+1+2", "name": "Heaven's Merciless Wrath", - "notes": "* Heat Engager\n* Heat Dash +43d (+35), +5\n* Balcony Break\n* Gain 1 Ultimate Count on Heat activation\n* Parries all mid or high punches or kicks\n* Attack is guaranteed after a successful parry\nps5~25", - "on_block": "-11", - "on_ch": "+23a (+13)", - "on_hit": "+23a (+13)", + "notes": "* Heat Engager\n* Heat Dash \n* Increases WAR level by 1\nps?~", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i42", "target": "m", "video": "" @@ -517,12 +497,12 @@ "image": "", "input": "b+1,4", "name": "Oni Yarai", - "notes": "* Tornado\n* Knee\n* Combo from 1st hit with 12f delay\n* Move can be delayed 10f\n,js24~", - "on_block": "-13", + "notes": "* Tornado\n* Knee\n* Combo from 1st hit\n,js?~", + "on_block": "", "on_ch": "+7a", "on_hit": "+7a", "parent": "Heihachi-b+1", - "recovery": "r40", + "recovery": "", "startup": "i14~15", "target": "m,m", "video": "" @@ -535,12 +515,12 @@ "image": "", "input": "b+2", "name": "Rashomon", - "notes": "* Balcony break on airborne hit\n* Chip damage on block\n", - "on_block": "+2", + "notes": "* Chip damage on block\n", + "on_block": "", "on_ch": "+7", "on_hit": "+7", "parent": "", - "recovery": "r34", + "recovery": "", "startup": "i22~23", "target": "m", "video": "" @@ -553,12 +533,12 @@ "image": "", "input": "b+2*", "name": "True Rashomon", - "notes": "* Strong Aerial Tailspin\n* Reversal Break\n* Balcony Break\n* Chip damage on block\n* Enter RAI +8 +32a (+24) r27 with F\n", - "on_block": "+5", + "notes": "* Balcony Break\n* Chip damage on block\n* Reversal break?\n* Enter FUJ with F\n", + "on_block": "", "on_ch": "+29a (+21)", "on_hit": "+29a (+21)", "parent": "", - "recovery": "r34", + "recovery": "", "startup": "i39~40", "target": "m", "video": "" @@ -566,18 +546,18 @@ { "alias": [], "alt": [], - "damage": "23", + "damage": "30", "id": "Heihachi-b:2*", "image": "", "input": "b:2*", "name": "Zenith Rashomon", - "notes": "* Strong Aerial Tailspin\n* Reversal Break\n* Balcony Break\n* Chip damage on block\n* Restores recoverable health on hit or block\n* 23 damage upon releasing input within the 5f window (frames 1822)\n* 28 damage on a perfect input release exactly on frame 17\n", - "on_block": "+6", - "on_ch": "+24a (+14)", - "on_hit": "+24a (+14)", + "notes": "* Balcony Break\n* Restores recoverable health on hit or block\n* Chip damage on block\n* Reversal break?\n", + "on_block": "", + "on_ch": "+29a (+21)", + "on_hit": "+29a (+21)", "parent": "", - "recovery": "r31", - "startup": "i29~30", + "recovery": "", + "startup": "i39~40", "target": "m", "video": "" }, @@ -590,11 +570,11 @@ "input": "b+3", "name": "", "notes": "* Homing\n", - "on_block": "-9", - "on_ch": "+2", - "on_hit": "+2", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r27", + "recovery": "", "startup": "i14~15", "target": "h", "video": "" @@ -607,12 +587,12 @@ "image": "", "input": "b+3,2", "name": "Hooking Crescent Thrust", - "notes": "* Combo from 1st hit with 4f delay\n", - "on_block": "-1", + "notes": "* Combo from 1st hit\n", + "on_block": "", "on_ch": "+8", "on_hit": "+8", "parent": "Heihachi-b+3", - "recovery": "r25", + "recovery": "", "startup": "i14~15", "target": "h,h", "video": "" @@ -625,34 +605,16 @@ "image": "", "input": "b+3,3", "name": "Hooking Crescent Kick", - "notes": "* Spike\n* Combo from 1st hit with 4f delay\n", - "on_block": "-12c", - "on_ch": "+3a", - "on_hit": "+3a", + "notes": "* Combo from 1st hit\n", + "on_block": "", + "on_ch": "+3d?", + "on_hit": "+3d?", "parent": "Heihachi-b+3", - "recovery": "r33", + "recovery": "", "startup": "i14~15", "target": "h,m", "video": "" }, - { - "alias": [], - "alt": [], - "damage": "27", - "id": "Heihachi-b+4", - "image": "", - "input": "b+4", - "name": "Indra's Kick", - "notes": "* Balcony Break\n* Chip damage on block\n", - "on_block": "-8", - "on_ch": "+30a (+4)", - "on_hit": "+30a (+4)", - "parent": "", - "recovery": "r46", - "startup": "i18~19", - "target": "m", - "video": "" - }, { "alias": [], "alt": [], @@ -679,12 +641,12 @@ "image": "", "input": "d+1", "name": "Hammer Punch", - "notes": "* Spike\n* Enter FC r28 with D\n", - "on_block": "-9", + "notes": "* Enter FC with D\n", + "on_block": "", "on_ch": "+2", "on_hit": "+2", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i16", "target": "m", "video": "" @@ -696,13 +658,13 @@ "id": "Heihachi-d+1+2", "image": "", "input": "d+1+2", - "name": "* Fujin\n* Wind God's Kamae", - "notes": "* Actionable after 30f\n", + "name": "FUJ", + "notes": "\n", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r30 FUJ", + "recovery": "", "startup": "", "target": "", "video": "" @@ -715,16 +677,34 @@ "image": "", "input": "d+1,2", "name": "Hammer Beating", - "notes": "* Combo from 1st hit with 2f delay\n* Input can be delayed 11f\n* Move can be delayed 10f\n* Enter RAI -5 +13 r24 with F\n", - "on_block": "-9", - "on_ch": "+35a (+28)", + "notes": "* Combo from 1st hit\n* Enter RAI with F\n", + "on_block": "", + "on_ch": "+9", "on_hit": "+9", "parent": "Heihachi-d+1", - "recovery": "r28", + "recovery": "", "startup": "i16", "target": "m,m", "video": "" }, + { + "alias": [], + "alt": [], + "damage": "35", + "id": "Heihachi-d+1+2,P", + "image": "", + "input": "d+1+2,P", + "name": "Charging Hard", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", + "parent": "", + "recovery": "", + "startup": "", + "target": "", + "video": "" + }, { "alias": [], "alt": [], @@ -735,10 +715,10 @@ "name": "Lightning Hammer", "notes": "\n", "on_block": "", - "on_ch": "+18a", - "on_hit": "+18a", + "on_ch": "+18d?", + "on_hit": "+18d?", "parent": "", - "recovery": "r41", + "recovery": "", "startup": "i60", "target": "m!", "video": "" @@ -751,36 +731,34 @@ "image": "", "input": "d+3", "name": "Jichinsai", - "notes": "* Spike\n* Chip damage on block\n", - "on_block": "-7", + "notes": "* Chip damage on block\n", + "on_block": "", "on_ch": "+3a", "on_hit": "+3a", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i22~23", - "target": "M", + "target": "M?", "video": "" }, { "alias": [ "H.d+3,2" ], - "alt": [ - "RAI.3,2" - ], + "alt": [], "damage": "25,25", "id": "Heihachi-d+3,H.2", "image": "", "input": "d+3,H.2", "name": "Rending Battering Ram", - "notes": "* Tornado\n* Reversal Break\n* Combo from 1st hit\n* Chip damage on block\n* Consumes remaining Heat time\n", - "on_block": "+0", + "notes": "* Tornado\n* Chip damage on block\n* Reversal break?\n* Consumes remaining Heat time\n", + "on_block": "", "on_ch": "-10a (-20)", "on_hit": "-10a (-20)", "parent": "Heihachi-d+3", - "recovery": "r50", + "recovery": "", "startup": "i22~23", - "target": "M,SM", + "target": "M?,SM?", "video": "" }, { @@ -791,14 +769,14 @@ "image": "", "input": "db+2", "name": "Eishomon", - "notes": "* Spike\ncs8~", - "on_block": "-18", + "notes": "\ncs?~", + "on_block": "", "on_ch": "+6c", "on_hit": "+6c", "parent": "", - "recovery": "r29 FC", + "recovery": "", "startup": "i23~25", - "target": "L", + "target": "L?", "video": "" }, { @@ -810,13 +788,13 @@ "input": "db+3", "name": "Sacred Tree Fell", "notes": "\n", - "on_block": "-13", + "on_block": "", "on_ch": "-2", "on_hit": "-2", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i16", - "target": "L", + "target": "l", "video": "" }, { @@ -828,11 +806,11 @@ "input": "df+1", "name": "", "notes": "\n", - "on_block": "-5", - "on_ch": "+7", - "on_hit": "+7", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r22", + "recovery": "", "startup": "i13~14", "target": "m", "video": "" @@ -846,11 +824,11 @@ "input": "df+1,1", "name": "Muso Palm Strike", "notes": "* Combo from 1st hit\n", - "on_block": "-2", + "on_block": "", "on_ch": "+4", "on_hit": "+4", "parent": "Heihachi-df+1", - "recovery": "r21", + "recovery": "", "startup": "i13~14", "target": "m,h", "video": "" @@ -864,11 +842,11 @@ "input": "df+1,2", "name": "Muso Tekken", "notes": "* Combo from 1st hit\n", - "on_block": "-13", + "on_block": "", "on_ch": "+3", "on_hit": "+3", "parent": "Heihachi-df+1", - "recovery": "r36", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -881,12 +859,12 @@ "image": "", "input": "df+1,2*", "name": "True Muso Tekken", - "notes": "* Reversal Break\n* Balcony Break\n* Chip damage on block\n", - "on_block": "+1", + "notes": "* Balcony Break\n* Chip damage on block\n* Reversal break?\n", + "on_block": "", "on_ch": "+32a (+11)", "on_hit": "+32a (+11)", "parent": "Heihachi-df+1", - "recovery": "r37", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -899,12 +877,12 @@ "image": "", "input": "df+1,:2*", "name": "Zenith Muso Tekken", - "notes": "* Tornado\n* Reversal Break\n* Combo from 1st hit\n* Chip damage on block\n* Restores recoverable health on hit or block\n* 23 damage upon releasing input within the 5f window (frames 1822)\n* 28 damage on a perfect input release exactly on frame 17\n", - "on_block": "-9", + "notes": "* Tornado\n* Combo from 1st hit\n* Restores recoverable health on hit or block\n* Chip damage on block\n* Reversal break?\n", + "on_block": "", "on_ch": "+19a (+14)", "on_hit": "+19a (+14)", "parent": "Heihachi-df+1", - "recovery": "r36", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -918,11 +896,11 @@ "input": "df+2", "name": "", "notes": "\n", - "on_block": "-7", - "on_ch": "+4", - "on_hit": "+4", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r25", + "recovery": "", "startup": "i13~14", "target": "m", "video": "" @@ -936,11 +914,11 @@ "input": "df+2,1", "name": "Reverse Muso Renken", "notes": "* Combo from 1st hit\n", - "on_block": "-17", + "on_block": "", "on_ch": "+12a (+5)", "on_hit": "+12a (+5)", "parent": "Heihachi-df+2", - "recovery": "r38", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -954,11 +932,11 @@ "input": "df+3", "name": "", "notes": "* Knee\n", - "on_block": "-6", - "on_ch": "+5", - "on_hit": "+5", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r24", + "recovery": "", "startup": "i15~16", "target": "m", "video": "" @@ -971,12 +949,12 @@ "image": "", "input": "df+3,1+2", "name": "", - "notes": "* Jail from 1st attack\n", - "on_block": "-15", - "on_ch": "-4", - "on_hit": "-4", + "notes": "* Combo from 1st hit\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-df+3", - "recovery": "r39", + "recovery": "", "startup": "i15~16", "target": "m,h,m,m", "video": "" @@ -989,12 +967,12 @@ "image": "", "input": "df+3,1+2,1", "name": "Gokotai Rampage", - "notes": "* Balcony break on airborne hit\n* Jail from 1st attack\n* Powered up input df+3,1+2,qcf+1 (5 additional damage)\n", - "on_block": "-15", + "notes": "* Combo from 1st hit\n* Powered up input: df+3,1+2,qcf+1\n", + "on_block": "", "on_ch": "+20a (+15)", "on_hit": "+20a (+15)", "parent": "Heihachi-df+3,1+2", - "recovery": "r34", + "recovery": "", "startup": "i15~16", "target": "m,h,m,m,m", "video": "" @@ -1008,11 +986,11 @@ "input": "df+4", "name": "", "notes": "\n", - "on_block": "-6", - "on_ch": "+5", - "on_hit": "+5", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r24", + "recovery": "", "startup": "i13~14", "target": "m", "video": "" @@ -1025,12 +1003,12 @@ "image": "", "input": "df+4,2", "name": "Rapid Crush Combo", - "notes": "* Balcony Break\n* Combo from 1st hit with 9f delay\n", - "on_block": "-12", - "on_ch": "+55a", + "notes": "* Combo from 1st hit\n", + "on_block": "", + "on_ch": "+9a (+0)", "on_hit": "+9a (+0)", "parent": "Heihachi-df+4", - "recovery": "r35", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -1044,11 +1022,11 @@ "input": "f+1+2", "name": "Chrome Dome", "notes": "* Spike\n* Head\n", - "on_block": "-14", - "on_ch": "+14c", - "on_hit": "+14c", + "on_block": "", + "on_ch": "+14", + "on_hit": "+14", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i12", "target": "h", "video": "" @@ -1062,11 +1040,11 @@ "input": "f+2", "name": "", "notes": "\n", - "on_block": "-9", + "on_block": "", "on_ch": "+2", "on_hit": "+2", "parent": "", - "recovery": "r27", + "recovery": "", "startup": "i15~16", "target": "h", "video": "" @@ -1079,12 +1057,12 @@ "image": "", "input": "f+2~1", "name": "", - "notes": "* Cancel to SS with D_U\n", - "on_block": "-11", - "on_ch": "+6", - "on_hit": "+6", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r30", + "recovery": "", "startup": "i13", "target": "m", "video": "" @@ -1097,12 +1075,12 @@ "image": "", "input": "f+2~1,1+2", "name": "Demon Shout Volley", - "notes": "* Balcony Break\n* Combo from 1st hit\n", - "on_block": "-13", + "notes": "* Balcony Break\n* Combo from 1st hit\n* Cancel to SS with D_U\n", + "on_block": "", "on_ch": "+11a (+2)", "on_hit": "+11a (+2)", "parent": "Heihachi-f+2~1", - "recovery": "r34", + "recovery": "", "startup": "i13", "target": "m,m", "video": "" @@ -1115,12 +1093,12 @@ "image": "", "input": "f+2,2", "name": "Tensu Gekishin", - "notes": "* Combo from 1st hit with 4f delay\n* Enter FUJ -2 +9 r25 with D\n", - "on_block": "-13", + "notes": "* Combo from 1st hit\n* Enter FUJ with D\n", + "on_block": "", "on_ch": "-2", "on_hit": "-2", "parent": "Heihachi-f+2", - "recovery": "r31", + "recovery": "", "startup": "i15~16", "target": "h,m", "video": "" @@ -1133,12 +1111,12 @@ "image": "", "input": "f+3", "name": "Lightning Crush", - "notes": "* Knee\n* Enter FUJ -2 +12 r25 with D\n", - "on_block": "-5", + "notes": "* Knee\n* Enter FUJ with D\n", + "on_block": "", "on_ch": "+9", "on_hit": "+9", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i18~20", "target": "m", "video": "" @@ -1150,13 +1128,13 @@ "id": "Heihachi-f+3+4", "image": "", "input": "f+3+4", - "name": "Thunder God's Kamae", - "notes": "* Cancel to r20 with b or db\n* Heihachi remains in stance indefinitely unless a move is used\n* Actionable after 40f\n", + "name": "RAI", + "notes": "\n", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r40 RAI", + "recovery": "", "startup": "", "target": "", "video": "" @@ -1169,12 +1147,12 @@ "image": "", "input": "f+4", "name": "Right Splits Kick", - "notes": "* Spike\n* Enter FUJ r27 with D\n* +15c against a crouching opponent\n", - "on_block": "+4", - "on_ch": "+26d", + "notes": "* Spike\n* Enter FUJ with D\n", + "on_block": "", + "on_ch": "+7c", "on_hit": "+7c", "parent": "", - "recovery": "r27", + "recovery": "", "startup": "i19~20", "target": "m", "video": "" @@ -1188,11 +1166,11 @@ "input": "FC.df+2", "name": "Ascension Upper", "notes": "* Tornado\n", - "on_block": "-14", + "on_block": "", "on_ch": "+37a (+27)", "on_hit": "+37a (+27)", "parent": "", - "recovery": "r37", + "recovery": "", "startup": "i15", "target": "m", "video": "" @@ -1200,19 +1178,19 @@ { "alias": [], "alt": [], - "damage": "16", + "damage": "20", "id": "Heihachi-FC.df+4", "image": "", "input": "FC.df+4", "name": "Crouching Dragon Kick", - "notes": "* On clean hit: +17a and 20 damage\ncs1~", - "on_block": "-23", - "on_ch": "+4c", - "on_hit": "+4c", + "notes": "* Clean hit\n", + "on_block": "", + "on_ch": "+17a", + "on_hit": "+17a", "parent": "", - "recovery": "r39 FC", + "recovery": "", "startup": "i19~21", - "target": "L", + "target": "L?", "video": "" }, { @@ -1223,12 +1201,12 @@ "image": "", "input": "f,F+1+2", "name": "Raoh Thrust", - "notes": "* Heat Engager\n* Heat Dash +36a (+26), +5\n* Balcony Break\n* Chip damage on block\n* Gain 1 Ultimate Count on Heat activation\n", - "on_block": "-8", - "on_ch": "+22a (+12)", - "on_hit": "+22a (+12)", + "notes": "* Heat Engager\n* Heat Dash \n* Balcony Break\n* Chip damage on block\n* Increases WAR level by 1\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r34", + "recovery": "", "startup": "i13", "target": "m", "video": "" @@ -1242,13 +1220,13 @@ "input": "f,F+2", "name": "Demon God Fist", "notes": "* Tornado\n", - "on_block": "-16", + "on_block": "", "on_ch": "+37a (+27)", "on_hit": "+37a (+27)", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i19~21", - "target": "M", + "target": "M?", "video": "" }, { @@ -1259,12 +1237,12 @@ "image": "", "input": "f,F+3", "name": "Left Splits Kick", - "notes": "* Spike\n", - "on_block": "-3c", + "notes": "\n", + "on_block": "", "on_ch": "+56a", "on_hit": "+56a", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i20~22", "target": "m", "video": "" @@ -1279,40 +1257,38 @@ "image": "", "input": "f,f,F+3", "name": "Leaping Side Kick", - "notes": "* Balcony Break\n* Chip damage on block\njs3~25\nfs26~28", - "on_block": "+6", + "notes": "* Balcony Break\n* Chip damage on block\njs?~", + "on_block": "", "on_ch": "+13a (+3)", "on_hit": "+13a (+3)", "parent": "", - "recovery": "r34", + "recovery": "", "startup": "i22~25", "target": "m", "video": "" }, { - "alias": [ - "CD" - ], + "alias": [], "alt": [], "damage": "", "id": "Heihachi-f,n,d,df", "image": "", "input": "f,n,d,df", "name": "Wind God Step", - "notes": "* Cannot be buffered\n* Stance moves can be buffered out of heat dash\n* Cancel to sidestep with u\n* Cancel to block with b\n", + "notes": "\n", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r3?", + "recovery": "", "startup": "", "target": "", "video": "" }, { "alias": [ - "EWGF", - "Electric" + "ewgf", + "electric" ], "alt": [], "damage": "23", @@ -1320,19 +1296,19 @@ "image": "", "input": "f,n,d,df#2", "name": "Electric Wind God Fist", - "notes": "* Chip damage on block\n* Can be performed without the d input: f,n,df#2\n", - "on_block": "+5", + "notes": "* Chip damage on block\n", + "on_block": "", "on_ch": "+39a (+29)", "on_hit": "+39a (+29)", "parent": "", - "recovery": "r24", + "recovery": "", "startup": "i11~12", "target": "h", "video": "" }, { "alias": [ - "TGF" + "tgf" ], "alt": [], "damage": "30", @@ -1340,19 +1316,19 @@ "image": "", "input": "f,n,d,df+1", "name": "Thunder God Fist", - "notes": "* Becomes Electric/Omen Thunder God Fist (f,n,df#1) during Heat, partially uses remaining Heat Time\njs19~40\nfs41~43", - "on_block": "-15", + "notes": "* Becomes Electric Thunder God Fist (f,n,df#1) during Heat, partially uses remaining Heat Time\njs?~", + "on_block": "", "on_ch": "+30a (+20)", "on_hit": "+30a (+20)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i19~21", - "target": "m", + "target": "M?", "video": "" }, { "alias": [ - "WGF" + "wgf" ], "alt": [], "damage": "20", @@ -1361,11 +1337,11 @@ "input": "f,n,d,df+2", "name": "Wind God Fist", "notes": "* Becomes Electric Wind God Fist (f,n,d,df#2) during Heat, partially uses remaining Heat Time\n", - "on_block": "-10", + "on_block": "", "on_ch": "+39a (+29)", "on_hit": "+39a (+29)", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i11~12", "target": "h", "video": "" @@ -1378,12 +1354,12 @@ "image": "", "input": "f,n,d,df+3", "name": "Bone Splinter Kick", - "notes": "* Tornado\n* Balcony Break\n* Chip damage on block\njs5~28", - "on_block": "+11g", + "notes": "* Tornado\n* Balcony Break\n* Chip damage on block\njs?~", + "on_block": "", "on_ch": "+31a (+10)", "on_hit": "+31a (+10)", "parent": "", - "recovery": "r38", + "recovery": "", "startup": "i27~28", "target": "m", "video": "" @@ -1396,12 +1372,12 @@ "image": "", "input": "f,n,d,DF+3", "name": "Earth Scraper Kick", - "notes": "\njs5~28", - "on_block": "-23", + "notes": "\njs?~", + "on_block": "", "on_ch": "+28a", "on_hit": "+28a", "parent": "", - "recovery": "r41", + "recovery": "", "startup": "i33~34", "target": "L", "video": "" @@ -1415,11 +1391,11 @@ "input": "f,n,d,DF+4", "name": "", "notes": "\n", - "on_block": "-23", - "on_ch": "+28a", - "on_hit": "+8c", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i16~17", "target": "L", "video": "" @@ -1433,11 +1409,11 @@ "input": "f,n,d,DF+4,4", "name": "", "notes": "\n", - "on_block": "-10", - "on_ch": "+26a", - "on_hit": "+3c", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-f,n,d,DF+4", - "recovery": "r35", + "recovery": "", "startup": "i16~17", "target": "L,L", "video": "" @@ -1445,17 +1421,17 @@ { "alias": [], "alt": [], - "damage": "15,10,8", + "damage": "15,10,10?", "id": "Heihachi-f,n,d,DF+4,4,4", "image": "", "input": "f,n,d,DF+4,4,4", "name": "Spinning Demon", "notes": "\n", - "on_block": "-10", - "on_ch": "+26a", - "on_hit": "+3c", + "on_block": "", + "on_ch": "+15a?", + "on_hit": "+15a?", "parent": "Heihachi-f,n,d,DF+4,4", - "recovery": "r35", + "recovery": "", "startup": "i16~17", "target": "L,L,L", "video": "" @@ -1463,35 +1439,35 @@ { "alias": [], "alt": [], - "damage": "15,10,8,20", + "damage": "15,10,10?,20?", "id": "Heihachi-f,n,d,DF+4,4,4,1", "image": "", "input": "f,n,d,DF+4,4,4,1", "name": "Spinning Demon Thunder God Fist", - "notes": "* Can be performed after any number of f,n,d,DF+4 lows\n,js?~", - "on_block": "-15", - "on_ch": "+25a (+18)", - "on_hit": "+25a (+18)", + "notes": "\n", + "on_block": "", + "on_ch": "+25a (+18)?", + "on_hit": "+25a (+18)?", "parent": "Heihachi-f,n,d,DF+4,4,4", "recovery": "", "startup": "i16~17", - "target": "L,L,L,m", + "target": "L,L,L,M?", "video": "" }, { "alias": [], "alt": [], - "damage": "15,10,8,30", + "damage": "15,10,10?,24?", "id": "Heihachi-f,n,d,DF+4,4,4,3", "image": "", "input": "f,n,d,DF+4,4,4,3", "name": "Spinning Demon Bell-Ringer", - "notes": "* Balcony Break\n* Chip damage on block\n* Can be performed after any number of f,n,d,DF+4 lows\n,js17~", - "on_block": "+9", - "on_ch": "+45a", - "on_hit": "+45a", + "notes": "* Balcony Break\n* Chip damage on block\n", + "on_block": "", + "on_ch": "+17a (-3)?", + "on_hit": "+17a (-3)?", "parent": "Heihachi-f,n,d,DF+4,4,4", - "recovery": "r38", + "recovery": "", "startup": "i16~17", "target": "L,L,L,h", "video": "" @@ -1499,17 +1475,17 @@ { "alias": [], "alt": [], - "damage": "15,10,8,10", - "id": "Heihachi-f,n,d,DF+4,4,4,n+4", + "damage": "15,10,10?,10?", + "id": "Heihachi-f,n,d,DF+4,4,4,n,4", "image": "", - "input": "f,n,d,DF+4,4,4,n+4", + "input": "f,n,d,DF+4,4,4,n,4", "name": "", - "notes": "* Can be performed after any number of f,n,d,DF+4 lows\n", - "on_block": "-3", - "on_ch": "+8", - "on_hit": "+8", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-f,n,d,DF+4,4,4", - "recovery": "r21", + "recovery": "", "startup": "i16~17", "target": "L,L,L,m", "video": "" @@ -1517,17 +1493,17 @@ { "alias": [], "alt": [], - "damage": "15,10,8,10,20", + "damage": "15,10,10?,10?,20?", "id": "Heihachi-f,n,d,DF+4,4,4,n,4,4", "image": "", - "input": "f,n,d,DF+4,4,4,n+4,4", + "input": "f,n,d,DF+4,4,4,n,4,4", "name": "Spinning Demon Tsunami Kick", - "notes": "* Spike\n* Combo from 4th hit\n* Enter FUJ -9 +6c r31 with D\n* Can be performed after any number of f,n,d,DF+4 lows\n", - "on_block": "-15", - "on_ch": "+0c", - "on_hit": "+0c", - "parent": "Heihachi-f,n,d,DF+4,4,4,n+4", - "recovery": "r37", + "notes": "* Spike\n* Combo from 4th? hit\n* Enter FUJ with D\n", + "on_block": "", + "on_ch": "-5a", + "on_hit": "-5a", + "parent": "Heihachi-f,n,d,DF+4,4,4,n,4", + "recovery": "", "startup": "i16~17", "target": "L,L,L,m,m", "video": "" @@ -1536,24 +1512,24 @@ "alias": [], "alt": [], "damage": "", - "id": "Heihachi-f,n,d,df,UF", + "id": "Heihachi-f,n,d,df,uf", "image": "", - "input": "f,n,d,df,UF", + "input": "f,n,d,df,uf", "name": "", - "notes": "* Unable to act from frames 3~27\njs1~21\nfs22~24", + "notes": "\njs?~", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r27", + "recovery": "", "startup": "", "target": "", "video": "" }, { "alias": [ - "OTGF", - "ETGF" + "otgf", + "etgf" ], "alt": [], "damage": "33", @@ -1561,14 +1537,14 @@ "image": "", "input": "f,n,df#1", "name": "* Omen Thunder God Fist\n* Electric Thunder God Fist", - "notes": "* Chip damage on block\njs19~40\nfs41~43", - "on_block": "-11", + "notes": "* Chip damage on block\njs?~", + "on_block": "", "on_ch": "+26a (+16)", "on_hit": "+26a (+16)", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i19~21", - "target": "M", + "target": "M?", "video": "" }, { @@ -1580,11 +1556,11 @@ "input": "FUJ.1", "name": "", "notes": "\n", - "on_block": "-4", + "on_block": "", "on_ch": "+7", "on_hit": "+7", "parent": "", - "recovery": "r22", + "recovery": "", "startup": "i12~13", "target": "h", "video": "" @@ -1597,12 +1573,12 @@ "image": "", "input": "FUJ.1,1", "name": "Wind God Hasai Rengeki", - "notes": "* Heat Engager\n* Heat Dash +34a (+27), +5\n* Balcony Break\n* Combo from 1st hit with 9f delay\n* Move can be delayed 7f\n* Gain 1 Ultimate Count on Heat activation\n", - "on_block": "-2", - "on_ch": "+34a (+9)", - "on_hit": "+34a (+9)", + "notes": "* Heat Engager\n* Heat Dash \n* Increases WAR level by 1\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-FUJ.1", - "recovery": "r31", + "recovery": "", "startup": "i12~13", "target": "h,h", "video": "" @@ -1615,12 +1591,12 @@ "image": "", "input": "FUJ.1+2", "name": "Tengu's Wings", - "notes": "* Homing\n* Balcony Break\n* -7 on block after absorbing an attack\n* Chip damage on block after absorbing an attack\n* Power Crush", - "on_block": "-13", + "notes": "* Homing\n* Balcony Break\n* Power Crush", + "on_block": "", "on_ch": "+6a (-3)", "on_hit": "+6a (-3)", "parent": "", - "recovery": "r38", + "recovery": "", "startup": "i18~19", "target": "m", "video": "" @@ -1633,12 +1609,12 @@ "image": "", "input": "FUJ.1,2", "name": "Wind God Tettsui", - "notes": "* Balcony Break\n* Spike\n* Combo from 1st hit with 8f delay\n* Input can be delayed 9f\n* Move can be delayed 7f\n", - "on_block": "-13", + "notes": "* Balcony Break\n* Combo from 1st hit\n", + "on_block": "", "on_ch": "+13a", "on_hit": "+13a", "parent": "Heihachi-FUJ.1", - "recovery": "r36", + "recovery": "", "startup": "i12~13", "target": "h,m", "video": "" @@ -1658,7 +1634,7 @@ "on_ch": "+7", "on_hit": "+7", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i18", "target": "t", "video": "" @@ -1672,11 +1648,11 @@ "input": "FUJ.2", "name": "Hidden Wind God Fist", "notes": "* Tornado\n* Chip damage on block\n", - "on_block": "-10", + "on_block": "", "on_ch": "+75a (+59)", "on_hit": "+75a (+59)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i15~16", "target": "m", "video": "" @@ -1689,12 +1665,12 @@ "image": "", "input": "FUJ.3", "name": "", - "notes": "* Balcony Break\n* 2nd hit available only on hit or block\njs8~", - "on_block": "-10", - "on_ch": "-10a (-20)", - "on_hit": "-10a (-20)", + "notes": "\njs?~", + "on_block": "", + "on_ch": "+75a (+59)", + "on_hit": "+75a (+59)", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i28~29", "target": "m", "video": "" @@ -1702,17 +1678,17 @@ { "alias": [], "alt": [], - "damage": "17,20", + "damage": "17,20?", "id": "Heihachi-FUJ.3,4", "image": "", "input": "FUJ.3,4", "name": "Wind God Hell Axle", - "notes": "* Strong Aerial Tailspin\n* Balcony Break\n* Combo from 1st hit\n* Chip damage on block\n* Unavailable on whiff\n,js1~", - "on_block": "+4", + "notes": "* Strong Aerial Tailspin\n* Balcony Break\n* Chip damage on block\n,js?~", + "on_block": "", "on_ch": "+30a (+23)", "on_hit": "+30a (+23)", "parent": "Heihachi-FUJ.3", - "recovery": "r34", + "recovery": "", "startup": "i28~29", "target": "m,m", "video": "" @@ -1725,12 +1701,12 @@ "image": "", "input": "FUJ.4", "name": "Wind God Geta Stomp", - "notes": "* Spike\n", - "on_block": "-14", - "on_ch": "+12g", + "notes": "\n", + "on_block": "", + "on_ch": "-4", "on_hit": "-4", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i18~19", "target": "L", "video": "" @@ -1742,13 +1718,13 @@ "id": "Heihachi-FUJ.DF", "image": "", "input": "FUJ.DF", - "name": "Fujin > Wind God Step", - "notes": "* Low parry on frames ?~?\n* Doesn't require a just frame input for Electric or Omen Thunder God Fist\n", + "name": "Wind God Step", + "notes": "\n", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r8 CD", + "recovery": "CD", "startup": "", "target": "", "video": "" @@ -1761,14 +1737,14 @@ "image": "", "input": "H.2+3", "name": "Enraged Tettsui Otoshi", - "notes": "* Heat Smash\n* Reversal Break\n* Floor Break\n* Chip damage on block\n* Transition to attack throw on hit\n* Enter RAI on block only\n* Cancel RAI transition with B, +6 on block instead\n", - "on_block": "+10", + "notes": "* Floor Break\n* Reversal Break\n* Transition to attack throw on hit\n* Cancel FUJ transition with B\n", + "on_block": "", "on_ch": "+0d", "on_hit": "+0d", "parent": "", - "recovery": "r36", + "recovery": "FUJ", "startup": "i15", - "target": "m,m", + "target": "m", "video": "" }, { @@ -1779,10 +1755,10 @@ "image": "", "input": "H.2+3,F", "name": "Eight Thunder Kami Slayer", - "notes": "* Heat Smash\n* Reversal Break\n* Balcony Break\n* Chip damage on block\n* Transition to attack throw on hit\n* Enter RAI on block only\n* Cancel RAI transition with B, +6 on block instead\n", - "on_block": "+10", - "on_ch": "-2d", - "on_hit": "-2d", + "notes": "* Balcony Break\n* Reversal Break\n* Transition to attack throw on hit\n* Cancel FUJ transition with B\n", + "on_block": "", + "on_ch": "-2a", + "on_hit": "-2a", "parent": "", "recovery": "FUJ", "startup": "i15", @@ -1797,37 +1773,16 @@ "image": "", "input": "H.b,b,n,3+4", "name": "Shadow Step", - "notes": "* Consumes all of the remaining Heat time\n* Tremendous backwards travel\n", + "notes": "* Consumes all of the remaining Heat time\n", "on_block": "", "on_ch": "", "on_hit": "", "parent": "", - "recovery": "r30", + "recovery": "", "startup": "", "target": "", "video": "" }, - { - "alias": [ - "FUJ.P", - "H.FUJ.P" - ], - "alt": [], - "damage": "35", - "id": "Heihachi-H.d+1+2,P", - "image": "", - "input": "H.d+1+2,P", - "name": "Charging Hard", - "notes": "* Parries high or mid punches or kicks\n* Regain health on a successful parry\n* Partially uses remaining heat tiem\nps19~40", - "on_block": "", - "on_ch": "", - "on_hit": "", - "parent": "", - "recovery": "", - "startup": "i11", - "target": "t", - "video": "" - }, { "alias": [], "alt": [], @@ -1836,14 +1791,14 @@ "image": "", "input": "H.db+1+2", "name": "Thunderous Battering Ram", - "notes": "* Tornado\n* Reversal Break\n* Balcony Break\n* Chip damage on block\n* Consumes remaining Heat time\n* Power Crush", - "on_block": "+0", + "notes": "* Tornado\n* Balcony Break\n* Chip damage on block\n* Reversal break?\n* Consumes remaining Heat time\n* Power Crush", + "on_block": "", "on_ch": "+0a (-17)", "on_hit": "+0a (-17)", "parent": "", - "recovery": "r50", + "recovery": "", "startup": "i30", - "target": "M", + "target": "M?", "video": "" }, { @@ -1858,10 +1813,10 @@ "name": "Firestarter", "notes": "* Cancel RAI transition with B\n* Consumes remaining Heat time\n* Throw is unbreakable\n", "on_block": "", - "on_ch": "+8", - "on_hit": "+8", + "on_ch": "+7", + "on_hit": "+7", "parent": "", - "recovery": "r42 RAI", + "recovery": "RAI", "startup": "i18", "target": "t", "video": "" @@ -1887,17 +1842,17 @@ { "alias": [], "alt": [], - "damage": "30", + "damage": "30?", "id": "Heihachi-OTG.d+4", "image": "", "input": "OTG.d+4", "name": "Geta Stomp", - "notes": "* Spike\n", - "on_block": "-14", + "notes": "\n", + "on_block": "", "on_ch": "-3a (-11)", "on_hit": "-3a (-11)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i19~20", "target": "L", "video": "" @@ -1912,12 +1867,12 @@ "image": "", "input": "qcf+2", "name": "Iron Hand", - "notes": "* Heat Engager\n* Heat Dash +43d (+35), +5\n* Balcony Break\n* Gain 1 Ultimate Count on Heat activation\n* Can be buffered\n", - "on_block": "-17", - "on_ch": "+18a (+8)", - "on_hit": "+18a (+8)", + "notes": "* Heat Engager\n* Heat Dash \n* Balcony Break\n* Increases WAR level by 1\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i14~15", "target": "m", "video": "" @@ -1930,14 +1885,14 @@ "image": "", "input": "RAI.1", "name": "Hidden Thunder God Fist", - "notes": "* Gains Reversal Break during Warrior Instinct\njs17~43\nfs44~46", - "on_block": "-11", + "notes": "* Reversal break?\n", + "on_block": "", "on_ch": "+12a (+2)", "on_hit": "+12a (+2)", "parent": "", - "recovery": "r49", + "recovery": "", "startup": "i17~18", - "target": "M", + "target": "M?", "video": "" }, { @@ -1950,12 +1905,12 @@ "image": "", "input": "RAI.1+3", "name": "Thunder Broken Toy", - "notes": "* Unbreakable\n* 42 damage on a wall splat\n", + "notes": "* Unbreakable\n", "on_block": "", "on_ch": "+0d", "on_hit": "+0d", "parent": "", - "recovery": "r39", + "recovery": "", "startup": "i15~16", "target": "t", "video": "" @@ -1968,12 +1923,12 @@ "image": "", "input": "RAI.2", "name": "Thunder Cutter", - "notes": "* Strong Aerial Tailspin\n* Homing\n* Guard Break\n* Chip damage on block\n", - "on_block": "+10", + "notes": "* Homing\n* Chip damage on block\n", + "on_block": "", "on_ch": "+51a", "on_hit": "+51a", "parent": "", - "recovery": "r34", + "recovery": "", "startup": "i17~18", "target": "h", "video": "" @@ -1986,14 +1941,14 @@ "image": "", "input": "RAI.3", "name": "Jichinsai", - "notes": "* Spike\n* Chip damage on block\n", - "on_block": "+7", - "on_ch": "+3a", - "on_hit": "+3a", + "notes": "* Chip damage on block\n", + "on_block": "", + "on_ch": "+3d?", + "on_hit": "+3d?", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i22~23", - "target": "M", + "target": "M?", "video": "" }, { @@ -2003,17 +1958,53 @@ "id": "Heihachi-RAI.4", "image": "", "input": "RAI.4", - "name": "Raijin Spinning Demon", - "notes": "* Links to f,n,d,DF+4 extensions\n", - "on_block": "-23", - "on_ch": "+28a", - "on_hit": "+8c", + "name": "", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i19~20", "target": "L", "video": "" }, + { + "alias": [], + "alt": [], + "damage": "15,10", + "id": "Heihachi-RAI.4,DF+4", + "image": "", + "input": "RAI.4,DF+4", + "name": "", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", + "parent": "Heihachi-RAI.4", + "recovery": "", + "startup": "i19~20", + "target": "L,L", + "video": "" + }, + { + "alias": [], + "alt": [], + "damage": "15,10,10?", + "id": "Heihachi-RAI.4,DF+4,4", + "image": "", + "input": "RAI.4,DF+4,4", + "name": "Spinning Demon", + "notes": "\n", + "on_block": "", + "on_ch": "+15a", + "on_hit": "+15a", + "parent": "Heihachi-RAI.4,DF+4", + "recovery": "", + "startup": "i19~20", + "target": "L,L,L", + "video": "" + }, { "alias": [], "alt": [], @@ -2058,12 +2049,12 @@ "image": "", "input": "SS.2", "name": "Nail Beating", - "notes": "* Enter RAI -5 +13 r24 with F\n", - "on_block": "-9", - "on_ch": "+36a (+28)", + "notes": "* Enter RAI with F\n", + "on_block": "", + "on_ch": "+9", "on_hit": "+9", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i23~24", "target": "m", "video": "" @@ -2076,12 +2067,12 @@ "image": "", "input": "ub+2", "name": "Skull Rupture", - "notes": "* Parries mid or high punches\n* Attack is guaranteed after a successful parry\n* Balcony Break\nps5~12", - "on_block": "-6", + "notes": "* Balcony Break\n", + "on_block": "", "on_ch": "+40d (-18)", "on_hit": "+40d (-18)", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i18~19", "target": "h", "video": "" @@ -2097,12 +2088,12 @@ "image": "", "input": "uf+1", "name": "Demon's Wings", - "notes": "* Balcony Break\n* -8 on block after absorbing an attack\n* Chip damage on block after absorbing an attack\n* Power Crush", - "on_block": "-13", + "notes": "* Balcony Break\n* -? on block after absorbing an attack\n* Chip damage on block after absorbing an attack\n* Power Crush", + "on_block": "", "on_ch": "+14a (+5)", "on_hit": "+14a (+5)", "parent": "", - "recovery": "r35", + "recovery": "", "startup": "i24~25", "target": "m", "video": "" @@ -2115,12 +2106,12 @@ "image": "", "input": "uf+1+2", "name": "Stonehead", - "notes": "* Balcony Break\n* Throw break 1+2\n* Side switch on break\n", - "on_block": "+0", + "notes": "* Balcony Break\n* Throw break 1+2\n", + "on_block": "", "on_ch": "+26a (+7)", "on_hit": "+26a (+7)", "parent": "", - "recovery": "r27", + "recovery": "", "startup": "i12", "target": "t", "video": "" @@ -2133,13 +2124,13 @@ "image": "", "input": "uf+1+4", "name": "Headbutt Clash", - "notes": "* Balcony Break\n* Throw break 1+2\n* Headbutt can be reversed with input 1 or 2 or 3 or 4\n* Works on Male characters only?\n", - "on_block": "-6", - "on_ch": "+28d (-30)", - "on_hit": "+28d (-30)", + "notes": "* Balcony Break\n* Throw break 1+2\n* Different outcomes based on pressing 1, 2, 3 or 4?\n", + "on_block": "", + "on_ch": "+26a (+7)", + "on_hit": "+26a (+7)", "parent": "", - "recovery": "r27", - "startup": "i12 i48", + "recovery": "", + "startup": "i12", "target": "t", "video": "" }, @@ -2154,11 +2145,11 @@ "input": "uf+2", "name": "", "notes": "\n", - "on_block": "-9", - "on_ch": "+4", - "on_hit": "+4", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r33", + "recovery": "", "startup": "i19", "target": "m", "video": "" @@ -2174,12 +2165,12 @@ "image": "", "input": "uf+2,1", "name": "Kidney Crush Combo", - "notes": "* Heat Engager\n* Heat Dash +36a (+26), +5\n* Balcony Break\n* Chip damage on block\n* Combo from 1st hit with 10f delay\n* Gain 1 Ultimate Count on Heat activation\n", - "on_block": "-11", - "on_ch": "+21a (+11)", - "on_hit": "+21a (+11)", + "notes": "* Heat Engager\n* Heat Dash \n* Balcony Break\n* Combo from 1st hit\n* Chip damage on block\n* Increases WAR level by 1\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "Heihachi-uf+2", - "recovery": "r33", + "recovery": "", "startup": "i19", "target": "m,m", "video": "" @@ -2195,12 +2186,12 @@ "image": "", "input": "uf+3", "name": "", - "notes": "* Balcony Break\n* 2nd hit available only on hit or block\njs9~", - "on_block": "-10", - "on_ch": "-10a (-20)", - "on_hit": "-10a (-20)", + "notes": "\njs?~", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r36", + "recovery": "", "startup": "i28~29", "target": "m", "video": "" @@ -2213,17 +2204,17 @@ "ub+3,4", "u+3,4" ], - "damage": "17,20", + "damage": "17,20?", "id": "Heihachi-uf+3,4", "image": "", "input": "uf+3,4", "name": "Hell Axle", - "notes": "* Strong Aerial Tailspin\n* Balcony Break\n* Chip damage on block\n* Unavailable on whiff\n,js1~", - "on_block": "+4", + "notes": "* Strong Aerial Tailspin\n* Balcony Break\n* Unavailable on whiff\n,js?~", + "on_block": "", "on_ch": "+30a (+23)", "on_hit": "+30a (+23)", "parent": "Heihachi-uf+3", - "recovery": "r34", + "recovery": "", "startup": "i28~29", "target": "m,h", "video": "" @@ -2239,12 +2230,12 @@ "image": "", "input": "uf+4", "name": "Wind Slicer", - "notes": "* Homing\n* Balcony Break\njs9~29\nfs31~32", - "on_block": "-9", + "notes": "* Homing\n* Balcony Break\njs?~", + "on_block": "", "on_ch": "+43a", "on_hit": "+43a", "parent": "", - "recovery": "r22", + "recovery": "", "startup": "i24~26", "target": "m", "video": "" @@ -2262,14 +2253,14 @@ "image": "", "input": "uf+4,1", "name": "Soaring Anvil Smasher", - "notes": "* Balcony Break\n* Chip damage on block\n* Consumes remaining Heat time\n* Combo from 1st hit\n", - "on_block": "+2", + "notes": "* Balcony Break\n* Chip damage on block\n* Consumes remaining Heat time\n", + "on_block": "", "on_ch": "+5a", "on_hit": "+5a", "parent": "Heihachi-uf+4", - "recovery": "r40", + "recovery": "", "startup": "i24~26", - "target": "m,M", + "target": "m,M?", "video": "" }, { @@ -2281,11 +2272,11 @@ "input": "WAR.1+2", "name": "Ultimate Demon Breath", "notes": "* Balcony Break\n* Chip Damage on block\n", - "on_block": "-10", + "on_block": "", "on_ch": "+32a (+24)", "on_hit": "+32a (+24)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i12", "target": "m", "video": "" @@ -2301,11 +2292,11 @@ "input": "df+2,WAR.1", "name": "Ultimate Muso Renken", "notes": "* Tornado\n* Combo from 1st hit\n* Chip Damage on block\n", - "on_block": "-17", + "on_block": "", "on_ch": "+66a (+50)", "on_hit": "+66a (+50)", "parent": "Heihachi-df+2", - "recovery": "r37", + "recovery": "", "startup": "i13~14", "target": "m,m", "video": "" @@ -2318,32 +2309,30 @@ "image": "", "input": "WAR.f,F+2", "name": "Ultimate Demon God Fist", - "notes": "* Tornado\n* Spike\n* Chip Damage on block\n", - "on_block": "+1", + "notes": "* Tornado\n* Chip Damage on block\n", + "on_block": "", "on_ch": "+56a", "on_hit": "+56a", "parent": "", - "recovery": "r28", + "recovery": "", "startup": "i20~22", "target": "m", "video": "" }, { "alias": [], - "alt": [ - "RAI.4" - ], + "alt": [], "damage": "17", "id": "Heihachi-WAR.f,n,d,DF+4", "image": "", "input": "WAR.f,n,d,DF+4", "name": "Ultimate Spinning Demon", - "notes": "* No stagger on block\n* Links to f,n,d,DF+4 extensions\n", - "on_block": "-14", - "on_ch": "+28a", - "on_hit": "+8c", + "notes": "\n", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i16~17", "target": "L", "video": "" @@ -2355,13 +2344,13 @@ "id": "Heihachi-WAR.FUJ.1", "image": "", "input": "WAR.FUJ.1", - "name": "Ultimate Hidden Wind God Fist", - "notes": "* Tornado\n* Reversal Break\n* Chip damage on block\n", - "on_block": "-3", + "name": "Ultimate Hidden WARd God Fist", + "notes": "* Tornado\n* Chip damage on block\n", + "on_block": "", "on_ch": "+75a (+59)", "on_hit": "+75a (+59)", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i15~16", "target": "m", "video": "" @@ -2374,14 +2363,14 @@ "image": "", "input": "WAR.RAI.1", "name": "Ultimate Hidden Thunder God Fist", - "notes": "* Reversal Break\n* Chip damage on block\njs17~", - "on_block": "-8", + "notes": "* Chip damage on block\njs?~", + "on_block": "", "on_ch": "+12a (+2)", "on_hit": "+12a (+2)", "parent": "", - "recovery": "r49", + "recovery": "", "startup": "i17~19", - "target": "M", + "target": "M?", "video": "" }, { @@ -2393,11 +2382,11 @@ "input": "ws1", "name": "Quick Iron Fist", "notes": "* Balcony Break\n", - "on_block": "-14", - "on_ch": "+35d (+27)", - "on_hit": "+35d (+27)", + "on_block": "", + "on_ch": "+35a (+27)", + "on_hit": "+35a (+27)", "parent": "", - "recovery": "r29", + "recovery": "", "startup": "i13~14", "target": "m", "video": "" @@ -2410,12 +2399,12 @@ "image": "", "input": "ws2", "name": "Dark Thrust", - "notes": "* Balcony break on airborne hit\n", - "on_block": "-8", - "on_ch": "+14c", + "notes": "\n", + "on_block": "", + "on_ch": "+8", "on_hit": "+8", "parent": "", - "recovery": "r32", + "recovery": "", "startup": "i18", "target": "m", "video": "" @@ -2429,11 +2418,11 @@ "input": "ws3", "name": "", "notes": "\n", - "on_block": "-11", - "on_ch": "+0", - "on_hit": "+0", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r29", + "recovery": "", "startup": "i18~19", "target": "m", "video": "" @@ -2447,11 +2436,11 @@ "input": "ws3,1+2", "name": "Holy Demon Cross", "notes": "* Balcony Break\n* Combo from 1st hit\n", - "on_block": "-9", + "on_block": "", "on_ch": "+13a (+4)", "on_hit": "+13a (+4)", "parent": "Heihachi-ws3", - "recovery": "r32", + "recovery": "", "startup": "i18~19", "target": "m,m", "video": "" @@ -2465,11 +2454,11 @@ "input": "ws4", "name": "", "notes": "\n", - "on_block": "-3", - "on_ch": "+8", - "on_hit": "+8", + "on_block": "", + "on_ch": "", + "on_hit": "", "parent": "", - "recovery": "r21", + "recovery": "", "startup": "i11~12", "target": "m", "video": "" @@ -2482,12 +2471,12 @@ "image": "", "input": "ws4,4", "name": "Tsunami Kick", - "notes": "* Spike\n* Combo from 1st hit\n* Enter FUJ -9 +6c r31 with D\n", - "on_block": "-15", + "notes": "* Combo from 1st hit\n* Enter FUJ with D\n", + "on_block": "", "on_ch": "+0c", "on_hit": "+0c", "parent": "Heihachi-ws4", - "recovery": "r37", + "recovery": "", "startup": "i11~12", "target": "m,m", "video": "" diff --git a/src/framedb/const.py b/src/framedb/const.py index 819869f..ceb547e 100644 --- a/src/framedb/const.py +++ b/src/framedb/const.py @@ -58,7 +58,7 @@ def url_encode(self) -> str: CharacterName.DRAGUNOV: ["drag", "sergei", "dragu"], CharacterName.EDDY: ["ed", "capo"], CharacterName.FENG: ["fen"], - CharacterName.HEIHACHI: ["hei"], + CharacterName.HEIHACHI: ["hei", "hachi"], CharacterName.HWOARANG: ["hwo"], CharacterName.JACK_8: ["j8", "jack8", "jack"], CharacterName.JIN: ["jim"],