sowelilekusi/mtd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oh man i fixed that status effect bug

Browse Source
This commit is contained in:
Lexi Quinn
2025-06-07 09:11:13 +10:00
parent c44a730b59
commit 400415f8a5
40 changed files with 648 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Scenes/CardPrinter/card_printer.gd
View File

@ -1,7 +1,6 @@
class_name CardPrinter extends StaticBody3D
@export var button_collider: CollisionShape3D
@export var button_box: Node3D
#TODO: use faction enum
var base_faction: int = 1
@ -37,6 +36,7 @@ func generate_rarity() -> int:
func randomize_cards(faction: Card.Faction) -> void:
#TODO: no magic numbers, asshole! 3 = cards to spawn
var pos_x: float = 0.0
for x: int in 3:
var decided_rarity: int = generate_rarity()
var card_choices: Array[Card] = get_faction_cards(faction)
@ -58,7 +58,10 @@ func randomize_cards(faction: Card.Faction) -> void:
card_array.erase(card)
var item: CardItem = reply_player.hero_class.card_item.instantiate() as CardItem
item.set_card(card)
item.position = Vector3(x, 1, 2)
item.position = Vector3(pos_x, 2, 0)
pos_x *= -1
if pos_x >= 0:
pos_x += 1.25
item.pressed.connect(card_picked_up)
spawned_cards.append(item)
add_child(item)
@ -71,13 +74,11 @@ func card_picked_up(card_item: CardItem) -> void:
spawned_card.queue_free()
spawned_cards = []
button_collider.disabled = false
button_box.position = Vector3(0,0,0)
$StaticBody3D/AudioStreamPlayer3D.play()
func _on_static_body_3d_button_interacted(_value: int, reply: Hero) -> void:
reply_player = reply
button_collider.disabled = true
button_box.position = Vector3(0,0,-0.2)
$StaticBody3D/AudioStreamPlayer3D.play()
randomize_cards(reply.hero_class.faction)

29
Scenes/CardPrinter/card_printer.tscn
View File

@ -2,34 +2,26 @@
[ext_resource type="Script" uid="uid://bivtfdl3p1brv" path="res://Scenes/CardPrinter/card_printer.gd" id="1_qft15"]
[ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="4_eavi1"]
[ext_resource type="PackedScene" uid="uid://b6i5w3mowcfcs" path="res://drafting_table.glb" id="4_kpujb"]
[ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="5_m033a"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_s02au"]
albedo_color = Color(0.203922, 0.592157, 0.592157, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_0ebt5"]
size = Vector3(2, 2.1, 1)
size = Vector3(2.17, 1.55307, 1.12)
[sub_resource type="BoxShape3D" id="BoxShape3D_ikdwj"]
size = Vector3(1.29447, 0.342125, 0.277604)
size = Vector3(2.20033, 0.260753, 1.27008)
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_73g2w"]
random_pitch = 1.1
streams_count = 1
stream_0/stream = ExtResource("5_m033a")
[node name="CardPrinter" type="StaticBody3D" node_paths=PackedStringArray("button_collider", "button_box")]
[node name="CardPrinter" type="StaticBody3D" node_paths=PackedStringArray("button_collider")]
script = ExtResource("1_qft15")
button_collider = NodePath("StaticBody3D/CollisionShape3D2")
button_box = NodePath("StaticBody3D/CollisionShape3D2/CSGBox3D")
[node name="CSGBox3D" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05, 0)
size = Vector3(2, 2.1, 1)
material = SubResource("StandardMaterial3D_s02au")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.776539, 0.0332634)
shape = SubResource("BoxShape3D_0ebt5")
[node name="StaticBody3D" type="StaticBody3D" parent="."]
@ -38,17 +30,18 @@ collision_layer = 16
collision_mask = 0
script = ExtResource("4_eavi1")
press_cost = 15
hover_text = "[center]#Interact# to spend $15 on random card"
hover_text = "[center]#Interact# draft a card for $15"
[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 0.866025, -0.5, 0, 0.5, 0.866025, -6.55949e-05, 0.349496, -0.579584)
shape = SubResource("BoxShape3D_ikdwj")
[node name="CSGBox3D" type="CSGBox3D" parent="StaticBody3D/CollisionShape3D2"]
size = Vector3(1.29447, 0.342125, 0.277604)
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.010989, -0.086501)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.578748, -0.587001)
stream = SubResource("AudioStreamRandomizer_73g2w")
bus = &"SFX"
[node name="drafting_table" parent="." instance=ExtResource("4_kpujb")]
transform = Transform3D(0.06, 0, 0, 0, 0.06, 0, 0, 0, 0.06, 0, 0.385809, 0)
[connection signal="button_interacted" from="StaticBody3D" to="." method="_on_static_body_3d_button_interacted"]

4
Scenes/Menus/CharacterSelect/character_podium.gd
View File

@ -1,3 +1,7 @@
class_name CharacterPodium extends Node3D
@export var text: String = ""
func show_content() -> void:
$Base/Content.visible = true

5
Scenes/Menus/CharacterSelect/character_select.gd
View File

@ -23,8 +23,9 @@ func _ready() -> void:
pivot.add_child(podium)
pivot.rotate_y((TAU / heroes) * x)
x += 1
#if Data.save_data.mage_unlocked:
#podiums.visible = true
podiums[0].show_content()
if Data.save_data.mage_unlocked:
podiums[1].show_content()
func reset_button() -> void:

6
Scenes/Menus/MainMenu/main_menu.gd
View File

@ -21,11 +21,11 @@ func _ready() -> void:
load_stats(Data.save_data)
bg_level.a_star_graph_3d.make_grid()
bg_level.a_star_graph_3d.find_path()
bg_level.a_star_graph_3d.build_random_maze(50)
bg_level.a_star_graph_3d.place_random_towers(20)
bg_level.a_star_graph_3d.build_random_maze(70)
bg_level.a_star_graph_3d.place_random_towers(30)
bg_level.a_star_graph_3d.disable_all_tower_frames()
Game.level = bg_level
WaveManager.generate_wave(1000, bg_level.enemy_pool, bg_level.enemy_spawns)
WaveManager.generate_wave(WaveManager.calculate_spawn_power(50, 4), bg_level.enemy_pool, bg_level.enemy_spawns)
for spawn: EnemySpawner in bg_level.enemy_spawns:
spawn.enemy_died_callback = enemy_died
spawn.enemy_reached_goal_callback = damage_goal

30
Scenes/Menus/MainMenu/main_menu.tscn
View File

@ -23,19 +23,19 @@
[sub_resource type="ViewportTexture" id="ViewportTexture_5u75i"]
viewport_path = NodePath("SubViewport")
[sub_resource type="AtlasTexture" id="AtlasTexture_sv1gy"]
[sub_resource type="AtlasTexture" id="AtlasTexture_6t4jd"]
resource_local_to_scene = true
atlas = ExtResource("8_1vnym")
region = Rect2(0, 0, 32, 32)
[sub_resource type="Resource" id="Resource_6t4jd"]
[sub_resource type="Resource" id="Resource_y5bw6"]
resource_local_to_scene = true
script = ExtResource("5_u514r")
title = "dog"
target_type = 1
icon = ExtResource("7_2sylv")
death_sprite = ExtResource("6_rsxwm")
sprite = SubResource("AtlasTexture_sv1gy")
sprite = SubResource("AtlasTexture_6t4jd")
spawn_power = 10
health = 180
penalty = 10
@ -83,7 +83,7 @@ game_select_menu = NodePath("GameSelectMenu")
main_controls = NodePath("MainControls")
seed_entry = NodePath("GameSelectMenu/VBoxContainer/HBoxContainer2/LineEdit")
profile_controls = NodePath("ProfileEditor")
mods_controls = NodePath("PanelContainer")
mods_controls = NodePath("ModsMenu")
[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 1
@ -186,7 +186,7 @@ text = "View Profile"
size = Vector2i(1920, 1080)
[node name="GridMap" parent="SubViewport" instance=ExtResource("3_l8r4a")]
enemy_pool = Array[ExtResource("5_u514r")]([SubResource("Resource_6t4jd"), ExtResource("9_hdp0s"), ExtResource("10_day26"), ExtResource("11_1mes0"), ExtResource("12_5vny5"), ExtResource("13_xb7gj")])
enemy_pool = Array[ExtResource("5_u514r")]([SubResource("Resource_y5bw6"), ExtResource("9_hdp0s"), ExtResource("10_day26"), ExtResource("11_1mes0"), ExtResource("12_5vny5"), ExtResource("13_xb7gj")])
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = SubResource("AudioStreamRandomizer_2jyua")
@ -559,7 +559,7 @@ icon = SubResource("AtlasTexture_3aj5m")
icon_alignment = 1
expand_icon = true
[node name="PanelContainer" type="PanelContainer" parent="."]
[node name="ModsMenu" type="PanelContainer" parent="."]
visible = false
layout_mode = 1
anchors_preset = 8
@ -575,32 +575,32 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("19_6t4jd")
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="ModsMenu"]
layout_mode = 2
[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"]
[node name="Label" type="Label" parent="ModsMenu/VBoxContainer"]
layout_mode = 2
text = "Mods"
horizontal_alignment = 1
vertical_alignment = 1
[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/VBoxContainer"]
[node name="ScrollContainer" type="ScrollContainer" parent="ModsMenu/VBoxContainer"]
custom_minimum_size = Vector2(800, 400)
layout_mode = 2
[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/ScrollContainer"]
[node name="VBoxContainer" type="VBoxContainer" parent="ModsMenu/VBoxContainer/ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 3
[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
[node name="HBoxContainer" type="HBoxContainer" parent="ModsMenu/VBoxContainer"]
layout_mode = 2
alignment = 2
[node name="CancelMods" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer"]
[node name="CancelMods" type="Button" parent="ModsMenu/VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Confirm"
[node name="ConfirmMods" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer"]
[node name="ConfirmMods" type="Button" parent="ModsMenu/VBoxContainer/HBoxContainer"]
layout_mode = 2
text = "Confirm"
@ -627,5 +627,5 @@ text = "Confirm"
[connection signal="pressed" from="ProfileManager/VBoxContainer/Controls/Cancel" to="." method="_on_profile_manager_cancel_pressed"]
[connection signal="pressed" from="ProfileManager/VBoxContainer/Controls/Confirm" to="." method="_on_profile_manager_confirm_pressed"]
[connection signal="pressed" from="AchievementsMenu/VBoxContainer/HBoxContainer/Button" to="." method="_on_achievements_back_button_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/CancelMods" to="." method="_on_cancel_mods_pressed"]
[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/ConfirmMods" to="." method="_on_confirm_mods_pressed"]
[connection signal="pressed" from="ModsMenu/VBoxContainer/HBoxContainer/CancelMods" to="." method="_on_cancel_mods_pressed"]
[connection signal="pressed" from="ModsMenu/VBoxContainer/HBoxContainer/ConfirmMods" to="." method="_on_confirm_mods_pressed"]