Skip to content
Snippets Groups Projects
Commit e34c120b authored by dg's avatar dg
Browse files

Clicking on the minimap now makes the character run to this spot

Updated Maj'Eyal and the Far East map to be more "meaty"


git-svn-id: http://svn.net-core.org/repos/t-engine4@2453 51575b47-30f0-44d4-a5cc-537603b46e54
parent fdb64643
No related branches found
No related tags found
No related merge requests found
......@@ -1028,6 +1028,13 @@ function _M:setupMouse(reset)
self.mouse:registerZone(self.player_display.display_x, self.player_display.display_y, self.player_display.w, self.player_display.h, function(button, mx, my, xrel, yrel, bx, by, event)
self.player_display.mouse:delegate(button, mx, my, xrel, yrel, bx, by, event)
end)
-- Move using the minimap
self.mouse:registerZone(0, 35, 200, 200, function(button, mx, my, xrel, yrel, bx, by, event)
if button == "left" and not xrel and not yrel and event == "button" then
local tmx, tmy = math.floor(bx / 4), math.floor(by / 4)
self.player:mouseMove(tmx, tmy)
end
end)
if not reset then self.mouse:setCurrent() end
end
......
......@@ -26,7 +26,7 @@ newBirthDescriptor{
desc = {
"Yeeks are a mysterious race of small humanoids native to the tropical island of Rel.",
"Their body is covered with white fur and their disproportionate head gives them a ridiculous look.",
"Although they are now nearly unheard of in Maj'Eyal, they spend many centuries as secret slaves to the halfling nation of Nargol.",
"Although they are now nearly unheard of in Maj'Eyal, they spent many centuries as secret slaves to the halfling nation of Nargol.",
"They gained their freedom during the Age of Pyre and have since then followed 'The Way' - a unity of minds enforced by their powerful psionics.",
},
descriptor_choices =
......@@ -60,7 +60,7 @@ newBirthDescriptor
name = "Yeek",
desc = {
"Yeeks are a mysterious race native to the tropical island of Rel.",
"Although they are now nearly unheard of in Maj'Eyal, they spend many centuries as secret slaves to the halfling nation of Nargol.",
"Although they are now nearly unheard of in Maj'Eyal, they spent many centuries as secret slaves to the halfling nation of Nargol.",
"They gained their freedom during the Age of Pyre and have since then followed 'The Way' - a unity of minds enforced by their powerful psionics.",
"They possess the #GOLD#Dominant Will#WHITE# talent which allows them temporarily subvert the mind of a lesser creature. When the effect ends the creature dies.",
"While yeeks are not amphibians they still have an affinity for water, allowing them to survive longer without breathing.",
......
......@@ -679,11 +679,11 @@ local activate_pair = function(moon, star, who)
-- The Moon knife's bonuses
moon.paired._special1 = {who, "lite", who:addTemporaryValue("lite", 1)}
moon.paired._special2 = {moon, "combat", moon:addTemporaryValue("combat", {melee_project={[DamageType.BLINDPHYSICAL]=2}})}
moon.paired._special2 = {moon, "combat", moon:addTemporaryValue("combat", {melee_project={[DamageType.RANDOM_CONFUSION]=3}})}
moon.paired._special3 = {who, {"inc_damage", DamageType.DARKNESS}, who:addTemporaryValue({"inc_damage", DamageType.DARKNESS}, 10)}
-- The Star knife's bonuses
star.paired._special1 = {who, "lite", who:addTemporaryValue("lite", 1)}
star.paired._special2 = {star, "combat", star:addTemporaryValue("combat", {melee_project={[DamageType.RANDOM_CONFUSION]=2}})}
star.paired._special2 = {star, "combat", star:addTemporaryValue("combat", {melee_project={[DamageType.RANDOM_BLINDPHYSICAL]=3}})}
star.paired._special3 = {who, "inc_damage", who:addTemporaryValue("inc_damage", {[DamageType.LIGHT]=10}) }
game.log("The two blades glow brightly as they are brought close together.")
end
......@@ -705,23 +705,23 @@ newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_MOON",
unique = true,
name = "Moon",
unided_name = "crescent blade",
desc = [[A viciously curved blade that devours the light around it.]],
desc = [[A viciously curved blade that a folk story says is made from a material that originates from the moon. Devouring the light abound, it fades.]],
level_range = {20, 30},
rarity = 200,
require = { stat = { dex=28, cun=20 }, },
require = { stat = { dex=24, cun=24 }, },
cost = 300,
material_level = 3,
combat = {
dam = 24,
apr = 15,
physcrit = 5,
dammod = {dex=0.45,str=0.45},
dam = 30,
apr = 30,
physcrit = 10,
dammod = {dex=0.45,cun=0.45},
melee_project={[DamageType.DARKNESS] = 20},
},
wielder = {
lite = -1,
inc_damage={
[DamageType.DARKNESS] = 5,
[DamageType.DARKNESS] = 10,
},
},
activate_pair = activate_pair,
......@@ -747,23 +747,23 @@ newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_STAR",
unique = true,
name = "Star",
unided_name = "jagged blade",
desc = [[A bright blade with more teeth than the most savage troll.]],
desc = [[Legend tells of a blade, shining bright as a star. Forged from a material fallen from the skies, it glows.]],
level_range = {20, 30},
rarity = 200,
require = { stat = { dex=20, cun=28 }, },
require = { stat = { dex=24, cun=24 }, },
cost = 300,
material_level = 3,
combat = {
dam = 22,
apr = 7,
physcrit = 13,
dammod = {dex=0.45,str=0.45},
dam = 25,
apr = 20,
physcrit = 20,
dammod = {dex=0.45,cun=0.45},
melee_project={[DamageType.LIGHT] = 20},
},
wielder = {
lite = 1,
inc_damage={
[DamageType.LIGHT] = 5,
[DamageType.LIGHT] = 10,
},
},
activate_pair = activate_pair,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment