1.8.78-unstable

Global.gd

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

characters/BaseChar.gd

@@ -65,7 +65,7 @@ const PARRY_COMBO_SCALING = "0.85"
 const PARRY_GROUNDED_KNOCKBACK_DIVISOR = "1.5"
 const PUSH_BLOCK_FORCE = "-10"
 const PUSH_BLOCK_DIST = "110"
-const PUSH_BLOCK_ADVANTAGE_PENALTY = 1
+const PUSH_BLOCK_ADVANTAGE_PENALTY = 0
 const AIR_BLOCK_PUSHBACK_MODIFIER = "0.35"
 const WAKEUP_THROW_IMMUNITY_TICKS = 3
 
@@ -712,6 +712,9 @@ func gain_super_meter(amount,stale_amount = "1.0"):
 	amount = meter_gain_modified(amount)
 	var super_modified_amount = fixed.round(fixed.div(str(amount), fixed.powu("2", combo_supers)))
 	amount = fixed.round(fixed.lerp_string(str(amount), str(super_modified_amount), stale_amount))
+	gain_super_meter_raw(amount)
+
+func gain_super_meter_raw(amount):
 	super_meter += amount
 	var played_sound = false
 	while super_meter >= MAX_SUPER_METER:
@@ -728,7 +731,6 @@ func gain_super_meter(amount,stale_amount = "1.0"):
 				unlock_achievement("ACH_ULTIMATE_POWER", true)
 			break
 
-
 func drain_super_meter(amount):
 	if infinite_resources:
 		return
@@ -1370,6 +1372,7 @@ func block_hitbox(hitbox, force_parry=false, force_block=false, ignore_guard_bre
 				opponent.got_blocked = true
 				on_blocked_melee_attack()
 			else:
+				opponent.feinting = false
 				opponent.got_parried = true
 				opponent.current_state().interruptible_on_opponent_turn = false
 
@@ -1525,6 +1528,15 @@ func block_hitbox(hitbox, force_parry=false, force_block=false, ignore_guard_bre
 			play_sound("Parry")
 			emit_signal("parried")
 
+func projectile_free_cancel():
+#	if current_state().state_name in ["Burst", "DefensiveBurst", "OffensiveBurst"]:
+#		return
+	if !current_state().can_feint_if_possible:
+		return
+	if (got_blocked or got_parried):
+		return
+	feinting = true
+
 func on_blocked_something():
 	pass
 

characters/mutant/Mutant.tscn

@@ -2427,25 +2427,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( 160 ): {
-"x": 37,
-"y": -1
+ExtResource( 169 ): {
+"x": 16,
+"y": -7
 },
 ExtResource( 166 ): {
 "x": -8,
 "y": -17
 },
-ExtResource( 169 ): {
-"x": 16,
-"y": -7
+ExtResource( 173 ): {
+"x": 9,
+"y": -11
 },
 ExtResource( 171 ): {
 "x": 15,
 "y": -10
+},
+ExtResource( 160 ): {
+"x": 37,
+"y": -1
 }
 }
 interruptible_on_opponent_turn = true
@@ -2471,7 +2471,6 @@ force_grounded = true
 minimum_grounded_frames = 5
 release_sfx = ExtResource( 178 )
 play_release_sfx_bass = false
-misc_properties = null
 
 [node name="Hitbox" type="Node2D" parent="StateMachine/BiteThrow" index="0"]
 z_index = 1000
@@ -3686,17 +3685,17 @@ enter_force_dir_x = "1.0"
 enter_force_dir_y = "-2.0"
 enter_force_speed = "4"
 throw_positions = {
-ExtResource( 81 ): {
-"x": -11,
-"y": -6
+ExtResource( 82 ): {
+"x": -8,
+"y": -5
 },
 ExtResource( 79 ): {
 "x": 23,
 "y": 16
 },
-ExtResource( 82 ): {
-"x": -8,
-"y": -5
+ExtResource( 81 ): {
+"x": -11,
+"y": -6
 }
 }
 land_cancel = true

characters/mutant/projectiles/AcidBubble.gd

@@ -12,7 +12,7 @@ func hit_by(hitbox):
 				var f = fixed.normalized_vec_times(fixed.mul(hitbox.dir_x, str(host.get_facing_int())), hitbox.dir_y, fixed.mul(hitbox.knockback, KNOCKBACK_MULTIPLIER))
 				apply_force(f.x, f.y)
 				if host.is_in_group("Fighter"):
-					host.feinting = true
+					host.projectile_free_cancel()
 			else:
 				change_state("Pop")
 

characters/mutant/states/Taunt.gd

@@ -18,17 +18,24 @@ func _frame_1():
 func _frame_7():
 	host.play_sound("Swish")
 
+func _frame_24():
+	host.add_juke_pips(host.JUKE_PIPS_PER_USE)
+
 func _frame_25():
 	host.play_sound("Swish")
+
 
 func _frame_26():
 	host.play_sound("Howl")
 	host.play_sound("Howl2")
 #	host.play_sound("HitBass")
 
+func _frame_34():
+	host.add_juke_pips(host.JUKE_PIPS_PER_USE)
+
 func _frame_44():
 	if !charge:
-		host.add_juke_pips(host.JUKE_PIPS_PER_USE*3)
+		host.add_juke_pips(host.JUKE_PIPS_PER_USE)
 		._frame_44()
 
 func is_usable():

characters/robo/Robot.gd

@@ -542,6 +542,10 @@ func on_blocked_melee_attack():
 	stop_fly_fx()
 	pass
 
+func use_burst():
+	.use_burst()
+	air_option_bar = air_option_bar_max
+
 func try_drive_cancel(fast=false):
 #	print("here")
 	if got_parried: