Swapped bool values, only_roll changed to attack_interrupts.

common/src/states/basic_beam.rs

@@ -64,7 +64,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.4);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::BasicBeam(_) => {},
                 _ => {

common/src/states/basic_melee.rs

@@ -48,7 +48,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.7);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::BasicMelee(_) => {},
                 _ => {

common/src/states/basic_ranged.rs

@@ -49,7 +49,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.3);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::BasicRanged(_) => {},
                 _ => {

common/src/states/charged_melee.rs

@@ -60,7 +60,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.7);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::ChargedMelee(_) => {},
                 _ => {

common/src/states/charged_ranged.rs

@@ -64,7 +64,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.3);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::ChargedRanged(_) => {},
                 _ => {

common/src/states/combo_melee.rs

@@ -111,7 +111,7 @@ impl CharacterBehavior for Data {
         handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.3);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, !self.static_data.is_interruptible);
+            handle_interrupt(data, &mut update, self.static_data.is_interruptible);
             if let CharacterState::Roll(roll) = &mut update.character {
                 roll.was_combo = Some((self.stage, self.combo));
             }

common/src/states/dash_melee.rs

@@ -67,7 +67,7 @@ impl CharacterBehavior for Data {
         handle_orientation(data, &mut update, 1.0);
         handle_move(data, &mut update, 0.1);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, !self.static_data.is_interruptible);
+            handle_interrupt(data, &mut update, self.static_data.is_interruptible);
             match update.character {
                 CharacterState::DashMelee(_) => {},
                 _ => {

common/src/states/leap_melee.rs

@@ -54,7 +54,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 0.3);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::LeapMelee(_) => {},
                 _ => {

common/src/states/repeater_ranged.rs

@@ -52,7 +52,7 @@ impl CharacterBehavior for Data {
         handle_move(data, &mut update, 1.0);
         handle_jump(data, &mut update);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::RepeaterRanged(_) => {},
                 _ => {

common/src/states/shockwave.rs

@@ -54,7 +54,7 @@ impl CharacterBehavior for Data {
 
         handle_move(data, &mut update, self.static_data.move_efficiency);
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, true);
+            handle_interrupt(data, &mut update, false);
             match update.character {
                 CharacterState::Shockwave(_) => {},
                 _ => {

common/src/states/spin_melee.rs

@@ -72,7 +72,7 @@ impl CharacterBehavior for Data {
         }
 
         if !ability_key_is_pressed(data, self.static_data.ability_key) {
-            handle_interrupt(data, &mut update, !self.static_data.is_interruptible);
+            handle_interrupt(data, &mut update, self.static_data.is_interruptible);
             match update.character {
                 CharacterState::SpinMelee(_) => {},
                 _ => {

common/src/states/utils.rs

@@ -420,8 +420,8 @@ pub fn unwrap_tool_data<'a>(data: &'a JoinData) -> Option<&'a Tool> {
     }
 }
 
-pub fn handle_interrupt(data: &JoinData, update: &mut StateUpdate, only_dodge: bool) {
+pub fn handle_interrupt(data: &JoinData, update: &mut StateUpdate, attacks_interrupt: bool) {
-    if !only_dodge {
+    if attacks_interrupt {
         handle_ability1_input(data, update);
         handle_ability2_input(data, update);
         handle_ability3_input(data, update);