From a007c4fc6d26dca58ec2a1d06612559eab951266 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 16 May 2010 22:57:23 +0000
Subject: [PATCH] minimap on by default Lorien added to the arda-west map
git-svn-id: http://svn.net-core.org/repos/t-engine4@639 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 2 +-
game/modules/tome/data/gfx/terrain/lorien.png | Bin 0 -> 1235 bytes
.../tome/data/maps/wilderness/arda-west.lua | 7 ++++---
3 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 game/modules/tome/data/gfx/terrain/lorien.png
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 507293e1dc..de98af7ff4 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -198,7 +198,7 @@ end
function _M:setupMiniMap()
print("[MINIMAP MODE]", self.minimap_mode)
- self.minimap_mode = self.minimap_mode or (config.settings.tome and config.settings.tome.minimap_mode) or 1
+ self.minimap_mode = self.minimap_mode or (config.settings.tome and config.settings.tome.minimap_mode) or 2
if self.minimap_mode == 1 then
print("[MINIMAP MODE] disabled")
elseif self.minimap_mode == 2 then
diff --git a/game/modules/tome/data/gfx/terrain/lorien.png b/game/modules/tome/data/gfx/terrain/lorien.png
new file mode 100644
index 0000000000000000000000000000000000000000..a961dad8a5afb9cb00af498204a383488accdb38
GIT binary patch
literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS?
z7B@4{^i$>l00dJ>L_t(o!^M|fXq#0S$A3v)x?BWPw<^0>T3KyaieD3UGboG+ow^AM
zlUZuln=x4RW?P{WbVy}|f}Iz#im;ne3lkN0(K=ehO#<<vLS=L5=*OVRE~M>66GBaE
zKD>DIocEkJNwZC44}|wU=RD8(|DTWdoF^XZA|-&vCIDDpv!6|S?C078bDYoFPs?wv
zyTz?9`?}XH9zy&>kOcyx&Rn*yyawc=JhoWkxm(sA*uZ{ZYGMF@Bgcjfosau>(Q)V$
zM~)3E5>0z-a@n$uKCeeio}Q+!?G%Wtui3z8z_D9b0O&Y$O6kRJT_KrD(;Nya5+Y*f
zCLI{9Oqpl*Rg*xruM)VLBvWYsnnS^=<V0j%qU5f%nl&IEZYRsB5@1I`2bIXwa{|C4
zUx5_c)Wm=R-raNFFc=>jQQ$2hkFnMq3L2zktfxr|SyEwb2d;yPNAd)d;P}{xva=)O
z=p<8V#>YmOniw!hs0h^ZT*9a4+fB|PWanEVR4q!?B4O3axjxoG9Pco^6dN~5(HA08
zjDhmH&-)smS}}Mo^iPFXx9{diXJG1=4K_A5X$kpxzvn|bIt~(x#clYE{c8+*NM|+)
z2K@wses15*Dd3l0Xe1c)lT4*~>y4+05C2W(W!T8Lz5-#poLV=0jI?=)M*EGbjz;?#
z8v2};kcZ_|sUq*@yz^DKQ)mznBayj<A^@j*cUIJcj75KLp-807YuLL<9Q@!t;+L-(
z1iZTU%c&BH#iBBfw0U{`u#aRaO)`}x7GGC-k-aY}U?D2f+jF=g|I4Wo@ypj}4h1=R
z!cwQLSNC>qp-B7l_SB7=1!Z{SW`SKheGGPmNh}r_><aVyo!>|-7Abk)y9@g$c_6V^
z<b3z5e01SwMJlma)KXg_7GF1RM9ZCPF>Eh~bFeGS@z3t@%@13^eZK!>AJ-H2nP18S
zsIhwg^EL<edzqOnJEZODIIE?gu?hT_U}d$W6eDeR6aoRbp0Ghh1WX^#FXas)GqXjb
zj%2@;)sp(<qV{R1ZbQrO-0{yo;~X9b_InApTD;x9mv;y6(S5vu`K3HFvqkkDZnXm`
z^8%*twX#|=PC#`X%WbH4I@vzc@Mxz`kr0o=t(HoI$mDdvX<{yw`+;+2U*PVDsuIvU
zp1>&l)e9%y@hMM5=9lt(`=bN8`>NxaT)VYeH`S84dp<SRZY}E~Ob!*G6C>O@a7C--
z0(N&^GVgtq{!IrDw^~e27pj8)r=GA@H=G4k1JyjKXD=eDmU%BvSS)wHUaPOKCAGR;
z_k1n=hl)V%9Q^ua<o}64EvD6SSnUj`=W)H-c=9z+&x35A9e#K9>&<MnKOFTUTG18P
z+FZ}QJN!pGefAODSAg<S`_xa{d%OiSoUZb}z-_qo2b?{#1As5S+T`q+9n3G~nVc>-
xz}ng0@XDiw-g{CbP>=QFNaoG$i%<^0e*r}(hWJ*Vl?4C*002ovPDHLkV1j31N-O{X
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/maps/wilderness/arda-west.lua b/game/modules/tome/data/maps/wilderness/arda-west.lua
index 55215cf797..deffd92787 100644
--- a/game/modules/tome/data/maps/wilderness/arda-west.lua
+++ b/game/modules/tome/data/maps/wilderness/arda-west.lua
@@ -26,6 +26,7 @@ quickEntity('m', {show_tooltip=true, name='misty mountains', display='^', color=
quickEntity('f', {show_tooltip=true, name='grey mountains', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
quickEntity('u', {show_tooltip=true, name='deep forest', display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/tree.png", block_move=true})
quickEntity('t', {show_tooltip=true, name='forest', display='#', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/tree.png", block_move=true})
+quickEntity('l', {show_tooltip=true, name='Lorien', display='#', color=colors.GOLD, back_color=colors.DARK_GREEN, image="terrain/lorien.png", block_move=true})
quickEntity('v', {show_tooltip=true, name='old forest', display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/tree_dark1.png", block_move=true})
quickEntity('i', {show_tooltip=true, name='iron mountains', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
quickEntity('=', {show_tooltip=true, name='the great sea', display='~', color=colors.DARK_BLUE, back_color=colors.BLUE, image="terrain/river.png", block_move=true})
@@ -107,9 +108,9 @@ return [[
==========..uuubbubb....._........____.....hmmmm....~~....uuuuuuu............._.__._ ...ttttttttttt
==========...uubuu......_........______....mmmmm....~~..uuuuuuuuuu............._.... ...t ttttttt
==========.....u.u....._........_.....______mm___...~~.uuuuuuuuuu................... ttttttt
-===========.=........._........_...........mmmm_...~~..uu&uuuuuuu.................. ttttttt
-================....__........_..ttt......mmmm.____~~..uuuuuuuuu................... ...tttt
-=================.==t........_....tt.....ttmmm.....~.....uuuuu..................hh. ......tt
+===========.=........._........_...........mmmm_lll~~..uu&uuuuuuu.................. ttttttt
+================....__........_..ttt......mmmm.llll~~..uuuuuuuuu................... ...tttt
+=================.==t........_....tt.....ttmmm.lll.~.....uuuuu..................hh. ......tt
===================tt........._.........ttmmm.......~~.........................hhhh. .......t
===================t==......._..........ttmmmttttt._..~~~~~~....................hhh. ... .......t
===================t==......_...........t&mmmmtttt___.....~~~..................hhhhh. ... ........t
--
GitLab