diff options
author | Led Mitz <smoothshifter@tuta.io> | 2024-02-20 04:33:13 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2024-02-20 04:33:13 +0000 |
commit | 888ca49c5eb864c236c480e1a55b34fcfd282463 (patch) | |
tree | d2b7fb12bd821ba7c08a0892c576c84e7db583e1 | |
parent | 15fce28ced897714016cc7cfa8d6fc8d0ae6b71b (diff) | |
parent | a91001307dc912c28942db0b51c6b76c2144c6dc (diff) | |
download | clientdata-888ca49c5eb864c236c480e1a55b34fcfd282463.tar.gz clientdata-888ca49c5eb864c236c480e1a55b34fcfd282463.tar.bz2 clientdata-888ca49c5eb864c236c480e1a55b34fcfd282463.tar.xz clientdata-888ca49c5eb864c236c480e1a55b34fcfd282463.zip |
Merge branch 'fireplace_maps' into 'master'
Added fireplace ambience to a few buildings
See merge request legacy/clientdata!582
-rw-r--r-- | maps/009-7.tmx | 2 | ||||
-rw-r--r-- | maps/016-2.tmx | 2 | ||||
-rw-r--r-- | maps/034-2.tmx | 2 | ||||
-rw-r--r-- | maps/botcheck.tmx | 2 | ||||
m--------- | music | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/maps/009-7.tmx b/maps/009-7.tmx index 6d4adff8..a7e9a089 100644 --- a/maps/009-7.tmx +++ b/maps/009-7.tmx @@ -2,7 +2,7 @@ <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4"> <properties> <property name="minimap" value="graphics/minimaps/009-7.png"/> - <property name="music" value="magick-real.ogg"/> + <property name="music" value=""/> <property name="name" value="The Sanguine Vault"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> diff --git a/maps/016-2.tmx b/maps/016-2.tmx index 10cc7385..9d2e0fa7 100644 --- a/maps/016-2.tmx +++ b/maps/016-2.tmx @@ -2,7 +2,7 @@ <map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13"> <properties> <property name="Authors" value="Tezer,Gumi"/> - <property name="music" value="despair.ogg"/> + <property name="music" value="Fireplace.ogg"/> <property name="name" value="Gwendolyn's"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> diff --git a/maps/034-2.tmx b/maps/034-2.tmx index 4e81d248..b60e0ecc 100644 --- a/maps/034-2.tmx +++ b/maps/034-2.tmx @@ -2,7 +2,7 @@ <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="5"> <properties> <property name="Authors" value="The Mana World, bh28."/> - <property name="music" value="snow-village.ogg"/> + <property name="music" value="Fireplace.ogg"/> <property name="name" value="Trappers Huts"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> diff --git a/maps/botcheck.tmx b/maps/botcheck.tmx index aa192e53..8681be5b 100644 --- a/maps/botcheck.tmx +++ b/maps/botcheck.tmx @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="75" height="75" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="1"> <properties> - <property name="music" value="dimonds-cove.ogg"/> + <property name="music" value=""/> <property name="name" value="Botcheck Area"/> </properties> <tileset firstgid="1" source="../tilesets/collision.tsx"/> diff --git a/music b/music -Subproject 825bc8c93380ccfc899f245adc8a170eae52b94 +Subproject c7004f9805e4d5a19a05fc252bf00769b395068 |