From 64977e95c004fa634fb6a997eb7926e6f51d66a5 Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Fri, 26 Feb 2016 09:09:08 -0600 Subject: [PATCH 1/6] Update Globe Theatre Buff. --- .../components/ConsumeLevelComponent.class | Bin 12184 -> 12063 bytes .../threading/tasks/QuarryAsyncTask.class | Bin 10941 -> 10845 bytes civcraft/data/buffs.yml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/components/ConsumeLevelComponent.class b/civcraft/bin/com/avrgaming/civcraft/components/ConsumeLevelComponent.class index f3b839ded67728ffd55c26dc9f34dd166514de32..e2765b6712a1ece643620e79d7926697c28fe924 100644 GIT binary patch delta 1944 zcmZWpX>3$g6#l-M>3cKNS4ukFraE1w=?tBjPAzpEKrK>e=|Z7EK?PfB!CKowDaE~_ zh)P++t585$L>y!j3QSu-L1RKR#>5|LV$?+94>iQNB<_mmO>2qq&pYRR_ndprJ>Pdv z|6RKmkALs)({BPOnvC2U8$U*K61Tnn@{AaoRmCuHr36A>f_WL?G6Knd8hg#bs`t5 za9Wn5k$3BCBD`{BhNr!$wWIj9)}HFlWd@fZO6aSbx;k1rmf6{&7NuR2FZexdC7fL? z?VUX>mEA4vM8bs1%EH^7Y-795`_!?ti8&o;CX$zTwRUvZcQ-9*o7>g2q{Yc%E;qP> zU5e>bY~2P|sj2A~*{cdNN_rc)#^B@Tp$RQrU7cM{kZTR*qssKw8Eina1DpA@!Drx* zsG70`<2|jP| z1ru~smnTc=v{?VFhULd?ALh+gG_1AKlV;m{xz;u%ILup!VcteWY*D=9whg0%=FYWd zV$m>1&q)Yg@wLE7sIR?VPFIQfSMf&W&(D=_MSig$_vd@8rx8~D`ICBo#8&)-?f4l- z@e5AiSDeLfIEUZy0sh37xQK6Y8JDC9I>~fe=%rOCP2jcEM4t{;(aAa{at;m7qe}#l z%H>RB4>P%eZf;=~x6#9c%;petc$&F9O{^AA$8w2G=6Kkp@KWfk5$_T{XRWMSs3XQ%f?1g^yVQx7KreQ3 zws;zgWfwD7XRr-(q;g3XHI=YlJO>ZL#kq2r6J~jaloBuMxdLzXJV-YZq3O~O_;hK2 z^d$~@;ruU1(IzGWp388+{=YRCs-qx-^VGV6yV;<=DJYKoOLJ|M8;brVxh5DIW7rl~ z%Ghs0z-<#D#e~v1zUzDo2C-j6b-Rm;VmKJX;1KVMGR4esYbU9Ryd+f}@tI2az*k~x zmH=h-PYo<>h{72e=N=d1y=h6ikRv(ncurbUjOJ>^=&I`UXH<2@xKc2$85NQO#>yCp zbw)I|COgR$Du^9_uQ)C=OkuSU(#AV@FWbc`9^fIisSo`h^^VY8%HB9-7Tm&>Xcs1I zsAY4U+61f-!c59E4C9kHV>&(+l1;|!qT2pAV-DtE1$#{HScqj@EnXr^v55DJC-W2a zG-Z^;*&>Js`4GmjGk45AGU{n##AnI-uTbTMJzASKUzd8{D)eNwU6w6uBaDu4EVJri zKB9gu3{7}cSdhoJK8Arf1&;*=u;~<(`5=!42KmHxtQGU5ni-f-^VHaa^%VL>R^5Sx zl5T4}h4p~}t{;mCN~g`B0ba?H$UZaDL^rB)fe@cnmja#)HI@~RXda2!s&a#a8QY~} zL<^>Khj+~ACu)T)acl&V`-{%?N#-CXfmU! zsHlnu#7|S3iu`;{#fqw|2YE=@!V&9X9#LiCO6yVS@WyZ?>vc4b7J0o`%C2^4?z$L{ ysV~C;>j|DzWyLO)SM0H#iu>32V-jSM!7?N^OYZf944h%{{~EQMrIgdRy8i+0NyknA delta 2075 zcmZWqYjBj+8GfGK&G+qYz73eol59%ICYamqW)p}Va5YG57Ge_uCO`lc2qpwj5=gR8 z+S;h4RSEZ_C1}0T+O>+5OV}i$XuS-!!;jvaj*P8S|2dsbZ9Bb=HGR*wVLP4v+4G*~ zy`1+u&-0#rcH`Kl*+2dK)yn`H_^t^Du}F10gDT{icW(J;ewCXy6FI~CcJ;>HyoE4B zy}Og!_r$$8!A1+GxrCToy+M8GEzb3FDQ`E~M3hU7LiL9NU(uJ4lKh_DEy=!IRIrhnsc|B>RUY00TOz&Eg8StB}9+3#$+_c_-o9(Y>d;E;+pY z{<_ZIVK2x|wZZ=ux2TeWM)s<^3QCPW-Oo1lV8O!r9Yi41-QN@H9|$E9p}pNhp{;U6 zPnquVev3PGTjt*G!T#<2eQpjYZ=l}TZE=u8YH6U*ljL5Ldx%>5LpIKt_9 zeAVLD_;qzA(CGSx#S!(#z{h+{{bJ67k)<59c+mdd-oe3vLEYqGi}TT{t)mw2MUMwZ zc-*3bM{Z?B)4D{nMxLX7QxPT+2IFc4^=#i{I6NyK{BZ^7f|H z2@O7D@mURe+7h!QwRvS%yM~{)cuE~BY@hQY!D=^OlBLeg)3VgKc}D%U@TlvO#n&!8 zR`i?NO+u;x{z#w?kRrR ziLU)lmIPeSPe)yiktwzkQ(Q^JT`9a1bWLFab>()QSUbg;b8;g8wTV%*x!?kc=6)vy~`(U6GXSq%+6T2jG7H7jPjW@vLdbpW~ z-*AI?9jrl`cM0a?ViEJ*V&$+IPw^hH4Bm;ul3O=h(hi}68wC_a2}PU4^6)DB+$@KA zF(M6F(u&=bdgR9Po^D`Tgl3qaiAqym0-ChJa(Mq2qznTV0wvS%!2N$d#6ClXiLH6l z$iH4sW=yInU&R*Qt9Dh?#jne#J;j5y*G04<63r^XWh*he%?SrxBGfcH)CUz`tnATx zPjjoE+ePfQ&hJYx-`13o)s(uaGQ?)JrgDL+f0Fm91C_TYc6FuTjpqgP(i{%>oH1AJ0Zagl!#kp2t*u zIKUHXSvXqyWY!;@@!Q!wne3<4F^POmrNR@1-;wOC&MKgk2~w%GrkS&zuozq2&>A6?z>lK=n! diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/QuarryAsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/QuarryAsyncTask.class index 82cbf6e4f88aaf1852451e41950c66da8edf0c84..ff69b6bb7b2480a930d315dd25a8383d865a1119 100644 GIT binary patch literal 10845 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 diff --git a/civcraft/data/buffs.yml b/civcraft/data/buffs.yml index 7dab44d87..3969c397e 100644 --- a/civcraft/data/buffs.yml +++ b/civcraft/data/buffs.yml @@ -316,7 +316,7 @@ buffs: - id: 'buff_globe_theatre_culture_from_towns' name: 'Globe Theatre Culture From Towns' description: 'Increase culture by 10 for every town in the world.' - value: '1' + value: '10' stackable: false parent: From 135ee5dbebc00ebf4f95339e6ea3ee910f89b8d3 Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Tue, 1 Mar 2016 07:28:06 -0600 Subject: [PATCH 2/6] Fix an issue with some title's not showing in chat. Also, that toggle text. --- .../resident/ResidentToggleCommand.class | Bin 4723 -> 4756 bytes .../avrgaming/civcraft/main/CivMessage.class | Bin 16658 -> 16690 bytes civcraft/bin/plugin.yml | 2 +- .../resident/ResidentToggleCommand.java | 2 +- .../avrgaming/civcraft/main/CivMessage.java | 8 ++++---- civcraft/src/plugin.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.class b/civcraft/bin/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.class index e44326edf28d1cb3cb7175fe31f0c8890d7d57d9..c7b6d3089db147b371bafa55d41e909f377ab892 100644 GIT binary patch delta 1961 zcmcgtYgANK6#mZ49q!C<5V+N1nV8I?e2i`TK3ace_H@|^euA22fvDDhMd2194%-S4YoOjKD2QJ5n`}6>*40IP!lD!&Yf2-qwnVE zKv?Xy6*@Z6t)h!zHa)>?8^=1V-;!~0v=bXR?!|o!&agL9-5ly(uD8>!=GM=vb)pkd zjt8)wSbtcOHKFdHgdgH~SO#S#f|B?~jz^{35toMeyDan^^lx(yp+@Y=bh~a#t2#%j+taF+aJM+mGiLl-y-nQh zs!y9~j8v=As%B-mU8~coT1a(ATGfFpcTw$yD(gg#RiT@{Qd+UCE`Kp6R}4Uk4ywSCSAgX z#5YgiPf3^X4HAEL0vFOHyiwv?C-803C48C0w@=`&k{jJlL@^m}42+OpBD%Sozm1_k3-4Mhc0 z=}N0K9*~*%EhA){G)i<5Yax(1Q`G;$=(LCbP)Hev8`gM$90UyCUfB5bO-+so6JugD h*PTb>hOnt4#KaF`JlCClYH9{is+FieQ*H}>`3q5)!}S0F delta 1939 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 delta 6706 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 PxQV#Gd<_&Z@$3Huk@@z$ diff --git a/civcraft/bin/plugin.yml b/civcraft/bin/plugin.yml index 857a87d6e..fbb9d6b33 100644 --- a/civcraft/bin/plugin.yml +++ b/civcraft/bin/plugin.yml @@ -1,7 +1,7 @@ name: CivCraft main: com.avrgaming.civcraft.main.CivCraft softdepends: [TitleAPI] -version: 1.76.1 +version: 1.76.2 commands: town: diff --git a/civcraft/src/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.java b/civcraft/src/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.java index 613bf8464..ff4e7417c 100644 --- a/civcraft/src/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.java +++ b/civcraft/src/com/avrgaming/civcraft/command/resident/ResidentToggleCommand.java @@ -38,7 +38,7 @@ public void init() { commands.put("showscout", CivSettings.localize.localizedString("cmd_res_toggle_showscoutDesc")); commands.put("combatinfo", CivSettings.localize.localizedString("cmd_res_toggle_combatinfoDesc")); commands.put("itemdrops", CivSettings.localize.localizedString("cmd_res_toggle_itemdropsDesc")); - commands.put("titles", CivSettings.localize.localizedString("cmd_res_toggle_itemdropsDesc")); + commands.put("titles", CivSettings.localize.localizedString("cmd_res_toggle_titleAPIDesc")); } public void itemdrops_cmd() throws CivException { diff --git a/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java b/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java index 26fc07057..002d313b3 100644 --- a/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java +++ b/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java @@ -101,10 +101,10 @@ public static void sendTitle(Object sender, int fadeIn, int show, int fadeOut, S TitleAPI.sendTitle(player, fadeIn, show, fadeOut, title, subTitle); } } -// send(sender, title); -// if (subTitle != "") { -// send(sender, subTitle); -// } + send(sender, title); + if (subTitle != "") { + send(sender, subTitle); + } } diff --git a/civcraft/src/plugin.yml b/civcraft/src/plugin.yml index 857a87d6e..fbb9d6b33 100644 --- a/civcraft/src/plugin.yml +++ b/civcraft/src/plugin.yml @@ -1,7 +1,7 @@ name: CivCraft main: com.avrgaming.civcraft.main.CivCraft softdepends: [TitleAPI] -version: 1.76.1 +version: 1.76.2 commands: town: From a916498932ffaabe067dc8b54645c76adbeb43eb Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Tue, 1 Mar 2016 07:39:31 -0600 Subject: [PATCH 3/6] Better wrap this one up, too. --- .../avrgaming/civcraft/main/CivMessage.class | Bin 16690 -> 16697 bytes .../avrgaming/civcraft/main/CivMessage.java | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/main/CivMessage.class b/civcraft/bin/com/avrgaming/civcraft/main/CivMessage.class index 9330fc58bd53ed3355e00ec76b7856eb9faf5c30..09775259c9ea572a4d5221ccd9cbb1eac64101f3 100644 GIT binary patch delta 992 zcmWlXeN2^Q7{;&b5fqL)c%XxJ&W1*IKn~}qLyqDBJS8nZ24;|mCOS8?mE{8w2 z8?Afb3i!J*(2a!w?H6kDU!pDE+bOpZ7_Ze2ht|`|`;m_y5ylzJ#aX zQSWX1iV08kFCamo4xgb?@oDzCGHQ6L2C86W;kS#jGa0ZA*_%=?!i`J93?fgl5Lcqk zNhu6oLnek$fa@s74J<_r)wm_nZPa2I+wlk5)N7Zf19$EGK&O3_6ZPHG)B{aDLA+HsMm1fiVJd2whV68tO}%z$I_MD~ z?#zIjBEgyX86W*9LR zVVK1Xa27+1Fs$cgmPFT0IbfE|k=;Dm&6i!N>=wxGHB4hU!mL0ED`mYH?{Nv5xD0)) z#u+Zh&#GNj?|0T9&ea^rH(9~AxQw-2$r`RdQvM1zp_CsB+G49iG2bUrZkF;>`Fw!@w;-Qeb+lF#Yd?oO zP{l9ps_7@3ZBp)%@+*0MZ9_A@_kE*EyDGa?*(=IEQTB_nSCnr>IVeh}^%TT>-${8` z$}UlQL^&eLQBjVG(j!W*D93H)%oENZr0kROq&!dAyE6}@_ruGx`mqDZ<2lS=KVISm z+ZjIZ9K={&Mg|9w#jAE(VV`G6lQ&d}>1+IkO5Vg99MT0Cw)I7E-=A{1qwDdPzSG~B z&HI?k2Por1RPd2ba0e^-pWRX1k!FBILpY2`YN*47?@<6HTf;9J%Fj!)?-$YsR9)jKf;R4ca#wukCtq;}bb1>cRj3 delta 984 zcmWlXZA{Zw7{$-|TS1x>iWId*MCMwcwj&};C`C406f=p44pGYoBEGW4=wcjhDGQmJ z%}kv)ECJ(}N#Yhme5sl;UDPn*2R0OEm^c-c_^#7rz9l;A@yor>J7ANoh#HNC1syr#H7b80f++;uJiU{unj{ZHKY84P)K5V~DgN#qYE`Lr%MIN({UF zz8LyrsPgMjrLmVpd%XLQqDEk%RxgsY_Nx8^1^5#|^q~T0u@Lr6ufYXm%H@Mi zYa=qgM~#ZN<#tunU;v9y3rpkKCY+tcTocLOoccFhxTvu~s8J?pYuXN4-QHj@R zA`nq;D@Q~x`sOl_fGj4Wh@()=BrKsFbxc76omkCOv@#9t>UGG|$#Ke$J0`%z47fP~ z?=Ul37r4MVlVPI=c6yP^9K1&#@)%H19yW3+BFsmW({O?XI4!N0#TaG@?lD9^OIgSn z46>LXu{^pdZ@;y8mf|WDH%DV6J z<+vy@QBI0-%H$MxJG$lkUCth5o-r?q_ow$_Jp1%v&mo`vn9g2&$N>`z4mbuehL@1R zL3nxD>@MkX4{7qclpA`DVbt&@mU2ixz+KZ6ihCX?<)MC$fAvm}P|hc);8Rrc85Zz` zZtxKGd};QSc8+EoBQ3yg5y_T?6w7A9GmbkFk#3E`JS!2kmfgHtw$0&?l8o_|1CuSM fIZ<}Uod%cX!W1hVGp#XLtG!9*7RzmZ`{1iLeVyo} diff --git a/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java b/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java index 002d313b3..3e3a6f2b4 100644 --- a/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java +++ b/civcraft/src/com/avrgaming/civcraft/main/CivMessage.java @@ -205,9 +205,10 @@ public static void globalTitle(String title, String subTitle) { Resident resident = CivGlobal.getResident(player); if (CivSettings.hasTitleAPI && resident.isTitleAPI()) { CivMessage.sendTitle(player, 10, 60, 10, title, subTitle); - } - send(player, buildTitle(title)); - send(player, subTitle); + } else { + send(player, buildTitle(title)); + send(player, subTitle); + } } } From e6839c99d80de10d0b0c614c183361163332aa27 Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Tue, 1 Mar 2016 08:40:33 -0600 Subject: [PATCH 4/6] Remove Battle Axes. --- .../components/TradeLevelComponent.class | Bin 17329 -> 17337 bytes .../threading/tasks/MobGrinderAsyncTask.class | Bin 17302 -> 17216 bytes civcraft/data/materials.yml | 171 +----------------- .../components/TradeLevelComponent.java | 8 +- .../threading/tasks/MobGrinderAsyncTask.java | 8 +- 5 files changed, 12 insertions(+), 175 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/components/TradeLevelComponent.class b/civcraft/bin/com/avrgaming/civcraft/components/TradeLevelComponent.class index 662daf77fe6e37b4a59b0a645aa0c65e75670b90..518dbb7b696a457ce26ed726a5f4c62d7265c5bd 100644 GIT binary patch delta 110 zcmdnk&bYIkaYLMxuuyJdNqk9ZUV3p!YF>PCd45sKO|Me5{2DQPQFkZ5vZQBr0~YCKRTH3uZc v!T6Gqfg2>1lb@HKlwZ!l_?nS{7bE~zGx?O16fX}*D6=RZY~be4QpYp^F%v1s diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.class index 86e997cd6c3df991cdd3691b2726990495c713ca..b5d3097e8ebb4b09abc13a27c240047d8479d773 100644 GIT binary patch delta 3682 zcmaJ^3v^V~6+P!=GVf*blFZDT$;^b1Nyto+nat!n36Yi(J{G7TxcJjzgfK!%NFWJ| zf}e;=Y3bs7&_boQP&Ix)3ur)DB2eX5ixHIyQc#d0wSrhg(L#FOoA)L_vbt7o?z{V* zea^Z2oO=V0FTvfvMC+mJuk8YWa=|WwfY6U@DK2VFw$P7Fo-IH5Buz}1Q#V7xEE;Cb zwPYhC)HcqSun*0%`cr)fV(rYj+F8*C3G?V#YmQuikk~vk8l59ykUp^X=^v6Y45txH zqX!PYBMDAov5X}uAdHQu%Q6|uW6N@NSs`O(Y*{8@6}_nBm?9GPBTIUgSF``2jQwK< zr4kN6FxNz9%%~}sa3G;WQH=-FW}7Q~JA!rg)Rvm&Id#*cO_~w!4b{}CX40sGenif|T!2rk69DB}y2?!Y) zV`|ehPO7H4B^s@-sptIb8fG+0I0?bseSc=Oes;7)!kMeu5idlcDJi_lA3yzZ1RO3M{5&R{8hSf}b}WwB-%!m-M;S-5mhBZ6Ja zdsehQ+S1sdrOuXfsl?$7HFwvI_vRUAt*@IM6O+ODETb!b!7Uo{#(lSF$j}4yk|RC6 z)o>G+jJFoiM-I=VM~tj)k!rC~T@5!RT4FfT&}og0EzJ`C`X*4 zLC-k7xQg~UvyiloV^JPsrE-#g%YCZ~A>lf$yLjUX8kz12|K5n-)m^;zhwdsdx`9@u zJMd3hck%M+Ta;m_?G|Midaj4=V)zB)Fmb6E+)P%N+x?QxsB7Zlbv4x%s&+X7+YnOK z>S~+1Ft6N*>AGyE6)unXDndG2(@LkaWT#$%`smb_nS7B9tzXx}8MyBB4NXA4ntRk% z6H7(>3qlqxO3F%*@GYuwXPEcPP=*Jn)g4JYB;#Mm^W+)rKhY|c5wKOdl(O5gn z0*KdS7zVNhI|UR4pwXG`LIGsfZ%$KPL(7R71BdqXb!FaW zFwHu%O|ctJDZ9|+i5nyu2KH0x!G1)8{adk`uK4}*wck$RJO}m4Q)n!Yfjk!Sn8D+Z zJeK7t=J6`27d?}gZ7$K&qqp<2%Pd_QW$9r@8yUp|T0d2-G}WxfC@VjM?#>^>p%(=m z2?~y-gZVz%k{_V-0)@WFFQB^$926)B&~jc!c|OGRh5{GeUtl+<$I|F1@X?L}o0xh$ zmWv$l(Pef0q?Qm3<8?{EE>DX`PMttY16fobuv_vBRSQ=K8@N1;!9j9qm%y2n6HNEE zr3^L9ZYbFFxVD@;T?~5gURC9incWU8A2H}X)b3ujb~uw-3p421fR$DT6X|q75#`Bh zzCWh}g_Egop`9Wj2R6{~ke~X56k5b%7>~A)f-SU@(KR8(98f8}Xmcprk)VFY+S;hb zLJEgnm`hhfUZ-VyTn)=6{U8t0f^d{7N?rI6T?zX*TC6G$Q(2LZPKFEU!6FA`6a{E! zkwW8n{)Xq(MJ}3MWD}+HvEX~y_PHV(H58lCOV@aHR^6Se?&i{M#lEcNhCs$0lq%xM zNI|-dfu5TC2wz zBV4=*%}*Pid#J~1tsZM=Q)vb}P)qw>u|gM0&En(gT{o|#!(1t6SwCD$qs#m>z0^)i z${e_!)|dJ5N!rWUyfTHpqkIhQPxy*r=w$oEFO@qF4MWjkh+Uh{8j$3@)(WqY;}Z4AHWnV1O#HA0VL# zw&F=V1&Qc^W%w~O%vh~6B%A`nHHL(@>x?8^)e6b@37&=|+`)fTPv99Qf9$%1pW<2m zI^#Nv|Ae*d=6lyx%}x~DuE+2k41i=I$lTAED+~Q}t}G03)!}*k7h`w2YVdRBrU(;U z_T{0d}NBZc+Z&Fci7 z2da(vGXAF>zgY*NU_1V|4XWHD3fu8|8(2pgyFxuZuz>?R zNgO<`-w8qD7}e}M1ro=K*f~@bl4LoF#ZP8X5M)73z|ORjkRha2d*Cf0O|Vsa{s)R{ BARhn# delta 3966 zcmZu!33OED6~6anGVdjMAv5!4=FMa!WSwM^$ue0QKoi-D;#NTfOk)V|z>s7nB!gnB z4c1z>qb=T|NO3=&v@A+MBZ>&tN|Cy2ZKM@kt5!j2tJW&o``)}afrNABKmYyj_TT^e z?*E@R`+kYHUyqK1-#zgZ0MrZFA_xdA?h$dV00EgcS&>11mJGPr@MWbxfIFEn^7YMX+7aHshQ$IE=M2*69ji zepp|IWo$?+>-A-mjLnHIn;0L<`$AL27+I=|sM_WAF0j(*$G1!iX|byi7tvL&0$f6yTzS||Pq=cYbs(q) zlAZlaBg?c7rbFxL7`P(Vzf8hT1kXgHK~@(+9$lt*NLJEq8bX1w2r05{IYN%UNVBMj zP`grq-3Eq?Pp^)lgN2v{8Y8@lURJ#RfzyG;o~!A5#S^?@B4}*8(mHJtG*lLH(pW6cuD6`5EU+N|m04gSfdTb8Zgy((xOJ$J=nPMhZ9PJ^u9B@C z?m+PC3du}91 zPK2FpLss=k*jf2|?p1dM3tPq^&#GpDsjBZ; zvj)r81o%%zJM-0lPH$(iR>VIeyf8{)ON(U5DW%wb;>Fkjv3KAE! zvh(uJP)}!cd1%&}F0C&fiA7~09b^WyuRjuvUli}`>Ym@<*`?{3Wm(A7ZT8hseOpP$ zqUpH{&_$HH$mT1y36pgXzy&Fq!bUX+bhw5KSW{FRw>Pf;G$ z@M@-9KLYQ$;lu7*@8@^xNRhwcUQcGlBQRqJHjY^u%``u-_L6qNC;CxL{Zv{~oa3H; zngDWEs_v;)nB5E;Qe5;xv5#sBQ*#tdno}*a>xh1YRyta|gPtvM(Qt{IJ}FUXl!voa zq3?KZ;<=bdJCCz@T+5@cG!^q`Q|aWo8a+V*&3v=S3#=-V+c?w5;LN9ErP=QHlh8Td zG{ff8m!%rrQ5K+IlqvLDSvl=3bK`8nYA=Ly6=5mFuFIVYMxswLU-SiC0 z-hh)HF1KeTs1BPM&og3w6mZ!O8C6nspqOqAxa7OX$_Z0nAfFD@IJ`rXmL`juWC1?k zNO7dbL3al-nAgpLDD&yBI1B6P(u$yb5_ijJOGQ3T)dO%PO)m7*DcCas3i(xw_S3Mq zQfDzY8I)vEzS%s{N~4?`svOdgyjZU`O8u3K$rn`UNTot&@SMtH8IMXHH}SYIsNfpX zf+h4u&?ROB^r$@gELf14k)q2cca&3=?S4yFB)Z-rb1j_+s#!*pr*Ac@_&F6-X}49E z)AlMiO{)&j(JF=3@EoXC=#grb#E_GgRl9j#oxB;my0_X*!4Q9eg)iAf&sX!DQtzS%cn;Jn?r#l*jMvBFVKW`B zQ$f-jCh<1RSAVh6r*Tk{n8bzPk?0yPT0LDkK3Ye(TQ ze2ybH3diwMea3eFa@FTPd{mzWpU@yQYcA>_Xw|IU&C zSNRv z<{Nc~;U@|{bv=FtXF`Th!LgrntSq#cv9d5zjo@+o7wgVbJMiBen<*?*FUJ4y;U@Vn zh7$aOBeMKAnGq#f_$B}Uo6P4e^>4vL_*D{(ulSQC5&B=+bmr^$HLYrGl17CS5EOZ_ zy;YUIMoyzIUTXEFf6dat#PWEn-!--r;Z0!MDCM?oJK5{Cwz9!fyhL~rMYzOp7QTl< z$PihEON?Jcga~hC?g+pRb`VeJz$_yE4`e<`CZBB|uTyw#(|hU>{AL8dzY~HLBZ6%R zntk&sM+Ey2IL@`KLPl`!m^=i=*M}lZ;@%tPOqt*Ww;DB$ diff --git a/civcraft/data/materials.yml b/civcraft/data/materials.yml index 15ba88772..f3ec88be9 100644 --- a/civcraft/data/materials.yml +++ b/civcraft/data/materials.yml @@ -1499,31 +1499,6 @@ materials: - " p " - " s " - - id: 'mat_wood_axe' - item_id: 271 - item_data: 0 - name: 'Training Axe' - craftable: true - shaped: true - category: 'Gear Tier 1' - components: - - name: 'Attack' - value: '5' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 5 - data: -1 - letter: 'p' - - type_id: 280 - data: 0 - letter: 's' - shape: - - "ppp" - - "psp" - - " s " - # Checked 10/8/13 - id: 'mat_leather_helmet' item_id: 298 @@ -2102,31 +2077,6 @@ materials: - " c " - " s " - - id: 'mat_stone_axe' - item_id: 275 - item_data: 0 - name: 'Stone Slicer' - craftable: true - shaped: true - category: 'Gear Tier 1' - components: - - name: 'Attack' - value: '6' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 4 - data: 0 - letter: 'c' - - type_id: 280 - data: 0 - letter: 's' - shape: - - "ccc" - - "csc" - - " s " - # Iron Gear recipes ------------------------------------------------- # Checked 10/8/13 @@ -2156,33 +2106,6 @@ materials: - " i " - " s " - # Checked 10/8/13 - - id: 'mat_iron_axe' - item_id: 258 - item_data: 0 - name: 'Iron Cleaver' - craftable: true - required_techs: 'tech_metal_casting' - shaped: true - category: 'Gear Tier 1' - components: - - name: 'Attack' - value: '14' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 265 - data: 0 - letter: 'i' - - type_id: 280 - data: 0 - letter: 's' - shape: - - "iii" - - "isi" - - " s " - # Checked 10/8/13 - id: 'mat_iron_helmet' item_id: 306 @@ -2412,35 +2335,6 @@ materials: - " b " - " h " - # Checked 10/8/13 - - id: 'mat_steel_axe' - item_id: 258 - item_data: 0 - name: 'Steel Double Axe' - craftable: true - required_techs: 'tech_sword_smithing' - shaped: true - category: 'Gear Tier 2' - components: - - name: 'Attack' - value: '22' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 0 - data: 0 - custom_id: 'mat_steel_sword_blade' - letter: 'b' - - type_id: 0 - data: 0 - custom_id: 'mat_steel_sword_hilt' - letter: 'h' - shape: - - "bbb" - - "bhb" - - " h " - ## Carbide steel - -- - ----------------------------------------- # Checked 10/8/13 @@ -2472,35 +2366,6 @@ materials: - " b " - " h " - # Checked 10/8/13 - - id: 'mat_carbide_steel_axe' - item_id: 283 - item_data: 0 - name: 'Carbide Steel Axe' - craftable: true - required_techs: 'tech_folded_steel' - shaped: true - category: 'Gear Tier 3' - components: - - name: 'Attack' - value: '28' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 0 - data: 0 - custom_id: 'mat_carbide_steel_sword_blade' - letter: 'b' - - type_id: 0 - data: 0 - custom_id: 'mat_carbide_steel_sword_hilt' - letter: 'h' - shape: - - "bbb" - - "bhb" - - " h " - # Checked 10/8/13 - id: 'mat_carbide_steel_helmet' item_id: 314 @@ -2632,34 +2497,6 @@ materials: - " b " - " b " - " h " - # Checked 10/8/13 - - id: 'mat_tungsten_axe' - item_id: 279 - item_data: 0 - name: 'Tungsten Broadaxe' - craftable: true - required_techs: 'tech_tempering' - shaped: true - category: 'Gear Tier 4' - components: - - name: 'Attack' - value: '36' - - name: 'NoVanillaDurability' - - name: 'DurabilityOnDeath' - value: '0.1' - ingredients: - - type_id: 0 - data: 0 - custom_id: 'mat_tungsten_sword_blade' - letter: 'b' - - type_id: 0 - data: 0 - custom_id: 'mat_tungsten_sword_hilt' - letter: 'h' - shape: - - "bbb" - - "bhb" - - " h " # Checked 10/8/13 - id: 'mat_tungsten_boots' @@ -4107,7 +3944,7 @@ materials: - name: 'NoRightClick' - name: 'Catalyst' enhancement: 'LoreEnhancementAttack' - allowed_materials: 'mat_iron_sword, mat_hunting_bow, mat_iron_axe' + allowed_materials: 'mat_iron_sword, mat_hunting_bow' chance: '50' amount: '1' ingredients: @@ -4171,7 +4008,7 @@ materials: - name: 'NoRightClick' - name: 'Catalyst' enhancement: 'LoreEnhancementAttack' - allowed_materials: 'mat_steel_sword, mat_recurve_bow, mat_steel_axe' + allowed_materials: 'mat_steel_sword, mat_recurve_bow' chance: '50' amount: '1' ingredients: @@ -4238,7 +4075,7 @@ materials: - name: 'NoRightClick' - name: 'Catalyst' enhancement: 'LoreEnhancementAttack' - allowed_materials: 'mat_carbide_steel_sword, mat_longbow, mat_carbide_steel_axe' + allowed_materials: 'mat_carbide_steel_sword, mat_longbow' chance: '50' amount: '1' ingredients: @@ -4304,7 +4141,7 @@ materials: - name: 'NoRightClick' - name: 'Catalyst' enhancement: 'LoreEnhancementAttack' - allowed_materials: 'mat_tungsten_sword, mat_marksmen_bow, mat_tungsten_axe' + allowed_materials: 'mat_tungsten_sword, mat_marksmen_bow' chance: '50' amount: '1' ingredients: diff --git a/civcraft/src/com/avrgaming/civcraft/components/TradeLevelComponent.java b/civcraft/src/com/avrgaming/civcraft/components/TradeLevelComponent.java index 92780ad4d..2e78a8528 100644 --- a/civcraft/src/com/avrgaming/civcraft/components/TradeLevelComponent.java +++ b/civcraft/src/com/avrgaming/civcraft/components/TradeLevelComponent.java @@ -293,7 +293,7 @@ private void processItemsFromStack(ItemStack stack) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_metallic_crystal_4"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_ionic_crystal_4"))); if (itemID.contains("creeper") || itemID.contains("skeleton") || itemID.contains("spider") || itemID.equals("zombie") || itemID.contains("slime") || itemID.contains("enderman")) { - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_tungsten_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_tungsten_sword"))); } else if (itemID.contains("pig") || itemID.contains("cow") || itemID.contains("chicken") || itemID.contains("sheep")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_marksmen_bow"))); } @@ -302,7 +302,7 @@ private void processItemsFromStack(ItemStack stack) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_metallic_crystal_3"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_ionic_crystal_3"))); if (itemID.contains("creeper") || itemID.contains("skeleton") || itemID.contains("spider") || itemID.equals("zombie") || itemID.contains("slime") || itemID.contains("enderman")) { - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_carbide_steel_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_carbide_steel_sword"))); } else if (itemID.contains("pig") || itemID.contains("cow") || itemID.contains("chicken") || itemID.contains("sheep")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_longbow"))); } @@ -311,7 +311,7 @@ private void processItemsFromStack(ItemStack stack) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_metallic_crystal_2"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_ionic_crystal_2"))); if (itemID.contains("creeper") || itemID.contains("skeleton") || itemID.contains("spider") || itemID.equals("zombie") || itemID.contains("slime") || itemID.contains("enderman")) { - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_steel_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_steel_sword"))); } else if (itemID.contains("pig") || itemID.contains("cow") || itemID.contains("chicken") || itemID.contains("sheep")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_recurve_bow"))); } @@ -320,7 +320,7 @@ private void processItemsFromStack(ItemStack stack) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_metallic_crystal_1"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_ionic_crystal_1"))); if (itemID.contains("creeper") || itemID.contains("skeleton") || itemID.contains("spider") || itemID.equals("zombie") || itemID.contains("slime") || itemID.contains("enderman")) { - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_iron_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_iron_sword"))); } else if (itemID.contains("pig") || itemID.contains("cow") || itemID.contains("chicken") || itemID.contains("sheep")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_hunting_bow"))); } diff --git a/civcraft/src/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.java b/civcraft/src/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.java index d1ccb696a..a526717df 100644 --- a/civcraft/src/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.java +++ b/civcraft/src/com/avrgaming/civcraft/threading/tasks/MobGrinderAsyncTask.java @@ -152,7 +152,7 @@ public void processMobGrinderUpdate() { } else if (itemID.contains("slime")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_tungsten_sword"))); } else if (itemID.contains("enderman")) { - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_tungsten_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_tungsten_sword"))); } else if (itemID.contains("pig")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_composite_leather_leggings"))); } else if (itemID.contains("cow")) { @@ -237,7 +237,7 @@ public void processMobGrinderUpdate() { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_carbide_steel_sword"))); } else if (itemID.contains("enderman")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_enderman_egg_4"))); - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_carbide_steel_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_carbide_steel_sword"))); } else if (itemID.contains("pig")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_pig_egg_4"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_hardened_leather_leggings"))); @@ -327,7 +327,7 @@ public void processMobGrinderUpdate() { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_steel_sword"))); } else if (itemID.contains("enderman")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_enderman_egg_3"))); - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_steel_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_steel_sword"))); } else if (itemID.contains("pig")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_pig_egg_3"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_refined_leather_leggings"))); @@ -417,7 +417,7 @@ else if (rand1 < ((int)((mobGrinder.getMineralChance(Crystal.BIGPACK))*10000))) newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_iron_sword"))); } else if (itemID.contains("enderman")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_enderman_egg_2"))); - newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_iron_axe"))); + newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_iron_sword"))); } else if (itemID.contains("pig")) { newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_pig_egg_2"))); newItems.add(LoreMaterial.spawn(LoreMaterial.materialMap.get("mat_leather_leggings"))); From a04807a92650b831e27c923390f701321303391a Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Tue, 1 Mar 2016 09:21:02 -0600 Subject: [PATCH 5/6] Settler Count, instead of town count. --- .../Barracks$1BarracksSyncUpdate.class | Bin 1173 -> 1173 bytes .../civcraft/structure/Barracks.class | Bin 19722 -> 20273 bytes .../civcraft/structure/Barracks.java | 19 +++++++++++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Barracks$1BarracksSyncUpdate.class b/civcraft/bin/com/avrgaming/civcraft/structure/Barracks$1BarracksSyncUpdate.class index 181fa97a3d7324f0f5815a2ba982e6162b5a8068..237fcb2fef92cbcaa284bd9d880773fdfd4d51a9 100644 GIT binary patch delta 35 rcmbQrIhAw6duC2m22Msb20ljh$v>FmICU6A8Fd+C81*K{vzP$@lr9HO delta 35 rcmbQrIhAw6duC1v22Msv20liq$v>FmIOQ2c85J007!@bSvzP$@k4^^w diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Barracks.class b/civcraft/bin/com/avrgaming/civcraft/structure/Barracks.class index 8570c2842eb6feefa8dfee6266976d85a66a8c6d..d5a31c52a8b85ac2d3cde61b194a260afb2291b3 100644 GIT binary patch delta 8638 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 diff --git a/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java b/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java index ff3941306..b3f7cc97f 100644 --- a/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java +++ b/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java @@ -130,13 +130,23 @@ private void train(Resident whoClicked) throws CivException { if (this.trainingUnit != null) { throw new CivException(CivSettings.localize.localizedString("var_barracks_inProgress",this.trainingUnit.name)); } - + + int previousSettlers = 1; if (unit.id.equals("u_settler")) { if (!this.getCiv().getLeaderGroup().hasMember(whoClicked) && !this.getCiv().getAdviserGroup().hasMember(whoClicked)) { throw new CivException(CivSettings.localize.localizedString("barracks_trainSettler_NoPerms")); } - - unit.cost *= this.getCiv().getTownCount(); + + ArrayList entries = CivGlobal.getSessionDB().lookup("settlers:"+this.getCiv().getName()); + if (entries != null && entries.size() != 0) { + //No previous trained settlers + } else { + for (SessionEntry entry : entries) { + previousSettlers += Integer.parseInt(entry.value); + } + } + + unit.cost *= previousSettlers; unit.hammer_cost *= this.getCiv().getTownCount(); } @@ -152,6 +162,9 @@ private void train(Resident whoClicked) throws CivException { this.setTrainingUnit(unit); CivMessage.sendTown(getTown(), CivSettings.localize.localizedString("var_barracks_begin",unit.name)); this.updateTraining(); + if (unit.id.equals("u_settler")) { + CivGlobal.getSessionDB().add("settlers:"+this.getCiv().getName(), ""+previousSettlers , this.getCiv().getId(), this.getCiv().getId(), this.getId()); + } } @Override From a8f1698fe619a6e574105cfaa681f872ac69ac3f Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Tue, 1 Mar 2016 10:36:24 -0600 Subject: [PATCH 6/6] Don't change the unit cost itself, just deduct a different amount. --- .../Barracks$1BarracksSyncUpdate.class | Bin 1173 -> 1173 bytes .../civcraft/structure/Barracks.class | Bin 20273 -> 20693 bytes .../civcraft/structure/Barracks.java | 41 +++++++++++++----- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Barracks$1BarracksSyncUpdate.class b/civcraft/bin/com/avrgaming/civcraft/structure/Barracks$1BarracksSyncUpdate.class index 237fcb2fef92cbcaa284bd9d880773fdfd4d51a9..05ea91e6a0f6b98eae6d7324f59c83ccf3ef6f9d 100644 GIT binary patch delta 35 rcmbQrIhAw6duC2E22MtE20liM$v>FmIBgk38SNNk80{y=vzP$@nvMsw delta 35 rcmbQrIhAw6duC2m22Msb20ljh$v>FmICU6A8Fd+C81*K{vzP$@lr9HO diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Barracks.class b/civcraft/bin/com/avrgaming/civcraft/structure/Barracks.class index d5a31c52a8b85ac2d3cde61b194a260afb2291b3..40f3ca9c1cd37b17aad3ba3234559d4dfa5036b2 100644 GIT binary patch literal 20693 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 z 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 IWb7dNf6DJ{tN;K2 literal 20273 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 diff --git a/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java b/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java index b3f7cc97f..b5b480872 100644 --- a/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java +++ b/civcraft/src/com/avrgaming/civcraft/structure/Barracks.java @@ -88,8 +88,22 @@ private String getUnitSignText(int index) throws IndexOutOfBoundsException { ConfigUnit unit = unitList.get(index); String out = "\n"; + int previousSettlers = 1; + double coinCost = unit.cost; + if (unit.id.equals("u_settler")) { + + ArrayList entries = CivGlobal.getSessionDB().lookup("settlers:"+this.getCiv().getName()); + if (entries != null) { + for (SessionEntry entry : entries) { + previousSettlers += Integer.parseInt(entry.value); + } + } + + coinCost *= previousSettlers; + } + out += CivColor.LightPurple+unit.name+"\n"; - out += CivColor.Yellow+unit.cost+"\n"; + out += CivColor.Yellow+coinCost+"\n"; out += CivColor.Yellow+CivSettings.CURRENCY_NAME; return out; @@ -132,30 +146,32 @@ private void train(Resident whoClicked) throws CivException { } int previousSettlers = 1; + double coinCost = unit.cost; if (unit.id.equals("u_settler")) { if (!this.getCiv().getLeaderGroup().hasMember(whoClicked) && !this.getCiv().getAdviserGroup().hasMember(whoClicked)) { throw new CivException(CivSettings.localize.localizedString("barracks_trainSettler_NoPerms")); } ArrayList entries = CivGlobal.getSessionDB().lookup("settlers:"+this.getCiv().getName()); - if (entries != null && entries.size() != 0) { - //No previous trained settlers - } else { + if (entries != null) { + CivLog.debug("entries: "+entries.size()); for (SessionEntry entry : entries) { - previousSettlers += Integer.parseInt(entry.value); + CivLog.debug("value: "+entry.value); + previousSettlers += Integer.parseInt(entry.value); } } - - unit.cost *= previousSettlers; - unit.hammer_cost *= this.getCiv().getTownCount(); + + CivLog.debug("previousSettlers: "+previousSettlers); + coinCost *= previousSettlers; + CivLog.debug("unit.cost: "+coinCost); } - if (!getTown().getTreasury().hasEnough(unit.cost)) { - throw new CivException(CivSettings.localize.localizedString("var_barracks_tooPoor",unit.name,unit.cost,CivSettings.CURRENCY_NAME)); + if (!getTown().getTreasury().hasEnough(coinCost)) { + throw new CivException(CivSettings.localize.localizedString("var_barracks_tooPoor",unit.name,coinCost,CivSettings.CURRENCY_NAME)); } - getTown().getTreasury().withdraw(unit.cost); + getTown().getTreasury().withdraw(coinCost); this.setCurrentHammers(0.0); @@ -163,8 +179,9 @@ private void train(Resident whoClicked) throws CivException { CivMessage.sendTown(getTown(), CivSettings.localize.localizedString("var_barracks_begin",unit.name)); this.updateTraining(); if (unit.id.equals("u_settler")) { - CivGlobal.getSessionDB().add("settlers:"+this.getCiv().getName(), ""+previousSettlers , this.getCiv().getId(), this.getCiv().getId(), this.getId()); + CivGlobal.getSessionDB().add("settlers:"+this.getCiv().getName(), "1" , this.getCiv().getId(), this.getCiv().getId(), this.getId()); } + this.onTechUpdate(); } @Override