Merge branch 'bos_testing' into devRefactor

This commit is contained in:
Jan Schuffenhauer
2020-04-19 18:26:34 +02:00
5 changed files with 40 additions and 25 deletions

View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://World.gd" type="Script" id=2]
[ext_resource path="res://Maps/Tilesets/Room/tileset_room.tres" type="TileSet" id=3]
[ext_resource path="res://testSprites/dark.png" type="Texture" id=4]
[ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=7]
[ext_resource path="res://Boss/Boss_template.tscn" type="PackedScene" id=17]
[ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=21]
[ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18]
[sub_resource type="AnimationNodeStateMachinePlayback" id=1]
[node name="World" type="Node2D"]
script = ExtResource( 2 )
@@ -34,13 +34,11 @@ position = Vector2( 152, 120 )
[node name="Player" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 176, 112 )
scale = Vector2( 2, 2 )
debug = true
FRICTION = 200
[node name="Bonfire" parent="YSort" instance=ExtResource( 7 )]
position = Vector2( 296, -16 )
[node name="AnimationTree" parent="YSort/Player" index="4"]
parameters/playback = SubResource( 1 )
[node name="Boss_template2" parent="YSort" instance=ExtResource( 17 )]
position = Vector2( -40, 16 )
[node name="Grid" parent="." instance=ExtResource( 18 )]
[node name="Grid" parent="." instance=ExtResource( 21 )]
[editable path="YSort/Player"]