summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE6
-rw-r--r--maps.xml89
2 files changed, 93 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 79fbdf36..27f997bb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -414,7 +414,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
#### Neck
graphics/items/equipment/neck/autumnmask.png (Chayenne) (GPLv2) (-)
graphics/items/equipment/neck/basiceye.png (Saulc) (CC BY-SA 4.0) (-)
- graphics/items/equipment/neck/beard.png (?) (GPLv2) (TMW.org)
+ graphics/items/equipment/neck/beard.png (?) (GPLv2) (TMW.org, Micksha)
graphics/items/equipment/neck/burglarmask.png (Saulc) (CC BY-SA 4.0) (-)
graphics/items/equipment/neck/cashiershade.png (?) (?) (TMW.org)
graphics/items/equipment/neck/eyepatch.png (Yosuhara) (GPLv2) (-)
@@ -1607,12 +1607,14 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/sprites/equipment/legs/trousers-male.png (Modanung, Reid) (CC BY-SA 3.0) (-)
#### Neck
graphics/sprites/equipment/neck/autumnmask.png (Chayenne) (CC BY-SA 3.0) (Saulc, Dustman)
+ graphics/sprites/equipment/neck/beard.png (?) (?) (TMW.org)
graphics/sprites/equipment/neck/burglarmask.png (Saulc) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/neck/eyepatch.png (Saulc) (GPLv2) (Yosuhara)
graphics/sprites/equipment/neck/goggles.png (Fettsack) (GPLv2) (Saulc)
graphics/sprites/equipment/neck/heartglasses.png (Lizandra) (GPLv2) (Saulc)
graphics/sprites/equipment/neck/monocle.png (Skipy) (GPLv2) (Saulc)
- graphics/sprites/equipment/neck/mustache.png (?) (?) (TMW.org)
+ graphics/sprites/equipment/neck/mustache.png (Saulc) (GPLv2) (-)
+ graphics/sprites/equipment/neck/old_mustache.png (?) (?) (TMW.org)
graphics/sprites/equipment/neck/rednose.png (ChefChelios, UntamedMonkey)(CC BY-SA 3.0) (dustman)
graphics/sprites/equipment/neck/shemagh.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/equipment/neck/sunglasses.png (UntamedMonkey) (CC BY-SA 3.0) (Saulc)
diff --git a/maps.xml b/maps.xml
index c8f0458c..b3c7bbe8 100644
--- a/maps.xml
+++ b/maps.xml
@@ -665,6 +665,24 @@ Copyright (C) 2018 TMW2 -->
<map name="027-4.tmx">
<atlas name="academy-indoors"/>
</map>
+ <map name="029-0.tmx">
+ <atlas name="evol-artis"/>
+ </map>
+ <map name="029-2.tmx">
+ <atlas name="crypt"/>
+ </map>
+ <map name="029-3.tmx">
+ <atlas name="crypt"/>
+ </map>
+ <map name="029-4.tmx">
+ <atlas name="crypt"/>
+ </map>
+ <map name="029-5.tmx">
+ <atlas name="crypt"/>
+ </map>
+ <map name="029-8.tmx">
+ <atlas name="evol-asphodel"/>
+ </map>
<map name="042-0.tmx">
<atlas name="camelot"/>
</map>
@@ -807,6 +825,65 @@ Copyright (C) 2018 TMW2 -->
<file name="graphics/tilesets/evol/artis-indoor.png"/>
<file name="graphics/tilesets/evol/ground.png"/>
</atlas>
+ <atlas name="evol-artis">
+ <file name="graphics/tilesets/evol/accessory.png"/>
+ <file name="graphics/tilesets/evol/box.png"/>
+ <file name="graphics/tilesets/evol/box-x1x2.png"/>
+ <file name="graphics/tilesets/evol/artis-accessory.png"/>
+ <file name="graphics/tilesets/evol/artis-accessory-x1x2.png"/>
+ <file name="graphics/tilesets/evol/artis-archway-x1x4.png"/>
+ <file name="graphics/tilesets/evol/artis-archway-x1x5.png"/>
+ <file name="graphics/tilesets/evol/artis-blockwall.png"/>
+ <file name="graphics/tilesets/evol/artis-bridge.png"/>
+ <file name="graphics/tilesets/evol/artis-chimney-x3x4.png"/>
+ <file name="graphics/tilesets/evol/artis-dock.png"/>
+ <file name="graphics/tilesets/evol/artis-fence.png"/>
+ <file name="graphics/tilesets/evol/artis-fountain.png"/>
+ <file name="graphics/tilesets/evol/artis-fountain-x1x4.png"/>
+ <file name="graphics/tilesets/evol/artis-fountain-x3x2.png"/>
+ <file name="graphics/tilesets/evol/artis-house.png"/>
+ <file name="graphics/tilesets/evol/artis-indoor-fringe.png"/>
+ <file name="graphics/tilesets/evol/artis-lamps.png"/>
+ <file name="graphics/tilesets/evol/artis-lamps-x1x3.png"/>
+ <file name="graphics/tilesets/evol/artis-market.png"/>
+ <file name="graphics/tilesets/evol/artis-pavement.png"/>
+ <file name="graphics/tilesets/evol/artis-pillar-x1x2.png"/>
+ <file name="graphics/tilesets/evol/artis-windows.png"/>
+ <file name="graphics/tilesets/evol/ground.png"/>
+ <file name="graphics/tilesets/ship-base.png"/>
+ <file name="graphics/tilesets/ship-flags-x3x2.png"/>
+ <file name="graphics/tilesets/ship-mast.png"/>
+ <file name="graphics/tilesets/tree-x3x3.png"/>
+ <file name="graphics/tilesets/tree-x3x4.png"/>
+ <file name="graphics/tilesets/tree-x4x5.png"/>
+ <file name="graphics/tilesets/water.png"/>
+ </atlas>
+ <atlas name="evol-asphodel">
+ <file name="graphics/tilesets/evol/artis-sewer.png"/>
+ <file name="graphics/tilesets/evol/fire.png"/>
+ <file name="graphics/tilesets/evol/ground.png"/>
+ <file name="graphics/tilesets/evol/hurns-ground.png"/>
+ <file name="graphics/tilesets/evol/hurns-house.png"/>
+ <file name="graphics/tilesets/evol/hurns-wall.png"/>
+ <file name="graphics/tilesets/evol/hurns-accessory.png"/>
+ <file name="graphics/tilesets/evol/hurns-accessory-x1x2.png"/>
+ <file name="graphics/tilesets/evol/hurns-chimney-x3x4.png"/>
+ <file name="graphics/tilesets/evol/hurns-indoor-accessory.png"/>
+ <file name="graphics/tilesets/evol/hurns-shadows.png"/>
+ <file name="graphics/tilesets/evol/hurns-accessory-x2x2.png"/>
+ <file name="graphics/tilesets/evol/swamp-accessory-x1x2.png"/>
+ <file name="graphics/tilesets/evol/swamp-accessory-x1x3.png"/>
+ <file name="graphics/tilesets/evol/swamp-ground.png"/>
+ <file name="graphics/tilesets/evol/swamp-house.png"/>
+ <file name="graphics/tilesets/evol/tree-x1x3.png"/>
+ <file name="graphics/tilesets/evol/tree-x1x4.png"/>
+ <file name="graphics/tilesets/evol/tree-x1x5.png"/>
+ <file name="graphics/tilesets/evol/waterfall.png"/>
+ <file name="graphics/tilesets/tree-x3x4.png"/>
+ <file name="graphics/tilesets/tree-x4x5.png"/>
+ <file name="graphics/tilesets/water.png"/>
+ <file name="graphics/tilesets/waterfall.png"/>
+ </atlas>
<!-- / Evol -->
@@ -982,6 +1059,18 @@ Copyright (C) 2018 TMW2 -->
<file name="graphics/tilesets/inn.png"/>
</atlas>
+ <atlas name="crypt">
+ <file name="graphics/tilesets/crypt1.png"/>
+ <file name="graphics/tilesets/crypt2.png"/>
+ <file name="graphics/tilesets/crypt2_x4.png"/>
+ <file name="graphics/tilesets/crypt_blockwall.png"/>
+ <file name="graphics/tilesets/crypt_fringe2_x3.png"/>
+ <file name="graphics/tilesets/crypt_fringe_x3.png"/>
+ <file name="graphics/tilesets/crypt_x4.png"/>
+ <file name="graphics/tilesets/woodland_indoor.png"/>
+ <file name="graphics/tilesets/woodland_indoor_x3.png"/>
+ </atlas>
+
<atlas name="desert">
<file name="graphics/tilesets/docks.png"/>
<file name="graphics/tilesets/desert1.png"/>