From c3e8563bf2b4a2ade1f789edd57f035923256166 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 26 Dec 2018 18:06:36 +0800 Subject: [PATCH] Add great general unit. --- Credits.md | 4 ++-- android/Images/UnitIcons/Great General.png | Bin 0 -> 3772 bytes android/assets/jsons/Units.json | 7 +++++++ .../logic/civilization/GreatPersonManager.kt | 9 +++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 android/Images/UnitIcons/Great General.png diff --git a/Credits.md b/Credits.md index 93462e628e..a44fa2a7f6 100644 --- a/Credits.md +++ b/Credits.md @@ -70,7 +70,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Pallet](https://thenounproject.com/search/?q=Pallet&i=6862) By James Keuning for Great Artist * [Gear](https://thenounproject.com/search/?q=Gear&i=17369) By Melvin Salas for Great Engineer * [Beaker](https://thenounproject.com/search/?q=Beaker&i=621510) By Delwar Hossain for Great Scientist - +* [General](https://thenounproject.com/search/?q=general&i=933566) By anbileru adaleru for Great General ## Resources @@ -413,4 +413,4 @@ Sounds are from FreeSound.org and are either Creative Commons or Public Domain * [klick_anlauf](https://freesound.org/people/jascha/sounds/16576/) By jascha as 'metalhit' for metal melee sounds * [Horse Neigh 2](https://freesound.org/people/GoodListener/sounds/322450/) By GoodListener as 'horse' for cavalry attack sounds * [machine gun 001 - loop](https://freesound.org/people/pgi/sounds/212602/) By pgi as 'machinegun' for machine gun attack sound -* [uzzi_full_single](https://freesound.org/people/Deganoth/sounds/348685/) By Deganoth as 'shot' for bullet attacks \ No newline at end of file +* [uzzi_full_single](https://freesound.org/people/Deganoth/sounds/348685/) By Deganoth as 'shot' for bullet attacks diff --git a/android/Images/UnitIcons/Great General.png b/android/Images/UnitIcons/Great General.png new file mode 100644 index 0000000000000000000000000000000000000000..87ceed82579823ccd92ed60889d05af0bb4b9c66 GIT binary patch literal 3772 zcmV;t4ny&YP)N2bZe?^J zG%hhNHDpIvQUCxBI!Q!9RCr$Porkk5MHR*`ISD*Lz(58;qQv(EktE@X3L-(G5)>3c zQdyQ1{O$UEXTGmrcTdmW+1;5NcK27+b+^yycusdu&+OdZy+h_KgmV$jiCD?C2u~t> z^uIMg{?8G9i||u~3lM5p|JmKg?ZuAB`60q9vg53vp1&jfjFo0^P;8}Raz~tp@UrZ5 zD4_m-AzaPIh5Lp`{-(DlhV1tNH@Sd5s~=zj4qo8TV~t1HE$U|ivWGiW;L&|hyBs>mb()*iv;<_=bgBbu*X)Et z)V~BoH&G7GN3hcl3p&U5C)cWp0pj0u;?0;P9#tpQzX0)tkWMm?2vk0reTR^3e)AC<%r}>-{;D*HYn@A2y~`z{EQt&qle*@B|#Z* zUye02au`~DOHd~AhkcJqJv*rDg|5oLGlP7kBmv@2b>iksJC?X3PpFRx$gb>Edv{25 z;Gpi`bWP|F8X{F1Set^U`#0+6XqX3qkIwHvxB_9!(m~^0j&Li&GYCsR(;~>{8rk<2 zG>nZtCNM4YFfYrf4f}|y?ExM0l8w1;3}Hi&OVs~_3?h}vbxq|C|N>vAvd1h@D?(n^`MIhNh@}Q~?5O=#cleY?Y{4Uwz zNT4>6t#wE-Lk=6YiEN!ie8Ij_wm1@~O?1ZAIfU3L56B*e3fjS&PO_EGFh{ZTTkDXx zj%a`ei1JRF2Jy|{oFN`+s_FpIizowI=M;DNJlP^4ISn=^$>6FsA+c{9w}#&AFrl62 zF1@DNhS1DEAdVbE#_*DH5Dp2WtLj8(w$LGAaM_?Bw1+=KwrM5NvI5SA3*wWcy zeDUsGONexI+!Q1BFlOYjB<-kVn*yn(xSoVlRcrzxemhBa&d8usn#&1gU|nMk&W_N| zzpFcz>}RxfoHD1gHd%aU?ZI)`z0jjHg$|4V>_#?1)<%|j-_ah zY!cc|&*iA)7|tNyTeN0}XV`9bEP;)6w(M9SouOkm+8OfYtoN!ak#09TR$%agY$8>k z%cbrieU!UnHJTUrRfy6$c1zWotnHL2rDK^L+KvUJHD5L!jk3`ZJ7-KxvG&W}O`!J6 z5`@m&EmJc=!;ak{G2QM0en4>f;Un|bV{__wAF^}C0a0HIE=Kqr!j}jSQBbkFc8r9} z&mv<{&pYybiSo68PIy6=j3&_M&T(D7!(Rl`xt^_n9c~#pr*@PLN}iR?M}hS9;b>&& zI+V9%qpv~iC_7ghVv(`v03LYB^GQe;M|K_!vhZLUay9yFJEM5gi}?MWIOrWn1DR*fH4-HtO4Z!XAv0F7ba>VbA7p~3P-(#U^OzXs`&2H%&c2Xs8*)!Z&|0L@m${c?gRW-;z5+oOI-7KR|CDzN*Q#rVVW*! z8237ae@it8()@}U#F3gQoE4t(x2nB^AkEtd_2J09e2{S|`#{kEabAB&7(n74P(4e% zsF$&(<01E*LPaOl^UV!Eo0O`y&%%)}$TcWr^}qfS+Rw}Cj1@FUK9 zn^XnTHNV0Q4N$ZI;@@}LVwXj3L>N3;s!NhMv?a_JZ60I91BcI2`x21-8KIsHT%z3J zE0i<=8P9bmG3z8wgyzghyh!2%WIP?)+$eE?xDS_c{v*MNr-L{TA|v^T;bV_KO3#1R z@9k_L^SSHIYei^a2t}JPfj$O^dYfxU_qM`>3jO7d%C8>f6dM-AivvChWO45UJaA_t zO<&cWfGE~?MH7^X-hp9|ecY+q7fB$Uf~< zdk;&Lfb2AaHx!>p97xv6b0Eh9+T(R+J)%i{=IwX-*rdx6w02s)i1!?w1N9{%(wO@s zN%9g(}4Wwz~a=Hsb~1towzU@(>|>vO}b>Uj59<#rAkOg z(sDlqo*l*cx`=zbebomFKSRV~?mq z#U(=1k=toy+<{``A^vVBZtl08$1qLZF=8VXkJJ(OV+`xbkn;#T>UI>rlp`6jG5mMP zA$8jcWh_58Xv?_nV||w7ZJoGjgQamH#nuk-{r)|G`50OaH%X^r6A}}rv2z|$k^phf z!f2<&0ivyI!_X+^k64mLMq^vtuNKYzAnHd!t--rA?o7Rgk|Ad-gUhcS?r-|?PDFi5 zk_b&l{W~ST_pkw7*PTidApTV+p2T274kxaEEnG-(KOxy96@Z~m_&bo=pf4&(fH=RN z9WsIk4M%T`V5t+9XMfkhZ7jCwl1(vyJ7cKa0MXAV15-J~4efnfD0yyFQv90&;xWP% z4G`rIOA?QI|1BQXAnyB^Ne35rOjQJkPwDhtXXm)#vB8Shdl2`w(R$bUg^~n_7vD@G z?k}C_Ogr>asS}b9T@zNpWz|obSNWH`9`C=| z=tHzmRRxIpY4Rivc}L|2lCdLmbS9On>Jkvy5j1oR3aJth@yEXi+dkBO{-QKl%Qy>& zL8a;vp*hosm52tbyhLc$EO;MmsQP~4yG~pfyZA~KaX#80o@u@RIh1_P_Pg%CsLDXH zwFYu;6e2q1P1GW6@NZRhfVdxdTVJ=2u){;6)bCXt#DJRg_YhMil@}oThfaFNAPewl zSfv5Y`iaEE9pqm>kR%=~^lp`UFJz(!)C3 zUOVwaB@GZi)rm*V>>GWBwJ)u=R2(|fn;P^ zhY)w5eh%fA>Z}g~Nu7Wwztdlq=#Pp@gl6$bA8HF(X@fr-l_SYk85sSBAjWEF=H z4}#*FMkMdGmxQKc)p{3|JH`(6hQuu0p5BN=^d-u`n1)R45aLn(sfrB{_xI-YOKko& zaZ!8sBl4=qL}(V5>j6}6eeF1vQzg~)L$+ON$+AO=i{y@JkZqT8h<5-Bzb4(WJg}*EeoNnr().apply { @@ -25,6 +27,13 @@ class GreatPersonManager { fun getNewGreatPerson(): String? { val greatPerson: String? = null + + if (greatGeneralPoints > pointsForNextGreatGeneral) { + greatGeneralPoints -= pointsForNextGreatGeneral + pointsForNextGreatGeneral += 50 + return "Great General" + } + val greatPersonPointsHashmap = greatPersonPoints.toHashMap() for(entry in statToGreatPersonMapping){ if(greatPersonPointsHashmap[entry.key]!!>pointsForNextGreatPerson){