diff --git a/game/menu/common/credits.tscn b/game/menu/common/credits.tscn index faf09ed..0dd4dce 100644 --- a/game/menu/common/credits.tscn +++ b/game/menu/common/credits.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://c3q3g2647qc27"] [ext_resource type="Script" uid="uid://dclkpithyykju" path="res://game/menu/common/credits.gd" id="1_wp78b"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_nidem"] -[ext_resource type="Theme" uid="uid://cigren10ijb75" path="res://images/menu/label.tres" id="3_x2hwc"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_nidem"] +[ext_resource type="Theme" uid="uid://cigren10ijb75" path="res://styles/label.tres" id="3_x2hwc"] [sub_resource type="InputEventAction" id="InputEventAction_wp78b"] action = &"ui_cancel" diff --git a/game/menu/common/options.tscn b/game/menu/common/options.tscn index 55baaee..e04d735 100644 --- a/game/menu/common/options.tscn +++ b/game/menu/common/options.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://btr60idiit4y7"] [ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/common/options.gd" id="1_61pji"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_1tdpy"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_1tdpy"] [sub_resource type="ButtonGroup" id="ButtonGroup_6ueaa"] diff --git a/game/menu/ingame/game_over_screen.tscn b/game/menu/ingame/game_over_screen.tscn index 4d0ce0f..b12b255 100644 --- a/game/menu/ingame/game_over_screen.tscn +++ b/game/menu/ingame/game_over_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://duxm8n62j2qt6"] [ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://game/menu/ingame/game_over_screen.gd" id="1_rkkr6"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_uh3ar"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_uh3ar"] [node name="GameOverScreen" type="Control"] layout_mode = 3 diff --git a/game/menu/ingame/pause_menu.tscn b/game/menu/ingame/pause_menu.tscn index 6a150a6..d65b97c 100644 --- a/game/menu/ingame/pause_menu.tscn +++ b/game/menu/ingame/pause_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bclo2wl8ibrcg"] [ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://game/menu/ingame/pause_menu.gd" id="1_inj1j"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_vy7sn"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_vy7sn"] [sub_resource type="Shortcut" id="Shortcut_lgp46"] diff --git a/game/menu/ingame/victory_screen.tscn b/game/menu/ingame/victory_screen.tscn index 001cbb5..a7e4800 100644 --- a/game/menu/ingame/victory_screen.tscn +++ b/game/menu/ingame/victory_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bdcs2ff85qjs4"] [ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://game/menu/ingame/victory_screen.gd" id="1_asigk"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_wb4d8"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_wb4d8"] [node name="VictoryScreen" type="Control"] layout_mode = 3 diff --git a/game/menu/ingame/weapon_selector.tscn b/game/menu/ingame/weapon_selector.tscn index 4b74aba..35c45e5 100644 --- a/game/menu/ingame/weapon_selector.tscn +++ b/game/menu/ingame/weapon_selector.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://1o3idp54lil2"] [ext_resource type="Script" uid="uid://beiydi6w6gqqc" path="res://game/menu/ingame/weapon_selector.gd" id="1_4acia"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_g83h6"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_g83h6"] [node name="WeaponSelector" type="MarginContainer"] anchors_preset = 15 diff --git a/game/menu/main/main_menu.tscn b/game/menu/main/main_menu.tscn index 68a2a76..42ebb1e 100644 --- a/game/menu/main/main_menu.tscn +++ b/game/menu/main/main_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bxlccevt52y70"] [ext_resource type="Script" uid="uid://dixdfabe2vfsj" path="res://game/menu/main/main_menu.gd" id="1_chmv6"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_f5okj"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_f5okj"] [node name="MainMenu" type="Control"] layout_mode = 3 diff --git a/game/menu/main/seed_selection_menu.tscn b/game/menu/main/seed_selection_menu.tscn index c03f2f0..0922c40 100644 --- a/game/menu/main/seed_selection_menu.tscn +++ b/game/menu/main/seed_selection_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://c36n317rhv8k7"] [ext_resource type="Script" uid="uid://dyynshvsgnepp" path="res://game/menu/main/seed_selection_menu.gd" id="1_g2smo"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_s4s14"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://styles/menu_button.tres" id="2_s4s14"] [sub_resource type="InputEventAction" id="InputEventAction_g2smo"] action = &"ui_cancel" diff --git a/images/menu/menu_font.png b/images/fonts/font16.png similarity index 100% rename from images/menu/menu_font.png rename to images/fonts/font16.png diff --git a/images/menu/menu_font.png.import b/images/fonts/font16.png.import similarity index 59% rename from images/menu/menu_font.png.import rename to images/fonts/font16.png.import index c402235..c0052f5 100644 --- a/images/menu/menu_font.png.import +++ b/images/fonts/font16.png.import @@ -3,12 +3,12 @@ importer="font_data_image" type="FontFile" uid="uid://bw1vqxkgbaekh" -path="res://.godot/imported/menu_font.png-8e9d8dba3a97b30f71beb18676246365.fontdata" +path="res://.godot/imported/font16.png-8508fb402c2297494648b96d293d0e34.fontdata" [deps] -source_file="res://images/menu/menu_font.png" -dest_files=["res://.godot/imported/menu_font.png-8e9d8dba3a97b30f71beb18676246365.fontdata"] +source_file="res://images/fonts/font16.png" +dest_files=["res://.godot/imported/font16.png-8508fb402c2297494648b96d293d0e34.fontdata"] [params] diff --git a/images/menu/main_font.png b/images/fonts/font8.png similarity index 100% rename from images/menu/main_font.png rename to images/fonts/font8.png diff --git a/images/menu/main_font.png.import b/images/fonts/font8.png.import similarity index 59% rename from images/menu/main_font.png.import rename to images/fonts/font8.png.import index 266053c..3bd1899 100644 --- a/images/menu/main_font.png.import +++ b/images/fonts/font8.png.import @@ -3,12 +3,12 @@ importer="font_data_image" type="FontFile" uid="uid://b3xawfjtsnm5b" -path="res://.godot/imported/main_font.png-02d3bd1470dfa1b293e4d94784048edd.fontdata" +path="res://.godot/imported/font8.png-d37c339899adda35b5ea0bd08bc26657.fontdata" [deps] -source_file="res://images/menu/main_font.png" -dest_files=["res://.godot/imported/main_font.png-02d3bd1470dfa1b293e4d94784048edd.fontdata"] +source_file="res://images/fonts/font8.png" +dest_files=["res://.godot/imported/font8.png-d37c339899adda35b5ea0bd08bc26657.fontdata"] [params] diff --git a/images/menu/label.tres b/styles/label.tres similarity index 80% rename from images/menu/label.tres rename to styles/label.tres index e8b2263..be4cfdc 100644 --- a/images/menu/label.tres +++ b/styles/label.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=2 format=3 uid="uid://cigren10ijb75"] -[ext_resource type="FontFile" uid="uid://b3xawfjtsnm5b" path="res://images/menu/main_font.png" id="1_h3mgl"] +[ext_resource type="FontFile" uid="uid://b3xawfjtsnm5b" path="res://images/fonts/font8.png" id="1_h3mgl"] [resource] default_font = ExtResource("1_h3mgl") diff --git a/images/menu/menu_button.tres b/styles/menu_button.tres similarity index 98% rename from images/menu/menu_button.tres rename to styles/menu_button.tres index 4cfc9f5..2df9890 100644 --- a/images/menu/menu_button.tres +++ b/styles/menu_button.tres @@ -1,7 +1,7 @@ [gd_resource type="Theme" load_steps=8 format=3 uid="uid://dtnd3tqllufey"] [ext_resource type="Texture2D" uid="uid://dhmquapac0fco" path="res://images/menu/menu_buttons.png" id="1_6mwof"] -[ext_resource type="FontFile" uid="uid://bw1vqxkgbaekh" path="res://images/menu/menu_font.png" id="1_hwy2u"] +[ext_resource type="FontFile" uid="uid://bw1vqxkgbaekh" path="res://images/fonts/font16.png" id="1_hwy2u"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_6mwof"] content_margin_left = 10.0