summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-22 22:16:51 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-22 22:16:51 -0300
commitf936ec88a3e085dbce1958d3fd2b63dc0b48c0a3 (patch)
tree85a0a14ae84a6b379699c323801c024a05984a75
parent5d0ca4363a3fbc983727be2e8b5d9d456a8ab153 (diff)
downloadclientdata-f936ec88a3e085dbce1958d3fd2b63dc0b48c0a3.tar.gz
clientdata-f936ec88a3e085dbce1958d3fd2b63dc0b48c0a3.tar.bz2
clientdata-f936ec88a3e085dbce1958d3fd2b63dc0b48c0a3.tar.xz
clientdata-f936ec88a3e085dbce1958d3fd2b63dc0b48c0a3.zip
Artis Lamps - add more lamps, and deprecate other lamp tileset.
In future, this will culminate in public lightining.
-rw-r--r--LICENSE4
-rw-r--r--graphics/tilesets/artis-lamps-x1x3.pngbin1888 -> 5115 bytes
-rw-r--r--maps/005-1.tmx4
3 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 83e32c34..28eb574a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1746,8 +1746,8 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/tilesets/artis-indoor-x1x3.png (Reid, Nard) (CC BY-SA 3.0) (Bagzie)
graphics/tilesets/artis-indoor-x1x4.png (Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-indoor-x2x4.png (Reid) (CC BY-SA 3.0) (-)
- graphics/tilesets/artis-lamps.png (Alige) (CC BY-SA 3.0) (Reid)
- graphics/tilesets/artis-lamps-x1x3.png (Alige) (CC BY-SA 3.0) (Reid)
+ graphics/tilesets/artis-lamps.png (Alige) (CC BY-SA 3.0) (Reid, Jesusalva)
+ graphics/tilesets/artis-lamps-x1x3.png (Alige) (CC BY-SA 3.0) (Reid, Jesusalva)
graphics/tilesets/artis-market.png (EJlol, IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-pavement.png (IvanMorve, Reid) (CC BY-SA 3.0) (-)
graphics/tilesets/artis-pillar-x1x2.png (Reid) (CC BY-SA 3.0) (Kestrel)
diff --git a/graphics/tilesets/artis-lamps-x1x3.png b/graphics/tilesets/artis-lamps-x1x3.png
index 9e086755..6cc6da74 100644
--- a/graphics/tilesets/artis-lamps-x1x3.png
+++ b/graphics/tilesets/artis-lamps-x1x3.png
Binary files differ
diff --git a/maps/005-1.tmx b/maps/005-1.tmx
index 4a2ed016..9561f62c 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -101,8 +101,8 @@
<tileset firstgid="2879" name="artis-pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="3007" name="artis lamps" tilewidth="32" tileheight="96" tilecount="6" columns="6">
- <image source="../graphics/tilesets/artis-lamps-x1x3.png" width="192" height="96"/>
+ <tileset firstgid="3007" name="artis lamps" tilewidth="32" tileheight="96" tilecount="20" columns="10">
+ <image source="../graphics/tilesets/artis-lamps-x1x3.png" width="320" height="192"/>
</tileset>
<layer id="1" name="Ground" width="135" height="140">
<data encoding="csv">