From 7687844ea6cf264cfb2623b1967521984e84fac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Melvin=20Wei=C3=9F?= Date: Thu, 2 Oct 2025 18:39:10 +0200 Subject: [PATCH] Increased Health Spawnrate Fixed Hit Knockback resetting vertical movement --- items/generic/item_pool.tres | 2 +- main.tscn | 10 +--------- player/player.gd | 6 ++++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/items/generic/item_pool.tres b/items/generic/item_pool.tres index e1028db..fd967c2 100644 --- a/items/generic/item_pool.tres +++ b/items/generic/item_pool.tres @@ -13,6 +13,6 @@ [resource] script = ExtResource("6_rli0f") -common = Array[PackedScene]([ExtResource("1_2l6sh"), ExtResource("1_2l6sh"), ExtResource("9_esvgx"), ExtResource("5_jwi73"), ExtResource("4_vpswe")]) +common = Array[PackedScene]([ExtResource("1_2l6sh"), ExtResource("1_2l6sh"), ExtResource("1_2l6sh"), ExtResource("9_esvgx"), ExtResource("5_jwi73"), ExtResource("4_vpswe")]) rare = Array[PackedScene]([ExtResource("3_g002j"), ExtResource("2_rli0f")]) unique = Array[PackedScene]([ExtResource("6_73uum"), ExtResource("7_k6eth"), ExtResource("8_8cxou")]) diff --git a/main.tscn b/main.tscn index a00a649..91e5f72 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=16 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"] @@ -15,8 +15,6 @@ [ext_resource type="PackedScene" uid="uid://cqn67nwyrtq3k" path="res://ui/journal/journal.tscn" id="10_w48qg"] [ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://enemies/boss/boss.tscn" id="11_efxa6"] [ext_resource type="Script" uid="uid://gul4u5tw1vxk" path="res://bg_image.gd" id="13_vivmo"] -[ext_resource type="PackedScene" uid="uid://bbpf28ohayd8n" path="res://items/permanent_items/backslash/backslash.tscn" id="16_2cqfq"] -[ext_resource type="PackedScene" uid="uid://bwtdls58ajair" path="res://items/permanent_items/upslash/upslash.tscn" id="16_yaehf"] [node name="main" type="Node2D"] @@ -105,12 +103,6 @@ colors = Array[Color]([Color(0, 0.6441987, 0.6693053, 1), Color(0.90588236, 0.15 script = ExtResource("10_efxa6") boss = ExtResource("11_efxa6") -[node name="Upslash" parent="." instance=ExtResource("16_yaehf")] -position = Vector2(827, -2974) - -[node name="Backslash" parent="." instance=ExtResource("16_2cqfq")] -position = Vector2(1021, -2924) - [connection signal="active_item_changed" from="Player" to="UIOverlay/ItemUI" method="_on_player_active_item_changed"] [connection signal="health_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_health_changed"] [connection signal="max_hp_changed" from="Player" to="UIOverlay/Healthbar" method="_on_player_max_hp_changed"] diff --git a/player/player.gd b/player/player.gd index 46ec7e8..ba766ff 100644 --- a/player/player.gd +++ b/player/player.gd @@ -163,8 +163,10 @@ func manage_velocity(delta: float) -> void: if(local_velocity.y > max_fall_speed): local_velocity.y = max_fall_speed - if(reset_to_velocity != Vector2.ZERO): - local_velocity = reset_to_velocity + if(reset_to_velocity.x != 0): + local_velocity.x = reset_to_velocity.x + if(reset_to_velocity.y != 0): + local_velocity.y = reset_to_velocity.y reset_to_velocity = Vector2.ZERO velocity = earth_aligner.global_from_local(local_velocity)