diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:05:45 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-27 12:05:45 -0500 |
| commit | 1656242563d14fa564bab8d4bc40054ab8998553 (patch) | |
| tree | 872589408ac7aef54b1959dc53b946fbed9dfcaa /res | |
| parent | e644f5c0d769989bd3b0665312c6949d76f5e388 (diff) | |
| download | tanetane-1656242563d14fa564bab8d4bc40054ab8998553.tar.gz tanetane-1656242563d14fa564bab8d4bc40054ab8998553.tar.bz2 tanetane-1656242563d14fa564bab8d4bc40054ab8998553.zip | |
Added background music (defined on a per-map basis)
Diffstat (limited to 'res')
| -rw-r--r-- | res/maps/hallucination_beach.tmx | 3 | ||||
| -rw-r--r-- | res/maps/hallucination_cliff.tmx | 3 | ||||
| -rw-r--r-- | res/maps/hallucination_hot_spring.tmx | 3 | ||||
| -rw-r--r-- | res/maps/hallucination_interior.tmx | 3 | ||||
| -rw-r--r-- | res/music/red_green_yellow_yellow.wav | bin | 0 -> 7078446 bytes | |||
| -rw-r--r-- | res/scripts/common.lua | 8 |
6 files changed, 19 insertions, 1 deletions
| diff --git a/res/maps/hallucination_beach.tmx b/res/maps/hallucination_beach.tmx index c6fd1cb..ce6c830 100644 --- a/res/maps/hallucination_beach.tmx +++ b/res/maps/hallucination_beach.tmx | |||
| @@ -1,5 +1,8 @@ | |||
| 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="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1"> | 2 | <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1"> |
| 3 | <properties> | ||
| 4 | <property name="music" value="red_green_yellow_yellow"/> | ||
| 5 | </properties> | ||
| 3 | <tileset firstgid="1" source="hallucination.tsx"/> | 6 | <tileset firstgid="1" source="hallucination.tsx"/> |
| 4 | <layer id="1" name="Lower" width="48" height="32"> | 7 | <layer id="1" name="Lower" width="48" height="32"> |
| 5 | <data encoding="csv"> | 8 | <data encoding="csv"> |
| diff --git a/res/maps/hallucination_cliff.tmx b/res/maps/hallucination_cliff.tmx index e6bd65e..8159d54 100644 --- a/res/maps/hallucination_cliff.tmx +++ b/res/maps/hallucination_cliff.tmx | |||
| @@ -1,5 +1,8 @@ | |||
| 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="48" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5"> | 2 | <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="48" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5"> |
| 3 | <properties> | ||
| 4 | <property name="music" value="red_green_yellow_yellow"/> | ||
| 5 | </properties> | ||
| 3 | <tileset firstgid="1" source="hallucination.tsx"/> | 6 | <tileset firstgid="1" source="hallucination.tsx"/> |
| 4 | <layer id="2" name="Background" width="48" height="48"> | 7 | <layer id="2" name="Background" width="48" height="48"> |
| 5 | <data encoding="csv"> | 8 | <data encoding="csv"> |
| diff --git a/res/maps/hallucination_hot_spring.tmx b/res/maps/hallucination_hot_spring.tmx index 2bb840d..b019681 100644 --- a/res/maps/hallucination_hot_spring.tmx +++ b/res/maps/hallucination_hot_spring.tmx | |||
| @@ -1,5 +1,8 @@ | |||
| 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="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5"> | 2 | <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5"> |
| 3 | <properties> | ||
| 4 | <property name="music" value="red_green_yellow_yellow"/> | ||
| 5 | </properties> | ||
| 3 | <tileset firstgid="1" source="hallucination.tsx"/> | 6 | <tileset firstgid="1" source="hallucination.tsx"/> |
| 4 | <layer id="2" name="Lower" width="32" height="16"> | 7 | <layer id="2" name="Lower" width="32" height="16"> |
| 5 | <data encoding="csv"> | 8 | <data encoding="csv"> |
| diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx index e792133..ee7a5cd 100644 --- a/res/maps/hallucination_interior.tmx +++ b/res/maps/hallucination_interior.tmx | |||
| @@ -1,5 +1,8 @@ | |||
| 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="2" nextobjectid="3"> | 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="2" nextobjectid="3"> |
| 3 | <properties> | ||
| 4 | <property name="music" value="red_green_yellow_yellow"/> | ||
| 5 | </properties> | ||
| 3 | <tileset firstgid="1" source="hallucination.tsx"/> | 6 | <tileset firstgid="1" source="hallucination.tsx"/> |
| 4 | <layer id="1" name="Lower" width="64" height="64"> | 7 | <layer id="1" name="Lower" width="64" height="64"> |
| 5 | <data encoding="csv"> | 8 | <data encoding="csv"> |
| diff --git a/res/music/red_green_yellow_yellow.wav b/res/music/red_green_yellow_yellow.wav new file mode 100644 index 0000000..e1cd6dd --- /dev/null +++ b/res/music/red_green_yellow_yellow.wav | |||
| Binary files differ | |||
| diff --git a/res/scripts/common.lua b/res/scripts/common.lua index 2a51419..a5e7873 100644 --- a/res/scripts/common.lua +++ b/res/scripts/common.lua | |||
| @@ -260,7 +260,13 @@ function ChangeMap(map, warp, options) | |||
| 260 | FadeToBlack(150) | 260 | FadeToBlack(150) |
| 261 | end | 261 | end |
| 262 | loadMap(map) | 262 | loadMap(map) |
| 263 | character():transplantParty(playerId, getWarpPoint(warp), direction) | 263 | character():transplantParty(playerId, getMap():getWarpPoint(warp), direction) |
| 264 | |||
| 265 | if (mixer():isPlayingMusic() and not getMap():hasMusic()) then | ||
| 266 | mixer():fadeoutMusic(150) | ||
| 267 | elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not mixer():getPlayingTrack() == getMap():getMusic())) then | ||
| 268 | mixer():playMusic(getMap():getMusic(), 150) | ||
| 269 | end | ||
| 264 | 270 | ||
| 265 | coroutine.yield() | 271 | coroutine.yield() |
| 266 | if (options & ChangeMapOptions.DO_NOT_FADE == 0) then | 272 | if (options & ChangeMapOptions.DO_NOT_FADE == 0) then |