From c8f674ac6fa0914d9e448d2929f2385cdad80d60 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Tue, 5 Nov 2024 11:34:49 +0100 Subject: next commit --- Stages/Wintermaul/HUD.tscn | 76 +++++++++++++++++++++++++-------------- Stages/Wintermaul/Wintermaul.tscn | 1 + Stages/Wintermaul/wintermaul.gd | 2 +- 3 files changed, 51 insertions(+), 28 deletions(-) (limited to 'Stages/Wintermaul') diff --git a/Stages/Wintermaul/HUD.tscn b/Stages/Wintermaul/HUD.tscn index 7ec86b5..9c8a575 100644 --- a/Stages/Wintermaul/HUD.tscn +++ b/Stages/Wintermaul/HUD.tscn @@ -1,24 +1,37 @@ -[gd_scene load_steps=25 format=3 uid="uid://bylx30cweulmk"] +[gd_scene load_steps=38 format=3 uid="uid://bylx30cweulmk"] [ext_resource type="Script" path="res://Stages/Wintermaul/HUD.gd" id="1_2bu0v"] -[ext_resource type="Texture2D" uid="uid://dlg78heamuf5g" path="res://Assets/UI/tilemap_white.png" id="2_dyehp"] +[ext_resource type="Texture2D" uid="uid://dlg78heamuf5g" path="res://UI/Assets/Icons/tilemap_white.png" id="2_dyehp"] [ext_resource type="PackedScene" uid="uid://x6kohecnw7f5" path="res://UI/SpawnButton.tscn" id="3_7eaea"] -[ext_resource type="Texture2D" uid="uid://up1rtweit3ut" path="res://Assets/Mobs/angesnow-menu01.png" id="4_w7sef"] [ext_resource type="PackedScene" uid="uid://dslebs7aarkoa" path="res://UI/panel_background_blue.tscn" id="4_x1gx8"] [ext_resource type="Theme" uid="uid://c7f1ftrx53ag1" path="res://theme.tres" id="5_121ry"] [ext_resource type="PackedScene" uid="uid://ei0ai7om3mkw" path="res://Stages/Wintermaul/hud_tower.tscn" id="5_hbytm"] -[ext_resource type="Texture2D" uid="uid://dq2i36oe1wj0m" path="res://Assets/Mobs/mob-pressed.png" id="5_xcxr8"] -[ext_resource type="Texture2D" uid="uid://dnkr5y0cfxu68" path="res://Assets/Mobs/mob-hovered.png" id="6_4go2d"] -[ext_resource type="Texture2D" uid="uid://dsy7k2v5fhh6v" path="res://Assets/Mobs/angesnow-front.png" id="7_ba5tw"] -[ext_resource type="Texture2D" uid="uid://dsui46tcf0pys" path="res://Assets/Mobs/banling-menu01.png" id="8_wmbg8"] -[ext_resource type="Texture2D" uid="uid://d3modiw2b30kh" path="res://Assets/Mobs/banling-front.png" id="9_nmd8t"] -[ext_resource type="Texture2D" uid="uid://75o7x0jadi08" path="res://Assets/Mobs/firomenis-menu01.png" id="10_daowa"] -[ext_resource type="Texture2D" uid="uid://bxr5ckrvhyp1t" path="res://Assets/Mobs/firomenis-front.png" id="11_yxcwt"] -[ext_resource type="Texture2D" uid="uid://byrx3c087exvb" path="res://Assets/Mobs/windeye-menu01.png" id="12_20egp"] -[ext_resource type="Texture2D" uid="uid://coiiq1yaonxeg" path="res://Assets/Mobs/windeye-front.png" id="13_iq5a7"] -[ext_resource type="Texture2D" uid="uid://dr02nqmrnciy0" path="res://Assets/Mobs/mob.png" id="14_t3qlu"] +[ext_resource type="Texture2D" uid="uid://dq2i36oe1wj0m" path="res://Units/Assets/mob-pressed.png" id="5_xcxr8"] +[ext_resource type="Texture2D" uid="uid://dnkr5y0cfxu68" path="res://Units/Assets/mob-hovered.png" id="6_4go2d"] +[ext_resource type="Texture2D" uid="uid://bxq68idyeo6gm" path="res://UI/Assets/Button_Green_9Slides_2.png" id="6_ru5yo"] +[ext_resource type="Texture2D" uid="uid://dsy7k2v5fhh6v" path="res://Units/Assets/angesnow-front.png" id="7_ba5tw"] +[ext_resource type="Texture2D" uid="uid://d3modiw2b30kh" path="res://Units/Assets/banling-front.png" id="9_nmd8t"] +[ext_resource type="Texture2D" uid="uid://dxj34mvmeao53" path="res://Units/Assets/Pekora/menu.png" id="10_ad8mc"] +[ext_resource type="Texture2D" uid="uid://cfqgrcn3ivern" path="res://Units/Assets/Pekora/menu_pressed.png" id="11_muxro"] +[ext_resource type="Texture2D" uid="uid://bxr5ckrvhyp1t" path="res://Units/Assets/firomenis-front.png" id="11_yxcwt"] +[ext_resource type="Texture2D" uid="uid://4bccmd5q1alb" path="res://Units/Assets/Pekora/menu_hover.png" id="12_540qu"] +[ext_resource type="Texture2D" uid="uid://coiiq1yaonxeg" path="res://Units/Assets/windeye-front.png" id="13_iq5a7"] +[ext_resource type="SpriteFrames" uid="uid://c6o6hpltnsds0" path="res://Units/Assets/Pekora/sprite_frames.tres" id="14_0x0h2"] +[ext_resource type="Texture2D" uid="uid://dr02nqmrnciy0" path="res://Units/Assets/mob.png" id="14_t3qlu"] +[ext_resource type="Texture2D" uid="uid://uy7jqeqnemvv" path="res://Units/Assets/NinomaeInanis/menu.png" id="15_7yrxb"] +[ext_resource type="Texture2D" uid="uid://drpox2degox52" path="res://Units/Assets/NinomaeInanis/menu_pressed.png" id="16_77ajg"] [ext_resource type="PackedScene" uid="uid://cxd6c4kbnk04c" path="res://UI/PlayersList.tscn" id="16_mq4um"] [ext_resource type="PackedScene" uid="uid://c05aq7xd4kx1p" path="res://UI/TowerConfiguration.tscn" id="17_1c5dq"] +[ext_resource type="SpriteFrames" uid="uid://5kv5733tpf16" path="res://Units/Assets/NinomaeInanis/sprite_frames.tres" id="17_hp6oc"] +[ext_resource type="Texture2D" uid="uid://cai6it8es6djw" path="res://Units/Assets/NinomaeInanis/menu_hover.png" id="17_k5kqo"] +[ext_resource type="SpriteFrames" uid="uid://c8ml3xlpt0mqg" path="res://Units/Assets/LaPlusDarkness/sprite_frames.tres" id="20_xc6s7"] +[ext_resource type="Texture2D" uid="uid://hsm230qk8hu" path="res://Units/Assets/LaPlusDarkness/menu.png" id="20_xigo6"] +[ext_resource type="Texture2D" uid="uid://jmtstn5t6a6j" path="res://Units/Assets/LaPlusDarkness/menu_pressed.png" id="21_4fyiv"] +[ext_resource type="Texture2D" uid="uid://nge6xe2exfcp" path="res://Units/Assets/LaPlusDarkness/menu_hover.png" id="22_471yj"] +[ext_resource type="Texture2D" uid="uid://chbq7reyacgga" path="res://Units/Assets/Penguin/menu.png" id="25_vpb52"] +[ext_resource type="Texture2D" uid="uid://dnkrgble5f8g0" path="res://Units/Assets/Penguin/menu_pressed.png" id="26_tgyag"] +[ext_resource type="Texture2D" uid="uid://d1jxmbpc8f6pi" path="res://Units/Assets/Penguin/menu_hover.png" id="27_5tp6y"] +[ext_resource type="SpriteFrames" uid="uid://d4a8tje703fp3" path="res://Units/Assets/Penguin/sprite_frames.tres" id="29_p4pru"] [sub_resource type="AtlasTexture" id="AtlasTexture_byi0r"] atlas = ExtResource("2_dyehp") @@ -44,7 +57,10 @@ script = ExtResource("1_2bu0v") [node name="Panel" type="PanelContainer" parent="."] anchors_preset = 10 anchor_right = 1.0 -offset_bottom = 29.0 +offset_left = 4.0 +offset_top = 4.0 +offset_right = -4.0 +offset_bottom = 68.0 grow_horizontal = 2 theme = ExtResource("5_121ry") @@ -162,9 +178,9 @@ anchors_preset = 1 anchor_left = 1.0 anchor_right = 1.0 offset_left = -288.0 -offset_top = 67.0 +offset_top = 71.0 offset_right = -4.0 -offset_bottom = 199.0 +offset_bottom = 203.0 grow_horizontal = 0 mouse_filter = 0 theme = ExtResource("5_121ry") @@ -225,6 +241,7 @@ mouse_filter = 1 [node name="PanelBackgroundBlue" parent="MarginContainer/HBoxContainer/TowerConfigurationsContainer" instance=ExtResource("4_x1gx8")] layout_mode = 2 +texture = ExtResource("6_ru5yo") [node name="MarginContainer" type="MarginContainer" parent="MarginContainer/HBoxContainer/TowerConfigurationsContainer"] layout_mode = 2 @@ -316,31 +333,36 @@ columns = 4 [node name="SpawnButton" parent="MarginContainer/HBoxContainer/SpawnBox/MarginContainer/GridContainer" instance=ExtResource("3_7eaea")] layout_mode = 2 theme = ExtResource("5_121ry") -texture_normal = ExtResource("4_w7sef") -texture_pressed = ExtResource("5_xcxr8") -texture_hover = ExtResource("6_4go2d") +texture_normal = ExtResource("10_ad8mc") +texture_pressed = ExtResource("11_muxro") +texture_hover = ExtResource("12_540qu") texture = ExtResource("7_ba5tw") +sprite_sheet = ExtResource("14_0x0h2") [node name="SpawnButton2" parent="MarginContainer/HBoxContainer/SpawnBox/MarginContainer/GridContainer" instance=ExtResource("3_7eaea")] layout_mode = 2 shortcut = SubResource("Shortcut_i6rmj") -texture_normal = ExtResource("8_wmbg8") -texture_hover = ExtResource("6_4go2d") +texture_normal = ExtResource("15_7yrxb") +texture_pressed = ExtResource("16_77ajg") +texture_hover = ExtResource("17_k5kqo") texture = ExtResource("9_nmd8t") +sprite_sheet = ExtResource("17_hp6oc") [node name="SpawnButton3" parent="MarginContainer/HBoxContainer/SpawnBox/MarginContainer/GridContainer" instance=ExtResource("3_7eaea")] layout_mode = 2 -texture_normal = ExtResource("10_daowa") -texture_pressed = ExtResource("5_xcxr8") -texture_hover = ExtResource("6_4go2d") +texture_normal = ExtResource("20_xigo6") +texture_pressed = ExtResource("21_4fyiv") +texture_hover = ExtResource("22_471yj") texture = ExtResource("11_yxcwt") +sprite_sheet = ExtResource("20_xc6s7") [node name="SpawnButton4" parent="MarginContainer/HBoxContainer/SpawnBox/MarginContainer/GridContainer" instance=ExtResource("3_7eaea")] layout_mode = 2 -texture_normal = ExtResource("12_20egp") -texture_pressed = ExtResource("5_xcxr8") -texture_hover = ExtResource("6_4go2d") +texture_normal = ExtResource("25_vpb52") +texture_pressed = ExtResource("26_tgyag") +texture_hover = ExtResource("27_5tp6y") texture = ExtResource("13_iq5a7") +sprite_sheet = ExtResource("29_p4pru") [node name="SpawnButton5" parent="MarginContainer/HBoxContainer/SpawnBox/MarginContainer/GridContainer" instance=ExtResource("3_7eaea")] layout_mode = 2 diff --git a/Stages/Wintermaul/Wintermaul.tscn b/Stages/Wintermaul/Wintermaul.tscn index c19a766..10a097e 100644 --- a/Stages/Wintermaul/Wintermaul.tscn +++ b/Stages/Wintermaul/Wintermaul.tscn @@ -41,6 +41,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +mouse_filter = 2 color = Color(0, 0, 0, 1) [node name="HUD" parent="." instance=ExtResource("2_v3f6l")] diff --git a/Stages/Wintermaul/wintermaul.gd b/Stages/Wintermaul/wintermaul.gd index 078edc6..081d18a 100644 --- a/Stages/Wintermaul/wintermaul.gd +++ b/Stages/Wintermaul/wintermaul.gd @@ -59,7 +59,7 @@ func _ready(): if multiplayer.is_server(): for player in Network.get_players(): Network.update_player.rpc(player.id, { - "money": 50 * 1000, + "money": 50, "income": 5, }) -- cgit v1.2.3