From 2249dffe91b67588f2617a958a1ec7b0f5e9a0e9 Mon Sep 17 00:00:00 2001 From: spacek531 Date: Thu, 17 Apr 2025 07:45:03 -0700 Subject: [PATCH] Replace display options tab with custom sprites --- distribution/changelog.txt | 1 + resources/g2/icons/monitor_0.png | Bin 0 -> 828 bytes resources/g2/icons/monitor_1.png | Bin 0 -> 884 bytes resources/g2/icons/monitor_10.png | Bin 0 -> 982 bytes resources/g2/icons/monitor_11.png | Bin 0 -> 955 bytes resources/g2/icons/monitor_12.png | Bin 0 -> 996 bytes resources/g2/icons/monitor_13.png | Bin 0 -> 1008 bytes resources/g2/icons/monitor_14.png | Bin 0 -> 989 bytes resources/g2/icons/monitor_15.png | Bin 0 -> 880 bytes resources/g2/icons/monitor_2.png | Bin 0 -> 960 bytes resources/g2/icons/monitor_3.png | Bin 0 -> 969 bytes resources/g2/icons/monitor_4.png | Bin 0 -> 981 bytes resources/g2/icons/monitor_5.png | Bin 0 -> 995 bytes resources/g2/icons/monitor_6.png | Bin 0 -> 975 bytes resources/g2/icons/monitor_7.png | Bin 0 -> 981 bytes resources/g2/icons/monitor_8.png | Bin 0 -> 971 bytes resources/g2/icons/monitor_9.png | Bin 0 -> 995 bytes resources/g2/sprites.json | 80 +++++++++++++++++++++++++++ src/openrct2-ui/windows/Options.cpp | 16 +++--- src/openrct2/SpriteIds.h | 5 +- src/openrct2/scripting/IconNames.hpp | 2 + 21 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 resources/g2/icons/monitor_0.png create mode 100644 resources/g2/icons/monitor_1.png create mode 100644 resources/g2/icons/monitor_10.png create mode 100644 resources/g2/icons/monitor_11.png create mode 100644 resources/g2/icons/monitor_12.png create mode 100644 resources/g2/icons/monitor_13.png create mode 100644 resources/g2/icons/monitor_14.png create mode 100644 resources/g2/icons/monitor_15.png create mode 100644 resources/g2/icons/monitor_2.png create mode 100644 resources/g2/icons/monitor_3.png create mode 100644 resources/g2/icons/monitor_4.png create mode 100644 resources/g2/icons/monitor_5.png create mode 100644 resources/g2/icons/monitor_6.png create mode 100644 resources/g2/icons/monitor_7.png create mode 100644 resources/g2/icons/monitor_8.png create mode 100644 resources/g2/icons/monitor_9.png diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 6a27d9e664..2ada4a317c 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Improved: [#21767] RCT Classic for macOS can now be used as the source game. - Improved: [#23982] The scenario objective window has been merged into the scenario options window. - Change: [#23803] Lightning strikes and thunder happen at the same frequency independently of the game speed. +- Change: [#23857] Replace display options tab with custom sprites. - Change: [#24069] [Plugin] Plugins are now available in the scenario editor and track designer. - Change: [#24135] Compress Emscripten js/wasm files. - Fix: [#21919] Non-recolourable cars still show colour picker. diff --git a/resources/g2/icons/monitor_0.png b/resources/g2/icons/monitor_0.png new file mode 100644 index 0000000000000000000000000000000000000000..8686638ed4fd5a2f04d368220322d5e1fbae3dff GIT binary patch literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5l&A~v32_C|iznCbUOida z*ceCx+5Pp|mv7&`|9J8L+YH_Ji=!7mkKS)@K3{xx`tjS={oB>^AG0$YXJBAAULG9W z{r>akc=>*Q=iSN4v$M5lw+HX8wqO1Ew6t^k?NMQuIw+FL>R1Cd7npa0SYbhba4#PI6w8`ZJ{Owfri8-tj5aT zYfSiCGr#`xmw46WdeP@UPr*mtm<=p5)E9}%8>yRlO6V=l5Ivr)Xy&=;?$V$%jcRwk z<9D=MpKtyD#H90!_sgkgyuNzB`n5YmE;Ht&tR;Vu;URmKtM*-s4lT=#e-brialsss z1AF)nE0qOpTbEvYe60lQgSij>`f`gsU@c9bawhPAT(X0p_#4?NK>`AwSkm81t9-JH z_5`|?x5PD~#5plHwJ4DRLS_7a{}L!60g`Y@EJ4ARF8=b5a>xtYTd9lS^|`^Gb?i{0ma^f}BH)zzp}I#Da{>@llGGvv z-~7DHlKdhCBRz9V1rxoboYcIONd}e6fd+Db4J-nBn8ConKIx|>P)ryk76eq2S`?BA zmH@g~&)8TB7@Gh9 literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_1.png b/resources/g2/icons/monitor_1.png new file mode 100644 index 0000000000000000000000000000000000000000..5973a4c17ab18e8c432e71c0099f2b99639c1fba GIT binary patch literal 884 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5l$a3U6XFV_7f-I=y?U~; zu`!SYvis|^FW`*{2R+YH_Ji=!7mkKS)@K408@z549*ak`;Qkde&2tbfq~z7_jdLCZ0*_c^8M|>yFZ_n-hRHmdVRNZ`{V7m)BDB!)%)3Z z?=QZ-T=@Lq)r+mIrGrmb+pkVep4~n_zIe9t^V^62|NmbwJsRX;mXaX9U?9z~d2-q; zAjO#E?e3zld__SJ$l)yTh%9Dc;1&j9Muu5)B!GhKC7!;n>@S%_7_3-%pGR&13Z3wD zaSYKoKlS2mz9s`6wg;W5#Y)0Q4%;kTVZi_5xBWbkU5uTxeyHEp+qdOq5Zk}$8(tOk z)N1x}7)~mZVVNA@yI7+y-P1@tQfFz*!j`QsQvL>-X++=7^}Op*R)2Ee#3kC=+7^wo z&-(uLyyPX~`P}}I!sX;?D+9i=wpc`V2ArEaOMcR|BFBqi7GCqj*1ibqInnJ_V77Ms z_TS8{mzOczlAeC_&axPiGfZ{#{~dcx{-)hUdkGp4`aXeJlnR(e2L=2xx3u>%bo z&6VS%f7iTz0gPw{-V)b{66eI+)S^TN2$k{w{Y#*P1W3Xqu_Tqj$iT={-@r)U&{DzB z%*xcl%D}YZc+7vG8dZ>*6rdWb zoS$1zT9R6%;G3V9S(0C*V5DbmsbHd)l#`m5GRdHFInY23uz^KD4>K4TdZeD*4-^vy zi3I`Gq!xu_f+RpL)-yEO=eQb_LAXKE!O5w4sSIH9sbcIjps)Z)7@;1h#md0&&0)1e PKsg3aS3j3^P6)*h-#*@M?(O~m zxxRDzV|(ZF_Tb(9;{L(G-Oq0yUVJ*fdVRNldwl-+@Z$^&s~H%A`RkLbtAS3cPWNt~ zA74D%`TXJ4|NsA=aZ^PA=wgO>_%)r1c z48n{Iv*t(u1=&kHeO=jKGKnx)@xL|NunMS$$J50zMB{wv#fw4B1_G=XM4S&vMNN*l zEs(i#LB`T6t3-eP*EiYVz?%rd)}?Ra!Z(3 z?Baq37Y@Ocm9=?pKSM87nVy(coOf&*kM5K+_o_~r&)XIx#?|_6&ECg0?3+KTvpH$5 zJ~NrqWXrq2Q|)Jp;+UT>y)4|Ze2&+LC#m{Rjmu`0mSw!Ybs%s7kL<0GYx_Rjs%=`m zWcgnwF^lH?3kul2T_~!b(!93$(BFP>^U!j4AqCsL`%WgU{Gy?2&$P#1{pIJ%uMb-v zF3Y&_aEpiAGGE`9J~>uqCs$0_#5dz-Nz=^4h53&PxFnXOG8h>cnd%!D=^I)q7@Ap` zT38vHh~19W0IE?1sYwB|#AbvjG27ra)n0%@jI}Io-01`&1w=ysU`ct{0&=4rc N;OXk;vd$@?2>|%7WTyZC literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_11.png b/resources/g2/icons/monitor_11.png new file mode 100644 index 0000000000000000000000000000000000000000..e3363ad95222220dda62817ad4b84d66a5adbee8 GIT binary patch literal 955 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lvoG;XVmq#yt9=+e*eZBhZ^y9a!`yaD2^o#qm8!u;&&gU04 zkG7Xjo?U(%Xo!3~gZgx328QflWApjq-S>;ly}ke6W^itQy#0Lr<=eNb*LOd^eb~P} zKA6AW-nsnr`R?}M-NC`#=MS&my}$VSa^ZOSe&^`u{PW@b&bzDAz1!!<7teOSeZ2ku z|Nr+7_ud9Nl%*udFBnKOY@VDp3rI00dAqxqx$p0|2;^`UctjR6FmMZlFeAgPITAoY z_7YEDSN4}oA`Dgn308aKfkMALT^vI+&X-=iUDRYC!g`@Y(M8eKSxYE+VMg}titNn) z|F55UD)3-owc6psvt*5)E6Ds8PT|}5a=(B+XROX;ljNJh^VWxDpX2`crd5qi;&z0_ z_Br8B?-nFGvTC$Uxo~s#YLVjbpKcSbgl&>pG9jpA`h`TV);<}l5=+g{<|}QpG%F9T zcQ~wEl{tBqoRs&%tEVSk>)w(%rKS$k26lWR8D%ZM{pLQBGXJePC)Hf5UW z=qUe~gSXS*$$3`yhR+pTQQ0=mFBqfL6vO;ybSnWvfw#mpqQp5dH?=5{0YYW`fBzCF zApw$bNi0caFfuSQ)i*HGH?&kRG_x|burf4Fypy{Rs74i}CIzU*D!C{Xrc~F!NY}_9 z#J~WeR2#@JFp%y)(v6}aH$NpatrBcDRt;H~YRrKeTtPOtW#*(ZxLC!wEPtlyi^7- j`BX7>8c~H!0TXalO+6@0d3GWz$V$(|d~b zp15dEeIC44zj~)vy5w%ViPEtNXKT*nS3A4u+*V%>W8l>*PLnV-wD z_n0<6pE0@a^uxTD!V?S+1wYOIZgXaBYLB$?cPGW2I}e6jc0S#wAF!qT@k*@;i^Q{U zew;dc?v(t3fUTAPHSFf9?9klrBqcU;!iJR-{EjU0ZsPIEymZo~rZK@SB7wiqrA|2T z%y#}>0sTkC8?IdvRJ8w=th{oK0z*15$aqU!BTAeTb5n~F86Z@~|MxF}5)vQ@m&B4( z1|tI_Q+)#?eM3tHLo+K=3oApjA6IQyfNE4hYEpn|tdfgTVM=ukjC73*LJSNbO0|Iu z0|Tw}dtxXWa`RI%(<;GcW7QCCm9`3~!4+hKTV_rwgNs#+OMY@`Zfaghag2XKYF?0Y zh!L3KUX)mnk(pc^ilJ28jg$)ua}MWCA6?F4i+NJ?S>PA1KWYk`7Kz%}ZqflTQ_6rvZfp dK*9+1RtAPv21aMg1Z07744$rjF6*2UngGafaV`J= literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_13.png b/resources/g2/icons/monitor_13.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d2fb2e902e57e8e3797c433693b3060e14e527 GIT binary patch literal 1008 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lsFLJ6XFV_7f-I=y?U~; zu`!SYvis|^PoMApd|LYdZHDgq#nFqONAI^cpD#W;{rGL`{_X1dkJ%ZHGcd%<_p=)> z=NC4QwwHhZ`SbtJ@sp1)cVDl*SU#TLc{hXl^z2~c=eH04f3Cm%c6##ca(n0U%eQX_ z2Y0sz?{j}`tE*lf9Lkc4AS|^3=G@P*PlPUdhzM_O>_%)r1c48n{Iv*t(u1=&kHeO=jKGKnx)3H6!W0m?Iqc)B=- zXq+#d_&VsYf`Hp)j|o$fq?)1(4Sjw0xVc8Zzxcg=jb6&aS3UQ64)+_k|848__~fr- zapl`EbP6j^~P=1l)G=H zM2mV{y76BxpJ6TcfgfB9a1OPr8_hZX1l1+BNT?|o1D%=6y! z=b|gx0$oSEq~CIQ-1X>5d~I&dF=ywL_wsj_tBROE4f8mplqq5+YV^W|-$cNlb7Av> zU)&sNO-(B&TijArn~^UrqnC}Q!>*k!DeIC@Ygq24yeHuWP@8~PAY?oRg6o1 za%paAUP*C`e?e+qkaLI;nBiWOSdfvKTpZ(^pIcB`l3JwTo1d3il3%1?q-SoaV4|0l zlbV+@$)IvM&_E8bfki+MGZ-50FPM1=C?*UN3j(T1Eegp5N`PIgXJ~rTZFWCUnj0h? soSd4M$^a&xD#lI&3JZXQ5$dfB46O`|cNHph1LYVzUHx3vIVCg!01nA}82|tP literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_14.png b/resources/g2/icons/monitor_14.png new file mode 100644 index 0000000000000000000000000000000000000000..e6583380e59083f46f03c64e009ea9e1003badee GIT binary patch literal 989 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5l-L;H6XFV_7f-I=y?U~; zu`!SYvis|^FWcFn4)$-4Pp+lD7x-#i8C5%6?z4AD4WdNDV+*?@<=ppErf z>Pv?U8-3ZLw)4rioqzHDf6_A5hRdJpkAHkr?s@r`@Im{JFSv7m*)N}*q4ks}p)X7D zxM$J4Wj9^br=Jc!`8nsS_k@(WDzk0&7AY-C()MO>Sd$d(QgrsYi+Rv}CXJB7@_>Dh zXW38sw&~6(TZgB+)(UU-+$r7pjFV3%(*9t`E6FQY-dwn!ezeFvXz~K#&(14u%e~5a zbL{)VmEJ2Ct`mHox9xYy9{-hJnYUKE2qho&^Ib0`y422Uqq4+dQx)IE{r&;=%KI)@ zKKuH%_Isl06W^VpU5OJHn&)JBtY*5}*8D}w=Gf*3 zBD0nW3ZMVYc7454kdyk>nZV%UEpd$~aZb!lElOm7P#OQ5qu*T6{E$RNbP0HRbI$S^RdidgE6 zq9HdwB{QuOY&KR6+^n+Sff`&vHn?Txq%ycz#kk}rm*%GCl@!PL7o_F|Ifod58SX`i z1sR#i#WBwLxdo*qsYMFD`FWWo`9%swdghi2CVELZsd*`r3@Voc4dehDSOoMigQ1C{ z2u~qUOc*2<1XPn+6p{&)0J~Vv&}5(EYEVw(21y4er{<+HfXSzdvD1LU0w7_8dMg7% WD+3c1(XARlIR;NxKbLh*2~7ZbmT=wx literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_15.png b/resources/g2/icons/monitor_15.png new file mode 100644 index 0000000000000000000000000000000000000000..d6da7419c39f29b65090d61eb8a71c7e8c58540f GIT binary patch literal 880 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lxPp|32_C|iznCbUOida z*ceCx+5Pp|mv7(RemnjDZHCXMr6(U>9=-Uv`+9Zr`Qo>&`yaD2ES8UFH(nkb-2MLZ z=l`GMqxakMJMX^#cyagr;@RoPk25fAKVRP-yt{gRw{!dBesTZP=eyPW*{?4bK7V-i z^V^4|gHKo6uTHM6Zl51tJlpy9@%I1!|4XjlZVhw_OG%JlFpy^0JUML^kYY^oc6ZU) zb+>Reki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*dAhnop6Sf_9oO&haLG>;eV(nzwbV>wYW{&6)6}z#H&?%A zTlO_hW?$5ICAZZ2AI^RHyneCFB3pk?$xTW-r!iGH>t9BY^ug<^vIOoPG40wkDR!N? zNR~OP!JQpCkIbK5KIO6PN_Q~BEiJA0b8oPeIhY4}w6!FBHfX%?NTrH>ttm^34Wr#t z>23L?+8jWS@s_wolsG5mrWPeKK&XuW?_UBXBtQ}_i6yBFMg~Tv`UXb&hL#G3W>%&a zR)&@tS&CDEYE(gLQh;i#l8aJdN_7p4bd3x`3=AMjwSf!+gFE``{-bEf%}>cps|1^k zRm0jMF=wC#SC9>EnK`KpE>94ICX5(@&V zNi7P=1WJHitY>I?(rtD>P?{Sg9h{t+m&yPppDM;q0}2a(gc0hk3=FLdOoN45_W|V? NJYD@<);T3K0RZIII?n(A literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_2.png b/resources/g2/icons/monitor_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c282fdb4b6565bf06c04215e7afbdbe7eeb27a1e GIT binary patch literal 960 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lvokq6XFV_7f-I=y?U~; zu`!SYvis|^FWF|CpU&v3xwc@p1CyJ`?>~RO|9Elt{o?5T_OsKEA7^0Tcix>HY`k4PKVH7yIXe3J?Zf|{>nG1Hw|6f8 z|2aN5xcm0;_V(c2r_Xmgw?FO|_pe^xeSNv``NOLhpN{uVPFC+{&(@wT9elbv-Mf8$ zeDQ4O|Ns9Vnsm$^=vJ1JAirQB&9HfL+AJW&nB?v5Vs5Zw2S}2$z$3Dlfq`2Xgc%uT z&5-~KvX^-Jy0X7y5@E1noAQo>4=D7<)5S4F<9zAG-0~&`3AO|ymqZ7nJ7I@I*InZl ztuFole|fLF$J)8?iZAeAKlofsz%QTWr>nyAa-Ru0%ir`BD;`~F9pKlkj^jNCnI7F!&| z!msV(^{d`WWG6FDD3Uz#*8hXyN6w@(4_{Y*W_CK{ns~=vk)_o9>Qcd#86N8CM`xH! z>WJ4jT)gAp)y$?}Di&$C+0+G(zf`q&{()nmJ(IISf9)>DN5F94Epd$~aZb!lElOm7 zP#OQFn}o41~Lo`uB#pqMbVI(pOTqY2{s$6hGi8sD}fqZK{mK$=A<&XSjD*H zCzs}?=9Lu3_!p$+1v!Tpff?>ai3J&%$;C0w`MCw9C8#m&SU#TLc{hXlbbev;>|o>npW~Go7}|q(FFqZA`*{2F z+lQUoAN#k*U%q|&^!e`N3=H~?RzP?;In7>{+_;j`X>g4L` z_WAL}vz`C{|Nr2ZHOSd4B|(0{K$>Cm978nDmtK5b)T|)Dnvf(Y62|M<>{*;E z+_^L}w`$}2|7oRy`Y(OX_k4Ohd-EHfmbU*bCh~_%miuelbSW#gw5a%A)|stkI(vK3 z{tG(=yeF(SsXcM+^4YTO`A-X?Z?3qx_y) zxF%A6ZqTW$gip%_=XdIVP~tf;q2bq@n2ZM>_4cryvz#mNi91nSp;6H*-wqf+yd|y? zCC-VtsYQtl5Gv#U`9nN|rl8>QuBhGLyW)-_oBptjLhWX80Y-lg3^-IA_d?4yv&mP zA_XHob4vviy`-Gfyp%}>mCJz!a)1pi0(zLiz<62qipfARVUSo5P)%x4NG3=En0%@jI}Io-01`&12Wqi0FlIXI{thU|;OXk;vd$@?2>?3F BWMlvU literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_4.png b/resources/g2/icons/monitor_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4882d78808f7d068ebe694861edd2e537f440b27 GIT binary patch literal 981 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5l-LsB6XFV_7f-I=y?U~; zu`!SYvis|^FWa)|2-?r|5%+9b_KAzop zd2n#|`_G^Me~zDgd^x}K?)#4y|9`H(_;h^o?DFmE`NtU;;^q78oy(u!KD_;QI)ik+ zxwm(F@a}$be+KpG{KDqZ_VUUM49@M3oui|x*LP{!TUtcbK{_yJjcK>Yc+0wzM ztL;};r+c^0k1w9>eEWF&|Ns9V-K>5HbT>;$kY6y6X4pJAZ5EJXO!9Vjv9{#zm#<$2>AW;yvwbag@Qf z2aiHdZL$e|b?3C}wlgnPlbiHaJVIGdu3Pt6G}-j|)+y#okJ9)XiGS1RV6XxDsUFdA%(%4%0csa9-XXLx7)7AC0uU!r9{T1rm zy-wI5U8l=wzH;V*ZM7ebzF%R^R8ar6J}tUx!;xx5=C@4}&ior(|7UH#@ayg0$Co)d zryr`Q+MT@cV^A{N#ID93A<<-`0;PRxTFy8%-dw^tYtn-W`5b;s^On>flxR-p_{*U9 zRh?7e#^IH~Fybw7jVN(W%uOvyWPnf^|KGm^N=SetToOxC8H@~!O!W9nN|rl z8>@!n>t!>68eBm(xMk*~GPqd9xa237=BDPA6vy}%q~--VhZunw?nQ|O8JWq&G0yq9 z1*IjaMGC(8d6^~oMG8iG=9UU3dPzB{c`1_&DwhKdj-Q|8G0_)jy!SSxSQZf`K%{=E-TZfD~hrx4VnACEu4EAcwQS zBeIx*fm;}a85w5HkpK#^mw5WRvcF^!VX)$w8{wh~)FbTa;uxZFzI5X4vL*uoS7qKS z2D6$RMR;5{+*p0(p3c+%_G^TV4*t5ZIqcBkxat{a4Bq`0Zc{fXjPFvt9<1opa5Ltf z%SR{G(L!Hzd@yI@oGmVvm#%zWEYRAf-uc!xxmtf))a2x~%#Al1rtMm{oP!~bQ^oW3 zz0LMrOb^a-p1!uXq^;?n_L9duPTY@v+~ty(<+$)`!i<@U8HVy61*_QqN(u#rNy@0q zUVQEF|NU!9tk&-1<;)14Ge3W`j#*xo54&B-K@XXyHZMvT>^(Gug?`O_zp>cHFSD(n z|H0IH&R_eU3m>av{JBeI1{Z_Ce_)95mbgZgI49<&79}!3sEq&bUjij0KoTyAC8-QX z21cg(21fdZmI{VuR;CtK29|||0#|@)R6%M|fNHFgi&9}qbq$PkjSNBz3?NFifeZr! zf!1}2C>nC}Q!>*k!DeICka$DvE>MFj$OgB}oKyxEs~DI3?(NYC6-!9*`9Cp9l+l0oHipn)7<1B-wj zW-u`I=ipri6cYxC1p(Eh7KLPjBtS0KGc;HC__Y`)%?*+cPEO5BWdM^;6=SCXg#|#u b2=zcMRtBc8*FCxolwbP0l+XkKbGT|| literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_6.png b/resources/g2/icons/monitor_6.png new file mode 100644 index 0000000000000000000000000000000000000000..777332d37cd0cc2b8bfa590837c1906bf27dd2ca GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lvo|$6XFV_7f-I=y?U~; zu`!SYvis|^qxajJ&ljJae*Cs||918K$LtKp85rW_`}v)Bvl}nx7dBUBU~rC(j$Zsc zd3JeruyOPB=?v2O(f0C_k1uy$ufAA5oN_lw(ucmMw!|Nl0__S@-~Z{L1? z`|$tg`p)f-?VZbSA8+p$_YV&4u3q1L`h0i(`S8W321szhn|&u;P9dU$Pmfhr`pwF+}5h>BZMU%?1Lj4@8`AxJ5bhdd;4+ zP2@<}p0Fo>@1Kb=Gk8^zCQ(;YJZUcP!jJZf&yvj^_J5qjaK>`KpZIC%iEG1Vo?I)= zIidL6$IB}>&ZLYwmD6?sZyn$%9Qo~y-=#*sfAX*r1(um zqU5#Sdi07csa&yTif+Q`Gaq00uYMhz`aX!ET032Fp40OcrPsGT+~GMZeQkV7_ha32 zX*PEb#-Au)|Fw1U&L(r_Xy(+3JKxS&`)-$6;H$ghUfhmmu^Kfy4n5uUZ_A+%OY3YE zl^=Wez6@PcW#$#&70K^YD|ztD1_P5qmt`&@#YGDRABFxAZcAKX?6i;Zag$=<0oEI_ zz+mDnag8W(PRva$N@Rdg8UNqE1WHJNBwP|pQW=a4j7;?njPwmH6%5U+Of9So4FtE% zGz6+q1*u5^s;5_uIDz?|#hAz;3)eJJ`5+`gHU8;{NUN{o?-S-rmmbk0&2r{`s`@ z_S@-~Z{PlZo8kHG!}iYQ+t1gl_p=8Fcb`AJ`tDkV|Gz)&{10?1OG%JlFpy^0JUML^kYY^oc6Tv1*s;SM$l)yTh%9Dc;1&j9Muu5) zB!GhKC7!;n>@S%_7_4|otRD&h^$2>pIEHAPFTHp>=&*tSTY?m4E@!W$sTtc+(ac*} zA4O{ayBBkEuND7i?3wl>?WU^0tbf8x{KcH{J=1?CoitY56guy|SZb*G>u={yw|(|2 z`M%-a^r?#TcxKemu>t3@dTDYxp-uJ(Lr_!1f<_293Yh54VJa13NQX}SFi zcp&BW<#>~&pT^;CL+`amS6hca{AS&JAYOLO>nADFPo5mzH}j|U^||uvZ`9Vz+ds#k zKJd${w}(9Tteg?JBq=4ZDd?2j(Ie&@X>F|EW~e=x)RI)U>;lV2wZGigqO6pkh*zhn zcs;UUJ`W5p-V)b{66eI+)S^TN2$k{w{Y#*P1W3Xqu_Tqj$iT={-@r)U&{DzB%*xcl z%Fr-ve1_ltN+CYYZ!TSRbfN2p)LvDUbW?CiK zY^)mQ&5ck2YH$VF;Fg(_%HU!ZYp;IqQPv??5>Q MPgg&ebxsLQ058~R1poj5 literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_8.png b/resources/g2/icons/monitor_8.png new file mode 100644 index 0000000000000000000000000000000000000000..9649ee699e09a5abb69ca376d7dce855c859b9f2 GIT binary patch literal 971 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5lvo$w6XFV_7f-I=y?U~; zu`!SYvis|^FWoPw z+vmp@&vw3jy#4?G{}<n~QBgJ&c|%jv*T7OE10-YBmsHeIPQ~!BBiw z)WPbFjY(@mb6oHLKj~98d4;`=F^}=jXDW@VQ~nA+l6xn7Us0nn?#$_8#U+!XUayLh z*zB@1BKBPN1h%JIUUjk4&7DlV?q$`6>%KdCSW2}aM`%mGMk(Wlj|q&s6gKc#-@Lar z|F&M2MAE``C-JA56S5xbr&cF#V+fR5`XHyf_gbo~mDk%Qi8V{^mU-F!*HTTae(3i} zKKZhzzQ$9>BeQCc&JzC~-u-EVJloG_`W;&}9{>Kxp)%2L`O|iBIW<=0C7BcEEb(0G zGwEcfdZ(A>e39w%{hZPk8mx2+VLVN-W68OfHUb&d)6@XgQ5 zEXglYFw!%(R4~y?%1O;jnPgD89B3d1*uWy7hZzhk40jev1I2_vVnIMPsYM}~APJC* z^$g7d{7;zzrMW@U!O5w4sSIH9sbcIjps)Z)7@;1h#mc~9s{Fh(pd5pztDnm{r-UW| DUaDKq literal 0 HcmV?d00001 diff --git a/resources/g2/icons/monitor_9.png b/resources/g2/icons/monitor_9.png new file mode 100644 index 0000000000000000000000000000000000000000..b11225556b4584a7818b6099e00fc8829dcc2687 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoZ!3-o%+KMOwDVB6cUq=Rpjs4tz5?O(Kg=CK) zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(0QDEl*%fF5l-LsB6XFV_7f-I=y?U~; zu`!SYvis|^uP+x~d^$dQ@$=-_j-Q|8G0_)jy!SSxSQZf`K%{=E-TZfD~hrx4VnACEu4EAcwQS zBeIx*fm;}a85w5HkpK#^mw5WRvcF^!VX)$xW!eA?1V&*`7sn8d^Q9ASmo*s(xGM8r zF__ilD8l2q;l}DK_jI2Aw_hV{bnw@O&0&WQ$5qcbWAN_3aGSb8VSJbB^ zTs}Ifo;Hb%+;r|!ufT%tol^o!qF1ThjS5=3`4`jF&eDplr#DA&EG$*zjhgbRZ_cWd zul7!SP&Xmu=Yu&L=WKDYymaO3Vu98+_0G4p$<_MXq9!M=Wp2FDFm2bmSK{mK$=A<&XSjD*HCzs}?=9Lu3_!p$+1v!Tp zff?>ai3J&%$;C0w`MCw9C8tmXRg9em6czvp bBh&-6SQ%J8l34cvD97OG>gTe~DWM4fX9H>p literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 2631c7ea90..6ec51e4eb9 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -363,6 +363,86 @@ "path": "icons/weather_blizzard.png", "x": 1 }, + { + "path": "icons/monitor_0.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_1.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_2.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_3.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_4.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_5.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_6.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_7.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_8.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_9.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_10.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_11.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_12.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_13.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_14.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_15.png", + "x": 3, + "y": 3 + }, { "path": "logo_mono_dithered.png" }, diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index db58b3a210..d88c8b1329 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2140,7 +2140,7 @@ namespace OpenRCT2::Ui::Windows void DrawTabImages(DrawPixelInfo& dpi) { - DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_DISPLAY, SPR_TAB_PAINT_0); + DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_DISPLAY, SPR_G2_MONITOR_TAB_START); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_RENDERING, SPR_G2_TAB_TREE); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_CULTURE, SPR_TAB_TIMER_0); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_AUDIO, SPR_TAB_MUSIC_0); @@ -2245,13 +2245,13 @@ namespace OpenRCT2::Ui::Windows }; static constexpr int32_t TabAnimationFrames[] = { - 8, // WINDOW_OPTIONS_PAGE_DISPLAY, - 1, // WINDOW_OPTIONS_PAGE_RENDERING, - 8, // WINDOW_OPTIONS_PAGE_CULTURE, - 16, // WINDOW_OPTIONS_PAGE_AUDIO, - 4, // WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE, - 16, // WINDOW_OPTIONS_PAGE_MISC, - 16, // WINDOW_OPTIONS_PAGE_ADVANCED, + SPR_G2_MONITOR_TAB_END - SPR_G2_MONITOR_TAB_START, // WINDOW_OPTIONS_PAGE_DISPLAY, + 1, // WINDOW_OPTIONS_PAGE_RENDERING, + 8, // WINDOW_OPTIONS_PAGE_CULTURE, + 16, // WINDOW_OPTIONS_PAGE_AUDIO, + 4, // WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE, + 16, // WINDOW_OPTIONS_PAGE_MISC, + 16, // WINDOW_OPTIONS_PAGE_ADVANCED, }; }; diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index c5a860d5db..c716f98d2f 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -983,11 +983,14 @@ enum : ImageIndex SPR_G2_WEATHER_SNOW, SPR_G2_WEATHER_HEAVY_SNOW, SPR_G2_WEATHER_BLIZZARD, + SPR_G2_MONITOR_TAB_START, + SPR_G2_MONITOR_TAB_END = SPR_G2_MONITOR_TAB_START + 15, SPR_G2_LOGO_MONO_DITHERED, // G2 Loading progress - SPR_G2_LOADER_HYBRID_SUPPORTS, + SPR_G2_LOADER_START = SPR_G2_LOGO_MONO_DITHERED + 1, + SPR_G2_LOADER_HYBRID_SUPPORTS = SPR_G2_LOADER_START, SPR_G2_LOADER_HYBRID_TRACK, SPR_G2_LOADER_HYBRID_VEHICLE, SPR_G2_LOADER_STEEL_SUPPORTS, diff --git a/src/openrct2/scripting/IconNames.hpp b/src/openrct2/scripting/IconNames.hpp index 80f0f65205..ede22c6b15 100644 --- a/src/openrct2/scripting/IconNames.hpp +++ b/src/openrct2/scripting/IconNames.hpp @@ -169,6 +169,8 @@ namespace OpenRCT2::Scripting { "selection_edge_se", SPR_G2_SELECTION_EDGE_SE }, { "palette_invisible", SPR_G2_ICON_PALETTE_INVISIBLE }, { "palette_invisible_pressed", SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED }, + { "monitor_start", SPR_G2_MONITOR_TAB_START }, + { "monitor_end", SPR_G2_MONITOR_TAB_END }, }; // Maps legacy G2 icons sprite indices to new sprite indices