From 04b31cd806e20891a7eba6ecd79956f455289055 Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Mon, 14 Feb 2011 15:21:24 +0000 Subject: [PATCH] Double greater egos have their own special color (because player love colored loot!) git-svn-id: http://svn.net-core.org/repos/t-engine4@2726 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/tome/class/Object.lua | 6 +++++- .../tome/data/general/objects/egos/ammo.lua | 6 +++--- .../tome/data/general/objects/egos/amulets.lua | 16 ++++++++-------- .../tome/data/general/objects/egos/armor.lua | 14 +++++++------- .../tome/data/general/objects/egos/belt.lua | 14 +++++++------- .../tome/data/general/objects/egos/boots.lua | 14 +++++++------- .../tome/data/general/objects/egos/bow.lua | 4 ++-- .../tome/data/general/objects/egos/cloak.lua | 12 ++++++------ .../tome/data/general/objects/egos/digger.lua | 12 ++++++------ .../tome/data/general/objects/egos/gloves.lua | 14 +++++++------- .../tome/data/general/objects/egos/helm.lua | 18 +++++++++--------- .../data/general/objects/egos/light-armor.lua | 4 ++-- .../tome/data/general/objects/egos/lite.lua | 12 ++++++------ .../general/objects/egos/massive-armor.lua | 2 +- .../tome/data/general/objects/egos/rings.lua | 12 ++++++------ .../tome/data/general/objects/egos/robe.lua | 16 ++++++++-------- .../tome/data/general/objects/egos/shield.lua | 12 ++++++------ .../tome/data/general/objects/egos/sling.lua | 4 ++-- .../tome/data/general/objects/egos/staves.lua | 14 +++++++------- .../tome/data/general/objects/egos/weapon.lua | 12 ++++++------ .../data/general/objects/egos/wizard-hat.lua | 12 ++++++------ .../data/zones/town-iron-council/grids.lua | 4 ++-- 22 files changed, 119 insertions(+), 115 deletions(-) diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua index 064cfd3174..e93cb8ff82 100644 --- a/game/modules/tome/class/Object.lua +++ b/game/modules/tome/class/Object.lua @@ -167,7 +167,11 @@ function _M:getDisplayColor() if self.lore then return {0, 128, 255}, "#0080FF#" elseif self.egoed then if self.greater_ego then - return {0, 0x80, 255}, "#0080FF#" + if self.greater_ego > 1 then + return {0x8d, 0x55, 0xff}, "#8d55ff#" + else + return {0, 0x80, 255}, "#0080FF#" + end else return {0, 255, 128}, "#00FF80#" end diff --git a/game/modules/tome/data/general/objects/egos/ammo.lua b/game/modules/tome/data/general/objects/egos/ammo.lua index 6e5db1ec4b..6e09306b9a 100644 --- a/game/modules/tome/data/general/objects/egos/ammo.lua +++ b/game/modules/tome/data/general/objects/egos/ammo.lua @@ -77,7 +77,7 @@ newEntity{ power_source = {arcane=true}, name = "elemental ", prefix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 25, cost = 35, wielder = { @@ -105,7 +105,7 @@ newEntity{ power_source = {technique=true}, name = " of annihilation", suffix=true, level_range = {1, 50}, - greater_ego = true, + greater_ego = 1, cost = 35, rarity = 15, combat = { @@ -121,7 +121,7 @@ newEntity{ power_source = {technique=true}, name = " of unerring flight", suffix=true, level_range = {1, 50}, - greater_ego = true, + greater_ego = 1, cost = 35, rarity = 15, combat = { diff --git a/game/modules/tome/data/general/objects/egos/amulets.lua b/game/modules/tome/data/general/objects/egos/amulets.lua index e32c385b53..bfdfe77270 100644 --- a/game/modules/tome/data/general/objects/egos/amulets.lua +++ b/game/modules/tome/data/general/objects/egos/amulets.lua @@ -70,7 +70,7 @@ newEntity{ power_source = {arcane=true}, name = " of greater telepathy", suffix=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 120, cost = 25, wielder = { @@ -205,7 +205,7 @@ newEntity{ power_source = {nature=true}, name = "vitalizing ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 30, wielder = { @@ -227,7 +227,7 @@ newEntity{ power_source = {technique=true}, name = " of murder", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 40, wielder = { @@ -243,7 +243,7 @@ newEntity{ power_source = {nature=true}, name = " of vision", suffix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 30, wielder = { @@ -259,7 +259,7 @@ newEntity{ power_source = {nature=true}, name = " of healing", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 60, wielder = { @@ -274,7 +274,7 @@ newEntity{ power_source = {technique=true}, name = "protective ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 40, wielder = { @@ -288,7 +288,7 @@ newEntity{ power_source = {technique=true}, name = "enraging ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 90, wielder = { @@ -303,7 +303,7 @@ newEntity{ power_source = {arcane=true}, name = "archmage's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 40, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/armor.lua b/game/modules/tome/data/general/objects/egos/armor.lua index 35051d7f2c..23c4014f81 100644 --- a/game/modules/tome/data/general/objects/egos/armor.lua +++ b/game/modules/tome/data/general/objects/egos/armor.lua @@ -137,7 +137,7 @@ newEntity{ power_source = {nature=true}, name = "radiant ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 15, wielder = { @@ -215,7 +215,7 @@ newEntity{ power_source = {technique=true}, name = "fortifying ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 35, wielder = { @@ -232,7 +232,7 @@ newEntity{ power_source = {technique=true}, name = "hardened ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 29, cost = 47, wielder = { @@ -266,7 +266,7 @@ newEntity{ power_source = {arcane=true}, name = " of the sky", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 35, wielder = { @@ -286,7 +286,7 @@ newEntity{ power_source = {nature=true}, name = " of Eyal", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 30, wielder = { @@ -300,7 +300,7 @@ newEntity{ power_source = {technique=true}, name = " of Toknor", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 30, wielder = { @@ -314,7 +314,7 @@ newEntity{ power_source = {technique=true}, name = " of implacability", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 30, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/belt.lua b/game/modules/tome/data/general/objects/egos/belt.lua index 6190c988e4..b63d1475c6 100644 --- a/game/modules/tome/data/general/objects/egos/belt.lua +++ b/game/modules/tome/data/general/objects/egos/belt.lua @@ -179,7 +179,7 @@ newEntity{ power_source = {arcane=true}, name = " of magery", suffix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 50, wielder = { @@ -195,7 +195,7 @@ newEntity{ power_source = {technique=true}, name = " of burglary", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 30, wielder = { @@ -212,7 +212,7 @@ newEntity{ power_source = {nature=true}, name = " of dampening", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 50, wielder = { @@ -229,7 +229,7 @@ newEntity{ power_source = {technique=true}, name = " of inertia", suffix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 50, wielder = { @@ -246,7 +246,7 @@ newEntity{ power_source = {technique=true}, name = "monstrous ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { @@ -261,7 +261,7 @@ newEntity{ power_source = {technique=true}, name = "balancing ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { @@ -278,7 +278,7 @@ newEntity{ power_source = {technique=true}, name = "protective ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/boots.lua b/game/modules/tome/data/general/objects/egos/boots.lua index 09da0b9c87..5b517ef7a0 100644 --- a/game/modules/tome/data/general/objects/egos/boots.lua +++ b/game/modules/tome/data/general/objects/egos/boots.lua @@ -24,7 +24,7 @@ newEntity{ power_source = {arcane=true}, name = " of phasing", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 40, wielder = { @@ -59,7 +59,7 @@ newEntity{ power_source = {arcane=true}, name = " of speed", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { @@ -71,7 +71,7 @@ newEntity{ power_source = {technique=true}, name = " of rushing", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 40, max_power = 80, power_regen = 1, @@ -88,7 +88,7 @@ newEntity{ power_source = {technique=true}, name = " of disengagement", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 40, @@ -175,7 +175,7 @@ newEntity{ power_source = {nature=true}, name = "restorative ", prefix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 60, wielder = { @@ -191,7 +191,7 @@ newEntity{ power_source = {nature=true}, name = "invigorating ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 70, wielder = { @@ -205,7 +205,7 @@ newEntity{ power_source = {technique=true}, name = "blood-soaked ", prefix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 20, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/bow.lua b/game/modules/tome/data/general/objects/egos/bow.lua index 4503106ad5..ccd1c31eca 100644 --- a/game/modules/tome/data/general/objects/egos/bow.lua +++ b/game/modules/tome/data/general/objects/egos/bow.lua @@ -76,7 +76,7 @@ newEntity{ power_source = {technique=true}, name = " of great speed", suffix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 60, combat={physspeed = -0.2}, @@ -86,7 +86,7 @@ newEntity{ power_source = {technique=true}, name = "thaloren ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 24, cost = 40, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/cloak.lua b/game/modules/tome/data/general/objects/egos/cloak.lua index a81cc85844..d796d0eff0 100644 --- a/game/modules/tome/data/general/objects/egos/cloak.lua +++ b/game/modules/tome/data/general/objects/egos/cloak.lua @@ -112,7 +112,7 @@ newEntity{ power_source = {nature=true}, name = " of fog", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 25, wielder = { @@ -166,7 +166,7 @@ newEntity{ power_source = {arcane=true}, name = " of sorcery", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -183,7 +183,7 @@ newEntity{ power_source = {technique=true}, name = " of implacability", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -197,7 +197,7 @@ newEntity{ power_source = {nature=true}, name = "restorative ", prefix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 60, wielder = { @@ -213,7 +213,7 @@ newEntity{ power_source = {technique=true}, name = "regal ", prefix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 20, wielder = { @@ -229,7 +229,7 @@ newEntity{ power_source = {technique=true}, name = "wyrmwaxed ", prefix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 60, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/digger.lua b/game/modules/tome/data/general/objects/egos/digger.lua index 68a5711d45..30f36214df 100644 --- a/game/modules/tome/data/general/objects/egos/digger.lua +++ b/game/modules/tome/data/general/objects/egos/digger.lua @@ -43,7 +43,7 @@ newEntity{ power_source = {technique=true}, name = " of delving", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 20, wielder = { @@ -89,7 +89,7 @@ newEntity{ power_source = {technique=true}, name = " of the Iron Throne", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 15, wielder = { @@ -103,7 +103,7 @@ newEntity{ power_source = {technique=true}, name = " of Reknor", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 15, wielder = { @@ -119,7 +119,7 @@ newEntity{ power_source = {technique=true}, name = "brutal ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 70, wielder = { @@ -134,7 +134,7 @@ newEntity{ power_source = {technique=true}, name = "builder's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 15, wielder = { @@ -150,7 +150,7 @@ newEntity{ power_source = {technique=true}, name = "soldier's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 15, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/gloves.lua b/game/modules/tome/data/general/objects/egos/gloves.lua index d8bc765bb3..e1f7fa63d0 100644 --- a/game/modules/tome/data/general/objects/egos/gloves.lua +++ b/game/modules/tome/data/general/objects/egos/gloves.lua @@ -46,7 +46,7 @@ newEntity{ power_source = {technique=true}, name = " of mighty criticals", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 25, wielder = { @@ -219,7 +219,7 @@ newEntity{ power_source = {nature=true}, name = " of protection", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 25, wielder = { @@ -235,7 +235,7 @@ newEntity{ power_source = {technique=true}, name = " of warmaking", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 35, wielder = { @@ -252,7 +252,7 @@ newEntity{ power_source = {technique=true}, name = " of regeneration", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 25, wielder = { @@ -266,7 +266,7 @@ newEntity{ power_source = {technique=true}, name = "heroic ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 75, wielder = { @@ -283,7 +283,7 @@ newEntity{ power_source = {arcane=true}, name = "alchemist's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 35, wielder = { @@ -300,7 +300,7 @@ newEntity{ power_source = {technique=true}, name = "archer's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 35, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/helm.lua b/game/modules/tome/data/general/objects/egos/helm.lua index 1cf12930df..78f37a2015 100644 --- a/game/modules/tome/data/general/objects/egos/helm.lua +++ b/game/modules/tome/data/general/objects/egos/helm.lua @@ -58,7 +58,7 @@ newEntity{ power_source = {arcane=true}, name = " of greater telepathy", suffix=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 50, cost = 25, wielder = { @@ -80,7 +80,7 @@ newEntity{ power_source = {arcane=true}, name = "shaloran ", prefix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 10, wielder = { @@ -107,7 +107,7 @@ newEntity{ power_source = {nature=true}, name = " of precognition", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 25, wielder = { @@ -226,7 +226,7 @@ newEntity{ power_source = {arcane=true}, name = " of knowledge", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 20, wielder = { @@ -243,7 +243,7 @@ newEntity{ power_source = {technique=true}, name = " of might", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 20, wielder = { @@ -259,7 +259,7 @@ newEntity{ power_source = {technique=true}, name = " of trickery", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 13, cost = 20, wielder = { @@ -275,7 +275,7 @@ newEntity{ power_source = {nature=true}, name = "warlord's ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 50, wielder = { @@ -291,7 +291,7 @@ newEntity{ power_source = {technique=true}, name = "defender's ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 50, wielder = { @@ -305,7 +305,7 @@ newEntity{ power_source = {technique=true}, name = "dragonslayer's ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 50, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/light-armor.lua b/game/modules/tome/data/general/objects/egos/light-armor.lua index 039047ead7..dceff3c709 100644 --- a/game/modules/tome/data/general/objects/egos/light-armor.lua +++ b/game/modules/tome/data/general/objects/egos/light-armor.lua @@ -26,7 +26,7 @@ newEntity{ power_source = {technique=true}, name = "troll-hide ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 14, wielder = { @@ -38,7 +38,7 @@ newEntity{ power_source = {technique=true}, name = "nimble ", prefix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 22, cost = 35, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/lite.lua b/game/modules/tome/data/general/objects/egos/lite.lua index a035ba6608..4847e3b545 100644 --- a/game/modules/tome/data/general/objects/egos/lite.lua +++ b/game/modules/tome/data/general/objects/egos/lite.lua @@ -47,7 +47,7 @@ newEntity{ power_source = {nature=true}, name = " of the sun", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 9, cost = 10, wielder = { @@ -164,7 +164,7 @@ newEntity{ power_source = {nature=true}, name = "reflective ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 30, wielder = { @@ -180,7 +180,7 @@ newEntity{ power_source = {nature=true}, name = "nightwalker's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 50, wielder = { @@ -196,7 +196,7 @@ newEntity{ power_source = {arcane=true}, name = "ethereal ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 50, encumber = -1, @@ -212,7 +212,7 @@ newEntity{ power_source = {arcane=true}, name = " of illusion", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 50, wielder = { @@ -227,7 +227,7 @@ newEntity{ power_source = {arcane=true}, name = " of corpselight", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 50, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/massive-armor.lua b/game/modules/tome/data/general/objects/egos/massive-armor.lua index c8d13dbd76..0f8806a604 100644 --- a/game/modules/tome/data/general/objects/egos/massive-armor.lua +++ b/game/modules/tome/data/general/objects/egos/massive-armor.lua @@ -26,7 +26,7 @@ newEntity{ power_source = {nature=true}, name = " of the dragon", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/rings.lua b/game/modules/tome/data/general/objects/egos/rings.lua index ea8e2c8d2d..71a204bd27 100644 --- a/game/modules/tome/data/general/objects/egos/rings.lua +++ b/game/modules/tome/data/general/objects/egos/rings.lua @@ -247,7 +247,7 @@ newEntity{ power_source = {technique=true}, name = "sneakthief's ", prefix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 20, wielder = { @@ -263,7 +263,7 @@ newEntity{ power_source = {technique=true}, name = "gladiator's ", prefix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 20, wielder = { @@ -279,7 +279,7 @@ newEntity{ power_source = {arcane=true}, name = "conjurer's ", prefix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 20, wielder = { @@ -295,7 +295,7 @@ newEntity{ power_source = {technique=true}, name = " of tenacity", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 50, wielder = { @@ -310,7 +310,7 @@ newEntity{ power_source = {arcane=true}, name = " of evocation", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 50, wielder = { @@ -324,7 +324,7 @@ newEntity{ power_source = {nature=true}, name = " of life", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 12, cost = 50, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/robe.lua b/game/modules/tome/data/general/objects/egos/robe.lua index 9525c8577f..a1f291671b 100644 --- a/game/modules/tome/data/general/objects/egos/robe.lua +++ b/game/modules/tome/data/general/objects/egos/robe.lua @@ -99,7 +99,7 @@ newEntity{ power_source = {arcane=true}, name = " of power", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 15, wielder = { @@ -165,7 +165,7 @@ newEntity{ power_source = {arcane=true}, name = "bilefire ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -187,7 +187,7 @@ newEntity{ power_source = {arcane=true}, name = "timelord's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -209,7 +209,7 @@ newEntity{ power_source = {nature=true}, name = "stormlord's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -231,7 +231,7 @@ newEntity{ power_source = {nature=true}, name = "radiant ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 50, wielder = { @@ -251,7 +251,7 @@ newEntity{ power_source = {arcane=true}, name = " of Angolwen", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { @@ -270,7 +270,7 @@ newEntity{ power_source = {arcane=true}, name = " of Linaniil", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { @@ -286,7 +286,7 @@ newEntity{ power_source = {nature=true}, name = " of life", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 60, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/shield.lua b/game/modules/tome/data/general/objects/egos/shield.lua index f7a055de34..89b73fba20 100644 --- a/game/modules/tome/data/general/objects/egos/shield.lua +++ b/game/modules/tome/data/general/objects/egos/shield.lua @@ -167,7 +167,7 @@ newEntity{ power_source = {technique=true}, name = " of crushing", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 20, wielder = { @@ -181,7 +181,7 @@ newEntity{ power_source = {nature=true}, name = " of resistance", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 20, wielder = { @@ -198,7 +198,7 @@ newEntity{ power_source = {nature=true}, name = " of the night", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 20, wielder = { @@ -214,7 +214,7 @@ newEntity{ power_source = {technique=true}, name = "impervious ", prefix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 40, wielder = { @@ -230,7 +230,7 @@ newEntity{ power_source = {nature=true}, name = "spellplated ", prefix=true, instant_resolve=true, level_range = {10, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 18, wielder = { @@ -246,7 +246,7 @@ newEntity{ power_source = {nature=true}, name = "blood-runed ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 30, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/sling.lua b/game/modules/tome/data/general/objects/egos/sling.lua index 3b3d7e4463..49a30bd7eb 100644 --- a/game/modules/tome/data/general/objects/egos/sling.lua +++ b/game/modules/tome/data/general/objects/egos/sling.lua @@ -76,7 +76,7 @@ newEntity{ power_source = {technique=true}, name = " of great speed", suffix=true, instant_resolve=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 10, cost = 60, combat={physspeed = -0.2}, @@ -86,7 +86,7 @@ newEntity{ power_source = {technique=true}, name = "halfling ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 24, cost = 40, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/staves.lua b/game/modules/tome/data/general/objects/egos/staves.lua index 17dd337b15..eda5e90164 100644 --- a/game/modules/tome/data/general/objects/egos/staves.lua +++ b/game/modules/tome/data/general/objects/egos/staves.lua @@ -62,7 +62,7 @@ newEntity{ power_source = {arcane=true}, name = " of wizardry", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 45, wielder = { @@ -222,7 +222,7 @@ newEntity{ power_source = {arcane=true}, name = " of blasting", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 45, wielder = { @@ -242,7 +242,7 @@ newEntity{ power_source = {arcane=true}, name = " of warding", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 45, wielder = { @@ -261,7 +261,7 @@ newEntity{ power_source = {arcane=true}, name = " of channeling", suffix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 45, wielder = { @@ -276,7 +276,7 @@ newEntity{ power_source = {nature=true}, name = "lifebinding ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 35, wielder = { @@ -293,7 +293,7 @@ newEntity{ power_source = {arcane=true}, name = "infernal ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 35, wielder = { @@ -310,7 +310,7 @@ newEntity{ power_source = {arcane=true}, name = "chronomancer's ", prefix=true, instant_resolve=true, level_range = {30, 50}, - greater_ego = true, + greater_ego = 1, rarity = 16, cost = 35, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/weapon.lua b/game/modules/tome/data/general/objects/egos/weapon.lua index 1ee822cff2..7ebf2c074f 100644 --- a/game/modules/tome/data/general/objects/egos/weapon.lua +++ b/game/modules/tome/data/general/objects/egos/weapon.lua @@ -100,7 +100,7 @@ newEntity{ power_source = {arcane=true}, name = "elemental ", prefix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 25, cost = 35, combat = { @@ -153,7 +153,7 @@ newEntity{ power_source = {technique=true}, name = " of rage", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 25, cost = 35, wielder = { @@ -176,7 +176,7 @@ newEntity{ power_source = {arcane=true}, name = " of corruption", suffix=true, instant_resolve=true, level_range = {35, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 35, combat = { @@ -228,7 +228,7 @@ newEntity{ power_source = {technique=true}, name = " of ruin", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 25, wielder = { @@ -246,7 +246,7 @@ newEntity{ power_source = {technique=true}, name = "quick ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 25, cost = 30, wielder = { @@ -263,7 +263,7 @@ newEntity{ power_source = {arcane=true}, name = "mystic ", prefix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 20, cost = 30, wielder = { diff --git a/game/modules/tome/data/general/objects/egos/wizard-hat.lua b/game/modules/tome/data/general/objects/egos/wizard-hat.lua index 5a9749f8e4..c38f2f738e 100644 --- a/game/modules/tome/data/general/objects/egos/wizard-hat.lua +++ b/game/modules/tome/data/general/objects/egos/wizard-hat.lua @@ -71,7 +71,7 @@ newEntity{ power_source = {arcane=true}, name = " of greater telepathy", suffix=true, level_range = {40, 50}, - greater_ego = true, + greater_ego = 1, rarity = 120, cost = 25, wielder = { @@ -116,7 +116,7 @@ newEntity{ power_source = {arcane=true}, name = "arcanist's ", prefix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 18, cost = 20, wielder = { @@ -213,7 +213,7 @@ newEntity{ power_source = {arcane=true}, name = " of knowledge", suffix=true, instant_resolve=true, level_range = {15, 50}, - greater_ego = true, + greater_ego = 1, rarity = 13, cost = 20, wielder = { @@ -229,7 +229,7 @@ newEntity{ power_source = {arcane=true}, name = " of the Spellblaze", suffix=true, instant_resolve=true, level_range = {20, 50}, - greater_ego = true, + greater_ego = 1, rarity = 15, cost = 20, wielder = { @@ -246,7 +246,7 @@ newEntity{ power_source = {nature=true}, name = "naturalist's ", prefix=true, instant_resolve=true, level_range = {10, 50}, - greater_ego = true, + greater_ego = 1, rarity = 11, cost = 15, wielder = { @@ -262,7 +262,7 @@ newEntity{ power_source = {nature=true}, name = "soothing ", prefix=true, instant_resolve=true, level_range = {25, 50}, - greater_ego = true, + greater_ego = 1, rarity = 17, cost = 20, wielder = { diff --git a/game/modules/tome/data/zones/town-iron-council/grids.lua b/game/modules/tome/data/zones/town-iron-council/grids.lua index 1cfa068e90..d90b1e7f5a 100644 --- a/game/modules/tome/data/zones/town-iron-council/grids.lua +++ b/game/modules/tome/data/zones/town-iron-council/grids.lua @@ -36,8 +36,8 @@ newEntity{ } end -newEntity{ base = "DOWN", define_as = "ESCAPE_REKNOR", change_zone="reknor-escape" } -newEntity{ base = "DOWN", define_as = "DEEP_BELLOW", change_zone="deep-bellow" } +newEntity{ base = "DOWN", define_as = "ESCAPE_REKNOR", name="Escape route from Reknor", change_zone="reknor-escape" } +newEntity{ base = "DOWN", define_as = "DEEP_BELLOW", name="The Deep Bellow", change_zone="deep-bellow" } newEntity{ define_as = "STATUE", display = '@', image="terrain/oldstone_floor.png", add_displays = {mod.class.Grid.new{image="terrain/statue1.png"}}, -- GitLab