Merged the two parts of the troll and necromancer poems into one

git-svn-id: http://svn.net-core.org/repos/t-engine4@2837 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/general/objects/lore/fun.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 newEntity{ base = "BASE_LORE",
-	name = "trollish poem, first part", lore="troll-poem-1", unique=true,
+	name = "trollish poem", lore="troll-poem", unique=true,
 	desc = [[A poem written by a... troll?]],
 	level_range = {1, 50},
 	rarity = 20,
@@ -26,23 +26,7 @@ newEntity{ base = "BASE_LORE",
 }
 
 newEntity{ base = "BASE_LORE",
-	name = "trollish poem, second part", lore="troll-poem-2", unique=true,
-	desc = [[A poem written by a... troll?]],
-	level_range = {1, 50},
-	rarity = 20,
-	encumber = 0,
-}
-
-newEntity{ base = "BASE_LORE",
-	name = "necromancer poem, first part", lore="necromancer-poem-1", unique=true,
-	desc = [[A poem written by a... Necromancer?]],
-	level_range = {15, 50},
-	rarity = 20,
-	encumber = 0,
-}
-
-newEntity{ base = "BASE_LORE",
-	name = "necromancer poem, second part", lore="necromancer-poem-2", unique=true,
+	name = "necromancer poem", lore="necromancer-poem", unique=true,
 	desc = [[A poem written by a... Necromancer?]],
 	level_range = {15, 50},
 	rarity = 20,

game/modules/tome/data/lore/fun.lua

@@ -18,9 +18,9 @@
 -- darkgod@te4.org
 
 newLore{
-	id = "troll-poem-1",
+	id = "troll-poem",
 	category = "misc",
-	name = "trollish poem (part one)",
+	name = "trollish poem",
 	lore = [[#{bold}#"Me Likes to Club"
 
 #{italic}#Club club club,
@@ -38,15 +38,6 @@ Eyes so blue,
 Crush his bones,
 Make elf stew!
 
-...#{normal}#]],
-}
-
-newLore{
-	id = "troll-poem-2",
-	category = "misc",
-	name = "trollish poem (part two)",
-	lore = [[#{italic}#...
-
 Hairy dwarf,
 Smells like dirt,
 Cook him long,
@@ -64,9 +55,9 @@ Me likes to club!#{normal}#]],
 }
 
 newLore{
-	id = "necromancer-poem-1",
+	id = "necromancer-poem",
 	category = "misc",
-	name = "necromancer poem (part one)",
+	name = "necromancer poem",
 	lore = [[#{bold}#"The Necromancer's Canticle"
 
 #{italic}#Saved from coffin, casket, urn
@@ -84,15 +75,6 @@ They hurry home, a distant friend
 But do they cheer? Do they commend?
 They yell! Does rotting flesh offend?
 
-...#{normal}#]],
-}
-
-newLore{
-	id = "necromancer-poem-2",
-	category = "misc",
-	name = "necromancer poem (part two)",
-	lore = [[#{italic}#...
-
 We bring life to lifeless bone
 But do they smile? Do they condone?
 They sit upon their golden thrones