summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--res/maps/map2.tmx18
-rw-r--r--res/scripts/map2.lua4
-rw-r--r--res/sprites/doria.pngbin0 -> 42556 bytes
-rw-r--r--res/sprites/doria_anim.txt25
-rw-r--r--res/sprites/doria_frames.txt178
5 files changed, 224 insertions, 1 deletions
diff --git a/res/maps/map2.tmx b/res/maps/map2.tmx index f6d6dd2..fe58daf 100644 --- a/res/maps/map2.tmx +++ b/res/maps/map2.tmx
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="7"> 2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="9">
3 <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10"> 3 <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
4 <image source="map2_tiles.png" width="160" height="288"/> 4 <image source="map2_tiles.png" width="160" height="288"/>
5 <tile id="61"> 5 <tile id="61">
@@ -660,6 +660,22 @@
660 <object id="6" name="debugWarp_mailboxes" type="warp" x="598.667" y="420.667"> 660 <object id="6" name="debugWarp_mailboxes" type="warp" x="598.667" y="420.667">
661 <point/> 661 <point/>
662 </object> 662 </object>
663 <object id="7" name="doria" type="sprite" x="328" y="525">
664 <properties>
665 <property name="animation" value="../res/sprites/doria_anim.txt"/>
666 <property name="collisionHeight" type="int" value="8"/>
667 <property name="collisionOffsetX" type="int" value="-8"/>
668 <property name="collisionOffsetY" type="int" value="-8"/>
669 <property name="collisionWidth" type="int" value="12"/>
670 <property name="shadow" type="bool" value="true"/>
671 </properties>
672 <point/>
673 </object>
674 <object id="8" name="approach_doria" type="trigger" x="384" y="512" width="16" height="64">
675 <properties>
676 <property name="script" value="approach_doria"/>
677 </properties>
678 </object>
663 </objectgroup> 679 </objectgroup>
664 <layer id="1" name="Layer 0" width="64" height="64"> 680 <layer id="1" name="Layer 0" width="64" height="64">
665 <data encoding="csv"> 681 <data encoding="csv">
diff --git a/res/scripts/map2.lua b/res/scripts/map2.lua index cdab0f5..1249f7d 100644 --- a/res/scripts/map2.lua +++ b/res/scripts/map2.lua
@@ -65,3 +65,7 @@ function map2.mailbox_lightning()
65 WaitForEndOfMessage() 65 WaitForEndOfMessage()
66 HideCutsceneBars() 66 HideCutsceneBars()
67end 67end
68
69function map2.approach_doria()
70 SetAnimation("doria", "hearts")
71end
diff --git a/res/sprites/doria.png b/res/sprites/doria.png new file mode 100644 index 0000000..c105a22 --- /dev/null +++ b/res/sprites/doria.png
Binary files differ
diff --git a/res/sprites/doria_anim.txt b/res/sprites/doria_anim.txt new file mode 100644 index 0000000..c52a456 --- /dev/null +++ b/res/sprites/doria_anim.txt
@@ -0,0 +1,25 @@
1../res/sprites/doria.png
2../res/sprites/doria_frames.txt
3still[down]: 0
4still[down_left]: 1
5still[left]: 2
6still[up_left]: 3
7still[up]: 4
8still[up_right]: 5
9still[right]: 6
10still[down_right]: 7
11walk[down]: 8,0,16,0
12walk[left]: 10,2,18,2
13walk[up]: 12,4,20,4
14walk[right]: 14,6,22,6
15talk[down]: 24,32,40
16talk[down_left]: 25,33,41
17talk[left]: 26,34,42
18talk[up_left]: 27,35,43
19talk[up]: 28,36,44
20talk[up_right]: 29,37,45
21talk[right]: 30,38,46
22talk[down_right]: 31,39,47
23hairflip![down]: 48,49,50,51,52,53,54,55,56
24hearts[down]: 57,58,59,60,61,62,63
25cheer[down_right]: 76,77,78,79 \ No newline at end of file
diff --git a/res/sprites/doria_frames.txt b/res/sprites/doria_frames.txt new file mode 100644 index 0000000..910b4ef --- /dev/null +++ b/res/sprites/doria_frames.txt
@@ -0,0 +1,178 @@
135,33 cell size
210 frames per row
3174 frames
4
532,32,16,32
632,32,16,32
732,32,16,32
832,32,16,32
932,32,16,32
1032,32,16,32
1132,32,16,32
1232,32,16,32
1332,32,16,32
1432,32,16,32
1532,32,16,32
1632,32,16,32
1732,32,16,32
1832,32,16,32
1932,32,16,32
2032,32,16,32
2132,32,16,32
2232,32,16,32
2332,32,16,32
2432,32,16,32
2532,32,16,32
2632,32,16,32
2732,32,16,32
2832,32,16,32
2932,32,16,32
3032,32,16,32
3132,32,16,32
3232,32,16,32
3332,32,16,32
3432,32,16,32
3532,32,16,32
3632,32,16,32
3732,32,16,32
3832,32,16,32
3932,32,16,32
4032,32,16,32
4132,32,16,32
4232,32,16,32
4332,32,16,32
4432,32,16,32
4532,32,16,32
4632,32,16,32
4732,32,16,32
4832,32,16,32
4932,32,16,32
5032,32,16,32
5132,32,16,32
5232,32,16,32
5335,32,19,32
5432,32,19,32
5532,32,19,32
5632,32,19,32
5732,32,19,32
5832,32,19,32
5932,32,19,32
6032,32,19,32
6132,32,19,32
6232,32,16,32
6332,32,16,32
6432,32,16,32
6532,32,16,32
6632,32,16,32
6732,32,16,32
6832,32,16,32
6932,32,16,32
7032,32,16,32
7132,32,16,32
7232,32,16,32
7332,32,16,32
7432,32,16,32
7532,32,16,32
7632,32,16,32
7732,32,16,32
7832,32,16,32
7932,32,16,32
8032,32,16,32
8132,32,16,32
8232,32,16,32
8332,32,16,32
8432,32,16,32
8532,32,16,32
8632,32,16,31
8732,32,16,30
8822,33,11,32
8922,33,11,31
9022,33,11,30
9122,33,11,32
9222,33,11,31
9322,33,11,30
9422,33,11,30
9532,32,16,32
9632,32,16,32
9732,32,16,32
9832,24,16,32
9932,32,16,32
10032,32,16,32
10132,24,16,32
10232,32,16,32
10332,32,16,32
10432,24,16,32
10532,32,16,32
10632,32,16,32
10732,24,16,32
10832,32,16,32
10932,32,16,32
11032,24,16,32
11132,32,16,32
11232,32,16,32
11332,24,16,32
11432,32,16,32
11532,32,16,32
11632,24,16,32
11732,32,16,32
11832,32,16,32
11932,24,16,32
12032,32,16,32
12132,32,16,32
12232,24,16,32
12332,32,19,32
12432,32,19,32
12532,24,19,32
12632,32,19,32
12732,32,19,32
12832,24,19,32
12932,32,19,32
13032,32,19,32
13132,24,19,32
13232,32,19,32
13332,32,19,32
13432,24,19,32
13532,32,19,32
13632,32,19,32
13732,24,19,32
13832,32,19,32
13932,32,19,32
14032,24,19,32
14132,32,19,32
14232,32,19,32
14332,32,19,32
14432,32,19,32
14532,32,19,32
14632,24,19,32
14716,8,8,8
14832,32,18,32
14932,32,18,32
15032,24,18,32
15132,32,18,34
15216,32,10,34
15316,32,10,34
1548,32,8,34
15516,16,8,22
15616,16,8,22
15716,16,8,23
15816,16,8,24
15916,16,8,25
16016,16,8,26
16116,16,8,27
16216,16,8,28
16316,16,8,28
16416,16,8,28
1658,8,8,28
16616,16,8,28
16716,16,8,28
16832,24,16,28
16932,24,16,28
17032,24,16,28
17132,24,16,28
17232,24,16,28
17332,24,16,28
17416,16,8,20
17516,16,8,20
17616,16,8,20
17716,8,8,12
17816,16,8,20