From 71e8e153e76030abfa738bfdb31052de08d8986e Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Thu, 18 Feb 2016 00:40:04 +0900 Subject: [PATCH] Faction Raw reader, new locale 'jp_kana' and 'jp', adjusting kana font Former-commit-id: 3e401ba531be1d3baed7bd280db4ad5619ce252b Former-commit-id: 530d4f8bc7cbc39068485c4fecb81693e569534a --- .../com/Torvald/ImageFont/GameFontBase.class | Bin 7801 -> 7762 bytes .../Terrarum/Actors/Faction/Faction.class | Bin 2647 -> 2843 bytes .../Torvald/Terrarum/Actors/PBFSigrid.class | Bin 2280 -> 5224 bytes .../com/Torvald/Terrarum/Actors/Player.class | Bin 9518 -> 9659 bytes .../ConsoleCommand/CodexEdictis.class | Bin 3118 -> 3118 bytes .../Terrarum/ConsoleCommand/CommandDict.class | Bin 2273 -> 2466 bytes .../Terrarum/ConsoleCommand/GetAV.class | Bin 2945 -> 2946 bytes .../ConsoleCommand/GetFactioning.class | Bin 0 -> 3804 bytes .../ConsoleCommand/SetGlobalLightLevel.class | Bin 0 -> 1411 bytes .../com/Torvald/Terrarum/Game.class | Bin 12175 -> 12175 bytes .../com/Torvald/Terrarum/LangPack/Lang.class | Bin 1462 -> 4327 bytes .../com/Torvald/Terrarum/Terrarum.class | Bin 4851 -> 4856 bytes .../Terrarum/TileProperties/propdata.csv | 4 +- .../spriteAnimation/SpriteAnimation.class | Bin 5046 -> 5084 bytes res/graphics/fonts/cjkpunct.png | Bin 20433 -> 20426 bytes res/graphics/fonts/kana.png | Bin 22776 -> 25535 bytes res/locales/en.lang | 108 +++++++- res/locales/fr.lang | 106 ++++++- res/locales/jp.lang | 262 ++++++++++++++++++ res/locales/jp_kana.lang | 262 ++++++++++++++++++ res/locales/ko.lang | 119 +++++++- src/com/Torvald/ImageFont/GameFontBase.java | 4 +- .../Terrarum/Actors/Faction/Faction.java | 8 + .../Torvald/Terrarum/Actors/PBFSigrid.java | 37 +++ src/com/Torvald/Terrarum/Actors/Player.java | 3 + .../Terrarum/ConsoleCommand/CommandDict.java | 2 + .../ConsoleCommand/GetFactioning.java | 55 ++++ .../ConsoleCommand/SetGlobalLightLevel.java | 33 +++ src/com/Torvald/Terrarum/LangPack/Lang.java | 102 +++++++ src/com/Torvald/Terrarum/Terrarum.java | 3 +- .../Terrarum/TileProperties/propdata.csv | 4 +- .../spriteAnimation/SpriteAnimation.java | 4 +- 32 files changed, 1080 insertions(+), 36 deletions(-) create mode 100644 out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.class create mode 100644 out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class create mode 100644 res/locales/jp.lang create mode 100644 res/locales/jp_kana.lang create mode 100644 src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.java create mode 100644 src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.java diff --git a/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class b/out/production/Terrarum_renewed/com/Torvald/ImageFont/GameFontBase.class index 5840d1b275bdf60ca54c3161fb9ef8b78be44156..d4c07248d6b212cb476d102d0e6ab6148e65f83a 100644 GIT binary patch delta 271 zcmW;GyGjF57zE&%leo)Cj6uyY*KS;gZ{^)WCozm<>5=1BW5#_#e~SmQ zI`kvU`4;De1(T?=AztBiVh>%`nPr2TO{Umkns4moH!~{9KBe)lvdk$%qax--dnGny z(yQ@Vw!N8!Hm*^F#ug88iCwr@;T2A7=lq|+IyPWqb%S#-)~%I_b&4}2V%^~$Ni6aO v4|dyweLGshpoD%^HvOZ}M~VS*97eArA5FYVDQ40}| zNHh>Dg%sLrE7h%AYSjPrb zl&)|F2D(-ff%b8Lu0S`aqZ>k?BL28Cc9B%YKY9hav}1 R<{+jyB$=LNzB!lfh(8wrJzoF- diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/Faction.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Faction/Faction.class index 246529eaa214ecc63720288153657d44c41fe498..7f42c91d645c403cb057b5526ae57cecb0d14298 100644 GIT binary patch delta 613 zcmZXQ%TE(g6vn?h<=)#VL^~6oJ#oId z2RhNgS;BO|EzZ*H{?6{ts^QMC+f_bYs+4YPxM@YX+GvMZyRAHWq8r*QYmZs`PN)3j zf0L5eCI#%yXirShQ+>0(=`i~%+LyDCDA2re>5Eo9;ccC3Jx1tE2lOeLvPb{?eUAF0 z0sRP(F?!1+Z(nJ~>4?d0h}@=x9neLH+@TVa;nfZx#JeP7fm~v~ OYP43m-^!{&=T3T8F delta 546 zcmaKoOD_Xa6vzL!kGV6W(N0ZA=y+5+UgHt*s%opMD+{r)xA8G7S=ezR5E9R|MU3$@4aWvi(Ps6s^0>bL(N1C^9DMwAhBp7+!T3L zSyG{(!m?@9WBssG<4{YTs~Fiqm!KkCg@%FGbNrZ|2Ij8dJnA|4&CXl z@w+=kdxlR5!{v{E)BEUy``dwMRT~-ICb7ZQ)Cl;^V+BDtxFKCvp6vEsO DW_(c| diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PBFSigrid.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/PBFSigrid.class index d91a30f10846beb1187b56689617c8416f4459e7..c5870601d590208f8211daadde85e3cd7506d55b 100644 GIT binary patch literal 5224 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 N>ga3L(Km3%{{hppnQQ<6 delta 720 zcmX|;Nla8h5Qe`V-psU*hkz?08bAo>L{L@%S!R$$MMP0?VR3|E97MoDaCg83apCk5 zy>d4(8V)9!c-Ls+$;7({j>e-0v3fARRm;W8nTbz--hBWnSg@rv>K~T({A{nfkOrk8|W}_#AJ19j{51c$ylvAra5lY%?T4ZsX1je&48vy zbJ}X?`20n4M$>=RYWixz=d9pQ!@X8$(QuzlKLeWcny}`AW>7O^6Jglsi~6~kl2}<; zu?Y|}*N<3j(%x!$4kqD}pHV-T-39f%XiQ;uk59!1BdxK~h+=J5sI@y5jmL&cM#9r! zM;>3P$anKna@;PD&wXj_NgZdx;RM+H$!!_a#*Qs>4Vc;ec zZn3u~>lU{a-pRr6XvEJQhr1*kW|(zfc>8?!jDO$#?X5|DV9bXOb3Aeze5Dx`%sV{h ziNjN#DGHNXJUX~EsVhAL5OSDh8}sDiN{>bIdBqOiQ@}?G`6gX{u#;Z|MD%WzMw!Z?Tm@wORUxWX oGc~G{I@L?P8lo|&f77bQfBLoRr=A9RN25rzgq!3KCZ&h|0%p)~N&o-= diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/Actors/Player.class index d92925c4ad71242c1637d2365b613b8c944ce466..6ef492cfecfcb5779d43d4ae6c4036cb0cf0d962 100644 GIT binary patch literal 9659 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 PEL`ri-My}?^Nqg(Suwv- literal 9518 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 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.class index 39610d6c6da91fb2119671485c83da73c6883e47..9a10fc75cb20d08998c80d6599bb66573abc8e46 100644 GIT binary patch delta 22 ecmZ1{u})$`HWRBEBZIxhWJM;e&9j)MZ~_2H=>{19 delta 22 ecmZ1{u})$`HWRA>BZIxhWJM;e&9j)MZ~_2Hl?D?4 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandDict.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/CommandDict.class index 842990755c1f6a67aabc1ca6f995f590b8ae20fb..2c01dfa639a06e99641eb450aadd053ba8e69c6b 100644 GIT binary patch delta 611 zcmX|;OHUI~7>1uy+Mel0iI)ZwjR{^bBp6bRQbh5B7m8Y~iWc!cEyHwhY}F3+EuPW8Ovb=!--SE)q9i~LYA-crfIy{0T5*2`{K2>fbP z@S2{P65op!-AWYHYl;K5t}pLJ(_JU1`K^J(P-|cEXLi!O0w_AI&HtoPF{aF?F#9y) z88iKnxFOVNdxzenM!pc=I<`)3{ww2aICEAXUT4DSBUZ0=Le848M1L#i6nr(nE|oQR zK5fi&H;X(oMx{8%`EDP^I(?znBo41J@PnhDH?op;nR%;?2zt3d!FY;`ovKU!0a#>d Ap#T5? delta 430 zcmYL_%T7~K6o$WjPSbVH5(1>rNYaURS~c#SZ`Rs>rrM5Ond^& z88R_WnMgWg(4hn0f(IbHfpM=gaIn|@*1!LMWo7>?9QJ+v^Y@?)Tx3hRL?YZ#0+N^t zcO$C8Jta?KVlCpn@IX>``G=%5MIn!PUFO`zvE8(?LHe3_lD1(MgVO<$A+z>XE^M-GQcgm>k|6ceYeB3|! z;lc?fvz_2ZMCGwb?xCYlIa2>AKa6`357>{7Fv;*bdpAsa_dtqpZ_ zSn-a`!YE8N?AEX+4l991 zR9m_uRAgR+9NaXrqmDpZv>)3~8>`K=uTVDGrs=Y5hz9---8L#G4tO%VXR9m( zeh9+gB1Wl(`!w87>gl9a z(@E!0yaC5|vqrBO#8p*TtW*)JqZ2Cy;w}8^?A+L*qYdo>sgnsZWqu70=y(thX?R%2 zBY0H9V>%wk0h&k06L?Z!!PLaqAcUaqUbyka)b-aRCX?Y#5;dLEv;7x({NNJ;eDljvQ;FeY$Z{Z+=vQD6oulEsdL_vryszT}d?+wq9q-v&u*|IK zwb+KwQx)0RJLcy?etgNYs6rV;46XZX&>1UJK&YF}~6WXa@ z`HVKRNFkR;To5f&+;hqb%r7fmEpp-=T%VjIlyfqHFYu)@afP`;fE9cwEXP;uuQHo83cU38lPkKL zC$3dpGCIJj^CKO!oXR*E_U)k01|8VX8?MrR*l~Mgc2uAx6gRNXbXH}~xs$qPN_9hN z^L5omSUJ?jH&q*9?NA%z8V>6?g70)>aG8#+YUo!(A1-5JOx6d}9&`2>j2_jiSlZ;U zRIPm<>rsAkrQtX&+V41f`~vG^pKTj%x5bKVFjs!9bVG<&Dw13H{IHDT($c~872XP; zMHQ5)gM;kbmFy?KS-SGXXDjnEMDCWBHNaS2ui*!Qv!~f7N*{s6C+5Qvx+2A=L zRWs$cgOAM`{xr_nZaJn&xsVjW@2s}N5N*ktZ&3S1z<3VF1UCVl@7dW{70d!wti~Fy z1Uun*B^YstJQ`_#9z*P!!s?#-MP?Q)Jlq;q2Cl*&P$JyWsx|lC#?y literal 0 HcmV?d00001 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.class new file mode 100644 index 0000000000000000000000000000000000000000..3fb46f0c48b13cf8ab7e9a49788fa8595b11dec1 GIT binary patch literal 1411 zcma)6T~8B16g|^!yJguzMFA1eil_yY6;x1BP!SN)>O-+cj1SYYSys2Z&9Wst`cr)4 z8Dk)k#2?@v^38arpsh(sc-WbHXYR*2XKwrR_xB$F?%}0@490Yf8;D^-Ew?&w8p#!|Si_89}+m`&k6jBpK6ZUKniq)Y#!3R(Vz6lobmv{) zepRoQ?QmU|J)ZRBgNpP@GIW)Ha;QaH?zX_gd?lz_>p{39y-jP~4nrB%tJY%RZwH>e z7*wm$-?WN$wBiM2>E&H#E6UqDw#WXuy=zzM5j*td-seBc9cg*ecdTL*y1p}~Fo}@g zDnEx`Ss=EOr@@S?E%C=-mxHh>qov)7U5nhnXMIhE4k4azQ(GWijAZ3gLDm|4D42jz zW8dh_wshFQC?Jxl#I+yydC?61oo?MfsteU@VX4~9T*uH_+H9zMmFC`qqQ@j0EGfZ?{) z{|+1<+mTfU54NAj6<%^82HF-;muyp&HGvza=W|vp70R8ZMo%r(5+~3_y<0|~ICHCG zC0ymNF#`?`f6#I6oFc9l=vmwa_r&-i#6FD}dbuVWhbi>YHje|)kBjuk3YWMtS(wlm z36v*(=wGmLgxI?YZTb-L187egUgE@?Z+OWQZ$=x+WOj!$sol@L+UJ?XS0uh6*_$|k zzK8z85jx%-!szKdfVl^K`~c~Fc1&Uo1*AwoA)F>Ipp&O*V(G#NDNd2(0?DlrcY&v` z7`Z|F12IbsHrTv`&YKx}L*zPw9ENGdnLB{Xv@}-e#1&cz=9|b;yqMy6!e3b=T#YT0N`<5HMeNtOg^mMs{DR*2=0QHqh$f~6GrP_*c! zC?W}3s3=?PC9p+`vLZt=D3F4r2aAM)ih`E=;6qQ}J@=mPa?bg_BNay~u1^hf%@b<1 zH6%-~hPw4rSgdx0Pu62$F|N77#{UNOvDw1dt(7$!sw#aAbyb!1LEjvq#3+gSH+;O^ z3%Ig`!jVR{%h;ojzj?=8?EEQa!k`97&v56iw)6W(Ls9~5|eo!ZF zwuy)B;-g+NXpkH`bJ->NG)kF=J+hg-(m<2!VV|_HU;BKu(xQu!_9h)P{fA8dVInzd z0^68|GK+Q=a>fLnBcJm+nADwg(U_NvaoJp6F-8ZuTr)#AOzcgnt+$0+`Xsq)$!#2y z8p0jMahFL}$I(q9517d#yY6DHN4+12)z2w8&SyizBPd!+{Q>8T1^-oB{MF7ktG-*c zKxfYIJ3md^FTFP-Q(F!FHuT3(xg)q_l*R`N90x~2Y?og(km9%vjWJX#ks6sAjPMX8 z(fGt(T)f(x8gx$}L?$v;Ch2f$kvq;%JRV8VytG_-sm*Cc@>mnn<8>%4OCDNPAnn%m fYGZmq)GySMbf4T8Fl{vLF={0 delta 710 zcmYk4YiP}J7{@xg?ABMj=DA3Aq*JQZ6sZC5lkQ^TG?Se&6r&`##U_`+fSg*RKz3*#~JzC~(_P3e;z2<)(186sc zF-EYTB71r=N6p|dvwmD(`>*;>n(~w>PFu<|rZ`KfnVQKt7IWTAonal_+Bfpj^b0s# zB+l#(;xa=GXV617*C^zMb@kcYTU2n{)^W$yaM$ABV<8WS@Q?c^ak&Ie;3|FLAP3Iv_cw)ijF8d&XoHT2EU zBrVJhI6utWPrZ^`tTAK1jQuvY*a4S_W(LEK3r8HA6;KW4IPu2Z#%4*P4#WlC%Y~fGG`-I*FY&Z7DkqW#4`R=K#L|D2MNjBv(n)awt7V@4n?O@4oLY znw$TA{v`mL@h2a;Vadq*;DF`D5=_fDBIBrxV=|8Wpuke_u$VvK#RqXh!H2}=qz^Ja z?8QfL$_EcV>Vq2}6E;3BY&;_46AC^lmXG@IDSTRRKBM5XKAwEehfaK6!575*n1U|~ zvC~5AOA4|IzAVlkSMU`DXB3(xJ1vs zsbEG}{FZ{J6?|L4GYT$|_h*WB;yZ%%T^Zj~a9P2#3T72tQE*kpH3_bio}Q3UA33B? z>+N|fnQ9+0Gg-s5l18pWf-3mEdMY)h#}7-;dP9*&S1A18Xe2bSb2L2I-NVCzvXE?# zS!OalLB;BDCY`hNw6#}HtiXNXpu}@Pwmysq}Ue^UDjkWCt*z_ zo|$SN&Y07BD$zb{n5J&#r`jU~W{B|F3qs@TIT|;zR+0e8nB$ETh9zNb;7*rY?>wUT zVdEI_&8G6Eo=WBnVP3+z3hMn8_1*DIKFtfOV-}s-rDyF&Fh3-C7mN~tBN;Oxp(>ln zSv~pmfRRs2a3|9V>}2!vY?P#{h#d}3rl zWl05JTWLljhRU{hsu&4hER#3mMsHH!?iJ5$6IrSv24>IVN*Sx72ffTHo0rVAcjd>& z4bw+Ufg4dM-+CR8ZaS}XwHfyAr*&8Zl;T;863^mKPrDB9iRnD@W(5DQ$ zJ1|`pD^qBNOw>TdGOSnx>^v)NuhUH4IO{8CSnR2KI-#2hQE%K6dH0^--qEcR8Vl~0 z3m1jx@5bW$XsIllJKk7D^u4;*l?rvyVRyq+MkitgjO{;(5PRD(dg97uOhR2BC~vrh z0N9$M@QZ&aY+73@Kz;|}9TnkHCiUE8p((RNv%EaULwP+#7j6NvbT#{qI>yW}kHrk# zj894kRC2NG@{%S^E6k7FzNAI1TZ|X~+(c9Jq>S{05b);mV>$azPoU6Wx#fC9C_}`_ z73gmbV$ms`;4Zra zJ($M5*hj8P*Xb(uV}$bo4i`@j@(Ju=T!{yD@smqP`T2w(od^c!(7@kio)vDY0l$0r zk>|x0THIV_*^l=TS^?20-e0trpq7JYtD9UG(Od+AHmkJ80s`03Gy^%vNnGKyALFrI z=&()K7u1WUX$ZO{ zcCnHXp<23}+3}{X5sf##f5XE4Z6$x(ZTVZ?c~4QQ()C2A5XfHCa{T}U6=HnCIK-kn z!Q6b3#dw~D_%h4z6&B!MSZe>oZpn?P)WA=VRoEl#z&M>VJb+~zQ&f-Eoa?x$wFf)R&)bDZaVMA36tblmEa)ENb%W=MZl4AHRU@JWu#nWVg@azUH?7 z$)fho*Ry{WyB7F3HxpZBV%PG?U6^3OCNV|`Ph-jkB*-+cWob{a9vtLsEUx&(B1mpL zhDmBkx19uD^a8C>+jI`qjatVA$gUZui(D7>VmNF_PDU!^&&b)oZ17iD_ANQ);nS&E-e%r nacf<%5swxoYlZkXmFzzt&BkvDPGOnkL9?V`1vw`94&?p=KtIvV delta 482 zcmYL_xlUVA5Qe{Vug$sla%CX`*qAtAAYlpEA*^P{tYO~*wLu68MF=FIpvgm=hK6SV zfZK=Aa|t-tb$;YkEBq1lG>qGLdli1V7+uM@P)&ndG-$Gu8MCOBq!xZpqvOF zh*7~5adDa8Kqiec3E#H(%okxz5)tV%i&_hd6z?W7E{6Wn)oDODv*!n{4u$@@^Yy+Ppk6GBsu8fR*UqX!`)p zlv*h{^Z}eY@hKc|=svr+8Buzx{5hcKs=%S1<%QSN=GOu#>&#oovS*Dp4+F7NWHTqZ= zdo=wx~G*Qy*x;rM=4&EQ_3piw9HO< LKo1%vz()BWgi<=q delta 289 zcmWNN-7AA}7>2L+)#`29UYn*Y$*`uhqV{QB$vSFpB(YY|5cC zrB+Uq6MukHC;kct+o9+1uB-dLo~Ppf^S|jvm7dx!*^MKcuMZpj7z|L&AWnv;W0ZP^ z@iIaqA@%I|@=ahTOaqfN6QPqSVIzc?W14vuh$_qZ9bBZAC7M{KjTjxo>0w34RmMpO zzrhS^%(5ua7^B_8pBA%CXo>a!2HiPnjE;I^& GPVpacJ2@)= diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv index 2e72b6385..92b07e07f 100644 --- a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv +++ b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/propdata.csv @@ -21,7 +21,7 @@ "17";"TILE_ORE_NATURAL_GOLD" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "17"; "0";"16" "18";"TILE_ORE_NATURAL_SILVER" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "18"; "0";"16" "19";"TILE_ORE_RUTILE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "19"; "0";"16" - "20";"TILE_ORE_NATURAL_AURICHALCUM"; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "20"; "0";"16" + "20";"TILE_ORE_AURICHALCUMITE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "20"; "0";"16" "21";"TILE_GEM_RUBY" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "21"; "0";"16" "22";"TILE_GEM_EMERALD" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "22"; "0";"16" "23";"TILE_GEM_SAPPHIRE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "23"; "0";"16" @@ -42,5 +42,5 @@ "36";"TILE_TORCH" ; "0"; "0"; "0"; "N/A"; "0"; "0";"16777215"; "36"; "0";"16" -"239";"TILE_WATER" ; "16"; "100"; "1"; "2"; "0"; "0";"15464447"; "239"; "0";"16" +"239";"TILE_WATER" ; "16"; "100"; "1"; "2"; "0"; "0";"15464447"; "239"; "0";"16" "255";"TILE_LAVA" ; "0"; "100"; "1"; "2"; "0"; "0"; "8397312"; "239"; "0";"16" diff --git a/out/production/Terrarum_renewed/com/Torvald/spriteAnimation/SpriteAnimation.class b/out/production/Terrarum_renewed/com/Torvald/spriteAnimation/SpriteAnimation.class index 9adeca0350732d9225b5e6799cd84defa284ff5a..cc514a0461295cd9152beb4c3ee104b8a3d925fa 100644 GIT binary patch literal 5084 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 l%bE|V_d%1Y|QHAiC{{iSZrpEvP literal 5046 zcmb7HZE#dq8Gi2W-QDcwhJ=uhh9rE`goSn$C`F)X3Iw7__z2Jv3hib0Cb=Qm-R^D@ ziuI#PX>Dz6tF)!92oy#8p-@RcY8hwLkYCJd!F~}dEc}9^AE0G1F#zJM$m%KhjBX|6Y&KRUlegn#N#54i+DoBlOnz( z;wceNi}-Q~&&W6~;wur%!m~1aPQ>#fz8b=E8NVibCqj53g4^(77%$;u7%$@$*?ToY z@paiaCE^cMofYw#?4A?xO?mxR2mFbTqt+9kT zmW*YG?D*kWkNTizz_N1dHH4h+vl<%r?=SJS0^)bU0n6?m$Z60zGz7-%L~cNX5g*B9 ztYoe|V-8bW#C_eB8Y6I0tr9qp{N2s zNHVFGXY~!)>20ZueKeKKnM2ek3wy0h&W_7#Xw=TyhlZ#*l7bjBL( z;fLJU+6%_Ip=p@O*$sBm&TZ7-Z(X)mgT5)1AV_7WowT|~h7Vbp-KJ7o-I*f(UNd9M zySu3825fqJM`t`W9NV4BjG9A*&pl4Wf-FMVqKVF>$i58l91}@pJ*r}(qBR9Mh-R2 zbc{KqwWNm()HS@C@F=-FHpc=(28XSR?6!~MMSaOz#Di|L;Z9d<(GlCuswwD8u%VAgmBTo+t_H}Cz}KnHottHIm|LB+J!EqN|ZyS0m}JMlxQFB)uBR zdo_~!Y9#yBNG5We3r%W?c5UL@8IBsqP0`EHqWT1UBK*YqSB7J?!|@>(V$ zEFvPJT!axdCQxyaFg|RiT*n_Ip!+)N5Jo-U=AssjluekAW-P%xhGsr1ZUO6f5$kp_ zOLQrXied{-8jeY5$5y^=gU=`NDcA5W1UUn0qwiqWzU9$NsN_?18M7x)T`(o0 zK3atu_6mWna}K%CJdRFu5x7`MH@0&{qO*}-i;`fpkJB$A(4<$_fiZJIz;0dSVu+DyPLh!93V7dW4Lpyk-5KnZ~!&LnZWOT*6*_?oHk z+X=se@H=k-zsG~$>%!mX@#GrMiuK)5MtKgOnxCT9H-S3;hDKRAi#7gxnq>VfZs$4v-=TaTgvWQxA{? z4=_iEJgb{nPxmVetJ&lCxmI_(f$Akr74-K}t-X)1b_3BHw7odL`{|XF-_E2!kaN4tN|p&j<*|x)`L;NoxK9^1O)a%Gq#oH~4K=WxzT$_boyH>)qmo$-48ZOpxd#=*5Z&1m|W7*?-e zM)L$D|B;gz=1@_upEya{6t?Oa@CrG>r;JZ{67$vt8UmA;-w;^hVqU?5<4cR?{I2qN zy*?=GoLA-NlUOJx7Ztp2r?0>htdyrvji>4LID5>q^yoSMRCu1<<^;O&BJ1cS66_>w z{$U!yD|igA;&HA$iBot6r&VM&($j8U;}5ZY2E=DCM&mF^OKG3uh^uBHvjk^SD&w#? z(^UjR@HZ{^kIMN$a>`-f9>VGTFdSXJWT`QU#bUqHK^+3V#-cc}uA~?~&^u@tiKnrsHSK6pPNWl}}T15Jr1}lB{9C1JYFA5^MhHzsc#jCby9Gl2=G^Kgq1^f5 zz$_FQ;$-3Xg!u!b{l}s#lzV=cBc-ySAzi{O_PA+g{fT&gE@@WU<3_#GpeMR7^NkqC7bJ-B_*fmnk1Vf z>L#Y88t7Uini-^7BqtghCnayL5V*mjl45CKm}Hcis%w&J4peDrZlar%Vr-ymm}F>X znP_O1YGRT+d9ScF!iLHIk|!tk3c77RE~dallufAmH~UL^F)9;b@8&&HR}EPTre89g zJk>|P{-dXhV@SoVH?yPj-YD=m%*?vhb)9AQ*S|ZuL=@+>nRLuk4!!ErE&WLNv&QGZ zQ1%aE_IH>ZfPjI8g{9@`iekMx`_3QHIJ)`BwcFt{-pr4BT+8oQRdSB=Uw9|~k&nu} z`=2cEj`Pji#&c}ft=N--hreEV6q&rcm4D@SlV6r03+i9D_3&}eTFG_2`s1`02_Bzv z7A+OZpYA2^zWUX7ho4E$FV74!tryDqe41 zY1aX>GfYbq=a=}rs+X^SG&$?G^kVaQ@pt%HO!$s2G*o%sb~offl<7scMN2<7N=oj! z`{;grXXOj~Lg{5&78LYa#%nIzSDg34N=!z#uzGdE>RJ6hkzu~IJx`s!9$CNOKj+N( zvG3atMr38oj%()Ia(3%VVDP-#`D~`e_v&fAziTTrYF_Ub+&VQ&MrK*PPWOZu*3IY6 zdxc)`57~b|PC{>W!>yk!8H>68rm6Dihd&nmt`z<iV=JS8o&$xL$ zCL_JR{MBc}FK?Ki^)>A7eKNb=_EX*a#ooU%{;gqNBm7}r!2Xpri#pYh^+#tmV7oCYBVMplNFRz{QK`D_uq%}e>#GpZyRq#78dn562OTP7vxnphYo z=_Xm2nd(|3rJ5$2TbdYISekCG5V*mjVwPfIo|0@~pqplDW&%`clA>#2nV6)Tl4g*U zVr*iVXqK2fd9Sb|Gsq@?$&-_N1>H6u7gJy&$_|*$&Hj>JjLJmVwRw-!RYR88xfOdR zPxaBS|KaK47*cWT&Ft5CuN4H?Jg26o&gYCP`~CRDq}CmJD$g!Ru3RnN?SWuCt*X03Y9{Iq*+dHSrZe`RY@UU@E?$20GAM$ptt=XL!KPQ5Ii8Ix`qdSH@{ zC8Mcv{>!QUY$|7DU-!;^CH-~H*8Nj^{(Vuj2zz(n#)}&fFKrCZ%+9LcTrQEnG=AN@ z(yjx^Ggv*G?Ox8Pzf%9F&;Qc4?QZ$D`*+B4WXN)c}J>l+_rbl#rbwAMs^=B72Xen~ub`g&yjg8v*d z=f}QpKNyu|VP?xNYhhOIvv%Invh$Ybuk4K9oO3r=-sO7Os=|U9n{=G&i#XHf&Yv1| z!GFp9?c!~xg$%a-k}kiLBVeTa8m~uK&`F8wPX8h4#@o}L_g^<}2P;4>fs3zp~ z@2|Z7zkTN4Gp%LY%9oq{Um03ZpU1u9w#UAky6?Z6?OM|N?7Yv4yZs^&2-i~dkw zKFPq=es#^h3;SYk*YPanU6~lrq|Q0{xk%5W!|bdq34B1~fTn_tC5=HqUjfH{W(FJK WmNy2=Hs1AM00K`}KbLh*2~7a{kg>`D diff --git a/res/graphics/fonts/kana.png b/res/graphics/fonts/kana.png index 88a8767735e1c84017d424f6768c7c69d839308a..16bb0d4a27d6ef4e4a6d11f3f1264c7d623abd80 100644 GIT binary patch delta 8942 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 diff --git a/res/locales/en.lang b/res/locales/en.lang index 2d4445f27..14f26d524 100755 --- a/res/locales/en.lang +++ b/res/locales/en.lang @@ -9,7 +9,8 @@ COPYRIGHT_MSG=All rights reserved. ## Application messages # ########################### -APP_CALIBRATE_YOUR_MONITOR=Best player experience can be achieved with properly calibrated monitor. If you have not, please do it before you play. +APP_CALIBRATE_YOUR_MONITOR=Best player experience can be achieved with properly calibrated monitor. \ + If you have not, please do it before you play. @@ -97,25 +98,116 @@ GAME_INVENTORY_YOU_CANNOT_CARRY=You cannot carry any more. ## Tiles # ############ -TILE_AIR=You are not supposed to see this TILE_STONE=Stone +TILE_STONE_PLURAL=Stones + TILE_DIRT=Dirt +TILE_DIRT_PLURAL=Dirts + TILE_GRASS=Grass -TILE_PLANK_NORMAL=Wooden plank -TILE_PLANK_EBONY=Ebony plank -TILE_PLANK_BIRCH=Birch plank -TILE_PLANK_ROSEWOOD=Rosewood plank +TILE_GRAS_PLURALS=Grasses + +TILE_PLANK_NORMAL=Wooden planks +TILE_PLANK_NORMAL_PLURAL=Wooden planks + +TILE_PLANK_EBONY=Ebony planks +TILE_PLANK_EBONY_PLURAL=Ebony planks + +TILE_PLANK_BIRCH=Birch planks +TILE_PLANK_BIRCH_PLURAL=Birch planks + +TILE_PLANK_BLOODROSE=Rosewood planks +TILE_PLANK_BLOODROSE_PLURAL=Rosewood planks + TILE_TRUNK_NORMAL=Oak log +TILE_TRUNK_NORMAL_PLURAL=Oak logs + TILE_TRUNK_EBONY=Ebony log +TILE_TRUNK_EBONY_PLURAL=Ebony logs + TILE_TRUNK_BIRCH=Birch log -TILE_TRUNK_ROSEWOOD=Rosewood log +TILE_TRUNK_BIRCH_PLURAL=Birch logs + +TILE_TRUNK_BLOODROSE=Rosewood log +TILE_TRUNK_BLOODROSE_PLURAL=Rosewood logs + +TILE_SAND=Sand +TILE_SAND_PLURAL=Sands + +TILE_GRAVEL=Gravel +TILE_GRAVEL_PLURAL=Gravels + +TILE_ORE_MALACHITE=Malachite +TILE_ORE_MALACHITES=Malachites + +TILE_ORE_HEMATITE=Hematite +TILE_ORE_HEMATITE_PLURAL=Hematites + +TILE_ORE_NATURAL_GOLD=Natural gold +TILE_ORE_NATERAL_GOLD_PLURAL=Natural golds + +TILE_ORE_NATURAL_SILVER=Natural silver +TILE_ORE_NATURAL_SILVER_PLURAL=Natural silvers + +TILE_ORE_RUTILE=Rutile +TILE_ORE_RUTILE_PLURAL=Rutiles + +TILE_ORE_AURICHALCUMITE=Aurichalcumite +TILE_ORE_AURICHALCUMITE_PLURAL=Aurichalcumites + +TILE_GEM_RUBY=Raw ruby +TILE_GEM_RUBY_PLURAL=Raw rubies + +TILE_GEM_EMERALD=Raw emerald +TILE_GEM_EMERALD_PLURAL=Raw emeralds + +TILE_GEM_SAPPHIRE=Raw sapphire +TILE_GEM_SAPPHIRE_PLURAL=Raw sapphires + +TILE_GEM_TOPAZ=Raw topaz +TILE_GEM_TOPAZ_PLURAL=Raw topazes + +TILE_GEM_DIAMOND=Raw diamond +TILE_GEM_DIAMOND_PLURAL=Raw diamonds + +TILE_GEM_AMETHYST=Raw amethyst +TILE_GEM_AMETHYST_PLURAL=Raw amethysts TILE_SNOW=Snow +TILE_SNOW_PLURAL=Snows + TILE_ICE_FRAGILE=Thin ice +TILE_ICE_FRAGILE_PLURAL=Thin ices + TILE_ICE_NATURAL=Ice +TILE_ICE_NATURAL_PLURAL=Ices + TILE_ICE_CLEAR_MAGICAL=Clear ice +TILE_ICE_CLEAR_MAGICA_PLURALL=Clear ices +TILE_PLATFORM_STONE=Stone platform +TILE_PLATFORM_STONE_PLURAL=Stone platforms +TILE_PLATFORM_WOODEN=Wooden platform +TILE_PLATFORM_WOODEN_PLURAL=Wooden platforms + +TILE_PLATFORM_EBONY=Ebony platform +TILE_PLATFORM_EBONY_PLURAL=Ebony platforms + +TILE_PLATFORM_BIRCH=Birch platform +TILE_PLATFORM_BIRCH_PLURAL=Birch platforms + +TILE_PLATFORM_BLOODROSE=Rosewood platform +TILE_PLATFORM_BLOODROSE_PLURAL=Rosewood platforms + +TILE_TORCH=Torch +TILE_TORCH_PLURAL=Torches + +TILE_WATER=Water +TILE_WATER_PLURAL=Waters + +TILE_LAVA=Lava +TILE_LAVA_PLURAL=Lavas #################### ## Terminologies # @@ -165,4 +257,6 @@ CREDITS_POLYGLOT=Translated by the Polyglot Project. LANGUAGE_ENGLISH=English LANGUAGE_FRENCH=French +LANGUAGE_JAPANESE=Japanese +LANGUAGE_JAPANESE_KANA=Japanese (kana) LANGUAGE_KOREAN=Korean diff --git a/res/locales/fr.lang b/res/locales/fr.lang index 75b31f092..2141f8ce9 100644 --- a/res/locales/fr.lang +++ b/res/locales/fr.lang @@ -9,7 +9,8 @@ COPYRIGHT_MSG=Tous les droits sont réservés. ## Application messages # ########################### -APP_CALIBRATE_YOUR_MONITOR=Meilleure expérience de joueur peut être réalisé avec écran correctement calibré. Si vous ne l'avez pas, s.v.p. le calibrez avant de jouer. +APP_CALIBRATE_YOUR_MONITOR=Meilleure expérience de joueur peut être réalisé avec écran correctement calibré. \ + Si vous ne l'avez pas, s.v.p. le calibrez avant de jouer. @@ -97,25 +98,116 @@ GAME_INVENTORY_YOU_CANNOT_CARRY=Vous ne pouvez pas transporter plus ## Tiles # ############ -TILE_AIR=Vous n'êtes pas censé voir ce TILE_STONE=Roche +TILE_STONE_PLURAL=Roches + TILE_DIRT=Terre +TILE_DIRT_PLURAL=Terres + TILE_GRASS=Herbe +TILE_GRAS_PLURALS=Herbes + TILE_PLANK_NORMAL=Planches +TILE_PLANK_NORMAL_PLURAL=Planches + TILE_PLANK_EBONY=Planches ébène +TILE_PLANK_EBONY_PLURAL=Planches ébène + TILE_PLANK_BIRCH=Planches bouleau -TILE_PLANK_ROSEWOOD=Planches palissandre +TILE_PLANK_BIRCH_PLURAL=Planches bouleau + +TILE_PLANK_BLOODROSE=Planches palissandre +TILE_PLANK_BLOODROSE_PLURAL=Planches palissandre + TILE_TRUNK_NORMAL=Bûche +TILE_TRUNK_NORMAL_PLURAL=Bûches + TILE_TRUNK_EBONY=Bûche ébène +TILE_TRUNK_EBONY_PLURAL=Bûches ébène + TILE_TRUNK_BIRCH=Bûche bouleau -TILE_TRUNK_ROSEWOOD=Bûche rouge +TILE_TRUNK_BIRCH_PLURAL=Bûches bouleau + +TILE_TRUNK_BLOODROSE=Bûche rouge +TILE_TRUNK_BLOODROSE_PLURAL=Bûches rouge + +TILE_SAND=Sable +TILE_SAND_PLURAL=Sables + +TILE_GRAVEL=Gravier +TILE_GRAVEL_PLURAL=Graviers + +TILE_ORE_MALACHITE=Malachite +TILE_ORE_MALACHITES=Malachites + +TILE_ORE_HEMATITE=Hématite +TILE_ORE_HEMATITE_PLURAL=Hématites + +TILE_ORE_NATURAL_GOLD=Or naturel +TILE_ORE_NATERAL_GOLD_PLURAL=Ors naturels + +TILE_ORE_NATURAL_SILVER=Argent naturel +TILE_ORE_NATURAL_SILVER_PLURAL=Argents naturels + +TILE_ORE_RUTILE=Rutile +TILE_ORE_RUTILE_PLURAL=Rutiles + +TILE_ORE_AURICHALCUMITE=Aurichalquemite +TILE_ORE_AURICHALCUMITE_PLURAL=Aurichalquemites + +TILE_GEM_RUBY=Rubis brut +TILE_GEM_RUBY_PLURAL=Rubis bruts + +TILE_GEM_EMERALD=Émeraude brute +TILE_GEM_EMERALD_PLURAL=Émeraudes brutes + +TILE_GEM_SAPPHIRE=Saphir brut +TILE_GEM_SAPPHIRE_PLURAL=Saphirs bruts + +TILE_GEM_TOPAZ=Topaze brute +TILE_GEM_TOPAZ_PLURAL=Topazes brutes + +TILE_GEM_DIAMOND=Diamant brut +TILE_GEM_DIAMOND_PLURAL=Diamants bruts + +TILE_GEM_AMETHYST=Améthyste brute +TILE_GEM_AMETHYST_PLURAL=Améthystes brutes TILE_SNOW=Neige +TILE_SNOW_PLURAL=Neiges + TILE_ICE_FRAGILE=Glace mance +TILE_ICE_FRAGILE_PLURAL=Glaces mance + TILE_ICE_NATURAL=Glace +TILE_ICE_NATURAL_PLURAL=Glaces + TILE_ICE_CLEAR_MAGICAL=Glace claire +TILE_ICE_CLEAR_MAGICA_PLURALL=Glaces claire +TILE_PLATFORM_STONE=Plateforme de pierre +TILE_PLATFORM_STONE_PLURAL=plateformes de pierre +TILE_PLATFORM_WOODEN=Plateforme de planches +TILE_PLATFORM_WOODEN_PLURAL=Plateformes de planches + +TILE_PLATFORM_EBONY=Plateforme de planches ébène +TILE_PLATFORM_EBONY_PLURAL=Plateformes de planches ébène + +TILE_PLATFORM_BIRCH=Plateforme de planche bouleau +TILE_PLATFORM_BIRCH_PLURAL=Plateformes de planche bouleau + +TILE_PLATFORM_BLOODROSE=Plateforme de planche palissandre +TILE_PLATFORM_BLOODROSE_PLURAL=Plateformes de planche palissandre + +TILE_TORCH=Torche +TILE_TORCH_PLURAL=Torches + +TILE_WATER=Eau +TILE_WATER_PLURAL=Eaux + +TILE_LAVA=Lave +TILE_LAVA_PLURAL=Laves #################### ## Terminologies # @@ -137,9 +229,9 @@ DEV_COLOUR_LEGEND_BLUE= BLEU DEV_COLOUR_LEGEND_ORANGE=ORANGE DEV_COLOUR_LEGEND_RED= ROUGE -DEV_MESSAGE_CONSOLE_CODEX=Tapez «codex» pour commandes disponibles. +DEV_MESSAGE_CONSOLE_CODEX=Tapez « codex » pour commandes disponibles. DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS=Commandes disponibles : -DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN=«%1$s»: Commande inconnue +DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN=« %1$s » : Commande inconnue @@ -165,4 +257,6 @@ CREDITS_POLYGLOT=Traduit par le Polyglot Projet. LANGUAGE_ENGLISH=Anglais LANGUAGE_FRENCH=Français +LANGUAGE_JAPANESE_KANA=Japonais +LANGUAGE_JAPANESE_KANA=Japonais (kana) LANGUAGE_KOREAN=Coréen diff --git a/res/locales/jp.lang b/res/locales/jp.lang new file mode 100644 index 000000000..ff6c61a07 --- /dev/null +++ b/res/locales/jp.lang @@ -0,0 +1,262 @@ +MENU_LANGUAGE_THIS_EN=Japanese +MENU_LANGUAGE_THIS=日本語 + +COPYRIGHT_MSG=全著作権所有。 + + + +########################### +## Application messages # +########################### + +APP_CALIBRATE_YOUR_MONITOR=このゲームは適切に校正したモニターから最高のプレイができます。\ + 校正していなければプレイする前に校正して下さい。 + + + +############### +## Gameplay # +############### + +GAME_ACTION_ATTACK=Attack +GAME_ACTION_BOOST=Boost +GAME_ACTION_BUILD=Build +GAME_ACTION_CAST_FISHING=Cast +GAME_ACTION_CAST_SPELL=Cast +GAME_ACTION_CLAIM=Claim +GAME_ACTION_CLIMB=Climb +GAME_ACTION_CLOSE=Close +GAME_ACTION_COLLECT=Collect +GAME_ACTION_COOK=Cook +GAME_ACTION_CRAFT=Craft +GAME_ACTION_CROUCH=Crouch +GAME_ACTION_DODGE=Dodge +GAME_ACTION_DRIVE=Drive +GAME_ACTION_FLY=Fly +GAME_ACTION_FULL_SPEED=Full Speed +GAME_ACTION_GO=Go +GAME_ACTION_GO_TO_PLACE=Go to +GAME_ACTION_HALF_SPEED=Half Speed +GAME_ACTION_HEAL=Heal +GAME_ACTION_JUMP=Jump +GAME_ACTION_LAND=Landing +GAME_ACTION_LOOK=Look +GAME_ACTION_MIX=Mix +GAME_ACTION_OPEN=Open +GAME_ACTION_PICK_UP=Pick up +GAME_ACTION_RACE=Race +GAME_ACTION_READ=Read +GAME_ACTION_REPLACE=Replace +GAME_ACTION_RUN=Run +GAME_ACTION_RUN_AWAY=Run away +GAME_ACTION_SHOOT=Shoot +GAME_ACTION_SNEAK=Sneak +GAME_ACTION_SPIN=Spin +GAME_ACTION_SPRINT=Sprint +GAME_ACTION_STEER=Steer +GAME_ACTION_TAKE_OFF=Takeoff +GAME_ACTION_TALK=Talk +GAME_ACTION_THROW=Throw +GAME_ACTION_WALK=Walk + +GAME_CHARACTER_ENDURANCE=Endurance +GAME_CHARACTER_EXP=Experience points +GAME_CHARACTER_HEALTH=Health +GAME_CHARACTER_HEART=Heart +GAME_CHARACTER_HEART_PLURAL=Hearts +GAME_CHARACTER_LEVEL=Level +GAME_CHARACTER_LEVEL_UP=Level up! +GAME_CHARACTER_RESPAWN=Respawn +GAME_CHARACTER_RESPAWN_IN=Respawn in: +GAME_CHARACTER_RESPAWN_QUESTION=Respawn? +GAME_CHARACTER_RESPAWNING=Respawning +GAME_CHARACTER_SKILL=Skill +GAME_CHARACTER_SPAWN_POINT=Spawn Point + +GAME_INVENTORY=Inventory +GAME_INVENTORY_AMMO=Ammo +GAME_INVENTORY_AMMUNITION=Ammunition +GAME_INVENTORY_BULLET=Bullet +GAME_INVENTORY_BULLET_PLURAL=Bullets +GAME_INVENTORY_BUY=Buy +GAME_INVENTORY_CAPACITY=Inventory Capacity +GAME_INVENTORY_DROP=Drop +GAME_INVENTORY_ENCUMBRANCE=Encumbrance +GAME_INVENTORY_FULL=Inventory Full +GAME_INVENTORY_ITEM=Item +GAME_INVENTORY_KEY=Key +GAME_INVENTORY_POWERUP=Power-up +GAME_INVENTORY_SELL=Sell +GAME_INVENTORY_USE=Use +GAME_INVENTORY_WEAPON=Weapon +GAME_INVENTORY_WEAPONS=Weapons +GAME_INVENTORY_YOU_CANNOT_CARRY=You cannot carry any more. + + + +############ +## Tiles # +############ + +TILE_STONE=Stone +TILE_STONE_PLURAL=Stones + +TILE_DIRT=Dirt +TILE_DIRT_PLURAL=Dirts + +TILE_GRASS=Grass +TILE_GRAS_PLURALS=Grasses + +TILE_PLANK_NORMAL=Wooden plank +TILE_PLANK_NORMAL_PLURAL=Wooden planks + +TILE_PLANK_EBONY=Ebony plank +TILE_PLANK_EBONY_PLURAL=Ebony planks + +TILE_PLANK_BIRCH=Birch plank +TILE_PLANK_BIRCH_PLURAL=Birch planks + +TILE_PLANK_BLOODROSE=Rosewood plank +TILE_PLANK_BLOODROSE_PLURAL=Rosewood planks + +TILE_TRUNK_NORMAL=Oak log +TILE_TRUNK_NORMAL_PLURAL=Oak logs + +TILE_TRUNK_EBONY=Ebony log +TILE_TRUNK_EBONY_PLURAL=Ebony logs + +TILE_TRUNK_BIRCH=Birch log +TILE_TRUNK_BIRCH_PLURAL=Birch logs + +TILE_TRUNK_BLOODROSE=Rosewood log +TILE_TRUNK_BLOODROSE_PLURAL=Rosewood logss + +TILE_SAND=Sand +TILE_SAND_PLURAL=Sands + +TILE_GRAVEL=Gravel +TILE_GRAVEL_PLURAL=Gravels + +TILE_ORE_MALACHITE=Malachite +TILE_ORE_MALACHITES=Malachites + +TILE_ORE_HEMATITE=Hematite +TILE_ORE_HEMATITE_PLURAL=Hematites + +TILE_ORE_NATURAL_GOLD=Natural gold +TILE_ORE_NATERAL_GOLD_PLURAL=Natural golds + +TILE_ORE_NATURAL_SILVER=Natural silver +TILE_ORE_NATURAL_SILVER_PLURAL=Natural silvers + +TILE_ORE_RUTILE=Rutile +TILE_ORE_RUTILE_PLURAL=Rutiles + +TILE_ORE_AURICHALCUMITE=Aurichalcumite +TILE_ORE_AURICHALCUMITE_PLURAL=Aurichalcumites + +TILE_GEM_RUBY=Raw ruby +TILE_GEM_RUBY_PLURAL=Raw rubies + +TILE_GEM_EMERALD=Raw emerald +TILE_GEM_EMERALD_PLURAL=Raw emeralds + +TILE_GEM_SAPPHIRE=Raw sapphire +TILE_GEM_SAPPHIRE_PLURAL=Raw sapphires + +TILE_GEM_TOPAZ=Raw topaz +TILE_GEM_TOPAZ_PLURAL=Raw topazes + +TILE_GEM_DIAMOND=Raw diamond +TILE_GEM_DIAMOND_PLURAL=Raw diamonds + +TILE_GEM_AMETHYST=Raw amethyst +TILE_GEM_AMETHYST_PLURAL=Raw amethysts + +TILE_SNOW=Snow +TILE_SNOW_PLURAL=Snows + +TILE_ICE_FRAGILE=Thin ice +TILE_ICE_FRAGILE_PLURAL=Thin ices + +TILE_ICE_NATURAL=Ice +TILE_ICE_NATURAL_PLURAL=Ices + +TILE_ICE_CLEAR_MAGICAL=Clear ice +TILE_ICE_CLEAR_MAGICA_PLURALL=Clear ices + +TILE_PLATFORM_STONE=Stone platform +TILE_PLATFORM_STONE_PLURAL=Stone platforms + +TILE_PLATFORM_WOODEN=Wooden platform +TILE_PLATFORM_WOODEN_PLURAL=Wooden platforms + +TILE_PLATFORM_EBONY=Ebony platform +TILE_PLATFORM_EBONY_PLURAL=Ebony platforms + +TILE_PLATFORM_BIRCH=Birch platform +TILE_PLATFORM_BIRCH_PLURAL=Birch platforms + +TILE_PLATFORM_BLOODROSE=Rosewood platform +TILE_PLATFORM_BLOODROSE_PLURAL=Rosewood platforms + +TILE_TORCH=Torch +TILE_TORCH_PLURAL=Torches + +TILE_WATER=Water +TILE_WATER_PLURAL=Waters + +TILE_LAVA=Lava +TILE_LAVA_PLURAL=Lavas + +#################### +## Terminologies # +#################### + +TERM_PHYS_MASS=質量 + + + +########## +## Dev # +########## + +DEV_MEMORY_SHORT_CAP=メモリー +DEV_MEMORY_A_OF_B=%2$sM 中 %1$sM + +DEV_COLOUR_LEGEND_GREEN=緑 +DEV_COLOUR_LEGEND_BLUE=青 +DEV_COLOUR_LEGEND_ORANGE=黄 +DEV_COLOUR_LEGEND_RED=赤 + +DEV_MESSAGE_CONSOLE_CODEX=使用可能な命令語の目録は「codex」を入力して下さい。 +DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS=命令語の目録: +DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN=「%1$s」: 不明な命令語 + + + +############### +## Debugger # +############### + +DBG_TOTAL_ACCEL_X=total X-accel + + + +############## +## Credits # +############## + +CREDITS_POLYGLOT=Translated by the Polyglot Project. + + + +################ +## Languages # +################ + +LANGUAGE_ENGLISH=えい ご +LANGUAGE_FRENCH=フランス ご +LANGUAGE_JAPANESE=日本語 +LANGUAGE_JAPANESE_KANA=日本語・仮名 +LANGUAGE_KOREAN=かんこく ご diff --git a/res/locales/jp_kana.lang b/res/locales/jp_kana.lang new file mode 100644 index 000000000..704fe16dc --- /dev/null +++ b/res/locales/jp_kana.lang @@ -0,0 +1,262 @@ +MENU_LANGUAGE_THIS_EN=Japanese (kana) +MENU_LANGUAGE_THIS=にほんご + +COPYRIGHT_MSG=ぜん ちょさくけん しょゆう。 + + + +########################### +## Application messages # +########################### + +APP_CALIBRATE_YOUR_MONITOR=この ゲームは てきせつに こうせい した モニターから さいこうの プレイが できます。\ + こうせい して いなければ プレイする まえに こうせい して ください。 + + + +############### +## Gameplay # +############### + +GAME_ACTION_ATTACK=Attack +GAME_ACTION_BOOST=Boost +GAME_ACTION_BUILD=Build +GAME_ACTION_CAST_FISHING=Cast +GAME_ACTION_CAST_SPELL=Cast +GAME_ACTION_CLAIM=Claim +GAME_ACTION_CLIMB=Climb +GAME_ACTION_CLOSE=Close +GAME_ACTION_COLLECT=Collect +GAME_ACTION_COOK=Cook +GAME_ACTION_CRAFT=Craft +GAME_ACTION_CROUCH=Crouch +GAME_ACTION_DODGE=Dodge +GAME_ACTION_DRIVE=Drive +GAME_ACTION_FLY=Fly +GAME_ACTION_FULL_SPEED=Full Speed +GAME_ACTION_GO=Go +GAME_ACTION_GO_TO_PLACE=Go to +GAME_ACTION_HALF_SPEED=Half Speed +GAME_ACTION_HEAL=Heal +GAME_ACTION_JUMP=Jump +GAME_ACTION_LAND=Landing +GAME_ACTION_LOOK=Look +GAME_ACTION_MIX=Mix +GAME_ACTION_OPEN=Open +GAME_ACTION_PICK_UP=Pick up +GAME_ACTION_RACE=Race +GAME_ACTION_READ=Read +GAME_ACTION_REPLACE=Replace +GAME_ACTION_RUN=Run +GAME_ACTION_RUN_AWAY=Run away +GAME_ACTION_SHOOT=Shoot +GAME_ACTION_SNEAK=Sneak +GAME_ACTION_SPIN=Spin +GAME_ACTION_SPRINT=Sprint +GAME_ACTION_STEER=Steer +GAME_ACTION_TAKE_OFF=Takeoff +GAME_ACTION_TALK=Talk +GAME_ACTION_THROW=Throw +GAME_ACTION_WALK=Walk + +GAME_CHARACTER_ENDURANCE=Endurance +GAME_CHARACTER_EXP=Experience points +GAME_CHARACTER_HEALTH=Health +GAME_CHARACTER_HEART=Heart +GAME_CHARACTER_HEART_PLURAL=Hearts +GAME_CHARACTER_LEVEL=Level +GAME_CHARACTER_LEVEL_UP=Level up! +GAME_CHARACTER_RESPAWN=Respawn +GAME_CHARACTER_RESPAWN_IN=Respawn in: +GAME_CHARACTER_RESPAWN_QUESTION=Respawn? +GAME_CHARACTER_RESPAWNING=Respawning +GAME_CHARACTER_SKILL=Skill +GAME_CHARACTER_SPAWN_POINT=Spawn Point + +GAME_INVENTORY=Inventory +GAME_INVENTORY_AMMO=Ammo +GAME_INVENTORY_AMMUNITION=Ammunition +GAME_INVENTORY_BULLET=Bullet +GAME_INVENTORY_BULLET_PLURAL=Bullets +GAME_INVENTORY_BUY=Buy +GAME_INVENTORY_CAPACITY=Inventory Capacity +GAME_INVENTORY_DROP=Drop +GAME_INVENTORY_ENCUMBRANCE=Encumbrance +GAME_INVENTORY_FULL=Inventory Full +GAME_INVENTORY_ITEM=Item +GAME_INVENTORY_KEY=Key +GAME_INVENTORY_POWERUP=Power-up +GAME_INVENTORY_SELL=Sell +GAME_INVENTORY_USE=Use +GAME_INVENTORY_WEAPON=Weapon +GAME_INVENTORY_WEAPONS=Weapons +GAME_INVENTORY_YOU_CANNOT_CARRY=You cannot carry any more. + + + +############ +## Tiles # +############ + +TILE_STONE=Stone +TILE_STONE_PLURAL=Stones + +TILE_DIRT=Dirt +TILE_DIRT_PLURAL=Dirts + +TILE_GRASS=Grass +TILE_GRAS_PLURALS=Grasses + +TILE_PLANK_NORMAL=Wooden plank +TILE_PLANK_NORMAL_PLURAL=Wooden planks + +TILE_PLANK_EBONY=Ebony plank +TILE_PLANK_EBONY_PLURAL=Ebony planks + +TILE_PLANK_BIRCH=Birch plank +TILE_PLANK_BIRCH_PLURAL=Birch planks + +TILE_PLANK_BLOODROSE=Rosewood plank +TILE_PLANK_BLOODROSE_PLURAL=Rosewood planks + +TILE_TRUNK_NORMAL=Oak log +TILE_TRUNK_NORMAL_PLURAL=Oak logs + +TILE_TRUNK_EBONY=Ebony log +TILE_TRUNK_EBONY_PLURAL=Ebony logs + +TILE_TRUNK_BIRCH=Birch log +TILE_TRUNK_BIRCH_PLURAL=Birch logs + +TILE_TRUNK_BLOODROSE=Rosewood log +TILE_TRUNK_BLOODROSE_PLURAL=Rosewood logss + +TILE_SAND=Sand +TILE_SAND_PLURAL=Sands + +TILE_GRAVEL=Gravel +TILE_GRAVEL_PLURAL=Gravels + +TILE_ORE_MALACHITE=Malachite +TILE_ORE_MALACHITES=Malachites + +TILE_ORE_HEMATITE=Hematite +TILE_ORE_HEMATITE_PLURAL=Hematites + +TILE_ORE_NATURAL_GOLD=Natural gold +TILE_ORE_NATERAL_GOLD_PLURAL=Natural golds + +TILE_ORE_NATURAL_SILVER=Natural silver +TILE_ORE_NATURAL_SILVER_PLURAL=Natural silvers + +TILE_ORE_RUTILE=Rutile +TILE_ORE_RUTILE_PLURAL=Rutiles + +TILE_ORE_AURICHALCUMITE=Aurichalcumite +TILE_ORE_AURICHALCUMITE_PLURAL=Aurichalcumites + +TILE_GEM_RUBY=Raw ruby +TILE_GEM_RUBY_PLURAL=Raw rubies + +TILE_GEM_EMERALD=Raw emerald +TILE_GEM_EMERALD_PLURAL=Raw emeralds + +TILE_GEM_SAPPHIRE=Raw sapphire +TILE_GEM_SAPPHIRE_PLURAL=Raw sapphires + +TILE_GEM_TOPAZ=Raw topaz +TILE_GEM_TOPAZ_PLURAL=Raw topazes + +TILE_GEM_DIAMOND=Raw diamond +TILE_GEM_DIAMOND_PLURAL=Raw diamonds + +TILE_GEM_AMETHYST=Raw amethyst +TILE_GEM_AMETHYST_PLURAL=Raw amethysts + +TILE_SNOW=Snow +TILE_SNOW_PLURAL=Snows + +TILE_ICE_FRAGILE=Thin ice +TILE_ICE_FRAGILE_PLURAL=Thin ices + +TILE_ICE_NATURAL=Ice +TILE_ICE_NATURAL_PLURAL=Ices + +TILE_ICE_CLEAR_MAGICAL=Clear ice +TILE_ICE_CLEAR_MAGICA_PLURALL=Clear ices + +TILE_PLATFORM_STONE=Stone platform +TILE_PLATFORM_STONE_PLURAL=Stone platforms + +TILE_PLATFORM_WOODEN=Wooden platform +TILE_PLATFORM_WOODEN_PLURAL=Wooden platforms + +TILE_PLATFORM_EBONY=Ebony platform +TILE_PLATFORM_EBONY_PLURAL=Ebony platforms + +TILE_PLATFORM_BIRCH=Birch platform +TILE_PLATFORM_BIRCH_PLURAL=Birch platforms + +TILE_PLATFORM_BLOODROSE=Rosewood platform +TILE_PLATFORM_BLOODROSE_PLURAL=Rosewood platforms + +TILE_TORCH=Torch +TILE_TORCH_PLURAL=Torches + +TILE_WATER=Water +TILE_WATER_PLURAL=Waters + +TILE_LAVA=Lava +TILE_LAVA_PLURAL=Lavas + +#################### +## Terminologies # +#################### + +TERM_PHYS_MASS=しつりょう + + + +########## +## Dev # +########## + +DEV_MEMORY_SHORT_CAP=メモリー +DEV_MEMORY_A_OF_B=%2$sM ちゅう %1$sM + +DEV_COLOUR_LEGEND_GREEN= みどり +DEV_COLOUR_LEGEND_BLUE=  あお +DEV_COLOUR_LEGEND_ORANGE=オレンジ +DEV_COLOUR_LEGEND_RED=  あか + +DEV_MESSAGE_CONSOLE_CODEX=しよう かのうな めいれいご の もくろく は 「codex」を にゅうりょく して ください。 +DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS=めいれいご の もくろく: +DEV_MESSAGE_CONSOLE_COMMAND_UNKNOWN=「%1$s」: ふめいな めいれいご + + + +############### +## Debugger # +############### + +DBG_TOTAL_ACCEL_X=total X-accel + + + +############## +## Credits # +############## + +CREDITS_POLYGLOT=Translated by the Polyglot Project. + + + +################ +## Languages # +################ + +LANGUAGE_ENGLISH=えい ご +LANGUAGE_FRENCH=フランス ご +LANGUAGE_JAPANESE=にほんご +LANGUAGE_JAPANESE_KANA=にほんご・かな +LANGUAGE_KOREAN=かんこく ご diff --git a/res/locales/ko.lang b/res/locales/ko.lang index 83a075c7b..ca7afbdbc 100755 --- a/res/locales/ko.lang +++ b/res/locales/ko.lang @@ -9,7 +9,8 @@ COPYRIGHT_MSG=모든 권리 보유. ## Application messages # ########################### -APP_CALIBRATE_YOUR_MONITOR=본 게임은 적절히 보정된 모니터에서 최상으로 즐길 수 있습니다. 모니터를 보정하지 않았다면 플레이하기 전에 보정해 주십시오. +APP_CALIBRATE_YOUR_MONITOR=본 게임은 적절히 보정된 모니터에서 최상으로 즐길 수 있습니다. \ + 보정하지 않았다면 플레이하기 전에 보정해 주십시오. @@ -97,24 +98,116 @@ GAME_INVENTORY_YOU_CANNOT_CARRY=더 지닐 수 없습니다. ## Tiles # ############ -TILE_AIR=이게 보이면 안 되는데 말입니다 TILE_STONE=돌 +TILE_STONE_PLURAL=돌 + TILE_DIRT=흙 +TILE_DIRT_PLURAL=흙 + TILE_GRASS=잔디 +TILE_GRAS_PLURALS=잔디 + TILE_PLANK_NORMAL=나무판자 +TILE_PLANK_NORMAL_PLURAL=나무판자 + TILE_PLANK_EBONY=흑단 +TILE_PLANK_EBONY_PLURAL=흑단 + TILE_PLANK_BIRCH=백단 -TILE_PLANK_ROSEWOOD=자단 +TILE_PLANK_BIRCH_PLURAL=백단 + +TILE_PLANK_BLOODROSE=자단 +TILE_PLANK_BLOODROSE_PLURAL=자단 + TILE_TRUNK_NORMAL=통나무 +TILE_TRUNK_NORMAL_PLURAL=통나무 + TILE_TRUNK_EBONY=흑단나무 -TILE_TRUNK_BIRCH=자작나무 -TILE_TRUNK_ROSEWOOD=자단나무 +TILE_TRUNK_EBONY_PLURAL=흑단나무 + +TILE_TRUNK_BIRCH=백단나무 +TILE_TRUNK_BIRCH_PLURAL=백단나무 + +TILE_TRUNK_BLOODROSE=자단나무 +TILE_TRUNK_BLOODROSE_PLURAL=자단나무 + +TILE_SAND=모래 +TILE_SAND_PLURAL=모래 + +TILE_GRAVEL=자갈 +TILE_GRAVEL_PLURAL=자갈 + +TILE_ORE_MALACHITE=공작석 +TILE_ORE_MALACHITES=공작석 + +TILE_ORE_HEMATITE=적철석 +TILE_ORE_HEMATITE_PLURAL=적철석 + +TILE_ORE_NATURAL_GOLD=자연금 +TILE_ORE_NATERAL_GOLD_PLURAL=자연금 + +TILE_ORE_NATURAL_SILVER=자연은 +TILE_ORE_NATURAL_SILVER_PLURAL=자연은 + +TILE_ORE_RUTILE=금홍석 +TILE_ORE_RUTILE_PLURAL=금홍석 + +TILE_ORE_AURICHALCUMITE=진금석 +TILE_ORE_AURICHALCUMITE_PLURAL=진금석 + +TILE_GEM_RUBY=홍옥석 +TILE_GEM_RUBY_PLURAL=홍옥석 + +TILE_GEM_EMERALD=취옥석 +TILE_GEM_EMERALD_PLURAL=취옥석 + +TILE_GEM_SAPPHIRE=청옥석 +TILE_GEM_SAPPHIRE_PLURAL=청옥석 + +TILE_GEM_TOPAZ=황옥석 +TILE_GEM_TOPAZ_PLURAL=황옥석 + +TILE_GEM_DIAMOND=금강석 +TILE_GEM_DIAMOND_PLURAL=금강석 + +TILE_GEM_AMETHYST=자수정석 +TILE_GEM_AMETHYST_PLURAL=자수정석 TILE_SNOW=눈 -TILE_ICE_FRAGILE=살얼음 -TILE_ICE_NATURAL=얼음 -TILE_ICE_CLEAR_MAGICAL=깨끗한 얼음 +TILE_SNOW_PLURAL=눈 +TILE_ICE_FRAGILE=살얼음 +TILE_ICE_FRAGILE_PLURAL=살얼음 + +TILE_ICE_NATURAL=얼음 +TILE_ICE_NATURAL_PLURAL=얼음 + +TILE_ICE_CLEAR_MAGICAL=깨끗한 얼음 +TILE_ICE_CLEAR_MAGICA_PLURALL=깨끗한 얼음 + +TILE_PLATFORM_STONE=돌 발판 +TILE_PLATFORM_STONE_PLURAL=돌 발판 + +TILE_PLATFORM_WOODEN=나무 발판 +TILE_PLATFORM_WOODEN_PLURAL=나무 발판 + +TILE_PLATFORM_EBONY=흑단 발판 +TILE_PLATFORM_EBONY_PLURAL=흑단 발판 + +TILE_PLATFORM_BIRCH=백단 발판 +TILE_PLATFORM_BIRCH_PLURAL=백단 발판 + +TILE_PLATFORM_BLOODROSE=적단 발판 +TILE_PLATFORM_BLOODROSE_PLURAL=적단 발판 + +TILE_TORCH=횃불 +TILE_TORCH_PLURAL=횃불 + +TILE_WATER=물 +TILE_WATER_PLURAL=물 + +TILE_LAVA=용암 +TILE_LAVA_PLURAL=용암 #################### ## Terminologies # @@ -131,10 +224,10 @@ TERM_PHYS_MASS=질량 DEV_MEMORY_SHORT_CAP=메모리 DEV_MEMORY_A_OF_B=%2$sM 중 %1$sM -DEV_COLOUR_LEGEND_GREEN= 녹 -DEV_COLOUR_LEGEND_BLUE= 청 -DEV_COLOUR_LEGEND_ORANGE= 황 -DEV_COLOUR_LEGEND_RED= 적 +DEV_COLOUR_LEGEND_GREEN=녹 +DEV_COLOUR_LEGEND_BLUE=청 +DEV_COLOUR_LEGEND_ORANGE=황 +DEV_COLOUR_LEGEND_RED=적 DEV_MESSAGE_CONSOLE_CODEX=사용 가능한 명령어 목록을 보려면 'codex'를 입력해 주십시오. DEV_MESSAGE_CONSOLE_AVAILABLE_COMMANDS=명령어 목록: @@ -164,4 +257,6 @@ CREDITS_POLYGLOT=번역 제공: Polyglot Project LANGUAGE_ENGLISH=영어 LANGUAGE_FRENCH=프랑스어 +LANGUAGE_JAPANESE=일본어 +LANGUAGE_JAPANESE_KANA=일본어 (가나) LANGUAGE_KOREAN=한국어 diff --git a/src/com/Torvald/ImageFont/GameFontBase.java b/src/com/Torvald/ImageFont/GameFontBase.java index e65872e2e..ca8d6eb9b 100644 --- a/src/com/Torvald/ImageFont/GameFontBase.java +++ b/src/com/Torvald/ImageFont/GameFontBase.java @@ -257,9 +257,7 @@ public class GameFontBase implements Font { + getWidth(s.substring(0, i)) ) , Math.round(y) - - ((prevInstance == SHEET_KANA) ? 2 - : (prevInstance == SHEET_CJK_PUNCT) ? - 1 : 0) + - ((prevInstance == SHEET_CJK_PUNCT) ? 1 : 0) , sheetX , sheetY ); diff --git a/src/com/Torvald/Terrarum/Actors/Faction/Faction.java b/src/com/Torvald/Terrarum/Actors/Faction/Faction.java index a2fe90545..3060054fb 100644 --- a/src/com/Torvald/Terrarum/Actors/Faction/Faction.java +++ b/src/com/Torvald/Terrarum/Actors/Faction/Faction.java @@ -21,6 +21,14 @@ public class Faction { factionFearful = new HashSet<>(); } + public String getFactionName() { + return factionName; + } + + public void renewFactionName(String factionName) { + this.factionName = factionName; + } + public HashSet getFactionFearful() { return factionFearful; } diff --git a/src/com/Torvald/Terrarum/Actors/PBFSigrid.java b/src/com/Torvald/Terrarum/Actors/PBFSigrid.java index c1ffeb875..077a96f7f 100644 --- a/src/com/Torvald/Terrarum/Actors/PBFSigrid.java +++ b/src/com/Torvald/Terrarum/Actors/PBFSigrid.java @@ -1,14 +1,22 @@ package com.Torvald.Terrarum.Actors; +import com.Torvald.JsonFetcher; +import com.Torvald.Terrarum.Actors.Faction.Faction; import com.Torvald.Terrarum.Game; import com.Torvald.spriteAnimation.SpriteAnimation; +import com.google.gson.JsonObject; +import org.lwjgl.Sys; import org.newdawn.slick.SlickException; +import java.io.IOException; + /** * Created by minjaesong on 16-02-03. */ public class PBFSigrid { + private static String FACTION_PATH = "./res/raw/"; + public Player build() throws SlickException { Player p = new Player(); @@ -60,7 +68,36 @@ public class PBFSigrid { p.setPosition(4096 * 16, 300 * 16); + p.assignFaction(loadFactioningData("FactionSigrid.json")); + return p; } + private Faction loadFactioningData(String filename) { + JsonObject jsonObject = null; + try { + jsonObject = JsonFetcher.readJson(FACTION_PATH + filename); + } + catch (IOException e) { + e.printStackTrace(); + System.exit(-1); + } + + Faction faction = new Faction(jsonObject.get("factionname").getAsString()); + + jsonObject.get("factionamicable").getAsJsonArray().forEach( + jobj -> faction.addFactionAmicable(jobj.getAsString()) + ); + jsonObject.get("factionneutral").getAsJsonArray().forEach( + jobj -> faction.addFactionNeutral(jobj.getAsString()) + ); + jsonObject.get("factionhostile").getAsJsonArray().forEach( + jobj -> faction.addFactionHostile(jobj.getAsString()) + ); + jsonObject.get("factionfearful").getAsJsonArray().forEach( + jobj -> faction.addFactionFearful(jobj.getAsString()) + ); + + return faction; + } } diff --git a/src/com/Torvald/Terrarum/Actors/Player.java b/src/com/Torvald/Terrarum/Actors/Player.java index 716073420..961ea3dcf 100644 --- a/src/com/Torvald/Terrarum/Actors/Player.java +++ b/src/com/Torvald/Terrarum/Actors/Player.java @@ -67,6 +67,9 @@ public class Player extends ActorWithBody implements Controllable, Pocketed, Fac @Override public void update(GameContainer gc, int delta_t) { + if (vehicleRiding instanceof Player) throw new RuntimeException("Attempted to 'ride' " + + "player object."); + updatePhysicalInfos(); super.update(gc, delta_t); diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java b/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java index 49bbcbdc7..77d011cb7 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java +++ b/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.java @@ -28,6 +28,8 @@ public class CommandDict { dict.put("cat", new CatStdout()); dict.put("exportav", new ExportAV()); dict.put("gsontest", new GsonTest()); + dict.put("setgl", new SetGlobalLightLevel()); + dict.put("getfaction", new GetFactioning()); } public static ConsoleCommand getCommand(String commandName) { diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.java b/src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.java new file mode 100644 index 000000000..0db7f6b13 --- /dev/null +++ b/src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.java @@ -0,0 +1,55 @@ +package com.Torvald.Terrarum.ConsoleCommand; + +import com.Torvald.Terrarum.Actors.Faction.Faction; +import com.Torvald.Terrarum.LangPack.Lang; +import com.Torvald.Terrarum.Terrarum; + +import java.util.HashSet; + +/** + * Created by minjaesong on 16-02-17. + */ +public class GetFactioning implements ConsoleCommand { + + private final String PRINT_INDENTATION = " --> "; + + @Override + public void execute(String[] args) { + Echo echo = new Echo(); + + if (args.length == 1) { // get all factioning data of player + HashSet factionSet = Terrarum.game.getPlayer().getAssignedFactions(); + + int count = factionSet.size(); + echo.execute(String.valueOf(count) + Lang.pluralise(" faction", count) + " assigned."); + + for (Faction faction : factionSet) { + echo.execute("Faction \"" + faction.getFactionName() + "\""); + echo.execute(" Amicable"); + faction.getFactionAmicable().forEach( + s -> echo.execute(PRINT_INDENTATION + s) + ); + + echo.execute(" Explicit neutral"); + faction.getFactionNeutral().forEach( + s -> echo.execute(PRINT_INDENTATION + s) + ); + + echo.execute(" Hostile"); + faction.getFactionHostile().forEach( + s -> echo.execute(PRINT_INDENTATION + s) + ); + + echo.execute(" Fearful"); + faction.getFactionFearful().forEach( + s -> echo.execute(PRINT_INDENTATION + s) + ); + } + } + } + + @Override + public void printUsage() { + + } +} diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.java b/src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.java new file mode 100644 index 000000000..c7d3d02df --- /dev/null +++ b/src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.java @@ -0,0 +1,33 @@ +package com.Torvald.Terrarum.ConsoleCommand; + +import com.Torvald.Terrarum.Terrarum; + +/** + * Created by minjaesong on 16-02-17. + */ +public class SetGlobalLightLevel implements ConsoleCommand { + @Override + public void execute(String[] args) { + if (args.length == 4) { + try { + int r = new Integer(args[1]); + int g = new Integer(args[2]); + int b = new Integer(args[3]); + int GL = (r << 16) | (g << 8) | b; + + Terrarum.game.map.setGlobalLight(GL); + } + catch (NumberFormatException e) { + new Echo().execute("Wrong number input."); + } + } + else{ + printUsage(); + } + } + + @Override + public void printUsage() { + new Echo().execute("Usage: setgl r g b"); + } +} diff --git a/src/com/Torvald/Terrarum/LangPack/Lang.java b/src/com/Torvald/Terrarum/LangPack/Lang.java index e7aba7a68..b05889892 100644 --- a/src/com/Torvald/Terrarum/LangPack/Lang.java +++ b/src/com/Torvald/Terrarum/LangPack/Lang.java @@ -4,6 +4,7 @@ import com.Torvald.Terrarum.Terrarum; import java.io.*; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.Properties; /** @@ -15,6 +16,26 @@ public class Lang { private static Properties langFallback; private static final String FALLBACK_LANG_CODE = "en"; + private static final int HANGUL_SYL_START = 0xAC00; + + private static final int[] HANGUL_POST_INDEX_ALPH = { // 0: 는, 가, ... 1: 은, 이, ... + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + private static final int[] HANGUL_POST_RO_INDEX_ALPH = { // 0: 로 1: 으로 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + + private static String[] ENGLISH_WORD_NORMAL_PLURAL = { + "photo" + }; + + private static String[] FRENCH_WORD_NORMAL_PLURAL = { + "bal" + , "banal" + , "fatal" + , "final" + }; + public Lang() throws IOException { lang = new Properties(); lang.load(new BufferedReader(new InputStreamReader(new FileInputStream( @@ -23,6 +44,8 @@ public class Lang { langFallback = new Properties(); langFallback.load(new BufferedReader(new InputStreamReader(new FileInputStream( "res/locales/" + FALLBACK_LANG_CODE + ".lang"), StandardCharsets.UTF_8))); + + Arrays.sort(ENGLISH_WORD_NORMAL_PLURAL); } public static String get(String key) { @@ -32,4 +55,83 @@ public class Lang { ); } + public static String pluraliseLang(String key, int count) { + return (count > 1) ? get(key + "_PLURAL") : get(key); + } + + public static String pluralise(String word, int count) { + if (count < 2) return word; + + switch (Terrarum.gameLocale) { + case ("fr"): + if (Arrays.binarySearch(FRENCH_WORD_NORMAL_PLURAL, word) >= 0) { + return word + "s"; + } + if (word.endsWith("al") || word.endsWith("au") || word.endsWith("eu") || word + .endsWith("eau")) { + return word.substring(0, word.length() - 2) + "ux"; + } + else if (word.endsWith("ail")) { + return word.substring(0, word.length() - 3) + "ux"; + } + else { + return word + "s"; + } + case ("en"): default: + if (Arrays.binarySearch(ENGLISH_WORD_NORMAL_PLURAL, word) >= 0) { + return word + "s"; + } + else if (word.endsWith("f")) { // f -> ves + return word.substring(0, word.length() - 2) + "ves"; + } + else if (word.endsWith("o") || word.endsWith("z")) { // o -> oes + return word + "es"; + } + else { + return word + "s"; + } + } + } + + public static String postEunNeun(String word) { + char lastChar = getLastChar(word); + + if (isHangul(lastChar)) { + int index = lastChar - HANGUL_SYL_START; + return (index % 28 == 0) ? word + "는" : word + "은"; + } + else if ((lastChar >= 'A' && lastChar <= 'Z') + || (lastChar >= 'a' && lastChar <= 'z')) { + int index = (lastChar - 0x41) % 0x20; + return (HANGUL_POST_INDEX_ALPH[index] == 0) ? word + "는" : word + "은"; + } + else { + return "은(는)"; + } + } + + public static String postIiGa(String word) { + char lastChar = getLastChar(word); + + if (isHangul(lastChar)) { + int index = lastChar - HANGUL_SYL_START; + return (index % 28 == 0) ? word + "가" : word + "이"; + } + else if ((lastChar >= 'A' && lastChar <= 'Z') + || (lastChar >= 'a' && lastChar <= 'z')) { + int index = (lastChar - 0x41) % 0x20; + return (HANGUL_POST_INDEX_ALPH[index] == 0) ? word + "가" : word + "이"; + } + else { + return "이(가)"; + } + } + + private static boolean isHangul(char c) { + return (c >= 0xAC00 && c <= 0xD7A3); + } + + private static char getLastChar(String s) { + return s.charAt(s.length() - 1); + } } diff --git a/src/com/Torvald/Terrarum/Terrarum.java b/src/com/Torvald/Terrarum/Terrarum.java index 9b85ba88e..b06bef8ac 100644 --- a/src/com/Torvald/Terrarum/Terrarum.java +++ b/src/com/Torvald/Terrarum/Terrarum.java @@ -8,7 +8,6 @@ import java.util.logging.Logger; import com.Torvald.ImageFont.GameFontWhite; import com.Torvald.Terrarum.LangPack.Lang; import org.lwjgl.input.Controllers; -import org.lwjgl.opengl.DisplayMode; import org.newdawn.slick.*; import org.newdawn.slick.state.StateBasedGame; @@ -42,7 +41,7 @@ public class Terrarum extends StateBasedGame { public static String defaultDir; public static String defaultSaveDir; - public static String gameLocale = "ko"; + public static String gameLocale = "jp_kana"; public static Font gameFontWhite; diff --git a/src/com/Torvald/Terrarum/TileProperties/propdata.csv b/src/com/Torvald/Terrarum/TileProperties/propdata.csv index 2e72b6385..92b07e07f 100644 --- a/src/com/Torvald/Terrarum/TileProperties/propdata.csv +++ b/src/com/Torvald/Terrarum/TileProperties/propdata.csv @@ -21,7 +21,7 @@ "17";"TILE_ORE_NATURAL_GOLD" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "17"; "0";"16" "18";"TILE_ORE_NATURAL_SILVER" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "18"; "0";"16" "19";"TILE_ORE_RUTILE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "19"; "0";"16" - "20";"TILE_ORE_NATURAL_AURICHALCUM"; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "20"; "0";"16" + "20";"TILE_ORE_AURICHALCUMITE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "20"; "0";"16" "21";"TILE_GEM_RUBY" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "21"; "0";"16" "22";"TILE_GEM_EMERALD" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "22"; "0";"16" "23";"TILE_GEM_SAPPHIRE" ; "32"; "25"; "0"; "N/A"; "1"; "0"; "0"; "23"; "0";"16" @@ -42,5 +42,5 @@ "36";"TILE_TORCH" ; "0"; "0"; "0"; "N/A"; "0"; "0";"16777215"; "36"; "0";"16" -"239";"TILE_WATER" ; "16"; "100"; "1"; "2"; "0"; "0";"15464447"; "239"; "0";"16" +"239";"TILE_WATER" ; "16"; "100"; "1"; "2"; "0"; "0";"15464447"; "239"; "0";"16" "255";"TILE_LAVA" ; "0"; "100"; "1"; "2"; "0"; "0"; "8397312"; "239"; "0";"16" diff --git a/src/com/Torvald/spriteAnimation/SpriteAnimation.java b/src/com/Torvald/spriteAnimation/SpriteAnimation.java index 5cd7ec35e..51b8fec3e 100644 --- a/src/com/Torvald/spriteAnimation/SpriteAnimation.java +++ b/src/com/Torvald/spriteAnimation/SpriteAnimation.java @@ -150,8 +150,8 @@ public class SpriteAnimation { flippedImage.startUse(); flippedImage.drawEmbedded( - FastMath.floor(posX * Terrarum.game.screenZoom) - , FastMath.floor(posY * Terrarum.game.screenZoom) + Math.round(posX * Terrarum.game.screenZoom) + , Math.round(posY * Terrarum.game.screenZoom) , FastMath.floor(width * scale) , FastMath.floor(height * scale) );