From af724a22bee3b09fc2fac8dc298147f8ec5066a1 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 17 Nov 2010 22:31:14 +0000
Subject: [PATCH] mark of the spellblaze
git-svn-id: http://svn.net-core.org/repos/t-engine4@1922 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/angband/dialogs/DeathDialog.lua | 2 +-
game/modules/example/dialogs/DeathDialog.lua | 2 +-
.../example_realtime/dialogs/DeathDialog.lua | 2 +-
.../data/gfx/terrain/burnttree_alpha1.png | Bin 0 -> 1047 bytes
.../data/gfx/terrain/burnttree_alpha2.png | Bin 0 -> 1187 bytes
.../data/gfx/terrain/burnttree_alpha3.png | Bin 0 -> 723 bytes
.../data/gfx/terrain/burnttree_alpha4.png | Bin 0 -> 889 bytes
.../data/gfx/terrain/burnttree_alpha5.png | Bin 0 -> 1116 bytes
.../tome/data/gfx/terrain/grass_burnt1.png | Bin 0 -> 1394 bytes
.../tome/data/zones/mark-spellblaze/grids.lua | 43 ++++++++++
.../tome/data/zones/mark-spellblaze/npcs.lua | 64 +++++++++++++++
.../data/zones/mark-spellblaze/objects.lua | 31 ++++++++
.../tome/data/zones/mark-spellblaze/traps.lua | 20 +++++
.../tome/data/zones/mark-spellblaze/zone.lua | 75 ++++++++++++++++++
game/modules/tome/dialogs/DeathDialog.lua | 2 +-
15 files changed, 237 insertions(+), 4 deletions(-)
create mode 100644 game/modules/tome/data/gfx/terrain/burnttree_alpha1.png
create mode 100644 game/modules/tome/data/gfx/terrain/burnttree_alpha2.png
create mode 100644 game/modules/tome/data/gfx/terrain/burnttree_alpha3.png
create mode 100644 game/modules/tome/data/gfx/terrain/burnttree_alpha4.png
create mode 100644 game/modules/tome/data/gfx/terrain/burnttree_alpha5.png
create mode 100644 game/modules/tome/data/gfx/terrain/grass_burnt1.png
create mode 100644 game/modules/tome/data/zones/mark-spellblaze/grids.lua
create mode 100644 game/modules/tome/data/zones/mark-spellblaze/npcs.lua
create mode 100644 game/modules/tome/data/zones/mark-spellblaze/objects.lua
create mode 100644 game/modules/tome/data/zones/mark-spellblaze/traps.lua
create mode 100644 game/modules/tome/data/zones/mark-spellblaze/zone.lua
diff --git a/game/modules/angband/dialogs/DeathDialog.lua b/game/modules/angband/dialogs/DeathDialog.lua
index 2a02fa910c..c558d13ff1 100644
--- a/game/modules/angband/dialogs/DeathDialog.lua
+++ b/game/modules/angband/dialogs/DeathDialog.lua
@@ -124,7 +124,7 @@ end
function _M:generateList()
local list = {}
- if config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
+ if config.settings.tome and config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
list[#list+1] = {name="Character dump", action="dump"}
list[#list+1] = {name="Exit to main menu", action="exit"}
diff --git a/game/modules/example/dialogs/DeathDialog.lua b/game/modules/example/dialogs/DeathDialog.lua
index 2a02fa910c..c558d13ff1 100644
--- a/game/modules/example/dialogs/DeathDialog.lua
+++ b/game/modules/example/dialogs/DeathDialog.lua
@@ -124,7 +124,7 @@ end
function _M:generateList()
local list = {}
- if config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
+ if config.settings.tome and config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
list[#list+1] = {name="Character dump", action="dump"}
list[#list+1] = {name="Exit to main menu", action="exit"}
diff --git a/game/modules/example_realtime/dialogs/DeathDialog.lua b/game/modules/example_realtime/dialogs/DeathDialog.lua
index 2a02fa910c..c558d13ff1 100644
--- a/game/modules/example_realtime/dialogs/DeathDialog.lua
+++ b/game/modules/example_realtime/dialogs/DeathDialog.lua
@@ -124,7 +124,7 @@ end
function _M:generateList()
local list = {}
- if config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
+ if config.settings.tome and config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
list[#list+1] = {name="Character dump", action="dump"}
list[#list+1] = {name="Exit to main menu", action="exit"}
diff --git a/game/modules/tome/data/gfx/terrain/burnttree_alpha1.png b/game/modules/tome/data/gfx/terrain/burnttree_alpha1.png
new file mode 100644
index 0000000000000000000000000000000000000000..51583d60ef7cc449fc37de092ac77bc68043de67
GIT binary patch
literal 1047
zcmV+y1nB#TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk|
z6&n$O(|MEt000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000AWNkl<Z
zSi|jC&u<%55dP-<*nPX}AM4o0O`N7_0tG}BlSo0465$|KAP^Eaj!5)CPaHV)$PM+v
zfm0DeLI?>2`~f)?df~u@N)-pBs(>I;D5Y*|JNDYU`-Vd#D(Y0J9XqFdmzCy?X1>uk
zZ)P8GjN$OgY|c5*$(8ij0mU%ci=L`)H~R<rB`LpaB)vNJ@*PQB@%2-WI#&Y7XnG@~
z>5H)^XJ#k?4vl(qIx{Fk!BYT$xvcv2bYAZiJsA~@d}*vC2w)?L_dAnB&&}l&FIUXg
z*^2k%$Vq&?*A{^uY!5B41AwPovGKrPA`D%(><M0}c%P0*YkaK;X9lap4gf0&4B&T7
zcxSnqtCxJu3!%QcRt?$<p|hn0{RrR_0MkP!*8&J#Q9BW+Mm3`^0l;)d?_C+fRbP=k
zGiCUN8Q;!i9S)7OwUWC2P?$V`MF1<0A?qLtu0%0#imt@v`%${q=*E|oq#Ifgj1=E4
z7CjIVy8S+W`MZl|0$MI>T)Q0)U9j5Ec(<3Ll(F!X`q>)XB*JS(iL*IZW*Xi2&Q7aW
ztOOcS)aQ1B?*ROlJkW&Qm=D(jl|a5cA37gAY(KY<ubs>)HWFMb8{Vk;T=pab@Bm<A
zF8}<~Mf1L|@DTwQw7|)cBru8)CH$z-`4$78I|5jp%_6Z30@_N@{caRhZg=g)Kilaw
z%UJa!ec4TUdlEb0GXO~?P<C@ZZ|n1UUOVA_2mnhZJyakuB7wI7eAVe&VrF7yxW?QB
zfb0LnM?wGqzA5{{GJsYuWozw)QGy(Xz>=ech*OJ3r%#q?sXm{dIw}I|THw8`qhMSI
z)vSh+05d;3mN{_ne}O!|5V}Q5V<;zwsI!Yd?xpzcUhjty7ToZtpUN?akR}O01OjlQ
z5w-r>O>z^L;Kft9iwq!55(p__(-aT_z82XdX~K51c}Yr%Bu)3KCxReKl9U0!nJ9r;
z7WHf{ha`^Ck0KBNr8NkkR%`*FKXw8ug}v``h)q9Zu4rSp)#}3ad`P7LfSb*xTnu<?
zA`<*`7g!E)#Si@Ny}%c@w(n4<m7-88u}~7sOvW>uruN+WtiL{yYv=|3GfHbjo$jru
zmwsG&!f7XQ{5pX)g_J-XlMtlY@*(%|K3FZu0o&&3@c&b(>dzd%*^V(P{so267Q;A=
REUEwi002ovPDHLkV1g2*$uIx_
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/terrain/burnttree_alpha2.png b/game/modules/tome/data/gfx/terrain/burnttree_alpha2.png
new file mode 100644
index 0000000000000000000000000000000000000000..acafd67058826e4aade57581e1a7f58d79b945ae
GIT binary patch
literal 1187
zcmV;U1YG-xP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk|
z6(Ap4*}JO%000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000C2Nkl<Z
zSi|j>O^B6M7{`C-ocH6t@BRMp$~dFmQD>Bt!h)oQLg+#;7eciSg4X4tg+_}u(V|_O
zz@VMswxEb2f;LH|88SixSx`~tIQP!nd*83~(ZbP;n4C$m&HUhScsPf1{^xnlbIt=B
zY_P!w8*H$CB(U{<E_PRD+7UDDsIhmVA%JOMa#xcsKu6r00JYkNHxhl@zL99!vHy90
zm`)7~8*B?WzcA*ygUics<-YrPDrR~|!#{P)-qS4~YAamLlNs>N?xuGVm|qz_7{QkN
z7J`Q+sud~KrKRQKwO*a}Oglp0Y~mo(HmC;Tg!F^ChPv&&rxUm!;CM}P8lWZrqkx%q
zgu+dY6H`qL6d7mc7ZRK!Uzy^H!nKyh`5TpTFg@Fj_W4Tm1zdITd}cWmz}ulET&n=@
zPGf!{VKNerM<qqwm)_!_II*Q9K6ALQq=N#45;(MdWC$oJj#*1X2{Bm<m6sLTcZMUs
z!z)0x76Jdb!&}Sp6Kn0^IF3Y~6?Qq%#uw;onn(ieP%+93<ygAK)QUjx-N?{s2beet
ze;SPQ#ihbMyK=bUy0V~G^N;4aeYM%Hi#*FPR*PCSR%7ctqwSAXMS+wqioIZ*SyA$p
zt9oMdvUUjQmK5iPg*&DlsRz$k_-IXcV7l(Jy{cxwec0(XgekNW0>V;+@;q1dq`=Wz
zG^l=NN=c$oz9PhtS%@Un!oV*>Q^vV&NpZ04bL`e8;oUqSGpoww;Ex~(NRu)BK`xZ<
z69gVc7wE#0YAb+md_iSwxn#5pjCGZvc0z&B;1ulh96w}^{oSfp8*7)>Jzmn5Pc@{g
zdZ1qSHz}nCNs@`t*a#tTm2yayX5^U>d0q(LVH_M(f^UKIB_H2OIoFESs1hk#3#8Bx
zjbYY8yfD^3YwL~+A&;bR_+LYCbx{0ft=$xc{?2+We5%!|2yl!>1wwGP*)H|UCGlmi
z6<*X*yk85|$;`O-M%tdfHa2hOhWXq%CaM8VUx=v^HZ|-tj%~u(X4w<LnjeO}lg-_G
zx)ry*>bYLcdlz75^Y2mI)rw|;=juKeBSAk_QdfLAsD;vXVlV48LfZ+k3i>fD1E*F}
zuEEW=dKv=EcH&7O{{H%Sel?*-r-;A!l{uwkr4-0CE$rnqw|Nw(#{yq&0kGOQlUvbu
zytO%2(}UEUNiA3Ic*gJj7u!Ek=>SN<6YYQxD)4gC<HZopZjP0!htf49x+2j5yzoHk
z1rH8H(D&g&C-Oe-#wxEXEMS0UZN2rtI<ZYjFND_%c=URr&uQaaAUO}nGR!@BVA6k}
zCDg7O695tH@A~5Fho`F5|D~4OTE5xuX#ACxe*%@HkN%2tNZJ4Z002ovPDHLkV1mQ~
BG>rfN
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/terrain/burnttree_alpha3.png b/game/modules/tome/data/gfx/terrain/burnttree_alpha3.png
new file mode 100644
index 0000000000000000000000000000000000000000..eff355073e4aeb90d3569d39f17579e2916c4f96
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk|
z6(cq?MsNfG000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006mNkl<Z
zSi|j>O=}ZD7=WL5HraGH$!<P2rcJjs+NOv0(2GzIDy@nNdeI*sUi=G!{spg|di3HC
z@ZzDMC&Aw!La{-;)V9gydw0f@V2_b*MaXk`XJBUDhxcWMff+Mq%$PCboY-0~<^Ngo
zYt2Hv<v2+N%G2&u=OJ)%5S=ECMM=O-T_6a8vk~aQl_=_p0_Q?Xz6ekMoL^m9dgJ@P
zS<T9eY0t|1Me<!I4ELJtb~g^g2S(&`=J3#qK(~B5;B=g>fDLZX7$!w;&kP1GV0Fu7
zipR%Xs@Sim6_|=m&tki(f+83|19}b;56or3tU*2X{+qWe;=`~ACKPlHObLt&rYUUg
zhHkn7+jW8s8?z>u5X>r=WiSh1Hf(vG`ZWw2`Di%7_#V3E2-<=mF9bFei}J|)G*g`?
z(=5JT6_P|P9-Sm@FAq8aE2HQSG(pWmiPg)xbHV<X&M=h<d^|GPwtBW4x>RcgDm9ma
zpQRdDIBo$%@=DW8tpyJ^8=`gc#PvKQRt7|H+&uZBN7l|6r4+-#;BjgK-@pE7iDh|8
zDT&7uqqPPg9*<E<Nj8^5DOF5G;C8cs);e-shhFEDsM8aY#0co|Xk>={KDM1RDwBD#
z)5v+}F0g+P;g<^K$s{J~_TI-6UJgg&PjMV8E0dAQWc)5p;=YKqKYSZ?QhNt(%x4#W
zk9X$b=90T`XQlKC;O=VKzrSA3-CDlDzsbE;<xKqV_ywXGvv!HZ4bA`n002ovPDHLk
FV1l<>IobdK
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/terrain/burnttree_alpha4.png b/game/modules/tome/data/gfx/terrain/burnttree_alpha4.png
new file mode 100644
index 0000000000000000000000000000000000000000..a99b6bedd6e6fec1ae1823de757130b8756a3a2d
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk|
z6(|#%wta{I000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0008iNkl<Z
zSi|ktzi%T&6u|NCo7owA*G_ynJIN)25RSn8ApA&!C?G;dar^;DTt`bwgQzH|p{GIA
zKu?E+PFH}01Vu_v1mdI<aTLX|v%lw2*w+)2wR95GJgv0z=CkugGdu8qds5qm2%p}0
zF#>pHFj(y1JF|EziH>%zZM^+oa+!HL{RV8qhiz96a^JeSaKKZ5gWrP+-n*9<4)_Zo
z;^SJZhETT`4!Gs`tWdU3$EB$1GYbXmCGe=^+kRqX62QRg(~2wzP!@0kKNW@cYK5TM
z0%T!;g9`Q%zOUieK9J=(old8>I_F+6*BU4*ym!1X1}2jUolfVuqv3EdfE#evdpS*O
z(lOvgaL&EjcnMn5@LC36OW+ex`d0+fJjXdVXdI9O7T$dbD_B0CWcs%S(kxREx!pLx
z12uefy(jnTz*g5u|4hMyR8_Up0oy2`n8mapDl$E`N_z>2fU+z%vpE;^g*&-I2R4%R
zQLX1|$@H^Zt=4AbecU*p4fjnTwwC;AY?i|;K?p&NwSISX&>SEJGT2{Vv%ao~bLXg3
z9w!L>UT^>4XxJPe1-h^^I;rn?&nQoGv{W2W6oqltt~FkQRoHc2Qmh$K3V9F&2&#DJ
zZZrn)vv>yXEY&w-Z~hpm(s9#MDAYAZ<mtu$1<-*XGkAY>#e6qOtM^s}LL?+WRul+q
ze|guMMgU!StAK6`9w71+2+Ikol_G$KKw-=^8M+H^M$x}{X$(IAyT?FPg~R1u`$2l1
zztLTCWRG%82pD5Fe?BoWP+sZ`JQns~@T_qE^h9sRNqn}noKTe0v68By4Kj>68<$>!
zYKr)xf_sO`{?_#?K~*E)Y7uHB08Ru|Jr*Cobm=9KDdK}__H3<D;HIKji+T&C)(=r#
z$_utG3YhC(?w#kauBvKqPRcwTOFv#eKR7&U53_8%zqh5|{PO3MbI1G#ARrAB5OT*2
P00000NkvXXu0mjf&Q^du
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/terrain/burnttree_alpha5.png b/game/modules/tome/data/gfx/terrain/burnttree_alpha5.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dd5d51ecfa6cf3ad8e13e6c16935d53fef268b8
GIT binary patch
literal 1116
zcmV-i1f%<jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk|
z6)q%oQGWpd000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000BGNkl<Z
zSi{AZKa5mW6vltwx%a)DU3Qn5*?+SG47z9}MnfS20!AAXE$GG0#MT%ZjV6{9HYPR}
zLZUVrtxQbB!bXWoVPT9E6lzo?D=MI@?CkK~Jr-{PB^#Vs89dEPUhX^J?|$dp^KRf@
zVqEO5iAy7*yTUDwanT+Z-3d|DjVb;I07k&-#*r!GD8M+pF$FIGOy4Sy8RM>L!)L|a
z8N3R34j()MaVUZ#;@-Lu#&qr7obh%m@O2ZO83T{tf{O-^?}5>^@-&QH>k+>{Ry*vD
zi@gBt0PR4w$vC^oc)t!l4?YeF@BpW#;kkdfCZ22>-Y^~-7$SprBlswIT^t5z8R`UX
z-)i_)V`(1J40v-D0`N(A4WN|~TE?kq!<)t(eGC7+pc~-zQQ;efPl@kljqL!p1=<Tn
zcfs&B_#F6#3g9yEIlva<=)B=G#+w80KElCVi~vl)p-JIQBejfPJMc2VcJbae@Xg?z
z)hCq`pDYB9bOJsf@Rn%L+Ku(>I`L`XFt9i(K625LI1Q+PEIEfd#vf(id=?=91<<R$
zRa@*7Jmn4s&n`M=&ZZj!gzIQ774S+XP70a^G9kf>0k#IwM&!T_0nwo*lmqnuQN&ca
zvH!=!JN-DWeik(h?hJ4`@mYWetRhc&LS09>;mP4whXS5of|vR&x%IQ?e1g*n&Xnvm
z=V8Gy6XpgPI0@yBA}GMVL3&Q>9acMP9K?AGhu&o<9G1XW;OBX`=Op}g(;QeUYBj!!
z8PvuM0a=wv5hm-AY&}PRps=7$9z~uRDJ6=_uyGk*f^R-8SiGq{uvVnx9RQhuAV$bC
zG$FnpXd~+dkeHN&B+Q^Fz=WFy>#KDG00+!gM_>X8Vg?olEaiUyxF89EOO<e0qAa@w
z4m`GPEO+OCS0M`!B9sO0iJ74TT)41&U)2YyN>G9)7#Tr-cA48h!^F@49&81Gomb|V
zQ~{u?*|fa0_6_N#032T|k$4*L7=zp$_ewuhKO{=;zYo?`0(ajmQFUN)*Xl_?xQvz7
zEWZpHfGB|^PmcWBY{10Ihd+>p4UomG8uwn7NZ=KP%-Ar;5KFMTQT=YSJOb`TaYgy6
z3tJlWe-zi_z@vE{0ld51GYO9oVyreDb3$#D&M*Ns#yq1elgc6?TOEg9UCk|U{L5v&
z=r>syRQ;ze#}?|D_qr?laDth7De-%Z`qrI~C7x(SR?hT>d?VUbrx7zX%EB*7ET1^X
i62P7&oH*Bip1%O6VkopQ7c;E@0000<MNUMnLSTaRuG)D3
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/terrain/grass_burnt1.png b/game/modules/tome/data/gfx/terrain/grass_burnt1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce7a24bd9a7812226f6f1e74afcfb976e9c62e87
GIT binary patch
literal 1394
zcmV-&1&#WNP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RV3lJ6p5g3(j)c^nm1W80eR7l5l
zR>^YPMiA{;0B{HrBnLLF1!d7v*)gk973Y{w$Oq(<|II0vEV3)H9J^%7u_O|r0fR$q
zgB%(f4q=A})?k*N?$@th4|#rieAH9&6tYzf05an7qJk9U{A+_(6%0W}901})<%eu{
z>V7F+RABx1#3@}`zq}X*Lvl9T>=}jbHTWMdD!c<t<7IN*4j^q!`!fareC*@^uvLvq
z+MA8__GGj>Y0m?ICrHO%JPrWytI883epRuj(;fgk@QNX=RIUL)B^m(ykPSno5-kFX
zXq4*)JdhE`4Ty&MREb{4)PLao^*V6!OrG(0Q9%K;dq2jW?q<-sCkTd&pC&jHqKx=m
zIsW@XJm`PIc|T<SjM0vD8^rc-3Z5Vch>SR1X1iigIuOefxjvljfb|5Sa?a7UHjNSY
zXY5V{mmh^6GLu+yr6<U5e+GHt*ofPqn8+|gEE>7Pkg26sxyA*zPm9|1>WvscsTzbB
zGl3f%pAz3K*GeT?CECP|DKt#QgA`+wb8Z$qK}3}t&Im$bI~XsjRXNF&bM$D_S-K*V
z*SDb;_VCjrhCQA3zyoB9O0*v`?htjQ#Y1XHVt4`o9w`LP{SgrX6#+HDO%EZ>T%N1x
zV;V0i6Iq*NgxgTt;GV0-<P#JA@G)gnW4Yl59P~vM4OW<88z_oQuyw*VXVVD}7@Fct
zwyHb1MSMQIZEn+^j5vGpZJ2&yJ+Vs*hO81T&p3C82<V*}l<yUIAkVl;bg3FYWXbi;
zCqHC19e(*Wh%<LvxxUVr=g6azYBB|NrR5n%>*zS5f4Q7&KGTzVX*fe2lCA2za+bMd
z>a&bEcL*-wo@dX?L9==Gyc7ZDrFL|>jxB*hjWqGzz0SXxZ%sX$>pfl`@TGySJGh6J
z{QOgB!}k^OiZ~{-&41KtnNjbZ)>_Fhf=GV+Ve}O(`a()u_tD~hWpv!?d{RT021qY-
zk$)XomJ!cZwVB+}Y<~{`3?I2~FC3eMwDn@nMd-eH!|fj8hYVMD)ST}b{p00`4m{)~
z&fF}>GWF1cKVyDqsp<M-RRObo^aROOgXd8;Oxr<=<56*OIk9`(@sql4TAw^YJV97A
za&h<cgdI*R>X78RM%hq_9)>JlR7UAUK<R)CLxv<ih_p(ycD+ehV_ArR_Uq4(0?Lm{
zG<)&FPp(^1ihyEep*iXh`!ilt=kKNiNNo{4exgS~Rab!R4{HsIwj^c5xhF{WMYF|U
zwyLvx#B$a6Av=YSCPOxV%%H8I`A%1;%?+Cm_R|3YHDi0JqhP3M#*U0QwXOW$F%wY7
zm3UDldH?oO+cIZ3+N!DPHnw)+;Gd;DKX><PC+!lyX_}j@{PHDW+-j4I+KDW@(*x4)
zm20IN!e|qnwlz`SGyq^;E-KOgZo=C&1)y8qKRn3yvU1k$Vc&n(xBIG`b5L8Za{!1=
z8?r61%>h7JH%Jdd**Yx_j!D1S92{5ab<qm`Jx3u0D1b#H*K~q52>hjh&j6L^@}?Oc
zGL>j3+Rl#L<y6aQGaN&DUC4;5EA1aKcTCHh1`6<J%pFtehs+O|0T*9ByB8p)Zoc2?
z_H}Tldh@p6jiLYm&ED17yBb}V5&!)>FsjfYm|>2s#vNrf&mn)t&~p1WZChBbFFrKO
zyRqj}?exmELiF}}$URDEy7T5R9n=#<Ej0lA2fw&N4l@=6DF6Tf07*qoM6N<$f^uhr
A0ssI2
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/zones/mark-spellblaze/grids.lua b/game/modules/tome/data/zones/mark-spellblaze/grids.lua
new file mode 100644
index 0000000000..ccb8fd8bea
--- /dev/null
+++ b/game/modules/tome/data/zones/mark-spellblaze/grids.lua
@@ -0,0 +1,43 @@
+-- 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
+
+load("/data/general/grids/basic.lua")
+load("/data/general/grids/forest.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/lava.lua")
+
+for i = 1, 20 do
+newEntity{
+ define_as = "BURNT_TREE"..i,
+ name = "burnt tree",
+ image = "terrain/grass_burnt1.png",
+ add_displays = class:makeTrees("terrain/burnttree_alpha"),
+ display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+ always_remember = true,
+ can_pass = {pass_tree=1},
+ does_block_move = true,
+ block_sight = true,
+ dig = "GRASS",
+}
+end
+
+newEntity{ define_as = "BURNT_GROUND",
+ name='burnt ground',
+ display='.', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/grass_burnt1.png",
+}
diff --git a/game/modules/tome/data/zones/mark-spellblaze/npcs.lua b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
new file mode 100644
index 0000000000..71abba5179
--- /dev/null
+++ b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
@@ -0,0 +1,64 @@
+-- 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
+
+load("/data/general/npcs/rodent.lua", rarity(5))
+load("/data/general/npcs/vermin.lua", rarity(5))
+load("/data/general/npcs/faeros.lua", rarity(2))
+load("/data/general/npcs/gwelgoroth.lua", rarity(2))
+load("/data/general/npcs/elven-caster.lua", rarity(2))
+
+--load("/data/general/npcs/all.lua", rarity(4, 65))
+
+local Talents = require("engine.interface.ActorTalents")
+
+newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
+ allow_infinite_dungeon = true,
+ name = "Grand Corruptor", color=colors.VIOLET, unique = true,
+ desc = [[An elven corruptor, drawn to these blighted lands.]],
+ level_range = {30, nil}, exp_worth = 1,
+ rank = 3.5,
+ vim_regen = 40,
+ max_vim = 800,
+ max_life = resolvers.rngavg(300, 310), life_rating = 18,
+ resolvers.equip{
+ {type="weapon", subtype="staff", autoreq=true},
+ {type="armor", subtype="cloth", autoreq=true},
+ },
+ resolvers.drops{chance=100, nb=1, {unique=true} },
+ resolvers.drops{chance=100, nb=3, {ego_chance=100} },
+
+ combat_armor = 0, combat_def = 0,
+ resolvers.talents{
+ [Talents.T_BONE_SHIELD]=5,
+ [Talents.T_BLOOD_SPRAY]=5,
+ [Talents.T_SOUL_ROT]=5,
+ [Talents.T_BLOOD_GRASP]=5,
+ [Talents.T_BLOOD_BOIL]=5,
+ [Talents.T_BLOOD_FURY]=5,
+ [Talents.T_BONE_SPEAR]=5,
+ [Talents.T_VIRULENT_DISEASE]=5,
+ [Talents.T_DARKFIRE]=5,
+ [Talents["T_FLAME_OF_URH'ROK"]]=5,
+ [Talents.T_DEMON_PLANE]=5,
+ [Talents.T_CYST_BURST]=4,
+ [Talents.T_BURNING_HEX]=5,
+ [Talents.T_WRAITHFORM]=5,
+ },
+ resolvers.sustains_at_birth(),
+}
diff --git a/game/modules/tome/data/zones/mark-spellblaze/objects.lua b/game/modules/tome/data/zones/mark-spellblaze/objects.lua
new file mode 100644
index 0000000000..e40ff113f2
--- /dev/null
+++ b/game/modules/tome/data/zones/mark-spellblaze/objects.lua
@@ -0,0 +1,31 @@
+-- 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
+
+load("/data/general/objects/objects.lua")
+
+for i = 1, 5 do
+newEntity{ base = "BASE_LORE",
+ define_as = "NOTE"..i,
+ name = "tattered paper scrap", lore="trollshaws-note-"..i,
+ desc = [[A paper scrap, left by an adventurer.]],
+ rarity = false,
+ is_magic_device = false,
+ encumberance = 0,
+}
+end
diff --git a/game/modules/tome/data/zones/mark-spellblaze/traps.lua b/game/modules/tome/data/zones/mark-spellblaze/traps.lua
new file mode 100644
index 0000000000..578363287a
--- /dev/null
+++ b/game/modules/tome/data/zones/mark-spellblaze/traps.lua
@@ -0,0 +1,20 @@
+-- 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
+
+load("/data/general/traps/natural_forest.lua")
diff --git a/game/modules/tome/data/zones/mark-spellblaze/zone.lua b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
new file mode 100644
index 0000000000..53ad79afbf
--- /dev/null
+++ b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
@@ -0,0 +1,75 @@
+-- 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
+
+return {
+ name = "Mark of the Spellblaze",
+ level_range = {25, 35},
+ level_scheme = "player",
+ max_level = 2,
+ decay = {300, 800},
+ actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+ width = 50, height = 50,
+-- all_remembered = true,
+ all_lited = true,
+ persistant = "zone",
+ ambiant_music = "Rainy Day.ogg",
+ generator = {
+ map = {
+ class = "engine.generator.map.Forest",
+ edge_entrances = {4,6},
+ zoom = 4,
+ sqrt_percent = 45,
+ noise = "fbm_perlin",
+ floor = "BURNT_GROUND",
+ wall = {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",},
+ up = "UP",
+ down = "DOWN",
+ do_ponds = {
+ nb = {0, 2},
+ size = {w=25, h=25},
+ pond = {{0.6, "LAVA"}, {0.8, "LAVA"}},
+ },
+ },
+ actor = {
+ class = "engine.generator.actor.Random",
+ nb_npc = {20, 30},
+ guardian = "GRAND_CORRUPTOR",
+ },
+ object = {
+ class = "engine.generator.object.Random",
+ nb_object = {0, 0},
+ },
+ trap = {
+ class = "engine.generator.trap.Random",
+ nb_trap = {0, 0},
+ },
+ },
+ post_process = function(level)
+ -- Place a lore note on each level
+ game:placeRandomLoreObject("NOTE"..level.level)
+ end,
+ levels =
+ {
+ [1] = {
+ generator = { map = {
+ up = "UP_WILDERNESS",
+ }, },
+ },
+ },
+}
diff --git a/game/modules/tome/dialogs/DeathDialog.lua b/game/modules/tome/dialogs/DeathDialog.lua
index 04e5daadbc..0ff6c86dd5 100644
--- a/game/modules/tome/dialogs/DeathDialog.lua
+++ b/game/modules/tome/dialogs/DeathDialog.lua
@@ -163,7 +163,7 @@ end
function _M:generateList()
local list = {}
- if config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
+ if config.settings.tome and config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
if self.actor:attr("easy_mode_lifes") then list[#list+1] = {name=("Resurrect with easy mode (%d left)"):format(self.actor.easy_mode_lifes), action="easy_mode"} end
if self.actor:attr("blood_life") and not self.actor:attr("undead") then list[#list+1] = {name="Resurrect with the Blood of Life", action="blood_life"} end
if self.actor:getTalentLevelRaw(self.actor.T_SKELETON_REASSEMBLE) >= 5 and not self.actor:attr("re-assembled") then list[#list+1] = {name="Re-assemble your bones and resurrect (Skeleton ability)", action="skeleton"} end
--
GitLab