Florian/The_Dark_Side_of_Earth
2
0
Fork 0
Code Issues Pull requests Projects Releases 10 Packages Wiki Activity Actions

Increased Health Spawnrate

Browse source 
Fixed Hit Knockback resetting vertical movement
This commit is contained in:
Melvin Weiß 2025-10-02 18:39:10 +02:00
parent 7186482a3f
commit 7687844ea6
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
items/generic/item_pool.tres
View file

@ -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")])

10
main.tscn
View file

@ -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"]

6
player/player.gd
View file

@ -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)