diff --git a/Scenes/Player/UI/player_ui.tscn b/Scenes/Player/UI/player_ui.tscn index 3653686..41cd68c 100644 --- a/Scenes/Player/UI/player_ui.tscn +++ b/Scenes/Player/UI/player_ui.tscn @@ -86,11 +86,13 @@ alignment = 1 [node name="StatPanel" type="HBoxContainer" parent="UIRoot/ControlPanel"] layout_mode = 2 size_flags_horizontal = 3 +size_flags_stretch_ratio = 0.65 mouse_filter = 2 [node name="Blud" type="Control" parent="UIRoot/ControlPanel/StatPanel"] layout_mode = 2 size_flags_horizontal = 3 +size_flags_stretch_ratio = 0.75 [node name="HBoxContainer" type="HBoxContainer" parent="UIRoot/ControlPanel/StatPanel/Blud"] layout_mode = 1 @@ -143,7 +145,7 @@ vertical_alignment = 2 [node name="Middle" type="VBoxContainer" parent="UIRoot/ControlPanel/StatPanel"] layout_mode = 2 size_flags_horizontal = 3 -size_flags_stretch_ratio = 0.8 +size_flags_stretch_ratio = 0.5 [node name="Time" type="Control" parent="UIRoot/ControlPanel/StatPanel/Middle"] layout_mode = 2 diff --git a/Scenes/Player/UI/spawnable_button.gd b/Scenes/Player/UI/spawnable_button.gd index f913828..f008047 100644 --- a/Scenes/Player/UI/spawnable_button.gd +++ b/Scenes/Player/UI/spawnable_button.gd @@ -13,7 +13,7 @@ func _ready(): return var temp : TemplateSpawnable = spawnableScene.instantiate() - label.text = str(temp.monsterName) + " (" + str(temp.cost) + ")" + label.text = str(temp.monsterName) + "| " + str(temp.cost) generate_tooltip(temp) temp.queue_free() diff --git a/Scenes/Spawnables/bat_spawnable.tscn b/Scenes/Spawnables/bat_spawnable.tscn index 4904dba..dcf2e1d 100644 --- a/Scenes/Spawnables/bat_spawnable.tscn +++ b/Scenes/Spawnables/bat_spawnable.tscn @@ -19,7 +19,7 @@ attackSpeed = 50.0 speed = 4000.0 damage = 1 priority = 1 -expReward = 15 +expReward = 5 BludGen = 0.5 cost = 20 minSpawnRange = 10.0 diff --git a/Scenes/Spawnables/necromancer_spawnable.tscn b/Scenes/Spawnables/necromancer_spawnable.tscn index 215d441..b72f53e 100644 --- a/Scenes/Spawnables/necromancer_spawnable.tscn +++ b/Scenes/Spawnables/necromancer_spawnable.tscn @@ -237,12 +237,12 @@ fill = 1 fill_from = Vector2(0.5, 0.5) [node name="NecromancerSpawnable" instance=ExtResource("1_scjiu")] -maxHp = 25 +maxHp = 50 speed = 2000.0 priority = 10 -expReward = 150 -BludGen = 7.0 -cost = 200 +expReward = 300 +BludGen = 10.0 +cost = 175 canAttack = false monsterName = "Necromancer" monsterIcon = SubResource("AtlasTexture_ac0gw") diff --git a/Scenes/Spawnables/pit_fiend_spawnable.tscn b/Scenes/Spawnables/pit_fiend_spawnable.tscn index 2d2879a..3ebe80e 100644 --- a/Scenes/Spawnables/pit_fiend_spawnable.tscn +++ b/Scenes/Spawnables/pit_fiend_spawnable.tscn @@ -402,12 +402,12 @@ height = 56.0 polygon = PackedVector2Array(3, -25, 3, -25, -7, -18, -8, -7, -7, 11, 0, 16, 7, 15, 12, 7, 10, -5, 8, -16) [node name="PitFiendSpawnable" instance=ExtResource("1_u8yit")] -maxHp = 300 -attackSpeed = 20.0 +maxHp = 200 +attackSpeed = 15.0 speed = 3000.0 damage = 20 priority = 5 -expReward = 1250 +expReward = 2500 BludGen = 5.0 cost = 500 monsterName = "Pit Fiend" diff --git a/Scenes/Spawnables/wolf_spawnable.tscn b/Scenes/Spawnables/wolf_spawnable.tscn index 3abae2d..e541921 100644 --- a/Scenes/Spawnables/wolf_spawnable.tscn +++ b/Scenes/Spawnables/wolf_spawnable.tscn @@ -341,12 +341,12 @@ height = 46.0 polygon = PackedVector2Array(-11, -5, 10, -5, 12, 1, 4, 5, -13, 5, -18, 0) [node name="WolfSpawnable" instance=ExtResource("1_t7ryl")] -maxHp = 14 +maxHp = 21 attackSpeed = 70.0 speed = 10000.0 -damage = 3 +damage = 5 priority = 3 -expReward = 75 +expReward = 100 BludGen = 0.25 cost = 50 monsterName = "Wolf" diff --git a/Scripts/Enemy.gd b/Scripts/Enemy.gd index 9b2a229..3f42b5d 100644 --- a/Scripts/Enemy.gd +++ b/Scripts/Enemy.gd @@ -1,6 +1,9 @@ class_name Fabio extends CharacterBody2D +const FREE_EXP_RATE = 12 +var freeXpStack = 0 + @onready var levelup = [300, 900, 2700, 6500, 14000, 23000, 34000, 48000, 64000] @onready var is_facing_left: bool = false @@ -96,7 +99,10 @@ func _process(delta): if !hitanim.is_emitting(): anim.modulate.a = 1 - + if freeXpStack >= 1: + receive_exp(floor(freeXpStack)) + freeXpStack -= floor(freeXpStack) + freeXpStack += FREE_EXP_RATE * level * delta move_and_slide() @@ -190,23 +196,26 @@ func setLevel(lvl): lvlsnd.play() stop_attack() + if level > 2: + damage = 7 + if level > 3: atk = "Attack2" atkL = atk2l atkR = atk2r - damage = 7 + damage = 14 if level > 4: cooldown.wait_time = 1 if level > 5: - damage = 12 + damage = 21 if level > 7: maxAtks = 2 - maxhp += 5 - hp += 5 * level + 5 + maxhp += 10 + hp += 10 * level + 5 if hp > maxhp: hp = maxhp