dakjfdlsjflsd

Global.gd

@@ -2,7 +2,7 @@ extends Node
 
 signal nag_window()
 
-var VERSION = "1.8.63-steam-unstable"
+var VERSION = "1.8.64-steam-unstable"
 const RESOLUTION = Vector2(640, 360)
 
 var audio_player

characters/BaseChar.gd

@@ -1239,12 +1239,12 @@ func hit_by(hitbox, force_hit=false):
 				opponent.apply_hitlag(hitbox)
 				if hitbox.rumble:
 					rumble(hitbox.screenshake_amount, hitbox.victim_hitlag if hitbox.screenshake_frames < 0 else hitbox.screenshake_frames)
-
 				take_damage(hitbox.get_damage(), hitbox.minimum_damage, hitbox.meter_gain_modifier)
-				opponent.incr_combo(hitbox.scale_combo, false, false, hitbox.combo_scaling_amount)
+				increment_opponent_combo(hitbox)
+#				opponent.incr_combo(hitbox.scale_combo, false, false, hitbox.combo_scaling_amount)
 			Hitbox.HitboxType.OffensiveBurst:
 				opponent.hitstun_decay_combo_count = 0
-				opponent.combo_proration = Utils.int_min(opponent.combo_proration, 0)
+#				opponent.combo_proration = Utils.int_min(opponent.combo_proration, 0)
 				launched_by(hitbox)
 				reset_pushback()
 				opponent.reset_pushback()

characters/BaseChar.tscn

@@ -611,11 +611,11 @@ AerialDefense
 Parry"
 interrupt_into_string = "Grounded
 Aerial"
-interrupt_exceptions_string = "AerialMovement"
 allowed_stances_string = "Normal
 All"
 change_stance_to = "Normal"
 parry_type = 2
+disable_aerial_movement = true
 
 [node name="ParryAfterWhiff" type="Node2D" parent="StateMachine" index="3"]
 script = ExtResource( 182 )
@@ -640,11 +640,11 @@ AerialDefense
 Parry"
 interrupt_into_string = "Grounded
 Aerial"
-interrupt_exceptions_string = "AerialMovement"
 allowed_stances_string = "Normal
 All"
 change_stance_to = "Normal"
 parry_type = 2
+disable_aerial_movement = true
 reblock = true
 
 [node name="ParryAuto" type="Node2D" parent="StateMachine" index="4"]
@@ -672,12 +672,12 @@ AerialDefense
 Parry"
 interrupt_into_string = "Grounded
 Aerial"
-interrupt_exceptions_string = "AerialMovement"
 allowed_stances_string = "Normal
 All"
 change_stance_to = "Normal"
 parry_type = 2
 autoguard = true
+disable_aerial_movement = true
 
 [node name="ParryLow" type="Node2D" parent="StateMachine" index="5"]
 script = ExtResource( 182 )

characters/mutant/Mutant.tscn

@@ -2115,25 +2115,25 @@ projectile_pos_x = 16
 projectile_pos_y = -24
 force_same_direction_as_previous_state = true
 throw_positions = {
-ExtResource( 173 ): {
-"x": 9,
-"y": -11
-},
 ExtResource( 169 ): {
 "x": 16,
 "y": -7
 },
-ExtResource( 171 ): {
-"x": 15,
-"y": -10
-},
 ExtResource( 160 ): {
 "x": 37,
 "y": -1
 },
 ExtResource( 166 ): {
 "x": -8,
 "y": -17
+},
+ExtResource( 171 ): {
+"x": 15,
+"y": -10
+},
+ExtResource( 173 ): {
+"x": 9,
+"y": -11
 }
 }
 interruptible_on_opponent_turn = true
@@ -2200,7 +2200,7 @@ y = -6
 width = 12
 height = -15
 damage = 67
-hitstun_ticks = 35
+hitstun_ticks = 28
 cancellable = false
 di_modifier = "1.5"
 plus_frames = 2
@@ -2221,7 +2221,7 @@ y = 1
 width = 12
 height = -23
 damage = 67
-hitstun_ticks = 35
+hitstun_ticks = 28
 cancellable = false
 di_modifier = "1.5"
 plus_frames = 2
@@ -3303,13 +3303,13 @@ ExtResource( 82 ): {
 "x": -8,
 "y": -5
 },
-ExtResource( 79 ): {
-"x": 23,
-"y": 16
-},
 ExtResource( 81 ): {
 "x": -11,
 "y": -6
+},
+ExtResource( 79 ): {
+"x": 23,
+"y": 16
 }
 }
 land_cancel = true

characters/mutant/actionuidata/ProjectileGrabActionUIData.tscn

@@ -12,6 +12,6 @@ size_flags_vertical = 0
 [node name="JumpArc" parent="." index="0" instance=ExtResource( 3 )]
 anchor_right = 0.0
 anchor_bottom = 0.0
-always_max = true
+margin_bottom = 66.0
 limit_range_degrees = 180.0
 default_value = Vector2( -4.37114e-08, -1 )

characters/mutant/states/ProjectileGrab.gd

@@ -1,8 +1,9 @@
 extends BeastState
 
-const JUMP_FORCE = -15
+const JUMP_FORCE = -10
 const JUMP_HORIZ_SPEED = "7.0"
-const FIGHTER_JUMP_FORCE = -10
+const FIGHTER_JUMP_FORCE = -5
+const BASE_JUMP_FORCE = -5
 
 var jumped = false
 
@@ -19,8 +20,13 @@ func detect(obj):
 	if jumped:
 		return
 	jumped = true
-	host.apply_force(xy_to_dir(data.x, data.y, JUMP_HORIZ_SPEED).x, str(JUMP_FORCE if !obj.is_in_group("Fighter") else FIGHTER_JUMP_FORCE))
 	host.set_vel(0, 0)
+	var dir = xy_to_dir(data.x, data.y)
+	var dir_x = fixed.mul(dir.x, JUMP_HORIZ_SPEED)
+	var dir_y = fixed.mul(dir.y, str(JUMP_FORCE if !obj.is_in_group("Fighter") else FIGHTER_JUMP_FORCE))
+	dir_y = fixed.mul(dir_y, "-1")
+	host.apply_force(dir_x, dir_y)
+	host.apply_force(0, BASE_JUMP_FORCE)
 	queue_state_change("ProjectileGrabJump")
 	if !obj.is_in_group("Fighter"):
 		obj.apply_force(0, -JUMP_FORCE)

characters/robo/RoboExtra.gd

@@ -70,6 +70,10 @@ func update_selected_move(move_state):
 		if move_state.is_grab and $"%ArmorEnabled".pressed:
 			can_feint = false
 
+	if fighter.current_state().get("disable_aerial_movement"):
+		$"%FlyEnabled".set_pressed_no_signal(false)
+		$"%FlyEnabled".disabled = true
+
 func show_options():
 	$"%FlyDir".hide()
 	bounce.hide()
@@ -105,7 +109,11 @@ func show_options():
 		$"%ArmorEnabled".show()
 #	if fighter.current_state().state_name == "WhiffInstantCancel":
 #		$"%ArmorEnabled".hide()
-	return
+
+	if fighter.current_state().get("disable_aerial_movement"):
+		$"%FlyEnabled".set_pressed_no_signal(false)
+		$"%FlyEnabled".disabled = true
+		$"%FlyDir".hide()
 
 func reset():
 	if fighter.flying_dir:
@@ -117,6 +125,10 @@ func reset():
 	$"%NadeActive".set_pressed_no_signal(false)
 	$"%PullEnabled".set_pressed_no_signal(false)
 	$"%DriveCancel".set_pressed_no_signal(fighter.stance == "Drive")
+
+	if fighter.current_state().get("disable_aerial_movement"):
+		$"%FlyEnabled".set_pressed_no_signal(false)
+		$"%FlyEnabled".disabled = true
 
 func on_data_changed():
 #	bounce.visible = $"%NadeActive".pressed