Maeh it's not the last commit

Patch bugs

Author: Killarexe

project.godot

@@ -192,6 +192,10 @@ locale/test="en"
 2d_physics/layer_3="Danger"
 2d_physics/layer_4="Player"
 
+[network]
+
+tls/enable_tls_v1.3=false
+
 [physics]
 
 3d/run_on_separate_thread=true

scenes/bundles/LevelEntryAnimation.tscn

@@ -63,5 +63,5 @@ zoom = Vector2(2, 2)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
-"": SubResource("AnimationLibrary_08ra1")
+&"": SubResource("AnimationLibrary_08ra1")
 }

scenes/bundles/player/Player.tscn

@@ -96,7 +96,7 @@ player = NodePath("..")
 player = NodePath("..")
 player_camera = NodePath("../Camera2D")
 player_menus = NodePath("../Menus")
-skip_control = NodePath("../Menus/SkipControl")
+skip_control = NodePath("../Menus/SkipControl/TouchScreenButton")
 
 [node name="ParallaxBackground" parent="." instance=ExtResource("8_nd3ki")]
 

scenes/globals/UpdateChecker.tscn

@@ -3,7 +3,5 @@
 [ext_resource type="Script" uid="uid://dt6tagajs7sv0" path="res://scripts/uis/main_menu/update/UpdateChecker.gd" id="1_sqcil"]
 
 [node name="UpdateChecker" type="HTTPRequest"]
+timeout = 10.0
 script = ExtResource("1_sqcil")
-
-[node name="@Timer@27476" type="Timer" parent="."]
-one_shot = true

scenes/uis/CollectionsMenu.tscn

@@ -431,6 +431,30 @@ tracks/1/keys = {
 "update": 0,
 "values": [Vector2(0, 0)]
 }
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath(".:limit_top")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [-10000000]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath(".:limit_bottom")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [10000000]
+}
 
 [sub_resource type="Animation" id="Animation_1yp6g"]
 resource_name = "zoom_hat"
@@ -463,6 +487,7 @@ tracks/1/keys = {
 [sub_resource type="Animation" id="Animation_qlnma"]
 resource_name = "zoom_particles"
 length = 0.5
+step = 0.1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -485,7 +510,31 @@ tracks/1/keys = {
 "times": PackedFloat32Array(0, 0.1, 0.5),
 "transitions": PackedFloat32Array(1, 0.318471, 3.14),
 "update": 0,
-"values": [Vector2(0, 0), Vector2(-16, 0), Vector2(-32, 0)]
+"values": [Vector2(0, 0), Vector2(-16, -12), Vector2(-32, -24)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath(".:limit_top")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [-10000000, -80]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath(".:limit_bottom")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [10000000, 80]
 }
 
 [sub_resource type="Animation" id="Animation_mqekw"]
@@ -634,7 +683,7 @@ vertical_alignment = 1
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer/MainMenu/SelectButtons/LootBoxButton/Circle"]
 libraries = {
-"": SubResource("AnimationLibrary_pvj0d")
+&"": SubResource("AnimationLibrary_pvj0d")
 }
 autoplay = "zoom"
 
@@ -661,7 +710,7 @@ text = "button.back"
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer/MainMenu/SelectButtons"]
 libraries = {
-"": SubResource("AnimationLibrary_dnby0")
+&"": SubResource("AnimationLibrary_dnby0")
 }
 autoplay = "enter"
 
@@ -727,7 +776,7 @@ stretch_mode = 5
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer/MainMenu/LootBoxMenu"]
 libraries = {
-"": SubResource("AnimationLibrary_sa12i")
+&"": SubResource("AnimationLibrary_sa12i")
 }
 
 [node name="Buttons" type="HBoxContainer" parent="CanvasLayer/MainMenu/LootBoxMenu"]
@@ -898,7 +947,7 @@ tile_map_data = PackedByteArray("AAC9ABkAAQABAAIAAAC9ABgAAQABAAEAAAC9ABcAAQABAAE
 
 [node name="PlayerAnimator" type="AnimationPlayer" parent="DefaultLevel/PlayerDummy"]
 libraries = {
-"": SubResource("AnimationLibrary_65662")
+&"": SubResource("AnimationLibrary_65662")
 }
 autoplay = "walk"
 
@@ -908,7 +957,7 @@ zoom = Vector2(2, 2)
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="DefaultLevel/PlayerDummy/PlayerViewer"]
 libraries = {
-"": SubResource("AnimationLibrary_un5mn")
+&"": SubResource("AnimationLibrary_un5mn")
 }
 
 [connection signal="pressed" from="CanvasLayer/MainMenu/SelectButtons/Buttons/SkinsButton" to="CanvasLayer/MainMenu" method="_on_skins_button_pressed"]

scripts/Game.gd

@@ -1,10 +1,10 @@
 extends Node
 
 enum Event {
-	NONE,
-	ANNIVERSARY,
-	CHRISTMAS,
-	HALLOWEEN
+  NONE,
+  ANNIVERSARY,
+  CHRISTMAS,
+  HALLOWEEN
 }
 
 const GAME_NAME: String = "Little Rage"
@@ -16,37 +16,37 @@ var can_pause: bool = true
 var starting: bool = true
 
 func _ready() -> void:
-	is_mobile = OS.get_name() == "Android" || OS.get_name() == "iOS"
-	var date = Time.get_datetime_dict_from_system()
-	var day: int = date["day"]
-	var month: int = date["month"]
-	if (day >= 23 && day <= 26) && month == 12:
-		RenderingServer.set_default_clear_color(Color.hex(0x80cff7FF))
-		PlayerSkinManager.unlock_skin("santa")
-		PlayerHatManager.unlock_hat("santa_hat")
-		AchievementManager.unlock_achievement("christmas_event")
-		current_event = Event.CHRISTMAS
-	elif (day == 30 || day == 31) && month == 10:
-		RenderingServer.set_default_clear_color(Color.hex(0x1b1c28FF))
-		AchievementManager.unlock_achievement("halloween_event")
-		current_event = Event.HALLOWEEN
-	elif day == 24 && month == 3:
-		PlayerSkinManager.unlock_skin("old_player", true)
-		print_rich("[wave amp=50.0 freq=5.0 connected=1][rainbow freq=1.0 sat=0.8 val=0.8]Happy Birthday Little Rage![/rainbow][/wave]")
-		current_event = Event.ANNIVERSARY
+  is_mobile = OS.get_name() == "Android" || OS.get_name() == "iOS"
+  var date = Time.get_datetime_dict_from_system()
+  var day: int = date["day"]
+  var month: int = date["month"]
+  if (day >= 23 && day <= 26) && month == 12:
+    RenderingServer.set_default_clear_color(Color.hex(0x80cff7FF))
+    PlayerSkinManager.unlock_skin("santa")
+    PlayerHatManager.unlock_hat("santa_hat")
+    AchievementManager.unlock_achievement("christmas_event")
+    current_event = Event.CHRISTMAS
+  elif (day == 30 || day == 31) && month == 10:
+    RenderingServer.set_default_clear_color(Color.hex(0x1b1c28FF))
+    AchievementManager.unlock_achievement("halloween_event")
+    current_event = Event.HALLOWEEN
+  elif day == 24 && month == 3:
+    PlayerSkinManager.unlock_skin("old_player", true)
+    print_rich("[wave amp=50.0 freq=5.0 connected=1][rainbow freq=1.0 sat=0.8 val=0.8]Happy Birthday Little Rage![/rainbow][/wave]")
+    current_event = Event.ANNIVERSARY
 
 func has_unlocked_unhiddens() -> bool:
-	return PlayerHatManager.has_unlocked_unhiddens() && PlayerSkinManager.has_unlocked_unhiddens() && PlayerParticleManager.has_unlocked_unhiddens()
+  return PlayerHatManager.has_unlocked_unhiddens() && PlayerSkinManager.has_unlocked_unhiddens() && PlayerParticleManager.has_unlocked_unhiddens()
 
 func instanceNodeAtPos(node: Object, parent: Object, pos: Vector2) -> Object:
-	var nodeInstance = instanceNode(node, parent)
-	nodeInstance.global_position = pos
-	return nodeInstance
+  var nodeInstance = instanceNode(node, parent)
+  nodeInstance.global_position = pos
+  return nodeInstance
 
 func instanceNode(node: Object, parent: Object) -> Object:
-	var nodeInstance = node.instantiate()
-	parent.add_child(nodeInstance)
-	return nodeInstance
+  var nodeInstance = node.instantiate()
+  parent.add_child(nodeInstance)
+  return nodeInstance
 
 func _exit_tree() -> void:
-	GAME_VERSION.free() #NOTE: is to fix a bug a think...
+  GAME_VERSION.free() #NOTE: is to fix a bug a think...

scripts/WindowManager.gd

@@ -1,40 +1,42 @@
 extends Node
 
 const WINDOW_SIZES: Array[Vector2] = [
-	Vector2(670, 360),
-	Vector2(768, 432),
-	Vector2(896, 504),
-	Vector2(1024, 576),
-	Vector2(1152, 648),
-	Vector2(1280, 720)
+  Vector2(670, 360),
+  Vector2(768, 432),
+  Vector2(896, 504),
+  Vector2(1024, 576),
+  Vector2(1152, 648),
+  Vector2(1280, 720)
 ]
 
 var window_size: int = 5
 
 func _ready() -> void:
-	update_window(window_size)
+  update_window(window_size)
 
 func update_window(size: int) -> void:
-	if size < WINDOW_SIZES.size():
-		var new_window_size: Vector2 = WINDOW_SIZES[size]
-		var current_screen: int = DisplayServer.window_get_current_screen()
-		var screen_size: Vector2 = DisplayServer.screen_get_size(current_screen)
-		var screen_position: Vector2 = DisplayServer.screen_get_position(current_screen)
-		var window_position: Vector2 = screen_size / 2 + screen_position - new_window_size / 2
-		DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
-		DisplayServer.window_set_size(new_window_size)
-		DisplayServer.window_set_position(window_position)
-	else:
-		DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
+  if OS.get_name() == "Android" || OS.get_name() == "iOS":
+    return
+  if size < WINDOW_SIZES.size():
+    var new_window_size: Vector2 = WINDOW_SIZES[size]
+    var current_screen: int = DisplayServer.window_get_current_screen()
+    var screen_size: Vector2 = DisplayServer.screen_get_size(current_screen)
+    var screen_position: Vector2 = DisplayServer.screen_get_position(current_screen)
+    var window_position: Vector2 = screen_size / 2 + screen_position - new_window_size / 2
+    DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
+    DisplayServer.window_set_size(new_window_size)
+    DisplayServer.window_set_position(window_position)
+  else:
+    DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
 
 func _input(event: InputEvent) -> void:
-	if event.is_action_pressed("fullscreen"):
-		if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN:
-			DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
-		else:
-			DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
+  if event.is_action_pressed("fullscreen") && !Game.is_mobile:
+    if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN:
+      DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
+    else:
+      DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
 
 func _notification(what: int) -> void:
-	if what == NOTIFICATION_WM_CLOSE_REQUEST || what == NOTIFICATION_WM_GO_BACK_REQUEST:
-		SaveManager.save()
-		get_tree().quit()
+  if what == NOTIFICATION_WM_CLOSE_REQUEST || what == NOTIFICATION_WM_GO_BACK_REQUEST:
+    SaveManager.save()
+    get_tree().quit()

scripts/level/LevelEntryAnimation.gd

@@ -3,7 +3,7 @@ extends Node2D
 @export var player: PlayerComponent
 @export var player_camera: Camera2D
 @export var player_menus: PlayerMenus
-@export var skip_control: CanvasLayer
+@export var skip_control: TouchScreenButton
 
 @onready var animation_camera: Camera2D = $Camera2D
 @onready var animation_player: AnimationPlayer = $AnimationPlayer
@@ -12,7 +12,6 @@ var countdown_prefab: Resource = load("res://scenes/bundles/uis/countdown.tscn")
 
 func _ready() -> void:
   await player_menus.ready
-  print(LevelManager.current_level)
   if LevelManager.current_level.is_empty():
     enable_status()
   else:
@@ -23,8 +22,6 @@ func _input(event: InputEvent) -> void:
     skip()
 
 func skip():
-  if Game.is_mobile:
-    skip_control.visible = false
   animation_player.stop()
   MusicManager.stop()
   animation_player.animation_finished.emit()
@@ -36,8 +33,6 @@ func play_animation() -> void:
   player_menus.mobile_control.visible = false
   animation_camera.enabled = true
   player_camera.enabled = false
-  if Game.is_mobile:
-    skip_control.visible = true
   Game.can_pause = false
   get_tree().paused = true
   animation_player.play("entry")
@@ -54,5 +49,7 @@ func play_animation() -> void:
   queue_free()
 
 func enable_status() -> void:
+  if Game.is_mobile:
+    skip_control.queue_free()
   player_menus.player_status.visible = !LevelManager.current_level.is_empty()
   player_menus.mobile_control.visible = Game.is_mobile

scripts/level/player/sound_effect/SoundEffectPlayer.gd

@@ -6,7 +6,7 @@ const SFX_DIR_PATH: String = "res://assets/sound_effects/"
 var sfx_volume: float = 50.0
 
 func _ready() -> void:
-  bus = "Sound Effect"
+  bus = "Sound Effects"
   process_mode = Node.PROCESS_MODE_ALWAYS
   set_sfx_volume(MusicManager.sound_effect_volume)
 

scripts/sounds/UISoundAdder.gd

@@ -6,24 +6,24 @@ const CLICK_SFX: AudioStream = preload("res://assets/sound_effects/button_click.
 var playback: AudioStreamPlaybackPolyphonic
 
 func _enter_tree() -> void:
-  var player: SoundEffectPlayer = SoundEffectPlayer.new()
+  var player: AudioStreamPlayer = AudioStreamPlayer.new()
   add_child(player)
   player.bus = "Sound Effects"
 
   var stream: AudioStreamPolyphonic = AudioStreamPolyphonic.new()
-  stream.polyphony = 32
+  stream.polyphony = 64
   player.stream = stream
   player.play()
   playback = player.get_stream_playback()
   get_tree().node_added.connect(on_node_added)
-  
+
 func on_node_added(node: Node) -> void:
   if node is Button:
     node.mouse_entered.connect(play_hover)
     node.pressed.connect(play_click)
 
 func play_hover() -> void:
-  playback.play_stream(SELECT_SFX, 0.0, 0.0, randf_range(0.9, 1.1))
+  playback.play_stream(SELECT_SFX, 0.0, min(max(MusicManager.sound_effect_volume - 50, -30), 0), randf_range(0.9, 1.1))
 
 func play_click() -> void:
-  playback.play_stream(CLICK_SFX, 0.0, 0.0, randf_range(0.9, 1.1))
+  playback.play_stream(CLICK_SFX, 0.0, min(max(MusicManager.sound_effect_volume - 50, -30), 0), randf_range(0.9, 1.1))