summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/maps/time_passage.tmx6
-rw-r--r--res/maps/time_passage.tsx20
-rw-r--r--res/maps/time_passage_antechamber.tmx12
-rw-r--r--res/scripts/common.lua9
-rw-r--r--res/scripts/time_passage_antechamber.lua5
-rw-r--r--res/sprites/entryway.pngbin0 -> 3050 bytes
-rw-r--r--res/sprites/entryway_anim.txt4
-rw-r--r--res/sprites/entryway_frames.txt6
8 files changed, 57 insertions, 5 deletions
diff --git a/res/maps/time_passage.tmx b/res/maps/time_passage.tmx index 7400e34..c5c6b71 100644 --- a/res/maps/time_passage.tmx +++ b/res/maps/time_passage.tmx
@@ -132,15 +132,15 @@
1321,1,1,1,1,1,1,1,1,1,1,21,21,21,30,31,2147483678,21,21,21,1,1,1,1,1,1,1,1,1,1,1,1, 1321,1,1,1,1,1,1,1,1,1,1,21,21,21,30,31,2147483678,21,21,21,1,1,1,1,1,1,1,1,1,1,1,1,
1331,1,1,1,1,1,1,1,1,1,1,1,21,21,1073741851,1073741852,3221225499,21,21,1,1,1,1,1,1,1,1,1,1,1,1,1, 1331,1,1,1,1,1,1,1,1,1,1,1,21,21,1073741851,1073741852,3221225499,21,21,1,1,1,1,1,1,1,1,1,1,1,1,1,
1341,1,1,1,1,1,1,1,1,1,1,1,1,1,1,21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1341,1,1,1,1,1,1,1,1,1,1,1,1,1,1,21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1351,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1351,1,1,1,1,1,1,1,1,1,1,1,1,1,1,21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1361,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 1361,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
137</data> 137</data>
138 </layer> 138 </layer>
139 <objectgroup id="2" name="Objects"> 139 <objectgroup id="2" name="Objects">
140 <object id="1" name="fromBottom" type="warp" x="247.75" y="1991"> 140 <object id="1" name="fromBottom" type="warp" x="248" y="1991">
141 <point/> 141 <point/>
142 </object> 142 </object>
143 <object id="2" name="fromMailbox" type="warp" x="247.75" y="1841"> 143 <object id="2" name="fromMailbox" type="warp" x="248" y="1840">
144 <point/> 144 <point/>
145 </object> 145 </object>
146 <object id="3" name="moveDown" type="trigger" x="236.5" y="1998.5" width="23" height="3.75"> 146 <object id="3" name="moveDown" type="trigger" x="236.5" y="1998.5" width="23" height="3.75">
diff --git a/res/maps/time_passage.tsx b/res/maps/time_passage.tsx index 20c8eeb..2a93d5a 100644 --- a/res/maps/time_passage.tsx +++ b/res/maps/time_passage.tsx
@@ -66,6 +66,16 @@
66 <property name="solid" type="bool" value="true"/> 66 <property name="solid" type="bool" value="true"/>
67 </properties> 67 </properties>
68 </tile> 68 </tile>
69 <tile id="16">
70 <properties>
71 <property name="solid" type="bool" value="true"/>
72 </properties>
73 </tile>
74 <tile id="18">
75 <properties>
76 <property name="solid" type="bool" value="true"/>
77 </properties>
78 </tile>
69 <tile id="19"> 79 <tile id="19">
70 <properties> 80 <properties>
71 <property name="solid" type="bool" value="true"/> 81 <property name="solid" type="bool" value="true"/>
@@ -196,6 +206,16 @@
196 <property name="solid" type="bool" value="true"/> 206 <property name="solid" type="bool" value="true"/>
197 </properties> 207 </properties>
198 </tile> 208 </tile>
209 <tile id="52">
210 <properties>
211 <property name="solid" type="bool" value="true"/>
212 </properties>
213 </tile>
214 <tile id="54">
215 <properties>
216 <property name="solid" type="bool" value="true"/>
217 </properties>
218 </tile>
199 <tile id="55"> 219 <tile id="55">
200 <properties> 220 <properties>
201 <property name="solid" type="bool" value="true"/> 221 <property name="solid" type="bool" value="true"/>
diff --git a/res/maps/time_passage_antechamber.tmx b/res/maps/time_passage_antechamber.tmx index 5075534..f705305 100644 --- a/res/maps/time_passage_antechamber.tmx +++ b/res/maps/time_passage_antechamber.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="48" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="3"> 2<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
3 <properties> 3 <properties>
4 <property name="music" value="time_passage"/> 4 <property name="music" value="time_passage"/>
5 </properties> 5 </properties>
@@ -25,9 +25,17 @@
25</data> 25</data>
26 </layer> 26 </layer>
27 <objectgroup id="2" name="Objects"> 27 <objectgroup id="2" name="Objects">
28 <object id="1" name="fromTop" type="warp" x="375" y="112.25"> 28 <object id="1" name="fromTop" type="warp" x="376" y="112.25">
29 <point/> 29 <point/>
30 </object> 30 </object>
31 <object id="3" name="entryway_appear" type="warp" x="360.133" y="64.1667">
32 <point/>
33 </object>
34 <object id="4" name="door" type="trigger" x="368" y="79.875" width="16" height="16">
35 <properties>
36 <property name="script" value="enter_door"/>
37 </properties>
38 </object>
31 </objectgroup> 39 </objectgroup>
32 <layer id="1" name="Upper" width="48" height="16"> 40 <layer id="1" name="Upper" width="48" height="16">
33 <properties> 41 <properties>
diff --git a/res/scripts/common.lua b/res/scripts/common.lua index 8eb491f..1b0c4a9 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua
@@ -313,6 +313,15 @@ function CreateAnimatedSpriteAtPosition(alias, character, x, y, animName, direct
313 animation():setSpriteAnimation(spriteId, animName) 313 animation():setSpriteAnimation(spriteId, animName)
314end 314end
315 315
316function CreateAnimatedSpriteAtWarpPoint(alias, character, warp, animName, direction, layer)
317 local spriteId = emplaceSprite(alias)
318 local loc = getMap():getWarpPoint(warp)
319 transform():initSprite(spriteId, loc:x(), loc:y(), layer)
320 animation():initSprite(spriteId, "../res/sprites/" .. character .. "_anim.txt")
321 animation():setSpriteDirection(spriteId, direction)
322 animation():setSpriteAnimation(spriteId, animName)
323end
324
316function DestroyNamedSprite(alias) 325function DestroyNamedSprite(alias)
317 local spriteId = getSpriteByAlias(alias) 326 local spriteId = getSpriteByAlias(alias)
318 destroySprite(spriteId) 327 destroySprite(spriteId)
diff --git a/res/scripts/time_passage_antechamber.lua b/res/scripts/time_passage_antechamber.lua index d70694a..cd5abbe 100644 --- a/res/scripts/time_passage_antechamber.lua +++ b/res/scripts/time_passage_antechamber.lua
@@ -1 +1,6 @@
1time_passage_antechamber = {} 1time_passage_antechamber = {}
2
3function time_passage_antechamber.enter_door()
4 CreateAnimatedSpriteAtWarpPoint("entryway", "entryway", "entryway_appear", "time_passage", Direction.DOWN, SpriteLayer.NORMAL)
5 ChangeMap("time_passage", "fromBottom")
6end
diff --git a/res/sprites/entryway.png b/res/sprites/entryway.png new file mode 100644 index 0000000..d93b535 --- /dev/null +++ b/res/sprites/entryway.png
Binary files differ
diff --git a/res/sprites/entryway_anim.txt b/res/sprites/entryway_anim.txt new file mode 100644 index 0000000..35a5927 --- /dev/null +++ b/res/sprites/entryway_anim.txt
@@ -0,0 +1,4 @@
1../res/sprites/entryway.png
2../res/sprites/entryway_frames.txt
3time_passage[down]: 0
4pink_shell[down]: 1 \ No newline at end of file
diff --git a/res/sprites/entryway_frames.txt b/res/sprites/entryway_frames.txt new file mode 100644 index 0000000..9a75157 --- /dev/null +++ b/res/sprites/entryway_frames.txt
@@ -0,0 +1,6 @@
132,32 cell size
210 frames per row
32 frames
4
532,32,0,0
632,32,0,0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 20:22:13 +0000