From 87db2326b40acc6d28f391cbaa35e8d48e049aec Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Thu, 14 Jun 2018 01:35:26 +0700 Subject: [PATCH] Added missing maps to map_cache and its mapflags (#3198) * Added missing maps to map_cache and its mapflags * Added nowarp, nowarpto, pvp_noparty for RWC maps suggested by @Atemo * Added mapflag/gvg_noparty.txt file to ignores party alliances on GvG-enabled maps. --- conf/maps_athena.conf | 19 +++++++++++++++++++ db/map_index.txt | 17 +++++++++++++++++ db/pre-re/map_cache.dat | Bin 2205358 -> 2221577 bytes db/re/map_cache.dat | Bin 2376864 -> 2387096 bytes npc/mapflag/gvg.txt | 19 +++++++++++++++++++ npc/mapflag/gvg_noparty.txt | 33 +++++++++++++++++++++++++++++++++ npc/mapflag/hidemobhpbar.txt | 19 +++++++++++++++++++ npc/mapflag/nobranch.txt | 19 +++++++++++++++++++ npc/mapflag/nomemo.txt | 19 +++++++++++++++++++ npc/mapflag/nopenalty.txt | 19 +++++++++++++++++++ npc/mapflag/nosave.txt | 19 +++++++++++++++++++ npc/mapflag/noteleport.txt | 19 +++++++++++++++++++ npc/mapflag/nowarp.txt | 19 +++++++++++++++++++ npc/mapflag/nowarpto.txt | 19 +++++++++++++++++++ npc/mapflag/pvp_noparty.txt | 7 ------- npc/scripts_mapflags.conf | 1 + 16 files changed, 241 insertions(+), 7 deletions(-) create mode 100644 npc/mapflag/gvg_noparty.txt diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf index 20bc40f704..e7972fa2d3 100644 --- a/conf/maps_athena.conf +++ b/conf/maps_athena.conf @@ -1326,6 +1326,25 @@ map: 1@soul map: star_frst map: star_in +// RWC Maps +map: 2009rwc_01 +map: 2009rwc_02 +map: 2009rwc_03 +map: 2009rwc_04 +map: 2009rwc_05 +map: 2009rwc_06 +map: 2009rwc_07 +map: 2009rwc_08 +map: 2009rwc_f01 +map: 2012rwc_01 +map: 2012rwc_02 +map: 2012rwc_03 +map: 2012rwc_04 +map: 2012rwc_05 +map: 2012rwc_06 +map: 2012rwc_07 +map: 2012rwc_08 + //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- diff --git a/db/map_index.txt b/db/map_index.txt index 6d4ee0e7ba..469c63e9e9 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -1030,6 +1030,23 @@ com_d02_i 1@soul star_frst star_in +2009rwc_01 +2009rwc_02 +2009rwc_03 +2009rwc_04 +2009rwc_05 +2009rwc_06 +2009rwc_07 +2009rwc_08 +2009rwc_f01 +2012rwc_01 +2012rwc_02 +2012rwc_03 +2012rwc_04 +2012rwc_05 +2012rwc_06 +2012rwc_07 +2012rwc_08 //====================================================================================== // - Other/Extra maps - diff --git a/db/pre-re/map_cache.dat b/db/pre-re/map_cache.dat index 170a19ffbe1f632966ddfd2855d5c8a76be8929e..1034587420212c2f1a0286fcf0e75001b049afd1 100644 GIT binary patch delta 10172 zcmeI1cT`hbqK846LX04wp~F=vA{ZbcbOfXb35tLSQl*5Bgr>9uqQXTCHb4SFI#NYJ znn-U_LKQU96iMh^kpALz^v#<)gLmB-=8w1T$@;RA(~`aS`R%j6ee&9FQUBT+N=>(q zBtZ2dnC=A~b(%5&h00=ltSz7tR8%&UR}K{w)z$dvp6Y`^{Cm~)R<|F!b~fmp7J$K zm->7)CFy?jP0C4aBTRxDw5=@TtxvPle_I+P8n9(lkxbnBlHUs;`Ky13JsIH(E2ZDobt-LX_2$nRvinNi0IwX6yPsA=dykkva2YL*JN%sfN> zO7rWJIa3YBmqImH;ZKvYr(D0hYr89Y)uMKdv@B5)TFw_jT)Y);&5^SCSh^>5U4utB z+0N$#wZ;HJ%JW1@+t_}1S*vi{aPXRq;rxE__eNG~&Ls_F2R=E1M!3u+InfAbMTuWk z^eV3vpRet81w=V~z(s>>PKDm;Ya1CHYLO<2dR!mJq9HKol6k*$VN})KU(1*0BdqUP z4ZP2JRS}NJnX;Y=8T?y0C?(ReR=9UqyhNb#N5x2es~GQZ zE&EpXU=S2Ub82Dx?Bex)S|BvvQ86XAUpQ^Fw3ih`A5v`zWh6IDxfC+8AL|(#e<~B) z5O&wFCPGgj1qz{Te^x5dZNknG5y_RYA^UZ2$YO)Y%l0Stv%_J&`17bj_h#MAb6@wY z{_1Ogq;+d`=@2IhB2n+B1_BW4QZ~G}{9!il0yy9p)?z&3 zAttD68`^oCCKu__^rDF4T^7Ige!iaDcMBW#K^-5)MbKyNUk-$Fln@Fv-fM3LJ&P7^5H9VEHQRGA9RVL1J*Oau})%&81 z-eP*i7NLQyZ!@OR9GN`7R~+PjNN=m0t4qa=jD~dSHTs|nv7^#%4VFybsw$#Vx}tON zm=^EWk9vpy%Wwm`n(m*68~B6imi|-e{&~28T}}7T!wvkq=|=37?w^Mn_z$LA=6C7- zdANaHP4~~k4eV;Ve;#i2e?Q%JP>C3qdYX5DBveB3`@P(Nx}PeR_P1Lh@x3=ui;7Nf zad>-s^k_rF6F0{*ZxCq{BGmNwK_=(O+7YWOd?^h5P}C}HwEN*%eWgG50rbu{wxlO6 zCjFd4cfR}j1*Cq3oW5aXs>qOhbUM-p#-q4mm#*K6Z-bQ(pRqhBrzOEq8y65WQua7R z?<8?_6EElrh!+k3e6rG6vrs8E1NdHu8deVi$=8VJ!!M%ZQW<+mws>ZemY*LE;+L2fTp?us+je@ z=QD=|UQ{>hLCn6+!-?tatd~n*ndzTdsk-OxSs#EcO|2^GPoG7BKq91rY zedC5GkRCX6_AF)Hm1@{$Q7RPNMe;-Wct(2cKHLH;Y*dIU{lk$)Ui+~(kH3DiZ$2yI zg4@JojeB*EeLpQ4wRln=1y@{NVn-{w_|8o_AQq#LYL#bE*+^xCI^xqz2W99BJK`iPQ%$XS(OWC?}Lh@;rk+{FUp3-*&1)xU7S(Hk%|$v8^tB z^>J#E5B{jSZi0VSEb6v$g05{@Km#0w_QQkWV#=hjaqQS@F(X263#|Ogyg^ zqxy&2t)A;c@z+9)kg{G2S=ocNh0Ahrjns`C)+Tx<^*x>TedbM%tp(uyCS_Ua4 z-lyw0i-2O_7|P>`h0lx1HSBXmn!W%@tRnv5lSB6L_z8G%j zve?>KtZeP%t-P4_++Y*~e&loCU|(cLoo{U1q*f#T)8}FqR%smqPWLn?EXrY~;)PZp zG}rm9%5^(9YTy;^m|FKCl(VmvSKXFrZKFN$GPNZjciE?6-UH^6KO8<@Nn_7>vZ<1I z!7n%v5olPA7I{6?Fnfu1;?zha2GQw&)Qmj!vd@8}^=H%my~6&tv-tb`|B;SFX^Sck z$B+2YYf%R9_SC1Sr@r-C{qHd&(rl;oCW5!OTl9Hfi-*&OT}q+8@28l0{~41Ex^e!h z=j%y2%Aoe^68SuW7Z?^8n^Hj^kn`(!7ee6mTuv-tz$^auRssLnpCmlr=)(j#KjgZ! z)x#&iO)iQ~D}~`xqCaO$mgTh+m(|wQ4m2(7E1xwr#1ZsD%f*1Cac*^V=!0f>+Bo-b z^>9=!#yiD>_G=}uxay$ca&8+Z%Ec#%SXAJ0*vkP=4A6s%F5#B@|Z5xp7X=jzibSlb+atcbe$ZNWtP(UJL2FGK%hY4w+ z88au9kxB{LR(4M0@Y+u!4j@;5CDk^oh54fk3wZ;a zj|u0z9{I}Md1mqYSCK62@scNwy>e1MdGc9P(ak`xD2cJV+&I-LY$Anm2Eym7ST5SA zpth;^&ghX^qvWj4I?3MmjlMhDXlzvuVFrKV(O`8g_GQeV>5wOK;p*yzcjTK=MqaKL z6P?KRBocvc))#ak&$rK}d(ZuPp&9O0Q+Tv@$nhD%YQ`a3^O~o}_Yb}+QNcTT>e?ys z=#~SjQD@}%B6DBIE7)HobrGglY6zkL9W`fdSUg?(&~_`ZQaeM;W({>ULFmi9Yc6N>_{) zFNJd4&Tf(tEn=R8CYM~~QRfob44WVA8y@Nfu5KG3wgi^^*I3#ooKI$Mo8NOcoIL2u zqk){-T78+5ngnpXzMU{2yVzYJ$`E+FRW>DnL2)&;lx%CKtFRdmMOb?p)=zURR>+rM zq`F&nn^ewfE~IiJjH!S}%$&#bZn3{oa(3wdxR35&3o%8!I&9pWQ0uIoQS=Sk!^g<4cj}vkOxYnZ#?k z-6AB#wDwmn4hvj9DG7l_cYO(1rm0Jad2v7x?jL8}@s_nO;(lHI&6wT zRY=n&gmC(po6V}S)y(KPz5G5Jn4afQiq9^(H(ph?ZSg%}Yb!>kPV`MBbEX2G^tvL+e zp7wHKvGS%)lmT0~b60$n@vnFP5oxRtq?n`M+8P;sgdTJxg z0s6k6x79|oAq>eA#m|A~nLX1~j|E>_Fa{5ve^MVaLU>*@a`JX-=N|V_X6;*YyvF(9 z@UE8mRu%c?(J}r2?)JQ4o@*H;UiP(*YVc}~#?=CupUf9!3;^(`!eM#wWv+oWwP!;w zR3tDArP2M>x}J|h@=y^_Jg(KNgJ0*D!jQ61 z(<|rn&&1^24&e~SZ9(mB$c3kvODpGyBw-J#k)Y(I(R`ulnG&5tGM5$UV%Vpf82w{T zDD0Isn#)RlMF)sWHn{K2vUgKyotrMfFscaKGqVQ~p29%w;MaEsj&b*iV|8Y?{O zy1R^)Ro$cC(Ve+ z+ZGjrSP4xkj);W#$vMW}#h%Bw;tF(<1zFx!YnJ&%i2;|baWveGonsfBOxdGF$fbfT z{d&k;;_QTEFi(AJE_OoTFi9AFL3XK>lPAh90*qW{B3)%`LwSDmKrUw&hcFd`?OyVQ zmQkIPvY4qFAke~7LTF`DZ>xD_a~e=R;doj5CgAZQ2GTu9GRwz_)74NVm9vagh3>Bh zmy`D9^8y@GiG4Ju;$?6xW5ZvvFA%EaruJ)dUvpdazA`dVy858lX&8Jd?vUoyKq^n> z*_IbjHn&&a;|IJ_Ox-b>qDS1{%H7Cy?I9fZxQG*Xw!KFaBrKCkR-jX_EIt9p3g7R~ z?qiOpsS}nx%KTgsr?;6MCJwd=o%%TJqv|Bv6#D^aX2}_uum~s(S&QWD!wPS++Z@(h zs5q?yXr(+DVf{ruD8I2d6C7|b53X7IHl}c>SH@AA{8gdFm*YQPw zGD?Xu>l6g6Sl%C{CK&SB%Z(5<`BjNwE#&2K`U-v!#0COwf?D3Ss^YH=Qn^JP0-~Yk zpa)6**uWuKa)&&5kK)`acjn712L zpK8Kfu%n{yzM%smDJTz08n!+9mG!$ql&{3eLz(8Ryg?$tlDKJq0 zQP@ubOyK|pW(q764i;xBvr2qnbi>%#S~*)-L7~OL{A_ged#s?LVS;QF*eM*MaF_yw c0tW?73S1PpDezF>rNBplzc@@#KrrZk0B(+w;s5{u delta 157 zcmWN=y$ymu0Dw_XJU~G}P(e|CHlU$q96DQS8ZNGJ36^w*CA4!GO23!9=SPX@I|wRWy%}x%$T#7 I>#qDg{`T8DmH+?% diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat index 603532349ab5cab3cab6864dd5cf3f0e6846c701..8af147a7c6e5276fdb74bafecf2c25f1aadc8146 100644 GIT binary patch delta 10159 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 G<$nOhm6i|y delta 164 zcmWN=xe3T=yJ{lmt1kp4Y%~@bH{)o_dM{(6VHqo^TLEFGv+K