diff --git a/game/modules/tome/data/chats/gates-of-morning-welcome.lua b/game/modules/tome/data/chats/gates-of-morning-welcome.lua
index 22b868f4b2e94203962e23f7faae0840336e1c71..d2e6152b5e5cc419e65646a509bccb098212046d 100644
--- a/game/modules/tome/data/chats/gates-of-morning-welcome.lua
+++ b/game/modules/tome/data/chats/gates-of-morning-welcome.lua
@@ -52,7 +52,8 @@ They roam the lands freely, ever assaulting us.
{"Thank you, my lady.", action=function(npc, player)
world:gainAchievement("STRANGE_NEW_WORLD", game.player)
player:setQuestStatus("strange-new-world", engine.Quest.DONE)
- npc:move(46, 27, true)
+ local spot = game.level:pickSpot{type="npc", subtype="aeryn-main"}
+ npc:move(spot.x, spot.y, true)
npc.can_talk = "gates-of-morning-main"
end},
}
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index b1b2fa65730c5a3e2f0f76a44fc91101bded753d..1d7371d3b97ceb5ac5ec56fcd8f444222b0a9d92 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -1301,7 +1301,7 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
desc = [[A plain elven-silk robe. It would be unremarkable if not for the sheer power it radiates.]],
level_range = {30, 40},
rarity = 290,
- cost = 350,
+ cost = 550,
material_level = 5,
wielder = {
lite = 1,
@@ -1318,6 +1318,28 @@ newEntity{ base = "BASE_CLOTH_ARMOR",
},
}
+newEntity{ base = "BASE_CLOTH_ARMOR",
+ power_source = {arcane=true},
+ unique = true,
+ name = "Temporal Augmentation Robe - Designed In-Style", color = colors.BLACK,
+ unided_name = "stlylish robe with a scarf",
+ desc = [[Designed by a slightly quirky paradox mage, this robe always appears to be stylish in any time the user finds him, her, or itself in. Crafted to aid paradox mages through their adventures, this robe is of great help to those that understand what a wibbly-wobbly, timey-wimey mess time actually is. Curiously, as a result of a particularly prolonged battle involving its fourth wearer, the robe appends a very long, multi-coloured scarf to its present wearers.]],
+ level_range = {30, 40},
+ rarity = 310,
+ cost = 540,
+ material_level = 5,
+ wielder = {
+ inc_damage = {[DamageType.TEMPORAL]=20},
+ combat_def = 9,
+ combat_armor = 3,
+ inc_stats = { [Stats.STAT_MAG] = 5, [Stats.STAT_WIL] = 3, },
+ resists={[DamageType.TEMPORAL] = 20},
+ on_melee_hit={[DamageType.TEMPORAL] = 10},
+ },
+ max_power = 100, power_regen = 1,
+ use_talent = { id = Talents.T_DAMAGE_SMEARING, level = 3, power = 100 },
+}
+
newEntity{ base = "BASE_GEM",
power_source = {arcane=true},
unique = true,
diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua
index 8cce0913cba7fea27b08c59dbbff6ee60db5d664..7d585f0d850c7a600afc4f98bc466e4eb76e8e45 100644
--- a/game/modules/tome/data/general/stores/basic.lua
+++ b/game/modules/tome/data/general/stores/basic.lua
@@ -99,6 +99,20 @@ newEntity{
},
}
+newEntity{
+ define_as = "ARCHER_WEAPON",
+ name = "archery",
+ display = '3', color=colors.UMBER,
+ store = {
+ purse = 25,
+ empty_before_restock = false,
+ filters = {
+ {type="weapon", subtype="longbow", id=true, tome_drops="store"},
+ {type="weapon", subtype="sling", id=true, tome_drops="store"},
+ },
+ },
+}
+
newEntity{
define_as = "KNIFE_WEAPON",
name = "knife smith",
@@ -245,9 +259,12 @@ newEntity{
name = "library",
display = '*', color=colors.LIGHT_RED,
store = {
- purse = 5,
+ purse = 10,
empty_before_restock = false,
filters = {
+ {type="scroll", subtype="rune", id=true},
+ },
+ fixed = {
{id=true, defined="FOUNDATION_NOTE1"},
{id=true, defined="FOUNDATION_NOTE2"},
{id=true, defined="FOUNDATION_NOTE3"},
@@ -378,3 +395,21 @@ newEntity{
end,
},
}
+
+newEntity{
+ define_as = "ZIGUR_ARCHER_WEAPON",
+ name = "archery",
+ display = '3', color=colors.UMBER,
+ store = {
+ purse = 25,
+ empty_before_restock = false,
+ filters = {
+ {type="weapon", subtype="sling", id=true, tome_drops="store"},
+ {type="weapon", subtype="longbow", id=true, tome_drops="store"},
+ },
+ post_filter = function(e)
+ if e.power_source and e.power_source.arcane then return false end
+ return true
+ end,
+ },
+}
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94729aff0dd413b460a52659b88b683cf4783cd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1i.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1i.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c222479f7ce8bfaca9fae5ee020236079ac3a87
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain1i.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain2.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8314d61ffce9da575e9dbcd6bc0019438eff3011
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain2.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bf4ea0a7e021281fac8fb25e3d035b5dcf5a639
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3i.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3i.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c723de4d8bbcc041e946984dd8fe67501c7f776
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain3i.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain4.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef058119d712af55bf859d19e156e49d48cd5444
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1cfca764b9d59878ff639105c35cdc4a2dc8d84
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_1.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..98b3b9db9c6037c1958dd07ba186bbf63eed452e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_1.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_2.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2df80c68066da2fdb6a73f1077a8e353e12279ae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_2.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_3.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..50e934eaa12ae7ff257afda5e9c018c331b5adf1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_3.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_4.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e1eda3d5fa7e945f4cf9eae963b89a5588ac06c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_5.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..e01525af2dae5d9589792d385142a4727824f64b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_5.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_6.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d9c6804e3fb5022cd8d75711580f9dd9e119cc6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain5_6.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain6.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain6.png
new file mode 100644
index 0000000000000000000000000000000000000000..949c212c4ef2cd254353c7451bf345bd034a4b89
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain6.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ab4da0153d9c9d838bee2dd9899c27b8595b1f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7i.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7i.png
new file mode 100644
index 0000000000000000000000000000000000000000..e28375c5e7351237eb2df0f8afb7fc92c5433697
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain7i.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain8.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain8.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b3481988bf623ec9b7dd7ccb9c48a4589b64794
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain8.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a821c2038e1ab11a4a47e2be3bbdfe5517274e2c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9i.png b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9i.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd9bbd4c38e1f09ca3a29c36336e2e6f1ee1be0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/golden_mountain9i.png differ
diff --git a/game/modules/tome/data/maps/towns/derth.lua b/game/modules/tome/data/maps/towns/derth.lua
index d4cd0e6ca7dce36f864aea44e4644a3c6e98587c..7a3f42387d7c8788bc27bae5920993c42b6b876e 100644
--- a/game/modules/tome/data/maps/towns/derth.lua
+++ b/game/modules/tome/data/maps/towns/derth.lua
@@ -35,6 +35,7 @@ defineTile("'", "DOOR")
defineTile('2', "HARDWALL", nil, nil, "SWORD_WEAPON_STORE")
defineTile('5', "HARDWALL", nil, nil, "KNIFE_WEAPON_STORE")
+defineTile('6', "HARDWALL", nil, nil, "ARCHER_WEAPON_STORE")
defineTile('3', "HARDWALL", nil, nil, "HEAVY_ARMOR_STORE")
defineTile('1', "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE")
defineTile('4', "HARDWALL", nil, nil, "HERBALIST")
@@ -103,7 +104,7 @@ ttttttt~~~t.._.#####....._.####._.###...t~~~tttttt
ttttttt~~~t.._.#####....._.####._.###...t~~~tttttt
ttttttt~~~t.._.#5#2#....___##a#._.###...t~~~tttttt
ttttttt~~~t.._______..___._.._.._.###...t~~~tttttt
-ttttttt~~~t......._..__..._______.###..tt~~~tttttt
+ttttttt~~~t......._..__..._______.#6#..tt~~~tttttt
ttttttt~~~tt......_.._.........._.._...t~~~ttttttt
tttttttt~~~tt.....____.####.....____...t~~~ttttttt
ttttttttt~~~tt......_..####....._......t~~~ttttttt
diff --git a/game/modules/tome/data/maps/towns/gates-of-morning.lua b/game/modules/tome/data/maps/towns/gates-of-morning.lua
index a8a9ce07a4ae2d900f894915d1e640e2db4d7cc0..e975bb2cb243d0a3cb3778750f212ed8a7498e16 100644
--- a/game/modules/tome/data/maps/towns/gates-of-morning.lua
+++ b/game/modules/tome/data/maps/towns/gates-of-morning.lua
@@ -17,21 +17,33 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-defineTile(' ', "FLOOR", nil, nil, nil, {no_teleport=true})
-quickEntity('M', {always_remember = true, show_tooltip=true, name='Sun Wall', display='^', color=colors.GOLD, back_color=colors.CRIMSON, image="terrain/mountain.png", tint=colors.GOLD, block_move=true}, {no_teleport=true})
-quickEntity('<', {show_tooltip=true, name='into the wild', display='<', color=colors.WHITE, change_level=1, change_zone="wilderness", image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/worldmap.png"}}}, {no_teleport=true})
-quickEntity('S', {name='brick roof top', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
-quickEntity('s', {name='brick roof', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
-quickEntity('t', {name='brick roof chimney', display='#', color=colors.LIGHT_RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
-quickEntity('#', {name='wall', display='#', color=colors.WHITE, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
-quickEntity('T', {name='tree', display='#', color=colors.LIGHT_GREEN, block_move=true, block_sight=true, image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha2.png"}}}, {no_teleport=true})
-quickEntity('P', {name='palm tree', display='#', color=colors.LIGHT_GREEN, back_color={r=163,g=149,b=42}, image="terrain/sand.png", add_displays = {mod.class.Grid.new{image="terrain/palmtree_alpha1.png"}}, block_move=true}, {no_teleport=true})
-quickEntity('~', {name='river', display='~', color=colors.BLUE, block_move=true, image="terrain/river.png", add_displays = mod.class.Grid:makeWater(true)}, {no_teleport=true})
-quickEntity('O', {name='cobblestone road', display='.', color=colors.WHITE, image="terrain/stone_road1.png"}, {no_teleport=true})
-quickEntity(':', {name='sand', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10}, {no_teleport=true})
-quickEntity('"', {name='grass', display='.', color=colors.LIGHT_GREEN, image="terrain/grass.png"}, {no_teleport=true})
-quickEntity('-', {name='grass', display='.', color=colors.LIGHT_GREEN, image="terrain/grass.png"})
-quickEntity('^', {name='hills', display='^', color=colors.SLATE, image="terrain/mountain.png", block_move=true, block_sight=true}, {no_teleport=true})
+
+-- defineTile section
+defineTile("<", "GRASS_UP_WILDERNESS")
+defineTile("#", "HARDWALL")
+defineTile("m", "GOLDEN_MOUNTAIN")
+defineTile("~", "DEEP_WATER")
+defineTile(":", "DEEP_OCEAN_WATER")
+defineTile("*", "SAND")
+defineTile("_", "ROAD")
+defineTile("p", {"PALMTREE","PALMTREE2","PALMTREE3","PALMTREE4","PALMTREE5","PALMTREE6","PALMTREE7","PALMTREE8","PALMTREE9","PALMTREE10","PALMTREE11","PALMTREE12","PALMTREE13","PALMTREE14","PALMTREE15","PALMTREE16","PALMTREE17","PALMTREE18","PALMTREE19","PALMTREE20",})
+defineTile(".", "FLOOR")
+defineTile("t", {"TREE","TREE2","TREE3","TREE4","TREE5","TREE6","TREE7","TREE8","TREE9","TREE10","TREE11","TREE12","TREE13","TREE14","TREE15","TREE16","TREE17","TREE18","TREE19","TREE20"})
+defineTile(" ", "GRASS")
+
+defineTile('1', "HARDWALL", nil, nil, "SWORD_WEAPON_STORE")
+defineTile('2', "HARDWALL", nil, nil, "AXE_WEAPON_STORE")
+defineTile('3', "HARDWALL", nil, nil, "KNIFE_WEAPON_STORE")
+defineTile('4', "HARDWALL", nil, nil, "MAUL_WEAPON_STORE")
+defineTile('5', "HARDWALL", nil, nil, "ARCHER_WEAPON_STORE")
+defineTile('A', "HARDWALL", nil, nil, "STAFF_WEAPON_STORE")
+defineTile('6', "HARDWALL", nil, nil, "HEAVY_ARMOR_STORE")
+defineTile('7', "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE")
+defineTile('8', "HARDWALL", nil, nil, "CLOTH_ARMOR_STORE")
+defineTile('9', "HARDWALL", nil, nil, "HERBALIST")
+defineTile('0', "HARDWALL", nil, nil, "RUNES")
+
+defineTile('Z', "HARDWALL", nil, nil, "ZEMEKKYS")
defineTile('@', "GRASS", nil, "HIGH_SUN_PALADIN_AERYN")
defineTile('j', "GRASS", nil, mod.class.NPC.new{
@@ -47,7 +59,7 @@ defineTile('j', "GRASS", nil, mod.class.NPC.new{
defineTile('s', "FLOOR", nil, mod.class.NPC.new{
type = "humanoid", subtype = "human",
- display = "p", color=colors.GOLD,
+ display = "p", color=colors.BLUE,
name = "Melnela",
size_category = 3, rank = 2,
ai = "simple",
@@ -56,75 +68,66 @@ defineTile('s', "FLOOR", nil, mod.class.NPC.new{
can_quest = true,
})
-quickEntity('1', {type="store", show_tooltip=true, name="Closed store", display='1', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('2', {type="store", show_tooltip=true, name="Armour Smith", display='2', color=colors.UMBER, resolvers.store("ARMOR"), image="terrain/wood_store_armor.png"}, {no_teleport=true})
-quickEntity('3', {type="store", show_tooltip=true, name="Weapon Smith", display='3', color=colors.UMBER, resolvers.store("WEAPON"), image="terrain/wood_store_weapon.png"}, {no_teleport=true})
-quickEntity('4', {type="store", show_tooltip=true, name="Alchemist", display='4', color=colors.LIGHT_BLUE, resolvers.store("POTION"), image="terrain/wood_store_potion.png"}, {no_teleport=true})
-quickEntity('5', {type="store", show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), resolvers.chatfeature("magic-store"), image="terrain/wood_store_book.png"}, {no_teleport=true})
-quickEntity('6', {type="store", show_tooltip=true, name="Closed store", display='6', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('7', {type="store", show_tooltip=true, name="Closed store", display='7', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('8', {type="store", show_tooltip=true, name="Closed store", display='8', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('9', {type="store", show_tooltip=true, name="Closed store", display='9', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('0', {type="store", show_tooltip=true, name="Closed store", display='0', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('a', {type="store", show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('b', {type="store", show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('c', {type="store", show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('d', {type="store", show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"}, {no_teleport=true})
-quickEntity('e', {type="store", show_tooltip=true, name="Zemekkys Home", display='+', color=colors.LIGHT_UMBER, resolvers.chatfeature("zemekkys"), image="terrain/wood_store_closed.png"}, {no_teleport=true})
-
startx = 0
-starty = 27
-endx = 0
-endy = 27
+starty = 26
+
+-- addSpot section
+addSpot({42, 26}, "npc", "aeryn-main")
+addSpot({43, 21}, "pop-quest", "farportal")
+addSpot({43, 20}, "pop-quest", "farportal-npc")
+addSpot({42, 21}, "pop-quest", "farportal-player")
+
+-- addZone section
+-- ASCII map section
return [[
-MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-MMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMMMMMMM
-MMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMM
-MMMMMMMMMMMM MMMMMMMMM
-MMMMMMMMMM ### MMMMMM
-MMMMMMMMM ##### MMMMM
-MMMMMMMM ##### MMMMM
-MMMMMMM #4O5# MMMMM
-MMMMMM O MMMMM
-MMMMMM O MMMM
-MMMMMM ##### O MMMM
-MMMMMM ###### O MMMMM
-MMMMM #####3OOO OO ### MMMMMM
-MMMMM ###### OOOO s O ### MMMMMM
-MMMMM ##### OOOOO O #e# MMMMMM
-MMMMM OOOO O O MMMMMM
-MMMMM OOOO O MMMMM
-MMMM ### O OO MMMM
-MMMM ######### O O MMMMM
-MMM ######### OOOOOOOOOOOOOOOOMMMM
-MMM ####2#### OO MMM
-MMMMM O O MMM
-MMMMMM O OO MMM
----MMM O OO MMM
-----MM OO OO MMM
-----MM O OO MM
----MMMM O O M
-<---@OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO M
----MMMM O MM
----MMM O MMMMMM
--MMMM O MMMMM
--MMM O MM
-MMM O MMM
-MMM OO MMMM
-MMM TTTTT O MMMMM
-MMM TTTT"""""""""""O""""""" MMMMM
-MMMM TT"""""~~~"""""""""""""""""""""" MMMMM
-MMMMMM TT"""""~~~~~""""""""""""""""""::""""MMMMMM
-MMMMMMMMM""""""~~~~~"""""""TT"""""""::P:::::MMMMMM
-MMMMMMMMM"""j"""~~~"""""TT"T""""""::::::::::MMMMMM
-MMMMMMMMM"""""""~~""""""TTTT"""""::::::::P:::MMMMM
-MMMMMMMMM"""""TT~"""""""TT"""""":::::P:::::MMMMMMM
-MMMMMMMMM"""TTTT~""""""""""""""::::::::::::MMMMMMM
-MMMMMMMMMM""TTT~~""""""""""""::::P::::::::::MMMMMM
-MMMMMMMMMMM"TT~~"""""""""""""::::::::::::P::::MMMM
-MMMMMMMMMMMMMM~MMMMMMMMMM""""::::P:::P::::::::MMMM
-MMMMMMMMMMMMM~~MMMMMMMMMMM""::::::P::::::::::::MMM
-MMMMMMMM~~~~~~MMMMMMMMMMMMMM:::::::::::::::::MMMMM
-MMMMMMM~~MMMMMMMMMMMMMMMMMMMMMM::::MMMMMMMMMMMMMMM
-MMMMMMM~MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM]]
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+mmmmmmmmmmmmmmm.........mmmmmmmmmmmmmmmmmmmmmmmmmm
+mmmmmmmmmmmmm..............mmmmmm..........mmmmmmm
+mmmmmmmmmmmmm................mm..............mmmmm
+mmmmmmmmmmmm.........................####.....mmmm
+mmmmmmmmm............................####.....mmmm
+mmmmmmmm.......###...................####.....mmmm
+mmmmmmmm......######..................8A.....mmmmm
+mmmmmmmm......######...#####....._______.....mmmmm
+mmmmmmmm......##6###...#####..____....._....mmmmmm
+mmmmmmmm........_......###7#.._.......__....mmmmmm
+mmmmmmmm........_........._..__......__.....mmmmmm
+mmmmmmm.........______________..#####_......mmmmmm
+mmmmmm.........._........._....######_.......mmmmm
+mmmmmm.........._..####..._....######_.......mmmmm
+mmmmm...###....__..#####.._..s..##345_...###..mmmm
+mmmmm...###...._...#####.._.......____...#Z#..mmmm
+mmmmm..#####..._...#12#..._......__......._...mmmm
+mmmmm..#0#9#..._....__....________......___....mmm
+ mmmm...___....______.....__...._......__......mmm
+ mmm....._....._.........._.....________........mm
+ mm.....___..__.........._..........._.........mm
+ mm......____..........._..........._........mmm
+ mm...#..._..#......#..._.#.....#..._.#......mmm
+< _@_________________________________________mmmm
+ mm...#......#......#..._.#.....#.....#....mmmmm
+ mm....................__.................mmmmmm
+m mmm...................._.................mmmmmmm
+mmmm....................__.................mmmmmmm
+mmmm................. ._..................mmmmmmm
+mmmm.........ttt. ...........mmmmmmm
+mmmm...tttttttt mmmmmm
+mmmm.ttttttttt mmmmmm
+mmmmtt ****** mmmmm
+mmmmt ~~~~ ****pp******* mmmmm
+mmmm ~~~~~~ ****************mmmmm
+mmmm ~~~~~~ttt j *p********p*****mmmmm
+mmmmm ~~~~~ttt ***********p**p**mmmmm
+mmmmmm tt~~~~tt *****p**p********mmmmm
+mmmmmm ttt~~~ **p***************mmmmm
+mmmmm ttt~~~ ******************mmmmm
+mmmmm ttt~~ *****:::::::*******mmmmm
+mmmmm ~~ ****:::::::::::::*mmmmmm
+mmmmmmm ~~~ ***:::::::::::::::mmmmmmm
+mmmmmmm ~~~ mmmm ****:::::::::::::::mmmmmmmm
+mmmmmm~~~~~mmmmmmmm **mmmmm::::::::::mmmmmmmmmm
+mmmmmm~mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+mmmmmm~mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm]]
\ No newline at end of file
diff --git a/game/modules/tome/data/maps/towns/last-hope.lua b/game/modules/tome/data/maps/towns/last-hope.lua
index e8190d1a84ddb99b4b6c9fd05b6c47e80ee5e2ff..cee8a082872ec9f719131d7738f3000fb02b1ab7 100644
--- a/game/modules/tome/data/maps/towns/last-hope.lua
+++ b/game/modules/tome/data/maps/towns/last-hope.lua
@@ -40,6 +40,7 @@ defineTile('6', "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE")
defineTile('7', "HARDWALL", nil, nil, "CLOTH_ARMOR_STORE")
defineTile('8', "HARDWALL", nil, nil, "HERBALIST")
defineTile('9', "HARDWALL", nil, nil, "RUNES")
+defineTile('A', "HARDWALL", nil, nil, "ARCHER_WEAPON_STORE")
defineTile('E', "HARDWALL", nil, nil, "ELDER")
defineTile('T', "HARDWALL", nil, nil, "TANNEN")
@@ -85,11 +86,11 @@ tt~~~## ### __~~###@_t###~~__ ##~~~t
tt~~~# #T# __~~##ttY_Ztt##~~__ #~~~t
tt~~~# ## _~~##tt_____tt##~~_ ## #~~~t
t~~~## ## __~##t___&_&___t##~__ ## ##~~~
-t~~~# ### _~~#tt_&&&_&&&_tt#~~_ ### #~~~
+t~~~# ##A _~~#tt_&&&_&&&_tt#~~_ ### #~~~
t~~~# ## _~##t__&&&_&&&__t##~_ ## #~~~
t~~~# #####1 _~#tt_&&_____&&_tt#~_ 3##### #~~~
t~~~# ##### _~#tt_&&_###_&&_tt#~_ ##### #~~~
-t~~~# #8###2 _~#tt_&&_#E#_&&_tt#~_ 4###9# #~~~
+t~~~# #8###2 _~#tt_&&_#E#_&&_tt#~_ 4##### #~~~
t~~~# ## _~##t__&_____&__t##~_ ## #~~~
t~~~# ### _~~#tt_&&&&&&&_tt#~~_ ### #~~~
t~~~## ## __~##t___&&&___t##~__ ## ##~~~
diff --git a/game/modules/tome/data/maps/towns/zigur.lua b/game/modules/tome/data/maps/towns/zigur.lua
index 3d3c39207532fe0f39002916dc522e96c0278498..afde2896bbe732f676df2b4c76a7ac3d5f642992 100644
--- a/game/modules/tome/data/maps/towns/zigur.lua
+++ b/game/modules/tome/data/maps/towns/zigur.lua
@@ -47,6 +47,7 @@ defineTile('7', "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE")
defineTile('8', "HARDWALL", nil, nil, "HEAVY_ARMOR_STORE")
defineTile('4', "HARDWALL", nil, nil, "HERBALIST")
defineTile('9', "HARDWALL", nil, nil, "LIBRARY")
+defineTile('A', "HARDWALL", nil, nil, "ARCHER_WEAPON_STORE")
startx = 24
starty = 49
@@ -149,7 +150,7 @@ return [[
~~~~,,,.....................................tttttt
~~~~,,,,..................................tttttttt
~~~~~~,,,,..............t................ttttttttt
-~~~~~~~~,,,............ttt..#####...tt..tttttttttt
+~~~~~~~~,,,............ttt..##A##...tt..tttttttttt
~~~~~~~~~,,...........ttttt.#####....t.ttttttttttt
~~~~~~~~~,,,..........ttttt.#5#6#......ttttttttttt
~~~~~~~~~,,,,...........tt..............tttttttttt
diff --git a/game/modules/tome/data/quests/west-portal.lua b/game/modules/tome/data/quests/west-portal.lua
index e58af9a784833adc008899ec43a9772cf175cb57..36f5026c7d4567815542ded5ecb817549bedbb25 100644
--- a/game/modules/tome/data/quests/west-portal.lua
+++ b/game/modules/tome/data/quests/west-portal.lua
@@ -99,18 +99,22 @@ create_portal = function(self, npc, player)
}
zemekkys:resolve() zemekkys:resolve(nil, true)
- game.zone:addEntity(game.level, zemekkys, "actor", 39, 17)
- game.zone:addEntity(game.level, g1, "terrain", 40, 15)
- game.zone:addEntity(game.level, g1, "terrain", 41, 15)
- game.zone:addEntity(game.level, g1, "terrain", 42, 15)
- game.zone:addEntity(game.level, g1, "terrain", 40, 16)
- game.zone:addEntity(game.level, g2, "terrain", 41, 16)
- game.zone:addEntity(game.level, g1, "terrain", 42, 16)
- game.zone:addEntity(game.level, g1, "terrain", 40, 17)
- game.zone:addEntity(game.level, g1, "terrain", 41, 17)
- game.zone:addEntity(game.level, g1, "terrain", 42, 17)
-
- player:move(39, 16, true)
+ local spot = game.level:pickSpot{type="pop-quest", subtype="farportal-npc"}
+ game.zone:addEntity(game.level, zemekkys, "actor", spot.x, spot.y)
+
+ local spot = game.level:pickSpot{type="pop-quest", subtype="farportal"}
+ game.zone:addEntity(game.level, g1, "terrain", spot.x, spot.y)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x+1, spot.y)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x+2, spot.y)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x, spot.y+1)
+ game.zone:addEntity(game.level, g2, "terrain", spot.x+1, spot.y+1)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x+2, spot.y+1)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x, spot.y+2)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x+1, spot.y+2)
+ game.zone:addEntity(game.level, g1, "terrain", spot.x+2, spot.y+2)
+
+ local spot = game.level:pickSpot{type="pop-quest", subtype="farportal-player"}
+ player:move(spot.x, spot.y, true)
player:setQuestStatus(self.id, engine.Quest.DONE)
world:gainAchievement("WEST_PORTAL", game.player)
diff --git a/game/modules/tome/data/zones/town-derth/traps.lua b/game/modules/tome/data/zones/town-derth/traps.lua
index 0b948fd7d6d5cfd3ce516690062603d446051221..eb2a77af3cf4666b53b653ac272db5e28833d0c0 100644
--- a/game/modules/tome/data/zones/town-derth/traps.lua
+++ b/game/modules/tome/data/zones/town-derth/traps.lua
@@ -43,6 +43,12 @@ newEntity{ base = "BASE_STORE", define_as = "KNIFE_WEAPON_STORE",
resolvers.store("KNIFE_WEAPON", "allied-kingdoms"),
}
+newEntity{ base = "BASE_STORE", define_as = "ARCHER_WEAPON_STORE",
+ name="Death from Afar",
+ display='3', color=colors.UMBER,
+ resolvers.store("ARCHER_WEAPON", "allied-kingdoms"),
+}
+
newEntity{ base = "BASE_STORE", define_as = "HERBALIST",
name="Herbalist",
display='4', color=colors.LIGHT_BLUE,
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/grids.lua b/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
index 08263adfff16f6e02a7e77bf3f75cc04499f1564..f96171ef96690624be8e9075d8859367748e3907 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/grids.lua
@@ -19,6 +19,14 @@
load("/data/general/grids/basic.lua")
load("/data/general/grids/forest.lua")
+load("/data/general/grids/mountain.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/sand.lua")
+
+newEntity{ base = "FLOOR", define_as = "ROAD",
+ name="cobblestone road",
+ display='.', image="terrain/stone_road1.png"
+}
newEntity{
define_as = "WEST_PORTAL",
@@ -51,3 +59,51 @@ newEntity{ base = "WEST_PORTAL", define_as = "CWEST_PORTAL",
level.map:particleEmitter(y, y, 3, "farportal_lightning")
end,
}
+
+newEntity{
+ define_as = "GOLDEN_MOUNTAIN",
+ name = "sunwall mountain", image = "terrain/golden_mountain5_1.png",
+ display = '#', color=colors.GOLD, back_color={r=44,g=95,b=43},
+ always_remember = true,
+ does_block_move = true,
+ block_sight = true,
+ block_sense = true,
+ block_esp = true,
+ air_level = -20,
+ nice_tiler = { method="mountain3d",
+ base={"GOLDENMOUNTAIN_5", 100, 1, 6},
+ wall8={"GOLDENMOUNTAIN_8", 100, 1, 6}, wall87={"GOLDENMOUNTAIN_8", 100, 1, 6}, wall88={"GOLDENMOUNTAIN_8", 100, 1, 6}, wall89={"GOLDENMOUNTAIN_8", 100, 1, 6},
+ wall2={"GOLDENMOUNTAIN_2", 100, 1, 6}, wall21={"GOLDENMOUNTAIN_2", 100, 1, 6}, wall22={"GOLDENMOUNTAIN_2", 100, 1, 6}, wall23={"GOLDENMOUNTAIN_2", 100, 1, 6},
+ wall4={"GOLDENMOUNTAIN_4", 100, 1, 6}, wall47={"GOLDENMOUNTAIN_4", 100, 1, 6}, wall44={"GOLDENMOUNTAIN_4", 100, 1, 6}, wall41={"GOLDENMOUNTAIN_4", 100, 1, 6},
+ wall6={"GOLDENMOUNTAIN_6", 100, 1, 6}, wall69={"GOLDENMOUNTAIN_6", 100, 1, 6}, wall66={"GOLDENMOUNTAIN_6", 100, 1, 6}, wall63={"GOLDENMOUNTAIN_6", 100, 1, 6},
+ wall1={"GOLDENMOUNTAIN_1", 100, 1, 6}, wall3={"GOLDENMOUNTAIN_3", 100, 1, 6}, wall7={"GOLDENMOUNTAIN_7", 100, 1, 6}, wall9={"GOLDENMOUNTAIN_9", 100, 1, 6},
+ wall11={"GOLDENMOUNTAIN_1", 100, 1, 6}, wall33={"GOLDENMOUNTAIN_3", 100, 1, 6}, wall77={"GOLDENMOUNTAIN_7", 100, 1, 6}, wall98={"GOLDENMOUNTAIN_9", 100, 1, 6},
+ inner_wall1={"GOLDENMOUNTAIN_1I", 100, 1, 6}, inner_wall3={"GOLDENMOUNTAIN_3I", 100, 1, 6}, inner_wall7={"GOLDENMOUNTAIN_7I", 100, 1, 6}, inner_wall9={"GOLDENMOUNTAIN_9I", 100, 1, 6},
+ pillar={"GOLDENMOUNTAIN_SINGLE", 100, 1, 6},
+ pillar4={"GOLDENMOUNTAIN_PILLAR4", 100, 1, 6}, pillar6={"GOLDENMOUNTAIN_PILLAR6", 100, 1, 6}, pillar2={"GOLDENMOUNTAIN_PILLAR2", 100, 1, 6}, pillar8={"GOLDENMOUNTAIN_PILLAR8", 100, 1, 6},
+ pillar82={"GOLDENMOUNTAIN_PILLAR82", 100, 1, 6}, pillar46={"GOLDENMOUNTAIN_PILLAR46", 100, 1, 6},
+ },
+}
+
+for i = 1, 6 do
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_5"..i, image="terrain/golden_mountain5_"..i..".png"}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_8"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, image="terrain/golden_mountain8.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_2"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_y=1, image="terrain/golden_mountain2.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_4"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_x=-1, image="terrain/golden_mountain4.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_6"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_x=1, image="terrain/golden_mountain6.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_7"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=-1, image="terrain/golden_mountain7.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}, {display_x=-1, image="terrain/golden_mountain4.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_9"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=1, image="terrain/golden_mountain9.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}, {display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_1"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_y=1, display_x=-1, image="terrain/golden_mountain1.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=-1, image="terrain/golden_mountain4.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_3"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_y=1, display_x=1, image="terrain/golden_mountain3.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_1I"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=1, image="terrain/golden_mountain1i.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_3I"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=-1, image="terrain/golden_mountain3i.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_7I"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_y=1, display_x=1, image="terrain/golden_mountain7i.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_9I"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_y=1, display_x=-1, image="terrain/golden_mountain9i.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_SINGLE"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=-1, image="terrain/golden_mountain7.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}, {display_x=1, display_y=-1, image="terrain/golden_mountain9.png"}}}, class.new{display_y=1, display_x=-1, image="terrain/golden_mountain1.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=1, display_y=1, image="terrain/golden_mountain3.png"}, {display_x=-1, image="terrain/golden_mountain4.png"}, {display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR4"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=-1, image="terrain/golden_mountain7.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}}}, class.new{display_y=1, display_x=-1, image="terrain/golden_mountain1.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=-1, image="terrain/golden_mountain4.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR6"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=1, image="terrain/golden_mountain9.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}}}, class.new{display_y=1, display_x=1, image="terrain/golden_mountain3.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR46"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, image="terrain/golden_mountain8.png"}, class.new{display_y=1, image="terrain/golden_mountain2.png"}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR8"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=-1, display_x=-1, image="terrain/golden_mountain7.png", add_mos = {{display_y=-1, image="terrain/golden_mountain8.png"}, {display_x=1, display_y=-1, image="terrain/golden_mountain9.png"}}}, class.new{display_x=-1, image="terrain/golden_mountain4.png", add_mos = {{display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR2"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{z=18, display_y=1, display_x=-1, image="terrain/golden_mountain1.png", add_mos = {{display_y=1, image="terrain/golden_mountain2.png"}, {display_x=1, display_y=1, image="terrain/golden_mountain3.png"}}}, class.new{display_x=-1, image="terrain/golden_mountain4.png", add_mos = {{display_x=1, image="terrain/golden_mountain6.png"}}}}}
+newEntity{base="GOLDEN_MOUNTAIN", define_as = "GOLDENMOUNTAIN_PILLAR82"..i, image="terrain/golden_mountain5_"..i..".png", add_displays = {class.new{display_x=-1, image="terrain/golden_mountain4.png", add_mos = {{display_x=1, image="terrain/golden_mountain6.png"}}}}}
+end
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/traps.lua b/game/modules/tome/data/zones/town-gates-of-morning/traps.lua
new file mode 100644
index 0000000000000000000000000000000000000000..1f8feb55a8adc54742aad647c731836b6b64a3eb
--- /dev/null
+++ b/game/modules/tome/data/zones/town-gates-of-morning/traps.lua
@@ -0,0 +1,92 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/traps/store.lua")
+
+newEntity{ base = "BASE_STORE", define_as = "HEAVY_ARMOR_STORE",
+ name="Impenetrable Plates",
+ display='2', color=colors.UMBER,
+ resolvers.store("HEAVY_ARMOR", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "LIGHT_ARMOR_STORE",
+ name="Quality Leather",
+ display='2', color=colors.UMBER,
+ resolvers.store("LIGHT_ARMOR", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "CLOTH_ARMOR_STORE",
+ name="Arcane Cloth",
+ display='2', color=colors.UMBER,
+ resolvers.store("CLOTH_ARMOR", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "SWORD_WEAPON_STORE",
+ name="Swordmaster",
+ display='3', color=colors.UMBER,
+ resolvers.store("SWORD_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "KNIFE_WEAPON_STORE",
+ name="Night Affairs",
+ display='3', color=colors.UMBER,
+ resolvers.store("KNIFE_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "AXE_WEAPON_STORE",
+ name="Orc Cutters",
+ display='3', color=colors.UMBER,
+ resolvers.store("AXE_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "MAUL_WEAPON_STORE",
+ name="Mauling for Brutes",
+ display='3', color=colors.UMBER,
+ resolvers.store("MAUL_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "ARCHER_WEAPON_STORE",
+ name="Bows and Slings",
+ display='3', color=colors.UMBER,
+ resolvers.store("ARCHER_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "STAFF_WEAPON_STORE",
+ name="Sook's Arcane Goodness",
+ display='3', color=colors.UMBER,
+ resolvers.store("STAFF_WEAPON", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "HERBALIST",
+ name="Sarah's Herbal Infusions",
+ display='4', color=colors.LIGHT_GREEN,
+ resolvers.store("POTION", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "RUNES",
+ name="Sook's Runes and other Harmless Contraptions",
+ display='5', color=colors.LIGHT_RED,
+ resolvers.store("LAST_HOPE_LIBRARY", "sunwall"),
+}
+
+newEntity{ base = "BASE_STORE", define_as = "ZEMEKKYS",
+ name="Zemekkys Home",
+ display='+', color=colors.UMBER,
+ resolvers.chatfeature("zemekkys", "sunwall"),
+}
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/zone.lua b/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
index ca3043dd286c637f04ceb0052c8b2c216574201d..699f5e8eb3e1d706863917c2713db9542c60fa5d 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/zone.lua
@@ -42,7 +42,8 @@ return {
},
actor = {
class = "engine.generator.actor.Random",
- nb_npc = {0, 0},
+ area = {x1=6, x2=46, y1=3, y2=47},
+ nb_npc = {10, 10},
},
object = {
class = "engine.generator.object.Random",
diff --git a/game/modules/tome/data/zones/town-last-hope/npcs.lua b/game/modules/tome/data/zones/town-last-hope/npcs.lua
index 660291e5059b1690379d921273526a40860ab722..5a75a3db6950d98d15adb40e4349c27b729c2c59 100644
--- a/game/modules/tome/data/zones/town-last-hope/npcs.lua
+++ b/game/modules/tome/data/zones/town-last-hope/npcs.lua
@@ -17,3 +17,80 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
+load("/data/general/npcs/gwelgoroth.lua", function(e) if e.rarity then e.derth_rarity, e.rarity = e.rarity, nil end end)
+
+local Talents = require("engine.interface.ActorTalents")
+
+newEntity{
+ define_as = "BASE_NPC_LAST_HOPE_TOWN",
+ type = "humanoid", subtype = "human",
+ display = "p", color=colors.WHITE,
+ faction = "allied-kingdoms",
+ anger_emote = "Catch @himher@!",
+
+ combat = { dam=resolvers.rngavg(1,2), atk=2, apr=0, dammod={str=0.4} },
+
+ body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+ lite = 3,
+
+ life_rating = 10,
+ rank = 2,
+ size_category = 3,
+
+ open_door = true,
+
+ resolvers.racial(),
+ resolvers.inscriptions(1, "infusion"),
+
+ autolevel = "warrior",
+ ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=1, },
+ energy = { mod=1 },
+ stats = { str=12, dex=8, mag=6, con=10 },
+
+ emote_random = resolvers.emote_random{allow_backup_guardian=true},
+}
+
+newEntity{ base = "BASE_NPC_LAST_HOPE_TOWN",
+ name = "last hope guard", color=colors.LIGHT_UMBER,
+ desc = [[A stern-looking guard, he will not let you disturb the town.]],
+ level_range = {1, nil}, exp_worth = 1,
+ rarity = 3,
+ max_life = resolvers.rngavg(70,80),
+ resolvers.equip{
+ {type="weapon", subtype="longsword", autoreq=true},
+ {type="armor", subtype="shield", autoreq=true},
+ },
+ combat_armor = 2, combat_def = 0,
+ resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
+}
+
+newEntity{ base = "BASE_NPC_LAST_HOPE_TOWN",
+ name = "halfling guard", color=colors.UMBER,
+ subtype = "halfling",
+ desc = [[A Halfling, with a sling. Beware.]],
+ level_range = {1, nil}, exp_worth = 1,
+ rarity = 3,
+ max_life = resolvers.rngavg(50,60),
+ resolvers.talents{ [Talents.T_SHOOT]=1, },
+ ai_state = { talent_in=2, },
+ autolevel = "slinger",
+ resolvers.equip{ {type="weapon", subtype="sling", autoreq=true}, {type="ammo", subtype="shot", autoreq=true} },
+}
+
+newEntity{ base = "BASE_NPC_LAST_HOPE_TOWN",
+ name = "human citizen", color=colors.WHITE,
+ desc = [[A clean looking human resident of Last Hope.]],
+ level_range = {1, nil}, exp_worth = 1,
+ rarity = 1,
+ max_life = resolvers.rngavg(30,40),
+ combat_armor = 2, combat_def = 0,
+}
+
+newEntity{ base = "BASE_NPC_LAST_HOPE_TOWN",
+ name = "halfling citizen", color=colors.WHITE,
+ subtype = "halfling",
+ desc = [[A clean looking halfling resident of Last Hope.]],
+ level_range = {1, nil}, exp_worth = 1,
+ rarity = 1,
+ max_life = resolvers.rngavg(30,40),
+}
diff --git a/game/modules/tome/data/zones/town-last-hope/traps.lua b/game/modules/tome/data/zones/town-last-hope/traps.lua
index 972d3758f4bcbaa0cdcefdd3c3b5d0416bfe26b0..2c19eab1e5584f121ec8f6e85b4d5cbe5ad4ad57 100644
--- a/game/modules/tome/data/zones/town-last-hope/traps.lua
+++ b/game/modules/tome/data/zones/town-last-hope/traps.lua
@@ -61,6 +61,12 @@ newEntity{ base = "BASE_STORE", define_as = "MAUL_WEAPON_STORE",
resolvers.store("MAUL_WEAPON", "allied-kingdoms"),
}
+newEntity{ base = "BASE_STORE", define_as = "ARCHER_WEAPON_STORE",
+ name="Dala's Far Reaching Implements",
+ display='3', color=colors.UMBER,
+ resolvers.store("ARCHER_WEAPON", "allied-kingdoms"),
+}
+
newEntity{ base = "BASE_STORE", define_as = "HERBALIST",
name="Sarah's Herbal Infusions",
display='4', color=colors.LIGHT_GREEN,
@@ -70,7 +76,7 @@ newEntity{ base = "BASE_STORE", define_as = "HERBALIST",
newEntity{ base = "BASE_STORE", define_as = "RUNES",
name="Sook's Runes and other Harmless Contraptions",
display='5', color=colors.LIGHT_RED,
- resolvers.store("SCROLL", "allied-kingdoms"),
+ resolvers.store("LAST_HOPE_LIBRARY", "allied-kingdoms"),
}
newEntity{ base = "BASE_STORE", define_as = "ELDER",
diff --git a/game/modules/tome/data/zones/town-last-hope/zone.lua b/game/modules/tome/data/zones/town-last-hope/zone.lua
index 10f27df537846068ff47f614d4638dea7b052078..c2e95e454bc269d68309bff4db490e4d47c423c5 100644
--- a/game/modules/tome/data/zones/town-last-hope/zone.lua
+++ b/game/modules/tome/data/zones/town-last-hope/zone.lua
@@ -41,7 +41,7 @@ return {
},
actor = {
class = "engine.generator.actor.Random",
- nb_npc = {0, 0},
+ nb_npc = {10, 10},
},
object = {
class = "engine.generator.object.Random",
diff --git a/game/modules/tome/data/zones/town-zigur/traps.lua b/game/modules/tome/data/zones/town-zigur/traps.lua
index 55071a9e8d5e40984e46cac5d64cf9108c4f0ab0..9a810f0336747a7d30ed014a441961363294e5b9 100644
--- a/game/modules/tome/data/zones/town-zigur/traps.lua
+++ b/game/modules/tome/data/zones/town-zigur/traps.lua
@@ -45,6 +45,11 @@ newEntity{ base = "BASE_STORE", define_as = "AXE_WEAPON_STORE",
display='3', color=colors.UMBER,
resolvers.store("ZIGUR_AXE_WEAPON", "zigur"),
}
+newEntity{ base = "BASE_STORE", define_as = "ARCHER_WEAPON_STORE",
+ name="Nature's Reach",
+ display='3', color=colors.UMBER,
+ resolvers.store("ZIGUR_ARCHER_WEAPON", "zigur"),
+}
newEntity{ base = "BASE_STORE", define_as = "KNIFE_WEAPON_STORE",
name="Millions Cuts",
display='3', color=colors.UMBER,
diff --git a/tiled-maps/zigur.tmx b/tiled-maps/zigur.tmx
index 5758acf7232f4cff31f99ece356dea2659305a62..f2529279d8410e6c25d8fc485e4c2d8a0118c162 100644
--- a/tiled-maps/zigur.tmx
+++ b/tiled-maps/zigur.tmx
@@ -125,6 +125,11 @@
<property name="display" value="8"/>
</properties>
</tile>
+ <tile id="26">
+ <properties>
+ <property name="display" value="A"/>
+ </properties>
+ </tile>
<tile id="35">
<properties>
<property name="display" value="&"/>
@@ -176,7 +181,7 @@
</tileset>
<layer name="Terrain" width="50" height="50">
<data encoding="base64" compression="zlib">
- eJzt2EtOAzEMBuBhW6mrHqASl+C6bDkAh+BR1vQG3SGW7GCkWLKs2PkdJ5kUqGT1lY78TeKMp4dlWQ6d425A9DZ4HbsUIxw7MKTjzAI9Burqkb+WQ8RRskQMZyC08dFz4nVYx1zzuTECcdwWArWMdlzY55Sr9tAsdC5Qh9xDNAcd94u9zjl4lAyWxePI7YWWY31/VD7XHPR4SGFZtPVpObQ93apz6bDqGZ0L7uCWGodnLzmC4zwGbvE40LmQ+cvo4SDLx2LXR42BHPx3OQc3ehy8bmSdoA7PfGiO3ByhDln7iEP7vnZdWWssV+fWfkUGr8MbyLqK1kjp2u65dmu9U60D2X/RHiXSE9buV5rH02NFHE/p+Xmxr9Ujw7uuWgbS43sMv9UxyrLm/PYTp/T6s8JRuv/Ysxg1P5H8EcdMltr/GVp5vD1zjQG5r41Ycv1Nqb7leMSAOLgleg4RB59D1OB1eCyW4yU9vyoO71zUOGrnpWdtoI4t9+OejpGWfwfmmM2COra2lDxRxywej2Nmi9dRsvQy3Wci6vB4WnlzDm6JOFqZIg5aY60cUf+1O8jyPrFDrh9rXKmX3MpBuVMdWhY+bus6t3KTllzI+5SZHTlPqW+awYHkiYZlGFXnrSxyjq7d0aJP/KuOx0GOb8vTSj0=
+ eJzt2EtOAzEMBuCwrcSqB6jEJXpdthyAQ/AobOkN2CGW7GCksWRZsfM7TjIpUMnqKx35m8QZT/cppX3nOA6I3gavY7fGCMcODOk4s0CPgbp65K/lEHGULBHDGQhtfPSceB3WMZd8roxAHDeFQC2jHe/sc8pVe2gWOheoQ+4hmoOO+8Ve5xw8SgbL4nHk9kLLsbw/KJ9rDnrcrWFZtPVpObQ93apz6bDqGZ0L7uCWGodnLzmA4zwGbvE40LmQ+cvo4SDLR7Lro8ZADv67nIMbPQ5eN7JOUIdnPjRHbo5Qh6x9xKF9X7uurDWWq3NrvyKD1+ENZF1Fa6R0bfdcu7XeqdaB7L9ojxLpCWv3K83j6bEijof1+THZ1+qR4V1XLQPp8T2G3+oYZVlyfvmJ0/r6s8JRuv+4ZjFqfiL5I46ZLLX/M7TyeHvmGgNyXxux5PobqunXlK9vOR4xIA5uiZ5D7rD2qaNxjBYOj8VyPK3Pz4rDOxc1jtp56VkbqGPL/binY6Tl34E5ZrOgjq0tJU/UMYvH45jZ4nWULL1Mt5mIOjyeVt6cg1sijlamiIPWWCtH1H/pDrK8TeyQ68caV+olt3JQ7lSHloWP27rOrdykJRfyPmVmR85T6ptmcCB5omEZRtV5K4uco0t3tOgT/6rjfpDjGw0zSjM=
</data>
</layer>
<objectgroup name="addSpot" width="50" height="50">