From af941754cdd513cd80d13fb820083de9ceda5387 Mon Sep 17 00:00:00 2001 From: will-ca Date: Sat, 25 Dec 2021 12:29:19 -0800 Subject: [PATCH] Show arrows on map for unit actions: Asset files. (#5825) * Show arrows on map for unit actions. * Don't wrap arrows unless world wrap is actually enabled. * Fix transported air units always being treated like teleports. * Simple reviews. * Separate movement arrow visibility checks from WorldScreen. * Assets for map arrows overlay. Co-authored-by: Yair Morgenstern --- .gitattributes | 2 ++ .../TileSets/FantasyHex/Arrows/Generic.png | Bin 0 -> 843 bytes .../TileSets/FantasyHex/Arrows/UnitAttacked.png | Bin 0 -> 2145 bytes .../FantasyHex/Arrows/UnitHasAttacked.png | Bin 0 -> 629 bytes .../TileSets/FantasyHex/Arrows/UnitMoved.png | Bin 0 -> 841 bytes .../TileSets/FantasyHex/Arrows/UnitMoving.png | Bin 0 -> 1447 bytes .../FantasyHex/Arrows/UnitTeleported.png | Bin 0 -> 3908 bytes .../TileSets/FantasyHex/Arrows/UnitWithdrew.png | Bin 0 -> 756 bytes android/ImagesToNotAddToGame/Arrows.svg | Bin 0 -> 33659 bytes android/ImagesToNotAddToGame/Footprints.png | Bin 0 -> 2039 bytes android/ImagesToNotAddToGame/SVGExport/README | 1 + core/src/com/unciv/logic/battle/Battle.kt | 1 - docs/Credits.md | 2 ++ 13 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitattributes create mode 100644 android/Images/TileSets/FantasyHex/Arrows/Generic.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitHasAttacked.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitMoving.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png create mode 100644 android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png create mode 100644 android/ImagesToNotAddToGame/Arrows.svg create mode 100644 android/ImagesToNotAddToGame/Footprints.png create mode 100644 android/ImagesToNotAddToGame/SVGExport/README diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..90a66bb51c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.svg binary +# These are basically image files. diff --git a/android/Images/TileSets/FantasyHex/Arrows/Generic.png b/android/Images/TileSets/FantasyHex/Arrows/Generic.png new file mode 100644 index 0000000000000000000000000000000000000000..8b35cc39bf4ac9645533e90365509a944c674893 GIT binary patch literal 843 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z)!3HEJ*vp>-Qk(@Ik;M!Qe1}1p@p%3UkP68X z*NBqf{Irtt#G+J&^73-M%)IR4<%2f{mfrfk{iQx3ep;++lwg^5yiTusi0jgN+g-BYb-} zD+C11`T0E<_pErSe#iWMu#u;1f?$MqFLSV9;nIS@@5gT}XHt=6;6C8CNRnll@}s1O zi{ABb)IY^F`3>Xe17VA#+0v9At@%CqW%Z^<+@7}&$ZVKAV+rdSw<8@uv4vX{?t0#O zay!@F@TA7iGU=jvr&=W@1*LV2mk%)fJk-nheE0hO%L2(jG+w&j=X*Kv3ulDV|KHC{sJGc23YiGyp1F;XH zlXmdd=*oJ(mHO`f`_sCYk&JP?Av{8Y<_(^oW?!iKUhr{QT%Eno-SDbA%in8HxPRq7 z)8;P|_(vC?yQ{e|T%Z`HO8lW7%%?eA74IPl%tdJ-ko-^*kGo zeQSgK75E#LPcq{c{~fzuA@gwU=6xF79XvCbg3iCNK49$G9-k)lExW#Of5oiYNVk8J zlV63eVVLJ#6~ALfL+7l2N9`}HpBI*onh4U){$=_p!P|F_>1`x1jWc+<`njxgN@xNA Dw)Api literal 0 HcmV?d00001 diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png b/android/Images/TileSets/FantasyHex/Arrows/UnitAttacked.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ba0aa5d042f7b71f3e09a4e34a453774d7bcf1 GIT binary patch literal 2145 zcmaJ?`8O1f7adE=ZVD4w#!hy|-iHhmla!^#7RGLbnJih#Zj5CtA&vA!);`TdQj~pH zc8QN&MigNThB3%jpFiMp&$;iOch0@Zm2-8sh20p!z~1b4g~v#gkbbl zRXu{dPWuO59_WAobYSqGVXByaGoJrOR3p8D(5mVxYN|a;%?AL$*;Kfx@$K;E8&fl3 z7yc3GrBcKkv{!7PCSY|WypGdt6za%KtjEot#A5C>7MGpj=*qi)lFbkvt;9l;g0(g+Lq?K?Oli8IkcR8$?nwI*^| z>+=qga3Z_qg^RhfeKh^Z)YnIm$@SeDM{ijhTFS6fJ6Cm}Yvz2`4}S91zTju%oyQ&? zO-x5a)&U9KtvpBbi#mR(!`(;lL>T)Gs}!qBVam^`VQ z)sO1iD|MNh0%!s)l?sTYM_33>)UbFUgY85YXZ_oa#$@m=;g1=}1gQDZ*!O%5M1j0U&`&zP?h4Ow09|n%%5Y zZCYvQI))w|Kyhdud5tP09g2u+6d33J%KKFa!;-x1MW};gbd6>~qu8L%H4D%8>DW-C zA=W;%t+?)bn+mh1Tj2w|dQmC5RLS4TJ_JJ|OWYCBwRhf%<|FvPU-3-Bb-|i!vlLb+& zRMugbMhRn_j{=^EQF1&1gg10K`7fm?@9|@=Kt46R#?&_~EcfSxild}U1vO_kF{+a# zg&$}E3{OQwO34idb9;SSobi>pL*PAyEkLWQR zo@ukjxxx!KILME{0F5C%AKRLFIx-Gzqhu@mmYC6S>xyb^^X}jRNt2+t0g>q;=JTHI z1Hvz6OFU1HDL(&qfu2k@VAn+}EN5 zl}`+bxS8Canc-ukz?gQfue<@91l$PA=zD4SNP?qab6LX&*@)V}a-wg=lR&j!cO;Bp z`M}Tlp^DBh&HbO(1|n^`6s0u0Ctg4Xl`1|t{`JT_-Z+gC%8+FfZpwxYM&2R)#*`gY zpeNX$U1Z4rHf9E3V|gdz?4M#4<#FGgYu^$J%rQlCNJNNy$47y+K1A_uBq^U|i zYzn6x7Qgt0SI&B2Ii8kB5m+XC*9+hQ&-z^I(vI$EL2Bduq74Y?Maj6*Y@LVdj&o8| zOr#n{tW@@r{{V#*;S?3$`JQPvj<;>~bVC`RJ$HU)$4M;VF9N}6_fs^!)v1LA4DJq| ztQRrXl{uK)L?&_b%?Lm$AI_0=n2SOgA~DGamcIUWBlMj2sA=gz@2}G$#m}?)Yv#Hj z1^2bg+7z>O8dKhT&v8sR8-Qk(@Ik;M!Qe1}1p@p%3UkP68X z*NBqf{Irtt#G+J&^73-M%)IR4_RA&XZLaT|rbI*oY@#>@l?~RY{-#6#{ zB<1G~DxQ;&(Ep7dmg`TS*M8tCQj^8KOjk{%?DXkKkv*Abb2pzBo&1%xxbBmU-j92; zw*HPP4?CH9KqYtMO|vBrJx^8MnaO1)Y3%uRo>^Hq->SULk0N)SUMpw5eSVSLw-awC zeBR=IE>Gc-?L9#ohGSDNsCM?VtPEq2?oIR-lIN%kIcIh%C-za#gGGhAt`{{szmA(= zp=z<{LF%zo)_g!Us$StD!stz;K7au+8_2AEhtURUQ_>}I@Nmp`tGe?-}gt( ziH{f8etmz#?!zopr08u&)!vFvP literal 0 HcmV?d00001 diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png b/android/Images/TileSets/FantasyHex/Arrows/UnitMoved.png new file mode 100644 index 0000000000000000000000000000000000000000..370513df0188fd3b12efd45404406a8f6303ff22 GIT binary patch literal 841 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z)!3HEJ*vp>-Qk(@Ik;M!Qe1}1p@p%3UkP68X z*NBqf{Irtt#G+J&^73-M%)IR47l?c{;^KP9liAtyM005d=gH<38ka8b;)s%+%{5C(swt}=L*t-;%9+nK`*@40 zY|kfa*le$jyL|Wk?|t__J)ZaQdqW2*Sh8`Sq5OxA$DNIjv(JTCZuu_V{qCBzmz>4K zYspj6+}_OnmHSPz$vM=EP5v>nxemvP?{~f}p1pgPeBX?FtIA)5?{BtiWsIqMa@N~k z!t8OvqJpsI*dG7*?fF|(zux@zm8s$Q^xUnt+yoz2FEW_5n5%W)1^z43uB6|-&YdM6 z7r*ssY_`vi%@a0xW{VhWAye+OA7B)Y2|5N)E>pPL5 z^K<{-XMQRBIhpTnrg1aBzI(-DyW4it%~)Q@ebwuhIN(vergoJ~qL6X;{M`9f3by5Y zH?KUjK)Q3MW%2%RA5y-pSqrk(X49vIAW%2!oi zl`vbZ`_H@mXiVS7^y@jEwaHa0tS1r_%%$13VW=oB!I3=ArHG@jU2ow_`1Tl4n%Pf1$(h~8x zV`w@NGs+T$e#@nmKVwOU#0_<VHQ1s z&*G%oCh_^)T{s+_$1vRK3_6F+=A@>53d3b6S`L8v&X4Uw2U5cds>#@<6*2Zt5-3=;(j_{1Ac6uu`l2 zRwWk5{b&j$67gO1+T`I&wYB+mSPeCH@+NU`+SiOCyq+VRKBk`AeS~;qdPR=(TaWnS za5vc#vNl+jE;pew0{b)oa|iY|@#CFBho&@@S;pEV$!NPs>`+Nid;k?7vLI(eMqJ-C z(@BTcwUWGO5-H~e-NDViF`-zxNiH<5g2~DH0MNAPAG{(4d;<0syaYO&$1DcvTezUOc4ZzPqv+yu$47 zeO3*WEBw352i5@OcF|=?oUza75?Qxb7hQA9c(|PEO*ZNK@K3M%{Zv2z54 zckG~Phu>_T_$iFg8!GNmdbq$3gtBQboRwmu4~aG6T*3SIA3+qgr5H*n%~}pdCqLW{ z9)4Ds)snbDRc!Hh7v~%U%q3a4^+1_R*y>gBOf0=O<|JvIm%Y$ zo2lbgPeML*66*2!gr3SEBNGBpDCtHJFmJIIy-NR?c(-JZwR7t3mBI6kNW5bF$%Tk1sYHMn&)rdw zvnu1qKC9{yCQNnxu9&Qy&N>JCArV_0q8-iT(41~sw4x}k4hgkXXL(EI!9L14!^?whqO|~sZsWH|%5_gUTR=l&V zgRfk-joG7}a=HbdX9i|(X9Yz5Ss^<;C~~BBwmW1F%<$foty|aY(;uvTjXfbEOVpKz zo;zdWP&dN#^o`*Q)PKWDk@{f06RkmdLfuU%^U799n-5OIeL~rt!lUX}V#qq%tZwH} zi1oM1y^ng{h|pBDO^9|f@aaz;E)0vAl8LF@Zd^>B*RtJjoEpqE|32&>-GM6{Zh3Gj z?_H-GXTdHR6Q?iZ?M1E1AVFSOeNOqpe5mg|J(YLq_1^SHn5x7VBzFH7 fOT^GGT)`afXss(=(?wiw=udzg7)Fx&(|-96F$0hN literal 0 HcmV?d00001 diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png b/android/Images/TileSets/FantasyHex/Arrows/UnitTeleported.png new file mode 100644 index 0000000000000000000000000000000000000000..646dc64a9826a6f7d9d5dc0c0f8d104604f62734 GIT binary patch literal 3908 zcmai1XHydh*JaoDks^YTCP)BLs^-_3ju@}iu5iK^<|$w@O-%E%$+&s&Y8J$Kio72JM;5=5`0`-T<0wcT< z;Is^Q&YoiSZRycd;tjTN598tz==-;R8w#raS0Royg|wILH-rp4GNA9MIrsLTzBtk$T)<K_wRbG9PYdFn=K@1Xq*8|9@-H?% zZj9+a+B(4u`|&F*$m|j<5%53Y+ruaS#QzkTDBR7>2lN6@vU8)K;GGf&s>`{tCyKIC zk7?_R&QADAko22!{qzwsyhYm1O`k8U(Uk4h4wB^zAfEOtTbWnW`eO`r2Ek1247sqR z9;8)Db%v#&=(@?K*kzAFK}Tc{F*mZbmS+{;JMrEa=BuS5}>8{-MerIV2oc6V=PzVcrAmdvD1B=o(*9st#V_^VXIEWS32 zne-7aR2dc%ox^iIX@*~07x?Fy3ZZcXNu8<0{P^duV3ogj3ePjIFy-r2dsDFGJqobs zjyVW?+5>~|0l7ZwO&mwJ!E2{fo-M82GIok_>hx@{6QRQBu?t|BWG*@~wL53G1HGjz z_fQ>65-O#=^D0{lXnx=x@Vog+3=Yi9Eht;YF4&YQJYD*F>rRw67&Afx#UU5@2_E%M zq6Y}*LvcVsLD=}5nql`hUIWufqU@sgmB=rE&N(F&C6s1mv-8lKtBbDxK#x@jI_Fuo z-+js&1Wo&sY3oyLm(Kg;uEc(KMP|dAy6j70LCg4@tf7Cq1gxefs6Q%JA`~ZurgcD^ z7dP@Ue|$7veFu%s*Jvv+3G`w+Z8o&vxaO^Ur+(rSnt{XE z_Z=)YF{S)wr_n_~kxb;$y-u~9k|$7#@`SY%PF9#k#}uBPG5eJu~H(06?x>9`f8W z%i%=8f19;3*!v7*GJiP)@ow`V%4>)K*x7??S#KE9_sZQVXjFodbh>-f=_)4nep^Uv zE*9jy?()+}mQ2jlcV`1H`Pcs%(KFJQ;m2Vt#G@V>it(nrCSzKM&1K=s!B=ADjuQJg zl`DhG9xMaT`J$ssy{y{Q_OjLs$c2u2P{istKd=D=gQ$fnT2K4K-CylSs*1L?_v=^r zhSd$T6C|D&D6HX#+94L+=}q4@w?j3(Nvwf-2#2GFPiwEs03n8P&iKINX=nH}1hZ7v z?Oiy(8`jof&!5{0OBb68bLx?v{nqw&Kx$oHmi(2Izi;9HUJkvSXKoKRsNRCxkOK{G z;*RMPw{8=9K1rP>)ZAOy#eHp;&>^b~9(ZLJaElfJmBr2pw!(EG8z;s;GE-YCW4*`% z4D8FENiw{{bf~J8*MdD>aJ*kO0*)2A?KeQbr>m|dsN`cK9=0mA>{eJ80Yi+cXlK=& z+^ymB{eybYeN&4x#jMzJ#7S|~hieStBK_>|fH8!I0jF}(jf10Gaj&EqwAAn6%tWE> zFN-IH4*#QT;XleH_Z1dpoMYym&m`yC0KEr(7T%2}YnX35c`1IjXjeq?F$pBE`tfLK z;Tm$Fj}nd^B33DFKPetwZe7~<)^oK|fISuF%;o6srcQ{)3e9R(ok8bztn=+ zQTbh4T^%h_v0PA}9!#yo86I8PLp0f>`9{@jTcm}@7ks&VHkU>dThYJhNj=uVgP_aE zr7jwOYuk%F6Oa3YkQd8cv~|Rijo~sp;f8tNw#AT`=GC_4i>&(zt;*@;NiPnEnS`o4 zcI+CuCHk_pO$&d{&9DzbW7)i|w~2Yr9;zz7eWf%Rx0Nwc$ITJ+|{&uf~W^p-k(y(-iq&DLltdD zHBBYI;#r;=33lZ<5_e#{u6@5jB!D{U^ov_uljruzS=0jz>aicH2z!3iFO6;L+p|VJ zD96_wJoh;gZE0s0eK>o#Z{qj>N{m<`}*7r)~hZw>9u9P z91v=3$KKmelg|8DVtp0vqZ`}%!j;#ZA$+EaXbM)BjrhvJMrX8re!I9I0rY;H3ULxx z89=W!3ON5X9Avp&VC`tN{&Fo)FmPZ9w=zT$Dl75+H?pG4^O|$W)m|3?xd2c_XwtA3 z%pBEyVRL+E;3DQ}n!w2T4Ms$}ho{Gv8+(wZAJJdC(9-XQ4^2At%};uY#Uw4G{L zlfDY~1bp@%4+?x6#kC3VW9bEUTH9Cm(Nu0B@*{^VS+y zlC_;UYUxc;UEfx#yUR4X%v0Wd42iZDq^W*TNxM5HvyM=L^SdyuUs4&OO4(Rar7 z5|8-WX%Np7u=|W^dv|}c`;eR}RL6R(fb!#s)qKaHuu8@Dq3@#4!K{UNHh;8xq zz|u7Fkca+SqlCKyOv!bqSX&Mf&oF(d@nR4`0J-t!BF&}BSSE*x-8!3B)X}a`3$j_`p%6lpVYGL z=1KMMci!baf&R6e0RP9~Y(Ubi_{?h&wNDQ3HX!wf=X{d+v~kC1L*#gttL3#@%qCPa$NY$r<)k+_uwM|fd`b?zlGOY579kp#xZpw}!TL#(z7 z8UWJfUBkv+l?_yh@8rzMcYBdg6MR{9UI49>=c&5rt$?TJD3yT=!{?F+dOcnlM{YQ+ z5+&<5FG90>?E9lmGAJFmIi=!jzyw-^M4HQlNy6^YJ`Z^2*;m1Z?B?a%R0 za1i+1IG0~%bvG1&YB_momYsxc97gW2E^fU=ZwcGEdU`a6moQS`W=u~Eeqt{o(*dYL z$#3XQOSP?d%!yrSO`02h%Hx^Qp()EL(7kW~r9LhAL?WH7s#wBpbHFGInpO(GN-^vR+6MsFxvBP^~Tb2)LVeeK(cKjIZRn=@p z%22SP|K+f19Vu$K`zTpY+6g?bd0u2r$x7wC$aA^$DOL?Vo?^yyx9ICer-(lPFpf<- zQGGt*g!$@AcXg4iiM9_TVxO@KlZgK@(wD%W#B(yc< z=ik(#$J;ZL)S~~;nX-&fk95S_2vHX!pb5!#!cTy{s&OxIzWZd37|iVt`OxD{F`kvx z#QAhI-Y0WBapqk;*lL{{eTT6Se(wo`4^f%;HeT<>S4sSBE4Q46&chi=HnAhmTBvY) zWRnx88v9g585dM^zH?MaO+5zD3E8CY#Kewaix~Y!anPU(@rE0hY%Gau`rZOAheAWs z4~DrDv;K+e8nL+^UMv?k+oMe=tvlKHL#wb1WyH0jYs*$_J>x>IW&XM5Da}P|qpo)1 z9g6CkjoI?Jc&^~`;MxYcLL0AoR%a^2eUPUZGwehi;wi^bxw+0Pfhw1Em52N|jx*z% z?+;j_F2$rREUbVbNyy{`YA-FHo+fbxhY!wY*et*dCxX@pJe;oITp*yQV?(}s%W-jC#O!iIc8{3 jc&`2r*nXJx>$fkW{uD?b#Nzb1<+3!j12>rb@#Oyj)epDu literal 0 HcmV?d00001 diff --git a/android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png b/android/Images/TileSets/FantasyHex/Arrows/UnitWithdrew.png new file mode 100644 index 0000000000000000000000000000000000000000..598b18da90599811f59d531a9264c8cded8b0969 GIT binary patch literal 756 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 ViSUPsQg8qO002ovPDHLkV1k-ot8xGU literal 0 HcmV?d00001 diff --git a/android/ImagesToNotAddToGame/SVGExport/README b/android/ImagesToNotAddToGame/SVGExport/README new file mode 100644 index 0000000000..2b19bec066 --- /dev/null +++ b/android/ImagesToNotAddToGame/SVGExport/README @@ -0,0 +1 @@ +This is just an empty directory so the export filepaths saved in SVG files have somewhere to put PNGs after you've edited them. diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 5c891ed179..637ec96f50 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -12,7 +12,6 @@ import com.unciv.logic.map.TileInfo import com.unciv.models.AttackableTile import com.unciv.models.UnitActionType import com.unciv.models.helpers.UnitMovementMemoryType - import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType diff --git a/docs/Credits.md b/docs/Credits.md index 0658af7fbb..d7c2bcc915 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -672,6 +672,8 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Mountains ](https://thenounproject.com/term/mountains/15616/) by Andrew J. Young as base for Civilopedia category Terrains * [File:Maya.svg](https://en.wikipedia.org/wiki/File:Maya.svg) for Mayan numerals * [East side of stela C, Quirigua](https://en.wikipedia.org/wiki/File:East_side_of_stela_C,_Quirigua.PNG) for Mayan calendar symbols +* [Footprints](https://thenounproject.com/icon/footprints-1393611/) by Abdul Wahhab for movement overlay toggle, slightly modified. Currently unused. +* Arrows.svg by Intralexical (@will-ca), CC0. ## Main menu