Merge remote-tracking branch 'upstream/master' into misc174

@@ -627,7 +627,7 @@ end
 function _M:createProfile(loginItem)
 	if not loginItem.create then
 		self.auth_tried = nil
-		local d = Dialog:simpleWaiter(_t"Login in...", _t"Please wait...") core.display.forceRedraw()
+		local d = Dialog:simpleWaiter(_t"Logging in...", _t"Please wait...") core.display.forceRedraw()
 		profile:performlogin(loginItem.login, loginItem.pass)
 		profile:waitFirstAuth()
 		d:done()

@@ -274,7 +274,7 @@ function _M:login()
 end
 
 function _M:loginSteam()
-	local d = self:simpleWaiter(_t"Login...", _t"Login in your account, please wait...") core.display.forceRedraw()
+	local d = self:simpleWaiter(_t"Login...", _t"Logging in your account, please wait...") core.display.forceRedraw()
 	d:timeout(10, function() Dialog:simplePopup("Steam", _t"Steam client not found.")	end)
 	core.steam.sessionTicket(function(ticket)
 		if not ticket then

@@ -1881,6 +1881,7 @@ function _M:textRank(use_rank)
 	elseif use_rank == 3.5 then rank, color = _t"unique", "#SANDY_BROWN#"
 	elseif use_rank == 4 then rank, color = _t"boss", "#ORANGE#"
 	elseif use_rank == 5 then rank, color = _t"elite boss", "#GOLD#"
+	elseif use_rank == 11 then rank, color = _t"godslayer", "#FF4000#"
 	elseif use_rank >= 10 then rank, color = _t"god", "#FF4000#"
 	end
 	return rank, color
@@ -4817,6 +4818,7 @@ end
 function _M:checkTwoHandedPenalty()
 	self:removeEffect(self.EFF_2H_PENALTY, true, true)
 	if not self:attr("allow_mainhand_2h_in_1h") then return end
+	if self:attr("allow_mainhand_2h_in_1h_no_penalty") then return end
 	local mi, oi = self:getInven(self.INVEN_MAINHAND), self:getInven(self.INVEN_OFFHAND)
 	if not mi or not oi then return end
 	local mh, oh = mi[1], oi[1]

@@ -203,7 +203,8 @@ function _M:tooltip(x, y)
 				if p.level <= data.level_range[1] - 10 then color = "CRIMSON"
 				elseif p.level <= data.level_range[1] - 4 then color = "ORANGE"
 				end
-				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..data.level_range[1], {"color", "LAST"}, {"font","normal"}, true)
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..math.floor((data.level_range[1]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"})
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Max.level: "..math.ceil((data.level_range[2]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"}, true)
 			end
 		end
 	end

@@ -127,7 +127,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed)
 --		if ret then return false end
 --	end
 
-	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevelRaw(target.T_WARDING_WEAPON) >= 5
+	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevel(target.T_WARDING_WEAPON) >= 5
 		and rng.percent(target:callTalent(target.T_WARDING_WEAPON, "getChance")) then
 		local t = self:getTalentFromId(self.T_WARDING_WEAPON)
 		if target:getPsi() >= t.psi then

@@ -117,6 +117,21 @@ newAchievement{
 	desc = _t[[Won ToME by closing the Void portal and letting yourself be killed by Aeryn to prevent the Way to enslave every sentient being on Eyal.]],
 }
 newAchievement{
+	name = "This is how the world ends: swallowed in fire, but not in darkness.", id = "AOADS_BURN",
+	show = "name", huge=true,
+	desc = _t[["Won" ToME by sacrificing yourself for your patron Distant Sun, opening a portal for it to burn and consume the world.]],
+}
+newAchievement{
+	name = "Last Instant of Sanity", id = "AOADS_SELFLESS",
+	show = "name", huge=true,
+	desc = _t[[Won ToME by closing the Void portal and letting yourself be killed by Aeryn to prevent your mad patron sun from burning the world in a searing flash.]],
+}
+newAchievement{
+	name = "They Came Back For Eyal", id = "AOADS_SHERTUL",
+	show = "name", huge=true,
+	desc = _t[[Won ToME thanks to a Sher'tul stopping you at the last moment from opening a portal to your mad patron sun.]],
+}
+newAchievement{
 	name = "Tactical master", id = "SORCERER_NO_PORTAL",
 	show = "name", huge=true,
 	desc = _t[[Fought the two Sorcerers without closing any invocation portals.]],

@@ -123,7 +123,11 @@ newBirthDescriptor{
 		resolvers.inventorybirth{ id=true,
 			{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance= -1000},
 		},
-
+		resolvers.generic(function(self)
+			if not profile.mod.allow_build.paladin_avatar then
+				self:learnTalent(self.T_AVATAR_DISTANT_SUN_UNLOCK_CHECKER, true)
+			end
+		end),
 	},
 	copy_add = {
 		life_rating = 2,

@@ -161,6 +161,7 @@ newBirthDescriptor
 		confusion_immune = 0.35,
 		max_air = 200,
 		moddable_tile = "yeek",
+		moddable_tile_nude = 1,
 		random_name_def = "yeek_#sex#",
 	},
 	experience = 0.85,

+{
+    "22": {
+        "id": 22,
+        "name": "chat",
+        "data": {
+            "chatid": "welcome",
+            "chat": "**DO NOT TRANSLATE YET**\n<<<You feel a gentle warmth in your mind. Something speaks directly to your mind!>>>\n#YELLOW#WELL MET FRIEND! I AM A FAR AWAY STAR, AND VERY FRIENDLY, ALSO LIBERTY NEEDS TO WRITE ME!\n#LAST#",
+            "answer1": "sOUNDS COOL!"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": []
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "24",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 213,
+        "pos_y": 362
+    },
+    "24": {
+        "id": 24,
+        "name": "lua-code",
+        "data": {
+            "code": "player:callTalent(player.T_AVATAR_DISTANT_SUN_UNLOCK_CHECKER, \"doUnlock\")"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "22",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 775,
+        "pos_y": 381
+    }
+}
\ No newline at end of file

+{
+    "25": {
+        "id": 25,
+        "name": "chat",
+        "data": {
+            "chatid": "chat4",
+            "chat": "#YELLOW#YOU ARE A CURIOUS ONE.",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1564,
+        "pos_y": 207
+    },
+    "27": {
+        "id": 27,
+        "name": "chat",
+        "data": {
+            "chatid": "chat6",
+            "chat": "#YELLOW#YOU HAVE MADE THE RIGHT CHOICE. TOGETHER, WE SHALL BRING ABOUT THE DESTRUCTION OF OUR ENEMIES.",
+            "answer1": "#GOLD#[you are now an Avatar of a Distant Sun]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "36",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "39",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 2507,
+        "pos_y": -110
+    },
+    "29": {
+        "id": 29,
+        "name": "chat",
+        "data": {
+            "chatid": "welcome",
+            "chat": "<<<You feel the gentle warmth of your Distant Sun patron. It speaks directly to your mind!>>>\n#YELLOW#I AM HERE. DO YOU DESIRE TO SMITE EVIL, DESTROY THE DARKNESS AND SCOUR THE EARTH? I SHALL AID YOU IN THIS QUEST. TOGETHER, WE WILL BE UNSTOPPABLE. ALL DARKNESS SHALL BE CONSUMED BY OUR LIGHT.\n#LAST#",
+            "answer1": "Yes, give me your power!",
+            "answer2": "Who... Who are you?"
+        },
+        "class": "chat",
+        "html": "chat2",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": []
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 92,
+        "pos_y": 131
+    },
+    "32": {
+        "id": 32,
+        "name": "chat",
+        "data": {
+            "chatid": "chat7",
+            "chat": "#YELLOW#I AM YOUR FRIEND. IT IS GOOD TO HAVE FRIENDS, ISN'T IT?",
+            "answer1": "But how are you speaking to me?",
+            "answer2": "You still haven't told me who or what you are.",
+            "answer3": "But what are you getting out of this?",
+            "answer4": "That doesn't tell me anything."
+        },
+        "class": "chat",
+        "html": "chat4",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "29",
+                        "input": "output_2"
+                    },
+                    {
+                        "node": "25",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "33",
+                        "input": "output_1"
+                    },
+                    {
+                        "node": "34",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "25",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "33",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_3": {
+                "connections": [
+                    {
+                        "node": "34",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_4": {
+                "connections": [
+                    {
+                        "node": "36",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 721,
+        "pos_y": 330
+    },
+    "33": {
+        "id": 33,
+        "name": "chat",
+        "data": {
+            "chatid": "chat8",
+            "chat": "#YELLOW#YOU NEED NOT CONCERN YOURSELF WITH SUCH THINGS. I KNOW YOU CRAVE POWER. I KNOW THE WEIGHT OF THE WORLD IS ON YOUR SHOULDERS. SO, ACCEPT MY BOONS. ALLOW ME TO HELP YOU.\n",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1558,
+        "pos_y": 415
+    },
+    "34": {
+        "id": 34,
+        "name": "chat",
+        "data": {
+            "chatid": "chat9",
+            "chat": "#YELLOW#I AM GETTING PLENTY OUT OF THIS.",
+            "answer1": "[...]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_3"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1559,
+        "pos_y": 776
+    },
+    "36": {
+        "id": 36,
+        "name": "chat",
+        "data": {
+            "chatid": "chat10",
+            "chat": "#YELLOW#I TIRE OF YOUR NAGGING QUESTIONS. TALK, TALK, TALK. YOU HAVE A SIMPLE CHOICE BEFORE YOU. WILL YOU BECOME POWERFUL? OR WILL YOU BE WEAK AND ALONE?",
+            "answer1": "Yes, give me your power!",
+            "answer2": "I don't trust you. Please go away."
+        },
+        "class": "chat",
+        "html": "chat2",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "32",
+                        "input": "output_4"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "output": "input_1"
+                    }
+                ]
+            },
+            "output_2": {
+                "connections": [
+                    {
+                        "node": "37",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 1557,
+        "pos_y": 1046
+    },
+    "37": {
+        "id": 37,
+        "name": "chat",
+        "data": {
+            "chatid": "chat11",
+            "chat": "#YELLOW#I HAVE LITTLE PATIENCE FOR TIME WASTERS. THIS SHALL BE THE LAST TIME WE SPEAK.",
+            "answer1": "#GRAY#[prodigy point refunded]"
+        },
+        "class": "chat",
+        "html": "chat1",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "36",
+                        "input": "output_2"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": [
+                    {
+                        "node": "40",
+                        "output": "input_1"
+                    }
+                ]
+            }
+        },
+        "pos_x": 2017,
+        "pos_y": 1318
+    },
+    "39": {
+        "id": 39,
+        "name": "lua-code",
+        "data": {
+            "code": "player:callTalent(player.T_AVATAR_OF_A_DISTANT_SUN, \"becomeAvatar\")"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "27",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 2859.4285714285716,
+        "pos_y": -43.42857142857143
+    },
+    "40": {
+        "id": 40,
+        "name": "lua-code",
+        "data": {
+            "code": "player:unlearnTalent(player.T_AVATAR_OF_A_DISTANT_SUN)\nplayer.unused_prodigies = player.unused_prodigies + 1\nplayer:attr(\"pissed_of_distant_sun\", 1)"
+        },
+        "class": "lua-code",
+        "html": "lua-code",
+        "typenode": true,
+        "inputs": {
+            "input_1": {
+                "connections": [
+                    {
+                        "node": "37",
+                        "input": "output_1"
+                    }
+                ]
+            }
+        },
+        "outputs": {
+            "output_1": {
+                "connections": []
+            }
+        },
+        "pos_x": 2477,
+        "pos_y": 1329
+    }
+}
\ No newline at end of file

@@ -21,6 +21,7 @@ local p = game.party:findMember{main=true}
 
 local function void_portal_open(npc, player)
 	-- Charred scar was successful
+	-- do return false end
 	if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end
 	return true
 end
@@ -32,6 +33,100 @@ end
 
 
 --------------------------------------------------------
+-- Distant Sun is not exactly benevolent after all
+--------------------------------------------------------
+if p:attr("sun_paladin_avatar") then
+newChat{ id="welcome",
+	text = ([[<<<The two Sorcerers lie dead before you.
+Their bodies vanish in a small cloud of mist, quickly fading away.
+You feel you the gentle warmth of your Distant Sun patron. It speaks directly to your mind!>>>
+#YELLOW#YOU HAVE DONE WELL %s! YOU DESERVE A REWARD!#LAST#
+<<<You can feel your mind filling with warmth and desire to serve your patron>>>
+#YELLOW#BUT YOU MUST DO ONE MORE TASK!#LAST#
+<<<The warmth in your head is getting intense, too intense. You feel your sanity burning away!>>>
+#YELLOW#THROW YOURSELF INTO THE PORTAL! OPEN THE WAY FOR MY POWER TO RADIATE OVER YOUR WORLD! #CRIMSON#DO IT!#LAST#
+<<<Those last words are compelling. You can not resist!>>>
+]]):tformat(p.name:upper()),
+	answers = {
+		{_t"#YELLOW#[sacrifice yourself to bring forth your patron to Eyal!]", action=function(npc, player)
+			player.no_resurrect = true
+			player:die(player, {special_death_msg=("sacrificing %s to bring the fiery wrath of the Distant Sun"):tformat(string.his_her_self(player))})
+			player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun")
+			player:hasQuest("high-peak"):win("distant-sun")
+		end},
+		{_t"Nnnnnooo! Get.. get out of my head!", jump="distant-sun-unsure"},
+	}
+}
+
+local shertul = game.zone:makeEntityByName(game.level, "actor", "CALDIZAR_AOADS", true)
+newChat{ id="distant-sun-unsure",
+	text = _t[[<<<The warmth in your mind turns into searing pain!>>>
+#CRIMSON#YOU WILL DO AS YOU ARE TOLD! YOU ARE MY TOOL AND I INTEND TO USE IT!
+]],
+	answers = {
+		{_t"#LIGHT_GREEN#[sacrifice yourself to bring forth your patron to Eyal!]", action=function(npc, player)
+			player.no_resurrect = true
+			player:die(player, {special_death_msg=("sacrificing %s to bring the fiery wrath of the Distant Sun"):tformat(string.his_her_self(player))})
+			player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun")
+			player:hasQuest("high-peak"):win("distant-sun")
+		end},
+		{_t"#LIGHT_GREEN#[In a last incredible display of willpower you fight the Distant Sun for a few seconds, letting you project your thoughts to Aeryn.]#WHITE# High Lady! Kill me #{bold}#NOW#{normal}#",
+			cond=function(npc, player) return not void_portal_open(nil, player) and aeryn_alive(npc, player) and player:getWil() >= 55 end, switch_npc=aeryn_alive(), jump="distant-sun-stab"
+		},
+		{_t"#LIGHT_GREEN#[In a last incredible display of willpower you fight the Distant Sun for a few seconds, unsure how to stop it.]#WHITE##{bold}#NO!#{normal}#",
+			switch_npc=shertul, cond=function(npc, player) return not void_portal_open(nil, player) and not aeryn_alive(npc, player) and player:getWil() >= 55 end, jump="distant-sun-shertul"
+		},
+	}
+}
+
+newChat{ id="distant-sun-stab",
+	text = _t[[<<<Through your mind Aeryn sees what the Distant Sun is planning.>>>
+You were a precious ally and a friend. The world will remember your last act of selfless sacrifice. I swear it.
+<<<As she says this she pierces your body with a mighty thrust of her sword, ending the plans of your mad patron.>>>
+]],
+	answers = {
+		{_t"#LIGHT_GREEN#[slip peacefully into death.]", action=function(npc, player)
+			player.no_resurrect = true
+			player:die(player, {special_death_msg=("sacrificing %s to stop the mad sun's plans"):tformat(string.his_her_self(player))})
+			player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun-stab")
+			player:hasQuest("high-peak"):win("distant-sun-selfless")
+		end},
+	}
+}
+
+newChat{ id="distant-sun-shertul",
+	text = _t[[<<<The precious seconds fly by, but as you feel your mind breaking and burning you see a strange figure appearing in front of you, it radiates of immense power.>>>
+<<<The strange, amorphous figure in front of you remains completely silent. With a gesture of one of its tendrils, the staff is ripped from your hands. A surge of energy goes through the room as it grips the staff. Then you remember the old myth of the Godslayers. This is none other than a ***Sher'Tul***#{italic}#, and it knows you have been colluding with a god. That alone tells you everything you need to know.>>>
+]],
+	answers = {
+		{_t"#CRIMSON#[Your mind is burnt by your patron sun! Fight for your sun god now!]", action=function(npc, player)
+			player.no_resurrect = true
+			game.level.data.no_worldport = true
+			game.zone.no_worldport = true
+			local who, o, item, inven_id = game.party:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION_AWAKENED")
+			if who and o then
+				who:removeObject(inven_id, item, true)
+			end
+			local x, y = util.findFreeGrid(player.x, player.y, 100, true, {[engine.Map.ACTOR]=true})
+			if x then
+				game.zone:addEntity(game.level, shertul, "actor", x, y)
+				shertul:setTarget(player)
+				shertul:setPersonalReaction(player, -100)
+			end
+			player.on_die = function()
+				game:onTickEnd(function()
+					player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun-shertul")
+					player:hasQuest("high-peak"):win("distant-sun-shertul")
+				end)
+			end
+		end},
+	}
+}
+
+return "welcome"
+end
+
+--------------------------------------------------------
 -- Yeeks have a .. plan
 --------------------------------------------------------
 if p.descriptor.race == "Yeek" then
@@ -68,7 +163,7 @@ You will do as asked, for the good of all Yeeks! The Way is always right.
 			player:hasQuest("high-peak"):win("yeek-sacrifice")
 		end},
 		{_t"#LIGHT_GREEN#[In a last incredible display of willpower you fight the Way for a few seconds, letting you project your thoughts to Aeryn.]#WHITE# High Lady! Kill me #{bold}#NOW#{normal}#",
-			cond=function(npc, player) return not void_portal_open(nil, player) and aeryn_alive(npc, player) and player:getWil() >= 55 end, jump="yeek-stab"
+			cond=function(npc, player) return not void_portal_open(nil, player) and aeryn_alive(npc, player) and player:getWil() >= 55 end, switch_npc=aeryn_alive(), jump="yeek-stab"
 		},
 	}
 }
@@ -103,7 +198,7 @@ newChat{ id="welcome",
 But the portal to the Void is already open. It must be closed before the Creator can come through or all will have been in vain!
 After searching the remains of the Sorcerers you find a note explaining that the portal can only be closed with a sentient being's sacrifice.]],
 	answers = {
-		{_t"Aeryn, I am sorry but one of us needs to be sacrificed for the world to go on. #LIGHT_GREEN#[sacrifice Aeryn for the sake of the world]", jump="aeryn-sacrifice", cond=aeryn_alive},
+		{_t"Aeryn, I am sorry but one of us needs to be sacrificed for the world to go on. #LIGHT_GREEN#[sacrifice Aeryn for the sake of the world]", jump="aeryn-sacrifice", switch_npc=aeryn_alive(), cond=aeryn_alive},
 		{_t"I will close it. #LIGHT_GREEN#[sacrifice yourself for the sake of the world]", action=function(npc, player)
 			player.no_resurrect = true
 			player:die(player, {special_death_msg=("sacrificing %s for the sake of the world"):tformat(string.his_her_self(player))})
@@ -135,7 +230,7 @@ newChat{ id="welcome",
 You have won the game!
 Both Maj'Eyal and the Far East are safe from the dark schemes of the Sorcerers and their God.]],
 	answers = {
-		{_t"Aeryn, are you well?", jump="aeryn-ok", cond=aeryn_alive},
+		{_t"Aeryn, are you well?", jump="aeryn-ok", switch_npc=aeryn_alive(), cond=aeryn_alive},
 		{_t"[leave]", action=function(npc, player) player:hasQuest("high-peak"):win("full") end},
 	}
 }

@@ -81,7 +81,7 @@ He who felt great sorrow for this world. He who shall now shatter the barriers o
 The staff has allowed us to drain enough energy from this world to open the portal to the Void and summon Him through!
 It is already too late. He is coming through as we speak -- it is only a matter of hours!]],
 	answers = {
-		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn"}, action=aeryn_comes, cond=aeryn_alive},
+		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn", image="npc/humanoid_human_high_sun_paladin_aeryn.png"}, action=aeryn_comes, cond=aeryn_alive},
 		{_t"I *WILL* stop you! The world will not end today!", cond=aeryn_dead},
 	}
 }
@@ -92,7 +92,7 @@ He who felt great sorrow for this world. He who shall now shatter the barriers o
 The staff will allow us to drain enough energy from this world to open the portal to the Void and summon Him through!
 You cannot stop us now!]],
 	answers = {
-		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn"}, action=aeryn_comes, cond=aeryn_alive},
+		{_t"I *WILL* stop you! The world will not end today!", jump="aeryn", switch_npc={name=_t"High Sun Paladin Aeryn", image="npc/humanoid_human_high_sun_paladin_aeryn.png"}, action=aeryn_comes, cond=aeryn_alive},
 		{_t"I *WILL* stop you! The world will not end today!", cond=aeryn_dead},
 	}
 }

@@ -59,6 +59,7 @@ local changer = function(id)
 		ambient_music = "World of Ice.ogg",
 		reload_lists = false,
 		persistent = "zone",
+		in_orbit = true,
 		
 		no_worldport = game.zone.no_worldport,
 		min_material_level = util.getval(game.zone.min_material_level),

@@ -283,8 +283,8 @@ newEntity{ base = "BASE_LITE", define_as = "WINTERTIDE_PHIAL",
 	material_level = 2,
 
 	wielder = {
-		lite = 1,
-		infravision = 6,
+		lite = 2,
+		infravision = 7,
 	},
 
 	max_power = 60, power_regen = 1,

@@ -501,7 +501,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 45,
 		apr = 11,
 		physcrit = 18,
-		dammod = {dex=0.55,str=0.35},
+		dammod = {dex=0.5,str=0.5},
 	},
 	wielder = {
 		lite = 1,
@@ -1176,7 +1176,7 @@ newEntity{ base = "BASE_KNIFE", -- Thanks Grayswandir!
 		dam = 20,
 		apr = 10,
 		physcrit = 12,
-		dammod = {dex=0.45,str=0.45,},
+		dammod = {dex=0.5,str=0.5,},
 		lifesteal = 6,
 		melee_project = {
 			[DamageType.FIRE] = 20,

@@ -370,6 +370,7 @@ newEntity{ base = "BASE_LITE", define_as = "SUMMERTIDE_PHIAL",
 	desc = _t[[A small crystal phial that captured Sunlight during the Summertide.]],
 	special_desc = function(self) return _t"When attacking in melee, deals 15 light damage and lights tiles in radius 1." end,
 	cost = 200,
+	material_level = 1,
 
 	max_power = 15, power_regen = 1,
 	use_power = {
@@ -848,7 +849,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 25,
 		apr = 10,
 		physcrit = 8,
-		dammod = {dex=0.55,str=0.35},
+		dammod = {dex=0.65,str=0.35},
 		no_stealth_break = true,
 		no_garrote = true,
 		melee_project={[DamageType.RANDOM_SILENCE] = 10},
@@ -2966,7 +2967,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 25,
 		apr = 10,
 		physcrit = 9,
-		dammod = {dex=0.45,str=0.45, mag=0.1},
+		dammod = {dex=0.5,str=0.5, mag=0.15},
 		convert_damage = {
 			[DamageType.DARKNESS] = 50,
 		},
@@ -6140,7 +6141,7 @@ Passed on and on, this blade has developed a thirst of its own.]],
 		dam = 27,
 		apr = 8,
 		physcrit = 9,
-		dammod = {str=0.45, dex=0.55, mag=0.05},
+		dammod = {str=0.35, dex=0.55, mag=0.2},
 		talent_on_hit = { T_DISPERSE_MAGIC = {level=1, chance=15},},
 		special_on_hit = {desc=_t"steals up to 50 mana from the target", fct=function(combat, who, target)
 			local manadrain = util.bound(target:getMana(), 0, 50)
@@ -8221,7 +8222,7 @@ Their killing spree ended when one of the victims got lucky and managed to stab
 		dam = 35,
 		apr = 10,
 		physcrit = 15,
-		dammod = {str=0.45, dex=0.45},
+		dammod = {str=0.5, dex=0.5},
 		melee_project = { [DamageType.COLD]=30 },
 		special_on_crit = {desc=_t"freezes the target", fct=function(combat, who, target)
 			if not target or target == self then return end

@@ -35,7 +35,7 @@ return {
 	system_rotation = dir, system_rotationv = 0,
 	generator = function()
 	return {
-		life = 42,
+		life = 15,
 		--size = 30, sizev = 2.1*64*radius/16, sizea = 0,
 		size = 3.5*64*radius, sizev = 0, sizea = 0,
 
@@ -47,7 +47,7 @@ return {
 		r = 1, rv = 0, ra = 0,
 		g = 1, gv = 0, ga = 0,
 		b = 1, bv = 0, ba = 0,
-		a = 1, av = 0, aa = 0,
+		a = 0.7, av = 0, aa = 0,
 	}
 end, },
 function(self)

@@ -51,7 +51,7 @@ defineTile('2', "FLOOR", {random_filter={type="ammo", add_levels=10, tome_mod="v
 
 return {
 [[XXXXXXXXXXXXXXXXX]],
-[[XE$..#.....#..$EX]],
+[[XE$...........$EX]],
 [[X$2$##..P..##$2$X]],
 [[X.$##.......##$.X]],
 [[X.##...X^X...##.X]],
@@ -61,7 +61,7 @@ return {
 [[X.T.^.#1D1#.^.T.X]],
 [[X...XXX111XXX...X]],
 [[X......X#X......X]],
-[[X##..e.X.X.e..##X]],
+[[X.#..e.X.X.e..#.X]],
 [[X.##...X^X...##.X]],
 [[X.$##.......##$.X]],
 [[X$2$##..P..##$2$X]],

@@ -55,19 +55,19 @@ defineTile('O', "FLOOR", nil, {random_filter={add_levels=15, name="orc necromanc
 defineTile('K', "FLOOR", nil, {random_filter={add_levels=5, type="undead", subtype="giant", special_rarity="bonegiant_rarity"}})
 
 return {
-[[...............................]],
-[[.#############################.]],
-[[.#...................+...+.K\#.]],
-[[.#.......o....o......#####.o\#.]],
-[[.#......................K#.K\#.]],
-[[.#.....o.................#####.]],
-[[.#~~~.....o...###........#o.K#.]],
-[[.#~O~..o......%$#........+...X.]],
-[[.#~~~.........###........#o.K#.]],
-[[.#.......o..o............#####.]],
-[[.#......................K#.K(#.]],
-[[.#....o....o.........#####.o(#.]],
-[[.#...................+...+.K(#.]],
-[[.#############################.]],
-[[...............................]],
+[[...........................]],
+[[.#########################.]],
+[[.#...............+...+.K\#.]],
+[[.#......o...o....#####.o\#.]],
+[[.#..................K#.K\#.]],
+[[.#.....o.............#####.]],
+[[.#~~~...o...###......#o.K#.]],
+[[.#~O~..o.....$#......+...X.]],
+[[.#~~~.......###......#o.K#.]],
+[[.#.....o..o..........#####.]],
+[[.#..................K#.K(#.]],
+[[.#...o...o.......#####.o(#.]],
+[[.#...............+...+.K(#.]],
+[[.#########################.]],
+[[...........................]],
 }

@@ -50,17 +50,17 @@ defineTile('d', "FLOOR", {random_filter={add_levels=15, tome_mod="gvault"}}, {ra
 return {
 
 [[########################]],
-[[#$$a/##.........c##d...#]],
+[[#$$a/##.........c..d...#]],
 [[#$$a##.........a.a##...#]],
-[[#ca##....^^^^^^.c.b%%..#]],
-[[#c%%.....^^^^^^.a.a.##.#]],
-[[###......^^^^^^c.a.ba###]],
-[[##.......^^^/^^.caaa...X]],
-[[###......^^^~^^caa.b.###]],
+[[#ca##....^^^^^^.c.b##..#]],
+[[#c##.....^^^^^^.a.a.##.#]],
+[[#.#......^^^^^^c.a.ba###]],
+[[#........^^^/^^.caaa...X]],
+[[#.#......^^^~^^caa.b.###]],
 [[#$##.....^~~~^^a..ba##d#]],
 [[#$$##....^~^^^^.c.a##..#]],
-[[#aaa##............%%...#]],
-[[#aacc%%.........c##....#]],
+[[#aaa##............##...#]],
+[[#aacc##.........c......#]],
 [[########################]],
 
 }
\ No newline at end of file

@@ -78,20 +78,21 @@ defineTile('!', "DOOR_VAULT")
 defineTile('>', "DYNAMIC_ZONE_EXIT")
 
 
-defineTile('b', "FLOOR", {random_filter={add_levels=20, tome_mod="gvault"}}, {random_filter={add_levels=5, name="skeleton magus"}})
+defineTile('b', "FLOOR", {random_filter={add_levels=15, tome_mod="gvault"}}, {random_filter={add_levels=5, name="skeleton magus"}})
 defineTile('$', "FLOOR", {random_filter={add_levels=25, type="money"}})
-defineTile('j', "FLOOR", {random_filter={add_levels=10, type="jewelry", tome_mod="gvault"}})
-defineTile('t', "FLOOR", {random_filter={add_levels=5, tome_mod="gvault"}}, turret())
+defineTile('j', "FLOOR", {random_filter={add_levels=5, type="jewelry", tome_mod="vault"}})
+defineTile('J', "FLOOR", {random_filter={add_levels=10, type="jewelry", tome_mod="gvault"}})
+defineTile('t', "FLOOR", {random_filter={add_levels=5, tome_mod="vault"}}, turret())
 
 local def = {
 [[##############]],
-[[#tjj##########]],
+[[#tjJ##########]],
 [[#b$$##########]],
 [[##.##t$..t####]],
 [[#t.+...>..####]],
 [[##.##...$.####]],
 [[#b$$#$...t####]],
-[[#tjj##########]],
+[[#tjJ##########]],
 [[##############]],
 }
 

@@ -74,7 +74,7 @@ next_combat = function(self)
 
 		if not self:isEnded() then
 			local Chat = require "engine.Chat"
-			local chat = Chat.new("antimagic-end", {name=_t"Grim-looking fighter"}, game.player)
+			local chat = Chat.new("antimagic-end", {name=_t"Grim-looking fighter", image="portrait/antimagic.png"}, game.player)
 			chat:invoke()
 		end
 	end

@@ -123,6 +123,9 @@ function win(self, how)
 	elseif how == "self-sacrifice" then world:gainAchievement("WIN_SACRIFICE", game.player)
 	elseif how == "yeek-sacrifice" then world:gainAchievement("YEEK_SACRIFICE", game.player)
 	elseif how == "yeek-selfless" then world:gainAchievement("YEEK_SELFLESS", game.player)
+	elseif how == "distant-sun" then world:gainAchievement("AOADS_BURN", game.player)
+	elseif how == "distant-sun-selfless" then world:gainAchievement("AOADS_SELFLESS", game.player)
+	elseif how == "distant-sun-shertul" then world:gainAchievement("AOADS_SHERTUL", game.player)
 	end
 	
 	local p = game:getPlayer(true)
@@ -177,6 +180,24 @@ function onWin(self, who)
 	desc[#desc+1] = _t"The Sorcerers are dead, and the Orc Pride lies in ruins, thanks to your efforts."
 	desc[#desc+1] = _t""
 
+	-- Avatars are special
+	if who:isQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun") then
+		desc[#desc+1] = _t"Your patron's plan worked. As your body was crushed by the raw forces of the void portal it opened wide. In an instant the connection was made and waves of heat came through."
+		desc[#desc+1] = _t"The mad sun brought forth all its power through the portal, turning the High Peak into a giant searing needle!"
+		desc[#desc+1] = _t"A few minutes later the whole world was set ablaze, nothing survived except Faeros elementals."
+		return 0, desc
+	elseif who:isQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun-stab") then
+		desc[#desc+1] = _t"In the aftermath of the battle the Distant Sun tried to force you to open the portal to bring it forth onto Eyal."
+		desc[#desc+1] = _t"Through an incredible display of willpower you resisted long enough to ask Aeryn to kill you."
+		desc[#desc+1] = _t"She sadly agreed and ran her sword through you, enabling you to do the last sacrifice you could for the world."
+		return 0, desc
+	elseif who:isQuestStatus("high-peak", engine.Quest.COMPLETED, "distant-sun-shertul") then
+		desc[#desc+1] = _t"In the aftermath of the battle the Distant Sun tried to force you to open the portal to bring it forth onto Eyal."
+		desc[#desc+1] = _t"Through an incredible display of willpower you resisted for a few decisive seconds. During this time a Sher'tul appeared, took the Staff and killed you."
+		desc[#desc+1] = _t"Though you succumbed to the fight, your mind was already gone, burnt to ashes by your mad patron sun. But the world was saved."
+		return 0, desc
+	end
+
 	-- Yeeks are special
 	if who:isQuestStatus("high-peak", engine.Quest.COMPLETED, "yeek") then
 		desc[#desc+1] = _t"Your sacrifice worked. Your mental energies were imbued with farportal energies. The Way radiated from the High Peak toward the rest of Eyal like a mental tidal wave."

@@ -77,7 +77,7 @@ kill_one = function(self)
 
 	if self.kill_count >= self.max_count then
 		local Chat = require "engine.Chat"
-		local chat = Chat.new("derth-attack-over", {name=_t"Scared Halfling"}, game.player)
+		local chat = Chat.new("derth-attack-over", {name=_t"Scared Halfling", image="portrait/derth_attack_over.png"}, game.player)
 		chat:invoke()
 
 		if not game.zone.unclean_derth_savior then

@@ -20,7 +20,7 @@
 name = _t"Following The Way"
 desc = function(self, who)
 	local desc = {}
-	desc[#desc+1] = _t"You have been tasked to remove at leastg one of the threats to the yeeks.\n"
+	desc[#desc+1] = _t"You have been tasked to remove at least one of the threats to the yeeks.\n"
 	desc[#desc+1] = _t"Protect the Way, and vanquish your foes.\n"
 	if self:isCompleted("murgol") then
 		if self:isCompleted("murgol-invaded") then

@@ -18,6 +18,48 @@
 -- darkgod@te4.org
 
 newTalent{
+	name = "Gravitic Effulgence",
+	type = {"celestial/other", 1},
+	mode = "sustained",
+	points = 1,
+	cooldown = 10,
+	tactical = { BUFF = 2 },
+	range = 10,
+	getShieldFlat = function(self, t)
+		return t.getDamage(self, t)
+	end,
+	activate = function(self, t)
+		game:onTickEnd(function()
+			if self:isTalentActive(self.T_WEAPON_OF_LIGHT) then
+				self.turn_procs.resetting_talents = true
+				self:forceUseTalent(self.T_WEAPON_OF_LIGHT, {ignore_energy=true, ignore_cd=true, no_talent_fail=true})
+				self:forceUseTalent(self.T_WEAPON_OF_LIGHT, {ignore_energy=true, ignore_cd=true, no_talent_fail=true, talent_reuse=true})
+				self.turn_procs.resetting_talents = nil			
+			end
+		end)
+
+		game:playSoundNear(self, "talents/spell_generic2")
+		local ret = {}
+		return ret
+	end,
+	deactivate = function(self, t, p)
+		game:onTickEnd(function()
+			if self:isTalentActive(self.T_WEAPON_OF_LIGHT) then
+				self.turn_procs.resetting_talents = true
+				self:forceUseTalent(self.T_WEAPON_OF_LIGHT, {ignore_energy=true, ignore_cd=true, no_talent_fail=true})
+				self:forceUseTalent(self.T_WEAPON_OF_LIGHT, {ignore_energy=true, ignore_cd=true, no_talent_fail=true, talent_reuse=true})
+				self.turn_procs.resetting_talents = nil			
+			end
+		end)
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Your Weapon of Light nows pulls in all foes in radius 5.]]):tformat()
+	end,
+}
+
+newTalent{
 	name = "Weapon of Light",
 	type = {"celestial/combat", 1},
 	mode = "sustained",
@@ -27,19 +69,18 @@ newTalent{
 	sustain_positive = 10,
 	tactical = { BUFF = 2 },
 	range = 10,
-	getDamage = function(self, t) return 7 + self:combatSpellpower(0.092) * self:combatTalentScale(t, 1, 7) end,
+	getDamage = function(self, t) return (7 + self:combatSpellpower(0.092) * self:combatTalentScale(t, 1, 7))  end,
 	getShieldFlat = function(self, t)
 		return t.getDamage(self, t)
 	end,
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/spell_generic2")
-		local ret = {
-			dam = self:addTemporaryValue("melee_project", {[DamageType.LIGHT]=t.getDamage(self, t)}),
-		}
+		local ret = {}
+		if not self:isTalentActive(self.T_GRAVITIC_EFFULGENCE) then ret.dam = self:addTemporaryValue("melee_project", {[DamageType.LIGHT]=t.getDamage(self, t)}) end
 		return ret
 	end,
 	deactivate = function(self, t, p)
-		self:removeTemporaryValue("melee_project", p.dam)
+		if p.dam then self:removeTemporaryValue("melee_project", p.dam) end
 		return true
 	end,
 	callbackOnMeleeAttack = function(self, t, target, hitted, crit, weapon, damtype, mult, dam)
@@ -55,6 +96,14 @@ newTalent{
 			self.damage_shield_absorb_max = self.damage_shield_absorb_max + shield_power
 			shield.dur = math.max(2, shield.dur)
 		end
+		if hitted and self:isTalentActive(self.T_GRAVITIC_EFFULGENCE) then
+			local list = table.values(self:projectCollect({type="ball", radius=5, x=target.x, y=target.y, friendlyfire=false}, target.x, target.y, Map.ACTOR))
+			table.sort(list, "dist")
+			for _, l in ipairs(list) do
+				if l.target:canBe("knockback") then l.target:pull(target.x, target.y, 5) end
+			end
+			self:project({type="ball", radius=2, x=target.x, y=target.y, friendlyfire=false}, target.x, target.y, DamageType.LIGHT, t.getDamage(self, t))
+		end
 	end,
 	info = function(self, t)
 		local damage = t.getDamage(self, t)

@@ -227,3 +227,29 @@ newTalent{
 		tformat(weapon, shield, cooldown, cleanse)
 	end,
 }
+
+
+
+newTalent{
+	name = "Avatar Distant Sun Unlock Checker", short_name = "AVATAR_DISTANT_SUN_UNLOCK_CHECKER", image = "talents/avatar_of_a_distant_sun.png",
+	type = {"celestial/other",1},
+	mode = "passive",
+	hide = "always",
+	no_unlearn_last = true,
+	callbackOnAct = function(self, t)
+		if not game.zone or not game.zone.in_orbit then return end
+		if not rng.chance(30) then return end
+
+		local chat = require("engine.Chat").new("avatar-distant-sun-unlock", t, self)
+		chat:invoke()
+	end,
+	doUnlock = function(self, t)
+		game:setAllowedBuild("paladin_avatar", true)
+		self:unlearnTalent(self.T_AVATAR_DISTANT_SUN_UNLOCK_CHECKER)
+		self:project({type="ball", radius=20, friendlyfire=false}, self.x, self.y, DamageType.FIRE, 5000)
+		game.level.map:particleEmitter(x, y, 20, "fireflash", {radius=20, proj_x=self.x, proj_y=self.y, src_x=self.x, src_y=self.y})
+	end,
+	info = function(self, t)
+		return "Move along, nothing to see" -- No need to translate
+	end,
+}

@@ -112,8 +112,8 @@ newTalent{
 	range = function(self) return radianceRadius(self) end,
 	tactical = { ATTACKAREA = {LIGHT=1} },
 	sustain_positive = 10,
-	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 3, 35) end,
-	getDaze = function(self, t) return self:combatTalentLimit(t, 35, 8, 25) end,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 3, 35) * (self:attr("sun_paladin_avatar") and 2 or 1) end,
+	getDaze = function(self, t) return self:combatTalentLimit(t, 35, 8, 25) * (self:attr("sun_paladin_avatar") and 2 or 1) end,
 	updateParticle = function(self, t)
 		local p = self:isTalentActive(self.T_SEARING_SIGHT)
 		if not p then return end

@@ -152,6 +152,9 @@ newTalent{
 			if self.talents_cd[self.T_SUN_BEAM] <= 0 then self.talents_cd[self.T_SUN_BEAM] = nil end
 		else
 			self:setEffect(self.EFF_SUN_VENGEANCE, 2, {})
+			if self:attr("sun_paladin_avatar") then
+				self:alterTalentCoolingdown(self.T_JUDGEMENT, -6)
+			end
 		end
 	end,
 	info = function(self, t)

@@ -41,7 +41,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Increases your spell critical damage multiplier by %d%%.
+		return ([[Increases your critical damage multiplier by %d%%.
 		The multiplier will increase with your Spellpower.]]):
 		tformat(self:combatTalentSpellDamage(t, 20, 50))
 	end,

@@ -162,8 +162,8 @@ newTalent{
 	range = 1,
 	target = function(self, t) return {type="hit", range=self:getTalentRange(t)}<