updated to 4.4, fixed levelup

This commit is contained in:
Luca 2024-11-15 22:27:10 +01:00
parent ce5d12df95
commit cd62e12389
64 changed files with 178 additions and 60 deletions

View file

@ -5,6 +5,9 @@ class_name MonsterList
@onready var monster_list_entry: PackedScene = preload("res://ui/ingame_menu/party_list_entry.tscn")
func _ready() -> void:
# INFO: Add debug heal function for the "Party" button
%PartyButton.pressed.connect(debug_heal)
visible = false
for i: int in range(6):
var entry: Node = monster_list_entry.instantiate()
@ -14,12 +17,20 @@ func _on_close_button_pressed() -> void:
visible = false
func update() -> void:
for i: int in SaveManager.current_save.party.size():
var monster: MonsterData = SaveManager.current_save.party[i]
for i: int in range(6):
var entry: Node = monster_list_entry_container.get_child(i)
entry.update(monster)
if SaveManager.current_save.party.size() >= i+1:
var monster: MonsterData = SaveManager.current_save.party[i]
entry.update(monster)
else:
entry.hide_entry()
func _update_player_info() -> void:
#%PlayerName.text =
pass
func debug_heal() -> void:
Utils.heal_all()
UI.ingame_menu.update()

View file

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

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://bbvbnrcjatkrb"]
[ext_resource type="Script" path="res://ui/ingame_menu/ingame_menu.gd" id="1_beinb"]
[ext_resource type="Script" uid="uid://dlgvxqnux5b76" path="res://ui/ingame_menu/ingame_menu.gd" id="1_beinb"]
[ext_resource type="Texture2D" uid="uid://bhh31i3wgww43" path="res://assets/textures/Game Icons/Vector/2x/singleplayer.png" id="2_c2ia0"]
[ext_resource type="Texture2D" uid="uid://cxry7h4q17lir" path="res://assets/textures/Game Icons/Vector/2x/star.png" id="3_oo4iu"]
@ -33,9 +33,9 @@ layout_mode = 2
[node name="PlayerInfo" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
layout_mode = 2
theme_override_constants/margin_left = 40
theme_override_constants/margin_top = 30
theme_override_constants/margin_right = 40
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10
[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/VBoxContainer/PlayerInfo"]
layout_mode = 2
@ -51,14 +51,14 @@ unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "PLAYER_NAME"
text = "Max"
vertical_alignment = 1
[node name="MoneyValue" type="Label" parent="MarginContainer/PanelContainer/VBoxContainer/PlayerInfo/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "1.000.000"
text = "23.451"
vertical_alignment = 1
[node name="CurrencyIcon" type="TextureRect" parent="MarginContainer/PanelContainer/VBoxContainer/PlayerInfo/HBoxContainer"]
@ -72,15 +72,19 @@ layout_mode = 2
alignment = 1
[node name="PartyButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/HBoxContainer2"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
text = "Party"
[node name="Items" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/HBoxContainer2"]
layout_mode = 2
size_flags_horizontal = 3
text = "Items"
[node name="Player" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/HBoxContainer2"]
layout_mode = 2
size_flags_horizontal = 3
text = "Player"
[node name="MonsterInfoTitle" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
@ -115,11 +119,10 @@ theme_override_constants/margin_bottom = 32
[node name="CloseButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/CloseButtonContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(150, 0)
layout_mode = 2
size_flags_horizontal = 4
theme_type_variation = &"RedButton"
text = "Close"
icon_alignment = 1
expand_icon = true
[connection signal="pressed" from="MarginContainer/PanelContainer/VBoxContainer/CloseButtonContainer/CloseButton" to="." method="_on_close_button_pressed"]

View file

@ -1,11 +1,21 @@
extends PanelContainer
class_name PartyListEntry
func _ready() -> void:
$HBoxContainer.modulate.a = 0.0
func hide_entry() -> void:
$HBoxContainer.modulate.a = 0.0
func update(monster: MonsterData) -> void:
%MonsterID.text = str(0)
%MonsterName.text = monster.name
%MonsterLevel.text = "Lvl. %s" % monster.level
%HealthProgressBar.value = monster.current_health
%HealthProgressBar.max_value = monster.health
%ExperienceProgressBar.value = monster.xp
%ExperienceProgressBar.max_value = monster.xp_for_levelup
$HBoxContainer.modulate.a = 1.0
%MonsterID.text = str(0)
%MonsterName.text = monster.name
%MonsterLevel.text = "Lvl. %s" % monster.level
%HealthProgressBar.value = monster.current_health
%HealthProgressBar.max_value = monster.health
%ExperienceProgressBar.value = monster.xp
%ExperienceProgressBar.max_value = monster.xp_for_levelup
%MonsterATK.text = "ATK: " + str(monster.attack)
%MonsterDEF.text = "DEF: " + str(monster.defense)
%MonsterXP.text = "XP: " + str(monster.xp) + "/" + str(monster.xp_for_levelup)

View file

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

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://brp2sljqnkuhe"]
[ext_resource type="Script" path="res://ui/ingame_menu/party_list_entry.gd" id="1_gdhy7"]
[ext_resource type="Script" uid="uid://dxa5lmd7juge3" path="res://ui/ingame_menu/party_list_entry.gd" id="1_gdhy7"]
[ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="2_rogma"]
[ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="3_etjt6"]
@ -80,7 +80,6 @@ theme_override_constants/separation = 0
[node name="HealthProgressBar" type="ProgressBar" parent="HBoxContainer/VBoxContainer/ProgressBarContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 4
theme_override_styles/background = SubResource("StyleBoxFlat_s3mod")
theme_override_styles/fill = SubResource("StyleBoxFlat_nb1sm")
@ -90,6 +89,7 @@ show_percentage = false
[node name="ExperienceProgressBar" type="ProgressBar" parent="HBoxContainer/VBoxContainer/ProgressBarContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 5)
layout_mode = 2
theme_override_styles/background = SubResource("StyleBoxFlat_fkb5g")
theme_override_styles/fill = SubResource("StyleBoxFlat_b4pov")
@ -97,6 +97,24 @@ step = 1.0
rounded = true
show_percentage = false
[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/VBoxContainer"]
layout_mode = 2
[node name="MonsterATK" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "ATK: 0"
[node name="MonsterDEF" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "DEF: 0"
[node name="MonsterXP" type="Label" parent="HBoxContainer/VBoxContainer/HBoxContainer"]
unique_name_in_owner = true
layout_mode = 2
text = "XP: 0"
[node name="SwapPositionButton" type="Button" parent="HBoxContainer"]
unique_name_in_owner = true
self_modulate = Color(0, 0, 0, 1)
@ -104,7 +122,7 @@ custom_minimum_size = Vector2(30, 30)
layout_mode = 2
size_flags_horizontal = 8
size_flags_vertical = 4
theme_override_constants/icon_max_width = 32
theme_override_constants/icon_max_width = 60
icon = ExtResource("3_etjt6")
flat = true
icon_alignment = 1