1.8.81-unstable

Global.gd

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

Main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=86 format=2]
+[gd_scene load_steps=87 format=2]
 
 [ext_resource path="res://ui/UILayer.gd" type="Script" id=1]
 [ext_resource path="res://main.gd" type="Script" id=2]
@@ -97,6 +97,8 @@ outline_size = 2
 outline_color = Color( 0, 0, 0, 1 )
 font_data = ExtResource( 69 )
 
+[sub_resource type="CanvasItemMaterial" id=25]
+
 [sub_resource type="DynamicFont" id=24]
 size = 36
 outline_size = 2
@@ -1016,6 +1018,31 @@ theme = ExtResource( 4 )
 text = "GUARD BREAK"
 align = 2
 
+[node name="ActiveP1Initiative" type="Label" parent="HudLayer/HudLayer"]
+unique_name_in_owner = true
+self_modulate = Color( 1, 1, 1, 0.427451 )
+material = SubResource( 25 )
+margin_left = 275.0
+margin_top = 267.0
+margin_right = 319.0
+margin_bottom = 278.0
+custom_colors/font_color = Color( 1, 0.2, 0.239216, 1 )
+custom_colors/font_outline_modulate = Color( 0, 0, 0, 0.372549 )
+text = "-initiative"
+
+[node name="ActiveP2Initiative" type="Label" parent="HudLayer/HudLayer"]
+unique_name_in_owner = true
+self_modulate = Color( 1, 1, 1, 0.427451 )
+material = SubResource( 25 )
+margin_left = 323.0
+margin_top = 267.0
+margin_right = 367.0
+margin_bottom = 278.0
+custom_colors/font_color = Color( 1, 0.2, 0.239216, 1 )
+custom_colors/font_outline_modulate = Color( 0, 0, 0, 0.372549 )
+text = "-initiative"
+align = 2
+
 [node name="WinLabel" type="Label" parent="HudLayer"]
 unique_name_in_owner = true
 visible = false
@@ -1633,6 +1660,19 @@ mouse_default_cursor_shape = 2
 icon = ExtResource( 64 )
 icon_align = 1
 
+[node name="NeutralLabel" type="Label" parent="UILayer/GameUI"]
+unique_name_in_owner = true
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+margin_top = -148.0
+margin_bottom = -123.0
+theme = ExtResource( 4 )
+custom_colors/font_color = Color( 1, 0.2, 0.239216, 1 )
+custom_constants/shadow_offset_x = 0
+custom_constants/line_spacing = -2
+align = 1
+
 [node name="ActivePlayer" type="Control" parent="UILayer/GameUI"]
 unique_name_in_owner = true
 margin_left = 310.5
@@ -1923,6 +1963,7 @@ margin_bottom = 23.0
 
 [node name="MainMenu" type="Control" parent="UILayer"]
 unique_name_in_owner = true
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 1
@@ -2264,6 +2305,7 @@ text = "Quit"
 
 [node name="OptionsContainer" type="PanelContainer" parent="UILayer"]
 unique_name_in_owner = true
+visible = false
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5

ObjectState.gd

@@ -496,17 +496,20 @@ func setup_hitboxes():
 	for hitbox in all_hitbox_nodes:
 		hitbox.host = host
 		hitbox.init()
-		has_hitboxes = true
+		var detect = hitbox.hitbox_type == Hitbox.HitboxType.Detect
+		if !detect:
+			has_hitboxes = true
 		if !host.is_ghost:
 			hitbox.property_list = get_script().get_property_list()
 		if hitbox.start_tick > 0:
 			if hitbox_start_frames.has(hitbox.start_tick):
 				hitbox_start_frames[hitbox.start_tick].append(hitbox)
 			else:
 				hitbox_start_frames[hitbox.start_tick] = [hitbox]
-			if hitbox.start_tick < earliest:
-				earliest = hitbox.start_tick
-				earliest_hitbox_node = hitbox
+			if !detect:
+				if hitbox.start_tick < earliest:
+					earliest = hitbox.start_tick
+					earliest_hitbox_node = hitbox
 		hitbox.connect("hit_something", self, "__on_hit_something")
 		hitbox.connect("got_parried", self, "__on_got_parried")
 		for hitbox2 in all_hitbox_nodes:

characters/BaseChar.gd

@@ -1820,6 +1820,17 @@ func get_advantage():
 		if current_state() is GroundedParryState:
 			advantage = true
 	return advantage
+
+func check_initiative():
+	if combo_count > 0:
+		return true
+	if busy_interrupt:
+		return false
+	if opponent.busy_interrupt:
+		return false
+	if current_state().state_name == "WhiffInstantCancel":
+		return false
+	return true
 
 func was_moving_forward():
 	return moved_forward and current_state().has_hitboxes

characters/mutant/Mutant.tscn

@@ -2431,25 +2431,25 @@ projectile_pos_x = 16
 projectile_pos_y = -24
 force_same_direction_as_previous_state = true
 throw_positions = {
-ExtResource( 169 ): {
-"x": 16,
-"y": -7
-},
-ExtResource( 166 ): {
-"x": -8,
-"y": -17
+ExtResource( 171 ): {
+"x": 15,
+"y": -10
 },
 ExtResource( 173 ): {
 "x": 9,
 "y": -11
 },
-ExtResource( 171 ): {
-"x": 15,
-"y": -10
+ExtResource( 169 ): {
+"x": 16,
+"y": -7
 },
 ExtResource( 160 ): {
 "x": 37,
 "y": -1
+},
+ExtResource( 166 ): {
+"x": -8,
+"y": -17
 }
 }
 interruptible_on_opponent_turn = true
@@ -2869,7 +2869,7 @@ apply_forces = true
 apply_fric = true
 apply_forces_no_limit = true
 fallback_state = "WallTrickFollowup"
-anim_length = 10
+anim_length = 9
 endless = true
 force_dir_x = "1.0"
 force_speed = "5.0"
@@ -3689,17 +3689,17 @@ enter_force_dir_x = "1.0"
 enter_force_dir_y = "-2.0"
 enter_force_speed = "4"
 throw_positions = {
-ExtResource( 82 ): {
-"x": -8,
-"y": -5
+ExtResource( 81 ): {
+"x": -11,
+"y": -6
 },
 ExtResource( 79 ): {
 "x": 23,
 "y": 16
 },
-ExtResource( 81 ): {
-"x": -11,
-"y": -6
+ExtResource( 82 ): {
+"x": -8,
+"y": -5
 }
 }
 land_cancel = true