1.8.80-unstable

BottomBar.gd

@@ -28,7 +28,7 @@ func _on_action_buttons_visibility_changed():
 			$"%PredictionSettingsOpenButton".hide()
 #		$"%ActivePlayerSuperContainer".show()
 
-	if p1_info_scene:
+	if is_instance_valid(p1_info_scene):
 		p1_info_scene.get_parent().remove_child(p1_info_scene)
 		p2_info_scene.get_parent().remove_child(p2_info_scene)
 
@@ -41,15 +41,15 @@ func _on_action_buttons_visibility_changed():
 		$"%P1SuperContainer".show()
 		$"%P2SuperContainer".show()
 		$"%ActivePlayer".hide()
-		if p1_info_scene:
+		if is_instance_valid(p1_info_scene):
 			p1_info_scene.on_position_changed(false)
 			p2_info_scene.on_position_changed(false)
 	else:
 		$"%P1SuperContainer".hide()
 		$"%P2SuperContainer".hide()
 		$"%ActivePlayer".show()
 		$"%ActivePlayerSuperContainer".show()
-		if p1_info_scene:
+		if is_instance_valid(p1_info_scene):
 			active_player_info_container.add_child(p1_info_scene)
 			active_player_info_container.add_child(p2_info_scene)
 			p1_info_scene.on_position_changed(true)

Global.gd

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

characters/BaseChar.gd

@@ -977,6 +977,7 @@ func launched_by(hitbox):
 
 #		if hitlag_ticks < hitbox.victim_hitlag:
 	apply_hitlag(hitbox)
+	feinting = false
 
 	if objs_map.has(hitbox.host):
 		var host = objs_map[hitbox.host]
@@ -1227,21 +1228,6 @@ func hit_by(hitbox, force_hit=false):
 	elif current_state() is CounterAttack:
 		hit_out_of_brace = true
 
-#	if brace_on and brace_available:
-#		hitlag_ticks = 4
-#		opponent.hitlag_ticks = 4
-#		if opponent.current_state().current_tick == brace_value - 1:
-#			play_sound("Parry")
-#			play_sound("Parry2")
-#			spawn_particle_effect(preload("res://fx/ParryEffect.tscn"), get_pos_visual() + particle_position)
-#			opponent.incr_combo(true, false, false, 1)
-#		else:
-#			play_sound("Block")
-#			play_sound("Parry")
-#			spawn_particle_effect(preload("res://characters/stickman/HeavyWhipWaveHitEffect.tscn"), get_pos_visual() + particle_position)
-#			opponent.incr_combo(true, false, false, -1)
-#		brace_available = false
-
 	if hitbox.throw and not is_otg():
 		return thrown_by(hitbox)
 	if force_hit or (not can_parry_hitbox(hitbox)):
@@ -1388,7 +1374,9 @@ func block_hitbox(hitbox, force_parry=false, force_block=false, ignore_guard_bre
 		particle_location.x *= get_facing_int()
 
 		if current_state() is GroundedParryState:
-			current_state().anim_name = "ParryLow" if (hitbox.hit_height == Hitbox.HitHeight.Low or !is_grounded()) else "ParryHigh"
+			var high_anim = "ParryHigh" if !current_state().use_guard_sprites else "ShieldHigh"
+			var low_anim = "ParryLow" if !current_state().use_guard_sprites else "ShieldLow"
+			current_state().anim_name = low_anim if (hitbox.hit_height == Hitbox.HitHeight.Low or !is_grounded()) else high_anim
 			current_state().update_sprite_frame()
 
 		if not particle_location:

characters/BaseChar.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=194 format=2]
+[gd_scene load_steps=195 format=2]
 
 [ext_resource path="res://characters/BaseChar.gd" type="Script" id=1]
 [ext_resource path="res://characters/stickman/sprites/idle.png" type="Texture" id=2]
@@ -192,6 +192,7 @@
 [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]
+[ext_resource path="res://fx/PushblockFreezeEffect.tscn" type="PackedScene" id=193]
 
 [sub_resource type="SpriteFrames" id=3]
 animations = [ {
@@ -430,7 +431,6 @@ frames = SubResource( 3 )
 animation = "Wait"
 offset = Vector2( 0, -18 )
 __meta__ = {
-"_edit_group_": true,
 "_edit_lock_": true
 }
 
@@ -572,6 +572,7 @@ __meta__ = {
 sprite_animation = "ParryHigh"
 anim_length = 20
 endless = true
+particle_scene = ExtResource( 193 )
 title = "Push Block"
 type = 4
 button_texture = ExtResource( 184 )
@@ -596,6 +597,16 @@ super_effect_ = true
 parry_type = 2
 push = true
 
+[node name="Hitbox" type="Node2D" parent="StateMachine/ParrySuper" index="0"]
+z_index = 1000
+script = ExtResource( 7 )
+y = -16
+width = 150
+height = 150
+hitbox_type = 6
+start_tick = 1
+active_ticks = 20
+
 [node name="ParryHigh" type="Node2D" parent="StateMachine" index="2"]
 script = ExtResource( 182 )
 __meta__ = {

characters/mutant/Mutant.tscn

@@ -711,6 +711,10 @@ frames = SubResource( 7 )
 animation = "BiteGrab"
 frame = 12
 offset = Vector2( 0, -16 )
+__meta__ = {
+"_edit_group_": true,
+"_edit_lock_": true
+}
 
 [node name="TwistAttackSprite" type="AnimatedSprite" parent="Flip" index="1"]
 unique_name_in_owner = true

characters/mutant/MutantPlayerInfo.gd

@@ -31,6 +31,8 @@ func update_p2_children():
 			$HBoxContainer.call_deferred("add_child", child)
 
 func _process(delta):
+	if !is_instance_valid(fighter):
+		return
 	for i in range(fighter.JUKE_PIPS):
 		if player_id == 2:
 			i = fighter.JUKE_PIPS - i - 1
@@ -41,4 +43,3 @@ func _process(delta):
 		separator_4.visible = fighter.juke_pips > 8
 		child.visible = fighter.juke_pips > i
 		child.texture = preload("res://characters/mutant/ActivePip.tres") if (fighter.juke_pips / 2) > i / 2 else preload("res://characters/mutant/pip3.png")
-

characters/robo/Robot.tscn

@@ -1077,6 +1077,10 @@ frames = SubResource( 12 )
 animation = "Punch"
 frame = 3
 offset = Vector2( 0, -16 )
+__meta__ = {
+"_edit_group_": true,
+"_edit_lock_": true
+}
 
 [node name="ChainsawArm" type="AnimatedSprite" parent="Flip" index="1"]
 unique_name_in_owner = true
@@ -1091,7 +1095,6 @@ unique_name_in_owner = true
 visible = false
 position = Vector2( 0, -16 )
 frames = SubResource( 9 )
-frame = 1
 playing = true
 
 [node name="HustleEffect" parent="Flip/Particles" index="0" instance=ExtResource( 391 )]
@@ -1957,7 +1960,7 @@ script = ExtResource( 463 )
 apply_forces = true
 apply_grav = true
 reset_x_momentum = true
-anim_length = 12
+anim_length = 13
 force_dir_x = "1.0"
 force_speed = "18.0"
 force_tick = 3
@@ -1981,7 +1984,7 @@ beats_backdash = true
 
 [node name="HostCommand" type="Node" parent="StateMachine/Propel" index="0"]
 script = ExtResource( 460 )
-tick = 7
+tick = 9
 command = "try_drive_cancel"
 args = [ true ]
 
@@ -2223,6 +2226,7 @@ x = 32
 y = -45
 width = 32
 height = 22
+damage_proration = 5
 increment_combo = false
 hits_vs_grounded = false
 beats_grab = false
@@ -2308,6 +2312,7 @@ damage = 400
 damage_in_combo = 120
 hitlag_ticks = 0
 victim_hitlag = 0
+damage_proration = 9001
 cancellable = false
 beats_grab = false
 replace_hit_particle = true

characters/robo/RobotInfo.gd

@@ -13,6 +13,8 @@ func set_fighter(fighter):
 		$"%LOICMeter".fill_mode = TextureProgress.FILL_RIGHT_TO_LEFT
 
 func _process(delta):
+	if !is_instance_valid(fighter):
+		return
 	$"%LandingIndicator".modulate.a = 0.15
 	if fighter.can_ground_pound:
 		$"%LandingIndicator".modulate.a = 1.0 if Utils.pulse(0.3, 0.65) else 0.75
@@ -22,4 +24,3 @@ func _process(delta):
 		$"%ArmorIndicator".modulate.a = 1.0 if Utils.pulse(0.3, 0.65) else 0.75
 	$"%LOICMeter".texture_progress = LOIC_READY_BAR if fighter.can_loic else LOIC_CHARGING_BAR
 	$"%LOICMeter".value = (fighter.loic_meter / float(fighter.LOIC_METER)) * $"%LOICMeter".max_value
-

characters/robo/projectiles/orbital_strike.tscn

@@ -101,12 +101,12 @@ script = ExtResource( 14 )
 pitch_variation = 0.0
 
 [node name="CollisionBox" parent="." index="2"]
-y = 100
+y = 1000
 width = 1
 height = 1
 
 [node name="Hurtbox" parent="." index="3"]
-y = 100
+y = 1000
 width = 1
 height = 1
 

characters/states/Jump.gd

@@ -46,8 +46,6 @@ func _enter():
 			"y": fixed.round(fixed.mul(dir.y, "100"))
 		}
 
-
-
 	squat = is_squat()
 	if !squat:
 		host.start_throw_invulnerability()
@@ -146,7 +144,7 @@ func _frame_0():
 			interrupt_frames[0] = 14
 			interrupt_frames[1] = 25
 			if !back:
-				interrupt_frames[0] = 13
+				interrupt_frames[0] = 14
 				interrupt_frames[1] = 24
 		elif full_hop:
 			interrupt_frames[0] = 10

characters/states/NewParry.gd

@@ -3,9 +3,11 @@ extends ParryState
 class_name GroundedParryState
 
 const IS_NEW_PARRY = true
+const PUSHBLOCK_PROJECTILE_FREEZE_FRAMES = 9
 
 
 export var push = false
+export var use_guard_sprites = false
 export var autoguard = false
 export var disable_aerial_movement = false
 #export var real_parry = false
@@ -23,11 +25,7 @@ func _ready():
 	fallback_state = "ParryAfterWhiff"
 
 func get_whiffed_block():
-#	print()
-#	print(parried)
-#	print(autoguard)
-#	print(host.combo_count <= 0)
-#	print(_previous_state().state_name if _previous_state() else "no previous")
+
 	var prev = _previous_state()
 	if prev and prev.get("IS_NEW_PARRY"):
 		return (!prev.parried_last and !prev.autoguard and host.combo_count <= 0)
@@ -66,10 +64,12 @@ func start():
 	iasa_at = -1
 	host.blocked_hitbox_plus_frames = 0
 #	host.add_penalty(10, true)
+	var high_anim = "ParryHigh" if !use_guard_sprites else "ShieldHigh"
+	var low_anim = "ParryLow" if !use_guard_sprites else "ShieldLow"
 	if host.is_grounded():
-		anim_name = "ParryHigh" if data["Block Height"].y == 0 else "ParryLow"
+		anim_name = high_anim if data["Block Height"].y == 0 else low_anim
 	else:
-		anim_name = "ParryLow"
+		anim_name = low_anim
 #	host.blockstun_ticks = 0
 
 func _frame_0():
@@ -156,6 +156,13 @@ func _tick():
 			stop_early_tick = 4
 		if current_tick == stop_early_tick:
 			enable_interrupt()
+	if host.hp <= 0:
+		return "Wait"
+
+func detect(obj):
+	if obj and !obj.is_in_group("Fighter") and obj.hitlag_ticks <= 0:
+		host.spawn_particle_effect(particle_scene, obj.get_hurtbox_center_float())
+		obj.hitlag_ticks += PUSHBLOCK_PROJECTILE_FREEZE_FRAMES
 
 func _exit():
 	parry_active = false

characters/stickman/NinjaGuy.tscn

@@ -630,7 +630,8 @@ stored_speed_3
 released_this_turn
 current_momentum
 boosted_during_combo
-stackriken_out"
+stackriken_out
+can_divekick_hop"
 character_portrait2 = ExtResource( 245 )
 player_info_scene = ExtResource( 243 )
 player_extra_params_scene = ExtResource( 63 )
@@ -644,6 +645,10 @@ material = SubResource( 2 )
 frames = SubResource( 4 )
 animation = "DiveKick2Up"
 frame = 11
+__meta__ = {
+"_edit_group_": true,
+"_edit_lock_": true
+}
 
 [node name="Super2" parent="Sounds" index="6"]
 pitch_variation = 0.1
@@ -3753,6 +3758,7 @@ title = "Substitution"
 type = 2
 button_texture = ExtResource( 78 )
 air_type = 2
+uses_air_movement = true
 next_state_on_hold_on_opponent_turn = true
 self_interruptable = false
 interrupt_from_string = "Grounded

characters/stickman/NinjaPlayerInfo.gd

@@ -28,6 +28,8 @@ func _ready():
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(_delta):
+	if !is_instance_valid(fighter):
+		return
 	texture_rect_1.hide()
 	texture_rect_2.hide()
 	texture_rect_3.hide()

characters/stickman/Stickman.gd

@@ -27,6 +27,7 @@ var boosted_during_combo = false
 var current_momentum = "0"
 var boost_frames_left = 0
 var stackriken_out = false
+var can_divekick_hop = true
 
 const RELEASE_MODIFIER = "1.175"
 const HOOK_DISABLE_DIST = "32"
@@ -193,6 +194,7 @@ func tick():
 
 	if is_grounded():
 		used_grappling_hook = false
+		can_divekick_hop = true
 
 func on_got_parried():
 	.on_got_parried()

characters/stickman/projectiles/Caltrops.gd

@@ -1,5 +1,7 @@
 extends BaseProjectile
 
+const DIVEKICK_BOUNCE = true
+
 func hit_by(hitbox):
 	var host = obj_from_name(hitbox.host)
 	if host and host.is_in_group("Fighter") and host.id != id:

characters/stickman/projectiles/Kunai.gd

@@ -1,5 +1,7 @@
 extends BaseProjectile
 
+const DIVEKICK_BOUNCE = true
+
 func hit_by(hitbox):
 	.hit_by(hitbox)
 	var host = obj_from_name(hitbox.host)

characters/stickman/projectiles/Kunai.tscn

@@ -47,7 +47,7 @@ shader_param/super_dim = false
 shader_param/use_outline = false
 shader_param/outline_color = Color( 0, 0, 0, 1 )
 
-[node name="BaseProjectile" instance=ExtResource( 1 )]
+[node name="Kunai" instance=ExtResource( 1 )]
 material = SubResource( 2 )
 script = ExtResource( 7 )
 max_fall_speed = "15"