1.8.73-unstable

uzkbwza · Mar 4, 2024 · a133e48 · a133e48
1 parent fd47133
commit a133e48
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 31 deletions.
diff --git a/Global.gd b/Global.gd
@@ -2,7 +2,7 @@ extends Node
 
 signal nag_window()
 
-var VERSION = "1.8.72-steam-unstable"
+var VERSION = "1.8.73-steam-unstable"
 const RESOLUTION = Vector2(640, 360)
 
 var audio_player

diff --git a/characters/BaseChar.tscn b/characters/BaseChar.tscn
@@ -189,7 +189,7 @@
 [ext_resource path="res://characters/VelocityLabel.gd" type="Script" id=187]
 [ext_resource path="res://characters/grounded.png" type="Texture" id=188]
 [ext_resource path="res://characters/Grounded.gd" type="Script" id=189]
-[ext_resource path="res://characters/states/CharState.gd" type="Script" id=190]
+[ext_resource path="res://characters/states/SuperFallStartup.gd" type="Script" id=190]
 [ext_resource path="res://characters/states/SuperFall.gd" type="Script" id=191]
 [ext_resource path="res://ui/ActionSelector/StateIcons/super_fall.png" type="Texture" id=192]
 
@@ -1049,19 +1049,24 @@ Grounded"
 
 [node name="SuperFallStartup" type="Node2D" parent="StateMachine" index="19"]
 script = ExtResource( 190 )
+__meta__ = {
+"_editor_description_": ""
+}
 apply_forces = true
 apply_fric = true
 reset_y_momentum = true
 fallback_state = "SuperFall"
 sprite_animation = "InstantCancel"
-anim_length = 6
+anim_length = 8
 title = "Super Fall"
 button_texture = ExtResource( 192 )
 air_type = 1
 land_cancel = true
 interruptible_on_opponent_turn = true
 interrupt_from_string = "Aerial
 AerialMovement"
+interrupt_into_string = "Aerial
+Grounded"
 
 [node name="SuperFall" type="Node2D" parent="StateMachine" index="20"]
 script = ExtResource( 191 )

diff --git a/characters/mutant/Mutant.tscn b/characters/mutant/Mutant.tscn
@@ -2144,7 +2144,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2165,7 +2164,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2186,7 +2184,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2207,7 +2204,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2228,7 +2224,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2273,7 +2268,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2294,7 +2288,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2315,7 +2308,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2336,7 +2328,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -2357,7 +2348,6 @@ hitstun_ticks = 16
 hitlag_ticks = 9
 victim_hitlag = 12
 hits_vs_grounded = false
-block_cancel_allowed = false
 plus_frames = -4
 whiff_sound = ExtResource( 209 )
 hit_sound = ExtResource( 16 )
@@ -3667,7 +3657,6 @@ loop_animation = true
 
 [node name="ThrowBox" parent="StateMachine/Grab" index="0"]
 beats_grab = false
-block_cancel_allowed = true
 pushback_x = "0.0"
 loop_active_ticks = 0
 
@@ -3676,12 +3665,8 @@ data_ui_scene = ExtResource( 124 )
 
 [node name="ThrowBox" parent="StateMachine/AirGrab" index="0"]
 beats_grab = false
-block_cancel_allowed = true
 pushback_x = "0.0"
 
-[node name="ThrowBox" parent="StateMachine/JumpGrab" index="0"]
-block_cancel_allowed = true
-
 [node name="ForwardThrow" parent="StateMachine" index="86"]
 apply_grav = false
 reset_y_momentum = true

diff --git a/characters/mutant/states/AcidSlashJ.gd b/characters/mutant/states/AcidSlashJ.gd
@@ -15,9 +15,12 @@ func _frame_0():
 	if host.initiative and host.is_grounded():
 		host.start_aerial_attack_invulnerability()
 
-func _frame_8():
-	host.end_aerial_attack_invulnerability()
-
 func _frame_9():
+	host.set_vel(host.get_vel().x, "0")
 	host.move_directly(0, -1)
 	host.apply_force_relative(FORWARD_X_FORCE if !up else UP_X_FORCE, FORWARD_Y_FORCE if !up else UP_Y_FORCE)
+	host.end_aerial_attack_invulnerability()
+
+func _got_parried():
+	._got_parried()
+	host.hitlag_ticks += 5
diff --git a/characters/states/CharState.gd b/characters/states/CharState.gd
@@ -558,6 +558,9 @@ func _exit_shared():
 	emit_signal("state_ended")
 	host.z_index = 0
 
+func on_interrupt():
+	pass
+
 func update_sprite_frame():
 #	if host.blockstun_ticks > 0 and !force:
 #		return

diff --git a/characters/states/NewParry.gd b/characters/states/NewParry.gd
@@ -37,7 +37,7 @@ func _enter():
 		data = { "Melee Parry Timing": {"count" : 0}, "Block Height": { "x": 1, "y": 0}}
 	extra_iasa = 0
 	disable_aerial_movement = _disable_aerial_movement
-	interrupt_exceptions.erase("AerialMovement")
+
 	start()
 
 func get_hold_restart():
@@ -157,7 +157,13 @@ func _exit():
 	parried_last = parried
 	host.blocked_last_hit = false
 
+func on_interrupt():
+	interrupt_exceptions.erase("AerialMovement")
+	if disable_aerial_movement:
+		interrupt_exceptions.append("AerialMovement")
+
 func enable_interrupt(check_opponent=true, remove_hitlag=false):
+	interrupt_exceptions.erase("AerialMovement")
 	if disable_aerial_movement:
 		interrupt_exceptions.append("AerialMovement")
 	.enable_interrupt(check_opponent, remove_hitlag)

diff --git a/characters/states/SuperFallStartup.gd b/characters/states/SuperFallStartup.gd
@@ -0,0 +1,4 @@
+extends CharacterState
+
+func _frame_5():
+	queue_state_change(fallback_state)
diff --git a/characters/swordandgun/SwordGuy.tscn b/characters/swordandgun/SwordGuy.tscn
@@ -941,7 +941,6 @@ data_ui_scene = ExtResource( 316 )
 button_texture = ExtResource( 274 )
 flip_with_facing = true
 air_type = 1
-uses_air_movement = true
 iasa_at = 7
 interruptible_on_opponent_turn = true
 next_state_on_hold_on_opponent_turn = true
@@ -981,7 +980,6 @@ data_ui_scene = ExtResource( 316 )
 button_texture = ExtResource( 274 )
 flip_with_facing = true
 air_type = 1
-uses_air_movement = true
 iasa_at = 7
 interruptible_on_opponent_turn = true
 next_state_on_hold_on_opponent_turn = true
@@ -1097,7 +1095,6 @@ data_ui_scene = ExtResource( 316 )
 button_texture = ExtResource( 274 )
 flip_with_facing = true
 air_type = 1
-uses_air_movement = true
 iasa_at = 7
 interruptible_on_opponent_turn = true
 next_state_on_hold_on_opponent_turn = true
@@ -1143,7 +1140,6 @@ data_ui_scene = ExtResource( 316 )
 button_texture = ExtResource( 274 )
 flip_with_facing = true
 air_type = 1
-uses_air_movement = true
 iasa_at = 7
 interruptible_on_opponent_turn = true
 next_state_on_hold_on_opponent_turn = true
@@ -1206,6 +1202,8 @@ type = 3
 button_texture = ExtResource( 338 )
 air_type = 2
 iasa_on_hit = 7
+iasa_on_hit_on_block = false
+next_state_on_hold_on_opponent_turn = true
 interrupt_from_string = "GroundedSuper
 Grounded
 AerialSuper
@@ -4376,16 +4374,11 @@ send_away_from_center = true
 always_on = true
 
 [node name="ThrowBox" parent="StateMachine/Grab" index="0"]
-block_cancel_allowed = true
 _c_Grouping = 1
 
 [node name="ThrowBox" parent="StateMachine/AirGrab" index="0"]
-block_cancel_allowed = true
 _c_Grouping = 1
 
-[node name="ThrowBox" parent="StateMachine/JumpGrab" index="0"]
-block_cancel_allowed = true
-
 [node name="ForwardThrow" parent="StateMachine" index="116"]
 knockback = "11.0"
 dir_y = "0.0"

diff --git a/game.gd b/game.gd
@@ -1243,6 +1243,8 @@ func process_tick():
 			var someones_turn = false
 			if p1.state_interruptable and !p1_turn:
 				p2.busy_interrupt = (!p2.state_interruptable and !(p2.current_state().interruptible_on_opponent_turn or p2.feinting or negative_on_hit(p2)))
+				if !p2.busy_interrupt:
+					p2.current_state().on_interrupt()
 				p2.state_interruptable = true
 				p1.show_you_label()
 				p1_turn = true
@@ -1257,6 +1259,8 @@ func process_tick():
 			elif p2.state_interruptable and !p2_turn:
 				someones_turn = true
 				p1.busy_interrupt = (!p1.state_interruptable and !(p1.current_state().interruptible_on_opponent_turn or p1.feinting or negative_on_hit(p1)))
+				if !p1.busy_interrupt:
+					p1.current_state().on_interrupt()
 				p1.state_interruptable = true
 				p2.show_you_label()
 				p2_turn = true