diff --git a/addons/escoria-dialog-simple/chooser/simple.tscn b/addons/escoria-dialog-simple/chooser/simple.tscn index 4994f308..fe3e0a12 100644 --- a/addons/escoria-dialog-simple/chooser/simple.tscn +++ b/addons/escoria-dialog-simple/chooser/simple.tscn @@ -12,9 +12,6 @@ gradient = SubResource( 1 ) anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="MarginContainer" type="MarginContainer" parent="."] margin_left = 20.0 @@ -61,6 +58,6 @@ __meta__ = { } [node name="AvatarContainer" type="Node2D" parent="."] -position = Vector2( 29.1458, 120.012 ) +position = Vector2( 94, 68 ) [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/game/characters/mark/mark_think.tscn b/game/characters/mark/mark_think.tscn new file mode 100644 index 00000000..c80159d4 --- /dev/null +++ b/game/characters/mark/mark_think.tscn @@ -0,0 +1,58 @@ +[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] + +[sub_resource type="AtlasTexture" id=1] +atlas = ExtResource( 1 ) +region = Rect2( 0, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=2] +atlas = ExtResource( 1 ) +region = Rect2( 189, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 1 ) +region = Rect2( 162, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 1 ) +region = Rect2( 135, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 1 ) +region = Rect2( 108, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 1 ) +region = Rect2( 81, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 1 ) +region = Rect2( 54, 0, 27, 27 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 1 ) +region = Rect2( 27, 0, 27, 27 ) + +[sub_resource type="SpriteFrames" id=9] +animations = [ { +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ], +"loop": true, +"name": "default", +"speed": 8.0 +} ] + +[node name="Node2D" type="Node2D"] + +[node name="MarkThinking" type="Sprite" parent="."] +position = Vector2( -48, 0 ) +scale = Vector2( 4, 4 ) +texture = ExtResource( 2 ) + +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( 54, 0 ) +scale = Vector2( 4, 4 ) +frames = SubResource( 9 ) +frame = 6 +playing = true diff --git a/game/characters/mark/png/mark_thinking.png b/game/characters/mark/png/mark_thinking.png new file mode 100644 index 00000000..05d53f1d Binary files /dev/null and b/game/characters/mark/png/mark_thinking.png differ diff --git a/game/characters/mark/png/mark_thinking_question.png b/game/characters/mark/png/mark_thinking_question.png new file mode 100644 index 00000000..55fe47d2 Binary files /dev/null and b/game/characters/mark/png/mark_thinking_question.png differ