From 9752f1110dcc7040779316fa3a5c30c07274529e Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 20 Sep 2010 16:15:55 +0000
Subject: [PATCH] Added naga tiles
git-svn-id: http://svn.net-core.org/repos/t-engine4@1253 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 2 +-
game/modules/tome/data/general/npcs/naga.lua | 6 +++---
game/modules/tome/data/gfx/npc/naga_myrmidon.png | Bin 0 -> 1073 bytes
game/modules/tome/data/gfx/npc/naga_psyren.png | Bin 0 -> 1312 bytes
.../tome/data/gfx/npc/naga_tide_huntress.png | Bin 0 -> 1130 bytes
.../tome/data/talents/cunning/packing.lua | 10 ----------
6 files changed, 4 insertions(+), 14 deletions(-)
create mode 100644 game/modules/tome/data/gfx/npc/naga_myrmidon.png
create mode 100644 game/modules/tome/data/gfx/npc/naga_psyren.png
create mode 100644 game/modules/tome/data/gfx/npc/naga_tide_huntress.png
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index a0aa028156..c99f53a951 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -250,7 +250,7 @@ end
function _M:move(x, y, force)
local moved = false
- print("actor move", self.uid, self.name, "::", self.x, self.y, "=>", x, y)
+
if force or self:enoughEnergy() then
-- Confused ?
if not force and self:attr("confused") then
diff --git a/game/modules/tome/data/general/npcs/naga.lua b/game/modules/tome/data/general/npcs/naga.lua
index 1107d739d9..5af02caf1d 100644
--- a/game/modules/tome/data/general/npcs/naga.lua
+++ b/game/modules/tome/data/general/npcs/naga.lua
@@ -45,7 +45,7 @@ newEntity{
}
newEntity{ base = "BASE_NPC_NAGA",
- name = "naga myrmidon", color=colors.DARK_UMBER,
+ name = "naga myrmidon", color=colors.DARK_UMBER, image="npc/naga_myrmidon.png",
desc = [[A naga warrior, wielding a menacing trident.
Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
level_range = {30, nil}, exp_worth = 1,
@@ -66,7 +66,7 @@ Myrmidons are the most devoted warriors, following the orders of Maglor whatever
}
newEntity{ base = "BASE_NPC_NAGA",
- name = "naga tide huntress", color=colors.RED,
+ name = "naga tide huntress", color=colors.RED, image="npc/naga_tide_huntress.png",
desc = [[A naga hunter, wielding a long bow.
Tide huntress wield both magic and hunting skills, making them terrible foes.]],
level_range = {34, nil}, exp_worth = 1,
@@ -91,7 +91,7 @@ Tide huntress wield both magic and hunting skills, making them terrible foes.]],
}
newEntity{ base = "BASE_NPC_NAGA",
- name = "naga psyren", color=colors.YELLOW,
+ name = "naga psyren", color=colors.YELLOW, image="npc/naga_psyren.png",
desc = [[A naga psyren, she looks at you with great intensity.
Psyrens are dangerous naga that can directly assault your mind.]],
level_range = {36, nil}, exp_worth = 1,
diff --git a/game/modules/tome/data/gfx/npc/naga_myrmidon.png b/game/modules/tome/data/gfx/npc/naga_myrmidon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7f5cea8d00f0e8715007bf5ab97ef0fd2bb5a50
GIT binary patch
literal 1073
zcmV-11kU@3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ige~
z5D5x^E5>&K0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~000As
zNkl<ZSi{|yPe>F|9LK-Uf2o0^tVoEoAt*!#LG}=uBMOm11R3JN0@q}*AZQ^$Nzp~Y
zP+<cPiicG&4~yVI3_V2BnrXC21`_O^1o0q>?m@>@<aHR|>&@=W{!<Y8UG~k}nfZR+
z_xF3h#}F$$#8pNTt~f3P;5u2Qu9H=IDFDvEY1oUJJYL%5@lqpk-#|B@xN#8(4q%s3
zi3^z;!3o(yN=iz?;JEmC_y)QYhR~$I<MBY2Wrz@VDV69sWVV#SY$@YoF{aCl=yZ7z
zjT>M>wh#s(3Ni?`dMIv?(kcKza3xzE3#q7I_7esYcM(p=77_>qAW4#LU5G(St2l^J
zM1x2Y3r<{dD8%~uy5>Q;wx~O1!CZ(2p>ZJ8b|WW(E7@F_iL*IZz#dmI60s99Au;F9
zz$uj^iQn^SmY}!@D98u4w$(W{_W9Lo`R+Vg^W?BP5M9xAK&*IY;FLCbyp&n*uw?=O
zsw-8Yt!-6U6tAxQ_pZ?$4~?ZBNGxZ83z<}eu-X;f`wH@b&tHI>zwhCe?JWSHHBTmy
zT!^U^H{*yj<A?x2N8b#_of%xPApg7>`C(Y3G1ow7wD&#GSeE|eD{h$P0Ra7-b?6#Y
zonW=VpjxCuGP2;HY>S#6KZlV6DMsQW3l56&4#!?Z*A@ZOIb7W<^tKIi2<Af1?Lz_p
zo8E6Q3(p!wN~9(eYAGqL0$p3g(#Zgp=Q7Yxp`f=d16I2NpC2eLivKK#n1azA4`sQ0
zQPa(>>-lq?0>HR41KrP3;g~#y)voZ>izzf)%8=XpA^sGw3Pz2rTkQbQHK@SR1{J~y
zOmAqnS$l2a#T+o&zq?&eHUGbx8Rkw5ZR7v|e%2PkY$*dNt>Q(f*N9RQIYjcOX0hG)
zh}TIw0LP>XfysRgZRGGHTHFCKI}k}ctuPD8ru4A+YsJ}U`Sl$geKWjZMF73k>o%f9
z#Q|{pLwAsoco=|@cv@jrMDd{SfM1K2_jlGs6xXC+?sYjASAOhpVHU}zbe!!SM|9v|
z%E#y4+}Y=axjD8=;%Y?Mjl~H14sf=29Je@I@g@L=EtfV_C~(_ysS$+kVZ<y=Hl=gX
zX!h4H`$?$Xn`67gy`*+bvn`ii%7+PCF%xIkMiC8y13Y}cOd^Seii+a*Uw$O9KmZ7X
r&^RDM=!xt7MiUny5^lx+_1E!V10T?3kQJEW00000NkvXXu0mjf$9~ua
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/npc/naga_psyren.png b/game/modules/tome/data/gfx/npc/naga_psyren.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8a4227191ca5c19facfd66cb4ea096f6013a355
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ige~
z5C}0SJ021M0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~000Dc
zNkl<ZSi{AaT}WG39Ke64e$d2+t3~RjM6sp?DOE`=V=}~`+ayDobW{4Up?PX4WBA}+
zHYh?Lig_qVgSHP*wx_KV!BVFWVo|YlOT#u5!H<fDj_F{U2aP66&mQ8v-ozVCl(F-2
zb8m9b?|1$m=jMtwxy}DM&YX6FK9ME+M3y}1{ppFm@PyrxjE;i~VHeJf+d>ZpP!t7=
z#iE_J$!(E}fG|pdXR}p0bNWT1>wO|iDvAPt#bVLES3kcs{G&K=3iNPK*eyMnr6=r`
z0M49#;R(B?qA29%=3=o}@caD)gFyiNem?+zIzEvAJtLhmr3iS!ZmEVjJ_?@ARw>Rs
zMo|>D{`wkg=|fB=69X;TT>pMcJH8xqA${Y~$!&ISp05_kM_@nap0N8+3dFg`$WT|z
z@4PMtMU_<m+VSJoZkoDh5H>r>M8UWVbj8;*(kZo^XLJw<1OPCZOd7=Nav*GWEhWIQ
zD?eHw?20*UliMN?2pqb8wYCFcvm<PFuGV(o_xodt^5*$!A#8SfHzs6q0{Z}G#%<x*
zY?W#r0p#DGA~L_Cq@)DGE`q@zUY7&u8%O%a@wyx_g{Tg-9ui5!2<X9kFN(FBJYlz1
zfJ?vFxMKU3;nugA40W;Uoo3ZL&19&HftGB%E(eiF#84us6gYGGH3_{Kz}CtKSg-jQ
zXvrq+Mn3>+WmBw`O#zU0qn}mpG(+tbn*6Q$J7U#4olwHC2J{^uedF|QOh_5(;!5>A
za}TZqurg<*uJORLu2HfwXN{SscVj~KjC9JP$|^0DNk0p2)!z~NUbdD#WOjBo<~MHw
zg1SaY@#Q7n1ftGgOqyfDt`=#cu1G(sMWk<BGdGz`?5+QV^o>(gS;bmtiZhBNuXc;|
zu@aV-mjEkiX=yZd&+OO1uM~_9ij>>%X??RCs%ek~_q<vtug$y=dLe-2<z?QvoK9Zt
zR<t{SpLh0%L?RT74vK=&LGk*-rqni~r}fP;vKu7rtSKfE`W;Ob%LrMy|K&RCW7(|D
zA1w6c-an||lp>&qM|PtRnEYm!wrXLsliwWOD=uAx!cs{_$jaKhps-YO=^`-_Lp2RD
z<(*Jnx&Ek1SU!JnuxDjP3vXc&78aug8O~ff1Q@DmkVlDVPs5>_2B{CbI^rXuj_JA(
zYh_c~suvca@b~w)_sytK=Q9E}K6@ezyTAypURUAzo8Nb~%Z17+SdE_NWkLnHyc-9K
z7a6K)kotL!{ZAO#4bu4RiHJ7`sPN`$eO}?sCDDrG@6}5g3Y^U^I8tiN*)9QgUM*4n
zXom7fGXR*2ig|w5Et3^76j0&nG3$cW5Ds9zU}fjkLE-JJu3#=I=C|*L6Bb>(NP0Yc
z_m9_yB=pdDxLGG?E-F6xd%;H|KL|bCXs9qFxEg^|y_l#GNCp}YKXn8EYCZRbJ_35E
z(Tep@J-qxgN7C;FBGJ3y^Sf@D2&#vxg?AG8kpg;=<De&nCnaDc5)VHKIAwwVYWxdF
W2P`Re7)_o40000<MNUMnLSTYqw^YOc
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/gfx/npc/naga_tide_huntress.png b/game/modules/tome/data/gfx/npc/naga_tide_huntress.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d422e6c0d5778f6c3938d64c2ccd5183b9a435f
GIT binary patch
literal 1130
zcmV-w1eN=VP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ige~
z5D5Z~@J>Yl0013nR9JLFZ*6U5Zgc<u0000(a%Ew3Wn>_CX>@2HM@dakWG-a~000BQ
zNkl<ZSi{AaUr1Y59LGOrb!CG@D%!A0O?1&{A9OU6t_xy~2o5Z(dvM+BHYUF8sj_w0
zJ*?}4&13g4aqeM{qYqP<FhTr>1Xk8;tBl$Fd8i2~%`BDFb|AH9581gp_vR+OMp=Jw
zx#Zk)&-eTL{=VmTPsIE35zjMT;5kQCr7vbb^vL!%{x*K!AATtIrNH%`Q*tlhN9qo-
z_VdfeSnZ@+9(W0=LP1#-3YJ`0SHOL=wjvTH0=fzccrv<foBd^X2LK=CLI6Dc>pt$I
zwf~O^8~oe&IzyyWE_|IKu6Rcc5{*AJ8c9s#R-}G+Oh9G-BpMT`RLYb+Ksx0@1jBq6
z9sxiE!$ukOkg-K3aw~Gg(=8kmP-STGR0H7m`%TY})E#1LbC<E{0Yos22!<J(9xxO*
zkP@_bs!8PX0O$$;Y;Eou=995SWNgtWfv&(rZbd3(91$2=x?#wa$mMwwjoHd}t?4A`
zl#8q9pK{L^;hrzTi*H5%c<+x^W8R3TTPT8iR-mu7-nK7XYdXnB$0`l}Z2;nl!lh!P
zW7R}LmB?`?99p^|P7L<QI}f(YzLZY6$Yk^Mo+<p!WTF3+r=~f|`Q;2~tAMY@#pSKX
zWxM0n=5Engprvqc93HFOgkS&kg&e&42{-#{xY<{O^;zTa7~Wf5jGlXBWS+@ll*4<g
z%d`de-H0|X4it@zUz!tv7C2sSzLWw07q9foiWCsRFw>t#iY8e*+41^9<_pV(E0ZmZ
zjbEA*0KU!;PU>G|!Vyomc#DYC7tzV71s9f~_e=p)#lkZ1c0qb4`@igY;Pv?jFh5&V
z0%gjn8AyKBg|9QjonN8=^nSd`J3Xi5bpU1!E9m{jE`;?+c4Dwc0>)1G?b{g|+zD#m
z9WC;P%2XMyZhY3X*5SZ00A6bH0MP&0H{zKl{BwFq_-b6HF&!M>Y;&7QW)TeY>aQ6S
z=;6RIcH(#cBh&6>@y9QvqY}*D&N38@3A;XUdg=nn^*F7>0oYmFFg@Ri-!;GuGVNY=
z);0_h;j^EMXMT*TLcyZ?ou0a22K#qWfc)I=rp$Hu^?3m4<oB{HfkZA}@^hSAkDFxG
z6|e(W^Y+|`N_~!-+XA)<RQJEexyc!!RMWwAlKT6$yTI;D_yLcFk}kO(r@1X)D4|GL
zy<n}qPN1Rryr}q0sK8YwRuKJe1qV#vWficV4Xx(Uy<k<MRLynwJ0f6v7AQlaoNCt0
wD<<HSh;Fu0;QRV>sxNAFwo~wZDR5Bn4@G;i*RNm+$N&HU07*qoM6N<$f@3lglK=n!
literal 0
HcmV?d00001
diff --git a/game/modules/tome/data/talents/cunning/packing.lua b/game/modules/tome/data/talents/cunning/packing.lua
index 81037929b9..21876cbada 100644
--- a/game/modules/tome/data/talents/cunning/packing.lua
+++ b/game/modules/tome/data/talents/cunning/packing.lua
@@ -41,16 +41,6 @@ newTalent{
require = cuns_req2,
mode = "passive",
points = 5,
- on_learn = function(self, t)
- self.heightened_senses = 4 + math.ceil(self:getTalentLevel(t))
- end,
- on_unlearn = function(self, t)
- if self:knowTalent(t) then
- self.heightened_senses = 4 + math.ceil(self:getTalentLevel(t))
- else
- self.heightened_senses = nil
- end
- end,
info = function(self, t)
return ([[Arrange your items in better way, protecting those that can easily be destroyed reducing their chance to be destroyed by %d%%.]]):
format(self:getTalentLevel(t) * 14)
--
GitLab