From 53e2dc8c4edf7affd720494bac397214c5c797fb Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 8 Nov 2010 09:32:31 +0000
Subject: [PATCH] Some more lore to be randomly found (well lore .. err ..
trollish lore .. err .. kinda .. well trollish stuff!)
git-svn-id: http://svn.net-core.org/repos/t-engine4@1817 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/general/objects/lore/fun.lua | 32 +++++++++
.../data/general/objects/lore/spellhunt.lua | 2 +-
.../data/general/objects/lore/sunwall.lua | 2 +-
.../tome/data/general/objects/objects.lua | 1 +
.../tome/data/general/objects/scrolls.lua | 9 +++
.../tome/data/gfx/object/scroll-lore.png | Bin 0 -> 760 bytes
game/modules/tome/data/lore/fun.lua | 66 ++++++++++++++++++
game/modules/tome/data/lore/lore.lua | 1 +
.../tome/data/zones/daikara/objects.lua | 2 +-
.../tome/data/zones/old-forest/objects.lua | 2 +-
.../tome/data/zones/trollshaws/objects.lua | 2 +-
11 files changed, 114 insertions(+), 5 deletions(-)
create mode 100644 game/modules/tome/data/general/objects/lore/fun.lua
create mode 100644 game/modules/tome/data/gfx/object/scroll-lore.png
create mode 100644 game/modules/tome/data/lore/fun.lua
diff --git a/game/modules/tome/data/general/objects/lore/fun.lua b/game/modules/tome/data/general/objects/lore/fun.lua
new file mode 100644
index 0000000000..bef0d8c095
--- /dev/null
+++ b/game/modules/tome/data/general/objects/lore/fun.lua
@@ -0,0 +1,32 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newEntity{ base = "BASE_LORE",
+ name = "trollish poem, first part", lore="troll-poem-1", unique=true,
+ desc = [[A poem written by a ... troll?]],
+ rarity = 20,
+ encumberance = 0,
+}
+
+newEntity{ base = "BASE_LORE",
+ name = "trollish poem, second part", lore="troll-poem-2", unique=true,
+ desc = [[A poem written by a ... troll?]],
+ rarity = 20,
+ encumberance = 0,
+}
diff --git a/game/modules/tome/data/general/objects/lore/spellhunt.lua b/game/modules/tome/data/general/objects/lore/spellhunt.lua
index a26f9e55ea..ef9b822d55 100644
--- a/game/modules/tome/data/general/objects/lore/spellhunt.lua
+++ b/game/modules/tome/data/general/objects/lore/spellhunt.lua
@@ -17,7 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
name = "memories of archmage Varil", lore="spellhunt-note-1", unique=true,
desc = [[A collection of thoughts and memories of the archmage Varil, during the Age of Dusk]],
rarity = 20,
diff --git a/game/modules/tome/data/general/objects/lore/sunwall.lua b/game/modules/tome/data/general/objects/lore/sunwall.lua
index dcfc09ba4f..33d33b53f5 100644
--- a/game/modules/tome/data/general/objects/lore/sunwall.lua
+++ b/game/modules/tome/data/general/objects/lore/sunwall.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
for i = 1, 4 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "SUNWALL_LORE_NOTE"..i,
name = "Loremaster Verutir's note", lore="sunwall-note-"..i, unique="Loremaster Verutir's note "..i,
desc = [[A paper scrap containing some lore.]],
diff --git a/game/modules/tome/data/general/objects/objects.lua b/game/modules/tome/data/general/objects/objects.lua
index 77ac265709..ccdc2ff49b 100644
--- a/game/modules/tome/data/general/objects/objects.lua
+++ b/game/modules/tome/data/general/objects/objects.lua
@@ -81,6 +81,7 @@ loadIfNot("/data/general/objects/mounts.lua")
-- Lore
loadIfNot("/data/general/objects/lore/spellhunt.lua")
+loadIfNot("/data/general/objects/lore/fun.lua")
-- Artifacts
loadIfNot("/data/general/objects/world-artifacts.lua")
diff --git a/game/modules/tome/data/general/objects/scrolls.lua b/game/modules/tome/data/general/objects/scrolls.lua
index a898401353..53150d05dd 100644
--- a/game/modules/tome/data/general/objects/scrolls.lua
+++ b/game/modules/tome/data/general/objects/scrolls.lua
@@ -34,6 +34,15 @@ newEntity{
egos = "/data/general/objects/egos/scrolls.lua", egos_chance = resolvers.mbonus(10, 5),
}
+newEntity{
+ define_as = "BASE_LORE",
+ type = "scroll", subtype="lore",
+ unided_name = "scroll", id_by_type = true,
+ display = "?", color=colors.ANTIQUE_WHITE, image="object/scroll-lore.png",
+ encumber = 0.1,
+ desc = [[This parchement contains some lore.]],
+}
+
newEntity{ base = "BASE_SCROLL",
name = "scroll of light",
level_range = {1, 40},
diff --git a/game/modules/tome/data/gfx/object/scroll-lore.png b/game/modules/tome/data/gfx/object/scroll-lore.png
new file mode 100644
index 0000000000000000000000000000000000000000..1976f4da164b49a8e7048b8b35365c2b254de9d6
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01IsZ01IsafDWY500007bV*G`2igk=
z2@W7<DZ1VO00MYPL_t(o!^M|>@#7#6#a}uVfCMB&0uoLF5+Y$GL;?~j0SQQ02{_>X
zXqQ_EX}D{@bD7B`%@02BJr+WN|GX{VXoMU}J&%9a=JG8t09f-p`p0~`%co$0%EtM5
zZC1qnQ@1@>&cBjC4}Aw7L1*gW{weqjKD*s#!F|MMV7X=u5MwOH7_95MTy_BwRX9JW
zai`tSzyZMT5ylu8V~}%3&d;09xn-DuwHC|_e$c_m6}<l~@O|F_0Nb|Jdnu&?pr&#M
zfDl3v=UDyg$uJdr?;1db3pnQtA_5Wpd5^hRYnPi`h`WdVMX=UB(|9!;`5Nx`Sm7ZA
z7-K3-!$SxFP?KTiayt~AwY3{`A-;o)YXQ7!syR2t)I@X|cY(?=?jD>0=L!5EaBktF
z$OSBo5)rm-tL~-kZQE)(jevf0o`%JB*54W|aQ)jD)1;wA-DGI^JtFQNZVOEpjKuWC
z*1J9{JQ1R=NevWT12Q6<r=}oB@ZPl^c0^PKYN1-dy&u0}a}~nOhw=Rmu3Z~rs+k^4
zL~?IgbOJHHib{zHn>)aDzia0bfA798JeBmKr^SPat3J;;*9k}98himCevJ!&5@ReW
zrNhq5#d}{;O7)mhDlx|5oIAWH&+8*I7hQ9suT*)>*-ho@O7C6wlh3>8b^KSK>Z*9;
z+<RYQjCFU;9o+ZtEB9q~O<0)u;B@3%QrY*tNo_RwXzt9yvFVaCct6?nQ}bE;v#a7}
zr6eOoLwon5zW+qPP>4>ZcRvy_TYR%Zn!PW)tKrvw3;yLVUE^e3*VDDYkN-F9ou!lx
q-EkKGw*;ID=@R;J0q+WS$odVh^jf6qjD5)f0000<MNUMnLSTZ<23WTM
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/lore/fun.lua b/game/modules/tome/data/lore/fun.lua
new file mode 100644
index 0000000000..6d06af22c7
--- /dev/null
+++ b/game/modules/tome/data/lore/fun.lua
@@ -0,0 +1,66 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+--------------------------------------------------------------------------
+-- The Old Forest
+--------------------------------------------------------------------------
+
+newLore{
+ id = "troll-poem-1",
+ category = "misc",
+ name = "trollish poem (part one)",
+ lore = [[#{italic}#Club club club,
+Grab some grub!
+When hunger hits,
+Me likes to club!
+
+Little halfling,
+Furry feet,
+Smash his brains,
+Tasty meat!
+
+Skinny elf,
+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,
+Or stomach hurt!
+
+Stupid human,
+Has no fear,
+Looks surprised,
+When me eats his ear!
+
+Club club club,
+Grab some grub!
+When hunger hits,
+Me likes to club!#{normal}#]],
+}
diff --git a/game/modules/tome/data/lore/lore.lua b/game/modules/tome/data/lore/lore.lua
index 4ca2979f8a..e2c6db8cc4 100644
--- a/game/modules/tome/data/lore/lore.lua
+++ b/game/modules/tome/data/lore/lore.lua
@@ -22,5 +22,6 @@ load("/data/lore/daikara.lua")
load("/data/lore/old-forest.lua")
load("/data/lore/infinite-dungeon.lua")
load("/data/lore/tol-falas.lua")
+load("/data/lore/fun.lua")
load("/data/lore/sunwall.lua")
load("/data/lore/spellhunt.lua")
diff --git a/game/modules/tome/data/zones/daikara/objects.lua b/game/modules/tome/data/zones/daikara/objects.lua
index 108ab962c3..d03026c266 100644
--- a/game/modules/tome/data/zones/daikara/objects.lua
+++ b/game/modules/tome/data/zones/daikara/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "daikara expedition note", lore="daikara-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],
diff --git a/game/modules/tome/data/zones/old-forest/objects.lua b/game/modules/tome/data/zones/old-forest/objects.lua
index b2b247cb96..11d88edc41 100644
--- a/game/modules/tome/data/zones/old-forest/objects.lua
+++ b/game/modules/tome/data/zones/old-forest/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "journal page", lore="old-forest-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],
diff --git a/game/modules/tome/data/zones/trollshaws/objects.lua b/game/modules/tome/data/zones/trollshaws/objects.lua
index f3741edc09..e40ff113f2 100644
--- a/game/modules/tome/data/zones/trollshaws/objects.lua
+++ b/game/modules/tome/data/zones/trollshaws/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "tattered paper scrap", lore="trollshaws-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],
--
GitLab