diff --git a/main.tscn b/main.tscn index 91e5f72..a00a649 100644 --- a/main.tscn +++ b/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://cxo6bq26huau7"] +[gd_scene load_steps=18 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,6 +15,8 @@ [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"] @@ -103,6 +105,12 @@ 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/sword.gd b/player/sword.gd index f633398..aa3793a 100644 --- a/player/sword.gd +++ b/player/sword.gd @@ -19,7 +19,7 @@ func swing(dir_str) -> void: if dir_str == "up": scale.x = abs(scale.x) scale.y = abs(scale.y) * facing - rotation = PI/2 + rotation = PI/2 * facing_mult else: scale.x = abs(scale.x) * facing scale.y = abs(scale.y)