Merge branch 'devMechanics' into devPlayerStats

This commit is contained in:
Jan Schuffenhauer
2020-04-18 16:29:11 +02:00
parent 40ea76cc7c
commit dd870a1aa9
44 changed files with 1963 additions and 40 deletions

View File

@@ -1,13 +1,98 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Menus/Startup/Startup.tscn" type="PackedScene" 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/Barrel/Barrel.tscn" type="PackedScene" id=5]
[node name="World" type="Node2D"]
[node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 164.844, 101.687 )
[node name="WallSprite" type="Sprite" parent="."]
position = Vector2( 98.1828, 136.399 )
texture = ExtResource( 4 )
region_enabled = true
region_rect = Rect2( 0, 0, 1280, 720 )
[node name="StaticBody2D" type="StaticBody2D" parent="."]
[node name="FloorTileMap" type="TileMap" parent="."]
tile_set = ExtResource( 3 )
cell_size = Vector2( 32, 32 )
format = 1
tile_data = PoolIntArray( -131063, 47, 0, -131062, 47, 2, -65536, 47, 4, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 196609, -65529, 47, 6, -65528, 47, 5, -65527, 47, 196614, -65526, 47, 196613, -65525, 47, 6, -65524, 47, 5, -65523, 47, 196609, -65522, 47, 7, 0, 47, 65539, 7, 47, 131072, 8, 47, 65543, 11, 47, 131072, 12, 47, 65543, 14, 47, 196612, 15, 47, 7, 65536, 47, 65539, 65544, 47, 196612, 65545, 47, 7, 65548, 47, 65539, 65551, 47, 65539, 131072, 47, 262148, 131073, 47, 196610, 131081, 47, 65539, 131084, 47, 65539, 131087, 47, 65539, 196608, 47, 65539, 196615, 47, 196611, 196617, 47, 131075, 196619, 47, 4, 196620, 47, 196615, 196622, 47, 4, 196623, 47, 196615, 262144, 47, 65539, 262146, 47, 3, 262155, 47, 65539, 262158, 47, 65539, 327680, 47, 262148, 327681, 47, 196609, 327682, 47, 196616, 327683, 47, 196609, 327684, 47, 196609, 327685, 47, 196609, 327686, 47, 196609, 327687, 47, 7, 327691, 47, 131075, 327694, 47, 65539, 393216, 47, 65539, 393223, 47, 196612, 393224, 47, 196610, 393230, 47, 65539, 458752, 47, 196612, 458753, 47, 196609, 458754, 47, 7, 458766, 47, 65539, 524290, 47, 196612, 524291, 47, 196609, 524292, 47, 196609, 524293, 47, 196609, 524294, 47, 196609, 524295, 47, 196609, 524296, 47, 196609, 524297, 47, 196609, 524298, 47, 196609, 524299, 47, 196609, 524300, 47, 196609, 524301, 47, 196609, 524302, 47, 196615 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D"]
polygon = PoolVector2Array( 192.287, 146.593, 265.375, 115.213, 228.831, 67.1505, 257.43, 37.3594, 218.9, 7.9655, 298.343, 3.59614, 310.26, 179.959, 11.9516, 168.837, 42.9343, 30.6067, 69.1505, 118.788, 86.628, 87.4084, 96.5583, 127.527 )
[node name="Startup" parent="." instance=ExtResource( 2 )]
visible = false
[node name="YSort" type="YSort" parent="."]
position = Vector2( 170.007, 112.118 )
[node name="Barrel" parent="YSort" instance=ExtResource( 5 )]
position = Vector2( -75.7991, -70.2346 )
[node name="Player" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -18.3394, -55.4925 )
scale = Vector2( 2, 2 )
[node name="Player2" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -38.722, -70.0515 )
ROLL_SPEED = 300
[node name="Player3" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -46.8102, -53.8748 )
ROLL_SPEED = 300
[node name="Player4" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -51.3397, -35.4335 )
ROLL_SPEED = 300
[node name="Player5" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -56.8398, -20.8745 )
ROLL_SPEED = 300
[node name="Player6" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -60.7221, -6.96263 )
ROLL_SPEED = 300
[node name="Player7" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -27.0748, 6.30219 )
ROLL_SPEED = 300
[node name="Player8" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 10.7785, -23.1393 )
ROLL_SPEED = 300
[node name="Player9" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 20.808, -10.5215 )
ROLL_SPEED = 300
[node name="Player10" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -22.8689, -23.7863 )
ROLL_SPEED = 300
[node name="Player11" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 9.80794, -43.1983 )
ROLL_SPEED = 300
[node name="Player12" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 42.1612, -11.4921 )
ROLL_SPEED = 300
[node name="Player13" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 58.9849, -37.3747 )
ROLL_SPEED = 300
[node name="Player14" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 43.4553, -59.6984 )
ROLL_SPEED = 300
[node name="Player15" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -6.69225, 23.4494 )
ROLL_SPEED = 300
[node name="Player16" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( 19.1904, -66.4926 )
ROLL_SPEED = 300
[node name="Player17" parent="YSort" instance=ExtResource( 1 )]
position = Vector2( -12.1923, -12.4627 )
ROLL_SPEED = 300