moved to new understanding of what a wave is

This commit is contained in:
2026-02-07 10:35:03 +11:00
parent 8f14012fff
commit fd9b62faba
41 changed files with 131 additions and 474 deletions

View File

@@ -1,23 +0,0 @@
class_name EnemyCardUI
extends Control
@export var enemy_name: Label
@export var enemy_rarity: TextureRect
@export var enemy_tex: TextureRect
@export var enemy_count: Label
func set_enemy(enemy: EnemyCard) -> void:
enemy_name.text = tr(enemy.enemy.title)
enemy_rarity.texture.region = Rect2(0.0, 92.0 - (23.0 * int(enemy.rarity)), 124.0, 23.0)
enemy_tex.texture = enemy.enemy.icon
if enemy.rarity == Data.Rarity.COMMON:
enemy_count.text = str(enemy.enemy.common_group)
elif enemy.rarity == Data.Rarity.UNCOMMON:
enemy_count.text = str(enemy.enemy.uncommon_group)
elif enemy.rarity == Data.Rarity.RARE:
enemy_count.text = str(enemy.enemy.rare_group)
elif enemy.rarity == Data.Rarity.EPIC:
enemy_count.text = str(enemy.enemy.epic_group)
elif enemy.rarity == Data.Rarity.LEGENDARY:
enemy_count.text = str(enemy.enemy.legendary_group)

View File

@@ -1 +0,0 @@
uid://b8j7mw1xwisi

View File

@@ -1,76 +0,0 @@
[gd_scene format=3 uid="uid://d17c77pqsi8oy"]
[ext_resource type="Script" uid="uid://b8j7mw1xwisi" path="res://UI/EnemyCard/enemy_card_ui.gd" id="1_i1ei4"]
[ext_resource type="Texture2D" uid="uid://g00wwrlxxdc5" path="res://Assets/Textures/icon_eye_dog.png" id="2_3r04h"]
[ext_resource type="Texture2D" uid="uid://c7tnda7he8u5l" path="res://Assets/Textures/stars_legendary-Sheet.png" id="3_uu1bb"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_uu1bb"]
bg_color = Color(0.691357, 0.691357, 0.691357, 1)
corner_radius_top_left = 15
corner_radius_top_right = 15
corner_radius_bottom_right = 15
corner_radius_bottom_left = 15
expand_margin_left = 5.0
expand_margin_top = 5.0
expand_margin_right = 5.0
expand_margin_bottom = 5.0
[sub_resource type="AtlasTexture" id="AtlasTexture_4b8gd"]
resource_local_to_scene = true
atlas = ExtResource("3_uu1bb")
region = Rect2(0, 0, 124, 23)
[node name="EnemyCardUI" type="Control" unique_id=478697806 node_paths=PackedStringArray("enemy_name", "enemy_rarity", "enemy_tex", "enemy_count")]
layout_mode = 3
anchors_preset = 0
mouse_filter = 2
script = ExtResource("1_i1ei4")
enemy_name = NodePath("PanelContainer/HBoxContainer/EnemyName")
enemy_rarity = NodePath("PanelContainer/HBoxContainer/HBoxContainer/TextureRect")
enemy_tex = NodePath("PanelContainer/HBoxContainer/TextureRect")
enemy_count = NodePath("PanelContainer/HBoxContainer/HBoxContainer/Amount")
[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1907664316]
custom_minimum_size = Vector2(0, 300)
layout_mode = 0
offset_right = 241.0
offset_bottom = 138.0
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_uu1bb")
[node name="HBoxContainer" type="VBoxContainer" parent="PanelContainer" unique_id=1742421495]
layout_mode = 2
mouse_filter = 2
[node name="EnemyName" type="Label" parent="PanelContainer/HBoxContainer" unique_id=1041834460]
layout_mode = 2
size_flags_vertical = 0
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "enemy name"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect" type="TextureRect" parent="PanelContainer/HBoxContainer" unique_id=799830247]
layout_mode = 2
size_flags_vertical = 3
mouse_filter = 2
texture = ExtResource("2_3r04h")
expand_mode = 1
stretch_mode = 5
[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/HBoxContainer" unique_id=763649452]
layout_mode = 2
size_flags_vertical = 8
[node name="Amount" type="Label" parent="PanelContainer/HBoxContainer/HBoxContainer" unique_id=987748659]
layout_mode = 2
size_flags_horizontal = 3
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "15"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect" type="TextureRect" parent="PanelContainer/HBoxContainer/HBoxContainer" unique_id=1523958658]
layout_mode = 2
texture = SubResource("AtlasTexture_4b8gd")
stretch_mode = 5

View File

@@ -1,10 +1,10 @@
class_name MainMenuLevelSelector extends PanelContainer
signal level_selected(specs: LevelSpecs, side_chosen: int)
signal level_selected(specs: LevelConfig, side_chosen: int)
var side: int = 0
@export var levels: Array[LevelSpecs] = []
@export var levels: Array[LevelConfig] = []
func _on_button_pressed() -> void:
side = 0
@@ -18,7 +18,7 @@ func _on_button_2_pressed() -> void:
func _ready() -> void:
var i: int = 0
for level: LevelSpecs in levels:
for level: LevelConfig in levels:
i += 1
var button: Button = Button.new()
button.text = "Level " + str(i)

View File

@@ -118,11 +118,11 @@ func generate_seed() -> void:
gamemode.rng_seed = randi()
func level_selected(level: LevelSpecs, side: int) -> void:
func level_selected(level: LevelConfig, side: int) -> void:
generate_seed()
gamemode.endless = true if side == 1 else false
gamemode.daily = false
game.level_specs = level
game.level_config = level
start_game()

View File

@@ -4,7 +4,7 @@
[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="Script" uid="uid://bwsw4oq150v3p" path="res://UI/Menus/MainMenu/level_selecter_main_menu.gd" id="8_qshe4"]
[ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://Scripts/Resources/level_specs.gd" id="9_nt3t4"]
[ext_resource type="Script" uid="uid://dalgif6huggwg" path="res://Scripts/Resources/level_config.gd" id="9_nt3t4"]
[ext_resource type="Resource" uid="uid://b67b70x1uf2el" path="res://Levels/Level1/specs.tres" id="10_kjkav"]
[ext_resource type="Resource" uid="uid://dffoufw4bnfn7" path="res://Levels/Level2/specs.tres" id="11_kjkav"]
[ext_resource type="Resource" uid="uid://dgrcneuv4fut" path="res://Levels/Level3/specs.tres" id="12_eonxx"]