summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-19 21:49:57 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-19 21:49:57 +0000
commitc439bf893ad5cf3f6f093c9d689352a2ebc64757 (patch)
treef75f1ffc28a60fa5f0f0fe9af89d187bcd07e304
parentb7456f6a237e6be253b9d76541610bfaf1a41c8d (diff)
parent536c2fac5f9d916d38f54c6f54b7b360db431854 (diff)
downloadclientdata-c439bf893ad5cf3f6f093c9d689352a2ebc64757.tar.gz
clientdata-c439bf893ad5cf3f6f093c9d689352a2ebc64757.tar.bz2
clientdata-c439bf893ad5cf3f6f093c9d689352a2ebc64757.tar.xz
clientdata-c439bf893ad5cf3f6f093c9d689352a2ebc64757.zip
Merge branch 'music_addition_1' into 'master'
Added 4 new music tracks to maps See merge request legacy/clientdata!530
-rw-r--r--maps/021-3.tmx2
-rw-r--r--maps/026-1.tmx2
-rw-r--r--maps/027-3.tmx2
-rw-r--r--maps/027-4.tmx2
-rw-r--r--maps/027-5.tmx2
-rw-r--r--maps/027-6.tmx2
-rw-r--r--maps/027-7.tmx2
-rw-r--r--maps/027-8.tmx2
-rw-r--r--maps/029-1.tmx2
9 files changed, 9 insertions, 9 deletions
diff --git a/maps/021-3.tmx b/maps/021-3.tmx
index 96f9689a..e553f0d3 100644
--- a/maps/021-3.tmx
+++ b/maps/021-3.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="178" height="168" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43">
<properties>
<property name="minimap" value="graphics/minimaps/021-3.png"/>
- <property name="music" value="faith.ogg"/>
+ <property name="music" value="SewerAmbience.ogg"/>
<property name="name" value="Central Tulimshar Sewers"/>
</properties>
<tileset firstgid="1" source="../tilesets/collision.tsx"/>
diff --git a/maps/026-1.tmx b/maps/026-1.tmx
index fac0f66a..b1cdaed1 100644
--- a/maps/026-1.tmx
+++ b/maps/026-1.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="150" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="34">
<properties>
<property name="minimap" value="graphics/minimaps/026-1.png"/>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="DrearyDay.ogg"/>
<property name="name" value="Asphodel Moor"/>
<property name="overlay0image" value="graphics/images/ambient/fog.png"/>
<property name="overlay0parallax" value="1.0"/>
diff --git a/maps/027-3.tmx b/maps/027-3.tmx
index 76528424..9ab713a2 100644
--- a/maps/027-3.tmx
+++ b/maps/027-3.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" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="12">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Basement"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/027-4.tmx b/maps/027-4.tmx
index 95fc8a12..0cb3f30b 100644
--- a/maps/027-4.tmx
+++ b/maps/027-4.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" compressionlevel="0" width="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="10">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Sub-Basement One"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/027-5.tmx b/maps/027-5.tmx
index 89130b5b..4d5171c3 100644
--- a/maps/027-5.tmx
+++ b/maps/027-5.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="150" height="125" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="10">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Sub-Basement Two"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/027-6.tmx b/maps/027-6.tmx
index ac67d73e..7dd65479 100644
--- a/maps/027-6.tmx
+++ b/maps/027-6.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="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="2">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Sub-Basement Two"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/027-7.tmx b/maps/027-7.tmx
index dfd67c55..fade67d4 100644
--- a/maps/027-7.tmx
+++ b/maps/027-7.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="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="2">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Sub-Basement Two"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/027-8.tmx b/maps/027-8.tmx
index b9d162a4..8339acb3 100644
--- a/maps/027-8.tmx
+++ b/maps/027-8.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="80" height="85" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="2">
<properties>
- <property name="music" value="graveyard.ogg"/>
+ <property name="music" value="OverwhelmedUnderground.ogg"/>
<property name="name" value="Crypt Sub-Basement Two"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
diff --git a/maps/029-1.tmx b/maps/029-1.tmx
index 9ba0eb02..89bb6ba7 100644
--- a/maps/029-1.tmx
+++ b/maps/029-1.tmx
@@ -2,7 +2,7 @@
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="14">
<properties>
<property name="minimap" value="graphics/minimaps/029-1.png"/>
- <property name="music" value="the-forest.ogg"/>
+ <property name="music" value="In my Heart.ogg"/>
<property name="name" value="Candor Island"/>
<property name="overlay0image" value="graphics/images/ambient/clouds.png"/>
<property name="overlay0parallax" value="1.0"/>