This commit is contained in:
2023-02-07 23:18:45 +01:00
parent c5a1583220
commit e95f081cff
7 changed files with 60 additions and 15 deletions

View File

@@ -7,10 +7,11 @@
[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/mark_animations.tres" type="Resource" id=8]
[ext_resource path="res://gymkhana/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=18]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 0, 0, 24, 70 )
@@ -20,6 +21,7 @@ atlas = ExtResource( 3 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=4]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 120, 0, 24, 70 )
@@ -29,6 +31,7 @@ atlas = ExtResource( 3 )
region = Rect2( 120, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=11]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 24, 0, 24, 70 )
@@ -38,6 +41,7 @@ atlas = ExtResource( 3 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=17]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 96, 0, 24, 70 )
@@ -47,6 +51,7 @@ atlas = ExtResource( 3 )
region = Rect2( 96, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=27]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 48, 0, 24, 70 )
@@ -56,6 +61,7 @@ atlas = ExtResource( 3 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=5]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 72, 0, 24, 70 )
@@ -65,14 +71,17 @@ atlas = ExtResource( 3 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=1]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=2]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=3]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 48, 0, 24, 70 )
@@ -107,14 +116,17 @@ atlas = ExtResource( 9 )
region = Rect2( 480, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=28]
flags = 4
atlas = ExtResource( 5 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=29]
flags = 4
atlas = ExtResource( 5 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=30]
flags = 4
atlas = ExtResource( 5 )
region = Rect2( 48, 0, 24, 70 )
@@ -159,22 +171,27 @@ atlas = ExtResource( 9 )
region = Rect2( 408, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=6]
flags = 4
atlas = ExtResource( 7 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=7]
flags = 4
atlas = ExtResource( 7 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=8]
flags = 4
atlas = ExtResource( 7 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=9]
flags = 4
atlas = ExtResource( 7 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=10]
flags = 4
atlas = ExtResource( 7 )
region = Rect2( 96, 0, 24, 70 )
@@ -204,10 +221,12 @@ atlas = ExtResource( 9 )
region = Rect2( 240, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=12]
flags = 4
atlas = ExtResource( 6 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=13]
flags = 4
atlas = ExtResource( 6 )
region = Rect2( 24, 0, 24, 70 )
@@ -222,14 +241,17 @@ atlas = ExtResource( 9 )
region = Rect2( 288, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=19]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 144, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=20]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 168, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=21]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 192, 0, 24, 70 )
@@ -274,22 +296,27 @@ atlas = ExtResource( 3 )
region = Rect2( 504, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=22]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 216, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=23]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 240, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=24]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 264, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=25]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 288, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=26]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 312, 0, 24, 70 )
@@ -319,14 +346,17 @@ atlas = ExtResource( 3 )
region = Rect2( 312, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=14]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 336, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=15]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 360, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=16]
flags = 4
atlas = ExtResource( 4 )
region = Rect2( 384, 0, 24, 70 )
@@ -501,7 +531,7 @@ height = 217.78
pause_mode = 1
script = ExtResource( 1 )
global_id = "player"
esc_script = "res://game/characters/mark/mark.esc"
esc_script = "res://gymkhana/characters/mark/mark.esc"
is_movable = true
default_action = "look"
combine_when_selected_action_is_in = [ ]

View File

@@ -3,22 +3,27 @@
[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1]
[sub_resource type="AtlasTexture" id=1]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 0, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=2]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 24, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=3]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 48, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=4]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 72, 0, 24, 70 )
[sub_resource type="AtlasTexture" id=5]
flags = 4
atlas = ExtResource( 1 )
region = Rect2( 96, 0, 24, 70 )

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=12 format=2]
[ext_resource path="res://game/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
[ext_resource path="res://game/characters/mark/png/mark_thinking.png" type="Texture" id=2]
[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2]
[sub_resource type="AtlasTexture" id=1]
atlas = ExtResource( 1 )