Heavy weapon falls on char when catching

[Memento]

I noticed that when base form Goku uses his rush attack, in which he runs fordward and goes to a catching frame, followed by a punch, the stone falls on him and Goku's hurt. I think this happens because the opponent is caught in frame 111, which is a defend frame, and you can't hold a heavy weapon in a defend frame. However, there's no fix that I know of without modifying every character's data and giving him a new frame showing the correct sprite (defending) 


Right now, I fixed this problem with a state: 7. It doesn't hurt Goku anymore, but the the stone falls somewhere very low on the y-axis and then it moves up again.

Easiest fix that I know of is breaking the weapon with a high bdefend and effect: 4. But are there any ways that don't involve destroying the object?



First active code is in the special running frames. This 'catches' the opponent:

Code:

  itr:

     kind: 3  x: 31  y: 32  w: 34  h: 33  vrest: 7  

     catchingact: 250 250  caughtact: 111 111

  itr_end:

The caught character goes to the defending frame 111

Code:

<frame> 111 defend

  pic: 57  state: 7  wait: 1  next: 110  dvx: 0  dvy: 0  dvz: 0  centerx: 40  centery: 79  hit_a: 0  hit_d: 0  hit_j: 0  hit_Ua: 145

  wpoint:
  kind: 1  x: 49  y: 39   weaponact: 35  attacking: 0  cover: 0  dvx: 0  dvy: 0  dvz: 0
  wpoint_end:

  bdy:
     kind: 0  x: 16  y: 19  w: 42  h: 60
  bdy_end:
<frame_end>

Goku uses a state 9 for the shortest time possible (wait 0) and then punches the opponent

Code:

<frame> 250 Meteor Combination combo1

  pic: 10  state: 9  wait: 0  next: 251  dvx: 0  dvy: 0  dvz: 0  centerx: 44  centery: 79  hit_a: 0  
hit_d: 0  hit_j: 0

  cpoint:
     kind: 1  x: 105  y: 41
     vaction: 130  aaction: 251  taction: -251  throwvz: -842150451  hurtable: 1 throwinjury: -842150451
decrease: -7
  cpoint_end:

  wpoint:
  kind: 1  x: 34  y: 39   weaponact: 20  attacking: 0  cover: 0  dvx: 0  dvy: 0  dvz: 0
  wpoint_end:
<frame_end>



<frame> 251 Meteor Combination combo1

  pic: 10  state: 7  wait: 1  next: 252  dvx: 2  dvy: 0  dvz: 1  centerx: 44  centery: 79  hit_a: 0  
hit_d: 0  hit_j: 0

  wpoint:
  kind: 1  x: 34  y: 39   weaponact: 20  attacking: 0  cover: 0  dvx: 0  dvy: 0  dvz: 0
  wpoint_end:

  bdy:
     kind: 0  x: 31  y: 28  w: 27  h: 44
  bdy_end:
<frame_end>



<frame> 252 Meteor Combination combo1
 sound: data\007.wav
  pic: 12  state: 7  wait: 3  next: 253  dvx: 5  dvy: 0  dvz: 1  centerx: 37  centery: 79  hit_a: 0  
hit_d: 0  hit_j: 0

  itr:
     kind: 0  x: 21  y: 30  w: 54  h: 23  dvx: 10  bdefend: 70  injury: 25 fall: 60
  itr_end:

  bdy:
     kind: 0  x: 31  y: 28  w: 27  h: 44
  bdy_end:

  wpoint:
  kind: 1  x: 59  y: 37   weaponact: 34  attacking: 0  cover: 1  dvx: 0  dvy: 0  dvz: 0
  wpoint_end:

<frame_end>