diff --git a/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_bone_giant.png b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_bone_giant.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f1cbc69b29d13194bccb77695439130b685385
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_bone_giant.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_eternal_bone_giant.png b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_eternal_bone_giant.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e5c039b0ba6195a2c473bcaa287035ea9b6f94e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_eternal_bone_giant.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_heavy_bone_giant.png b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_heavy_bone_giant.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8e9b2ffbbd854ce66d43cf641ecc48d19629308
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/lord_of_skulls_heavy_bone_giant.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_giant_runed_bone_giant.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_giant_runed_bone_giant.png
index 53263d716d6a86aa0357458ad0481488fef6cc37..775489a30e9e8f06cec6215a65f5088372e3ffad 100644
Binary files a/game/modules/tome/data/gfx/shockbolt/npc/undead_giant_runed_bone_giant.png and b/game/modules/tome/data/gfx/shockbolt/npc/undead_giant_runed_bone_giant.png differ
diff --git a/game/modules/tome/data/talents/spells/master-of-bones.lua b/game/modules/tome/data/talents/spells/master-of-bones.lua
index b4e0a596220c3accd435e346dba3cb4ef08b6260..e28d4ad5447f3c7c8a224fb5cd89510ec75844bc 100644
--- a/game/modules/tome/data/talents/spells/master-of-bones.lua
+++ b/game/modules/tome/data/talents/spells/master-of-bones.lua
@@ -391,7 +391,7 @@ newTalent{
blind_immune = 1,
fear_immune = 1,
stun_immune = 1,
- is_bone_giant = true,
+ is_bone_giant = "bone_giant",
see_invisible = resolvers.mbonus(15, 5),
undead = 1,
name = "bone giant", color=colors.WHITE,
@@ -404,7 +404,7 @@ newTalent{
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
resolvers.talents{ T_BONE_ARMOUR={base=3, every=10, max=5}, T_STUN={base=3, every=10, max=5}, },
},
- h_bone_giant = {
+ e_bone_giant = {
type = "undead", subtype = "giant",
blood_color = colors.GREY,
display = "K",
@@ -427,12 +427,12 @@ newTalent{
blind_immune = 1,
fear_immune = 1,
stun_immune = 1,
- is_bone_giant = true,
+ is_bone_giant = "e_bone_giant",
see_invisible = resolvers.mbonus(15, 5),
undead = 1,
- name = "heavy bone giant", color=colors.RED,
+ name = "eternal bone giant", color=colors.RED,
desc=_t[[A towering creature, made from the bones of hundreds of dead bodies. It is covered by an unholy aura.]],
- resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_heavy_bone_giant.png", display_h=2, display_y=-1}}},
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_eternal_bone_giant.png", display_h=2, display_y=-1}}},
level_range = {1, nil}, exp_worth = 0,
max_life = resolvers.rngavg(100,120),
combat_armor = 20, combat_def = 0,
@@ -440,7 +440,7 @@ newTalent{
melee_project = {[DamageType.BLIGHT]=resolvers.mbonus(15, 5)},
resolvers.talents{ T_BONE_ARMOUR={base=3, every=10, max=5}, T_THROW_BONES={base=4, every=10, max=7}, T_STUN={base=3, every=10, max=5}, },
},
- e_bone_giant = {
+ h_bone_giant = {
type = "undead", subtype = "giant",
blood_color = colors.GREY,
display = "K",
@@ -463,12 +463,12 @@ newTalent{
blind_immune = 1,
fear_immune = 1,
stun_immune = 1,
- is_bone_giant = true,
+ is_bone_giant = "h_bone_giant",
see_invisible = resolvers.mbonus(15, 5),
undead = 1,
- name = "eternal bone giant", color=colors.GREY,
+ name = "heavy bone giant", color=colors.GREY,
desc=_t[[A towering creature, made from the bones of hundreds of dead bodies. It is covered by an unholy aura.]],
- resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_eternal_bone_giant.png", display_h=2, display_y=-1}}},
+ resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_heavy_bone_giant.png", display_h=2, display_y=-1}}},
level_range = {1, nil}, exp_worth = 0,
max_life = resolvers.rngavg(100,120),
combat_armor = 40, combat_def = 20,
@@ -506,8 +506,8 @@ newTalent{
end
local def = t.minions_list.bone_giant
- if self:getTalentLevel(t) >= 6 then def = t.minions_list.e_bone_giant
- elseif self:getTalentLevel(t) >= 3 then def = t.minions_list.h_bone_giant
+ if self:getTalentLevel(t) >= 6 then def = t.minions_list.h_bone_giant
+ elseif self:getTalentLevel(t) >= 3 then def = t.minions_list.e_bone_giant
end
necroSetupSummon(self, def, pos.x, pos.y, lev, nil, true)
@@ -518,8 +518,8 @@ newTalent{
info = function(self, t)
return ([[Every army of undead minions needs its spearhead. To that end you combine 3 skeleton minions into a bone giant of level %d.
The minions used are automatically selected by taking the weaker and older ones first and a Lord of Skull is never used.
- At level 3 a heavy bone giant is created instead.
- At level 6 an eternal bone giant is created instead.
+ At level 3 an eternal bone giant is created instead.
+ At level 6 a heavy bone giant is created instead.
Only one bone giant may be active at any time, casting this spell while one exists will destroy it and replace it with a new one.
]]):
tformat(math.max(1, self.level + t:_getLevel(self)))
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 12bd14474bd50d80ed1aaa759445477b6d439f2e..23c036997ad95061d8ce51ebb600ea075af93a90 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -4758,7 +4758,11 @@ newEffect{
if self.skeleton_minion == "warrior" then image = "npc/lord_of_skulls_warrior.png"
elseif self.skeleton_minion == "archer" then image = "npc/lord_of_skulls_archer.png"
elseif self.skeleton_minion == "mage" then image = "npc/lord_of_skulls_magus.png"
- elseif self.is_bone_giant then image = "npc/undead_giant_heavy_sentinel.png"
+ elseif self.is_bone_giant then
+ if self.is_bone_giant == "e_bone_giant" then image = "npc/lord_of_skulls_eternal_bone_giant.png"
+ elseif self.is_bone_giant == "h_bone_giant" then image = "npc/lord_of_skulls_heavy_bone_giant.png"
+ elseif self.is_bone_giant == "bone_giant" then image = "npc/lord_of_skulls_bone_giant.png"
+ end
end
self.replace_display = mod.class.Actor.new{