From 50c2ad45731daffac7faf255cd8e5ed85f1775c6 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 4 Oct 2018 23:33:08 +0300 Subject: [PATCH] Added America civ --- android/Images/ResourceIcons/Sugar.png | Bin 2814 -> 1429 bytes android/Images/TechIcons/Plastics.png | Bin 1879 -> 1093 bytes android/assets/jsons/Nations.json | 9 +++++++++ .../unciv/logic/city/CityExpansionManager.kt | 4 +++- core/src/com/unciv/logic/map/MapUnit.kt | 3 +++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/android/Images/ResourceIcons/Sugar.png b/android/Images/ResourceIcons/Sugar.png index f1adb06d87dc22b0b29e0e3c3e5b6f482b884add..97accd894a51cbd533790737113f281358c7c42c 100644 GIT binary patch delta 1421 zcmV;81#+QlAPoFzytqgQ@%+~GL!jcvS5rc#u#IaF~%5U zj4{R-V~iPPOL>r7Z`Hr*vA$$m_F-D!B>AiSSAHOu$y~OQA4#@lA16xFkhdf!GPA^-`J3CW?>OULvunfQEe+O950=(-Gqp8Vq87@X}4{3U0TS;pzT#P^E*3$IIMUs{g zEw&3-VETtn$7wnqjWMPI&Br?ZPe7BH{-jduAnP`}DZ@-Rg?XkwDQW#s>7FKYppp(R zW_PflW$u*hn`4~Mf(%ZVAt&>MoXPr%LQsIQ&KzgSxDcPqNo*{`-4Q%Yw#DHx-uLg4AHgKPknwhB$eDxg?pGxR;DzlRnZvd6 zAIWxfg|yk1#J(Pq?3-g;Eps?mQUmq(c5tq{%ZJQmGGz8*Sym_SZd%|%S-lWdbDOlLAt%eYhj*N; z!CGJ%Oj;}2yOl=W%ccS z8rcWKQ2ib;C3KmDQHO2%hCEc74EXgjLj7r(I+<}Sd$ zjYF;t&t|fJeLRLr`H5tx(ahC5j2>iiOsY`x;ER$e4l@B+x$kAFAoJvRvdwH}5ssCm zD(R3#oW>^Ge=a3`WrLkR!W6I{WGe6`J|lOOq=c_oTvkUWev)$CNj|r@tW9|uFz9v8MCuYt=H7|a z-6jXYfifpyG_5>x0=%eI=KwAx_1RuBz=)RAdTq!#f7oC44sW)p0Na!%G%sg$E=G`x z!kxnKoz(xg>9ev|nD?CutV~vehE4B)H+?tkE0i8 zMwYBQa^%A@RX&!fb-R*tQgY<}Sgw<)fVz}?c{~!G?sL+$sdc-Q#zW`4CsV<6?Ol@3 zFyY;cf6MyzUD+vg9;O1ZYur_K#w9Wpgk2+}D?20pdV)=Rzw883nnS2Khb|3{PSU@7 z%2WV$RKD?59Hw)n4sJ(1RTk$4nL4-~^?F&H@VzTL*?VMh-jS(;+fm<^#o_Cose{{5 znND34GH$5@+q7gSiw;j^Dsk$-cD&Uw0j)xcV={G6J6>jf6@#x#rw(ez%fP|L@GV0I z7gxPWrVeVyd!tO9%WY&f$IH~tZF};S?`-&pJ=4ByIXTD17-Nhv#u#IaF~%5Uj4{Ua b$-=^aJQ=WVu=3>I00000NkvXXu0mjfceJly literal 2814 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 diff --git a/android/Images/TechIcons/Plastics.png b/android/Images/TechIcons/Plastics.png index f7780b9b324ab83bab5f69002440e3e01a33f40f..90111d342a8543f249c9667755fb52b08b013b67 100644 GIT binary patch literal 1093 zcmeAS@N?(olHy`uVBq!ia0vp^DImQK$!8;-MT+OL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3( zJ;P+JIo=Em%-cL&978JN-rn86-X~k+*hl5SfZve|7K@s;x+qG`U7;#uJ285~hj0Zg z!Cn^5g>LQ(g+D4cy$VwF`136C&7D_2C;>pLOodyM1Yk+&re; zC!^*auzDd~eRkW@mwX$f*Sr;5;q<#9H*U(_1#{Lh+}@!v-O!kbt&I8N zo<8Q?X>sX^A{!qruDqGfwtHDypbVF^&8+J>@(*ft{w&(VZ_WMpfQhmrW<`{xzBgDWL>#&;i4%?*Ux0%TIlop;YY?L$J)Arx?+Qwt*7`NxK`J6 z97khAdHtBZR>n?^jf+{H?J_z@8>5FZNRJF zPcH6z)44Rx`TXH2X*_Q&H!NIa!@Pd_fpyYBna3{ZF-U8jviz`%<;^a|scAfC<+!u^ zIntZ2rq%nu+_>@E5zDf-0lUsf+;dGhd^PR;F}=HNWq$>Bos+l~wSzzBK-9ZNTkh4~ z-xwOi55%co(lKsJZ%=wZq~n9QNOShxh$W zHV;U;e)H?MhZg6rKMpMrc(c&x|KTifB*mh literal 1879 zcmb7Fc{JPk7XKw7CAO(iOQRBPv{SW}ww4hk5yTi;v}!4)wn4|zV616EEiEId)5Q{0 zP+L)31x1EV8EvJ}T2Ae)Q>oYz2|~%}dvoTzbLP!?=iPIc^S$?T@At3!xi`-_+RDKW z!T1jJ>yXgq=G90A#-YVjv)&rV0R1 z5#HL$HI}wCdAYLu!l6E1z5aRItM(Y_;~|0esfxPb{R>A8GfJFcd>cjSrw#^+H#ieg zm?-uI74|PGu$Yo$YlCbhfsHaMAVlH~{39~A*W^|yVeviBS9bf++TzZmmfcV^YXc(g zXe#a;xn4U>G-XY(p!gir|JHJv3Yr9-dKpDCUAGA}I~xx;zmUzi<7-(a0XeLt`qlAY zNp{juYkLEvb28}mp94?N>7}it%vFASf^u1VA%>so*BVx12C1SJkelWd`r%AB?Lq9o zvJ6v=pYGS{4GF6}13zBs1gSr#r`{nnj7Tas#k(hhV{h_j$7)r`H8n3C@;R^>31Lrz zrx+yfmRsE1pa2#>AezK*O(NoW?)GqoQfwL{VsXTUxea4QyR?0*98?E(Efe<;KQlWr z2V;$({^TblpRW+N2;9h-Ldp3~X-K2N3ZS87A)7GV%S`<(u-gLCh@6LPe2qxnS+IE5 zcCQ}fPDLnoi~2?sU_#%^P=C#3P2!t+&vC7T4M!o3!1Q5aQ@F>p&TC4vDm8B#$}32; zUjlqsQ+Ii?{aKUNd6e4GI%AT4;PR_WQ2&SWkcy1yiM9pQYRRKRL-a#Oh%WPW#Q{rH zWv&#jpv_ejaN_%Q!h7RuRc871-+R!p&%)p5w4|)y+J}3FC%cu)T>`CE8O+b) zfLzaoWT%rl)V!agZSykSXwY4#IXDr{sDAC$oE~)Zx|(bIZceRdN($2{t31)OTB(7qFeXof5iAqq+Q-<>nEQ2w4xIyW!NXocZEtd8B}cOE zg3II(Q{7ouC`)(?W6O+VE#-#>UsSvPE*NZHSqV5*EP8dWjmCH)vu~4_^Dh)!C`6zQt4*!57c@>S+y1xC4 z8ikDKc_`Qk7;^Z>oKz!ZT3IkVGthFqu0pkIsZG-B*=oa1mD}ia(d$gyttkf7esO81c5sMFosJqtTUXaFiy@MyuV4bc0 z4SI2;FUSs-`DIKry7#fD&j2Nf`vUtJP1clF>5P=i&2e(p{MLu zQ`DCzNy4QcHbb>$Kh@WDjY86~eC^eS+Z*MQx8$)hnxf(UZ8jLUujDRu;uN3QY{1t1 zQ47_r5r^=|r%i+D|r}$${N}UX7 z8PP7xYi*2`Z60<;cL#GW`_)@|6?(ZrzdLAC#J#^R>c}L!gsN`{JX@U0 z_%9GyD6U0pmgt_}MW}Uomh|uQBj$nM)yGz65|9wJ;6hJ>0E@Q}M`AXX`v6wK`#B<6k?i__uXeu~C>2zZ8mhib5B1S^ogiE!@XT zB1dvghtF5$s*nA?-L+uQ`&||%PB_(9mn0EO-o)j393!RVB|uhB zrx|hCYurxC<&Jw@*lS?M(FC`t7+VN|hDCJ5 kvYUuUX#LZXsd^v=!OZW5DVCYm?_EX!k8`xH!}uou0j!2#q5uE@ diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 1d0ec95f6f..a8ec4a9577 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -72,6 +72,15 @@ "Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul", "Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis"] }, + { + name:"America", + mainColor:[ 28,51,119], + secondaryColor:[255,255,255], + unique:"All land military units have +1 sight, 50% discount when purchasing tiles", + cities:["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston", + "Portland","St. Louis","Miami","Buffalo","Detroit","New Orleans","Baltimore","Denver","Cincinnati","Dallas","Memphis", + "Cleveland","Kansas City","San Diego","Richmond","Las Vegas","Phoenix","Albuquerque","Minneapolis","Pittsburgh"] + }, { name:"Barbarians", mainColor:[200,200,200], diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index fdbd30e3f8..72a7c404e6 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -42,7 +42,9 @@ class CityExpansionManager { val baseCost = 50 val numTilesClaimed= cityInfo.tiles.size - 7 val distanceFromCenter = tileInfo.arialDistanceTo(cityInfo.getCenterTile()) - val cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 + var cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 + if(cityInfo.civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles") + cost /= 2 return cost } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 776e4a9800..4104772298 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -76,6 +76,8 @@ class MapUnit { var visibilityRange = 2 visibilityRange += getUniques().count{it=="+1 Visibility Range"} if(hasUnique("Limited Visibility")) visibilityRange-=1 + if(civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles") + visibilityRange += 1 val tile = getTile() if (tile.baseTerrain == "Hill") visibilityRange += 1 return tile.getViewableTiles(visibilityRange) @@ -222,6 +224,7 @@ class MapUnit { class YouCantGetThereFromHereException : Exception() if (!distanceToTiles.containsKey(otherTile)) + throw YouCantGetThereFromHereException() class CantEnterThisTileException : Exception()