Fixed random escorts spawning on daikara 3 and messing up the paradox mage unlock

Fixed epoch spawning the player on daikara 4
Fixed wormhole targeting at level 4+
Fixed non-functioning bow and sling egos


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

@@ -37,7 +37,7 @@ newBirthDescriptor{
 			["Runic Golem"] = "allow",
 		},
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor

@@ -49,7 +49,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 ---------------------------------------------------------

@@ -91,7 +91,7 @@ newBirthDescriptor
 		resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=7, range=10}),
 	},
 	experience = 1.35,
-	random_escort_possibilities = { {"scintillating-caves", 2, 3}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"scintillating-caves", 2, 3}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor

@@ -54,7 +54,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 ---------------------------------------------------------

@@ -55,7 +55,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 ---------------------------------------------------------

@@ -65,7 +65,7 @@ newBirthDescriptor{
 		resolvers.inscription("RUNE:_SHIELDING", {cooldown=14, dur=5, power=100}),
 		resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=7, range=10}),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor

@@ -51,7 +51,7 @@ newBirthDescriptor{
 		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
 		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 ---------------------------------------------------------

@@ -27,7 +27,9 @@ newEntity{
 	level_range = {1, 50},
 	rarity = 3,
 	cost = 6,
-	combat={},
+	wielder = {
+		inc_damage={ [DamageType.PHYSICAL] = resolvers.mbonus_material(14, 8), },
+	},
 }
 
 newEntity{
@@ -37,8 +39,8 @@ newEntity{
 	level_range = {1, 50},
 	rarity = 3,
 	cost = 4,
-	combat = {
-		dam = resolvers.mbonus_material(20, 5),
+	wielder = {
+		combat_dam = resolvers.mbonus_material(10, 5),
 	},
 }
 
@@ -61,7 +63,7 @@ newEntity{
 	level_range = {1, 50},
 	rarity = 7,
 	cost = 7,
-	combat = {
+	wielder = {
 		physcrit = resolvers.mbonus_material(7, 3),
 	}
 }
@@ -119,12 +121,14 @@ newEntity{
 	rarity = 20,
 	cost = 40,
 	combat = {
-		physcrit = resolvers.mbonus_material(7, 3),
 		travel_speed = 2
 	},
 	resolvers.generic(function(e)
 		e.combat.range = e.combat.range + 1
 	end),
+	wielder = {
+		physcrit = resolvers.mbonus_material(7, 3),
+	},
 }
 
 newEntity{
@@ -135,10 +139,8 @@ newEntity{
 	greater_ego = 1,
 	rarity = 20,
 	cost = 40,
-	combat = {
-		apr = resolvers.mbonus_material(25, 5)
-	},
 	wielder = {
+		apr = resolvers.mbonus_material(25, 5),
 		resists_pen = {
 			[DamageType.PHYSICAL] = resolvers.mbonus_material(20, 5),
 		},

@@ -166,9 +166,10 @@ newTalent{
 			minimum_distance = 0
 			local tg = {type="ball", nolock=true, pass_terrain=true, nowarning=true, range=self:getTalentRange(t), radius=radius}
 			x, y = self:getTarget(tg)
+			print("[Target]", x, y)
 			if not x then return nil end
-			-- See if we can actually project to the selected location
-			if not self:canProject(tg, x, y) then
+			-- Make sure the target is within range
+			if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then
 				game.logPlayer(self, "Pick a valid location.")
 				return false
 			end

@@ -37,5 +37,5 @@ newEntity{
 	always_remember = true,
 	show_tooltip = true,
 	desc = [[The rift leads somewhere ..]],
-	change_level = 4, change_zone = "daikara",
+	change_level = 3, change_zone = "daikara",
 }

@@ -5,3 +5,7 @@
 * auto-leveling for beginners/lazy
 * md5sum saves & save it online to check local tempering
 * donator's fight club
+* redo traps:
+  - spinning "laser" trap
+  - boulder trap
+  - flood trap