diff --git a/ActionRPG-HeartBeast/Enemies/Bat.gd b/ActionRPG-HeartBeast/Enemies/Bat.gd index 9f68028..b69e589 100644 --- a/ActionRPG-HeartBeast/Enemies/Bat.gd +++ b/ActionRPG-HeartBeast/Enemies/Bat.gd @@ -14,7 +14,7 @@ enum { } var knockback = Vector2.ZERO -var velocity = Vector2.ZERO +#var velocity = Vector2.ZERO var state = IDLE diff --git a/ActionRPG-HeartBeast/Player/Player.gd b/ActionRPG-HeartBeast/Player/Player.gd index 0337a26..2480192 100644 --- a/ActionRPG-HeartBeast/Player/Player.gd +++ b/ActionRPG-HeartBeast/Player/Player.gd @@ -1,3 +1,4 @@ +extends CharacterBody2D var input_vector = Vector2.ZERO var roll_vector = Vector2.DOWN var stats = PlayerStats @@ -17,12 +18,13 @@ enum { var state = MOVE -@onready var animationPlayer = $AnimationPlayer -@onready var blinkAnimationPlayer = $BlinkAnimationPlayer -@onready var animationTree = $AnimationTree +@onready var animationTree = get_node("AnimationTree") +@onready var blinkAnimationPlayer = get_node("BlinkAnimationPlayer") +@onready var animationPlayer = get_node("AnimationPlayer") @onready var animationState = animationTree.get("parameters/playback") -@onready var swordHitbox = $HitboxPivot/SwordHitbox -@onready var hurtBox = $Hurtbox +@onready var swordHitbox = get_node("HitboxPivot/SwordHitbox") +@onready var hurtBox = get_node("Hurtbox") + func _ready(): stats.connect("no_health", Callable(self, "queue_free")) diff --git a/ActionRPG-HeartBeast/Player/Player.tscn b/ActionRPG-HeartBeast/Player/Player.tscn index e571370..635d433 100644 --- a/ActionRPG-HeartBeast/Player/Player.tscn +++ b/ActionRPG-HeartBeast/Player/Player.tscn @@ -8,7 +8,7 @@ [ext_resource type="Texture2D" uid="uid://bb222608451qy" path="res://Shadows/MediumShadow.png" id="6"] [ext_resource type="AudioStream" uid="uid://bo14kc5oajchr" path="res://Music and Sounds/Swipe.wav" id="7"] [ext_resource type="AudioStream" uid="uid://dwjvh7kwt62da" path="res://Music and Sounds/Evade.wav" id="8"] -[ext_resource type="Shader" path="res://WhiteColor_shader.tres" id="9"] +[ext_resource type="Shader" uid="uid://c8kh0c6pydtym" path="res://WhiteColor_shader.tres" id="9"] [sub_resource type="ShaderMaterial" id="55"] shader = ExtResource("9") diff --git a/ActionRPG-HeartBeast/WhiteColor_shader.tres b/ActionRPG-HeartBeast/WhiteColor_shader.tres index 888431a..b7048f2 100644 --- a/ActionRPG-HeartBeast/WhiteColor_shader.tres +++ b/ActionRPG-HeartBeast/WhiteColor_shader.tres @@ -1,4 +1,4 @@ -[gd_resource type="Shader" format=2] +[gd_resource type="Shader" format=3 uid="uid://c8kh0c6pydtym"] [resource] code = "shader_type canvas_item; diff --git a/ActionRPG-HeartBeast/World.tscn b/ActionRPG-HeartBeast/World.tscn index 008420d..130481f 100644 --- a/ActionRPG-HeartBeast/World.tscn +++ b/ActionRPG-HeartBeast/World.tscn @@ -53,9 +53,6 @@ position = Vector2(872, 544) [node name="Player" parent="Node2D" instance=ExtResource("2")] position = Vector2(167, 111) -__meta__ = { -"_edit_group_": true -} [node name="RemoteTransform2D" type="RemoteTransform2D" parent="Node2D/Player"] remote_path = NodePath("../../../Camera2D") @@ -208,5 +205,9 @@ offset_bottom = 40.0 [node name="HealthUI" parent="CanvasLayer" instance=ExtResource("9")] layout_mode = 3 anchors_preset = 0 +offset_left = 0.0 +offset_top = 0.0 +offset_right = 122.0 +offset_bottom = 25.0 [editable path="Camera2D"] diff --git a/ActionRPG-HeartBeast/project.godot b/ActionRPG-HeartBeast/project.godot index 09dcec8..19f1bdc 100644 --- a/ActionRPG-HeartBeast/project.godot +++ b/ActionRPG-HeartBeast/project.godot @@ -25,7 +25,8 @@ window/size/viewport_width=320 window/size/viewport_height=180 window/size/window_width_override=1920 window/size/window_height_override=1080 -window/stretch/mode="2d" +window/stretch/scale=6.0 +window/stretch/scale_mode="integer" [gui] @@ -118,6 +119,7 @@ common/enable_pause_aware_picking=true [rendering] +textures/canvas_textures/default_texture_filter=0 environment/defaults/default_environment="res://default_env.tres" quality/driver/driver_name="GLES2" vram_compression/import_etc=true