oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: New room 15 files (#575)

Browse Source 
Co-authored-by: Balloonpopper <balloonpopper@git.com>
This commit is contained in:
balloonpopper
2022-04-24 02:55:57 +10:00
committed by GitHub
parent 371197423b
commit 488b20656d
20 changed files with 505 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

444
game/characters/mark/mark.tscn
View File

@@ -1,13 +1,38 @@
[gd_scene load_steps=45 format=2]
[gd_scene load_steps=85 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1]
[ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2]
[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=3]
[ext_resource path="res://game/characters/mark/png/markjester.png" type="Texture" id=3]
[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4]
[ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5]
[ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6]
[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7]
[ext_resource path="res://game/characters/mark/png/mark_talk_up_right.png" type="Texture" id=8]
[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=8]
[ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9]
[sub_resource type="AtlasTexture" id=71]
atlas = ExtResource( 3 )
region = Rect2( 408, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=72]
atlas = ExtResource( 3 )
region = Rect2( 432, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=73]
atlas = ExtResource( 3 )
region = Rect2( 456, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=74]
atlas = ExtResource( 3 )
region = Rect2( 480, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=75]
atlas = ExtResource( 3 )
region = Rect2( 504, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=68]
atlas = ExtResource( 3 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 2 )
@@ -21,57 +46,29 @@ region = Rect2( 24, 0, 24, 70 )
atlas = ExtResource( 2 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=12]
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=13]
atlas = ExtResource( 6 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=4]
[sub_resource type="AtlasTexture" id=17]
atlas = ExtResource( 4 )
region = Rect2( 120, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=6]
atlas = ExtResource( 7 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=7]
atlas = ExtResource( 7 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 7 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 7 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 7 )
region = Rect2( 96, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=5]
atlas = ExtResource( 4 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=18]
atlas = ExtResource( 4 )
[sub_resource type="AtlasTexture" id=67]
atlas = ExtResource( 3 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=19]
atlas = ExtResource( 4 )
region = Rect2( 144, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=56]
atlas = ExtResource( 9 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=20]
atlas = ExtResource( 4 )
region = Rect2( 168, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=57]
atlas = ExtResource( 9 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=21]
atlas = ExtResource( 4 )
region = Rect2( 192, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=58]
atlas = ExtResource( 9 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=70]
atlas = ExtResource( 3 )
region = Rect2( 96, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=17]
atlas = ExtResource( 4 )
@@ -97,25 +94,165 @@ region = Rect2( 288, 0, 24, 70 )
atlas = ExtResource( 4 )
region = Rect2( 312, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=14]
atlas = ExtResource( 4 )
[sub_resource type="AtlasTexture" id=53]
atlas = ExtResource( 3 )
region = Rect2( 144, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=54]
atlas = ExtResource( 3 )
region = Rect2( 168, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=55]
atlas = ExtResource( 3 )
region = Rect2( 192, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=33]
atlas = ExtResource( 9 )
region = Rect2( 264, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=34]
atlas = ExtResource( 9 )
region = Rect2( 288, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=35]
atlas = ExtResource( 3 )
region = Rect2( 336, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=15]
atlas = ExtResource( 4 )
[sub_resource type="AtlasTexture" id=36]
atlas = ExtResource( 3 )
region = Rect2( 360, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=16]
atlas = ExtResource( 4 )
[sub_resource type="AtlasTexture" id=37]
atlas = ExtResource( 3 )
region = Rect2( 384, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=69]
atlas = ExtResource( 3 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=62]
atlas = ExtResource( 9 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=63]
atlas = ExtResource( 9 )
region = Rect2( 96, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=64]
atlas = ExtResource( 9 )
region = Rect2( 120, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=6]
atlas = ExtResource( 7 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=7]
atlas = ExtResource( 7 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 7 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 7 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 7 )
region = Rect2( 96, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=38]
atlas = ExtResource( 9 )
region = Rect2( 144, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=39]
atlas = ExtResource( 9 )
region = Rect2( 168, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=40]
atlas = ExtResource( 9 )
region = Rect2( 192, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=41]
atlas = ExtResource( 9 )
region = Rect2( 216, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=42]
atlas = ExtResource( 9 )
region = Rect2( 240, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=59]
atlas = ExtResource( 9 )
region = Rect2( 432, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=60]
atlas = ExtResource( 9 )
region = Rect2( 456, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=61]
atlas = ExtResource( 9 )
region = Rect2( 480, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=12]
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=13]
atlas = ExtResource( 6 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=66]
atlas = ExtResource( 3 )
region = Rect2( 120, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=11]
atlas = ExtResource( 4 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=19]
atlas = ExtResource( 4 )
region = Rect2( 144, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=20]
atlas = ExtResource( 4 )
region = Rect2( 168, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=21]
atlas = ExtResource( 4 )
region = Rect2( 192, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=43]
atlas = ExtResource( 3 )
region = Rect2( 216, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=44]
atlas = ExtResource( 3 )
region = Rect2( 240, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=45]
atlas = ExtResource( 3 )
region = Rect2( 264, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=46]
atlas = ExtResource( 3 )
region = Rect2( 288, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=47]
atlas = ExtResource( 3 )
region = Rect2( 312, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=27]
atlas = ExtResource( 4 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=11]
[sub_resource type="AtlasTexture" id=5]
atlas = ExtResource( 4 )
region = Rect2( 24, 0, 24, 70 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=65]
atlas = ExtResource( 3 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=28]
atlas = ExtResource( 5 )
@@ -129,69 +266,153 @@ region = Rect2( 24, 0, 24, 70 )
atlas = ExtResource( 5 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=33]
atlas = ExtResource( 8 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=4]
atlas = ExtResource( 4 )
region = Rect2( 120, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=34]
atlas = ExtResource( 8 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=14]
atlas = ExtResource( 4 )
region = Rect2( 336, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=35]
atlas = ExtResource( 8 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=15]
atlas = ExtResource( 4 )
region = Rect2( 360, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=36]
atlas = ExtResource( 8 )
[sub_resource type="AtlasTexture" id=16]
atlas = ExtResource( 4 )
region = Rect2( 384, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=48]
atlas = ExtResource( 9 )
region = Rect2( 312, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=49]
atlas = ExtResource( 9 )
region = Rect2( 336, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=50]
atlas = ExtResource( 9 )
region = Rect2( 360, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=51]
atlas = ExtResource( 9 )
region = Rect2( 384, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=52]
atlas = ExtResource( 9 )
region = Rect2( 408, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=18]
atlas = ExtResource( 4 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="SpriteFrames" id=31]
animations = [ {
"frames": [ SubResource( 71 ), SubResource( 72 ), SubResource( 73 ), SubResource( 74 ), SubResource( 75 ) ],
"loop": true,
"name": "walk_left_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 68 ) ],
"loop": true,
"name": "idle_up_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ],
"loop": true,
"name": "speak_down",
"speed": 6.0
}, {
"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ],
"loop": true,
"name": "speak_up",
"speed": 3.0
}, {
"frames": [ SubResource( 4 ) ],
"loop": true,
"name": "idle_down_left",
"speed": 5.0
}, {
"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
"loop": true,
"name": "speak_right",
"speed": 5.0
}, {
"frames": [ SubResource( 5 ) ],
"loop": true,
"name": "idle_up",
"speed": 5.0
}, {
"frames": [ SubResource( 18 ) ],
"loop": true,
"name": "idle_down",
"speed": 5.0
}, {
"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ],
"loop": true,
"name": "walk_down",
"speed": 6.0
}, {
"frames": [ SubResource( 17 ) ],
"loop": true,
"name": "idle_left",
"speed": 5.0
}, {
"frames": [ SubResource( 67 ) ],
"loop": true,
"name": "idle_down_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ],
"loop": true,
"name": "speak_down_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 70 ) ],
"loop": true,
"name": "idle_left_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ],
"loop": true,
"name": "walk_right",
"speed": 6.0
}, {
"frames": [ SubResource( 53 ), SubResource( 54 ), SubResource( 55 ), SubResource( 54 ) ],
"loop": true,
"name": "walk_down_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 33 ), SubResource( 34 ) ],
"loop": true,
"name": "speak_up_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 36 ) ],
"loop": true,
"name": "walk_up_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 69 ) ],
"loop": true,
"name": "idle_down_right_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 62 ), SubResource( 63 ), SubResource( 64 ) ],
"loop": true,
"name": "speak_down_right_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
"loop": true,
"name": "speak_right",
"speed": 5.0
}, {
"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ) ],
"loop": true,
"name": "speak_right_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 59 ), SubResource( 60 ), SubResource( 61 ) ],
"loop": true,
"name": "speak_down_left_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ],
"loop": true,
"name": "speak_up",
"speed": 3.0
}, {
"frames": [ SubResource( 66 ) ],
"loop": true,
"name": "idle_down_left_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 11 ) ],
"loop": true,
"name": "idle_down_right",
"speed": 5.0
}, {
"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ],
"loop": true,
"name": "walk_down",
"speed": 6.0
}, {
"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ) ],
"loop": true,
"name": "walk_right_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ],
"loop": true,
"name": "walk_up",
@@ -202,9 +423,14 @@ animations = [ {
"name": "idle_right",
"speed": 5.0
}, {
"frames": [ SubResource( 11 ) ],
"frames": [ SubResource( 5 ) ],
"loop": true,
"name": "idle_down_right",
"name": "idle_up",
"speed": 5.0
}, {
"frames": [ SubResource( 65 ) ],
"loop": true,
"name": "idle_right_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
@@ -212,14 +438,24 @@ animations = [ {
"name": "speak_down_right",
"speed": 6.0
}, {
"frames": [ SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 34 ) ],
"frames": [ SubResource( 4 ) ],
"loop": true,
"name": "speak_up_right",
"name": "idle_down_left",
"speed": 5.0
}, {
"frames": [ SubResource( 36 ) ],
"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ],
"loop": true,
"name": "idle_up_right",
"name": "walk_up",
"speed": 6.0
}, {
"frames": [ SubResource( 48 ), SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ) ],
"loop": true,
"name": "speak_left_jester",
"speed": 5.0
}, {
"frames": [ SubResource( 18 ) ],
"loop": true,
"name": "idle_down",
"speed": 5.0
} ]
@@ -236,10 +472,10 @@ is_movable = true
tooltip_name = "Me"
dialog_color = Color( 1, 1, 1, 1 )
selectable = true
animations = ExtResource( 3 )
animations = ExtResource( 8 )
[node name="sprite" type="AnimatedSprite" parent="."]
position = Vector2( 0, -138.938 )
position = Vector2( 0, -137.938 )
scale = Vector2( 4, 4 )
frames = SubResource( 31 )
animation = "idle_down"

52
game/characters/mark/mark_animations_weird.tres → game/characters/mark/mark_animations_jester.tres
View File

@@ -46,122 +46,122 @@ angle_size = 50
[sub_resource type="Resource" id=9]
script = ExtResource( 3 )
animation = "walk_down"
animation = "walk_up_jester"
mirrored = false
[sub_resource type="Resource" id=10]
script = ExtResource( 3 )
animation = "walk_up"
animation = "walk_up_jester"
mirrored = false
[sub_resource type="Resource" id=11]
script = ExtResource( 3 )
animation = "walk_left"
animation = "walk_right_jester"
mirrored = false
[sub_resource type="Resource" id=12]
script = ExtResource( 3 )
animation = "walk_up"
animation = "walk_down_jester"
mirrored = false
[sub_resource type="Resource" id=13]
script = ExtResource( 3 )
animation = "walk_right"
animation = "walk_down_jester"
mirrored = false
[sub_resource type="Resource" id=14]
script = ExtResource( 3 )
animation = "walk_left"
animation = "walk_down_jester"
mirrored = false
[sub_resource type="Resource" id=15]
script = ExtResource( 3 )
animation = "walk_up"
mirrored = true
animation = "walk_left_jester"
mirrored = false
[sub_resource type="Resource" id=16]
script = ExtResource( 3 )
animation = "walk_down"
animation = "walk_up_jester"
mirrored = false
[sub_resource type="Resource" id=17]
script = ExtResource( 3 )
animation = "idle_up"
animation = "idle_up_jester"
mirrored = false
[sub_resource type="Resource" id=18]
script = ExtResource( 3 )
animation = "idle_up"
animation = "idle_up_jester"
mirrored = false
[sub_resource type="Resource" id=19]
script = ExtResource( 3 )
animation = "idle_right"
animation = "idle_right_jester"
mirrored = false
[sub_resource type="Resource" id=20]
script = ExtResource( 3 )
animation = "idle_down_right"
animation = "idle_down_jester"
mirrored = false
[sub_resource type="Resource" id=21]
script = ExtResource( 3 )
animation = "idle_down"
animation = "idle_down_jester"
mirrored = false
[sub_resource type="Resource" id=22]
script = ExtResource( 3 )
animation = "idle_down_left"
animation = "idle_down_jester"
mirrored = false
[sub_resource type="Resource" id=23]
script = ExtResource( 3 )
animation = "idle_left"
animation = "idle_left_jester"
mirrored = false
[sub_resource type="Resource" id=24]
script = ExtResource( 3 )
animation = "idle_up"
animation = "idle_up_jester"
mirrored = false
[sub_resource type="Resource" id=25]
script = ExtResource( 3 )
animation = "speak_up"
animation = "speak_up_jester"
mirrored = false
[sub_resource type="Resource" id=26]
script = ExtResource( 3 )
animation = "speak_up"
animation = "speak_up_jester"
mirrored = false
[sub_resource type="Resource" id=27]
script = ExtResource( 3 )
animation = "speak_right"
animation = "speak_right_jester"
mirrored = false
[sub_resource type="Resource" id=28]
script = ExtResource( 3 )
animation = "speak_down"
animation = "speak_down_right_jester"
mirrored = false
[sub_resource type="Resource" id=29]
script = ExtResource( 3 )
animation = "speak_down"
animation = "speak_down_jester"
mirrored = false
[sub_resource type="Resource" id=30]
script = ExtResource( 3 )
animation = "speak_down"
animation = "speak_down_left_jester"
mirrored = false
[sub_resource type="Resource" id=31]
script = ExtResource( 3 )
animation = "speak_right"
mirrored = true
animation = "speak_left_jester"
mirrored = false
[sub_resource type="Resource" id=32]
script = ExtResource( 3 )
animation = "speak_up"
animation = "speak_up_jester"
mirrored = false
[resource]

BIN
game/characters/mark/png/markjester.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
game/characters/mark/png/markjester_talk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB