diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index ed5b552c92933d5ebb828d13d1866608dfcfe2ad..faf42cfea0191f0ad1fa0945593ce0627d1368f9 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -689,9 +689,9 @@ function _M:setupCommands()
end,
[{"_g","ctrl"}] = function()
if config.settings.tome.cheat then
--- local m = game.zone:makeEntityByName(game.level, "actor", "TEST")
--- game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y+1)
- self:changeLevel(5, "crypt-kryl-feijan")
+ local m = game.zone:makeEntityByName(game.level, "actor", "TEST")
+ game.zone:addEntity(game.level, m, "actor", game.player.x, game.player.y+1)
+-- self:changeLevel(5, "crypt-kryl-feijan")
end
end,
}
diff --git a/game/modules/tome/data/general/npcs/ghost.lua b/game/modules/tome/data/general/npcs/ghost.lua
index b90bc54ab5099040a65758d455e717c240559250..e8cabd7d62905ecb9916b49ef28eba854192f59e 100644
--- a/game/modules/tome/data/general/npcs/ghost.lua
+++ b/game/modules/tome/data/general/npcs/ghost.lua
@@ -71,7 +71,7 @@ newEntity{ base = "BASE_NPC_GHOST",
}
newEntity{ base = "BASE_NPC_GHOST",
- name = "dreadmaster", color=colors.YELLOW, image="npc/dreadmaster.png",
+ name = "dreadmaster", color=colors.YELLOW, image="npc/dreadmaster.png", define_as = "TEST",
desc = [[It is an unlife of power almost unequalled. An affront to existence, its very touch abuses and disrupts the flow of life, and its unearthly limbs, of purest black, crush rock and flesh with ease.]],
level_range = {32, nil}, exp_worth = 1,
rarity = 15,
@@ -85,13 +85,13 @@ newEntity{ base = "BASE_NPC_GHOST",
summon = {{type="undead", subtype="ghost", name="dead", number=3, hasxp=false}, },
resolvers.talents{
- [Talents.T_SUMMON]=1,
- [Talents.T_PHASE_DOOR]=2,
- [Talents.T_BLUR_SIGHT]=4,
+-- [Talents.T_SUMMON]=1,
+-- [Talents.T_PHASE_DOOR]=2,
+-- [Talents.T_BLUR_SIGHT]=4,
[Talents.T_DISPERSE_MAGIC]=3,
- [Talents.T_SILENCE]=2,
- [Talents.T_MIND_DISRUPTION]=3,
- [Talents.T_BURNING_HEX]=5,
+-- [Talents.T_SILENCE]=2,
+-- [Talents.T_MIND_DISRUPTION]=3,
+-- [Talents.T_BURNING_HEX]=5,
},
}
diff --git a/game/modules/tome/data/general/npcs/horror.lua b/game/modules/tome/data/general/npcs/horror.lua
index 49b56fb01f3351e73dc1e1dd831dd942f40e165b..ae7a1ec56d8a815d8b9cc3b5439e2e0a52cd8c65 100644
--- a/game/modules/tome/data/general/npcs/horror.lua
+++ b/game/modules/tome/data/general/npcs/horror.lua
@@ -42,7 +42,7 @@ newEntity{
}
newEntity{ base = "BASE_NPC_HORROR",
- name = "worm that walks", color=colors.SANDY_BROWN, define_as="TEST",
+ name = "worm that walks", color=colors.SANDY_BROWN,
desc = [[A maggot filled robe with a vaguely humanoid shape.]],
level_range = {20, nil}, exp_worth = 1,
rarity = 5,
@@ -155,7 +155,7 @@ newEntity{ base = "BASE_NPC_HORROR",
------------------------------------------------------------------------
-- Headless horror and its eyes
------------------------------------------------------------------------
-newEntity{ base = "BASE_NPC_HORROR", define_as = "TEST",
+newEntity{ base = "BASE_NPC_HORROR",
name = "headless horror", color=colors.TAN,
desc ="A headless gangly humanoid with a large distended stomach.",
level_range = {30, nil}, exp_worth = 1,
diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index 16c24183c16d613319578aa5dd0cc1be184de0b4..ef3de7ecad16becd1234bccf4c284d49a5853883 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -23,7 +23,7 @@ local Talents = require "engine.interface.ActorTalents"
-- This file describes artifacts associated with a boss of the game, they have a high chance of dropping their respective ones, but they can still be found elsewhere
newEntity{ base = "BASE_LONGSWORD",
- define_as = "LONGSWORD_WINTERTIDE", rarity=false, unided_name = "glittering longsword",
+ define_as = "LONGSWORD_WINTERTIDE", rarity=false, unided_name = "glittering longsword", image="object/artifact/wintertide.png",
name = "Wintertide", unique=true,
desc = [[The air seems to freeze around the blade of this sword, draining all heat from the area.
It is said the Conclave created this weapon for their warmaster during the dark times of the first allure war.]],
@@ -59,7 +59,7 @@ It is said the Conclave created this weapon for their warmaster during the dark
}
newEntity{ base = "BASE_LITE", define_as = "WINTERTIDE_PHIAL",
- unided_name = "phial filled with darkness", unique = true,
+ unided_name = "phial filled with darkness", unique = true, image="object/artifact/wintertide_phial.png",
name = "Wintertide Phial", color=colors.DARK_GREY,
desc = [[This phial seems filled with darkness, yet it cleanses your thoughts.]],
level_range = {1, 10},
@@ -76,7 +76,7 @@ newEntity{ base = "BASE_LITE", define_as = "WINTERTIDE_PHIAL",
newEntity{ base = "BASE_AMULET",
define_as = "FIERY_CHOKER", rarity=false,
- name = "Fiery Choker", unique=true,
+ name = "Fiery Choker", unique=true, image="object/artifact/fiery_chocker.png",
desc = [[A choker made of pure flame, forever shifting patterns around the neck of its wearer. Its fire seems to not harm the wearer.]],
level_range = {32, 42},
rarity = 220,
@@ -100,7 +100,7 @@ newEntity{ base = "BASE_AMULET",
-- Artifact, droped by Rantha
newEntity{ base = "BASE_LEATHER_BOOT",
define_as = "FROST_TREADS",
- name = "Frost Treads", unique=true,
+ name = "Frost Treads", unique=true, image="object/artifact/frost_threads.png",
desc = [[A pair of leather boots. Cold to the touch, they radiate a cold blue light.]],
require = { stat = { dex=16 }, },
level_range = {10, 18},
@@ -202,7 +202,7 @@ newEntity{ base = "BASE_LIGHT_ARMOR",
newEntity{ base = "BASE_RING",
define_as = "PRIDE_GLORY", rarity=false,
- name = "Glory of the Pride", unique=true,
+ name = "Glory of the Pride", unique=true, image="object/artifact/glory_of_the_pride.png",
desc = [[The most prized treasure of the Battlemaster of the Pride, Grushnak. This gold ring is incribed in the orc tongue, the black speech.]],
unided_name = "deep black ring",
level_range = {40, 50},
@@ -228,7 +228,7 @@ newEntity{ base = "BASE_RING",
newEntity{ base = "BASE_HELM",
define_as = "HELM_OF_GARKUL",
- name = "Steel Helm of Garkul", unique=true,
+ name = "Steel Helm of Garkul", unique=true, image="object/artifact/helm_of_garkul.png",
desc = [[A great helm that belonged to Garkul the Devourer, one of the greatest orcs to live.]],
require = { stat = { str=16 }, },
level_range = {12, 22},
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index 6ad0817f36413791f2b77157d26392eab4ebc340..8afeac56e4a0ae28b231c5a1d756298bfc15b2d5 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -27,7 +27,7 @@ newEntity{ define_as = "STAFF_ABSORPTION",
unided_name = "dark runed staff",
name = "Staff of Absorption",
level_range = {30, 30},
- display = "\\", color=colors.VIOLET, image = "object/staff_dragonbone.png",
+ display = "\\", color=colors.VIOLET, image = "object/artifact/staff_absorption.png",
encumber = 7,
desc = [[Carved with runes of power, this staff seems to have been made long ago. Yet it bears no signs of tarnishment.
Light around it seems to dim and you can feel its tremendous power simply by touching it.]],
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index d15fe43fd370bee21566a3eb4d790dbf361702bd..94a8b129b1dba14dde791fbe653a94d189af0529 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -235,7 +235,7 @@ newEntity{ base = "BASE_RING",
newEntity{ base = "BASE_LITE",
unique = true,
- name = "Summertide Phial",
+ name = "Summertide Phial", image="object/artifact/summertide_phial.png",
unided_name = "glowing phial",
level_range = {1, 10},
color=colors.YELLOW,
diff --git a/game/modules/tome/data/gfx/object/staff_absorption.png b/game/modules/tome/data/gfx/object/artifact/staff_absorption.png
similarity index 100%
rename from game/modules/tome/data/gfx/object/staff_absorption.png
rename to game/modules/tome/data/gfx/object/artifact/staff_absorption.png
diff --git a/game/modules/tome/data/zones/high-peak/objects.lua b/game/modules/tome/data/zones/high-peak/objects.lua
index 9a10c13a0b7011b48f41b40f899ec39517030f8b..18d6b8dd6a26ec21c6d90d5f53e3035f69b0059f 100644
--- a/game/modules/tome/data/zones/high-peak/objects.lua
+++ b/game/modules/tome/data/zones/high-peak/objects.lua
@@ -26,7 +26,7 @@ local Stats = require "engine.interface.ActorStats"
newEntity{ define_as = "STAFF_ABSORPTION_AWAKENED", base="BASE_STAFF",
unique = true, godslayer=true,
name = "Awakened Staff of Absorption", identified=true,
- display = "\\", color=colors.VIOLET, image = "object/staff_absorption.png",
+ display = "\\", color=colors.VIOLET, image = "object/artifact/staff_absorption.png",
encumber = 7,
desc = [[Carved with runes of power, this staff seems to have been made long ago. Yet it bears no signs of tarnishment.
Light around it seems to dim and you can feel its tremendous power simply by touching it.