All alchemist quets ingredients and rewards now have tiles

git-svn-id: http://svn.net-core.org/repos/t-engine4@3778 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/quests/master-jeweler.lua

@@ -56,16 +56,10 @@ end
 start_search = function(self, who)
 	-- Reveal entrances
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Cavern leading to the valley of the moon",
-			display='>', color=colors.GREY,
-			notice = true,
-			change_level=1, change_zone="valley-moon-caverns"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "CAVERN_MOON")
 		local spot = level:pickSpot{type="zone-pop", subtype="valley-moon-caverns"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 
 	who:setQuestStatus(self.id, engine.Quest.COMPLETED, "search-valley")

game/modules/tome/data/quests/orc-hunt.lua

@@ -30,16 +30,10 @@ end
 on_grant = function(self, who)
 	-- Reveal reknor entrance
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true,
-			name="A gate into the old kingdom of Reknor",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="reknor"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "REKNOR")
 		local spot = level:pickSpot{type="zone-pop", subtype="reknor"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 	game.logPlayer(game.player, "The elder points to Reknor on your map, to the north on the western side of the Iron Throne.")
 end

game/modules/tome/data/quests/orc-pride.lua

@@ -61,52 +61,25 @@ end
 on_grant = function(self, who)
 	-- Reveal entrances
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Entrance to Rak'shor Pride bastion",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="rak-shor-pride"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "RAK_SHOR_PRIDE")
 		local spot = level:pickSpot{type="zone-pop", subtype="rak-shor-pride"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 
-		-- Reveal entrances
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Entrance to Vor Pride bastion",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="vor-pride"
-		}
-		g:resolve() g:resolve(nil, true)
+		g = game.zone:makeEntityByName(level, "terrain", "VOR_PRIDE")
 		local spot = level:pickSpot{type="zone-pop", subtype="vor-pride"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 
-		-- Reveal entrances
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Entrance to Gorbat Pride bastion",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="gorbat-pride"
-		}
-		g:resolve() g:resolve(nil, true)
+		g = game.zone:makeEntityByName(level, "terrain", "GORBAT_PRIDE")
 		local spot = level:pickSpot{type="zone-pop", subtype="gorbat-pride"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 
-		-- Reveal entrances
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Entrance to Grushnak Pride caverns",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="grushnak-pride"
-		}
-		g:resolve() g:resolve(nil, true)
+		g = game.zone:makeEntityByName(level, "terrain", "GRUSHNAK_PRIDE")
 		local spot = level:pickSpot{type="zone-pop", subtype="grushnak-pride"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 
 	game.logPlayer(game.player, "Aeryn points to the known locations on your map.")

game/modules/tome/data/quests/pre-charred-scar.lua

@@ -30,16 +30,9 @@ on_grant = function(self, who)
 	local chat = engine.Chat.new("pre-charred-scar", aeryn, who)
 	chat:invoke()
 
-	-- Reveal  entrance
+	-- Reveal entrance
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="The arid wastes of Erúan",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="eruan"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "ERUAN")
 		local spot = level:pickSpot{type="zone-pop", subtype="eruan"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
 	end)

game/modules/tome/data/quests/spydric-infestation.lua

@@ -32,16 +32,11 @@ end
 on_grant = function(self, who)
 	-- Reveal entrance
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="A way into the caverns of Ardhungol",
-			display='>', color=colors.GREEN,
-			notice = true,
-			change_level=1, change_zone="ardhungol"
-		}
+		local g = game.zone:makeEntityByName(level, "terrain", "ARDHUNGOL")
 		g:resolve() g:resolve(nil, true)
 		local spot = level:pickSpot{type="zone-pop", subtype="ardhungol"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 	game.logPlayer(game.player, "She marks the location of Ardhungol on your map.")
 end
@@ -55,7 +50,8 @@ portal_back = function(self, who)
 		name="Portal back to the Gates of Morning",
 		display='>', color=colors.GOLD,
 		notice = true,
-		change_level=1, change_zone="town-gates-of-morning"
+		change_level=1, change_zone="town-gates-of-morning",
+		image = "terrain/granite_floor1.png", add_mods={{image="terrain/demon_portal.png"}},
 	}
 	g:resolve() g:resolve(nil, true)
 	game.zone:addEntity(game.level, g, "terrain", who.x, who.y)

game/modules/tome/data/quests/west-portal.lua

@@ -44,16 +44,10 @@ end
 on_grant = function(self, who)
 	-- Reveal entrances
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Backdoor to the Vor Armoury",
-			display='>', color=colors.UMBER,
-			notice = true,
-			change_level=1, change_zone="vor-armoury"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "VOR_ARMOURY")
 		local spot = level:pickSpot{type="zone-pop", subtype="vor-armoury"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 
 	game.logPlayer(game.player, "Zemekkys points to the location of Vor Armoury on your map.")
@@ -62,16 +56,10 @@ end
 wyrm_lair = function(self, who)
 	-- Reveal entrances
 	game:onLevelLoad("wilderness-1", function(zone, level)
-		local g = mod.class.Grid.new{
-			show_tooltip=true, always_remember = true,
-			name="Entrance into the sandpit of Briagh",
-			display='>', color=colors.YELLOW,
-			notice = true,
-			change_level=1, change_zone="briagh-lair"
-		}
-		g:resolve() g:resolve(nil, true)
+		local g = game.zone:makeEntityByName(level, "terrain", "BRIAGH_LAIR")
 		local spot = level:pickSpot{type="zone-pop", subtype="briagh"}
 		game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+		game.nicer_tiles:updateAround(game.level, spot.x, spot.y)
 	end)
 
 	game.logPlayer(game.player, "Zemekkys points to the location of Briagh lair on your map.")

game/modules/tome/data/zones/wilderness/grids.lua

@@ -271,7 +271,7 @@ newEntity{ base="TOWN", define_as = "TOWN_LAST_HOPE",
 	change_zone="town-last-hope",
 }
 newEntity{ base="TOWN", define_as = "TOWN_ANGOLWEN",
-	name = "Angolwen, the hidden city of magic", add_mos = {{image="terrain/town1.png"}},
+	name = "Angolwen, the hidden city of magic", add_displays = {mod.class.Grid.new{z=5, image="terrain/town1.png"}},
 	desc = "Secret place of magic, set apart from the world to protect it.\nLead by the Supreme Archmage Linaniil.",
 	change_zone="town-angolwen",
 }
@@ -317,7 +317,7 @@ newEntity{ base="TOWN", define_as = "TOWN_IRON_COUNCIL",
 }
 
 --------------------------------------------------------------------------------
--- Zones
+-- Maj'Eyal Zones
 --------------------------------------------------------------------------------
 newEntity{ base="PLAINS", define_as = "ZONE_PLAINS", change_level=1, display='>', color=colors.VIOLET, notice = true, nice_tiler=false }
 newEntity{ base="DESERT", define_as = "ZONE_DESERT", change_level=1, display='>', color=colors.VIOLET, notice = true, nice_tiler=false }
@@ -436,9 +436,107 @@ newEntity{ base="ZONE_PLAINS", define_as = "UNREMARKABLE_CAVE",
 	change_zone="unremarkable-cave",
 }
 
+newEntity{ base="ZONE_PLAINS", define_as = "REKNOR",
+	name="A gate into the old kingdom of Reknor",
+	color=colors.UMBER,
+	add_displays={class.new{image="terrain/cave_entrance_closed02.png", z=4}},
+	change_zone="reknor",
+}
+
+newEntity{ base="ZONE_PLAINS", define_as = "TELMUR",
+	name="Entrance into Telmur, tower of Telos",
+	color=colors.RED,
+	add_mos={{image="terrain/tower_entrance02.png"}}, add_displays={class.new{image="terrain/tower_entrance_up02.png", z=18, display_y=-1}},
+	change_zone="telmur",
+}
+
 newEntity{ base="WATER_BASE", define_as = "MURGOL_LAIR",
 	name="Way into the lair of Murgol",
 	color={r=0, g=0, b=255},
 	add_displays={class.new{image="terrain/underwater/subsea_cave_entrance_01.png", z=4, display_h=2, display_y=-1}},
 	change_level=1, change_zone="murgol-lair",
 }
+
+newEntity{ base="ZONE_PLAINS", define_as = "TEMPEST_PEAK",
+	name="Long road to the Tempest Peak",
+	color=colors.WHITE,
+	add_displays={mod.class.Grid.new{image="terrain/road_upwards_01.png", display_h=2, display_y=-1}},
+	change_level=1, change_zone="tempest-peak",
+	change_level_check = function()
+		game.turn = game.turn + 5 * game.calendar.HOUR
+		if not game.player:hasQuest("lightning-overload").walked then
+			require("engine.ui.Dialog"):simpleLongPopup("Danger...", [[After an hours long walk you finally reach the end of the way. You are nearly on top of one of the highest peaks you can see.
+The storm is raging above your head.]], 400)
+			game.player:hasQuest("lightning-overload").walked = true
+		end
+	end,
+}
+
+--------------------------------------------------------------------------------
+-- Far East Zones
+--------------------------------------------------------------------------------
+
+newEntity{ base="ZONE_DESERT", define_as = "RAK_SHOR_PRIDE",
+	name="Entrance to Rak'shor Pride bastion",
+	color=colors.UMBER,
+	add_displays = {mod.class.Grid.new{image="terrain/dungeon_entrance_closed02.png", z=5}},
+	change_zone="rak-shor-pride",
+}
+
+newEntity{ base="ZONE_DESERT", define_as = "GORBAT_PRIDE",
+	name="Entrance to Gorbat Pride bastion",
+	color=colors.UMBER,
+	add_displays = {mod.class.Grid.new{image="terrain/dungeon_entrance_closed02.png", z=5}},
+	change_zone="gorbat-pride",
+}
+
+newEntity{ base="ZONE_PLAINS", define_as = "GRUSHNAK_PRIDE",
+	name="Entrance to Grushnak Pride bastion",
+	color=colors.UMBER,
+	add_displays = {mod.class.Grid.new{image="terrain/ladder_down.png", z=5}},
+	change_zone="grushnak-pride",
+}
+
+newEntity{ base="ZONE_PLAINS", define_as = "VOR_PRIDE",
+	name="Entrance to Vor Pride bastion",
+	color=colors.UMBER,
+	add_displays = {mod.class.Grid.new{image="terrain/dungeon_entrance_closed02.png", z=5}},
+	change_zone="vor-pride",
+}
+
+newEntity{ base="ZONE_PLAINS", define_as = "VOR_ARMOURY",
+	name="Backdoor to the Vor Armoury",
+	color=colors.UMBER,
+	add_displays = {mod.class.Grid.new{image="terrain/dungeon_entrance_closed02.png", z=5}},
+	change_zone="vor-armoury",
+}
+
+newEntity{ base="ZONE_DESERT", define_as = "BRIAGH_LAIR",
+	name="Entrance into the sandpit of Briagh",
+	color=colors.YELLOW,
+	add_displays = {mod.class.Grid.new{image="terrain/ladder_down.png", z=5}},
+	change_zone="briagh-lair",
+}
+
+newEntity{ base="ZONE_DESERT", define_as = "CAVERN_MOON",
+	name="Cavern leading to the valley of the moon",
+	color=colors.GREY,
+	add_displays = {mod.class.Grid.new{image="terrain/cave_entrance_closed02.png", z=5}},
+	change_zone="valley-moon-caverns",
+}
+
+newEntity{ base="ZONE_PLAINS", define_as = "ARDHUNGOL",
+	name="A way into the caverns of Ardhungol",
+	color=colors.GREEN,
+	add_displays = {mod.class.Grid.new{image="terrain/cave_entrance02.png", z=5}},
+	change_zone="ardhungol",
+}
+
+newEntity{ base="ZONE_DESERT", define_as = "ERUAN",
+	name="The arid wastes of Erúan",
+	color=colors.UMBER,
+	add_displays={mod.class.Grid.new{image="terrain/road_upwards_01.png", display_h=2, display_y=-1}},
+	change_zone="eruan",
+}
+
+START POSITION RESET ON RELOAD ????
\ No newline at end of file