diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua index ec9b0bf046ec91026583d7b139625b5570d8c850..ab359352db3d06bb3c20d16dc6213e3f9669451f 100644 --- a/game/modules/tome/data/general/stores/basic.lua +++ b/game/modules/tome/data/general/stores/basic.lua @@ -227,6 +227,20 @@ newEntity{ }, } +newEntity{ + define_as = "LITEDIGSTORE", + name = "tool store", + display = '8', color=colors.UMBER, + store = { + purse = 10, + empty_before_restock = false, + filters = { + {type="lite", id=true, tome_drops="store"}, + {type="tool", subtype="digger", id=true, tome_drops="store"}, + }, + }, +} + ------------------------------------------------------------- -- Angolwen diff --git a/game/modules/tome/data/maps/towns/derth.lua b/game/modules/tome/data/maps/towns/derth.lua index a67ec5e8e6ac21d398f8249fdd66bf6e6b57624f..760221d19a7ad99cead39c08a7b3c97aa3f6415b 100644 --- a/game/modules/tome/data/maps/towns/derth.lua +++ b/game/modules/tome/data/maps/towns/derth.lua @@ -41,6 +41,7 @@ defineTile('1', "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE") defineTile('4', "HARDWALL", nil, nil, "HERBALIST") defineTile('9', "HARDWALL", nil, nil, "JEWELRY") defineTile('a', "HARDWALL", nil, nil, "ALCHEMIST") +defineTile('b', "HARDWALL", nil, nil, "TOOLSHOP") startx = 0 starty = 20 @@ -88,7 +89,7 @@ tttttttttttt~~~tt.................ttt~~~tttttt~~~~ ttttttttttt~~~~t....................t~~~~ttt~~~~~~ ttttttttttt~~~tt..######....######...t~~~t~~~~~~~t tttttttttt~~~~t...######....######...tt~~~~~~~~~~t -tttttttttt~~~tt...######....######....t~~~~~~~~ttt +tttttttttt~~~tt...######....##b###....t~~~~~~~~ttt tttttttttt~~~t....###4##.....___......tt~~~~~~tttt tttttttttt~~tt......___......._........t~~~~tttttt ttttttttt...t........_........_........t~~~ttttttt diff --git a/game/modules/tome/data/maps/towns/iron-council.lua b/game/modules/tome/data/maps/towns/iron-council.lua index aa6158f214bcc9b1df539f958176eb8760749501..2fc01203aa2b31f994fd5fe03b4d06269b905bfb 100644 --- a/game/modules/tome/data/maps/towns/iron-council.lua +++ b/game/modules/tome/data/maps/towns/iron-council.lua @@ -45,6 +45,7 @@ defineTile("4", "HARDWALL", nil, nil, "MACE_WEAPON_STORE") defineTile("6", "HARDWALL", nil, nil, "SWORD_WEAPON_STORE") defineTile("5", "HARDWALL", nil, nil, "RUNIC_STORE") defineTile("9", "HARDWALL", nil, nil, "GEM_STORE") +defineTile("a", "HARDWALL", nil, nil, "TOOLSHOP") -- addSpot section @@ -78,7 +79,7 @@ return [[ ####.....####.....F....&&&&....B......####....#### ##############........&&&&&&.........############# ##############........&&&&&&.........############# -####.....####.....E....&&&&....C......9#5#....#### +####.....##a#.....E....&&&&....C......9#5#....#### ####....................&&....................#### ####..........................................#### ####..........................................#### diff --git a/game/modules/tome/data/zones/town-derth/traps.lua b/game/modules/tome/data/zones/town-derth/traps.lua index 7a5a6a69d1e7468713bd3a92515109bf84b4d86d..6a1a18d8e32ca1195af025c76fa99ba35fec5a40 100644 --- a/game/modules/tome/data/zones/town-derth/traps.lua +++ b/game/modules/tome/data/zones/town-derth/traps.lua @@ -61,6 +61,12 @@ newEntity{ base = "BASE_STORE", define_as = "JEWELRY", resolvers.store("GEMSTORE", "allied-kingdoms", "store/shop_door.png", "store/shop_sign_jewelry.png"), } +newEntity{ base = "BASE_STORE", define_as = "TOOLSHOP", + name="Survival Supplies", + display='8', color=colors.UMBER, + resolvers.store("LITEDIGSTORE", "allied-kingdoms", "store/shop_door.png", "store/shop_sign_trainer.png"), +} + newEntity{ base = "BASE_STORE", define_as = "ALCHEMIST", name="Home of Stire the Alchemist", display='*', color=colors.UMBER, image = "store/shop_door_barred.png", diff --git a/game/modules/tome/data/zones/town-iron-council/traps.lua b/game/modules/tome/data/zones/town-iron-council/traps.lua index 71896fff84559b97e577e133de1065fb71f5bc2f..b998dd1fa8d45c6ea58d04e0288a6d11767958bd 100644 --- a/game/modules/tome/data/zones/town-iron-council/traps.lua +++ b/game/modules/tome/data/zones/town-iron-council/traps.lua @@ -62,3 +62,9 @@ newEntity{ base = "BASE_STORE", define_as = "GEM_STORE", display='9', color=colors.LIGHT_RED, resolvers.store("GEMSTORE", "iron-throne", "store/shop_door.png", "store/shop_sign_jewelry.png"), } + +newEntity{ base = "BASE_STORE", define_as = "TOOLSHOP", + name="Delver's Delights", + display='8', color=colors.UMBER, + resolvers.store("LITEDIGSTORE", "iron-throne", "store/shop_door.png", "store/shop_sign_trainer.png"), +} diff --git a/tiled-maps/derth.tmx b/tiled-maps/derth.tmx index 2d1f26f2e95a0c2f599da5d2c24174493b68f8fd..8236e22f5f6833167a5fc1b8414cf1e206b0d25d 100644 --- a/tiled-maps/derth.tmx +++ b/tiled-maps/derth.tmx @@ -103,6 +103,11 @@ <property name="display" value="#"/> </properties> </tile> + <tile id="3"> + <properties> + <property name="display" value="b"/> + </properties> + </tile> <tile id="4"> <properties> <property name="display" value="3"/> @@ -113,6 +118,11 @@ <property name="display" value="2"/> </properties> </tile> + <tile id="7"> + <properties> + <property name="display" value="a"/> + </properties> + </tile> <tile id="8"> <properties> <property name="display" value="9"/> @@ -156,7 +166,7 @@ </tileset> <layer name="Terrain" width="50" height="50"> <data encoding="base64" compression="zlib"> - eJztl0tuwzAMRL3OJXoMnyEH7mG6aIFsku5yhcBAChgEP0OKhFSAi0EWsqV5GpFy9m3b9lar1QJ1BTXb56j/lZlGGFbh8fpZkUdb/8LIyzaTgfOvKYslwp3FwOXk5RjJL5MB4Ymc60gWGQyUR/OYUU9aFl+CqE/kOW6trB5nZZHNYXmvyCKbQzpfGb3Zqouzp6fi79DHSdU9WeKwehTi8QKMIzXvFZ3bWh/xGOHQPH6SPfQo6hHJy8sRzULisjjpmFXr3JmuqG+pLtAcD/83gYNmUs1h7f8O5CONZ3Ag3yFIrYzUUzUH2l8tn8g9kslxrnvUP8pR3bO0LGivse5vi8PzzTibg3u2OXI5ft+/PwLHuR+syGHdcdy9yNXLTA6rlrl+ZrEf/u+EQ+ubGX0X4Yj0ZPpeBoOXRdpjpAdId2omx0guo3dLJQeayyhHVm2gLBzPH8v32/8jyJHNEMkm+r8S2bdqFi0jS975q1jQdSXv2pyVHAgP4ifyzkpMUe7/wjPbe6vValXrBWleFvg= + eJztl01qAzEMhWedS/QYc4YcuIcptCXdtN3lCmUggUHo50mWsAtaPLKwx36f30ie7Nu27a1WqwXqCmq2z1H/KzONMKzC4/WzIo+2/4WRl20mA+dfUxZLhDuLgcvJyzGSXyYDwhN5ryNZZDBQHs1jRj1pWbwJoj6RedxeWT3OyiKbw/JekUWE492Yh3B4a5vj0M75rvg79HJSdU+WOKwehXi8AONIzXtF17b2RzxGODSPr+QMPYp6RPLyckSzkLgsTjpm1Tr3TlfUt1QXaI6H/y+Bg2ZSzWGd/w7kI41ncCDfIUitjNRTNQfaXy2fyD2SyXGue9Q/ylHds7QsaK+x7m+Lw/PNOJuDm9scuRy/j99PgePcD54+bwtxWHccdy9y9TKTw6plrp9Z7If/b8Kh9c2MvotwRHoyfS6DwcsinTHSA6Q7NZNjJJfRu6WSA81llCOrNlAWjufJ8vHw/xPkyGaIZBP9X4mcWzWLlpEl7/pVLOi+kndtzUoOhAfxE3lmJaYo93/hme291Wq1qvUHIekXAg== </data> </layer> <objectgroup name="addSpot" width="50" height="50"> diff --git a/tiled-maps/iron-council.tmx b/tiled-maps/iron-council.tmx index f3a6a111dd6df76ee14b7d66372f95debc001942..bb429b440edb501dcccd099a73dad40ce7c34e95 100644 --- a/tiled-maps/iron-council.tmx +++ b/tiled-maps/iron-council.tmx @@ -150,6 +150,11 @@ </tileset> <tileset firstgid="361" name="dg_town132" tilewidth="32" tileheight="32"> <image source="gfx/dg_town132.gif" width="288" height="128"/> + <tile id="3"> + <properties> + <property name="display" value="a"/> + </properties> + </tile> <tile id="4"> <properties> <property name="display" value="2"/> @@ -1499,7 +1504,7 @@ <tile gid="1"/> <tile gid="218"/> <tile gid="218"/> - <tile gid="218"/> + <tile gid="364"/> <tile gid="218"/> <tile gid="1"/> <tile gid="1"/>