From 2a55da506735a3328b03446113ca4c1ef4f4c721 Mon Sep 17 00:00:00 2001 From: Balloonpopper Date: Sat, 10 Dec 2022 11:42:43 +1100 Subject: [PATCH] feat: Add thinking avatar scene for Mark --- .../escoria-dialog-simple/chooser/simple.tscn | 5 +- game/characters/mark/mark_think.tscn | 58 ++++++++++++++++++ game/characters/mark/png/mark_thinking.png | Bin 0 -> 796 bytes .../mark/png/mark_thinking_question.png | Bin 0 -> 2094 bytes 4 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 game/characters/mark/mark_think.tscn create mode 100644 game/characters/mark/png/mark_thinking.png create mode 100644 game/characters/mark/png/mark_thinking_question.png 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 0000000000000000000000000000000000000000..05d53f1df3a8e80e5ce34af6449ff2d6dd2de2e0 GIT binary patch literal 796 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