From 1a261dd0aab0d6ef10978ad19854f8c055cdde95 Mon Sep 17 00:00:00 2001 From: Lexi Quinn Date: Fri, 7 Nov 2025 19:30:23 +1100 Subject: [PATCH] slight rebalance --- PCs/hero.tscn | 2 +- Scenes/MixingTable/remix_table.gd | 1 + .../HeavyRounds/heavy_rounds_feature.tres | 2 +- Scripts/data.gd | 3 +- Scripts/game.gd | 10 ++-- Scripts/wave_manager.gd | 4 +- UI/Menus/MixingMenu/track_editor.gd | 2 +- UI/Menus/OptionsMenu/gameplay_options.gd | 25 +++++++++ UI/Menus/OptionsMenu/gameplay_options.tscn | 53 +++++++++++++++++- UI/Themes/Scale1/button_disabled.tres | 2 +- UI/Themes/Scale1/button_focus.tres | 2 +- UI/Themes/Scale1/button_hover.tres | 2 +- UI/Themes/Scale1/button_normal.tres | 2 +- UI/Themes/Scale1/button_pressed.tres | 2 +- UI/Themes/Scale1/grabber_area.tres | 2 +- UI/Themes/Scale1/grabber_disabled_tex.tres | 2 +- UI/Themes/Scale1/grabber_tex.tres | 2 +- UI/Themes/Scale1/h_scroll_bar.tres | 2 +- UI/Themes/Scale1/h_scroll_grabber.tres | 2 +- UI/Themes/Scale1/popup_item_hover.tres | 2 +- UI/Themes/Scale1/psx_ui.tres | 2 +- UI/Themes/Scale1/slider.tres | 2 +- UI/Themes/Scale1/slider_tick_tex.tres | 2 +- ui_atlas.png => UI/Themes/Scale1/ui_atlas.png | Bin .../Themes/Scale1/ui_atlas.png.import | 6 +- UI/Themes/Scale1/v_scroll_bar.tres | 2 +- UI/Themes/Scale1/v_scroll_grabber.tres | 2 +- main.tscn | 8 +-- project.godot | 4 +- 29 files changed, 115 insertions(+), 37 deletions(-) rename ui_atlas.png => UI/Themes/Scale1/ui_atlas.png (100%) rename ui_atlas.png.import => UI/Themes/Scale1/ui_atlas.png.import (76%) diff --git a/PCs/hero.tscn b/PCs/hero.tscn index 733bef4..1748a28 100644 --- a/PCs/hero.tscn +++ b/PCs/hero.tscn @@ -189,7 +189,7 @@ collision_mask = 65535 [node name="FirstPersonViewport" type="SubViewport" parent="."] transparent_bg = true -size = Vector2i(320, 240) +size = Vector2i(640, 360) render_target_update_mode = 4 [node name="Head2" type="Camera3D" parent="FirstPersonViewport" node_paths=PackedStringArray("clone_camera")] diff --git a/Scenes/MixingTable/remix_table.gd b/Scenes/MixingTable/remix_table.gd index d08d920..f7a5098 100644 --- a/Scenes/MixingTable/remix_table.gd +++ b/Scenes/MixingTable/remix_table.gd @@ -22,6 +22,7 @@ func _on_static_body_3d_button_interacted(_value: int, callback: Hero) -> void: menu.populate_feature_slots() menu.add_option(card_array) menu.cards_remixed.connect(output) + menu.press_check_button(false) reply_player.pause() reply_player.hud.add_child(menu) diff --git a/Scripts/Features/HeavyRounds/heavy_rounds_feature.tres b/Scripts/Features/HeavyRounds/heavy_rounds_feature.tres index de5c4ad..64258a2 100644 --- a/Scripts/Features/HeavyRounds/heavy_rounds_feature.tres +++ b/Scripts/Features/HeavyRounds/heavy_rounds_feature.tres @@ -8,5 +8,5 @@ script = ExtResource("1_hyapt") display_name = "FEATURE_NAME_HEAVY_ROUNDS" description = "FEATURE_DESC_HEAVY_ROUNDS" icon = ExtResource("1_drp05") -strength = 15.0 +strength = 30.0 metadata/_custom_type_script = "uid://uabrepvb5cur" diff --git a/Scripts/data.gd b/Scripts/data.gd index 3e53428..13e7ac0 100644 --- a/Scripts/data.gd +++ b/Scripts/data.gd @@ -25,7 +25,8 @@ static var target_type_names: Dictionary[TargetType, String] = { } static var weapon_recharge_delay: float = 0.5 -static var starting_cash: int = 10 +static var starting_blanks: int = 1 +static var starting_cash: int = 15 static var starting_lives: int = 144 static var player_energy: int = 6 static var wall_cost: int = 1 diff --git a/Scripts/game.gd b/Scripts/game.gd index 65c0755..b4641db 100644 --- a/Scripts/game.gd +++ b/Scripts/game.gd @@ -31,7 +31,6 @@ var wave_limit: int = 20 var shop_chance: float = 0.0 var stats: RoundStats var card_gameplay: bool = false -var starting_blanks: int = 0 #TODO: Create a reference to some generic Lobby object that wraps the multiplayer players list stuff @@ -110,7 +109,7 @@ func spawn_players() -> void: player.game_manager = self player.edit_tool.level = level player.hud.map_anchor = level - player.blank_cassettes += starting_blanks + player.blank_cassettes += Data.starting_blanks player.player_name_tag.text = connected_player_profiles[peer_id].display_name player.position = level.player_spawns[p_i].global_position player.profile = connected_player_profiles[peer_id] @@ -145,7 +144,7 @@ func ready_player(player_ready_true: bool) -> void: func spawn_enemy_wave() -> void: - level.shop.close() + #level.shop.close() #wave += 1 level.disable_all_tower_frames() level.flow_field.calculate() @@ -255,8 +254,8 @@ func end_wave() -> void: player.hud.set_wave_count(wave) player.currency += ceili(pot / connected_players_nodes.size()) player.energy = Data.player_energy - if wave % 2 == 0: - player.blank_cassettes += 1 + #if wave % 2 == 0: + # player.blank_cassettes += 1 if card_gameplay: player.iterate_duration() player.draw_to_hand_size() @@ -339,6 +338,7 @@ func start() -> void: #Start game game_active = true chatbox.append_message("SERVER", Color.TOMATO, "Started with seed: " + str(NoiseRandom.noise.seed)) + networked_spawn_shop.rpc() game_started.emit() diff --git a/Scripts/wave_manager.gd b/Scripts/wave_manager.gd index 652f1f9..9542762 100644 --- a/Scripts/wave_manager.gd +++ b/Scripts/wave_manager.gd @@ -13,13 +13,13 @@ extends Object ## Takes in wave number and number of players and returns a spawn power value ## intended for passing into the generate_wave method static func calculate_spawn_power(wave_number: int, number_of_players: int) -> int: - return (20 * number_of_players) + (5 * wave_number) + return (20 * number_of_players) + (4 * wave_number) ## Takes in wave number and number of players and returns the amount of coins ## that should be divided between each player after completing the wave static func calculate_pot(wave_number: int, number_of_players: int) -> int: - return ceili((2.5 * number_of_players) + (0.5 * wave_number)) + return ceili((3.0 * number_of_players) + (2.5 * wave_number)) ## Uses a spawn power budget to "buy" cards of enemies at random selection from diff --git a/UI/Menus/MixingMenu/track_editor.gd b/UI/Menus/MixingMenu/track_editor.gd index 589d12a..4e505d5 100644 --- a/UI/Menus/MixingMenu/track_editor.gd +++ b/UI/Menus/MixingMenu/track_editor.gd @@ -62,7 +62,7 @@ func press_check_button(value: bool) -> void: switch_button.text = tr(SIDE_B_STR) else: switch_button.text = tr(SIDE_A_STR) - card_desc.set_card(temp_card, check_button_pressed) + card_desc.set_card(temp_card, !check_button_pressed) func _process(_delta: float) -> void: diff --git a/UI/Menus/OptionsMenu/gameplay_options.gd b/UI/Menus/OptionsMenu/gameplay_options.gd index 998e281..3eb9fab 100644 --- a/UI/Menus/OptionsMenu/gameplay_options.gd +++ b/UI/Menus/OptionsMenu/gameplay_options.gd @@ -1,6 +1,7 @@ class_name GameplayOptionsMenu extends VBoxContainer +@export var resolution_drop_down: OptionButton @export var look_sens_slider: HSlider @export var look_sens_input: SpinBox @export var toggle_sprint_checkbox: CheckButton @@ -14,6 +15,10 @@ extends VBoxContainer func _ready() -> void: + resolution_drop_down.add_item("320x240") + resolution_drop_down.add_item("1920x1080") + $MouseSens2/HBoxContainer/SpinBox.value = get_window().content_scale_factor + $MouseSens2/HBoxContainer/HSlider.value = get_window().content_scale_factor look_sens_slider.value = Data.preferences.mouse_sens look_sens_input.value = Data.preferences.mouse_sens toggle_sprint_checkbox.button_pressed = Data.preferences.toggle_sprint @@ -44,3 +49,23 @@ func _on_mouse_sens_spin_box_value_changed(value: float) -> void: func _on_mouse_sens_h_slider_value_changed(value: float) -> void: look_sens_input.value = value + + +func _on_option_button_item_selected(index: int) -> void: + print(index) + if index == 0: + get_tree().root.size = Vector2i(320, 240) + #DisplayServer.window_set_size(Vector2i(320, 240)) + print(get_tree().root.size) + if index == 1: + get_tree().root.size = Vector2i(1920, 1080) + #DisplayServer.window_set_size(Vector2i(1920, 1080)) + print(get_tree().root.size) + + +func _on_spin_box_value_changed(value: float) -> void: + get_window().content_scale_factor = value + + +func _on_h_slider_value_changed(value: float) -> void: + get_window().content_scale_factor = value diff --git a/UI/Menus/OptionsMenu/gameplay_options.tscn b/UI/Menus/OptionsMenu/gameplay_options.tscn index cc6f711..110b8fe 100644 --- a/UI/Menus/OptionsMenu/gameplay_options.tscn +++ b/UI/Menus/OptionsMenu/gameplay_options.tscn @@ -4,13 +4,14 @@ [sub_resource type="ImageTexture" id="ImageTexture_03x6q"] -[node name="Gameplay" type="VBoxContainer" node_paths=PackedStringArray("look_sens_slider", "look_sens_input", "toggle_sprint_checkbox", "invert_lookY", "invert_lookX", "fixed_minimap", "tower_damage", "self_damage", "party_damage", "status_damage")] +[node name="Gameplay" type="VBoxContainer" node_paths=PackedStringArray("resolution_drop_down", "look_sens_slider", "look_sens_input", "toggle_sprint_checkbox", "invert_lookY", "invert_lookX", "fixed_minimap", "tower_damage", "self_damage", "party_damage", "status_damage")] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_sy26f") +resolution_drop_down = NodePath("Resolution/HBoxContainer/OptionButton") look_sens_slider = NodePath("MouseSens/HBoxContainer/HSlider") look_sens_input = NodePath("MouseSens/HBoxContainer/SpinBox") toggle_sprint_checkbox = NodePath("ToggleSprint/CenterContainer/CheckButton") @@ -22,6 +23,24 @@ self_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/S party_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/PartyDamage") status_damage = NodePath("FloatingDamageIndicators/CenterContainer/HBoxContainer/StatusDamage") +[node name="Resolution" type="HBoxContainer" parent="."] +layout_mode = 2 + +[node name="Label" type="Label" parent="Resolution"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "OPTION_RESOLUTION" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="HBoxContainer" type="HBoxContainer" parent="Resolution"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="OptionButton" type="OptionButton" parent="Resolution/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 6 + [node name="MouseSens" type="HBoxContainer" parent="."] layout_mode = 2 alignment = 1 @@ -51,6 +70,35 @@ size_flags_vertical = 1 step = 0.01 scrollable = false +[node name="MouseSens2" type="HBoxContainer" parent="."] +layout_mode = 2 +alignment = 1 + +[node name="Label" type="Label" parent="MouseSens2"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "OPTION_MOUSE_SENSITIVITY" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="HBoxContainer" type="HBoxContainer" parent="MouseSens2"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="SpinBox" type="SpinBox" parent="MouseSens2/HBoxContainer"] +layout_mode = 2 +theme_override_icons/updown = SubResource("ImageTexture_03x6q") +step = 0.01 +alignment = 1 +update_on_text_changed = true + +[node name="HSlider" type="HSlider" parent="MouseSens2/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 +step = 0.01 +scrollable = false + [node name="ToggleSprint" type="HBoxContainer" parent="."] layout_mode = 2 @@ -167,5 +215,8 @@ toggle_mode = true button_pressed = true text = "OPTION_STATUS_DAMAGE" +[connection signal="item_selected" from="Resolution/HBoxContainer/OptionButton" to="." method="_on_option_button_item_selected"] [connection signal="value_changed" from="MouseSens/HBoxContainer/SpinBox" to="." method="_on_mouse_sens_spin_box_value_changed"] [connection signal="value_changed" from="MouseSens/HBoxContainer/HSlider" to="." method="_on_mouse_sens_h_slider_value_changed"] +[connection signal="value_changed" from="MouseSens2/HBoxContainer/SpinBox" to="." method="_on_spin_box_value_changed"] +[connection signal="value_changed" from="MouseSens2/HBoxContainer/HSlider" to="." method="_on_h_slider_value_changed"] diff --git a/UI/Themes/Scale1/button_disabled.tres b/UI/Themes/Scale1/button_disabled.tres index ce892b4..3a05af5 100644 --- a/UI/Themes/Scale1/button_disabled.tres +++ b/UI/Themes/Scale1/button_disabled.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://doxcjij1w2ot7"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_ychim"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_ychim"] [sub_resource type="AtlasTexture" id="AtlasTexture_amp6b"] atlas = ExtResource("1_ychim") diff --git a/UI/Themes/Scale1/button_focus.tres b/UI/Themes/Scale1/button_focus.tres index 3662cfc..78da695 100644 --- a/UI/Themes/Scale1/button_focus.tres +++ b/UI/Themes/Scale1/button_focus.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://buu2yn08s4wc7"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_axkac"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_axkac"] [sub_resource type="AtlasTexture" id="AtlasTexture_xobyj"] atlas = ExtResource("1_axkac") diff --git a/UI/Themes/Scale1/button_hover.tres b/UI/Themes/Scale1/button_hover.tres index 56c2a86..b0a385a 100644 --- a/UI/Themes/Scale1/button_hover.tres +++ b/UI/Themes/Scale1/button_hover.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://srk2hghxkb70"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_x020y"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_x020y"] [sub_resource type="AtlasTexture" id="AtlasTexture_kt4jn"] atlas = ExtResource("1_x020y") diff --git a/UI/Themes/Scale1/button_normal.tres b/UI/Themes/Scale1/button_normal.tres index 4695aa9..fbe7fe7 100644 --- a/UI/Themes/Scale1/button_normal.tres +++ b/UI/Themes/Scale1/button_normal.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://esvjdvqih123"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_rwyhh"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_rwyhh"] [sub_resource type="AtlasTexture" id="AtlasTexture_s7nl3"] atlas = ExtResource("1_rwyhh") diff --git a/UI/Themes/Scale1/button_pressed.tres b/UI/Themes/Scale1/button_pressed.tres index 0b6922f..da06413 100644 --- a/UI/Themes/Scale1/button_pressed.tres +++ b/UI/Themes/Scale1/button_pressed.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://bfqarik7bi544"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_u0q6f"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_u0q6f"] [sub_resource type="AtlasTexture" id="AtlasTexture_a57sn"] atlas = ExtResource("1_u0q6f") diff --git a/UI/Themes/Scale1/grabber_area.tres b/UI/Themes/Scale1/grabber_area.tres index cf201a5..5c98150 100644 --- a/UI/Themes/Scale1/grabber_area.tres +++ b/UI/Themes/Scale1/grabber_area.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://bss3dp7k18rx0"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_ug2go"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_ug2go"] [sub_resource type="AtlasTexture" id="AtlasTexture_h3qir"] atlas = ExtResource("1_ug2go") diff --git a/UI/Themes/Scale1/grabber_disabled_tex.tres b/UI/Themes/Scale1/grabber_disabled_tex.tres index 1e82d96..afd0755 100644 --- a/UI/Themes/Scale1/grabber_disabled_tex.tres +++ b/UI/Themes/Scale1/grabber_disabled_tex.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c1xm8bkvho3vl"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_466t2"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_466t2"] [resource] atlas = ExtResource("1_466t2") diff --git a/UI/Themes/Scale1/grabber_tex.tres b/UI/Themes/Scale1/grabber_tex.tres index efda8ce..23732a5 100644 --- a/UI/Themes/Scale1/grabber_tex.tres +++ b/UI/Themes/Scale1/grabber_tex.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cuwhoitu6ybba"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_74qo4"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_74qo4"] [resource] atlas = ExtResource("1_74qo4") diff --git a/UI/Themes/Scale1/h_scroll_bar.tres b/UI/Themes/Scale1/h_scroll_bar.tres index 2919c68..1891626 100644 --- a/UI/Themes/Scale1/h_scroll_bar.tres +++ b/UI/Themes/Scale1/h_scroll_bar.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://duopp63rij323"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_73g4w"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_73g4w"] [sub_resource type="AtlasTexture" id="AtlasTexture_okcqu"] atlas = ExtResource("1_73g4w") diff --git a/UI/Themes/Scale1/h_scroll_grabber.tres b/UI/Themes/Scale1/h_scroll_grabber.tres index 0b4b13c..fa88231 100644 --- a/UI/Themes/Scale1/h_scroll_grabber.tres +++ b/UI/Themes/Scale1/h_scroll_grabber.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://dlnw55uearhrg"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_xum1s"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_xum1s"] [sub_resource type="AtlasTexture" id="AtlasTexture_noue1"] atlas = ExtResource("1_xum1s") diff --git a/UI/Themes/Scale1/popup_item_hover.tres b/UI/Themes/Scale1/popup_item_hover.tres index 6249109..2314c86 100644 --- a/UI/Themes/Scale1/popup_item_hover.tres +++ b/UI/Themes/Scale1/popup_item_hover.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://co6ouoi7ieawj"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_slo62"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_slo62"] [sub_resource type="AtlasTexture" id="AtlasTexture_xobyj"] atlas = ExtResource("1_slo62") diff --git a/UI/Themes/Scale1/psx_ui.tres b/UI/Themes/Scale1/psx_ui.tres index 97a44bf..9c05f40 100644 --- a/UI/Themes/Scale1/psx_ui.tres +++ b/UI/Themes/Scale1/psx_ui.tres @@ -6,7 +6,7 @@ [ext_resource type="StyleBox" uid="uid://esvjdvqih123" path="res://UI/Themes/Scale1/button_normal.tres" id="3_43i8g"] [ext_resource type="StyleBox" uid="uid://bfqarik7bi544" path="res://UI/Themes/Scale1/button_pressed.tres" id="4_845oj"] [ext_resource type="FontFile" uid="uid://bqy8dm2o3piqm" path="res://Assets/Fonts/Quaver v1.0/quaver.ttf" id="5_o6p3e"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="6_43i8g"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="6_43i8g"] [ext_resource type="StyleBox" uid="uid://bfuea1sjymo8g" path="res://UI/Themes/Scale1/pane_style_box.tres" id="6_w151p"] [ext_resource type="StyleBox" uid="uid://jnnnhb3i2265" path="res://UI/Themes/Scale1/switch_side_b_style_box.tres" id="7_w8nmj"] [ext_resource type="StyleBox" uid="uid://cm3wsvk3woory" path="res://UI/Themes/Scale1/switch_side_a_style_box.tres" id="8_8j1wx"] diff --git a/UI/Themes/Scale1/slider.tres b/UI/Themes/Scale1/slider.tres index a54ee2a..7c1da37 100644 --- a/UI/Themes/Scale1/slider.tres +++ b/UI/Themes/Scale1/slider.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://bpowvv8e13flg"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_85syk"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_85syk"] [sub_resource type="AtlasTexture" id="AtlasTexture_uj2su"] atlas = ExtResource("1_85syk") diff --git a/UI/Themes/Scale1/slider_tick_tex.tres b/UI/Themes/Scale1/slider_tick_tex.tres index d328ff6..529bcfd 100644 --- a/UI/Themes/Scale1/slider_tick_tex.tres +++ b/UI/Themes/Scale1/slider_tick_tex.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d3bbst30pgfgy"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_gfpkm"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_gfpkm"] [resource] atlas = ExtResource("1_gfpkm") diff --git a/ui_atlas.png b/UI/Themes/Scale1/ui_atlas.png similarity index 100% rename from ui_atlas.png rename to UI/Themes/Scale1/ui_atlas.png diff --git a/ui_atlas.png.import b/UI/Themes/Scale1/ui_atlas.png.import similarity index 76% rename from ui_atlas.png.import rename to UI/Themes/Scale1/ui_atlas.png.import index 11012da..63b2c9a 100644 --- a/ui_atlas.png.import +++ b/UI/Themes/Scale1/ui_atlas.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b5h32okh8yu6f" -path="res://.godot/imported/ui_atlas.png-aa1aa353e19deb1c1fc500215a2c3959.ctex" +path="res://.godot/imported/ui_atlas.png-6cf68f4a43ca4f789830e8d3dc7c3f50.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://ui_atlas.png" -dest_files=["res://.godot/imported/ui_atlas.png-aa1aa353e19deb1c1fc500215a2c3959.ctex"] +source_file="res://UI/Themes/Scale1/ui_atlas.png" +dest_files=["res://.godot/imported/ui_atlas.png-6cf68f4a43ca4f789830e8d3dc7c3f50.ctex"] [params] diff --git a/UI/Themes/Scale1/v_scroll_bar.tres b/UI/Themes/Scale1/v_scroll_bar.tres index 8c46118..be6c26d 100644 --- a/UI/Themes/Scale1/v_scroll_bar.tres +++ b/UI/Themes/Scale1/v_scroll_bar.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://c4cljq7yl78eg"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_qpij5"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_qpij5"] [sub_resource type="AtlasTexture" id="AtlasTexture_okcqu"] atlas = ExtResource("1_qpij5") diff --git a/UI/Themes/Scale1/v_scroll_grabber.tres b/UI/Themes/Scale1/v_scroll_grabber.tres index e0b1509..73ab284 100644 --- a/UI/Themes/Scale1/v_scroll_grabber.tres +++ b/UI/Themes/Scale1/v_scroll_grabber.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://8s0fgx46n145"] -[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://ui_atlas.png" id="1_6syfe"] +[ext_resource type="Texture2D" uid="uid://b5h32okh8yu6f" path="res://UI/Themes/Scale1/ui_atlas.png" id="1_6syfe"] [sub_resource type="AtlasTexture" id="AtlasTexture_noue1"] atlas = ExtResource("1_6syfe") diff --git a/main.tscn b/main.tscn index ad60d2e..1722345 100644 --- a/main.tscn +++ b/main.tscn @@ -66,10 +66,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -165.0 -offset_top = 50.0 -offset_right = 190.0 -offset_bottom = 135.0 +offset_left = -179.0 +offset_top = 47.0 +offset_right = 176.0 +offset_bottom = 132.0 grow_horizontal = 2 grow_vertical = 2 color = Color(0.192157, 0.415686, 0.223529, 1) diff --git a/project.godot b/project.godot index 255b10c..19ca817 100644 --- a/project.godot +++ b/project.godot @@ -28,8 +28,8 @@ gdscript/warnings/inferred_declaration=2 [display] -window/size/viewport_width=320 -window/size/viewport_height=240 +window/size/viewport_width=640 +window/size/viewport_height=360 window/stretch/mode="viewport" window/stretch/scale_mode="integer"