Improve Loot box open menu

Add translations Patch bugs Improve github workflow
Killarexe · May 29, 2024 · b5f1d55 · b5f1d55
1 parent 2c45212
commit b5f1d55
Show file tree

Hide file tree

Showing 15 changed files with 257 additions and 221 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -1,5 +1,4 @@
-name: Autobuild
-
+name: Godot Export
 on:
   push:
     branches: [ "master" ]
@@ -12,39 +11,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
-      - name: Install prerequisites
-        run: |
-          echo "Installing prerequisites..."
-          sudo apt install -y wget unzip
-          echo "Install complete!"
-
-      - name: Download Godot LTS Version
-        run: |
-          echo "Downloading Godot..."
-          wget https://github.com/godotengine/godot/releases/download/4.2.1-stable/Godot_v4.2.1-stable_linux.x86_64.zip
-          unzip Godot_v4.2.1-stable_linux.x86_64.zip
-          mv Godot_v4.2.1-stable_linux.x86_64 godot
-          chmod +x godot
-          echo "Download complete!"
-          
-      - name: Donwload Godot export templates
-        run: |
-          echo "Downloading Godot's export templates..."
-          wget https://github.com/godotengine/godot/releases/download/4.2.1-stable/Godot_v4.2.1-stable_mono_export_templates.tpz
-          unzip Godot_v4.2.1-stable_mono_export_templates.tpz
-          mkdir -p ~/.local/share/godot/export_templates
-          mv templates ~/.local/share/godot/export_templates/4.2.1.stable/
-          echo "Export templates downloaded!"
-          
-      - name: Export project
-        run: |
-          echo "Exporting project..."
-          echo "Export project to Linux(release)"
-          echo "$PWD"
-          mkdir -p build/linux
-          ./godot --headless --export-release "Linux/X11" build/linux/LittleRage.x86_64
-          echo "Export project to Windows(release)"
-          mkdir -p build/windows
-          ./godot --headless --path . --export-release "Windows Desktop" build/windows/LittleRage.exe
-          echo "Project exported!"
+      - name: Godot Export
+        uses: firebelley/godot-export@v5.2.1
+        with:
+          godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.2.1/Godot_v4.2.1-stable_linux.x86_64.zip
+          godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.2.1/Godot_v4.2.1-stable_export_templates.tpz
+          archive_output: true
+          cache: true
+          relative_export_path: ./
+          verbose: true
+      - name: Upload Windows Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-build
+          path: /home/runner/work/LittleRage/LittleRage/Windows.zip
+          retention-days: 5
+      - name: Upload Linux x86_64 Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-x86_64-build
+          path: /home/runner/work/LittleRage/LittleRage/LinuxX86_64.zip
+          retention-days: 5
+      - name: Upload Linux Arm64 Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-arm64-build
+          path: /home/runner/work/LittleRage/LittleRage/LinuxArm64.zip
+          retention-days: 5
+      - name: Upload MacOS Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-build
+          path: /home/runner/work/LittleRage/LittleRage/macOS.zip
+          retention-days: 5
diff --git a/assets/lang/lang.csv b/assets/lang/lang.csv
diff --git a/assets/lang/lang.en.translation b/assets/lang/lang.en.translation
diff --git a/assets/lang/lang.fr.translation b/assets/lang/lang.fr.translation
diff --git a/assets/style/default_theme.tres b/assets/style/default_theme.tres
diff --git a/data/hats/luigi_hat.tres b/data/hats/luigi_hat.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_tcdc8")
-name = "skin.luigi_hat"
+name = "hat.luigi_hat"
 chance = 1
 is_hidden = false
 texture = ExtResource("2_re7a1")
diff --git a/data/hats/mario_hat.tres b/data/hats/mario_hat.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_q1ngr")
-name = "skin.mario_hat"
+name = "hat.mario_hat"
 chance = 1
 is_hidden = false
 texture = ExtResource("2_cf0po")
diff --git a/data/hats/waluigi_hat.tres b/data/hats/waluigi_hat.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_usogy")
-name = "skin.waluigi_hat"
+name = "hat.waluigi_hat"
 chance = 1
 is_hidden = false
 texture = ExtResource("2_pbnsy")
diff --git a/data/hats/wario_hat.tres b/data/hats/wario_hat.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_0fi3t")
-name = "skin.wario_hat"
+name = "hat.wario_hat"
 chance = 1
 is_hidden = false
 texture = ExtResource("2_t76ji")
diff --git a/data/skins/rainer.tres b/data/skins/rainer.tres
diff --git a/data/skins/santa.tres b/data/skins/santa.tres
@@ -5,7 +5,7 @@
 
 [resource]
 script = ExtResource("1_6cqd7")
-name = "skin.niark"
+name = "skin.santa"
 chance = 0
 is_hidden = true
 texture = ExtResource("2_3im50")
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -206,7 +206,7 @@ xr_features/passthrough=0
 
 [preset.1]
 
-name="Linux x86_64"
+name="LinuxX86_64"
 platform="Linux/X11"
 runnable=true
 dedicated_server=false
@@ -246,7 +246,7 @@ rm -rf \"{temp_dir}\""
 
 [preset.2]
 
-name="Linux arm64"
+name="LinuxArm64"
 platform="Linux/X11"
 runnable=false
 dedicated_server=false

diff --git a/scenes/uis/CollectionsMenu.tscn b/scenes/uis/CollectionsMenu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=39 format=3 uid="uid://wcpkho1r3os3"]
+[gd_scene load_steps=40 format=3 uid="uid://wcpkho1r3os3"]
 
 [ext_resource type="Theme" uid="uid://becgxgj56yfdh" path="res://assets/style/default_theme.tres" id="1_q884x"]
 [ext_resource type="Script" path="res://scripts/uis/collections_menu/MainCollectionMenu.gd" id="2_e00sk"]
@@ -17,6 +17,7 @@
 [ext_resource type="Script" path="res://scripts/uis/collections_menu/ParticlesMenu.gd" id="6_y5t24"]
 [ext_resource type="Script" path="res://scripts/uis/collections_menu/hats_menu/HatList.gd" id="7_5na8b"]
 [ext_resource type="Texture2D" uid="uid://bf7j2smrgc7mg" path="res://assets/textures/ui/icons/disc.png" id="10_65766"]
+[ext_resource type="LabelSettings" uid="uid://cd8gvl774mr2v" path="res://assets/style/label_settings/medium_label.tres" id="12_8cvgb"]
 [ext_resource type="Script" path="res://scripts/uis/collections_menu/LootBoxMenu.gd" id="13_86pp1"]
 [ext_resource type="LabelSettings" uid="uid://b35bwhibubxgx" path="res://assets/style/label_settings/small_medium_label.tres" id="17_8gk2a"]
 [ext_resource type="PackedScene" uid="uid://bf6u6lge7vm8i" path="res://scenes/bundles/player/PlayerDummy.tscn" id="19_h3c7l"]
@@ -663,7 +664,7 @@ libraries = {
 }
 autoplay = "enter"
 
-[node name="LootBoxMenu" type="Control" parent="CanvasLayer/MainMenu" node_paths=PackedStringArray("skin_list", "hat_list", "particle_menu")]
+[node name="LootBoxMenu" type="Control" parent="CanvasLayer/MainMenu" node_paths=PackedStringArray("cosmetic_texture", "cosmetic_label", "animation_player", "next_button", "skin_list", "hat_list", "particle_menu")]
 visible = false
 layout_mode = 1
 anchors_preset = 15
@@ -673,22 +674,38 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 script = ExtResource("13_86pp1")
+cosmetic_texture = NodePath("CosmeticTexture")
+cosmetic_label = NodePath("Cosmetic Label")
+animation_player = NodePath("AnimationPlayer")
+next_button = NodePath("Buttons/NextBoxButton")
 skin_list = NodePath("../../SkinsMenu/SkinList")
 hat_list = NodePath("../../HatsMenu/HatList")
 particle_menu = NodePath("../../ParticlesMenu")
 
 [node name="Background" type="ColorRect" parent="CanvasLayer/MainMenu/LootBoxMenu"]
-visible = false
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_right = 3840.0
-offset_bottom = 2160.0
 grow_horizontal = 2
 grow_vertical = 2
 color = Color(0.176471, 0.176471, 0.176471, 0.501961)
 
+[node name="Cosmetic Label" type="Label" parent="CanvasLayer/MainMenu/LootBoxMenu"]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -224.0
+offset_top = 32.0
+offset_right = 224.0
+offset_bottom = 64.0
+grow_horizontal = 2
+theme = ExtResource("1_q884x")
+label_settings = ExtResource("12_8cvgb")
+horizontal_alignment = 1
+vertical_alignment = 1
+
 [node name="CosmeticTexture" type="TextureRect" parent="CanvasLayer/MainMenu/LootBoxMenu"]
 layout_mode = 1
 anchors_preset = 8
@@ -713,7 +730,6 @@ libraries = {
 }
 
 [node name="Buttons" type="HBoxContainer" parent="CanvasLayer/MainMenu/LootBoxMenu"]
-visible = false
 layout_mode = 1
 anchors_preset = 7
 anchor_left = 0.5

diff --git a/scripts/uis/collections_menu/LootBoxMenu.gd b/scripts/uis/collections_menu/LootBoxMenu.gd
@@ -1,9 +1,10 @@
 extends Control
 class_name LootBoxMenu
 
-@onready var cosmetic_texture: TextureRect = $CosmeticTexture
-@onready var animation_player: AnimationPlayer = $AnimationPlayer
-@onready var next_button: Button = $Buttons/NextBoxButton
+@export var cosmetic_texture: TextureRect
+@export var cosmetic_label: Label
+@export var animation_player: AnimationPlayer
+@export var next_button: Button
 
 @export var skin_list: SkinList
 @export var hat_list: HatList
@@ -20,6 +21,7 @@ func update_texture():
 		skin_list.set_item_skins()
 		hat_list.set_hat_items()
 		particle_menu.load_particles()
+		cosmetic_label.text = TranslationServer.translate("label.unlocked_cosmetic") + ": " + TranslationServer.translate(cosmetic.name)
 
 func update_buttons():
 	next_button.visible = LootBoxesManager.has_loot_box()

diff --git a/scripts/uis/level_editor_selection_menu/LevelCreateImportMenu.gd b/scripts/uis/level_editor_selection_menu/LevelCreateImportMenu.gd
@@ -65,6 +65,7 @@ func _on_create_level_button_pressed():
 	level.difficulty = level_creation_menu.difficulty
 	level.scene = load("res://scenes/bundles/DefaultLevel.tscn")
 	ResourceSaver.save(level, LevelManager.EXTERNAL_LEVELS_DIR + "/" + level_id + ".tres")
+	AchievementManager.unlock_achievement("making_my_own")
 	LevelManager.load_levels()
 	LevelManager.current_level = level_id
 	SceneManager.change_scene("res://scenes/uis/LevelEditor.tscn")