Skip to content
Snippets Groups Projects
Commit 17306fea authored by Jannik Rosendahl's avatar Jannik Rosendahl
Browse files

player scale 1.35

parent 8cf00582
No related branches found
No related tags found
No related merge requests found
......@@ -83,76 +83,86 @@ flags = 4
atlas = ExtResource( 3 )
region = Rect2( 240, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=5]
[sub_resource type="AtlasTexture" id=43]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 0, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=6]
[sub_resource type="AtlasTexture" id=44]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 48, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=7]
[sub_resource type="AtlasTexture" id=45]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 96, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=8]
[sub_resource type="AtlasTexture" id=46]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 144, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=9]
[sub_resource type="AtlasTexture" id=47]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 192, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=10]
[sub_resource type="AtlasTexture" id=48]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 240, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=11]
[sub_resource type="AtlasTexture" id=49]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 288, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=12]
[sub_resource type="AtlasTexture" id=50]
flags = 4
atlas = ExtResource( 6 )
atlas = ExtResource( 1 )
region = Rect2( 336, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=17]
[sub_resource type="AtlasTexture" id=5]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=18]
[sub_resource type="AtlasTexture" id=6]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 48, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=19]
[sub_resource type="AtlasTexture" id=7]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 96, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=20]
[sub_resource type="AtlasTexture" id=8]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 144, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=21]
[sub_resource type="AtlasTexture" id=9]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 192, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=22]
[sub_resource type="AtlasTexture" id=10]
flags = 4
atlas = ExtResource( 8 )
atlas = ExtResource( 6 )
region = Rect2( 240, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=11]
flags = 4
atlas = ExtResource( 6 )
region = Rect2( 288, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=12]
flags = 4
atlas = ExtResource( 6 )
region = Rect2( 336, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=29]
flags = 4
atlas = ExtResource( 7 )
......@@ -163,46 +173,36 @@ flags = 4
atlas = ExtResource( 7 )
region = Rect2( 0, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=43]
[sub_resource type="AtlasTexture" id=17]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 0, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=44]
[sub_resource type="AtlasTexture" id=18]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 48, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=45]
[sub_resource type="AtlasTexture" id=19]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 96, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=46]
[sub_resource type="AtlasTexture" id=20]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 144, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=47]
[sub_resource type="AtlasTexture" id=21]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 192, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=48]
[sub_resource type="AtlasTexture" id=22]
flags = 4
atlas = ExtResource( 1 )
atlas = ExtResource( 8 )
region = Rect2( 240, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=49]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 288, 0, 48, 48 )
[sub_resource type="AtlasTexture" id=50]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 336, 0, 48, 48 )
[sub_resource type="SpriteFrames" id=38]
animations = [ {
"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ],
......@@ -220,25 +220,25 @@ animations = [ {
"name": "move",
"speed": 5.0
}, {
"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 49 ), SubResource( 50 ) ],
"loop": true,
"name": "melee",
"speed": 17.0
}, {
"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ],
"loop": true,
"name": "attack1",
"speed": 20.0
}, {
"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ) ],
"loop": false,
"name": "death",
"speed": 7.0
}, {
"frames": [ SubResource( 29 ), SubResource( 42 ), SubResource( 29 ), SubResource( 42 ), SubResource( 29 ), SubResource( 29 ), SubResource( 42 ) ],
"loop": true,
"name": "hurt",
"speed": 5.0
}, {
"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 49 ), SubResource( 50 ) ],
"loop": true,
"name": "melee",
"speed": 17.0
"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ) ],
"loop": false,
"name": "death",
"speed": 7.0
} ]
[sub_resource type="RectangleShape2D" id=39]
......@@ -254,6 +254,7 @@ extents = Vector2( 9.11914, 2.77663 )
extents = Vector2( 12.751, 6.23259 )
[node name="Player" type="KinematicBody2D" groups=["player"]]
scale = Vector2( 1.35, 1.35 )
collision_layer = 3
collision_mask = 249
collision/safe_margin = 0.01
......@@ -264,7 +265,7 @@ material = ExtResource( 12 )
position = Vector2( 10, -24 )
frames = SubResource( 38 )
animation = "melee"
frame = 5
frame = 7
playing = true
[node name="Camera2D" type="Camera2D" parent="."]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment