From 95140d071d385274e3ef82b8ad7fd19f394fe0bb Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 17 Jul 2020 19:30:27 -0500 Subject: [PATCH] a --- characters/Player.tscn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/characters/Player.tscn b/characters/Player.tscn index fb04164..7a44776 100644 --- a/characters/Player.tscn +++ b/characters/Player.tscn @@ -4,8 +4,8 @@ [ext_resource path="res://ui/PlayerStats.tscn" type="PackedScene" id=2] [ext_resource path="res://meta/BoundedCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://script/PlayerStateMachine.gd" type="Script" id=4] -[ext_resource path="res://art/WizardM.png" type="Texture" id=5] -[ext_resource path="res://magic/Wands/BasicWand.tscn" type="PackedScene" id=6] +[ext_resource path="res://magic/Wands/BasicWand.tscn" type="PackedScene" id=5] +[ext_resource path="res://art/WizardM.png" type="Texture" id=6] [sub_resource type="OccluderPolygon2D" id=1] polygon = PoolVector2Array( -7, 0, -7, -2, -6, -2, -6, -3, -5, -3, -5, -5, -6, -5, -6, -10, -7, -10, -7, -12, -6, -12, -6, -19, -4, -19, -4, -18, -3, -18, -3, -17, 1, -17, 1, -16, 3, -16, 3, -15, 4, -15, 4, -14, 5, -14, 5, -13, 6, -13, 6, -12, 7, -12, 7, -10, 6, -10, 6, -9, 5, -9, 5, -8, 6, -8, 6, -4, 5, -4, 5, 0, -7, 0 ) @@ -81,9 +81,15 @@ drag_margin_bottom = 0.0 [node name="PlayerStateMachine" type="Node" parent="."] script = ExtResource( 4 ) +[node name="HoldPosition" type="Position2D" parent="."] +position = Vector2( 0, -7 ) + +[node name="Wand" parent="HoldPosition" instance=ExtResource( 5 )] +position = Vector2( 14, 0 ) + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0, -12 ) -texture = ExtResource( 5 ) +texture = ExtResource( 6 ) vframes = 3 hframes = 4 @@ -117,10 +123,4 @@ position = Vector2( 0, -7 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hitbox"] visible = false polygon = PoolVector2Array( -6, -12, -6, -5, -7, -5, -7, -3, -6, -3, -6, 2, -5, 2, -5, 4, -6, 4, -6, 5, -7, 5, -7, 7, 5, 7, 5, 3, 6, 3, 6, -1, 5, -1, 5, -2, 6, -2, 6, -3, 7, -3, 7, -5, 6, -5, 6, -6, 5, -6, 5, -7, 4, -7, 4, -8, 3, -8, 3, -9, 1, -9, 1, -10, -3, -10, -3, -11, -4, -11, -4, -12, -6, -12 ) - -[node name="HoldPosition" type="Position2D" parent="."] -position = Vector2( 0, -7 ) - -[node name="Wand" parent="HoldPosition" instance=ExtResource( 6 )] -position = Vector2( 15, 0 ) [connection signal="grounded_updated" from="." to="Camera" method="_on_grounded_updated"]