1.9.9-unstable

Global.gd

@@ -2,7 +2,7 @@ extends Node
 
 signal nag_window()
 
-var VERSION = "1.9.6-steam"
+var VERSION = "1.9.9-steam-unstable"
 const RESOLUTION = Vector2(640, 360)
 
 var audio_player
@@ -31,6 +31,7 @@ var steam_demo_version = false
 var show_last_move_indicators = true
 var speed_lines_enabled = true
 var replay_extra_freeze_frames = true
+var seen_custom_character_nag = false
 var auto_fc = true
 var ghost_speed = 2
 
@@ -90,6 +91,8 @@ func _enter_tree():
 	audio_player = AudioStreamPlayer.new()
 	call_deferred("add_child", audio_player)
 	audio_player.bus = "Music"
+
+
 	var data = get_player_data()
 	for key in data.options:
 		set(key, data.options[key])
@@ -211,6 +214,7 @@ func save_options():
 			"speed_lines_enabled": speed_lines_enabled,
 			"auto_fc": auto_fc,
 			"replay_extra_freeze_frames": replay_extra_freeze_frames,
+			"seen_custom_character_nag": seen_custom_character_nag,
 		}
 	})
 
@@ -239,6 +243,7 @@ func get_default_player_data():
 			"auto_fc": true,
 			"show_extra_info": false,
 			"replay_extra_freeze_frames": true,
+			"seen_custom_character_nag": false,
 		}
 	}
 

Main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=87 format=2]
+[gd_scene load_steps=88 format=2]
 
 [ext_resource path="res://ui/UILayer.gd" type="Script" id=1]
 [ext_resource path="res://main.gd" type="Script" id=2]
@@ -74,6 +74,7 @@
 [ext_resource path="res://ui/VelocityLabel.gd" type="Script" id=72]
 [ext_resource path="res://sound/ui/outtatime2.wav" type="AudioStream" id=73]
 [ext_resource path="res://ui/airoptionbar.png" type="Texture" id=74]
+[ext_resource path="res://ui/tiktok.png" type="Texture" id=75]
 
 [sub_resource type="ShaderMaterial" id=19]
 shader = ExtResource( 50 )
@@ -1966,7 +1967,6 @@ 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
@@ -2179,8 +2179,8 @@ icon_align = 1
 
 [node name="DiscordButton" type="Button" parent="UILayer/MainMenu/SocialLinks"]
 unique_name_in_owner = true
-margin_left = 595.0
-margin_right = 617.0
+margin_left = 573.0
+margin_right = 595.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 20, 20 )
 mouse_default_cursor_shape = 2
@@ -2190,12 +2190,23 @@ icon_align = 1
 
 [node name="TwitterButton" type="Button" parent="UILayer/MainMenu/SocialLinks"]
 unique_name_in_owner = true
+margin_left = 595.0
+margin_right = 617.0
+margin_bottom = 24.0
+rect_min_size = Vector2( 20, 20 )
+mouse_default_cursor_shape = 2
+icon = ExtResource( 17 )
+flat = true
+icon_align = 1
+
+[node name="TikTokButton" type="Button" parent="UILayer/MainMenu/SocialLinks"]
+unique_name_in_owner = true
 margin_left = 617.0
 margin_right = 639.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 20, 20 )
 mouse_default_cursor_shape = 2
-icon = ExtResource( 17 )
+icon = ExtResource( 75 )
 flat = true
 icon_align = 1
 

ObjectState.gd

@@ -87,6 +87,10 @@ export var projectile_pos_y = 0
 export var projectile_local_pos = true
 export var projectile_match_facing = false
 
+export var _c_Other = 0
+export var extra_parry_hitlag = 0
+
+
 export var _c_Flip = 0
 export var flip_frame = -1
 export var force_same_direction_as_previous_state = false

SteamLobby.gd

@@ -287,7 +287,7 @@ func spectate_forfeit(player_id):
 	for spectator in SPECTATORS:
 		_send_P2P_Packet(spectator, {"spectator_player_forfeit": player_id})
 
-func request_lobby_list(code: String="", version: String=""):
+func request_lobby_list(code: String="", version: String="", allow_modded=true, allow_vanilla=true):
 	if LOBBY_ID == 0:
 			# Set distance to worldwide
 		Steam.addRequestLobbyListDistanceFilter(3)
@@ -297,6 +297,12 @@ func request_lobby_list(code: String="", version: String=""):
 
 		if version != "":
 			Steam.addRequestLobbyListStringFilter("version", version, 0)
+
+		if allow_modded != allow_vanilla:
+			if allow_modded:
+				Steam.addRequestLobbyListStringFilter("charloader", "Yes", 0)
+			else:
+				Steam.addRequestLobbyListStringFilter("charloader", "No", 0)
 		#	Before requesting the lobby list with requestLobbyList you can add more search queries like:
 		#	addRequestLobbyListStringFilter - which allows you to look for specific works in the lobby metadata
 		#	addRequestLobbyListNumericalFilter - which adds a numerical comparions filter (<=, <, =, >, >=, !=)

characters/BaseChar.gd

@@ -69,9 +69,9 @@ const PUSH_BLOCK_ADVANTAGE_PENALTY = 0
 const AIR_BLOCK_PUSHBACK_MODIFIER = "0.35"
 const WAKEUP_THROW_IMMUNITY_TICKS = 3
 
-const GLOBAL_HITLAG_MODIIFER = 0.5
+const GLOBAL_HITLAG_MODIIFER = 0.6
 const GLOBAL_BLOCKLAG_MODIFIER = 0.25
-const MAX_GLOBAL_HITLAG = 7
+const MAX_GLOBAL_HITLAG = 10
 
 const BASE_PLUS_FRAMES = 0
 const VS_AERIAL_ADDITIONAL_PLUS_FRAMES = 2
@@ -1540,6 +1540,10 @@ func block_hitbox(hitbox, force_parry=false, force_block=false, ignore_guard_bre
 			play_sound("Parry2")
 			play_sound("Parry")
 			emit_signal("parried")
+			on_parried()
+
+func on_parried():
+	pass
 
 func projectile_free_cancel():
 #	if current_state().state_name in ["Burst", "DefensiveBurst", "OffensiveBurst"]:

characters/mutant/Beast.gd

@@ -121,6 +121,10 @@ func _on_hit_something(obj, hitbox):
 		start_projectile_invulnerability()
 	add_juke_pips(1)
 
+
+func on_parried():
+	add_juke_pips(JUKE_PIPS_PER_USE)
+
 func on_got_blocked():
 	.on_got_blocked()
 #	if !juked_this_turn: