diff --git a/game/modules/tome/data/general/traps/elemental.lua b/game/modules/tome/data/general/traps/elemental.lua
index b3a6e7592ad0f2bed3fe82600f5771be723c2537..8a741194d076d91507acb8dd104dfaaf61e507bf 100644
--- a/game/modules/tome/data/general/traps/elemental.lua
+++ b/game/modules/tome/data/general/traps/elemental.lua
@@ -89,7 +89,7 @@ newEntity{ base = "TRAP_ELEMENTAL",
-------------------------------------------------------
newEntity{ base = "TRAP_ELEMENTAL_BLAST",
subtype = "acid",
- name = "acid blast trap", image = "trap/blast_acid01.png",
+ name = "acid blast trap",
detect_power = 50, disarm_power = 50,
rarity = 3, level_range = {20, 50},
color_r=40, color_g=220, color_b=0,
@@ -98,7 +98,7 @@ newEntity{ base = "TRAP_ELEMENTAL_BLAST",
}
newEntity{ base = "TRAP_ELEMENTAL_BLAST",
subtype = "fire",
- name = "fire blast trap", image = "trap/blast_fire01.png",
+ name = "fire blast trap", image = "trap/trap_fire_rune_01.png",
detect_power = 50, disarm_power = 50,
rarity = 3, level_range = {20, 50},
color_r=220, color_g=0, color_b=0,
@@ -107,7 +107,7 @@ newEntity{ base = "TRAP_ELEMENTAL_BLAST",
}
newEntity{ base = "TRAP_ELEMENTAL_BLAST",
subtype = "cold",
- name = "ice blast trap", image = "trap/blast_ice01.png",
+ name = "ice blast trap", image = "trap/trap_frost_rune_01.png.png",
detect_power = 50, disarm_power = 50,
rarity = 3, level_range = {20, 50},
color_r=150, color_g=150, color_b=220,
@@ -117,7 +117,7 @@ newEntity{ base = "TRAP_ELEMENTAL_BLAST",
}
newEntity{ base = "TRAP_ELEMENTAL_BLAST",
subtype = "lightning",
- name = "lightning blast trap", image = "trap/blast_lightning01.png",
+ name = "lightning blast trap", image = "trap/trap_lightning_rune_02.png.png",
detect_power = 50, disarm_power = 50,
rarity = 3, level_range = {20, 50},
color_r=0, color_g=0, color_b=220,
diff --git a/game/modules/tome/data/general/traps/natural_forest.lua b/game/modules/tome/data/general/traps/natural_forest.lua
index b95e2d427aca71a5a03eb0e214be764d78a3ab63..ab82bd1bec935c78448b36a6b9b81340f283c68f 100644
--- a/game/modules/tome/data/general/traps/natural_forest.lua
+++ b/game/modules/tome/data/general/traps/natural_forest.lua
@@ -27,7 +27,7 @@ newEntity{ define_as = "TRAP_NATURAL_FOREST",
}
newEntity{ base = "TRAP_NATURAL_FOREST",
- name = "sliding rock", auto_id = true,
+ name = "sliding rock", auto_id = true, image = "trap/trap_slippery_rocks_01.png",
detect_power = 6, disarm_power = 16,
rarity = 3, level_range = {1, 50},
color=colors.UMBER,
diff --git a/game/modules/tome/data/gfx/shockbolt/npc/undead_skull_flying_skull.png b/game/modules/tome/data/gfx/shockbolt/npc/undead_skull_flying_skull.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d7df5c547e5ff18ea4d7de3f4b52c627f654513
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/npc/undead_skull_flying_skull.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_beartrap_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_beartrap_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a9dfe7e243a926fb2f12b0cdf9c5aadb50535c7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_beartrap_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_bomb_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_bomb_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8e896a870273de7a9729ba0ec7f2d771d1e864
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_bomb_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_caltrops_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_caltrops_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e928a1d3d9efd80bcc806d5a19c61bf0d6f3bff
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_caltrops_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_fire_rune_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_fire_rune_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f67353c1925415d28b790592323ef4c53f8161
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_fire_rune_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_frost_rune_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_frost_rune_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc970f74f0b44b064ebf596c7da60cccf456edc6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_frost_rune_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_lightning_rune_02.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_lightning_rune_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..f55af3d06271e17b34027f4e17c84ada3fb718d2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_lightning_rune_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_poison_spikes_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_poison_spikes_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfd61dfaf3bd9ae83277f2088bfe5949caf6d3be
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_poison_spikes_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_random_rubble_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_random_rubble_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..32ade473f1153ace9c9aeb1dff9ba2c9e51eb2e0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_random_rubble_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_slippery_rocks_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_slippery_rocks_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..37a9acc724a816db2125f824ddbf900d92b806a5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_slippery_rocks_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_smoke_bomb_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_smoke_bomb_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f285f808f68b3ee9d60bada35cc337424a4b540f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_smoke_bomb_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/trap/trap_water_rune_01.png b/game/modules/tome/data/gfx/shockbolt/trap/trap_water_rune_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..40c55399b57ce33e4088c5e725c2df5f3ec4f988
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/trap/trap_water_rune_01.png differ
diff --git a/game/modules/tome/data/zones/arena/npcs.lua b/game/modules/tome/data/zones/arena/npcs.lua
index 50f884849652d986e968fc6a71c24646a4eecf53..5e5f1412cb88b1815202db77ce32326a1749b441 100644
--- a/game/modules/tome/data/zones/arena/npcs.lua
+++ b/game/modules/tome/data/zones/arena/npcs.lua
@@ -36,7 +36,7 @@ local Talents = require("engine.interface.ActorTalents")
--Fodder
newEntity{ name = "flying skull",
- type = "elemental", subtype = "dark",
+ type = "undead", subtype = "skull",
display = "*", color=colors.BLACK, tint=colors.BLACK,
desc = [[A floating disembodied skull with an aura of darkness.]],
combat = { dam=10, atk=5, apr=10, physspeed=1 },
@@ -66,6 +66,7 @@ newEntity{ name = "flying skull",
disease_immune = 1,
poison_immune = 1,
stun_immune = 1,
+ undead = 1,
resolvers.sustains_at_birth(),
}