Fixes ESCMoving angles calculation to make it work with 2-dir animations (#454)

game/characters/mark2dir/mark.esc

@@ -0,0 +1,3 @@
+:look
+
+say player "That's a-me, Mark-io."

game/characters/mark2dir/mark2dir.tscn

@@ -0,0 +1,232 @@
+[gd_scene load_steps=40 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/mark2dir/mark_animations.tres" type="Resource" 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]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 4 )
+region = Rect2( 120, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 4 )
+region = Rect2( 216, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 4 )
+region = Rect2( 240, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 4 )
+region = Rect2( 264, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 4 )
+region = Rect2( 288, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 4 )
+region = Rect2( 312, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 4 )
+region = Rect2( 336, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 4 )
+region = Rect2( 360, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 4 )
+region = Rect2( 384, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 4 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 4 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=12]
+atlas = ExtResource( 4 )
+region = Rect2( 144, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=13]
+atlas = ExtResource( 4 )
+region = Rect2( 168, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 4 )
+region = Rect2( 192, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=15]
+atlas = ExtResource( 4 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=16]
+atlas = ExtResource( 4 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=17]
+atlas = ExtResource( 2 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=18]
+atlas = ExtResource( 2 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=19]
+atlas = ExtResource( 2 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 5 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 5 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=22]
+atlas = ExtResource( 5 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=23]
+atlas = ExtResource( 6 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=24]
+atlas = ExtResource( 6 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=25]
+atlas = ExtResource( 4 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=26]
+atlas = ExtResource( 7 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=27]
+atlas = ExtResource( 7 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=28]
+atlas = ExtResource( 7 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=29]
+atlas = ExtResource( 7 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=30]
+atlas = ExtResource( 7 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="SpriteFrames" id=31]
+animations = [ {
+"frames": [ SubResource( 1 ) ],
+"loop": true,
+"name": "idle_down_left",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ],
+"loop": true,
+"name": "walk_right",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 8 ) ],
+"loop": true,
+"name": "walk_up",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 10 ) ],
+"loop": true,
+"name": "idle_down",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 11 ) ],
+"loop": true,
+"name": "idle_down_right",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 13 ) ],
+"loop": true,
+"name": "walk_down",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 15 ) ],
+"loop": true,
+"name": "idle_left",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 16 ) ],
+"loop": true,
+"name": "idle_right",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 18 ), SubResource( 19 ) ],
+"loop": true,
+"name": "speak_down",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 20 ), SubResource( 21 ), SubResource( 22 ) ],
+"loop": true,
+"name": "speak_down_right",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 23 ), SubResource( 24 ), SubResource( 24 ) ],
+"loop": true,
+"name": "speak_up",
+"speed": 3.0
+}, {
+"frames": [ SubResource( 25 ) ],
+"loop": true,
+"name": "idle_up",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
+"loop": true,
+"name": "speak_right",
+"speed": 5.0
+} ]
+
+[sub_resource type="CapsuleShape2D" id=32]
+radius = 38.2347
+height = 217.78
+
+[node name="mark" type="Area2D"]
+pause_mode = 1
+script = ExtResource( 1 )
+global_id = "player"
+esc_script = "res://game/characters/mark2dir/mark.esc"
+is_movable = true
+tooltip_name = "Me"
+dialog_color = Color( 1, 1, 1, 1 )
+selectable = true
+animations = ExtResource( 3 )
+
+[node name="sprite" type="AnimatedSprite" parent="."]
+position = Vector2( 0, -140.938 )
+scale = Vector2( 4, 4 )
+frames = SubResource( 31 )
+animation = "idle_down"
+
+[node name="collision" type="CollisionShape2D" parent="."]
+position = Vector2( 0.455139, -138.362 )
+shape = SubResource( 32 )
+
+[node name="debug" type="Label" parent="."]
+margin_right = 40.0
+margin_bottom = 14.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="dialog_position" type="Position2D" parent="."]
+position = Vector2( 0, -320 )

game/characters/mark2dir/mark_animations.tres

@@ -0,0 +1,52 @@
+[gd_resource type="Resource" load_steps=12 format=2]
+
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3]
+
+[sub_resource type="Resource" id=1]
+script = ExtResource( 2 )
+angle_start = 0
+angle_size = 180
+
+[sub_resource type="Resource" id=2]
+script = ExtResource( 2 )
+angle_start = 180
+angle_size = 180
+
+[sub_resource type="Resource" id=3]
+script = ExtResource( 3 )
+animation = "walk_right"
+mirrored = false
+
+[sub_resource type="Resource" id=4]
+script = ExtResource( 3 )
+animation = "walk_right"
+mirrored = true
+
+[sub_resource type="Resource" id=5]
+script = ExtResource( 3 )
+animation = "idle_right"
+mirrored = false
+
+[sub_resource type="Resource" id=6]
+script = ExtResource( 3 )
+animation = "idle_left"
+mirrored = false
+
+[sub_resource type="Resource" id=7]
+script = ExtResource( 3 )
+animation = "speak_right"
+mirrored = false
+
+[sub_resource type="Resource" id=8]
+script = ExtResource( 3 )
+animation = "speak_right"
+mirrored = true
+
+[resource]
+script = ExtResource( 1 )
+dir_angles = [ SubResource( 1 ), SubResource( 2 ) ]
+directions = [ SubResource( 3 ), SubResource( 4 ) ]
+idles = [ SubResource( 5 ), SubResource( 6 ) ]
+speaks = [ SubResource( 7 ), SubResource( 8 ) ]

game/characters/mark2dir/mark_talk.tscn

@@ -0,0 +1,34 @@
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 1 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 1 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 1 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 1 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="SpriteFrames" id=6]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+} ]
+
+[node name="AnimatedSprite" type="AnimatedSprite"]
+frames = SubResource( 6 )