added sounds to ui and game, prepared interaction with character
This commit is contained in:
parent
b5ace17da9
commit
21d7cf417a
42 changed files with 450 additions and 155 deletions
|
|
@ -2,6 +2,14 @@ extends Control
|
|||
|
||||
@onready var battle_moves_menu: VBoxContainer = %BattleMovesMenu
|
||||
|
||||
@onready var party_fighter_level: Label = %PartyFighterLevel
|
||||
@onready var party_fighter_name: Label = %PartyFighterName
|
||||
@onready var party_fighter_healthbar: ProgressBar = %PartyFighterHealthbar
|
||||
|
||||
@onready var enemy_monster_level: Label = %EnemyMonsterLevel
|
||||
@onready var enemy_monster_name: Label = %EnemyMonsterName
|
||||
@onready var enemy_monster_healthbar: ProgressBar = %EnemyMonsterHealthbar
|
||||
|
||||
var move_button: PackedScene = preload("res://ui/battle_ui/battle_move_button.tscn")
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
|
|
@ -15,15 +23,15 @@ func update() -> void:
|
|||
var player: Node3D = Utils.get_player()
|
||||
var player_fighter: MonsterData = SaveManager.current_save.party[0] as MonsterData
|
||||
|
||||
%PartyFighterLevel.text = "Lv. %s" % str(player_fighter.level)
|
||||
%PartyFighterName.text = player_fighter.nickname if not player_fighter.nickname.is_empty() else player_fighter.name
|
||||
%PartyFighterHealthbar.max_value = player_fighter.health
|
||||
%PartyFighterHealthbar.value = player_fighter.current_health
|
||||
party_fighter_level.text = "Lv. %s" % str(player_fighter.level)
|
||||
party_fighter_name.text = player_fighter.nickname if not player_fighter.nickname.is_empty() else player_fighter.name
|
||||
party_fighter_healthbar.max_value = player_fighter.health
|
||||
party_fighter_healthbar.value = player_fighter.current_health
|
||||
|
||||
%EnemyMonsterLevel.text = "Lv. %s" % player.enemy.data.level
|
||||
%EnemyMonsterName.text = player.enemy.data.name
|
||||
%EnemyMonsterHealthbar.max_value = player.enemy.data.health
|
||||
%EnemyMonsterHealthbar.value = player.enemy.data.current_health
|
||||
enemy_monster_level.text = "Lv. %s" % player.enemy.data.level
|
||||
enemy_monster_name.text = player.enemy.data.name
|
||||
enemy_monster_healthbar.max_value = player.enemy.data.health
|
||||
enemy_monster_healthbar.value = player.enemy.data.current_health
|
||||
|
||||
func _on_battle_button_pressed() -> void:
|
||||
print("attacking enemy")
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
[gd_scene load_steps=21 format=3 uid="uid://dyroahq85mhws"]
|
||||
[gd_scene load_steps=13 format=3 uid="uid://dyroahq85mhws"]
|
||||
|
||||
[ext_resource type="Script" path="res://ui/battle_ui/battle_ui.gd" id="1_jyqir"]
|
||||
[ext_resource type="Texture2D" uid="uid://ve2k0qrfpwxw" path="res://assets/textures/Generic/Vector/generic_button_circle_fill.svg" id="2_keyyt"]
|
||||
[ext_resource type="Texture2D" uid="uid://4t8cotroofge" path="res://assets/textures/Game Icons/Vector/2x/upRight.png" id="3_fa6tk"]
|
||||
[ext_resource type="StyleBox" uid="uid://ddtjhp2lob6to" path="res://ui/styles/battle_ui_normal_button.tres" id="4_r2q1k"]
|
||||
[ext_resource type="Texture2D" uid="uid://cxry7h4q17lir" path="res://assets/textures/Game Icons/Vector/2x/star.png" id="4_saqy8"]
|
||||
[ext_resource type="Texture2D" uid="uid://c1dlsfah0ioi5" path="res://assets/textures/Game Icons/Vector/2x/massiveMultiplayer.png" id="5_pnobx"]
|
||||
[ext_resource type="StyleBox" uid="uid://cv8ispcxuwjn5" path="res://ui/styles/battle_ui_pressed_button.tres" id="5_w48y1"]
|
||||
[ext_resource type="Texture2D" uid="uid://dbycrn4i3wkhu" path="res://assets/textures/Game Icons/Vector/2x/menuList.png" id="6_ikm1n"]
|
||||
[ext_resource type="Texture2D" uid="uid://cs84avwwjbn5q" path="res://assets/textures/Game Icons/Vector/2x/exitRight.png" id="7_tihhr"]
|
||||
|
||||
|
|
@ -56,28 +54,6 @@ expand_margin_top = 1.0
|
|||
expand_margin_right = 1.0
|
||||
expand_margin_bottom = 1.0
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jwbwi"]
|
||||
bg_color = Color(0, 0, 0, 1)
|
||||
border_width_left = 3
|
||||
border_width_top = 3
|
||||
border_width_right = 3
|
||||
border_width_bottom = 3
|
||||
border_color = Color(1, 1, 1, 1)
|
||||
corner_radius_top_left = 6
|
||||
corner_radius_top_right = 6
|
||||
corner_radius_bottom_right = 6
|
||||
corner_radius_bottom_left = 6
|
||||
|
||||
[sub_resource type="LabelSettings" id="LabelSettings_5e62u"]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_eqgks"]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4ki2k"]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cabkl"]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_g6kqv"]
|
||||
|
||||
[node name="BattleUI" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
|
|
@ -219,7 +195,6 @@ size_flags_vertical = 3
|
|||
[node name="PanelContainer" type="PanelContainer" parent="BottomMarginContainer/VBoxContainer/MessageContainer"]
|
||||
custom_minimum_size = Vector2(0, 100)
|
||||
layout_mode = 2
|
||||
theme_override_styles/panel = SubResource("StyleBoxFlat_jwbwi")
|
||||
|
||||
[node name="MarginContainer" type="MarginContainer" parent="BottomMarginContainer/VBoxContainer/MessageContainer/PanelContainer"]
|
||||
layout_mode = 2
|
||||
|
|
@ -232,8 +207,8 @@ theme_override_constants/margin_bottom = 8
|
|||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 1
|
||||
theme_override_colors/font_color = Color(0, 0, 0, 1)
|
||||
text = "A wild monster appeared!"
|
||||
label_settings = SubResource("LabelSettings_5e62u")
|
||||
|
||||
[node name="HBoxContainer" type="HBoxContainer" parent="BottomMarginContainer/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
|
@ -349,18 +324,6 @@ unique_name_in_owner = true
|
|||
layout_mode = 2
|
||||
theme_override_constants/h_separation = 18
|
||||
theme_override_constants/icon_max_width = 20
|
||||
theme_override_font_sizes/font_size = 26
|
||||
theme_override_styles/focus = SubResource("StyleBoxEmpty_eqgks")
|
||||
theme_override_styles/disabled_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/disabled = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover = ExtResource("4_r2q1k")
|
||||
theme_override_styles/pressed_mirrored = ExtResource("5_w48y1")
|
||||
theme_override_styles/pressed = ExtResource("5_w48y1")
|
||||
theme_override_styles/normal_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/normal = ExtResource("4_r2q1k")
|
||||
text = "Attack"
|
||||
icon = ExtResource("4_saqy8")
|
||||
alignment = 0
|
||||
|
|
@ -370,18 +333,6 @@ unique_name_in_owner = true
|
|||
layout_mode = 2
|
||||
theme_override_constants/h_separation = 18
|
||||
theme_override_constants/icon_max_width = 20
|
||||
theme_override_font_sizes/font_size = 26
|
||||
theme_override_styles/focus = SubResource("StyleBoxEmpty_4ki2k")
|
||||
theme_override_styles/disabled_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/disabled = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover = ExtResource("4_r2q1k")
|
||||
theme_override_styles/pressed_mirrored = ExtResource("5_w48y1")
|
||||
theme_override_styles/pressed = ExtResource("5_w48y1")
|
||||
theme_override_styles/normal_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/normal = ExtResource("4_r2q1k")
|
||||
text = "Party"
|
||||
icon = ExtResource("5_pnobx")
|
||||
alignment = 0
|
||||
|
|
@ -391,18 +342,6 @@ unique_name_in_owner = true
|
|||
layout_mode = 2
|
||||
theme_override_constants/h_separation = 18
|
||||
theme_override_constants/icon_max_width = 20
|
||||
theme_override_font_sizes/font_size = 26
|
||||
theme_override_styles/focus = SubResource("StyleBoxEmpty_cabkl")
|
||||
theme_override_styles/disabled_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/disabled = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover = ExtResource("4_r2q1k")
|
||||
theme_override_styles/pressed_mirrored = ExtResource("5_w48y1")
|
||||
theme_override_styles/pressed = ExtResource("5_w48y1")
|
||||
theme_override_styles/normal_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/normal = ExtResource("4_r2q1k")
|
||||
text = "Items"
|
||||
icon = ExtResource("6_ikm1n")
|
||||
alignment = 0
|
||||
|
|
@ -412,18 +351,6 @@ unique_name_in_owner = true
|
|||
layout_mode = 2
|
||||
theme_override_constants/h_separation = 18
|
||||
theme_override_constants/icon_max_width = 20
|
||||
theme_override_font_sizes/font_size = 26
|
||||
theme_override_styles/focus = SubResource("StyleBoxEmpty_g6kqv")
|
||||
theme_override_styles/disabled_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/disabled = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_pressed = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/hover = ExtResource("4_r2q1k")
|
||||
theme_override_styles/pressed_mirrored = ExtResource("5_w48y1")
|
||||
theme_override_styles/pressed = ExtResource("5_w48y1")
|
||||
theme_override_styles/normal_mirrored = ExtResource("4_r2q1k")
|
||||
theme_override_styles/normal = ExtResource("4_r2q1k")
|
||||
text = "Run"
|
||||
icon = ExtResource("7_tihhr")
|
||||
alignment = 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue