diff --git a/game/modules/tome/data/general/objects/boss-artifacts.lua b/game/modules/tome/data/general/objects/boss-artifacts.lua
index d70faccad0c0562f6962e964b234f94322525e24..c0242f954291c1219148fd5bf67f60f239fdcbea 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts.lua
@@ -381,7 +381,7 @@ newEntity{ base = "BASE_GEM",
unique = true, define_as = "PETRIFIED_WOOD",
unided_name = "burned piece of wood",
name = "Petrified Wood", subtype = "black",
- color = colors.WHITE, image="object/bloodstone.png",
+ color = colors.WHITE, image = "object/artifact/petrified_wood.png",
level_range = {35, 45},
rarity = 280,
desc = [[A piece of the scorched wood taken from the remains of Snaproot.]],
@@ -521,7 +521,7 @@ newEntity{ base = "BASE_STAFF",
newEntity{ base = "BASE_AMULET",
power_source = {arcane=true},
define_as = "AMULET_DREAD", rarity=false,
- name = "Choker of Dread", unique=true,
+ name = "Choker of Dread", unique=true, image = "object/artifact/amulet_choker_of_dread.png",
unided_name = "dark amulet", color=colors.LIGHT_DARK,
desc = [[The evilness of undeath radiates from this amulet.]],
level_range = {20, 28},
@@ -778,39 +778,12 @@ newEntity{ base = "BASE_GLOVES", define_as = "FLAMEWROUGHT",
}
-- The crystal set
-local crystal_activate_pair = function(w, a, who)
- local DamageType = require "engine.DamageType"
- w.paired = {}
- a.paired = {}
-
- -- The weapon's bonuses
- w.talent_on_spell = { {chance=10, talent="T_MANATHRUST", level=3} }
- w.combat.talent_on_hit = { T_MANATHRUST = {level=3, chance=10} }
- w.paired._special1 = {who, "combat_spellcrit", who:addTemporaryValue("combat_spellcrit", 10)}
- w.paired._special2 = {who, "combat_physcrit", who:addTemporaryValue("combat_physcrit", 10)}
- w.paired._special3 = {who, "resists_pen", who:addTemporaryValue("resists_pen", {[DamageType.ARCANE]=20})}
- -- The armor's bonuses
- a.paired._special1 = {who, "stun_immune", who:addTemporaryValue("stun_immune", 0.5)}
- a.paired._special2 = {who, "blind_immune", who:addTemporaryValue("blind_immune", 0.5)}
- game.logPlayer(who, "#GOLD#As the crystalline weapon and armour are brought together, they begin to emit a constant humming.")
-end
-local crystal_deactivate_pair = function(w, a, who)
- -- Remove the paired bonusese
- for k, id in pairs(w) do id[1]:removeTemporaryValue(id[2], id[3]) end
- for k, id in pairs(a) do id[1]:removeTemporaryValue(id[2], id[3]) end
- w.talent_on_spell = nil
- w.combat.talent_on_hit = nil
- w.paired = nil
- a.paired = nil
- game.logPlayer(who, "#GOLD#The humming from the crystalline artifacts fades as they are separated.")
-end
-
newEntity{ base = "BASE_GEM", define_as = "CRYSTAL_FOCUS",
power_source = {arcane=true},
unique = true,
unided_name = "scintillating crystal",
name = "Crystal Focus", subtype = "multi-hued",
- color = colors.WHITE, image="object/ametrine.png",
+ color = colors.WHITE, image = "object/artifact/crystal_focus.png",
level_range = {5, 12},
desc = [[This crystal radiates the power of the Spellblaze itself.]],
rarity = 200,
@@ -872,7 +845,7 @@ newEntity{ base = "BASE_GEM", define_as = "CRYSTAL_HEART",
unique = true,
unided_name = "coruscating crystal",
name = "Crystal Heart", subtype = "multi-hued",
- color = colors.RED, image="object/ruby.png",
+ color = colors.RED, image = "object/artifact/crystal_heart.png",
level_range = {35, 42},
desc = [[This crystal is huge, easily the size of your head. It sparkles brilliantly almost of its own accord.]],
rarity = 250,
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index deb26115124e839932f50ccfa3bd6f38e7e8429b..705a55c98af07b12da86b7a004a571cdbf40ceba 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -218,7 +218,7 @@ newEntity{ define_as = "ORB_ELEMENTS",
unided_name = "orb of command",
name = "Elemental Orb (Orb of Command)",
level_range = {50, 50},
- display = "*", color=colors.VIOLET, image = "object/pearl.png",
+ display = "*", color=colors.VIOLET, image = "object/artifact/elemental_orb.png",
encumber = 1,
desc = [[Flames swirl on the icy surface of this orb.]],
@@ -247,7 +247,7 @@ newEntity{ define_as = "ORB_DESTRUCTION",
unided_name = "orb of command",
name = "Orb of Destruction (Orb of Command)",
level_range = {50, 50},
- display = "*", color=colors.VIOLET, image = "object/pearl.png",
+ display = "*", color=colors.VIOLET, image = "object/artifact/orb_destruction.png",
encumber = 1,
desc = [[Visions of death and destruction fill your mind as you lift this orb.]],
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index 17f31abe8bed46f515b080b92c061cd5f21ab55c..e38518760e3290846524be99b60f44fe9cdd6649 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -229,7 +229,7 @@ newEntity{ base = "BASE_RING",
newEntity{ base = "BASE_RING",
power_source = {nature=true},
unique = true,
- name = "Ring of the Dead", color = colors.DARK_GREY,
+ name = "Ring of the Dead", color = colors.DARK_GREY, image = "object/artifact/jewelry_ring_of_the_dead.png",
unided_name = "dull black ring",
desc = [[This ring is imbued with powers from beyond the grave. It is said that those who wear it may find a new path when all other roads turn dim.]],
level_range = {35, 42},
@@ -418,7 +418,7 @@ newEntity{ base = "BASE_LITE",
power_source = {arcane=true},
unique = true,
name = "Dúathedlen Heart",
- unided_name = "a dark, fleshy mass",
+ unided_name = "a dark, fleshy mass", image = "object/artifact/dark_red_heart.png",
level_range = {30, 40},
color = colors.RED,
encumber = 1,
@@ -517,7 +517,7 @@ newEntity{ base = "BASE_LONGBOW",
newEntity{ base = "BASE_LONGBOW",
power_source = {arcane=true, nature=true},
- name = "Corpsebow", unided_name = "rotting longbow", unique=true,
+ name = "Corpsebow", unided_name = "rotting longbow", unique=true, image = "object/artifact/bow_corpsebow.png",
desc = [[A lost artifact of the Age of Dusk, the Corpsebow is filled with a lingering essence of that era's terrible plagues. Those struck by arrows fired from its rotten string find themselves afflicted by echoes of ancient sickness.]],
level_range = {10, 20},
rarity = 200,
@@ -956,7 +956,7 @@ newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_STAR",
newEntity{ base = "BASE_RING",
power_source = {technique=true},
unique = true,
- name = "Ring of the War Master", color = colors.DARK_GREY,
+ name = "Ring of the War Master", color = colors.DARK_GREY, image = "object/artifact/ring_of_war_master.png",
unided_name = "blade-edged ring",
desc = [[A blade-edged ring that radiates power. As you put it on, strange thoughts of pain and destruction come to your mind.]],
level_range = {15, 30},
@@ -1512,7 +1512,7 @@ newEntity{ base = "BASE_BATTLEAXE",
power_source = {technique=true},
unique = true,
unided_name = "crude iron battle axe",
- name = "Crude Iron Battle Axe of Kroll", color = colors.GREY,
+ name = "Crude Iron Battle Axe of Kroll", color = colors.GREY, image = "object/artifact/crude_iron_battleaxe_of_kroll.png",
desc = [[Made in times before the Dwarves learned beautiful craftsmanship, the rough appearance of this axe belies its great power. Only Dwarves may harness its true strength, however.]],
require = { stat = { str=50 }, },
level_range = {39, 46},
@@ -1547,7 +1547,7 @@ newEntity{ base = "BASE_BATTLEAXE",
power_source = {technique=true},
unique = true,
unided_name = "viciously sharp battle axe",
- name = "Drake's Bane",
+ name = "Drake's Bane", image = "object/artifact/axe_drakes_bane.png",
color = colors.RED,
desc = [[The killing of Kroltar, mightiest of wyrms, took seven months and the lives of 20,000 dwarven warriors. Finally the beast was worn down and mastersmith Gruxim, standing atop the bodies of his fallen comrades, was able slit its throat with this axe crafted purely for the purpose of penetrating the wyrm's hide.]],
require = { stat = { str=45 }, },
@@ -2011,10 +2011,12 @@ newEntity{ base = "BASE_WARAXE",
power_source = {technique=true},
unique = true,
rarity = false, unided_name = "razor sharp war axe",
- name = "Razorblade, the Cursed Waraxe", color = colors.LIGHT_BLUE,
+ name = "Razorblade, the Cursed Waraxe", color = colors.LIGHT_BLUE, image = "object/artifact/razorblade_the_cursed_waraxe.png",
desc = [[This mighty axe can cleave through armour like the sharpest swords, yet hit with all the impact of a heavy club.
It is said the wielder will slowly grow mad. This, however, has never been proven - no known possessor of this item has lived to tell the tale.]],
require = { stat = { str=42 }, },
+ level_range = {40, 50},
+ rarity = 250,
material_level = 5,
combat = {
dam = 58,
@@ -2072,7 +2074,7 @@ newEntity{ base = "BASE_LONGSWORD", define_as = "ART_PAIR_TWSWORD",
newEntity{ base = "BASE_KNIFE", define_as = "ART_PAIR_TWDAG",
power_source = {arcane=true},
unique = true,
- name = "Dagger of the Past",
+ name = "Dagger of the Past", image = "object/artifact/dagger_of_the_past.png",
unided_name = "rusted blade",
desc = [[Legend has it this blade is one of a pair; twin blades forged in the earliest of days of the Wardens. To an untrained wielder it is less than perfect; to a Warden, it represents the opportunity to learn from the mistakes of the past.]],
level_range = {20, 30},
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/amulet_choker_of_dread.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/amulet_choker_of_dread.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4b1d7d55f2879db80dc6e6babdbe5b58701c748
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/amulet_choker_of_dread.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/axe_drakes_bane.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/axe_drakes_bane.png
new file mode 100644
index 0000000000000000000000000000000000000000..73d474bfd13611905bdb9765681dc6d7de43316c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/axe_drakes_bane.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/bow_corpsebow.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/bow_corpsebow.png
new file mode 100644
index 0000000000000000000000000000000000000000..68a750de348a1e9072b0e3605e4c4ac39c172a32
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/bow_corpsebow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/crude_iron_battleaxe_of_kroll.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/crude_iron_battleaxe_of_kroll.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a60099e723291abbd885e9a7867928d33f27fc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/crude_iron_battleaxe_of_kroll.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_focus.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_focus.png
new file mode 100644
index 0000000000000000000000000000000000000000..41fe1f16f46b82422dd87dcf42c6eaf08e2b1f52
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_focus.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_heart.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_heart.png
new file mode 100644
index 0000000000000000000000000000000000000000..b296a8037244d0a29eaec57cf3b83c0d014098f5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/crystal_heart.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/dagger_of_the_past.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/dagger_of_the_past.png
new file mode 100644
index 0000000000000000000000000000000000000000..459f90e18638822b4705532f33fd56def0aec21c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/dagger_of_the_past.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/dark_red_heart.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/dark_red_heart.png
new file mode 100644
index 0000000000000000000000000000000000000000..183e08b97b99665016e869da68bded5685b50a44
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/dark_red_heart.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/eldritch_pearl.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/eldritch_pearl.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c508e61fdab4c3b429146d63236c49764622f5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/eldritch_pearl.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/elemental_orb.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/elemental_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..653066eda9d79564352589413df1bd42e7723dc4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/elemental_orb.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/jewelry_ring_of_the_dead.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/jewelry_ring_of_the_dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea60eafdfdcf597b16add93945155ccfbd4275a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/jewelry_ring_of_the_dead.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/petrified_wood.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/petrified_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec92f90b0860b05168d7b441b41dd3f092540c70
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/petrified_wood.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/razorblade_the_cursed_waraxe.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/razorblade_the_cursed_waraxe.png
new file mode 100644
index 0000000000000000000000000000000000000000..22bea49c7017b5bd7a49cafd744b0213dc2ef9cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/razorblade_the_cursed_waraxe.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/ring_of_war_master.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/ring_of_war_master.png
new file mode 100644
index 0000000000000000000000000000000000000000..6798f102d1b8fa3642f795b8811db82eee278027
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/ring_of_war_master.png differ
diff --git a/game/modules/tome/data/zones/temple-of-creation/objects.lua b/game/modules/tome/data/zones/temple-of-creation/objects.lua
index dd0875c0673e9569bfbdcf93a076b101ec92fbd9..939bc61e1ddc3de6f01110a9b1d6e3ee94692507 100644
--- a/game/modules/tome/data/zones/temple-of-creation/objects.lua
+++ b/game/modules/tome/data/zones/temple-of-creation/objects.lua
@@ -28,7 +28,7 @@ newEntity{ base = "BASE_LITE",
power_source = {arcane=true},
define_as = "ELDRITCH_PEARL",
unided_name = "bright pearl",
- name = "Eldritch Pearl", unique=true,
+ name = "Eldritch Pearl", unique=true, image = "object/artifact/eldritch_pearl.png",
display ='*', color = colors.AQUAMARINE,
desc = [[Thousands of years spent inside the temple of creation have infused this pearl with the fury of rushing water. It pulses light.]],