Patch scene transition bugs, end credits

Killarexe · Killarexe · commit ad4162432098 · 2025-02-05T21:36:26.000+01:00
Add achivements &amp; tool list for the editor
diff --git a/assets/style/default_theme.tres b/assets/style/default_theme.tres
diff --git a/assets/style/label_settings/small_label_outlined.tres b/assets/style/label_settings/small_label_outlined.tres
@@ -0,0 +1,5 @@
+[gd_resource type="LabelSettings" format=3 uid="uid://dm7r1nxrodf5k"]
+
+[resource]
+outline_size = 8
+outline_color = Color(0, 0, 0, 1)
diff --git a/data/achievements/bro_stop.tres b/data/achievements/bro_stop.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="Achievement" load_steps=3 format=3 uid="uid://bmiwa8cxku1ci"]
+
+[ext_resource type="Texture2D" uid="uid://dph8ufon3bhvc" path="res://assets/textures/achievement_icons/first_death.png" id="1_tucco"]
+[ext_resource type="Script" path="res://scripts/achievement/Achievement.gd" id="2_pnhbp"]
+
+[resource]
+script = ExtResource("2_pnhbp")
+icon = ExtResource("1_tucco")
+type = 2
+hidden = true
diff --git a/data/achievements/dedicated_player.tres b/data/achievements/dedicated_player.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="Achievement" load_steps=3 format=3 uid="uid://b4p3p38go3x8g"]
+
+[ext_resource type="Texture2D" uid="uid://dph8ufon3bhvc" path="res://assets/textures/achievement_icons/first_death.png" id="1_7p6po"]
+[ext_resource type="Script" path="res://scripts/achievement/Achievement.gd" id="2_eeg21"]
+
+[resource]
+script = ExtResource("2_eeg21")
+icon = ExtResource("1_7p6po")
+type = 2
+hidden = true
diff --git a/data/achievements/determination.tres b/data/achievements/determination.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="Achievement" load_steps=3 format=3 uid="uid://d1pugbaqbphoj"]
+
+[ext_resource type="Texture2D" uid="uid://ccxonb7svtht0" path="res://assets/textures/achievement_icons/invincible.png" id="1_mo7yj"]
+[ext_resource type="Script" path="res://scripts/achievement/Achievement.gd" id="2_iob47"]
+
+[resource]
+script = ExtResource("2_iob47")
+icon = ExtResource("1_mo7yj")
+type = 1
+hidden = true
diff --git a/data/achievements/invincible.tres b/data/achievements/invincible.tres
@@ -7,4 +7,4 @@
 script = ExtResource("2_eutbw")
 icon = ExtResource("1_rqr75")
 type = 1
-hidden = true
+hidden = false
diff --git a/data/achievements/stay_alive.tres b/data/achievements/stay_alive.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="Achievement" load_steps=3 format=3 uid="uid://xhvhiqwi6wxj"]
+
+[ext_resource type="Texture2D" uid="uid://ccxonb7svtht0" path="res://assets/textures/achievement_icons/invincible.png" id="1_sgwno"]
+[ext_resource type="Script" path="res://scripts/achievement/Achievement.gd" id="2_vh3iy"]
+
+[resource]
+script = ExtResource("2_vh3iy")
+icon = ExtResource("1_sgwno")
+type = 1
+hidden = false
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -527,7 +527,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter="builds/*"
-export_path="builds/1_0/Little Rage 1.0.0 Android.apk"
+export_path="builds/1_0/android/Little Rage 1.0.0 Android.apk"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
diff --git a/scenes/bundles/player/Player.tscn b/scenes/bundles/player/Player.tscn
@@ -147,7 +147,6 @@ player_status_ui = NodePath("../PlayerStatus")
 [node name="PauseMenu" parent="Menus" instance=ExtResource("16_rp8rw")]
 
 [node name="SkipControl" type="CanvasLayer" parent="Menus"]
-visible = false
 
 [node name="TouchScreenButton" type="TouchScreenButton" parent="Menus/SkipControl"]
 position = Vector2(640, 360)
diff --git a/scenes/levels/CreditsScene.tscn b/scenes/levels/CreditsScene.tscn
diff --git a/scenes/uis/LevelEditor.tscn b/scenes/uis/LevelEditor.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=35 format=3 uid="uid://dcjl70toseb36"]
+[gd_scene load_steps=37 format=3 uid="uid://dcjl70toseb36"]
 
 [ext_resource type="Script" path="res://scripts/uis/level_editor/LevelEditor.gd" id="1_6j8q1"]
 [ext_resource type="Script" path="res://scripts/uis/level_editor/LevelEditorCamera.gd" id="1_a2bpn"]
@@ -17,6 +17,8 @@
 [ext_resource type="Texture2D" uid="uid://ksfev1r6k01h" path="res://assets/textures/ui/icons/quit.png" id="7_x2onc"]
 [ext_resource type="Texture2D" uid="uid://bnq26jdctplio" path="res://assets/textures/ui/icons/open.png" id="8_ngjq6"]
 [ext_resource type="Texture2D" uid="uid://dknlajug6w68u" path="res://assets/textures/ui/icons/settings.png" id="9_0ub0d"]
+[ext_resource type="Texture2D" uid="uid://dvi2sgpxm0fu1" path="res://assets/textures/ui/icons/eraser.png" id="9_nnlbo"]
+[ext_resource type="Script" path="res://scripts/uis/level_editor/ToolsList.gd" id="11_d1r5d"]
 [ext_resource type="Texture2D" uid="uid://c3leilbjuyb5y" path="res://assets/textures/ui/icons/move.png" id="15_mgqjn"]
 [ext_resource type="PackedScene" uid="uid://o458ah6nqt0b" path="res://scenes/uis/LevelSettingsMenu.tscn" id="16_cwana"]
 [ext_resource type="Script" path="res://scripts/level/player/cosmetic/skin/PlayerSkinSprite.gd" id="18_bvqml"]
@@ -304,6 +306,33 @@ script = ExtResource("5_3edqr")
 control = NodePath("..")
 brush = NodePath("../../../Camera2D/BrushComponent")
 
+[node name="ToolsList" type="ItemList" parent="GUI" node_paths=PackedStringArray("brush")]
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -176.0
+offset_top = -125.0
+offset_right = 176.0
+offset_bottom = -32.0
+grow_horizontal = 2
+grow_vertical = 0
+item_count = 4
+max_columns = 4
+icon_scale = 5.0
+item_0/icon = ExtResource("9_nnlbo")
+item_1/icon = ExtResource("7_x2onc")
+item_2/icon = ExtResource("7_x2onc")
+item_3/icon = ExtResource("7_x2onc")
+script = ExtResource("11_d1r5d")
+brush = NodePath("../../Camera2D/BrushComponent")
+
+[node name="LevelEditorUIElement" type="Node" parent="GUI/ToolsList" node_paths=PackedStringArray("control", "brush")]
+script = ExtResource("5_3edqr")
+control = NodePath("..")
+brush = NodePath("../../../Camera2D/BrushComponent")
+
 [node name="Menu" type="Control" parent="GUI" node_paths=PackedStringArray("level_editor", "brush", "level_settings_animation_player", "quit_button", "save_button", "load_button", "settings_button", "file_dialog", "animation_player")]
 visible = false
 layout_mode = 3
@@ -434,10 +463,12 @@ control = NodePath("..")
 brush = NodePath("../../../Camera2D/BrushComponent")
 
 [node name="TilesList" type="ItemList" parent="GUI"]
+visible = false
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_bottom = -360.0
+offset_top = -400.0
+offset_bottom = -760.0
 grow_horizontal = 2
 grow_vertical = 2
 auto_height = true
diff --git a/scenes/uis/LevelEditorTools.tscn b/scenes/uis/LevelEditorTools.tscn
diff --git a/scenes/uis/MainMenu.tscn b/scenes/uis/MainMenu.tscn
@@ -6,12 +6,12 @@
 [ext_resource type="Texture2D" uid="uid://cto6ho6cpiuyw" path="res://assets/textures/ui/little_rage_logo.png" id="3_4yirm"]
 [ext_resource type="PackedScene" uid="uid://0sui0mov7cam" path="res://scenes/levels/TitleScreenLevel.tscn" id="3_gaxhl"]
 [ext_resource type="Animation" uid="uid://b52wj1p1e1ckf" path="res://assets/animations/logo_move.res" id="6_6jai1"]
-[ext_resource type="LabelSettings" uid="uid://deaqu53istr0t" path="res://assets/style/label_settings/small_label.tres" id="9_0et4q"]
 [ext_resource type="Animation" uid="uid://cx2cp7vkuhysr" path="res://assets/animations/splash_text_zoom.res" id="9_c25sm"]
 [ext_resource type="Texture2D" uid="uid://c5yejwo4hxfqa" path="res://assets/textures/ui/icons/red-circle.png" id="9_gumy7"]
 [ext_resource type="Script" path="res://scripts/uis/main_menu/SplashText.gd" id="9_uac2h"]
 [ext_resource type="Script" path="res://scripts/uis/main_menu/Information.gd" id="10_5eid8"]
 [ext_resource type="Script" path="res://scripts/uis/LootBoxCountNotifier.gd" id="10_5hwgr"]
+[ext_resource type="LabelSettings" uid="uid://dm7r1nxrodf5k" path="res://assets/style/label_settings/small_label_outlined.tres" id="11_5khbo"]
 
 [sub_resource type="Animation" id="Animation_u5ewi"]
 length = 0.001
@@ -408,13 +408,15 @@ offset_bottom = -47.0
 grow_horizontal = 2
 grow_vertical = 0
 theme = ExtResource("1_fjp12")
-text = "Version Null. By Killar.exe"
-label_settings = ExtResource("9_0et4q")
+text = "Version Null, by Killar."
+label_settings = ExtResource("11_5khbo")
 horizontal_alignment = 1
 vertical_alignment = 1
 script = ExtResource("10_5eid8")
 
 [node name="Button" type="Button" parent="CanvasLayer/Information"]
+modulate = Color(1, 1, 1, 0)
+self_modulate = Color(1, 1, 1, 0)
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/scripts/save/SaveManager.gd b/scripts/save/SaveManager.gd
@@ -16,7 +16,8 @@ const DEFAULT_SAVE: Dictionary = {
 	"sound_effects_volume": 25.0,
 	"loot_box_count": 0,
 	"window_size": 5,
-	"lang": "en"
+	"lang": "en",
+	"death_count": 0
 }
 
 func _ready() -> void:
diff --git a/scripts/uis/LevelEditorTools.gd b/scripts/uis/LevelEditorTools.gd
diff --git a/scripts/uis/SceneManager.gd b/scripts/uis/SceneManager.gd
@@ -26,7 +26,7 @@ func play_animation(transition_type: int, inverse: bool) -> bool:
 
 func change_scene(path: String, in_anim_id: int = 2, is_in_anim_inv: bool = false, out_anim_id: int = 3, is_out_anim_inv: bool = false) -> void:
 	if animation_player.is_playing():
-		await animation_player.animation_finished
+		return
 	prepare()
 	if play_animation(in_anim_id, is_in_anim_inv):
 		await animation_player.animation_finished
@@ -37,7 +37,7 @@ func change_scene(path: String, in_anim_id: int = 2, is_in_anim_inv: bool = fals
 
 func change_packed(packed: PackedScene, in_anim_id: int = 2, is_in_anim_inv: bool = false, out_anim_id: int = 3, is_out_anim_inv: bool = false) -> void:
 	if animation_player.is_playing():
-		await animation_player.animation_finished
+		return
 	prepare()
 	if play_animation(in_anim_id, is_in_anim_inv):
 		await animation_player.animation_finished
diff --git a/scripts/uis/level_editor/ToolsList.gd b/scripts/uis/level_editor/ToolsList.gd
@@ -0,0 +1,21 @@
+extends ItemList
+class_name ToolsList
+
+@export var brush: BrushComponent
+
+func _ready() -> void:
+	item_selected.connect(on_selected)
+	select(2)
+
+func on_selected(index: int) -> void:
+	if index == 0:
+		brush.erase = true
+		brush.brush_type = BrushComponent.BrushTypes.PEN
+		return
+	match index:
+		1:
+			brush.brush_type = BrushComponent.BrushTypes.PEN
+		2:
+			brush.brush_type = BrushComponent.BrushTypes.RECTANGLE
+		3:
+			brush.brush_type = BrushComponent.BrushTypes.CIRCLE
diff --git a/scripts/uis/main_menu/Information.gd b/scripts/uis/main_menu/Information.gd
@@ -1,7 +1,7 @@
 extends Label
 
 func _ready() -> void:
-	text = "Version " + Game.GAME_VERSION.as_str() + ". By Killar.exe"
+	text = "Version " + Game.GAME_VERSION.as_str() + ", by Killar."
 
 func _on_button_pressed() -> void:
 	SceneManager.change_scene("res://scenes/levels/CreditsScene.tscn")
