diff --git a/Assets/Textures/place_icon.png b/Assets/Textures/place_icon.png new file mode 100644 index 0000000..dbc8d5e Binary files /dev/null and b/Assets/Textures/place_icon.png differ diff --git a/button_patch.png.import b/Assets/Textures/place_icon.png.import similarity index 73% rename from button_patch.png.import rename to Assets/Textures/place_icon.png.import index f0c7941..10c3c17 100644 --- a/button_patch.png.import +++ b/Assets/Textures/place_icon.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://broabvnrwp73t" -path="res://.godot/imported/button_patch.png-22aba966b297663456907901b6cbce38.ctex" +uid="uid://deelc254ct7ae" +path="res://.godot/imported/place_icon.png-ad3a74931c0ccf2fbff4749d1f6da64b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://button_patch.png" -dest_files=["res://.godot/imported/button_patch.png-22aba966b297663456907901b6cbce38.ctex"] +source_file="res://Assets/Textures/place_icon.png" +dest_files=["res://.godot/imported/place_icon.png-ad3a74931c0ccf2fbff4749d1f6da64b.ctex"] [params] diff --git a/Classes/Engineer/plan.tscn b/Classes/Engineer/plan.tscn index 0467768..3827a2f 100644 --- a/Classes/Engineer/plan.tscn +++ b/Classes/Engineer/plan.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" uid="uid://cl2mi4bnpatwk" path="res://Scripts/float_and_spin.gd" id="3_b2a1t"] [ext_resource type="Texture2D" uid="uid://dds48gjgiyjp6" path="res://Classes/Engineer/plan_plan_tex.png" id="4_75s6s"] [ext_resource type="Material" uid="uid://dq30v3hgyi4da" path="res://Classes/Engineer/mouse_hover_material.tres" id="5_2u312"] -[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="6_etati"] +[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="6_etati"] [sub_resource type="BoxShape3D" id="BoxShape3D_2u312"] size = Vector3(0.436279, 1.47153, 1.05554) diff --git a/Classes/Engineer/podium.tscn b/Classes/Engineer/podium.tscn index 94078f9..da9d328 100644 --- a/Classes/Engineer/podium.tscn +++ b/Classes/Engineer/podium.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://ciagj1hfn4gou"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_fo804"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_fo804"] [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://Classes/Engineer/doe.png" id="2_4b5pd"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_pmyku"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_1jafm"] diff --git a/Classes/Mage/podium.tscn b/Classes/Mage/podium.tscn index 0f31ba7..e813143 100644 --- a/Classes/Mage/podium.tscn +++ b/Classes/Mage/podium.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://bd4k48bdgiddy"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_0wn84"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_0wn84"] [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://Classes/Mage/yeen.png" id="2_skplt"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_m1210"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_5wuy8"] diff --git a/Classes/Mage/scroll.tscn b/Classes/Mage/scroll.tscn index 37ee297..5e54861 100644 --- a/Classes/Mage/scroll.tscn +++ b/Classes/Mage/scroll.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=4 uid="uid://bfxgtf1v1okat"] [ext_resource type="Script" uid="uid://bj7oafusrrsk" path="res://Scripts/card_item.gd" id="1_rlle2"] -[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="2_aiko0"] +[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="2_aiko0"] [ext_resource type="Script" uid="uid://cl2mi4bnpatwk" path="res://Scripts/float_and_spin.gd" id="3_jjaja"] [ext_resource type="Texture2D" uid="uid://b0sl2tvwle1m7" path="res://Classes/Mage/scroll2_paper.png" id="4_aiko0"] [ext_resource type="Material" uid="uid://0273wjmwcpa5" path="res://Classes/Mage/mouse_hover_material2.tres" id="5_jjaja"] diff --git a/Classes/NewHero3/podium.tscn b/Classes/NewHero3/podium.tscn index aa5fa73..e3266d9 100644 --- a/Classes/NewHero3/podium.tscn +++ b/Classes/NewHero3/podium.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://busdu5na4rf4e"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_nxj67"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_nxj67"] [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://Classes/Engineer/doe.png" id="2_05uii"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_il1ej"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_mrig3"] diff --git a/Classes/NewHero4/podium.tscn b/Classes/NewHero4/podium.tscn index 08de417..a31b8a3 100644 --- a/Classes/NewHero4/podium.tscn +++ b/Classes/NewHero4/podium.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://6givglesbjef"] -[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_h2nqs"] +[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_h2nqs"] [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://Classes/Mage/yeen.png" id="2_e7ajb"] [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_brui3"] [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_6igfd"] diff --git a/Enemies/BabyEyeDog/baby_eye_dog.tscn b/Enemies/BabyEyeDog/baby_eye_dog.tscn index a18a7e5..98aaa37 100644 --- a/Enemies/BabyEyeDog/baby_eye_dog.tscn +++ b/Enemies/BabyEyeDog/baby_eye_dog.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_vl30x"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="5_f7xim"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="6_lbm5h"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="7_o1784"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="7_o1784"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="8_1fak8"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_yrbee"] [ext_resource type="PackedScene" uid="uid://bgxr27by7jruo" path="res://Enemies/BabyEyeDog/baby_eyedog.glb" id="10_8k5ts"] diff --git a/Enemies/ElderEyeDog/elder_eye_dog.tscn b/Enemies/ElderEyeDog/elder_eye_dog.tscn index 2ec8353..7d331a4 100644 --- a/Enemies/ElderEyeDog/elder_eye_dog.tscn +++ b/Enemies/ElderEyeDog/elder_eye_dog.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_lirjc"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="5_bi7k0"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="6_k6khd"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="7_wko6w"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="7_wko6w"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="8_2jssq"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_2x8lp"] [ext_resource type="PackedScene" uid="uid://r2s4pd42y0ma" path="res://Enemies/ElderEyeDog/elder_eyedog.glb" id="10_17xxt"] diff --git a/Enemies/EyeDog/eye_dog.tscn b/Enemies/EyeDog/eye_dog.tscn index a686e19..6181f7a 100644 --- a/Enemies/EyeDog/eye_dog.tscn +++ b/Enemies/EyeDog/eye_dog.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_1dh2f"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="6_3v8fr"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="7_bkkhh"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="8_k2835"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="8_k2835"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="9_t4oco"] [ext_resource type="PackedScene" uid="uid://dlhx6r23m5ceg" path="res://Enemies/EyeDog/eyedog.glb" id="10_h25mw"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="11_kpdsm"] diff --git a/Locales/en.mo b/Locales/en.mo index 6de698d..8f856ad 100644 Binary files a/Locales/en.mo and b/Locales/en.mo differ diff --git a/Locales/en.po b/Locales/en.po index 6d50ac4..858a4a3 100644 --- a/Locales/en.po +++ b/Locales/en.po @@ -624,6 +624,9 @@ msgstr "Cost: $" msgid "LABEL_REMIX_CURRENCY" msgstr "Coins: $" +msgid "PROMPT_QUIT" +msgstr "Are you sure you want to quit?" + #, fuzzy #~| msgid "LABEL_DISPLAY_NAME" #~ msgid "LABEL_CARD_NAME" diff --git a/Locales/translation_template.pot b/Locales/translation_template.pot index 5f7e8c9..992937d 100644 --- a/Locales/translation_template.pot +++ b/Locales/translation_template.pot @@ -587,3 +587,6 @@ msgstr "" msgid "LABEL_REMIX_CURRENCY" msgstr "" + +msgid "PROMPT_QUIT" +msgstr "" diff --git a/PCs/FSM/carding_state.gd b/PCs/FSM/carding_state.gd index a215206..b8e0e83 100644 --- a/PCs/FSM/carding_state.gd +++ b/PCs/FSM/carding_state.gd @@ -63,3 +63,4 @@ func swap_to_slot(num: int) -> void: if hero.hand.size >= num: hero.hand_selected_index = num - 1 hero.swap_card_audio.play() + hero.hud.hot_wheel.update_cassettes(hero.get_wheel_cards()) diff --git a/PCs/FSM/fighting_state.gd b/PCs/FSM/fighting_state.gd index 153516b..e6325b7 100644 --- a/PCs/FSM/fighting_state.gd +++ b/PCs/FSM/fighting_state.gd @@ -15,8 +15,9 @@ func enter_state() -> void: hero.weapons[hero.equipped_weapon].current_energy = hero.weapons[hero.equipped_weapon].max_energy #this had to be commented out coz the new energy bar thinks "energy changed" is "energy used" #weapons[equipped_weapon].energy_changed.emit(weapons[equipped_weapon].current_energy) - for x: int in hero.hand.contents.size(): - hero.discard_pile.add(hero.hand.remove_at(hero.hand.contents.size() - 1)) + if hero.game_manager.card_gameplay: + for x: int in hero.hand.contents.size(): + hero.discard_pile.add(hero.hand.remove_at(hero.hand.contents.size() - 1)) hero.weapon_swap_timer.start() hero.hud.energy_label.visible = false diff --git a/PCs/hero.gd b/PCs/hero.gd index cd33614..1621acf 100644 --- a/PCs/hero.gd +++ b/PCs/hero.gd @@ -15,7 +15,6 @@ signal ready_state_changed(state: bool) @export var draw_pile: Inventory @export var hand: Inventory @export var discard_pile: Inventory -@export var gauntlet_cards: Array[CardInHand] @export var pause_menu_scene: PackedScene @export var hud: HUD @export var movement: PlayerMovement @@ -41,7 +40,7 @@ signal ready_state_changed(state: bool) var current_state: HeroState var pre_fighting_state: HeroState -var hand_card_scene: PackedScene = preload("res://Scenes/UI/card_hand.tscn") +var hand_card_scene: PackedScene = preload("res://UI/card_hand.tscn") var card_sprites: Array[CardInHand] var game_manager: GameManager var hovering_item: InteractButton = null @@ -184,6 +183,7 @@ func increment_selected() -> void: hand_selected_index += 1 if hand_selected_index >= hand.size: hand_selected_index = 0 + hud.hot_wheel.update_cassettes(get_wheel_cards()) func decrement_selected() -> void: @@ -193,20 +193,43 @@ func decrement_selected() -> void: hand_selected_index -= 1 if hand_selected_index < 0: hand_selected_index = hand.size - 1 + hud.hot_wheel.update_cassettes(get_wheel_cards()) + + +func get_wheel_cards() -> Array[Card]: + var wheel_cards: Array[Card] = [] + if hand.size > 0: + wheel_cards.append(hand.contents[hand_selected_index]) + var left_searches: int = floori((min(5, hand.size) - 1) / 2.0) + var right_searches: int = ceili((min(5, hand.size) - 1) / 2.0) + while left_searches > 0 or right_searches > 0: + for x: int in left_searches: + if hand_selected_index - (x + 1) >= 0: + wheel_cards.append(hand.contents[hand_selected_index - (x + 1)]) + left_searches -= 1 + else: + right_searches += left_searches + left_searches = 0 + for x: int in right_searches: + if hand_selected_index + (x + 1) < hand.size: + wheel_cards.append(hand.contents[hand_selected_index + (x + 1)]) + right_searches -= 1 + else: + left_searches += right_searches + right_searches = 0 + return wheel_cards + func set_card_elements_visibility(value: bool) -> void: if value: hud.show_hot_wheel() + hud.hot_wheel.update_cassettes(get_wheel_cards()) + hud.show_slots() else: hud.hide_hot_wheel() + hud.hide_slots() $FirstPersonViewport/Head2/LeftHand.visible = value - $HUD/PlaceIcon.visible = value - $HUD/SwapIcon.visible = value - if cards[0]: - $HUD/PlaceIcon.visible = false - if cards[1]: - $HUD/SwapIcon.visible = false func _unhandled_input(event: InputEvent) -> void: @@ -226,8 +249,6 @@ func ready_self() -> void: edit_tool.interact_key_held = false if !ready_state: ready_state = true - hud.place_icon.set_visible(false) - hud.swap_icon.set_visible(false) hud.shrink_wave_start_label() ready_audio.play() @@ -243,6 +264,7 @@ func add_card(new_card: Card) -> void: hand.add(new_card) hud.pickup(new_card) place_card_audio.play() + hud.hot_wheel.update_cassettes(get_wheel_cards()) func unpause() -> void: @@ -301,6 +323,8 @@ func equip_weapon(slot: int = 0) -> void: energy -= energy_cost place_card_audio.play() cards[slot] = hand.remove_at(hand.contents.find(selected_card)) + decrement_selected() + hud.hot_wheel.update_cassettes(get_wheel_cards()) #card_sprites[hand_selected_index].queue_free() #card_sprites.remove_at(hand_selected_index) if game_manager.card_gameplay: @@ -314,13 +338,10 @@ func equip_weapon(slot: int = 0) -> void: weapons[slot].duration = 1 weapons_spawn_count += 1 weapons[slot].set_multiplayer_authority(multiplayer.get_unique_id()) - gauntlet_cards[slot].set_card(cards[slot]) if slot == 0: - hud.place_icon.visible = false + hud.set_primary_button(cards[slot]) else: - hud.swap_icon.visible = false - gauntlet_cards[slot].view_weapon() - gauntlet_cards[slot].visible = true + hud.set_secondary_button(cards[slot]) weapons[slot].set_hero(self) weapons[slot].visible = false right_hand.add_child(weapons[slot]) @@ -364,14 +385,14 @@ func _on_timer_timeout() -> void: func unequip_weapon(slot: int = 0) -> void: - gauntlet_cards[slot].visible = false if slot == 0: - hud.place_icon.visible = true + hud.set_primary_button(null) else: - hud.swap_icon.visible = true + hud.set_secondary_button(null) weapons[slot].queue_free() weapons[slot] = null if !game_manager.card_gameplay: add_card(cards[slot]) cards[slot] = null place_card_audio.play() + hud.hot_wheel.update_cassettes(get_wheel_cards()) diff --git a/PCs/hero.tscn b/PCs/hero.tscn index 0d6941d..2c59b04 100644 --- a/PCs/hero.tscn +++ b/PCs/hero.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=69 format=3 uid="uid://dxgxbtf68lcv5"] +[gd_scene load_steps=67 format=3 uid="uid://dxgxbtf68lcv5"] [ext_resource type="Script" uid="uid://1fqpoegbdm6n" path="res://PCs/hero.gd" id="1_pihpe"] [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://Classes/Engineer/class.tres" id="2_dbyo0"] [ext_resource type="PackedScene" uid="uid://ri8r03wqy80t" path="res://Scenes/8_direction_sprite.tscn" id="2_ib0t5"] -[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://Scenes/Menus/PauseMenu/pause_menu.tscn" id="3_avnsx"] +[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://UI/Menus/PauseMenu/pause_menu.tscn" id="3_avnsx"] [ext_resource type="PackedScene" uid="uid://n8ab1cy7ordc" path="res://card_model/3d_card.tscn" id="4_2mqvj"] [ext_resource type="Script" uid="uid://cij76at0nbs1v" path="res://PCs/view_movement.gd" id="4_mhexa"] -[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="4_mwtvp"] [ext_resource type="PackedScene" uid="uid://gdd1xupf4oxx" path="res://UI/CardSelectionBox/card_selection_box.tscn" id="5_h82f6"] [ext_resource type="PackedScene" uid="uid://dqt1ggtkpkuhs" path="res://PCs/PathEditTool/path_edit_tool.tscn" id="5_jlxb3"] [ext_resource type="Script" uid="uid://do24iuot0j7d7" path="res://Scripts/inventory.gd" id="6_cf5ap"] @@ -20,10 +19,10 @@ [ext_resource type="Texture2D" uid="uid://c60fh34ttgcvh" path="res://Assets/Textures/minimap_player.png" id="15_nhlam"] [ext_resource type="Texture2D" uid="uid://chhmkmlfrobhu" path="res://Assets/Textures/bubble.png" id="15_q3yot"] [ext_resource type="Texture2D" uid="uid://cqnapc8cscl7i" path="res://Assets/Textures/border.png" id="16_x1xjr"] -[ext_resource type="PackedScene" uid="uid://chnj376d3lcjd" path="res://Scenes/UI/pickup_notification.tscn" id="17_oyeww"] +[ext_resource type="PackedScene" uid="uid://chnj376d3lcjd" path="res://UI/pickup_notification.tscn" id="17_oyeww"] [ext_resource type="PackedScene" uid="uid://d17c77pqsi8oy" path="res://UI/EnemyCard/enemy_card_ui.tscn" id="18_dfkac"] -[ext_resource type="Texture2D" uid="uid://cvjcu3hofahr6" path="res://Assets/Textures/place_slot.png" id="18_okmpi"] [ext_resource type="Script" uid="uid://b5wle8f6rv3e7" path="res://PCs/player_movement.gd" id="20_cfhw8"] +[ext_resource type="Texture2D" uid="uid://deelc254ct7ae" path="res://Assets/Textures/place_icon.png" id="22_o55s8"] [ext_resource type="AudioStream" uid="uid://csu2hce4bfoki" path="res://Audio/cardPlace1.ogg" id="24_8ch4w"] [ext_resource type="AudioStream" uid="uid://dxq8b77wa41os" path="res://Audio/cardPlace2.ogg" id="25_awl6m"] [ext_resource type="Texture2D" uid="uid://bs2mskoyvyehv" path="res://Assets/Textures/crosshair159.png" id="25_l7gpx"] @@ -36,9 +35,10 @@ [ext_resource type="AudioStream" uid="uid://val5n418yebw" path="res://Audio/cardSlide3.ogg" id="30_djhlg"] [ext_resource type="Texture2D" uid="uid://up7omskwg0yx" path="res://Assets/Textures/battery.png" id="30_rim6q"] [ext_resource type="AudioStream" uid="uid://ck6g061w7i6ro" path="res://Audio/cardSlide4.ogg" id="31_546e6"] -[ext_resource type="PackedScene" uid="uid://ga21hoa8fxmm" path="res://hot_wheel.tscn" id="31_h1yfy"] -[ext_resource type="PackedScene" uid="uid://cqslp83lf0ku0" path="res://shield_ui.tscn" id="31_o55s8"] -[ext_resource type="PackedScene" uid="uid://q73cllewm7pj" path="res://energy_pips.tscn" id="32_o55s8"] +[ext_resource type="PackedScene" uid="uid://ga21hoa8fxmm" path="res://UI/HotWheelUI/hot_wheel.tscn" id="31_h1yfy"] +[ext_resource type="PackedScene" uid="uid://cqslp83lf0ku0" path="res://UI/ShieldUI/shield_ui.tscn" id="31_o55s8"] +[ext_resource type="PackedScene" uid="uid://q73cllewm7pj" path="res://UI/EnergyPipUI/energy_pips.tscn" id="32_o55s8"] +[ext_resource type="Texture2D" uid="uid://doqfkinrjw4mt" path="res://UI/Enemy_icon.png" id="32_r2yb6"] [ext_resource type="AudioStream" uid="uid://bj8eitlsjdotb" path="res://Audio/cardSlide5.ogg" id="32_tg7y0"] [ext_resource type="AudioStream" uid="uid://d0620p56ad34a" path="res://Audio/cardSlide6.ogg" id="33_2v5co"] [ext_resource type="AudioStream" uid="uid://uvoxbl1fbtu0" path="res://Audio/cardSlide7.ogg" id="34_6acmc"] @@ -59,12 +59,6 @@ radius = 0.3 height = 1.8 -[sub_resource type="ViewportTexture" id="ViewportTexture_v8f6r"] -viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2") - -[sub_resource type="ViewportTexture" id="ViewportTexture_xme80"] -viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3") - [sub_resource type="Environment" id="Environment_cilxe"] background_mode = 1 background_color = Color(0.282353, 0.615686, 0.278431, 1) @@ -120,7 +114,7 @@ stream_0/stream = ExtResource("36_lsvj8") streams_count = 1 stream_0/stream = ExtResource("37_kv1mg") -[node name="Hero" type="CharacterBody3D" node_paths=PackedStringArray("camera", "gun_camera", "left_hand", "right_hand", "edit_tool", "carding_tool", "sprite", "interaction_raycast", "draw_pile", "hand", "discard_pile", "gauntlet_cards", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "place_card_audio", "swap_card_audio", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio")] +[node name="Hero" type="CharacterBody3D" node_paths=PackedStringArray("camera", "gun_camera", "left_hand", "right_hand", "edit_tool", "carding_tool", "sprite", "interaction_raycast", "draw_pile", "hand", "discard_pile", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "place_card_audio", "swap_card_audio", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio")] collision_layer = 2 collision_mask = 37 script = ExtResource("1_pihpe") @@ -136,7 +130,6 @@ interaction_raycast = NodePath("ViewMovement/Head/RayCast3D") draw_pile = NodePath("DrawPile") hand = NodePath("Hand") discard_pile = NodePath("DiscardPile") -gauntlet_cards = [NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2/Node2D"), NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3/Node2D")] pause_menu_scene = ExtResource("3_avnsx") hud = NodePath("HUD") movement = NodePath("PlayerMovement") @@ -214,35 +207,6 @@ weapon_rotation_amount = 0.001 [node name="LeftHand" type="Node3D" parent="FirstPersonViewport/Head2"] transform = Transform3D(0.235, 0, 0, 0, 0.235, 0, 0, 0, 0.235, -0.645, -0.26, -1.04) -visible = false - -[node name="SubViewport2" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"] -transparent_bg = true -render_target_update_mode = 4 - -[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport2" instance=ExtResource("4_mwtvp")] -visible = false - -[node name="SubViewport3" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"] -transparent_bg = true -render_target_update_mode = 4 - -[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport3" instance=ExtResource("4_mwtvp")] -visible = false - -[node name="Sprite3D2" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"] -transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 4.72, -0.145, 1.581) -layers = 2 -sorting_offset = 1.0 -texture_filter = 0 -texture = SubResource("ViewportTexture_v8f6r") - -[node name="Sprite3D3" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"] -transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 6.01, -0.145, 1.581) -layers = 2 -sorting_offset = 1.0 -texture_filter = 0 -texture = SubResource("ViewportTexture_xme80") [node name="card_hand_model" parent="FirstPersonViewport/Head2/LeftHand" instance=ExtResource("11_h82f6")] transform = Transform3D(-4.16989, -0.848374, -3.61733e-07, -0.824933, 4.05468, -0.993384, 0.198049, -0.973442, -4.13774, 1.56596, 0.519149, 3.37051) @@ -321,7 +285,7 @@ max_look_up_angle = 80.0 enable_jumping = true weapon_holder = NodePath("../FirstPersonViewport/Head2/RightHand") -[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("player", "wave_count", "currency_count", "minimap_outline", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "wave_start_label", "place_icon", "swap_icon", "place_text", "swap_text", "energy_label", "blank_cassette_label", "feature_preview", "hot_wheel", "shield_ui", "currencies", "energy_pips")] +[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("player", "wave_count", "currency_count", "minimap_outline", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "wave_start_label", "place_text", "swap_text", "energy_label", "blank_cassette_label", "feature_preview", "hot_wheel", "shield_ui", "currencies", "energy_pips", "enemy_count_label", "primary_button", "secondary_button", "slots")] script = ExtResource("8_yl6ka") player = NodePath("..") wave_count = NodePath("EnemyTracker/WaveCount") @@ -336,10 +300,8 @@ enemy_sprites = [NodePath("EnemyTracker/TextureRect"), NodePath("EnemyTracker/Te enemy_counts = [NodePath("EnemyTracker/TextureRect/Label"), NodePath("EnemyTracker/TextureRect2/Label2"), NodePath("EnemyTracker/TextureRect3/Label3"), NodePath("EnemyTracker/TextureRect4/Label4"), NodePath("EnemyTracker/TextureRect5/Label5")] pickup_notif_scene = ExtResource("17_oyeww") wave_start_label = NodePath("StartWaveLabel") -place_icon = NodePath("PlaceIcon") -swap_icon = NodePath("SwapIcon") -place_text = NodePath("PlaceIcon/RichTextLabel") -swap_text = NodePath("SwapIcon/RichTextLabel") +place_text = NodePath("VBoxContainer2/HBoxContainer/RichTextLabel") +swap_text = NodePath("VBoxContainer2/HBoxContainer2/RichTextLabel") enemy_card_scene = ExtResource("18_dfkac") energy_label = NodePath("Currencies/HBoxContainer/EnergyLabel") blank_cassette_label = NodePath("Currencies/BlankCassetteLabel") @@ -348,6 +310,11 @@ hot_wheel = NodePath("HotWheel") shield_ui = NodePath("ShieldUI") currencies = NodePath("Currencies") energy_pips = NodePath("EnergyPips") +enemy_count_label = NodePath("HBoxContainer/Label") +primary_button = NodePath("VBoxContainer2/HBoxContainer/Button") +secondary_button = NodePath("VBoxContainer2/HBoxContainer2/Button2") +null_icon = ExtResource("22_o55s8") +slots = NodePath("VBoxContainer2") [node name="FirstPersonCam" type="TextureRect" parent="HUD"] anchors_preset = 15 @@ -358,60 +325,6 @@ grow_vertical = 2 mouse_filter = 2 texture = SubResource("ViewportTexture_mk87g") -[node name="PlaceIcon" type="TextureRect" parent="HUD"] -visible = false -anchors_preset = -1 -anchor_left = 0.75 -anchor_top = 0.95 -anchor_right = 0.8 -anchor_bottom = 0.95 -grow_horizontal = 0 -grow_vertical = 0 -mouse_filter = 2 -texture = ExtResource("18_okmpi") -stretch_mode = 5 - -[node name="RichTextLabel" type="RichTextLabel" parent="HUD/PlaceIcon"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -bbcode_enabled = true -text = "%Primary Fire%" -scroll_active = false -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="SwapIcon" type="TextureRect" parent="HUD"] -visible = false -anchors_preset = -1 -anchor_left = 0.95 -anchor_top = 0.95 -anchor_right = 0.95 -anchor_bottom = 0.95 -grow_horizontal = 0 -grow_vertical = 0 -mouse_filter = 2 -texture = ExtResource("18_okmpi") -stretch_mode = 5 - -[node name="RichTextLabel" type="RichTextLabel" parent="HUD/SwapIcon"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -bbcode_enabled = true -text = "%Secondary Fire%" -scroll_active = false -horizontal_alignment = 1 -vertical_alignment = 1 - [node name="Minimap" type="TextureRect" parent="HUD"] visible = false anchors_preset = 1 @@ -452,6 +365,7 @@ horizontal_alignment = 2 vertical_alignment = 1 [node name="EnemyTracker" type="TextureRect" parent="HUD"] +visible = false texture_filter = 1 anchors_preset = -1 anchor_left = 0.5 @@ -601,19 +515,18 @@ vertical_alignment = 1 anchors_preset = 4 anchor_top = 0.5 anchor_bottom = 0.5 -offset_left = 15.0 -offset_top = -295.0 -offset_right = 445.0 -offset_bottom = -40.0 -grow_vertical = 0 +offset_top = -10.0 +offset_right = 104.0 +offset_bottom = 10.0 +grow_vertical = 2 mouse_filter = 2 alignment = 2 [node name="StartWaveLabel" type="RichTextLabel" parent="HUD"] anchors_preset = -1 -anchor_top = 0.261 +anchor_top = 0.136 anchor_right = 1.0 -anchor_bottom = 0.395 +anchor_bottom = 0.252 grow_horizontal = 2 mouse_filter = 2 bbcode_enabled = true @@ -729,9 +642,9 @@ vertical_alignment = 1 visible = false anchors_preset = -1 anchor_left = 0.5 -anchor_top = 0.893 +anchor_top = 0.973 anchor_right = 0.5 -anchor_bottom = 0.893 +anchor_bottom = 0.973 grow_horizontal = 2 grow_vertical = 0 @@ -762,6 +675,77 @@ anchor_bottom = 0.97 grow_horizontal = 0 grow_vertical = 0 +[node name="HBoxContainer" type="HBoxContainer" parent="HUD"] +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -20.0 +offset_right = 20.0 +offset_bottom = 40.0 +grow_horizontal = 2 +rotation = 0.008726646 + +[node name="TextureRect" type="TextureRect" parent="HUD/HBoxContainer"] +layout_mode = 2 +texture = ExtResource("32_r2yb6") +stretch_mode = 3 + +[node name="Label" type="Label" parent="HUD/HBoxContainer"] +layout_mode = 2 +text = "15" +vertical_alignment = 1 + +[node name="VBoxContainer2" type="VBoxContainer" parent="HUD"] +visible = false +anchors_preset = -1 +anchor_left = 0.98 +anchor_top = 0.768 +anchor_right = 0.98 +anchor_bottom = 0.768 +grow_horizontal = 0 +grow_vertical = 0 +alignment = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="HUD/VBoxContainer2"] +layout_mode = 2 + +[node name="RichTextLabel" type="RichTextLabel" parent="HUD/VBoxContainer2/HBoxContainer"] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +mouse_filter = 2 +bbcode_enabled = true +text = "%Primary Fire%" +scroll_active = false +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="Button" type="Button" parent="HUD/VBoxContainer2/HBoxContainer"] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +icon = ExtResource("22_o55s8") +icon_alignment = 1 +expand_icon = true + +[node name="HBoxContainer2" type="HBoxContainer" parent="HUD/VBoxContainer2"] +layout_mode = 2 + +[node name="RichTextLabel" type="RichTextLabel" parent="HUD/VBoxContainer2/HBoxContainer2"] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +mouse_filter = 2 +bbcode_enabled = true +text = "%Secondary Fire%" +scroll_active = false +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="Button2" type="Button" parent="HUD/VBoxContainer2/HBoxContainer2"] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +icon = ExtResource("22_o55s8") +icon_alignment = 1 +expand_icon = true + [node name="WeaponSwapTimer" type="Timer" parent="."] wait_time = 0.4 one_shot = true diff --git a/PCs/hud.gd b/PCs/hud.gd index e570b93..af41403 100644 --- a/PCs/hud.gd +++ b/PCs/hud.gd @@ -15,8 +15,6 @@ extends CanvasLayer @export var enemy_counts: Array[Label] @export var pickup_notif_scene: PackedScene @export var wave_start_label: RichTextLabel -@export var place_icon: TextureRect -@export var swap_icon: TextureRect @export var place_text: RichTextLabel @export var swap_text: RichTextLabel @export var enemy_card_scene: PackedScene @@ -29,12 +27,18 @@ extends CanvasLayer @export var shield_ui: ShieldUI @export var currencies: VBoxContainer @export var energy_pips: EnergyPips +@export var enemy_count_label: Label +@export var primary_button: Button +@export var secondary_button: Button +@export var null_icon: Texture +@export var slots: VBoxContainer var last_lives_count: int = Data.starting_lives var enemy_names: Array[String] var map_anchor: Node3D var cards: Array[EnemyCardUI] = [] var feature_preview_tween: Tween +var enemy_count: int = 0 func _ready() -> void: @@ -52,6 +56,28 @@ func hide_hot_wheel() -> void: hot_wheel.visible = false +func show_slots() -> void: + slots.visible = true + + +func hide_slots() -> void: + slots.visible = false + + +func set_primary_button(card: Card) -> void: + if card: + primary_button.icon = card.icon + else: + primary_button.icon = null_icon + + +func set_secondary_button(card: Card) -> void: + if card: + secondary_button.icon = card.icon + else: + secondary_button.icon = null_icon + + func set_blank_cassette_count(value: int) -> void: blank_cassette_label.text = str(value) @@ -100,6 +126,7 @@ func _process(_delta: float) -> void: func show_features(cassette: Card) -> void: + print("shown features") for child: Node in feature_preview.get_children(): child.queue_free() var cols: int = max(cassette.tower_stats.features.size(), cassette.weapon_stats.features.size()) @@ -184,9 +211,12 @@ func enemy_count_down(enemy: Enemy) -> void: if num == 0: enemy_counts[index].set_visible(false) enemy_sprites[index].set_visible(false) + enemy_count -= 1 + enemy_count_label.text = str(enemy_count) func set_upcoming_wave(value: Dictionary) -> void: + enemy_count = 0 var frame_count: int = 0 enemy_names = [] var wave: Dictionary = {} @@ -196,6 +226,7 @@ func set_upcoming_wave(value: Dictionary) -> void: if enemy.title == key: new_enemy = enemy wave[new_enemy] = value[key] + enemy_count += value[key] for x: int in enemy_sprites.size(): enemy_sprites[x].set_visible(false) enemy_counts[x].set_visible(false) @@ -206,6 +237,7 @@ func set_upcoming_wave(value: Dictionary) -> void: enemy_sprites[frame_count].set_visible(true) enemy_counts[frame_count].set_visible(true) frame_count += 1 + enemy_count_label.text = str(enemy_count) func set_currency_count(value: int) -> void: @@ -255,7 +287,6 @@ func minimize_minimap() -> void: func pickup(card: Card) -> void: - hot_wheel.add_cassette(card) var notif: PickupNotification = pickup_notif_scene.instantiate() notif.set_card(card) $VBoxContainer.add_child(notif) diff --git a/Scenes/CardPrinter/card_printer.tscn b/Scenes/CardPrinter/card_printer.tscn index ab6a34d..4992bde 100644 --- a/Scenes/CardPrinter/card_printer.tscn +++ b/Scenes/CardPrinter/card_printer.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=3 uid="uid://1b2ikdanl66b"] [ext_resource type="Script" uid="uid://bivtfdl3p1brv" path="res://Scenes/CardPrinter/card_printer.gd" id="1_qft15"] -[ext_resource type="PackedScene" uid="uid://bcvjgl0s1wp8y" path="res://choose_card_screen.tscn" id="2_kpujb"] +[ext_resource type="PackedScene" uid="uid://bcvjgl0s1wp8y" path="res://UI/Menus/RadioMenu/choose_card_screen.tscn" id="2_kpujb"] [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="4_eavi1"] [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="5_m033a"] diff --git a/Scenes/Menus/alert_popup.tscn b/Scenes/Menus/alert_popup.tscn index 1527de3..f62fc48 100644 --- a/Scenes/Menus/alert_popup.tscn +++ b/Scenes/Menus/alert_popup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://6a277g802os0"] [ext_resource type="Script" uid="uid://4uwd40mavufi" path="res://Scripts/alert_popup.gd" id="1_cac03"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_2mbtt"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_2mbtt"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_veol0"] random_pitch = 1.1 diff --git a/Scenes/Menus/confirmation_popup.tscn b/Scenes/Menus/confirmation_popup.tscn index e1b5804..794b0ac 100644 --- a/Scenes/Menus/confirmation_popup.tscn +++ b/Scenes/Menus/confirmation_popup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://f46qh73hrk4y"] [ext_resource type="Script" uid="uid://bjt72v1wym5ie" path="res://Scripts/confirmation_popup.gd" id="1_x7akt"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_3w36n"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_3w36n"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_22wuj"] random_pitch = 1.1 @@ -27,24 +27,28 @@ layout_mode = 2 [node name="Label" type="Label" parent="VBoxContainer"] layout_mode = 2 +size_flags_vertical = 3 text = "Some Text?" +horizontal_alignment = 1 +vertical_alignment = 1 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] layout_mode = 2 - -[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"] -layout_mode = 2 -text = "Confirm" +alignment = 2 [node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"] layout_mode = 2 text = "Cancel" +[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"] +layout_mode = 2 +text = "Confirm" + [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = SubResource("AudioStreamRandomizer_22wuj") bus = &"SFX" -[connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_button_mouse_entered"] -[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"] [connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_button_mouse_entered"] [connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"] +[connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_button_mouse_entered"] +[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"] diff --git a/Scenes/Menus/multiplayer_lobby.tscn b/Scenes/Menus/multiplayer_lobby.tscn index 23054c9..784692b 100644 --- a/Scenes/Menus/multiplayer_lobby.tscn +++ b/Scenes/Menus/multiplayer_lobby.tscn @@ -1,19 +1,18 @@ -[gd_scene load_steps=9 format=3 uid="uid://cwvprrvk4l2k0"] +[gd_scene load_steps=8 format=3 uid="uid://cwvprrvk4l2k0"] -[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://UI/new_theme.tres" id="1_l1spu"] [ext_resource type="Script" uid="uid://cvm4lyhx1uh0w" path="res://Scripts/multiplayer_lobby.gd" id="2_nb860"] -[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://Scenes/UI/scoreboard.tscn" id="3_f6bia"] +[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://UI/scoreboard.tscn" id="3_f6bia"] [ext_resource type="PackedScene" uid="uid://bvfit0sy2tnw4" path="res://Scenes/Menus/server_form.tscn" id="5_bqbwv"] -[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="6_wtqwd"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="7_6mhre"] -[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://Scenes/Menus/CharacterSelect/character_select.tscn" id="7_kawp7"] +[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://UI/chatbox.tscn" id="6_wtqwd"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="7_6mhre"] +[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://UI/Menus/CharacterSelect/character_select.tscn" id="7_kawp7"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_cwnde"] random_pitch = 1.1 streams_count = 1 stream_0/stream = ExtResource("7_6mhre") -[node name="multiplayer_lobby" type="Control" node_paths=PackedStringArray("server_form", "scoreboard", "chatbox", "ready_button", "audio_player")] +[node name="multiplayer_lobby" type="Control" node_paths=PackedStringArray("server_form", "chatbox", "audio_player")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -21,13 +20,10 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -theme = ExtResource("1_l1spu") script = ExtResource("2_nb860") server_form = NodePath("ServerForm") character_select_screen = ExtResource("7_kawp7") -scoreboard = NodePath("Scoreboard") chatbox = NodePath("Chatbox") -ready_button = NodePath("ReadyButton") audio_player = NodePath("AudioStreamPlayer") [node name="ServerForm" parent="." instance=ExtResource("5_bqbwv")] diff --git a/Scenes/Menus/server_form.tscn b/Scenes/Menus/server_form.tscn index a59bcda..c26f6d0 100644 --- a/Scenes/Menus/server_form.tscn +++ b/Scenes/Menus/server_form.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bvfit0sy2tnw4"] [ext_resource type="Script" uid="uid://dyyhbd2pbfygi" path="res://Scripts/server_form.gd" id="1_43oaq"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_hirre"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_hirre"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_3o7ni"] random_pitch = 1.1 diff --git a/Scenes/Menus/singleplayer_lobby.tscn b/Scenes/Menus/singleplayer_lobby.tscn index b036526..1a699c2 100644 --- a/Scenes/Menus/singleplayer_lobby.tscn +++ b/Scenes/Menus/singleplayer_lobby.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=7 format=3 uid="uid://176c6fuhg5ic"] +[gd_scene load_steps=6 format=3 uid="uid://176c6fuhg5ic"] -[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://UI/new_theme.tres" id="1_2aur6"] [ext_resource type="Script" uid="uid://e5gf7hd5jsw3" path="res://Scripts/singleplayer_lobby.gd" id="1_nd17k"] -[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="3_l8xy3"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="6_6nu57"] -[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://Scenes/Menus/CharacterSelect/character_select.tscn" id="6_ltm04"] +[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://UI/chatbox.tscn" id="3_l8xy3"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="6_6nu57"] +[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://UI/Menus/CharacterSelect/character_select.tscn" id="6_ltm04"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_g5har"] random_pitch = 1.1 @@ -19,7 +18,6 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -theme = ExtResource("1_2aur6") script = ExtResource("1_nd17k") character_select_screen = ExtResource("6_ltm04") chatbox = NodePath("Chatbox") @@ -27,6 +25,13 @@ audio_player = NodePath("AudioStreamPlayer") [node name="Chatbox" parent="." instance=ExtResource("3_l8xy3")] layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.02 +anchor_top = 0.65 +anchor_right = 0.4 +anchor_bottom = 0.98 +grow_horizontal = 1 +grow_vertical = 1 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = SubResource("AudioStreamRandomizer_g5har") diff --git a/Scenes/Menus/text_input_popup.tscn b/Scenes/Menus/text_input_popup.tscn index a82dd51..b46b9a6 100644 --- a/Scenes/Menus/text_input_popup.tscn +++ b/Scenes/Menus/text_input_popup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dccsyymk4uko6"] [ext_resource type="Script" uid="uid://b0asb3pmu8pqb" path="res://Scripts/text_input_popup.gd" id="1_ve6eb"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_mec4u"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_mec4u"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_w0x7l"] random_pitch = 1.1 diff --git a/remix_table.gd b/Scenes/MixingTable/remix_table.gd similarity index 100% rename from remix_table.gd rename to Scenes/MixingTable/remix_table.gd diff --git a/remix_table.gd.uid b/Scenes/MixingTable/remix_table.gd.uid similarity index 100% rename from remix_table.gd.uid rename to Scenes/MixingTable/remix_table.gd.uid diff --git a/remix_table.tscn b/Scenes/MixingTable/remix_table.tscn similarity index 92% rename from remix_table.tscn rename to Scenes/MixingTable/remix_table.tscn index ae037d8..c117c96 100644 --- a/remix_table.tscn +++ b/Scenes/MixingTable/remix_table.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://c6isprnkaliqr"] -[ext_resource type="Script" uid="uid://bpvmvx10q4ayd" path="res://remix_table.gd" id="1_q8doq"] -[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://track_editor.tscn" id="2_ibyhf"] +[ext_resource type="Script" uid="uid://bpvmvx10q4ayd" path="res://Scenes/MixingTable/remix_table.gd" id="1_q8doq"] +[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://UI/Menus/MixingMenu/track_editor.tscn" id="2_ibyhf"] [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="2_mjah6"] [sub_resource type="BoxShape3D" id="BoxShape3D_ibyhf"] diff --git a/Scenes/ShopStand/shop_stand.tscn b/Scenes/ShopStand/shop_stand.tscn index e7062af..000a630 100644 --- a/Scenes/ShopStand/shop_stand.tscn +++ b/Scenes/ShopStand/shop_stand.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://colk6js4wet11" path="res://Scenes/ShopStand/shop_stand.gd" id="1_4in53"] [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="1_x8sts"] [ext_resource type="PackedScene" uid="uid://dsasunnk47n8o" path="res://Scenes/item_card.tscn" id="2_qh00w"] -[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="3_u7x2f"] +[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="3_u7x2f"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lhc2g"] albedo_color = Color(0.313726, 0.180392, 0.00392157, 1) diff --git a/Scenes/UI/drop_003.ogg.import b/Scenes/UI/drop_003.ogg.import deleted file mode 100644 index 04b26ea..0000000 --- a/Scenes/UI/drop_003.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cp6ph4ra7u5rk" -path="res://.godot/imported/drop_003.ogg-b1448cf24bb17e683ffb9af8ac49fa5f.oggvorbisstr" - -[deps] - -source_file="res://Scenes/UI/drop_003.ogg" -dest_files=["res://.godot/imported/drop_003.ogg-b1448cf24bb17e683ffb9af8ac49fa5f.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/Scripts/confirmation_popup.gd b/Scripts/confirmation_popup.gd index 539afbf..10de507 100644 --- a/Scripts/confirmation_popup.gd +++ b/Scripts/confirmation_popup.gd @@ -4,9 +4,9 @@ extends PanelContainer signal completed(outcome: bool) func set_popup(prompt_text: String, confirm_text: String, cancel_text: String) -> void: - $VBoxContainer/Label.text = prompt_text - $VBoxContainer/HBoxContainer/Confirm.text = confirm_text - $VBoxContainer/HBoxContainer/Cancel.text = cancel_text + $VBoxContainer/Label.text = tr(prompt_text) + $VBoxContainer/HBoxContainer/Confirm.text = tr(confirm_text) + $VBoxContainer/HBoxContainer/Cancel.text = tr(cancel_text) func _on_confirm_pressed() -> void: diff --git a/Scripts/game.gd b/Scripts/game.gd index 2d716dd..4ee71c7 100644 --- a/Scripts/game.gd +++ b/Scripts/game.gd @@ -168,7 +168,7 @@ func set_upcoming_wave() -> void: func temp_set_upcoming_wave(new_wave: Wave, coins: int) -> void: pot = coins - connected_players_nodes[multiplayer.get_unique_id()].hud.show_wave_generation_anim(new_wave) + #connected_players_nodes[multiplayer.get_unique_id()].hud.show_wave_generation_anim(new_wave) connected_players_nodes[multiplayer.get_unique_id()].hud.set_upcoming_wave(new_wave.to_dict()) #TODO: You'll probably have to write a to_dict function for the new wave system diff --git a/Scripts/pickup_notification.gd b/Scripts/pickup_notification.gd index 07b2f51..a82e0e9 100644 --- a/Scripts/pickup_notification.gd +++ b/Scripts/pickup_notification.gd @@ -2,7 +2,6 @@ class_name PickupNotification extends PanelContainer @export var fade_out_time: float -@export var style: StyleBoxFlat @export var text_style: Color @export var common_background: Color @export var uncommon_background: Color @@ -15,19 +14,17 @@ var fading: bool = false func _ready() -> void: - add_theme_stylebox_override("panel", style) - $HBoxContainer/Label.add_theme_color_override("font_color", text_style) - $HBoxContainer/Label2.add_theme_color_override("font_color", text_style) $Timer.start() func _process(delta: float) -> void: if fading: fade_time += delta - style.bg_color.a = lerp(200.0 / 255.0, 0.0, fade_time / fade_out_time) - text_style.a = lerp(220.0 / 255.0, 0.0, fade_time / fade_out_time) - $HBoxContainer/Label.add_theme_color_override("font_color", text_style) - $HBoxContainer/Label2.add_theme_color_override("font_color", text_style) + var mod_color: Color = Color.WHITE + mod_color.a = 1.0 - (fade_time / fade_out_time) + modulate = mod_color + #$HBoxContainer/Label.add_theme_color_override("font_color", text_style) + #$HBoxContainer/Label2.add_theme_color_override("font_color", text_style) if fade_time >= fade_out_time: queue_free() @@ -36,15 +33,15 @@ func set_card(card: Card) -> void: $HBoxContainer/Label.text = tr(card.display_name) match(card.rarity): Data.Rarity.COMMON: - style.bg_color = common_background + $HBoxContainer/Label.add_theme_color_override("font_color", common_background) Data.Rarity.UNCOMMON: - style.bg_color = uncommon_background + $HBoxContainer/Label.add_theme_color_override("font_color", uncommon_background) Data.Rarity.RARE: - style.bg_color = rare_background + $HBoxContainer/Label.add_theme_color_override("font_color", rare_background) Data.Rarity.EPIC: - style.bg_color = epic_background + $HBoxContainer/Label.add_theme_color_override("font_color", epic_background) Data.Rarity.LEGENDARY: - style.bg_color = legendary_background + $HBoxContainer/Label.add_theme_color_override("font_color", legendary_background) func _on_timer_timeout() -> void: diff --git a/Scripts/status_effector.gd b/Scripts/status_effector.gd index f3deeb0..0416d90 100644 --- a/Scripts/status_effector.gd +++ b/Scripts/status_effector.gd @@ -4,7 +4,7 @@ extends Node @export var sprite_container: Container ## Container that effect icons should be instantiated under var enemy: EnemyController ## Enemy Controller that this node should affect -var icon_scene: PackedScene = preload("res://Scenes/status_icon.tscn") +var icon_scene: PackedScene = preload("res://UI/status_icon.tscn") var immunities: Array[StatusEffect] = [] ## The set of status effects that this effector shouldn't apply var effects: Dictionary[StatusEffect, int] = {} var icons: Dictionary[StatusEffect, TextureRect] = {} diff --git a/crt_harrison.gdshader b/Shaders/crt_harrison.gdshader similarity index 100% rename from crt_harrison.gdshader rename to Shaders/crt_harrison.gdshader diff --git a/crt_harrison.gdshader.uid b/Shaders/crt_harrison.gdshader.uid similarity index 100% rename from crt_harrison.gdshader.uid rename to Shaders/crt_harrison.gdshader.uid diff --git a/Scripts/damage_particle.gd b/UI/DamageParticle/damage_particle.gd similarity index 100% rename from Scripts/damage_particle.gd rename to UI/DamageParticle/damage_particle.gd diff --git a/Scripts/damage_particle.gd.uid b/UI/DamageParticle/damage_particle.gd.uid similarity index 100% rename from Scripts/damage_particle.gd.uid rename to UI/DamageParticle/damage_particle.gd.uid diff --git a/Scenes/damage_particle.tscn b/UI/DamageParticle/damage_particle.tscn similarity index 94% rename from Scenes/damage_particle.tscn rename to UI/DamageParticle/damage_particle.tscn index ae43cd4..6a51419 100644 --- a/Scenes/damage_particle.tscn +++ b/UI/DamageParticle/damage_particle.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://cqtew0t8sttpm"] -[ext_resource type="Script" uid="uid://blt7umrgo3tfh" path="res://Scripts/damage_particle.gd" id="1_lgvaq"] +[ext_resource type="Script" uid="uid://blt7umrgo3tfh" path="res://UI/DamageParticle/damage_particle.gd" id="1_lgvaq"] [sub_resource type="ViewportTexture" id="ViewportTexture_ppqlh"] viewport_path = NodePath("SubViewport") diff --git a/Scripts/health_bar.gd b/UI/EnemyHealthBar/health_bar.gd similarity index 100% rename from Scripts/health_bar.gd rename to UI/EnemyHealthBar/health_bar.gd diff --git a/Scripts/health_bar.gd.uid b/UI/EnemyHealthBar/health_bar.gd.uid similarity index 100% rename from Scripts/health_bar.gd.uid rename to UI/EnemyHealthBar/health_bar.gd.uid diff --git a/Scenes/health_bar.tscn b/UI/EnemyHealthBar/health_bar.tscn similarity index 88% rename from Scenes/health_bar.tscn rename to UI/EnemyHealthBar/health_bar.tscn index d962dbf..80ed802 100644 --- a/Scenes/health_bar.tscn +++ b/UI/EnemyHealthBar/health_bar.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://hjq3nrnumklp"] [ext_resource type="Texture2D" uid="uid://r202vo47jw1q" path="res://Assets/Textures/enemyhealth.png" id="1_x8m88"] -[ext_resource type="Script" uid="uid://bf06es50d0flv" path="res://Scripts/health_bar.gd" id="2_m8c1f"] -[ext_resource type="Gradient" uid="uid://dx7auy3oqw82t" path="res://UI/health_bar_gradient.tres" id="3_dpmma"] +[ext_resource type="Script" uid="uid://bf06es50d0flv" path="res://UI/EnemyHealthBar/health_bar.gd" id="2_m8c1f"] +[ext_resource type="Gradient" uid="uid://dx7auy3oqw82t" path="res://UI/EnemyHealthBar/health_bar_gradient.tres" id="3_dpmma"] [node name="HealthBar" type="TextureProgressBar"] offset_right = 200.0 diff --git a/UI/health_bar_gradient.tres b/UI/EnemyHealthBar/health_bar_gradient.tres similarity index 100% rename from UI/health_bar_gradient.tres rename to UI/EnemyHealthBar/health_bar_gradient.tres diff --git a/UI/Enemy_icon.png b/UI/Enemy_icon.png new file mode 100644 index 0000000..afd73cb Binary files /dev/null and b/UI/Enemy_icon.png differ diff --git a/screencap.png.import b/UI/Enemy_icon.png.import similarity index 74% rename from screencap.png.import rename to UI/Enemy_icon.png.import index b1daa84..5f6ae5e 100644 --- a/screencap.png.import +++ b/UI/Enemy_icon.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d1v5d8goaf7mu" -path="res://.godot/imported/screencap.png-3297cf7556450392792667332cdef39f.ctex" +uid="uid://doqfkinrjw4mt" +path="res://.godot/imported/Enemy_icon.png-e3ec1e1b7e954feb5c5ab49627db4832.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://screencap.png" -dest_files=["res://.godot/imported/screencap.png-3297cf7556450392792667332cdef39f.ctex"] +source_file="res://UI/Enemy_icon.png" +dest_files=["res://.godot/imported/Enemy_icon.png-e3ec1e1b7e954feb5c5ab49627db4832.ctex"] [params] diff --git a/energy_pips.gd b/UI/EnergyPipUI/energy_pips.gd similarity index 100% rename from energy_pips.gd rename to UI/EnergyPipUI/energy_pips.gd diff --git a/energy_pips.gd.uid b/UI/EnergyPipUI/energy_pips.gd.uid similarity index 100% rename from energy_pips.gd.uid rename to UI/EnergyPipUI/energy_pips.gd.uid diff --git a/energy_pips.tscn b/UI/EnergyPipUI/energy_pips.tscn similarity index 88% rename from energy_pips.tscn rename to UI/EnergyPipUI/energy_pips.tscn index 986f736..f9b232b 100644 --- a/energy_pips.tscn +++ b/UI/EnergyPipUI/energy_pips.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://q73cllewm7pj"] -[ext_resource type="Script" uid="uid://cvdb5y5wmkvmm" path="res://energy_pips.gd" id="1_6l017"] -[ext_resource type="Texture2D" uid="uid://h1m3ss2ln5hq" path="res://energy_sheet.png" id="2_q2m70"] +[ext_resource type="Script" uid="uid://cvdb5y5wmkvmm" path="res://UI/EnergyPipUI/energy_pips.gd" id="1_6l017"] +[ext_resource type="Texture2D" uid="uid://h1m3ss2ln5hq" path="res://UI/EnergyPipUI/energy_sheet.png" id="2_q2m70"] [sub_resource type="AtlasTexture" id="AtlasTexture_46jyx"] atlas = ExtResource("2_q2m70") diff --git a/energy_sheet.png b/UI/EnergyPipUI/energy_sheet.png similarity index 100% rename from energy_sheet.png rename to UI/EnergyPipUI/energy_sheet.png diff --git a/energy_sheet.png.import b/UI/EnergyPipUI/energy_sheet.png.import similarity index 76% rename from energy_sheet.png.import rename to UI/EnergyPipUI/energy_sheet.png.import index 512a03a..60116c6 100644 --- a/energy_sheet.png.import +++ b/UI/EnergyPipUI/energy_sheet.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://h1m3ss2ln5hq" -path="res://.godot/imported/energy_sheet.png-cce4e01dae5f3c3cc83f0e4b096ce208.ctex" +path="res://.godot/imported/energy_sheet.png-3d8e008c2b32340e3af87512f5cd5773.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://energy_sheet.png" -dest_files=["res://.godot/imported/energy_sheet.png-cce4e01dae5f3c3cc83f0e4b096ce208.ctex"] +source_file="res://UI/EnergyPipUI/energy_sheet.png" +dest_files=["res://.godot/imported/energy_sheet.png-3d8e008c2b32340e3af87512f5cd5773.ctex"] [params] diff --git a/feature_ui.gd b/UI/FeatureUI/feature_ui.gd similarity index 100% rename from feature_ui.gd rename to UI/FeatureUI/feature_ui.gd diff --git a/feature_ui.gd.uid b/UI/FeatureUI/feature_ui.gd.uid similarity index 100% rename from feature_ui.gd.uid rename to UI/FeatureUI/feature_ui.gd.uid diff --git a/feature_ui.tscn b/UI/FeatureUI/feature_ui.tscn similarity index 95% rename from feature_ui.tscn rename to UI/FeatureUI/feature_ui.tscn index 6d5f937..5c188ff 100644 --- a/feature_ui.tscn +++ b/UI/FeatureUI/feature_ui.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://c8xdsg6gtwvh3"] -[ext_resource type="Script" uid="uid://o668c5lfhgm5" path="res://feature_ui.gd" id="1_tms0v"] +[ext_resource type="Script" uid="uid://o668c5lfhgm5" path="res://UI/FeatureUI/feature_ui.gd" id="1_tms0v"] [ext_resource type="Texture2D" uid="uid://cps7onfe2s1gi" path="res://Scripts/Features/Radar/radar_icon.png" id="2_w6jf0"] [node name="FeatureUI" type="VBoxContainer" node_paths=PackedStringArray("icon", "name_label")] diff --git a/UI/HotWheelUI/hot_wheel.gd b/UI/HotWheelUI/hot_wheel.gd new file mode 100644 index 0000000..4dc5eb1 --- /dev/null +++ b/UI/HotWheelUI/hot_wheel.gd @@ -0,0 +1,39 @@ +class_name HotWheel +extends HBoxContainer + +@export var buttons: Array[Button] + + +func update_cassettes(cassettes: Array[Card]) -> void: + var entry_count: int = cassettes.size() + buttons[0].visible = true + buttons[1].visible = true + buttons[2].visible = true + buttons[3].visible = true + buttons[4].visible = true + if entry_count < 1: + buttons[0].visible = false + buttons[1].visible = false + buttons[2].visible = false + buttons[3].visible = false + buttons[4].visible = false + elif entry_count < 2: + buttons[0].visible = false + buttons[1].visible = false + buttons[3].visible = false + buttons[4].visible = false + elif entry_count < 4: + buttons[0].visible = false + buttons[4].visible = false + if entry_count >= 1: + buttons[2].icon = cassettes[0].icon + if entry_count >= 2: + buttons[1].icon = cassettes[1].icon + buttons[3].icon = cassettes[1].icon + if entry_count >= 3: + buttons[3].icon = cassettes[2].icon + if entry_count >= 4: + buttons[0].icon = cassettes[3].icon + buttons[4].icon = cassettes[3].icon + if entry_count >= 5: + buttons[4].icon = cassettes[4].icon diff --git a/hot_wheel.gd.uid b/UI/HotWheelUI/hot_wheel.gd.uid similarity index 100% rename from hot_wheel.gd.uid rename to UI/HotWheelUI/hot_wheel.gd.uid diff --git a/UI/HotWheelUI/hot_wheel.tscn b/UI/HotWheelUI/hot_wheel.tscn new file mode 100644 index 0000000..b4d09b4 --- /dev/null +++ b/UI/HotWheelUI/hot_wheel.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=3 format=3 uid="uid://ga21hoa8fxmm"] + +[ext_resource type="Script" uid="uid://laoxiep4e5x0" path="res://UI/HotWheelUI/hot_wheel.gd" id="1_2sjpl"] +[ext_resource type="Texture2D" uid="uid://bpcyxdpog3w85" path="res://Assets/Textures/assault_icon.png" id="2_7sdlw"] + +[node name="HotWheel" type="HBoxContainer" node_paths=PackedStringArray("buttons")] +alignment = 1 +script = ExtResource("1_2sjpl") +buttons = [NodePath("Button4"), NodePath("Button5"), NodePath("Button"), NodePath("Button2"), NodePath("Button3")] + +[node name="Button4" type="Button" parent="."] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +size_flags_vertical = 8 +toggle_mode = true +icon = ExtResource("2_7sdlw") +icon_alignment = 1 +expand_icon = true + +[node name="Button5" type="Button" parent="."] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +size_flags_vertical = 8 +toggle_mode = true +icon = ExtResource("2_7sdlw") +icon_alignment = 1 +expand_icon = true + +[node name="Button" type="Button" parent="."] +custom_minimum_size = Vector2(48, 48) +layout_mode = 2 +toggle_mode = true +button_pressed = true +icon = ExtResource("2_7sdlw") +icon_alignment = 1 +expand_icon = true + +[node name="Button2" type="Button" parent="."] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +size_flags_vertical = 8 +toggle_mode = true +icon = ExtResource("2_7sdlw") +icon_alignment = 1 +expand_icon = true + +[node name="Button3" type="Button" parent="."] +custom_minimum_size = Vector2(32, 32) +layout_mode = 2 +size_flags_vertical = 8 +toggle_mode = true +icon = ExtResource("2_7sdlw") +icon_alignment = 1 +expand_icon = true diff --git a/Scenes/Menus/CharacterSelect/character_podium.gd b/UI/Menus/CharacterSelect/character_podium.gd similarity index 100% rename from Scenes/Menus/CharacterSelect/character_podium.gd rename to UI/Menus/CharacterSelect/character_podium.gd diff --git a/Scenes/Menus/CharacterSelect/character_podium.gd.uid b/UI/Menus/CharacterSelect/character_podium.gd.uid similarity index 100% rename from Scenes/Menus/CharacterSelect/character_podium.gd.uid rename to UI/Menus/CharacterSelect/character_podium.gd.uid diff --git a/Scenes/Menus/CharacterSelect/character_preview.gd b/UI/Menus/CharacterSelect/character_preview.gd similarity index 100% rename from Scenes/Menus/CharacterSelect/character_preview.gd rename to UI/Menus/CharacterSelect/character_preview.gd diff --git a/Scenes/Menus/CharacterSelect/character_preview.gd.uid b/UI/Menus/CharacterSelect/character_preview.gd.uid similarity index 100% rename from Scenes/Menus/CharacterSelect/character_preview.gd.uid rename to UI/Menus/CharacterSelect/character_preview.gd.uid diff --git a/Scenes/Menus/CharacterSelect/character_select.gd b/UI/Menus/CharacterSelect/character_select.gd similarity index 100% rename from Scenes/Menus/CharacterSelect/character_select.gd rename to UI/Menus/CharacterSelect/character_select.gd diff --git a/Scenes/Menus/CharacterSelect/character_select.gd.uid b/UI/Menus/CharacterSelect/character_select.gd.uid similarity index 100% rename from Scenes/Menus/CharacterSelect/character_select.gd.uid rename to UI/Menus/CharacterSelect/character_select.gd.uid diff --git a/Scenes/Menus/CharacterSelect/character_select.tscn b/UI/Menus/CharacterSelect/character_select.tscn similarity index 96% rename from Scenes/Menus/CharacterSelect/character_select.tscn rename to UI/Menus/CharacterSelect/character_select.tscn index 6d2d7e3..b0a34d8 100644 --- a/Scenes/Menus/CharacterSelect/character_select.tscn +++ b/UI/Menus/CharacterSelect/character_select.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://bc6m3cluulpis"] -[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://Scenes/Menus/CharacterSelect/character_select.gd" id="1_lqqhx"] -[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://Scenes/Menus/CharacterSelect/character_preview.gd" id="9_8d0rx"] +[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://UI/Menus/CharacterSelect/character_select.gd" id="1_lqqhx"] +[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://UI/Menus/CharacterSelect/character_preview.gd" id="9_8d0rx"] [ext_resource type="PackedScene" uid="uid://clabkhnbn75rf" path="res://UI/tower_label.tscn" id="10_jdigy"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_tlgw2"] diff --git a/UI/enemybox.gd b/UI/Menus/GameEndScreen/enemy_row.gd similarity index 100% rename from UI/enemybox.gd rename to UI/Menus/GameEndScreen/enemy_row.gd diff --git a/UI/enemybox.gd.uid b/UI/Menus/GameEndScreen/enemy_row.gd.uid similarity index 100% rename from UI/enemybox.gd.uid rename to UI/Menus/GameEndScreen/enemy_row.gd.uid diff --git a/UI/h_box_container.tscn b/UI/Menus/GameEndScreen/enemy_row.tscn similarity index 61% rename from UI/h_box_container.tscn rename to UI/Menus/GameEndScreen/enemy_row.tscn index c1000da..8335029 100644 --- a/UI/h_box_container.tscn +++ b/UI/Menus/GameEndScreen/enemy_row.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=2 format=3 uid="uid://b5hp43bm07b8a"] -[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://UI/enemybox.gd" id="1_lcu0c"] +[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://UI/Menus/GameEndScreen/enemy_row.gd" id="1_th4b3"] -[node name="HBoxContainer" type="HBoxContainer"] -script = ExtResource("1_lcu0c") +[node name="EnemyRow" type="HBoxContainer"] +script = ExtResource("1_th4b3") [node name="WaveLabel" type="Label" parent="."] layout_mode = 2 diff --git a/Scenes/Menus/GameEndScreen/game_end_screen.gd b/UI/Menus/GameEndScreen/game_end_screen.gd similarity index 96% rename from Scenes/Menus/GameEndScreen/game_end_screen.gd rename to UI/Menus/GameEndScreen/game_end_screen.gd index 74a688b..dfa757b 100644 --- a/Scenes/Menus/GameEndScreen/game_end_screen.gd +++ b/UI/Menus/GameEndScreen/game_end_screen.gd @@ -17,6 +17,11 @@ func _ready() -> void: total_games_label.text = str(Data.save_data.wins + Data.save_data.losses) total_wins_label.text = str(Data.save_data.wins) total_losses_label.text = str(Data.save_data.losses) + if game_manager: + set_wave() + + +func set_wave() -> void: for wave_key: int in game_manager.stats.enemies_undefeated: var spawned_box: EnemyBox = box.instantiate() as EnemyBox undefeated_enemies.add_child(spawned_box) diff --git a/Scenes/Menus/GameEndScreen/game_end_screen.gd.uid b/UI/Menus/GameEndScreen/game_end_screen.gd.uid similarity index 100% rename from Scenes/Menus/GameEndScreen/game_end_screen.gd.uid rename to UI/Menus/GameEndScreen/game_end_screen.gd.uid diff --git a/Scenes/Menus/GameEndScreen/game_end_screen.tscn b/UI/Menus/GameEndScreen/game_end_screen.tscn similarity index 96% rename from Scenes/Menus/GameEndScreen/game_end_screen.tscn rename to UI/Menus/GameEndScreen/game_end_screen.tscn index b987019..4d40671 100644 --- a/Scenes/Menus/GameEndScreen/game_end_screen.tscn +++ b/UI/Menus/GameEndScreen/game_end_screen.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=3 uid="uid://ce0m8vbjbng6o"] -[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://Scenes/Menus/GameEndScreen/game_end_screen.gd" id="1_oa7nq"] -[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://UI/h_box_container.tscn" id="2_xm8em"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="3_ro1yg"] +[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://UI/Menus/GameEndScreen/game_end_screen.gd" id="1_oa7nq"] +[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://UI/Menus/GameEndScreen/enemy_row.tscn" id="2_xm8em"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="3_ro1yg"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dram5"] random_pitch = 1.1 diff --git a/Scenes/Menus/MainMenu/achievements_menu.gd b/UI/Menus/MainMenu/achievements_menu.gd similarity index 100% rename from Scenes/Menus/MainMenu/achievements_menu.gd rename to UI/Menus/MainMenu/achievements_menu.gd diff --git a/Scenes/Menus/MainMenu/achievements_menu.gd.uid b/UI/Menus/MainMenu/achievements_menu.gd.uid similarity index 100% rename from Scenes/Menus/MainMenu/achievements_menu.gd.uid rename to UI/Menus/MainMenu/achievements_menu.gd.uid diff --git a/Scenes/Menus/MainMenu/main_menu.gd b/UI/Menus/MainMenu/main_menu.gd similarity index 97% rename from Scenes/Menus/MainMenu/main_menu.gd rename to UI/Menus/MainMenu/main_menu.gd index 37a0f7f..915d6b1 100644 --- a/Scenes/Menus/MainMenu/main_menu.gd +++ b/UI/Menus/MainMenu/main_menu.gd @@ -16,7 +16,7 @@ var gamemode: GameMode = GameMode.new() var confirmation_popup_scene: PackedScene = preload("res://Scenes/Menus/confirmation_popup.tscn") var text_input_popup_scene: PackedScene = preload("res://Scenes/Menus/text_input_popup.tscn") var multiplayer_lobby_scene_path: String = "res://Scenes/multiplayer_lobby.tscn" -var options_menu_scene: PackedScene = preload("res://Scenes/Menus/options_menu.tscn") +var options_menu_scene: PackedScene = preload("res://UI/Menus/OptionsMenu/options_menu.tscn") var temp_data: SaveData @@ -58,7 +58,7 @@ func change_profile_display_name(display_name: String) -> void: func _on_quit_button_pressed() -> void: var popup: ConfirmationPopup = confirmation_popup_scene.instantiate() as ConfirmationPopup - popup.set_popup("Are you sure you want to quit?", "Yes", "No") + popup.set_popup("PROMPT_QUIT", "BUTTON_CONFIRM", "BUTTON_CANCEL") popup.completed.connect(quit_game) add_child(popup) diff --git a/Scenes/Menus/MainMenu/main_menu.gd.uid b/UI/Menus/MainMenu/main_menu.gd.uid similarity index 100% rename from Scenes/Menus/MainMenu/main_menu.gd.uid rename to UI/Menus/MainMenu/main_menu.gd.uid diff --git a/Scenes/Menus/MainMenu/main_menu.tscn b/UI/Menus/MainMenu/main_menu.tscn similarity index 98% rename from Scenes/Menus/MainMenu/main_menu.tscn rename to UI/Menus/MainMenu/main_menu.tscn index 1593a60..b10e4e1 100644 --- a/Scenes/Menus/MainMenu/main_menu.tscn +++ b/UI/Menus/MainMenu/main_menu.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=12 format=3 uid="uid://8yv7excojcg0"] -[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://Scenes/Menus/MainMenu/main_menu.gd" id="2_ivytu"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="5_cwn2i"] +[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://UI/Menus/MainMenu/main_menu.gd" id="2_ivytu"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="5_cwn2i"] [ext_resource type="Texture2D" uid="uid://cr1ucbuw3iotp" path="res://Assets/Textures/first_win_achievements.png" id="15_74epv"] -[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://Scenes/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"] +[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://UI/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"] [ext_resource type="Texture2D" uid="uid://cpa1hl36xfplg" path="res://Assets/Textures/first_scroll_seen.png" id="16_sv1gy"] [ext_resource type="Texture2D" uid="uid://ctbi3gm1me1t5" path="res://Assets/Textures/unlock_mage_achievement.png" id="17_6t4jd"] [ext_resource type="Script" uid="uid://cxrm2naq75jo1" path="res://Scripts/mod_menu.gd" id="19_6t4jd"] @@ -25,7 +25,7 @@ region = Rect2(0, 0, 36, 36) atlas = ExtResource("17_6t4jd") region = Rect2(0, 0, 36, 36) -[node name="MainMenu" type="Control" node_paths=PackedStringArray("bg_level", "game_select_menu", "main_controls", "seed_entry", "profile_controls", "mods_controls")] +[node name="MainMenu" type="Control" node_paths=PackedStringArray("game_select_menu", "main_controls", "seed_entry", "profile_controls", "mods_controls")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -33,7 +33,6 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("2_ivytu") -bg_level = NodePath("") game_select_menu = NodePath("GameSelectMenu") main_controls = NodePath("MainControls") seed_entry = NodePath("GameSelectMenu/VBoxContainer/HBoxContainer2/LineEdit") diff --git a/price_panel.gd b/UI/Menus/MixingMenu/price_panel.gd similarity index 100% rename from price_panel.gd rename to UI/Menus/MixingMenu/price_panel.gd diff --git a/price_panel.gd.uid b/UI/Menus/MixingMenu/price_panel.gd.uid similarity index 100% rename from price_panel.gd.uid rename to UI/Menus/MixingMenu/price_panel.gd.uid diff --git a/price_panel.tscn b/UI/Menus/MixingMenu/price_panel.tscn similarity index 93% rename from price_panel.tscn rename to UI/Menus/MixingMenu/price_panel.tscn index daf854c..328c5e7 100644 --- a/price_panel.tscn +++ b/UI/Menus/MixingMenu/price_panel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dekexkjl37dvh"] -[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://price_panel.gd" id="1_sn84y"] +[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://UI/Menus/MixingMenu/price_panel.gd" id="1_sn84y"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_517dt"] bg_color = Color(0.2702219, 0.27022195, 0.27022177, 0.09019608) diff --git a/track_editor.gd b/UI/Menus/MixingMenu/track_editor.gd similarity index 100% rename from track_editor.gd rename to UI/Menus/MixingMenu/track_editor.gd diff --git a/track_editor.gd.uid b/UI/Menus/MixingMenu/track_editor.gd.uid similarity index 100% rename from track_editor.gd.uid rename to UI/Menus/MixingMenu/track_editor.gd.uid diff --git a/track_editor.tscn b/UI/Menus/MixingMenu/track_editor.tscn similarity index 82% rename from track_editor.tscn rename to UI/Menus/MixingMenu/track_editor.tscn index 8960094..e9cd821 100644 --- a/track_editor.tscn +++ b/UI/Menus/MixingMenu/track_editor.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://bajli4d3nqwll"] -[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://feature_ui.tscn" id="1_y6tpq"] -[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://track_editor.gd" id="1_yrnbk"] -[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://price_panel.tscn" id="3_48m6c"] -[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://card_description_ui.tscn" id="3_q6wwl"] -[ext_resource type="Texture2D" uid="uid://cll2vlvf1h454" path="res://track_one_patch.png" id="4_dya4i"] -[ext_resource type="Texture2D" uid="uid://cvhkk22pxxuqj" path="res://track_two_patch.png" id="5_4gmyw"] +[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://UI/FeatureUI/feature_ui.tscn" id="1_y6tpq"] +[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://UI/Menus/MixingMenu/track_editor.gd" id="1_yrnbk"] +[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://UI/Menus/MixingMenu/price_panel.tscn" id="3_48m6c"] +[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://UI/card_description_ui.tscn" id="3_q6wwl"] +[ext_resource type="Texture2D" uid="uid://cll2vlvf1h454" path="res://UI/Themes/Scale1/track_one_patch.png" id="4_dya4i"] +[ext_resource type="Texture2D" uid="uid://cvhkk22pxxuqj" path="res://UI/Themes/Scale1/track_two_patch.png" id="5_4gmyw"] [node name="TrackEditor" type="Control" node_paths=PackedStringArray("drag_feature", "sample_library", "tower_parts", "weapon_parts", "drop_down", "card_desc", "price_label", "money_label", "confirm_button", "switch_button")] layout_mode = 3 @@ -18,8 +18,8 @@ script = ExtResource("1_yrnbk") drag_feature = NodePath("FeatureUI") sample_library = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer2/SamplePanel/ScrollContainer/SampleLibrary") feature_scene = ExtResource("1_y6tpq") -tower_parts = NodePath("PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer/MarginContainer/TowerParts") -weapon_parts = NodePath("PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer/MarginContainer/WeaponParts") +tower_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower/MarginContainer/TowerParts") +weapon_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon/MarginContainer/WeaponParts") drop_down = NodePath("PanelContainer/VBoxContainer/Tracks/SourceCartridge/CassetteSelector/OptionButton") card_desc = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer/DescriptionVBox") price_panel_scene = ExtResource("3_48m6c") @@ -53,7 +53,6 @@ size_flags_vertical = 3 [node name="SourceCartridge" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"] layout_mode = 2 -size_flags_vertical = 3 [node name="MarginContainer2" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/SourceCartridge"] layout_mode = 2 @@ -90,23 +89,38 @@ text = "Price: $0" horizontal_alignment = 1 vertical_alignment = 1 -[node name="TowerTrack" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"] +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"] layout_mode = 2 -size_flags_vertical = 3 -[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack"] +[node name="Labels" type="VBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer"] +layout_mode = 2 + +[node name="Tower" type="Label" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/Labels"] layout_mode = 2 size_flags_horizontal = 3 +size_flags_vertical = 7 text = "LABEL_TOWER_TRACK" horizontal_alignment = 1 vertical_alignment = 1 -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack"] +[node name="Weapon" type="Label" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/Labels"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 7 +text = "LABEL_WEAPON_TRACK" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="TrackUIs" type="VBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 + +[node name="Tower" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs"] layout_mode = 2 size_flags_horizontal = 3 size_flags_stretch_ratio = 4.0 -[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer"] +[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower"] layout_mode = 2 texture = ExtResource("5_4gmyw") patch_margin_left = 1 @@ -114,39 +128,24 @@ patch_margin_top = 1 patch_margin_right = 1 patch_margin_bottom = 1 -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer"] +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower"] layout_mode = 2 theme_override_constants/margin_left = 4 theme_override_constants/margin_top = 4 theme_override_constants/margin_right = 4 theme_override_constants/margin_bottom = 4 -[node name="TowerParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer/MarginContainer"] +[node name="TowerParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower/MarginContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks"] -layout_mode = 2 -theme_override_constants/margin_top = 10 - -[node name="WeaponTrack" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"] -layout_mode = 2 -size_flags_vertical = 3 - -[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack"] -layout_mode = 2 -size_flags_horizontal = 3 -text = "LABEL_WEAPON_TRACK" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack"] +[node name="Weapon" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs"] layout_mode = 2 size_flags_horizontal = 3 size_flags_stretch_ratio = 4.0 -[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer"] +[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon"] layout_mode = 2 texture = ExtResource("4_dya4i") patch_margin_left = 1 @@ -154,23 +153,18 @@ patch_margin_top = 1 patch_margin_right = 1 patch_margin_bottom = 1 -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer"] +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon"] layout_mode = 2 theme_override_constants/margin_left = 4 theme_override_constants/margin_top = 4 theme_override_constants/margin_right = 4 theme_override_constants/margin_bottom = 4 -[node name="WeaponParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer/MarginContainer"] +[node name="WeaponParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon/MarginContainer"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 3 -size_flags_stretch_ratio = 0.1 - [node name="InfoPanel" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 diff --git a/Scripts/audio_options.gd b/UI/Menus/OptionsMenu/audio_options.gd similarity index 100% rename from Scripts/audio_options.gd rename to UI/Menus/OptionsMenu/audio_options.gd diff --git a/Scripts/audio_options.gd.uid b/UI/Menus/OptionsMenu/audio_options.gd.uid similarity index 100% rename from Scripts/audio_options.gd.uid rename to UI/Menus/OptionsMenu/audio_options.gd.uid diff --git a/Scenes/Menus/audio_options.tscn b/UI/Menus/OptionsMenu/audio_options.tscn similarity index 98% rename from Scenes/Menus/audio_options.tscn rename to UI/Menus/OptionsMenu/audio_options.tscn index 2bbb9e5..e07aaf3 100644 --- a/Scenes/Menus/audio_options.tscn +++ b/UI/Menus/OptionsMenu/audio_options.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bwc45ogto8thn"] -[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://Scripts/audio_options.gd" id="1_avc0j"] +[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://UI/Menus/OptionsMenu/audio_options.gd" id="1_avc0j"] [sub_resource type="ImageTexture" id="ImageTexture_hvvdd"] diff --git a/Scripts/gameplay_options.gd b/UI/Menus/OptionsMenu/gameplay_options.gd similarity index 100% rename from Scripts/gameplay_options.gd rename to UI/Menus/OptionsMenu/gameplay_options.gd diff --git a/Scripts/gameplay_options.gd.uid b/UI/Menus/OptionsMenu/gameplay_options.gd.uid similarity index 100% rename from Scripts/gameplay_options.gd.uid rename to UI/Menus/OptionsMenu/gameplay_options.gd.uid diff --git a/Scenes/Menus/gameplay_options.tscn b/UI/Menus/OptionsMenu/gameplay_options.tscn similarity index 98% rename from Scenes/Menus/gameplay_options.tscn rename to UI/Menus/OptionsMenu/gameplay_options.tscn index 8f676a2..cc6f711 100644 --- a/Scenes/Menus/gameplay_options.tscn +++ b/UI/Menus/OptionsMenu/gameplay_options.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bjk7jf0bau5lv"] -[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://Scripts/gameplay_options.gd" id="1_sy26f"] +[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://UI/Menus/OptionsMenu/gameplay_options.gd" id="1_sy26f"] [sub_resource type="ImageTexture" id="ImageTexture_03x6q"] @@ -68,6 +68,7 @@ size_flags_horizontal = 3 [node name="CheckButton" type="CheckButton" parent="ToggleSprint/CenterContainer"] layout_mode = 2 size_flags_horizontal = 3 +flat = true [node name="InvertMouseY" type="HBoxContainer" parent="."] layout_mode = 2 @@ -86,6 +87,7 @@ size_flags_horizontal = 3 [node name="CheckButton" type="CheckButton" parent="InvertMouseY/CenterContainer"] layout_mode = 2 size_flags_horizontal = 3 +flat = true [node name="InvertMouseX" type="HBoxContainer" parent="."] layout_mode = 2 @@ -104,6 +106,7 @@ size_flags_horizontal = 3 [node name="CheckButton" type="CheckButton" parent="InvertMouseX/CenterContainer"] layout_mode = 2 size_flags_horizontal = 3 +flat = true [node name="FixedMinimap" type="HBoxContainer" parent="."] layout_mode = 2 @@ -121,6 +124,7 @@ size_flags_horizontal = 3 [node name="CheckButton" type="CheckButton" parent="FixedMinimap/CenterContainer"] layout_mode = 2 +flat = true [node name="FloatingDamageIndicators" type="HBoxContainer" parent="."] layout_mode = 2 diff --git a/Scripts/graphics_options.gd b/UI/Menus/OptionsMenu/graphics_options.gd similarity index 100% rename from Scripts/graphics_options.gd rename to UI/Menus/OptionsMenu/graphics_options.gd diff --git a/Scripts/graphics_options.gd.uid b/UI/Menus/OptionsMenu/graphics_options.gd.uid similarity index 100% rename from Scripts/graphics_options.gd.uid rename to UI/Menus/OptionsMenu/graphics_options.gd.uid diff --git a/Scenes/Menus/graphics_options.tscn b/UI/Menus/OptionsMenu/graphics_options.tscn similarity index 98% rename from Scenes/Menus/graphics_options.tscn rename to UI/Menus/OptionsMenu/graphics_options.tscn index e291b91..38099ec 100644 --- a/Scenes/Menus/graphics_options.tscn +++ b/UI/Menus/OptionsMenu/graphics_options.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://bmd4mawasoc11"] -[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://Scripts/graphics_options.gd" id="1_85rh6"] +[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://UI/Menus/OptionsMenu/graphics_options.gd" id="1_85rh6"] [sub_resource type="ImageTexture" id="ImageTexture_03x6q"] diff --git a/UI/KeybindEntry.gd b/UI/Menus/OptionsMenu/keybind_entry.gd similarity index 100% rename from UI/KeybindEntry.gd rename to UI/Menus/OptionsMenu/keybind_entry.gd diff --git a/UI/KeybindEntry.gd.uid b/UI/Menus/OptionsMenu/keybind_entry.gd.uid similarity index 100% rename from UI/KeybindEntry.gd.uid rename to UI/Menus/OptionsMenu/keybind_entry.gd.uid diff --git a/Scenes/UI/keybind_entry.tscn b/UI/Menus/OptionsMenu/keybind_entry.tscn similarity index 94% rename from Scenes/UI/keybind_entry.tscn rename to UI/Menus/OptionsMenu/keybind_entry.tscn index de0043f..ba65dcf 100644 --- a/Scenes/UI/keybind_entry.tscn +++ b/UI/Menus/OptionsMenu/keybind_entry.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cb8irvp2y2p6g"] -[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://UI/KeybindEntry.gd" id="1_it8q2"] +[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://UI/Menus/OptionsMenu/keybind_entry.gd" id="1_it8q2"] [node name="KeybindEntry" type="HBoxContainer"] anchors_preset = 15 diff --git a/Scripts/keybind_options.gd b/UI/Menus/OptionsMenu/keybind_options.gd similarity index 91% rename from Scripts/keybind_options.gd rename to UI/Menus/OptionsMenu/keybind_options.gd index fd4f65c..2b8e037 100644 --- a/Scripts/keybind_options.gd +++ b/UI/Menus/OptionsMenu/keybind_options.gd @@ -1,8 +1,8 @@ extends VBoxContainer class_name KeybindsOptionsMenu -var keybind_entry_scene: PackedScene = load("res://Scenes/UI/keybind_entry.tscn") -var keybind_popup: PackedScene = load("res://Scenes/UI/keybind_popup.tscn") +@export var keybind_entry_scene: PackedScene +@export var keybind_popup: PackedScene var keybind_boxes: Array[KeybindEntry] = [] var key_event: InputEvent var selected_entry: KeybindEntry diff --git a/Scripts/keybind_options.gd.uid b/UI/Menus/OptionsMenu/keybind_options.gd.uid similarity index 100% rename from Scripts/keybind_options.gd.uid rename to UI/Menus/OptionsMenu/keybind_options.gd.uid diff --git a/Scenes/Menus/keybind_options.tscn b/UI/Menus/OptionsMenu/keybind_options.tscn similarity index 54% rename from Scenes/Menus/keybind_options.tscn rename to UI/Menus/OptionsMenu/keybind_options.tscn index 40fc756..09495b8 100644 --- a/Scenes/Menus/keybind_options.tscn +++ b/UI/Menus/OptionsMenu/keybind_options.tscn @@ -1,6 +1,8 @@ -[gd_scene load_steps=2 format=3 uid="uid://bf2nosqt5f82e"] +[gd_scene load_steps=4 format=3 uid="uid://bf2nosqt5f82e"] -[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://Scripts/keybind_options.gd" id="1_oxg0p"] +[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://UI/Menus/OptionsMenu/keybind_options.gd" id="1_oxg0p"] +[ext_resource type="PackedScene" uid="uid://cb8irvp2y2p6g" path="res://UI/Menus/OptionsMenu/keybind_entry.tscn" id="2_ayiik"] +[ext_resource type="PackedScene" uid="uid://clsdko6ttudu8" path="res://UI/Menus/OptionsMenu/keybind_popup.tscn" id="3_h1scm"] [node name="Keybinds" type="VBoxContainer"] anchors_preset = 15 @@ -9,6 +11,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_oxg0p") +keybind_entry_scene = ExtResource("2_ayiik") +keybind_popup = ExtResource("3_h1scm") [node name="HBoxContainer" type="HBoxContainer" parent="."] layout_mode = 2 diff --git a/UI/keybind_screen.gd b/UI/Menus/OptionsMenu/keybind_popup.gd similarity index 100% rename from UI/keybind_screen.gd rename to UI/Menus/OptionsMenu/keybind_popup.gd diff --git a/UI/keybind_screen.gd.uid b/UI/Menus/OptionsMenu/keybind_popup.gd.uid similarity index 100% rename from UI/keybind_screen.gd.uid rename to UI/Menus/OptionsMenu/keybind_popup.gd.uid diff --git a/Scenes/UI/keybind_popup.tscn b/UI/Menus/OptionsMenu/keybind_popup.tscn similarity index 89% rename from Scenes/UI/keybind_popup.tscn rename to UI/Menus/OptionsMenu/keybind_popup.tscn index 37b55c8..1e5eb2d 100644 --- a/Scenes/UI/keybind_popup.tscn +++ b/UI/Menus/OptionsMenu/keybind_popup.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=2 format=3 uid="uid://clsdko6ttudu8"] -[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://UI/keybind_screen.gd" id="1_m5i0b"] +[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://UI/Menus/OptionsMenu/keybind_popup.gd" id="1_m5i0b"] -[node name="Control" type="Control"] +[node name="KeybindPopup" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 diff --git a/Scripts/keymap_data.gd b/UI/Menus/OptionsMenu/keymap_data.gd similarity index 100% rename from Scripts/keymap_data.gd rename to UI/Menus/OptionsMenu/keymap_data.gd diff --git a/Scripts/keymap_data.gd.uid b/UI/Menus/OptionsMenu/keymap_data.gd.uid similarity index 100% rename from Scripts/keymap_data.gd.uid rename to UI/Menus/OptionsMenu/keymap_data.gd.uid diff --git a/Scripts/options_menu.gd b/UI/Menus/OptionsMenu/options_menu.gd similarity index 100% rename from Scripts/options_menu.gd rename to UI/Menus/OptionsMenu/options_menu.gd diff --git a/Scripts/options_menu.gd.uid b/UI/Menus/OptionsMenu/options_menu.gd.uid similarity index 100% rename from Scripts/options_menu.gd.uid rename to UI/Menus/OptionsMenu/options_menu.gd.uid diff --git a/Scenes/Menus/options_menu.tscn b/UI/Menus/OptionsMenu/options_menu.tscn similarity index 89% rename from Scenes/Menus/options_menu.tscn rename to UI/Menus/OptionsMenu/options_menu.tscn index 66b3bc9..207e4cd 100644 --- a/Scenes/Menus/options_menu.tscn +++ b/UI/Menus/OptionsMenu/options_menu.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=8 format=3 uid="uid://clulh7v8c7h85"] -[ext_resource type="Script" uid="uid://48rvmybi18wj" path="res://Scripts/options_menu.gd" id="1_bievw"] -[ext_resource type="PackedScene" uid="uid://bjk7jf0bau5lv" path="res://Scenes/Menus/gameplay_options.tscn" id="3_25wuw"] -[ext_resource type="PackedScene" uid="uid://bmd4mawasoc11" path="res://Scenes/Menus/graphics_options.tscn" id="4_ckcvq"] -[ext_resource type="PackedScene" uid="uid://bf2nosqt5f82e" path="res://Scenes/Menus/keybind_options.tscn" id="5_4k33c"] -[ext_resource type="PackedScene" uid="uid://bwc45ogto8thn" path="res://Scenes/Menus/audio_options.tscn" id="6_4vs8p"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="6_hhyef"] +[ext_resource type="Script" uid="uid://48rvmybi18wj" path="res://UI/Menus/OptionsMenu/options_menu.gd" id="1_bievw"] +[ext_resource type="PackedScene" uid="uid://bjk7jf0bau5lv" path="res://UI/Menus/OptionsMenu/gameplay_options.tscn" id="3_25wuw"] +[ext_resource type="PackedScene" uid="uid://bmd4mawasoc11" path="res://UI/Menus/OptionsMenu/graphics_options.tscn" id="4_ckcvq"] +[ext_resource type="PackedScene" uid="uid://bf2nosqt5f82e" path="res://UI/Menus/OptionsMenu/keybind_options.tscn" id="5_4k33c"] +[ext_resource type="PackedScene" uid="uid://bwc45ogto8thn" path="res://UI/Menus/OptionsMenu/audio_options.tscn" id="6_4vs8p"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="6_hhyef"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_5otwj"] random_pitch = 1.1 diff --git a/Scenes/Menus/PauseMenu/pause_menu.gd b/UI/Menus/PauseMenu/pause_menu.gd similarity index 93% rename from Scenes/Menus/PauseMenu/pause_menu.gd rename to UI/Menus/PauseMenu/pause_menu.gd index 3a5742f..9b8d964 100644 --- a/Scenes/Menus/PauseMenu/pause_menu.gd +++ b/UI/Menus/PauseMenu/pause_menu.gd @@ -4,7 +4,7 @@ signal closed signal quit_to_main_menu_pressed signal quit_to_desktop_pressed -var options_menu_scene: PackedScene = preload("res://Scenes/Menus/options_menu.tscn") +var options_menu_scene: PackedScene = preload("res://UI/Menus/OptionsMenu/options_menu.tscn") var confirmation_popup_scene: PackedScene = preload("res://Scenes/Menus/confirmation_popup.tscn") var game_manager: GameManager diff --git a/Scenes/Menus/PauseMenu/pause_menu.gd.uid b/UI/Menus/PauseMenu/pause_menu.gd.uid similarity index 100% rename from Scenes/Menus/PauseMenu/pause_menu.gd.uid rename to UI/Menus/PauseMenu/pause_menu.gd.uid diff --git a/Scenes/Menus/PauseMenu/pause_menu.tscn b/UI/Menus/PauseMenu/pause_menu.tscn similarity index 96% rename from Scenes/Menus/PauseMenu/pause_menu.tscn rename to UI/Menus/PauseMenu/pause_menu.tscn index d700b5d..27138db 100644 --- a/Scenes/Menus/PauseMenu/pause_menu.tscn +++ b/UI/Menus/PauseMenu/pause_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://buvgdem68wtev"] -[ext_resource type="Script" uid="uid://cjyyepxaf4xl8" path="res://Scenes/Menus/PauseMenu/pause_menu.gd" id="2_4pn2l"] -[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="3_0bid7"] +[ext_resource type="Script" uid="uid://cjyyepxaf4xl8" path="res://UI/Menus/PauseMenu/pause_menu.gd" id="2_4pn2l"] +[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="3_0bid7"] [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_n6ixr"] random_pitch = 1.1 diff --git a/choose_card_screen.gd b/UI/Menus/RadioMenu/choose_card_screen.gd similarity index 100% rename from choose_card_screen.gd rename to UI/Menus/RadioMenu/choose_card_screen.gd diff --git a/choose_card_screen.gd.uid b/UI/Menus/RadioMenu/choose_card_screen.gd.uid similarity index 100% rename from choose_card_screen.gd.uid rename to UI/Menus/RadioMenu/choose_card_screen.gd.uid diff --git a/choose_card_screen.tscn b/UI/Menus/RadioMenu/choose_card_screen.tscn similarity index 96% rename from choose_card_screen.tscn rename to UI/Menus/RadioMenu/choose_card_screen.tscn index 427c398..57a0605 100644 --- a/choose_card_screen.tscn +++ b/UI/Menus/RadioMenu/choose_card_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bcvjgl0s1wp8y"] -[ext_resource type="Script" uid="uid://nc0df5y8tll7" path="res://choose_card_screen.gd" id="1_y4oar"] -[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://card_description_ui.tscn" id="2_3npvv"] +[ext_resource type="Script" uid="uid://nc0df5y8tll7" path="res://UI/Menus/RadioMenu/choose_card_screen.gd" id="1_y4oar"] +[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://UI/card_description_ui.tscn" id="2_3npvv"] [node name="ChooseCardScreen" type="Control" node_paths=PackedStringArray("choice_buttons", "card_desc", "card_name_label")] layout_mode = 3 diff --git a/health-Sheet.png b/UI/ShieldUI/health-Sheet.png similarity index 100% rename from health-Sheet.png rename to UI/ShieldUI/health-Sheet.png diff --git a/health-Sheet.png.import b/UI/ShieldUI/health-Sheet.png.import similarity index 76% rename from health-Sheet.png.import rename to UI/ShieldUI/health-Sheet.png.import index 5f41c57..c688382 100644 --- a/health-Sheet.png.import +++ b/UI/ShieldUI/health-Sheet.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d0yfidlyfyxff" -path="res://.godot/imported/health-Sheet.png-3a0a09780bb7aea652e77e269f0d8b32.ctex" +path="res://.godot/imported/health-Sheet.png-0fdb3ca3bd7269341e0271c38f6c9352.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://health-Sheet.png" -dest_files=["res://.godot/imported/health-Sheet.png-3a0a09780bb7aea652e77e269f0d8b32.ctex"] +source_file="res://UI/ShieldUI/health-Sheet.png" +dest_files=["res://.godot/imported/health-Sheet.png-0fdb3ca3bd7269341e0271c38f6c9352.ctex"] [params] diff --git a/health_border.png b/UI/ShieldUI/health_border.png similarity index 100% rename from health_border.png rename to UI/ShieldUI/health_border.png diff --git a/health_border.png.import b/UI/ShieldUI/health_border.png.import similarity index 76% rename from health_border.png.import rename to UI/ShieldUI/health_border.png.import index f9a7ef1..b824826 100644 --- a/health_border.png.import +++ b/UI/ShieldUI/health_border.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bv3alwpq8esky" -path="res://.godot/imported/health_border.png-138c86d63678f02e052053b45bae13ec.ctex" +path="res://.godot/imported/health_border.png-99006dff11f73b4b2477bea9384c83e2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://health_border.png" -dest_files=["res://.godot/imported/health_border.png-138c86d63678f02e052053b45bae13ec.ctex"] +source_file="res://UI/ShieldUI/health_border.png" +dest_files=["res://.godot/imported/health_border.png-99006dff11f73b4b2477bea9384c83e2.ctex"] [params] diff --git a/health_hit-Sheet.png b/UI/ShieldUI/health_hit-Sheet.png similarity index 100% rename from health_hit-Sheet.png rename to UI/ShieldUI/health_hit-Sheet.png diff --git a/health_hit-Sheet.png.import b/UI/ShieldUI/health_hit-Sheet.png.import similarity index 75% rename from health_hit-Sheet.png.import rename to UI/ShieldUI/health_hit-Sheet.png.import index 17ac0bc..3584172 100644 --- a/health_hit-Sheet.png.import +++ b/UI/ShieldUI/health_hit-Sheet.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bifqfvhsu4c2f" -path="res://.godot/imported/health_hit-Sheet.png-cf8e317c6327f19733eb29b3a217e682.ctex" +path="res://.godot/imported/health_hit-Sheet.png-dc664b62759c22b42d5c36a63bd92934.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://health_hit-Sheet.png" -dest_files=["res://.godot/imported/health_hit-Sheet.png-cf8e317c6327f19733eb29b3a217e682.ctex"] +source_file="res://UI/ShieldUI/health_hit-Sheet.png" +dest_files=["res://.godot/imported/health_hit-Sheet.png-dc664b62759c22b42d5c36a63bd92934.ctex"] [params] diff --git a/ShieldUI.gd b/UI/ShieldUI/shield_ui.gd similarity index 100% rename from ShieldUI.gd rename to UI/ShieldUI/shield_ui.gd diff --git a/ShieldUI.gd.uid b/UI/ShieldUI/shield_ui.gd.uid similarity index 100% rename from ShieldUI.gd.uid rename to UI/ShieldUI/shield_ui.gd.uid diff --git a/shield_ui.tscn b/UI/ShieldUI/shield_ui.tscn similarity index 96% rename from shield_ui.tscn rename to UI/ShieldUI/shield_ui.tscn index ff1f676..9cbc53a 100644 --- a/shield_ui.tscn +++ b/UI/ShieldUI/shield_ui.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=22 format=3 uid="uid://cqslp83lf0ku0"] -[ext_resource type="Script" uid="uid://kiivev1q63p0" path="res://ShieldUI.gd" id="1_aa64g"] -[ext_resource type="Texture2D" uid="uid://bv3alwpq8esky" path="res://health_border.png" id="2_lvnxo"] -[ext_resource type="Texture2D" uid="uid://d0yfidlyfyxff" path="res://health-Sheet.png" id="3_uoync"] -[ext_resource type="Texture2D" uid="uid://bifqfvhsu4c2f" path="res://health_hit-Sheet.png" id="4_yanml"] +[ext_resource type="Script" uid="uid://kiivev1q63p0" path="res://UI/ShieldUI/shield_ui.gd" id="1_aa64g"] +[ext_resource type="Texture2D" uid="uid://bv3alwpq8esky" path="res://UI/ShieldUI/health_border.png" id="2_lvnxo"] +[ext_resource type="Texture2D" uid="uid://d0yfidlyfyxff" path="res://UI/ShieldUI/health-Sheet.png" id="3_uoync"] +[ext_resource type="Texture2D" uid="uid://bifqfvhsu4c2f" path="res://UI/ShieldUI/health_hit-Sheet.png" id="4_yanml"] [sub_resource type="AtlasTexture" id="AtlasTexture_5gv4u"] atlas = ExtResource("3_uoync") diff --git a/UI/Themes/Scale1/button_disabled.tres b/UI/Themes/Scale1/button_disabled.tres new file mode 100644 index 0000000..ce892b4 --- /dev/null +++ b/UI/Themes/Scale1/button_disabled.tres @@ -0,0 +1,18 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_amp6b"] +atlas = ExtResource("1_ychim") +region = Rect2(0, 10, 9, 9) + +[resource] +texture = SubResource("AtlasTexture_amp6b") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 2.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 diff --git a/UI/Themes/Scale1/button_focus.tres b/UI/Themes/Scale1/button_focus.tres new file mode 100644 index 0000000..3662cfc --- /dev/null +++ b/UI/Themes/Scale1/button_focus.tres @@ -0,0 +1,18 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_xobyj"] +atlas = ExtResource("1_axkac") +region = Rect2(10, 10, 9, 9) + +[resource] +texture = SubResource("AtlasTexture_xobyj") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 2.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 diff --git a/UI/Themes/Scale1/button_hover.tres b/UI/Themes/Scale1/button_hover.tres new file mode 100644 index 0000000..56c2a86 --- /dev/null +++ b/UI/Themes/Scale1/button_hover.tres @@ -0,0 +1,18 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_kt4jn"] +atlas = ExtResource("1_x020y") +region = Rect2(10, 0, 9, 9) + +[resource] +texture = SubResource("AtlasTexture_kt4jn") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 2.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 diff --git a/UI/Themes/Scale1/button_normal.tres b/UI/Themes/Scale1/button_normal.tres new file mode 100644 index 0000000..4695aa9 --- /dev/null +++ b/UI/Themes/Scale1/button_normal.tres @@ -0,0 +1,18 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_s7nl3"] +atlas = ExtResource("1_rwyhh") +region = Rect2(0, 0, 9, 9) + +[resource] +texture = SubResource("AtlasTexture_s7nl3") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 2.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 diff --git a/UI/Themes/Scale1/button_pressed.tres b/UI/Themes/Scale1/button_pressed.tres new file mode 100644 index 0000000..0b6922f --- /dev/null +++ b/UI/Themes/Scale1/button_pressed.tres @@ -0,0 +1,18 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_a57sn"] +atlas = ExtResource("1_u0q6f") +region = Rect2(20, 0, 9, 9) + +[resource] +texture = SubResource("AtlasTexture_a57sn") +texture_margin_left = 3.0 +texture_margin_top = 3.0 +texture_margin_right = 3.0 +texture_margin_bottom = 3.0 +expand_margin_left = 2.0 +expand_margin_top = 1.0 +expand_margin_right = 1.0 +expand_margin_bottom = 1.0 diff --git a/UI/Themes/Scale1/grabber_area.tres b/UI/Themes/Scale1/grabber_area.tres new file mode 100644 index 0000000..cf201a5 --- /dev/null +++ b/UI/Themes/Scale1/grabber_area.tres @@ -0,0 +1,12 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_h3qir"] +atlas = ExtResource("1_ug2go") +region = Rect2(72, 4, 2, 2) + +[resource] +texture = SubResource("AtlasTexture_h3qir") +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 diff --git a/pane_style_box.tres b/UI/Themes/Scale1/pane_style_box.tres similarity index 85% rename from pane_style_box.tres rename to UI/Themes/Scale1/pane_style_box.tres index ecaa7d3..cece864 100644 --- a/pane_style_box.tres +++ b/UI/Themes/Scale1/pane_style_box.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bfuea1sjymo8g"] -[ext_resource type="Texture2D" uid="uid://b0d2fesjkbawy" path="res://panel_patch.png" id="1_o1mxl"] +[ext_resource type="Texture2D" uid="uid://b0d2fesjkbawy" path="res://UI/Themes/Scale1/panel_patch.png" id="1_o1mxl"] [resource] texture = ExtResource("1_o1mxl") diff --git a/panel_patch.png b/UI/Themes/Scale1/panel_patch.png similarity index 100% rename from panel_patch.png rename to UI/Themes/Scale1/panel_patch.png diff --git a/panel_patch.png.import b/UI/Themes/Scale1/panel_patch.png.import similarity index 76% rename from panel_patch.png.import rename to UI/Themes/Scale1/panel_patch.png.import index c770cbb..a3e444e 100644 --- a/panel_patch.png.import +++ b/UI/Themes/Scale1/panel_patch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b0d2fesjkbawy" -path="res://.godot/imported/panel_patch.png-0f7e0ebf0ef3857853777c0ea247f46f.ctex" +path="res://.godot/imported/panel_patch.png-3e1921fc1569bba0ed194febf3436a04.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://panel_patch.png" -dest_files=["res://.godot/imported/panel_patch.png-0f7e0ebf0ef3857853777c0ea247f46f.ctex"] +source_file="res://UI/Themes/Scale1/panel_patch.png" +dest_files=["res://.godot/imported/panel_patch.png-3e1921fc1569bba0ed194febf3436a04.ctex"] [params] diff --git a/UI/Themes/Scale1/psx_ui.tres b/UI/Themes/Scale1/psx_ui.tres new file mode 100644 index 0000000..8c8a0c6 --- /dev/null +++ b/UI/Themes/Scale1/psx_ui.tres @@ -0,0 +1,164 @@ +[gd_resource type="Theme" load_steps=36 format=3 uid="uid://jn4qqx5hxc5i"] + +[ext_resource type="StyleBox" uid="uid://doxcjij1w2ot7" path="res://UI/Themes/Scale1/button_disabled.tres" id="1_ts3pc"] +[ext_resource type="StyleBox" uid="uid://buu2yn08s4wc7" path="res://UI/Themes/Scale1/button_focus.tres" id="1_vnhdr"] +[ext_resource type="StyleBox" uid="uid://srk2hghxkb70" path="res://UI/Themes/Scale1/button_hover.tres" id="2_ts3pc"] +[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="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"] +[ext_resource type="StyleBox" uid="uid://bss3dp7k18rx0" path="res://UI/Themes/Scale1/grabber_area.tres" id="8_o6p3e"] +[ext_resource type="StyleBox" uid="uid://bpowvv8e13flg" path="res://UI/Themes/Scale1/slider.tres" id="9_w151p"] +[ext_resource type="StyleBox" uid="uid://8s0fgx46n145" path="res://UI/Themes/Scale1/scroll_grabber.tres" id="13_w151p"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_845oj"] +atlas = ExtResource("6_43i8g") +region = Rect2(30, 1, 15, 8) + +[sub_resource type="AtlasTexture" id="AtlasTexture_o6p3e"] +atlas = ExtResource("6_43i8g") +region = Rect2(46, 1, 15, 8) + +[sub_resource type="FontVariation" id="FontVariation_b02pe"] +base_font = ExtResource("5_o6p3e") +baseline_offset = 0.15 + +[sub_resource type="AtlasTexture" id="AtlasTexture_w8nmj"] +atlas = ExtResource("6_43i8g") +region = Rect2(62, 1, 8, 8) + +[sub_resource type="AtlasTexture" id="AtlasTexture_t2hcr"] +atlas = ExtResource("6_43i8g") +region = Rect2(79, 1, 8, 8) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8j1wx"] +atlas = ExtResource("6_43i8g") +region = Rect2(62, 1, 8, 8) + +[sub_resource type="AtlasTexture" id="AtlasTexture_w151p"] +atlas = ExtResource("6_43i8g") +region = Rect2(75, 4, 2, 2) + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_t2hcr"] + +[sub_resource type="FontVariation" id="FontVariation_inyly"] +base_font = ExtResource("5_o6p3e") + +[sub_resource type="AtlasTexture" id="AtlasTexture_n5i54"] +atlas = ExtResource("6_43i8g") +region = Rect2(98, 4, 8, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_08ul3"] +atlas = ExtResource("6_43i8g") +region = Rect2(98, 16, 8, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_b5n6m"] +atlas = ExtResource("6_43i8g") +region = Rect2(98, 10, 8, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xqncf"] +atlas = ExtResource("6_43i8g") +region = Rect2(89, 1, 8, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_nis8m"] +atlas = ExtResource("6_43i8g") +region = Rect2(89, 13, 8, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_aggbr"] +atlas = ExtResource("6_43i8g") +region = Rect2(89, 7, 8, 5) + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_o6p3e"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_w151p"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_w8nmj"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_8j1wx"] + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ts3pc"] +content_margin_top = 2.0 + +[sub_resource type="AtlasTexture" id="AtlasTexture_okcqu"] +atlas = ExtResource("6_43i8g") +region = Rect2(62, 10, 8, 8) + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_qa24s"] +texture = SubResource("AtlasTexture_okcqu") +texture_margin_left = 4.0 +texture_margin_top = 2.0 +texture_margin_right = 4.0 +texture_margin_bottom = 2.0 +region_rect = Rect2(0, 0, 8, 8) + +[resource] +Button/colors/font_color = Color(0.85490197, 0.8784314, 0.91764706, 1) +Button/colors/font_disabled_color = Color(0.85882354, 0.6431373, 0.3882353, 1) +Button/colors/font_hover_color = Color(1, 1, 1, 1) +Button/colors/font_outline_color = Color(0.023529412, 0.023529412, 0.03137255, 1) +Button/styles/disabled = ExtResource("1_ts3pc") +Button/styles/focus = ExtResource("1_vnhdr") +Button/styles/hover = ExtResource("2_ts3pc") +Button/styles/normal = ExtResource("3_43i8g") +Button/styles/pressed = ExtResource("4_845oj") +CheckButton/icons/checked = SubResource("AtlasTexture_845oj") +CheckButton/icons/unchecked = SubResource("AtlasTexture_o6p3e") +Control/constants/outline_size = 4 +Control/font_sizes/font_size = 8 +Control/fonts/font = SubResource("FontVariation_b02pe") +HSlider/icons/grabber = SubResource("AtlasTexture_w8nmj") +HSlider/icons/grabber_disabled = SubResource("AtlasTexture_t2hcr") +HSlider/icons/grabber_highlight = SubResource("AtlasTexture_8j1wx") +HSlider/icons/tick = SubResource("AtlasTexture_w151p") +HSlider/styles/grabber_area = ExtResource("8_o6p3e") +HSlider/styles/grabber_area_highlight = ExtResource("8_o6p3e") +HSlider/styles/slider = ExtResource("9_w151p") +InteractLabel/base_type = &"Label" +Label/font_sizes/font_size = 8 +Label/fonts/font = ExtResource("5_o6p3e") +LineEdit/styles/focus = ExtResource("1_vnhdr") +LineEdit/styles/normal = SubResource("StyleBoxEmpty_t2hcr") +PanelContainer/styles/panel = ExtResource("6_w151p") +PopupMenu/constants/outline_size = 4 +PopupMenu/font_sizes/font_size = 8 +PopupMenu/fonts/font = SubResource("FontVariation_inyly") +PopupMenu/styles/panel = ExtResource("6_w151p") +RichTextLabel/font_sizes/normal_font_size = 8 +RichTextLabel/fonts/normal_font = ExtResource("5_o6p3e") +SideCheckButton/base_type = &"Button" +SideCheckButton/colors/font_color = Color(0.8392157, 0.8392157, 0.8392157, 1) +SideCheckButton/colors/font_hover_color = Color(1, 1, 1, 1) +SideCheckButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) +SideCheckButton/colors/font_pressed_color = Color(0.8392157, 0.8392157, 0.8392157, 1) +SideCheckButton/styles/hover = ExtResource("7_w8nmj") +SideCheckButton/styles/hover_pressed = ExtResource("8_8j1wx") +SideCheckButton/styles/normal = ExtResource("7_w8nmj") +SideCheckButton/styles/pressed = ExtResource("8_8j1wx") +SpinBox/icons/down = SubResource("AtlasTexture_n5i54") +SpinBox/icons/down_disabled = SubResource("AtlasTexture_08ul3") +SpinBox/icons/down_hover = SubResource("AtlasTexture_b5n6m") +SpinBox/icons/up = SubResource("AtlasTexture_xqncf") +SpinBox/icons/up_disabled = SubResource("AtlasTexture_nis8m") +SpinBox/icons/up_hover = SubResource("AtlasTexture_aggbr") +SpinBox/styles/down_background_hovered = SubResource("StyleBoxEmpty_o6p3e") +SpinBox/styles/down_background_pressed = SubResource("StyleBoxEmpty_w151p") +SpinBox/styles/up_background_hovered = SubResource("StyleBoxEmpty_w8nmj") +SpinBox/styles/up_background_pressed = SubResource("StyleBoxEmpty_8j1wx") +StartWaveLabel/base_type = &"Label" +TabContainer/constants/tab_separation = 6 +TabContainer/styles/panel = SubResource("StyleBoxEmpty_ts3pc") +TabContainer/styles/tab_disabled = ExtResource("1_ts3pc") +TabContainer/styles/tab_focus = ExtResource("1_vnhdr") +TabContainer/styles/tab_hovered = ExtResource("2_ts3pc") +TabContainer/styles/tab_selected = ExtResource("4_845oj") +TabContainer/styles/tab_unselected = ExtResource("3_43i8g") +VScrollBar/styles/grabber = ExtResource("13_w151p") +VScrollBar/styles/grabber_highlight = ExtResource("13_w151p") +VScrollBar/styles/grabber_pressed = ExtResource("13_w151p") +VScrollBar/styles/scroll = SubResource("StyleBoxTexture_qa24s") +VersionLabel/base_type = &"Label" +VersionLabel/colors/font_color = Color(0.85, 0.85, 0.85, 0.7) +VersionLabel/font_sizes/font_size = 8 diff --git a/UI/Themes/Scale1/scroll_grabber.tres b/UI/Themes/Scale1/scroll_grabber.tres new file mode 100644 index 0000000..19ea065 --- /dev/null +++ b/UI/Themes/Scale1/scroll_grabber.tres @@ -0,0 +1,15 @@ +[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_pfcbc"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_noue1"] +atlas = ExtResource("1_pfcbc") +region = Rect2(62, 1, 8, 8) + +[resource] +texture = SubResource("AtlasTexture_noue1") +texture_margin_top = 2.0 +texture_margin_bottom = 2.0 +expand_margin_top = 2.0 +expand_margin_bottom = 2.0 +region_rect = Rect2(0, 0, 8, 8) diff --git a/sidea_patch.png b/UI/Themes/Scale1/sidea_patch.png similarity index 100% rename from sidea_patch.png rename to UI/Themes/Scale1/sidea_patch.png diff --git a/sidea_patch.png.import b/UI/Themes/Scale1/sidea_patch.png.import similarity index 76% rename from sidea_patch.png.import rename to UI/Themes/Scale1/sidea_patch.png.import index 0bbfde4..5271057 100644 --- a/sidea_patch.png.import +++ b/UI/Themes/Scale1/sidea_patch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cp3yr2676jkjx" -path="res://.godot/imported/sidea_patch.png-6cae89542c56b09a27871bf910466490.ctex" +path="res://.godot/imported/sidea_patch.png-e6077b21c815d458b1ba03ab43740b9a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sidea_patch.png" -dest_files=["res://.godot/imported/sidea_patch.png-6cae89542c56b09a27871bf910466490.ctex"] +source_file="res://UI/Themes/Scale1/sidea_patch.png" +dest_files=["res://.godot/imported/sidea_patch.png-e6077b21c815d458b1ba03ab43740b9a.ctex"] [params] diff --git a/sideb_patch.png b/UI/Themes/Scale1/sideb_patch.png similarity index 100% rename from sideb_patch.png rename to UI/Themes/Scale1/sideb_patch.png diff --git a/sideb_patch.png.import b/UI/Themes/Scale1/sideb_patch.png.import similarity index 76% rename from sideb_patch.png.import rename to UI/Themes/Scale1/sideb_patch.png.import index 42116dc..1119915 100644 --- a/sideb_patch.png.import +++ b/UI/Themes/Scale1/sideb_patch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bm3a5gkj0spil" -path="res://.godot/imported/sideb_patch.png-c386755922b23d48adc52790a1e6ca6d.ctex" +path="res://.godot/imported/sideb_patch.png-b275a8e31a250f45a054c6126dd65805.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sideb_patch.png" -dest_files=["res://.godot/imported/sideb_patch.png-c386755922b23d48adc52790a1e6ca6d.ctex"] +source_file="res://UI/Themes/Scale1/sideb_patch.png" +dest_files=["res://.godot/imported/sideb_patch.png-b275a8e31a250f45a054c6126dd65805.ctex"] [params] diff --git a/UI/Themes/Scale1/slider.tres b/UI/Themes/Scale1/slider.tres new file mode 100644 index 0000000..9c7fd8b --- /dev/null +++ b/UI/Themes/Scale1/slider.tres @@ -0,0 +1,13 @@ +[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"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_uj2su"] +atlas = ExtResource("1_85syk") +region = Rect2(75, 4, 2, 2) + +[resource] +content_margin_top = 2.0 +texture = SubResource("AtlasTexture_uj2su") +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 diff --git a/switch_side_a_style_box.tres b/UI/Themes/Scale1/switch_side_a_style_box.tres similarity index 85% rename from switch_side_a_style_box.tres rename to UI/Themes/Scale1/switch_side_a_style_box.tres index aaf05cd..02e901e 100644 --- a/switch_side_a_style_box.tres +++ b/UI/Themes/Scale1/switch_side_a_style_box.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://cm3wsvk3woory"] -[ext_resource type="Texture2D" uid="uid://cp3yr2676jkjx" path="res://sidea_patch.png" id="1_bunl1"] +[ext_resource type="Texture2D" uid="uid://cp3yr2676jkjx" path="res://UI/Themes/Scale1/sidea_patch.png" id="1_bunl1"] [resource] texture = ExtResource("1_bunl1") diff --git a/switch_side_b_style_box.tres b/UI/Themes/Scale1/switch_side_b_style_box.tres similarity index 85% rename from switch_side_b_style_box.tres rename to UI/Themes/Scale1/switch_side_b_style_box.tres index 68953c6..0487b7a 100644 --- a/switch_side_b_style_box.tres +++ b/UI/Themes/Scale1/switch_side_b_style_box.tres @@ -1,6 +1,6 @@ [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://jnnnhb3i2265"] -[ext_resource type="Texture2D" uid="uid://bm3a5gkj0spil" path="res://sideb_patch.png" id="1_f68ef"] +[ext_resource type="Texture2D" uid="uid://bm3a5gkj0spil" path="res://UI/Themes/Scale1/sideb_patch.png" id="1_f68ef"] [resource] texture = ExtResource("1_f68ef") diff --git a/track_one_patch.png b/UI/Themes/Scale1/track_one_patch.png similarity index 100% rename from track_one_patch.png rename to UI/Themes/Scale1/track_one_patch.png diff --git a/track_one_patch.png.import b/UI/Themes/Scale1/track_one_patch.png.import similarity index 75% rename from track_one_patch.png.import rename to UI/Themes/Scale1/track_one_patch.png.import index 831a2ce..92a3d35 100644 --- a/track_one_patch.png.import +++ b/UI/Themes/Scale1/track_one_patch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cll2vlvf1h454" -path="res://.godot/imported/track_one_patch.png-5a380010e299cd637294c2754d938c6c.ctex" +path="res://.godot/imported/track_one_patch.png-b8b8fabc6c975ecd3842921215124194.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://track_one_patch.png" -dest_files=["res://.godot/imported/track_one_patch.png-5a380010e299cd637294c2754d938c6c.ctex"] +source_file="res://UI/Themes/Scale1/track_one_patch.png" +dest_files=["res://.godot/imported/track_one_patch.png-b8b8fabc6c975ecd3842921215124194.ctex"] [params] diff --git a/track_two_patch.png b/UI/Themes/Scale1/track_two_patch.png similarity index 100% rename from track_two_patch.png rename to UI/Themes/Scale1/track_two_patch.png diff --git a/track_two_patch.png.import b/UI/Themes/Scale1/track_two_patch.png.import similarity index 75% rename from track_two_patch.png.import rename to UI/Themes/Scale1/track_two_patch.png.import index 41bf975..1077519 100644 --- a/track_two_patch.png.import +++ b/UI/Themes/Scale1/track_two_patch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cvhkk22pxxuqj" -path="res://.godot/imported/track_two_patch.png-c2aa8b915c0063c9cb99d93fc0c36ee4.ctex" +path="res://.godot/imported/track_two_patch.png-506cead7a321a46145eb40a2aef81093.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://track_two_patch.png" -dest_files=["res://.godot/imported/track_two_patch.png-c2aa8b915c0063c9cb99d93fc0c36ee4.ctex"] +source_file="res://UI/Themes/Scale1/track_two_patch.png" +dest_files=["res://.godot/imported/track_two_patch.png-506cead7a321a46145eb40a2aef81093.ctex"] [params] diff --git a/card_description_ui.gd b/UI/card_description_ui.gd similarity index 100% rename from card_description_ui.gd rename to UI/card_description_ui.gd diff --git a/card_description_ui.gd.uid b/UI/card_description_ui.gd.uid similarity index 100% rename from card_description_ui.gd.uid rename to UI/card_description_ui.gd.uid diff --git a/card_description_ui.tscn b/UI/card_description_ui.tscn similarity index 94% rename from card_description_ui.tscn rename to UI/card_description_ui.tscn index 9bb7ac7..c4480fe 100644 --- a/card_description_ui.tscn +++ b/UI/card_description_ui.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cmlpmr78tmo6p"] -[ext_resource type="Script" uid="uid://dipne6u86gxth" path="res://card_description_ui.gd" id="1_bxjpl"] -[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://feature_ui.tscn" id="2_hr2hd"] +[ext_resource type="Script" uid="uid://dipne6u86gxth" path="res://UI/card_description_ui.gd" id="1_bxjpl"] +[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://UI/FeatureUI/feature_ui.tscn" id="2_hr2hd"] [node name="DescriptionVBox" type="VBoxContainer" node_paths=PackedStringArray("card_name_label", "card_description_label", "feature_list", "target_list")] size_flags_horizontal = 3 diff --git a/Scenes/UI/card_hand.tscn b/UI/card_hand.tscn similarity index 100% rename from Scenes/UI/card_hand.tscn rename to UI/card_hand.tscn diff --git a/Scenes/UI/chatbox.tscn b/UI/chatbox.tscn similarity index 92% rename from Scenes/UI/chatbox.tscn rename to UI/chatbox.tscn index 2b66d92..e2b13f6 100644 --- a/Scenes/UI/chatbox.tscn +++ b/UI/chatbox.tscn @@ -20,11 +20,12 @@ text_panel = NodePath("VBoxContainer/PanelContainer") fade_timer = NodePath("Timer") [node name="VBoxContainer" type="VBoxContainer" parent="."] -layout_mode = 2 -offset_left = 40.0 -offset_top = 100.0 -offset_right = 375.0 -offset_bottom = 300.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 mouse_filter = 2 alignment = 2 @@ -36,6 +37,7 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_c3kb6") [node name="RichTextLabel" type="RichTextLabel" parent="VBoxContainer/PanelContainer"] modulate = Color(1, 1, 1, 0) +clip_contents = false layout_mode = 2 size_flags_vertical = 3 mouse_filter = 2 diff --git a/Scenes/UI/drop_003.ogg b/UI/drop_003.ogg similarity index 100% rename from Scenes/UI/drop_003.ogg rename to UI/drop_003.ogg diff --git a/UI/drop_003.ogg.import b/UI/drop_003.ogg.import new file mode 100644 index 0000000..2688b52 --- /dev/null +++ b/UI/drop_003.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cp6ph4ra7u5rk" +path="res://.godot/imported/drop_003.ogg-17680daa1fe8d8f6b4fc58b6f660917c.oggvorbisstr" + +[deps] + +source_file="res://UI/drop_003.ogg" +dest_files=["res://.godot/imported/drop_003.ogg-17680daa1fe8d8f6b4fc58b6f660917c.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Scenes/UI/hero_card.tscn b/UI/hero_card.tscn similarity index 100% rename from Scenes/UI/hero_card.tscn rename to UI/hero_card.tscn diff --git a/Scenes/UI/lifebar_segment.tscn b/UI/lifebar_segment.tscn similarity index 100% rename from Scenes/UI/lifebar_segment.tscn rename to UI/lifebar_segment.tscn diff --git a/Scenes/UI/lives_bar.tscn b/UI/lives_bar.tscn similarity index 98% rename from Scenes/UI/lives_bar.tscn rename to UI/lives_bar.tscn index 4fd7533..a145012 100644 --- a/Scenes/UI/lives_bar.tscn +++ b/UI/lives_bar.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://dvy2lvtotaxb3" path="res://Assets/Textures/lifebar_bg.png" id="1_x27cx"] [ext_resource type="Script" uid="uid://b3g3hofk5pbcp" path="res://Scripts/lives_bar.gd" id="2_lqe7s"] -[ext_resource type="PackedScene" uid="uid://dko38egcaxubd" path="res://Scenes/UI/lifebar_segment.tscn" id="3_6hp86"] +[ext_resource type="PackedScene" uid="uid://dko38egcaxubd" path="res://UI/lifebar_segment.tscn" id="3_6hp86"] [node name="LivesBar" type="TextureRect" node_paths=PackedStringArray("segments")] texture_filter = 1 diff --git a/Scenes/UI/pickup_notification.tscn b/UI/pickup_notification.tscn similarity index 68% rename from Scenes/UI/pickup_notification.tscn rename to UI/pickup_notification.tscn index 3986397..6ab6104 100644 --- a/Scenes/UI/pickup_notification.tscn +++ b/UI/pickup_notification.tscn @@ -1,23 +1,10 @@ -[gd_scene load_steps=3 format=3 uid="uid://chnj376d3lcjd"] +[gd_scene load_steps=2 format=3 uid="uid://chnj376d3lcjd"] [ext_resource type="Script" uid="uid://b6vynawytkd0k" path="res://Scripts/pickup_notification.gd" id="1_cgy5u"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cdnv4"] -resource_local_to_scene = true -content_margin_left = 7.0 -content_margin_top = 3.0 -content_margin_right = 7.0 -content_margin_bottom = 3.0 -bg_color = Color(0.717647, 0.0941176, 0.392157, 0.784314) -corner_radius_top_left = 15 -corner_radius_top_right = 15 -corner_radius_bottom_right = 15 -corner_radius_bottom_left = 2 - [node name="PanelContainer" type="PanelContainer"] script = ExtResource("1_cgy5u") fade_out_time = 2.0 -style = SubResource("StyleBoxFlat_cdnv4") text_style = Color(0, 0, 0, 0.862745) common_background = Color(1, 1, 1, 0.784314) uncommon_background = Color(0.196078, 0.8, 0.141176, 0.784314) diff --git a/UI/psx_ui.tres b/UI/psx_ui.tres deleted file mode 100644 index 7feebad..0000000 --- a/UI/psx_ui.tres +++ /dev/null @@ -1,50 +0,0 @@ -[gd_resource type="Theme" load_steps=9 format=3 uid="uid://jn4qqx5hxc5i"] - -[ext_resource type="StyleBox" uid="uid://bgxt37xw4tma6" path="res://button_style_box_normal.tres" id="1_b02pe"] -[ext_resource type="FontFile" uid="uid://bqy8dm2o3piqm" path="res://Assets/Fonts/Quaver v1.0/quaver.ttf" id="1_u5gny"] -[ext_resource type="StyleBox" uid="uid://bfuea1sjymo8g" path="res://pane_style_box.tres" id="3_inyly"] -[ext_resource type="StyleBox" uid="uid://cm3wsvk3woory" path="res://switch_side_a_style_box.tres" id="4_u1sfq"] -[ext_resource type="StyleBox" uid="uid://jnnnhb3i2265" path="res://switch_side_b_style_box.tres" id="5_78ak8"] - -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_u1sfq"] - -[sub_resource type="FontVariation" id="FontVariation_b02pe"] -base_font = ExtResource("1_u5gny") -baseline_offset = 0.15 - -[sub_resource type="FontVariation" id="FontVariation_inyly"] -base_font = ExtResource("1_u5gny") - -[resource] -Button/colors/font_color = Color(0.8388973, 0.838897, 0.838897, 1) -Button/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1) -Button/styles/focus = SubResource("StyleBoxEmpty_u1sfq") -Button/styles/hover = ExtResource("1_b02pe") -Button/styles/normal = ExtResource("1_b02pe") -Control/constants/outline_size = 4 -Control/font_sizes/font_size = 8 -Control/fonts/font = SubResource("FontVariation_b02pe") -InteractLabel/base_type = &"Label" -Label/font_sizes/font_size = 8 -Label/fonts/font = ExtResource("1_u5gny") -LineEdit/font_sizes/font_size = 8 -LineEdit/fonts/font = ExtResource("1_u5gny") -PanelContainer/styles/panel = ExtResource("3_inyly") -PopupMenu/constants/outline_size = 4 -PopupMenu/font_sizes/font_size = 8 -PopupMenu/fonts/font = SubResource("FontVariation_inyly") -RichTextLabel/font_sizes/normal_font_size = 8 -RichTextLabel/fonts/normal_font = ExtResource("1_u5gny") -SideCheckButton/base_type = &"Button" -SideCheckButton/colors/font_color = Color(0.8392157, 0.8392157, 0.8392157, 1) -SideCheckButton/colors/font_hover_color = Color(1, 1, 1, 1) -SideCheckButton/colors/font_hover_pressed_color = Color(1, 1, 1, 1) -SideCheckButton/colors/font_pressed_color = Color(0.8392157, 0.8392157, 0.8392157, 1) -SideCheckButton/styles/hover = ExtResource("5_78ak8") -SideCheckButton/styles/hover_pressed = ExtResource("4_u1sfq") -SideCheckButton/styles/normal = ExtResource("5_78ak8") -SideCheckButton/styles/pressed = ExtResource("4_u1sfq") -StartWaveLabel/base_type = &"Label" -VersionLabel/base_type = &"Label" -VersionLabel/colors/font_color = Color(0.85, 0.85, 0.85, 0.7) -VersionLabel/font_sizes/font_size = 8 diff --git a/Scenes/UI/scoreboard.tscn b/UI/scoreboard.tscn similarity index 94% rename from Scenes/UI/scoreboard.tscn rename to UI/scoreboard.tscn index f9cb538..2841b27 100644 --- a/Scenes/UI/scoreboard.tscn +++ b/UI/scoreboard.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://dpt3kpixawyby"] [ext_resource type="Script" uid="uid://k0jvsnqw4766" path="res://Scripts/scoreboard.gd" id="1_b5vdp"] -[ext_resource type="PackedScene" uid="uid://bhri8mqjbme2t" path="res://Scenes/UI/scoreboard_entry.tscn" id="2_uer0b"] +[ext_resource type="PackedScene" uid="uid://bhri8mqjbme2t" path="res://UI/scoreboard_entry.tscn" id="2_uer0b"] [node name="Scoreboard" type="PanelContainer"] anchors_preset = 8 diff --git a/Scenes/UI/scoreboard_entry.tscn b/UI/scoreboard_entry.tscn similarity index 100% rename from Scenes/UI/scoreboard_entry.tscn rename to UI/scoreboard_entry.tscn diff --git a/Scenes/status_icon.tscn b/UI/status_icon.tscn similarity index 100% rename from Scenes/status_icon.tscn rename to UI/status_icon.tscn diff --git a/Worlds/GreenPlanet/Enemies/air_enemy.tscn b/Worlds/GreenPlanet/Enemies/air_enemy.tscn index fa06744..955409d 100644 --- a/Worlds/GreenPlanet/Enemies/air_enemy.tscn +++ b/Worlds/GreenPlanet/Enemies/air_enemy.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://ejqql2660u6h" path="res://Worlds/GreenPlanet/Enemies/enemy_controller.gd" id="1_m83kr"] [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_aed6c"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="9_4xla1"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="9_4xla1"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_7hati"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="9_7yfyh"] [ext_resource type="Script" uid="uid://d147vuqksqhis" path="res://Scripts/EnemyAI/beelining_controller.gd" id="9_cx8mv"] diff --git a/Worlds/GreenPlanet/Enemies/enemy_controller.gd b/Worlds/GreenPlanet/Enemies/enemy_controller.gd index c1173f7..f7a75b7 100644 --- a/Worlds/GreenPlanet/Enemies/enemy_controller.gd +++ b/Worlds/GreenPlanet/Enemies/enemy_controller.gd @@ -12,7 +12,7 @@ signal health_changed(health: int) #@export var sprite: Sprite3D @export var corpse_scene: PackedScene -var damage_particle_scene: PackedScene = preload("res://Scenes/damage_particle.tscn") +var damage_particle_scene: PackedScene = preload("res://UI/DamageParticle/damage_particle.tscn") var current_health: int var corpse_root: Node var movement_speed: float diff --git a/Worlds/GreenPlanet/Enemies/land_enemy.tscn b/Worlds/GreenPlanet/Enemies/land_enemy.tscn index fd2fab8..f5fdd97 100644 --- a/Worlds/GreenPlanet/Enemies/land_enemy.tscn +++ b/Worlds/GreenPlanet/Enemies/land_enemy.tscn @@ -7,7 +7,7 @@ [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="7_5eo4w"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="9_f8btv"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="10_gljle"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="10_or8n6"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="10_or8n6"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="10_txouh"] [ext_resource type="Script" uid="uid://cp77etg1m1hc2" path="res://Scripts/sprite_bobber.gd" id="12_2nmk0"] diff --git a/Worlds/GreenPlanet/Enemies/leaping_enemy.tscn b/Worlds/GreenPlanet/Enemies/leaping_enemy.tscn index c53bc45..f04cbcb 100644 --- a/Worlds/GreenPlanet/Enemies/leaping_enemy.tscn +++ b/Worlds/GreenPlanet/Enemies/leaping_enemy.tscn @@ -3,13 +3,13 @@ [ext_resource type="Script" uid="uid://ejqql2660u6h" path="res://Worlds/GreenPlanet/Enemies/enemy_controller.gd" id="1_joiuq"] [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_ssgps"] [ext_resource type="Script" uid="uid://bamhci3kawuyt" path="res://Scripts/health.gd" id="3_dhcpw"] -[ext_resource type="PackedScene" uid="uid://cqtew0t8sttpm" path="res://Scenes/damage_particle.tscn" id="4_yref6"] +[ext_resource type="PackedScene" uid="uid://cqtew0t8sttpm" path="res://UI/DamageParticle/damage_particle.tscn" id="4_yref6"] [ext_resource type="PackedScene" uid="uid://ri8r03wqy80t" path="res://Scenes/8_direction_sprite.tscn" id="5_5u3uw"] [ext_resource type="Texture2D" uid="uid://cb66pspr16scy" path="res://Assets/Textures/leapfrog_2.png" id="6_joiuq"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="7_72t32"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="8_egpbw"] [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_47ywr"] -[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="10_lce6w"] +[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="10_lce6w"] [ext_resource type="Script" uid="uid://cp77etg1m1hc2" path="res://Scripts/sprite_bobber.gd" id="12_g2knp"] [ext_resource type="Script" uid="uid://dqluvn05min37" path="res://Scripts/EnemyAI/leaping_controller.gd" id="12_joiuq"] diff --git a/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn b/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn index 6ead30d..9647d93 100644 --- a/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn +++ b/Worlds/GreenPlanet/Levels/Bridge/bridge.tscn @@ -15,7 +15,7 @@ [ext_resource type="PackedScene" uid="uid://d3h3lmlf3hljl" path="res://Worlds/GreenPlanet/Decorations/bush.tscn" id="16_lhsvw"] [ext_resource type="PackedScene" uid="uid://7g3jev3v6d3l" path="res://Scenes/ShopStand/shop_stand.tscn" id="19_h6brl"] [ext_resource type="PackedScene" uid="uid://cmneu5o0m02l8" path="res://Worlds/GreenPlanet/Enemies/leaping_enemy.tscn" id="20_ttr7n"] -[ext_resource type="PackedScene" uid="uid://c6isprnkaliqr" path="res://remix_table.tscn" id="21_ks6qx"] +[ext_resource type="PackedScene" uid="uid://c6isprnkaliqr" path="res://Scenes/MixingTable/remix_table.tscn" id="21_ks6qx"] [ext_resource type="PackedScene" uid="uid://2vv6mrxiwibf" path="res://Scenes/FlowField/flow_field_tool_output.tscn" id="24_sbix1"] [ext_resource type="Script" uid="uid://cy6oj2hr8q8br" path="res://Scripts/killbox.gd" id="26_tuncf"] [ext_resource type="PackedScene" uid="uid://c2avjln5vmr0y" path="res://Scenes/Shredder/shredder.tscn" id="27_gppb4"] diff --git a/Worlds/TestingRange/Enemies/target_dummy.tscn b/Worlds/TestingRange/Enemies/target_dummy.tscn index 7238346..38def29 100644 --- a/Worlds/TestingRange/Enemies/target_dummy.tscn +++ b/Worlds/TestingRange/Enemies/target_dummy.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://du13pv0e5fah" path="res://Scripts/target_dummy.gd" id="1_f72ee"] [ext_resource type="Resource" uid="uid://bdkcwve6d35gl" path="res://Worlds/TestingRange/Enemies/dummy.tres" id="2_7pldl"] [ext_resource type="Script" uid="uid://bamhci3kawuyt" path="res://Scripts/health.gd" id="3_8hqew"] -[ext_resource type="PackedScene" uid="uid://cqtew0t8sttpm" path="res://Scenes/damage_particle.tscn" id="4_0ruff"] +[ext_resource type="PackedScene" uid="uid://cqtew0t8sttpm" path="res://UI/DamageParticle/damage_particle.tscn" id="4_0ruff"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="4_yinjs"] [ext_resource type="PackedScene" uid="uid://ri8r03wqy80t" path="res://Scenes/8_direction_sprite.tscn" id="5_t0dpu"] [ext_resource type="Texture2D" uid="uid://brjk5pu0up85s" path="res://Assets/TextureAtlases/dummy.tres" id="6_agkvc"] diff --git a/blk-nx64-1x.png b/blk-nx64-1x.png deleted file mode 100644 index 6f730f6..0000000 Binary files a/blk-nx64-1x.png and /dev/null differ diff --git a/blk-nx64-1x.png.import b/blk-nx64-1x.png.import deleted file mode 100644 index aa96049..0000000 --- a/blk-nx64-1x.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bpo5fu2a26mr7" -path="res://.godot/imported/blk-nx64-1x.png-073bb5194bda50a3dbca3434c8427284.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://blk-nx64-1x.png" -dest_files=["res://.godot/imported/blk-nx64-1x.png-073bb5194bda50a3dbca3434c8427284.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/button_patch.png b/button_patch.png deleted file mode 100644 index b9124df..0000000 Binary files a/button_patch.png and /dev/null differ diff --git a/button_style_box_normal.tres b/button_style_box_normal.tres deleted file mode 100644 index 90fae39..0000000 --- a/button_style_box_normal.tres +++ /dev/null @@ -1,10 +0,0 @@ -[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bgxt37xw4tma6"] - -[ext_resource type="Texture2D" uid="uid://broabvnrwp73t" path="res://button_patch.png" id="1_iolpp"] - -[resource] -texture = ExtResource("1_iolpp") -texture_margin_left = 4.0 -texture_margin_top = 4.0 -texture_margin_right = 4.0 -texture_margin_bottom = 4.0 diff --git a/card_model/3d_card.tscn b/card_model/3d_card.tscn index 3f2b8c4..bb17dea 100644 --- a/card_model/3d_card.tscn +++ b/card_model/3d_card.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://cr6hn1pbu35o1" path="res://card_model/3d_card.gd" id="1_o6jcx"] [ext_resource type="Shader" uid="uid://c5bffujq0l70k" path="res://Shaders/jitter.gdshader" id="2_o6jcx"] -[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="3_bnh6n"] +[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="3_bnh6n"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0gfbg"] resource_name = "Face" diff --git a/card_placing_tool.gd b/card_placing_tool.gd index 7ab5cfd..229964f 100644 --- a/card_placing_tool.gd +++ b/card_placing_tool.gd @@ -52,6 +52,8 @@ func place_card(tower_base: TowerBase) -> void: return remove_card(tower_base) hero.hand.remove_at(hero.hand.contents.find(card)) + hero.decrement_selected() + hero.hud.hot_wheel.update_cassettes(hero.get_wheel_cards()) tower_base.add_card(card, multiplayer.get_unique_id()) hero.place_card_audio.play() if hero.game_manager.card_gameplay: diff --git a/hot_wheel.gd b/hot_wheel.gd deleted file mode 100644 index ddea50f..0000000 --- a/hot_wheel.gd +++ /dev/null @@ -1,13 +0,0 @@ -class_name HotWheel -extends HBoxContainer - -var entries: Array[TextureRect] - - -func add_cassette(cassette: Card) -> void: - var tex: TextureRect = TextureRect.new() - tex.texture = cassette.icon - tex.expand_mode = TextureRect.EXPAND_IGNORE_SIZE - tex.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED - tex.custom_minimum_size = Vector2(32.0, 32.0) - add_child(tex) diff --git a/hot_wheel.tscn b/hot_wheel.tscn deleted file mode 100644 index 6482e5d..0000000 --- a/hot_wheel.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://ga21hoa8fxmm"] - -[ext_resource type="Script" uid="uid://laoxiep4e5x0" path="res://hot_wheel.gd" id="1_2sjpl"] - -[node name="HotWheel" type="HBoxContainer"] -alignment = 1 -script = ExtResource("1_2sjpl") diff --git a/lost-century-1x.png b/lost-century-1x.png deleted file mode 100644 index 321bd10..0000000 Binary files a/lost-century-1x.png and /dev/null differ diff --git a/lost-century-1x.png.import b/lost-century-1x.png.import deleted file mode 100644 index 21d4b46..0000000 --- a/lost-century-1x.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://jy150d2odqk2" -path="res://.godot/imported/lost-century-1x.png-1c6cec7524286e83e291b7e7de05b077.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://lost-century-1x.png" -dest_files=["res://.godot/imported/lost-century-1x.png-1c6cec7524286e83e291b7e7de05b077.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/main.gd b/main.gd index 2df0b1a..c0f42d4 100644 --- a/main.gd +++ b/main.gd @@ -10,7 +10,7 @@ signal loaded_scene var game_manager: GameManager var loaded: bool = false var UILayer: CanvasLayer -var main_menu_scene_path: String = "res://Scenes/Menus/MainMenu/main_menu.tscn" +var main_menu_scene_path: String = "res://UI/Menus/MainMenu/main_menu.tscn" var multiplayer_lobby_scene_path: String = "res://Scenes/Menus/multiplayer_lobby.tscn" var singleplayer_lobby_scene_path: String = "res://Scenes/Menus/singleplayer_lobby.tscn" diff --git a/panel_tex.png b/panel_tex.png deleted file mode 100644 index c7a9bb8..0000000 Binary files a/panel_tex.png and /dev/null differ diff --git a/project.godot b/project.godot index 49870f5..a7a7016 100644 --- a/project.godot +++ b/project.godot @@ -47,6 +47,8 @@ folder_colors={ "res://Scenes/": "yellow", "res://Scripts/": "red", "res://UI/Keybinding/": "green", +"res://UI/Menus/": "orange", +"res://UI/Themes/": "pink", "res://Worlds/": "teal" } diff --git a/remix_menu.gd b/remix_menu.gd deleted file mode 100644 index 32c88e9..0000000 --- a/remix_menu.gd +++ /dev/null @@ -1,75 +0,0 @@ -class_name RemixMenu -extends Control - -signal cards_remixed(cards_consumed: Array[Card], cards_created: Array[Card]) - -@export var card_ui_one: CardDescriptionUI -@export var card_ui_two: CardDescriptionUI -@export var option_button_one: OptionButton -@export var option_button_two: OptionButton - -var cards: Array[Card] - -var card_one: Card -var card_two: Card - -var temp_card_one: Card -var temp_card_two: Card - - -func add_option(card_options: Array[Card]) -> void: - cards = card_options - for card: Card in cards: - option_button_one.add_item(tr(card.display_name)) - option_button_two.add_item(tr(card.display_name)) - option_button_one.select(0) - set_card_one(0) - option_button_two.select(1) - set_card_two(1) - - -func set_cards(first_card: Card, second_card: Card) -> void: - card_one = first_card - card_two = second_card - - -func set_card_one(option: int) -> void: - card_one = cards[option] - card_ui_one.set_card(card_one, true) - - -func set_card_two(option: int) -> void: - card_two = cards[option] - card_ui_two.set_card(card_two, true) - - -func remix() -> void: - temp_card_one = card_one.duplicate(true) - temp_card_one.tower_stats = temp_card_one.tower_stats.duplicate_deep() - temp_card_one.weapon_stats = temp_card_one.weapon_stats.duplicate_deep() - for feature: Feature in card_two.tower_stats.features: - temp_card_one.tower_stats.features.append(feature) - for feature: Feature in card_two.weapon_stats.features: - temp_card_one.weapon_stats.features.append(feature) - - temp_card_two = card_two.duplicate(true) - temp_card_two.tower_stats = temp_card_two.tower_stats.duplicate_deep() - temp_card_two.weapon_stats = temp_card_two.weapon_stats.duplicate_deep() - for feature: Feature in card_one.tower_stats.features: - temp_card_two.tower_stats.features.append(feature) - for feature: Feature in card_one.weapon_stats.features: - temp_card_two.weapon_stats.features.append(feature) - - card_ui_one.set_card(temp_card_one, true) - card_ui_two.set_card(temp_card_two, true) - - -func _on_button_2_pressed() -> void: - var card_array_one: Array[Card] - var card_array_two: Array[Card] - card_array_one.append(card_one) - card_array_one.append(card_two) - card_array_two.append(temp_card_one) - card_array_two.append(temp_card_two) - cards_remixed.emit(card_array_one, card_array_two) - queue_free() diff --git a/remix_menu.gd.uid b/remix_menu.gd.uid deleted file mode 100644 index eaf6158..0000000 --- a/remix_menu.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ccnvchtd8tlaw diff --git a/remix_menu.tscn b/remix_menu.tscn deleted file mode 100644 index 924ec30..0000000 --- a/remix_menu.tscn +++ /dev/null @@ -1,81 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://cqdft7j5pwg4b"] - -[ext_resource type="Script" uid="uid://ccnvchtd8tlaw" path="res://remix_menu.gd" id="1_jyl8o"] -[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://card_description_ui.tscn" id="2_vjjvi"] - -[node name="Control" type="Control" node_paths=PackedStringArray("card_ui_one", "card_ui_two", "option_button_one", "option_button_two")] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_jyl8o") -card_ui_one = NodePath("PanelContainer/VBoxContainer/HBoxContainer/Card1") -card_ui_two = NodePath("PanelContainer/VBoxContainer/HBoxContainer/Card2") -option_button_one = NodePath("PanelContainer/VBoxContainer/HBoxContainer2/OptionButton") -option_button_two = NodePath("PanelContainer/VBoxContainer/HBoxContainer2/OptionButton2") - -[node name="PanelContainer" type="PanelContainer" parent="."] -layout_mode = 1 -anchors_preset = -1 -anchor_left = 0.03 -anchor_top = 0.03 -anchor_right = 0.97 -anchor_bottom = 0.97 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"] -layout_mode = 2 - -[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 1 -text = "TITLE_REMIX" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="HBoxContainer2" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] -layout_mode = 2 - -[node name="OptionButton" type="OptionButton" parent="PanelContainer/VBoxContainer/HBoxContainer2"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/HBoxContainer2"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_stretch_ratio = 2.0 - -[node name="OptionButton2" type="OptionButton" parent="PanelContainer/VBoxContainer/HBoxContainer2"] -layout_mode = 2 -size_flags_horizontal = 3 - -[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] -layout_mode = 2 -size_flags_vertical = 3 - -[node name="Card1" parent="PanelContainer/VBoxContainer/HBoxContainer" instance=ExtResource("2_vjjvi")] -layout_mode = 2 - -[node name="UI" type="VBoxContainer" parent="PanelContainer/VBoxContainer/HBoxContainer"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_stretch_ratio = 2.0 - -[node name="Button" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer/UI"] -layout_mode = 2 -text = "BUTTON_SHOW_REMIX_RESULT" - -[node name="Button2" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer/UI"] -layout_mode = 2 -text = "BUTTON_CONFIRM_REMIX" - -[node name="Card2" parent="PanelContainer/VBoxContainer/HBoxContainer" instance=ExtResource("2_vjjvi")] -layout_mode = 2 - -[connection signal="item_selected" from="PanelContainer/VBoxContainer/HBoxContainer2/OptionButton" to="." method="set_card_one"] -[connection signal="item_selected" from="PanelContainer/VBoxContainer/HBoxContainer2/OptionButton2" to="." method="set_card_two"] -[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/UI/Button" to="." method="remix"] -[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/UI/Button2" to="." method="_on_button_2_pressed"] diff --git a/resurrect-64-1x.png b/resurrect-64-1x.png deleted file mode 100644 index d4934ae..0000000 Binary files a/resurrect-64-1x.png and /dev/null differ diff --git a/resurrect-64-1x.png.import b/resurrect-64-1x.png.import deleted file mode 100644 index 0d1afb6..0000000 --- a/resurrect-64-1x.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cfbvrwy0x72e6" -path="res://.godot/imported/resurrect-64-1x.png-19790abf6f86dfef7c9c0ca4ad1888b4.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resurrect-64-1x.png" -dest_files=["res://.godot/imported/resurrect-64-1x.png-19790abf6f86dfef7c9c0ca4ad1888b4.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/screencap.png b/screencap.png deleted file mode 100644 index 2d44a8d..0000000 Binary files a/screencap.png and /dev/null differ diff --git a/shield_ui_test.gd b/shield_ui_test.gd deleted file mode 100644 index 628850f..0000000 --- a/shield_ui_test.gd +++ /dev/null @@ -1,24 +0,0 @@ -extends Control - -@export var shield: ShieldUI -@export var lives_bar: LivesBar -@export var damage_label: Label - -var damage: int = 1 - -func increase_damage() -> void: - damage += 1 - damage_label.text = str(damage) - - -func decrease_damage() -> void: - damage -= 1 - if damage < 1: - damage = 1 - damage_label.text = str(damage) - - -func hit() -> void: - shield.take_damage(damage) - for x: int in damage: - lives_bar.take_life() diff --git a/shield_ui_test.gd.uid b/shield_ui_test.gd.uid deleted file mode 100644 index 38fcbe3..0000000 --- a/shield_ui_test.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://biuqlk7ulx83 diff --git a/shield_ui_test.tscn b/shield_ui_test.tscn deleted file mode 100644 index a4e7392..0000000 --- a/shield_ui_test.tscn +++ /dev/null @@ -1,61 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://3t3kdhagmayy"] - -[ext_resource type="Script" uid="uid://biuqlk7ulx83" path="res://shield_ui_test.gd" id="1_uywwg"] -[ext_resource type="PackedScene" uid="uid://cqslp83lf0ku0" path="res://shield_ui.tscn" id="2_iketu"] -[ext_resource type="PackedScene" uid="uid://24x18qxqhy0i" path="res://Scenes/UI/lives_bar.tscn" id="3_eamca"] - -[node name="Control" type="Control" node_paths=PackedStringArray("shield", "lives_bar", "damage_label")] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("1_uywwg") -shield = NodePath("ShieldUI") -lives_bar = NodePath("LivesBar") -damage_label = NodePath("Controls/Label") - -[node name="Controls" type="HBoxContainer" parent="."] -layout_mode = 0 -offset_left = 251.0 -offset_top = 13.0 -offset_right = 311.00003 -offset_bottom = 29.0 - -[node name="Label" type="Label" parent="Controls"] -layout_mode = 2 -text = "1" - -[node name="VBoxContainer" type="HBoxContainer" parent="Controls"] -layout_mode = 2 - -[node name="Button" type="Button" parent="Controls/VBoxContainer"] -layout_mode = 2 -text = "<" - -[node name="Button2" type="Button" parent="Controls/VBoxContainer"] -layout_mode = 2 -text = ">" - -[node name="Button" type="Button" parent="Controls"] -layout_mode = 2 -text = "hit" - -[node name="ShieldUI" parent="." instance=ExtResource("2_iketu")] -layout_mode = 0 -offset_left = 130.0 -offset_top = 31.0 -offset_right = 130.0 -offset_bottom = 31.0 - -[node name="LivesBar" parent="." instance=ExtResource("3_eamca")] -layout_mode = 1 -offset_left = 69.0 -offset_top = 115.0 -offset_right = 69.0 -offset_bottom = 115.0 - -[connection signal="pressed" from="Controls/VBoxContainer/Button" to="." method="decrease_damage"] -[connection signal="pressed" from="Controls/VBoxContainer/Button2" to="." method="increase_damage"] -[connection signal="pressed" from="Controls/Button" to="." method="hit"] diff --git a/test_ui.tscn b/test_ui.tscn index f06704d..11e7f2a 100644 --- a/test_ui.tscn +++ b/test_ui.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://cdrpqvf37mehj" path="res://test_ui.gd" id="1_3tn64"] [ext_resource type="PackedScene" uid="uid://dik1j1w8vrul5" path="res://drag_n_drop_container.tscn" id="1_w4nob"] -[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://feature_ui.tscn" id="2_3tn64"] +[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://UI/FeatureUI/feature_ui.tscn" id="2_3tn64"] [ext_resource type="Script" uid="uid://bsuinotkvh7eu" path="res://Scripts/Resources/feature.gd" id="2_w3nqu"] [ext_resource type="Resource" uid="uid://dfup264h2pun7" path="res://Scripts/Features/HeavyRounds/heavy_rounds_feature.tres" id="3_55qp5"] [ext_resource type="Resource" uid="uid://nh7g23b3rnvr" path="res://Scripts/Features/Radar/radar_feature.tres" id="4_mlaor"] diff --git a/ui_atlas.png b/ui_atlas.png new file mode 100644 index 0000000..813ab80 Binary files /dev/null and b/ui_atlas.png differ diff --git a/panel_tex.png.import b/ui_atlas.png.import similarity index 75% rename from panel_tex.png.import rename to ui_atlas.png.import index 5987267..11012da 100644 --- a/panel_tex.png.import +++ b/ui_atlas.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c5626mx5het1y" -path="res://.godot/imported/panel_tex.png-00e53fe522b0b0e4a7be462402eb65cf.ctex" +uid="uid://b5h32okh8yu6f" +path="res://.godot/imported/ui_atlas.png-aa1aa353e19deb1c1fc500215a2c3959.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://panel_tex.png" -dest_files=["res://.godot/imported/panel_tex.png-00e53fe522b0b0e4a7be462402eb65cf.ctex"] +source_file="res://ui_atlas.png" +dest_files=["res://.godot/imported/ui_atlas.png-aa1aa353e19deb1c1fc500215a2c3959.ctex"] [params]