From afc55d6573c761f49d3363abcd98614ede3463ca Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:44:47 -0400 Subject: [PATCH] Show other speso colours, add larger denominations (Frontier#1496) (#37030) --- Content.Client/Stack/StackSystem.cs | 50 +++++ Content.Shared/Stacks/StackComponent.cs | 22 +++ .../Stacks/StackThresholdComponent.cs | 19 ++ .../Entities/Objects/Misc/space_cash.yml | 16 +- .../Objects/Economy/cash.rsi/cash.png | Bin 286 -> 375 bytes .../Objects/Economy/cash.rsi/cash_10.png | Bin 292 -> 424 bytes .../Objects/Economy/cash.rsi/cash_100.png | Bin 291 -> 413 bytes .../Objects/Economy/cash.rsi/cash_1000.png | Bin 290 -> 414 bytes .../Objects/Economy/cash.rsi/cash_10000.png | Bin 0 -> 695 bytes .../Objects/Economy/cash.rsi/cash_100000.png | Bin 0 -> 1466 bytes .../Objects/Economy/cash.rsi/cash_1000000.png | Bin 1109 -> 3037 bytes .../Objects/Economy/cash.rsi/cash_25000.png | Bin 0 -> 681 bytes .../Objects/Economy/cash.rsi/cash_500.png | Bin 299 -> 401 bytes .../Objects/Economy/cash.rsi/cash_5000.png | Bin 0 -> 380 bytes .../Objects/Economy/cash.rsi/cash_50000.png | Bin 0 -> 701 bytes .../Objects/Economy/cash.rsi/meta.json | 173 ++++++++++++++---- 16 files changed, 236 insertions(+), 44 deletions(-) create mode 100644 Content.Shared/Stacks/StackThresholdComponent.cs create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_10000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_100000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_25000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_5000.png create mode 100644 Resources/Textures/Objects/Economy/cash.rsi/cash_50000.png diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs index 7e681aeba3..17e502675c 100644 --- a/Content.Client/Stack/StackSystem.cs +++ b/Content.Client/Stack/StackSystem.cs @@ -66,10 +66,60 @@ namespace Content.Client.Stack if (!_appearanceSystem.TryGetData(uid, StackVisuals.Hide, out var hidden, args.Component)) hidden = false; + if (comp.LayerFunction != StackLayerFunction.None) + ApplyLayerFunction((uid, comp), ref actual, ref maxCount); + if (comp.IsComposite) _counterSystem.ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite); else _counterSystem.ProcessOpaqueSprite(uid, comp.BaseLayer, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite); } + + /// + /// Adjusts the actual and maxCount to change how stack amounts are displayed. + /// + /// The entity considered. + /// The actual number of items in the stack. Altered depending on the function to run. + /// The maximum number of items in the stack. Altered depending on the function to run. + /// Whether or not a function was applied. + private bool ApplyLayerFunction(Entity ent, ref int actual, ref int maxCount) + { + switch (ent.Comp.LayerFunction) + { + case StackLayerFunction.Threshold: + if (TryComp(ent, out var threshold)) + { + ApplyThreshold(threshold, ref actual, ref maxCount); + return true; + } + break; + } + // No function applied. + return false; + } + + /// + /// Selects which layer a stack applies based on a list of thresholds. + /// Each threshold passed results in the next layer being selected. + /// + /// The threshold parameters to apply. + /// The number of items in the stack. Will be set to the index of the layer to use. + /// The maximum possible number of items in the stack. Will be set to the number of selectable layers. + private static void ApplyThreshold(StackLayerThresholdComponent comp, ref int actual, ref int maxCount) + { + // We must stop before we run out of thresholds or layers, whichever's smaller. + maxCount = Math.Min(comp.Thresholds.Count + 1, maxCount); + var newActual = 0; + foreach (var threshold in comp.Thresholds) + { + //If our value exceeds threshold, the next layer should be displayed. + //Note: we must ensure actual <= MaxCount. + if (actual >= threshold && newActual < maxCount) + newActual++; + else + break; + } + actual = newActual; + } } } diff --git a/Content.Shared/Stacks/StackComponent.cs b/Content.Shared/Stacks/StackComponent.cs index 7137f8c0c2..356b888606 100644 --- a/Content.Shared/Stacks/StackComponent.cs +++ b/Content.Shared/Stacks/StackComponent.cs @@ -78,6 +78,13 @@ namespace Content.Shared.Stacks [DataField("layerStates")] [ViewVariables(VVAccess.ReadWrite)] public List LayerStates = new(); + + /// + /// An optional function to convert the amounts used to adjust a stack's appearance. + /// Useful for different denominations of cash, for example. + /// + [DataField] + public StackLayerFunction LayerFunction = StackLayerFunction.None; } [Serializable, NetSerializable] @@ -95,4 +102,19 @@ namespace Content.Shared.Stacks Lingering = lingering; } } + + [Serializable, NetSerializable] + public enum StackLayerFunction : byte + { + // + // No operation performed. + // + None, + + // + // Arbitrarily thresholds the stack amount for each layer. + // Expects entity to have StackLayerThresholdComponent. + // + Threshold + } } diff --git a/Content.Shared/Stacks/StackThresholdComponent.cs b/Content.Shared/Stacks/StackThresholdComponent.cs new file mode 100644 index 0000000000..5d142b5774 --- /dev/null +++ b/Content.Shared/Stacks/StackThresholdComponent.cs @@ -0,0 +1,19 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Stacks; + +/// +/// Denotes an item as having thresholded stack visuals. +/// StackComponent.LayerFunction should be set to Threshold to use this in practice. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class StackLayerThresholdComponent : Component +{ + /// + /// A list of thresholds to check against the number of things in the stack. + /// Each exceeded threshold will cause the next layer to be displayed. + /// Should be sorted in ascending order. + /// + [DataField(required: true)] + public List Thresholds = new(); +} diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml index 57dfb40098..db08a70202 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -25,7 +25,15 @@ - cash_100 - cash_500 - cash_1000 + - cash_5000 + - cash_10000 + - cash_25000 + - cash_50000 + - cash_100000 - cash_1000000 + layerFunction: Threshold + - type: StackLayerThreshold + thresholds: [10, 100, 500, 1000, 5000, 10000, 25000, 50000, 100000, 1000000] - type: Sprite sprite: Objects/Economy/cash.rsi state: cash @@ -121,7 +129,7 @@ components: - type: Icon sprite: Objects/Economy/cash.rsi - state: cash_1000 + state: cash_5000 - type: Stack count: 5000 @@ -132,7 +140,7 @@ components: - type: Icon sprite: Objects/Economy/cash.rsi - state: cash_1000 + state: cash_10000 - type: Stack count: 10000 @@ -143,7 +151,7 @@ components: - type: Icon sprite: Objects/Economy/cash.rsi - state: cash_1000 + state: cash_10000 - type: Stack count: 20000 @@ -154,7 +162,7 @@ components: - type: Icon sprite: Objects/Economy/cash.rsi - state: cash_1000 + state: cash_25000 - type: Stack count: 30000 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash.png b/Resources/Textures/Objects/Economy/cash.rsi/cash.png index 42e7b863e685d9974b0f2cf88fe948c507cc45d9..7ce8d6fd7b6e2cf6e729971c81b4866e5951c0dd 100644 GIT binary patch delta 359 zcmV-t0hs=t0`~%t8Gi-<0047(dh`GQ0X|7YK~z|U?UXS~!$25@A0-VaXP^X^41t0} z90QW6E^+b?ICOI9(yf2PrCS%>{Rz%O1}R;f>{f6nhz23ODTcH|Oze_NK}CdnwwLd{ z@B4UZb9uVA`fiV%x`KITuCh+1Jbc$a4-#%rgK0002ovPDHLk FV1oCosf_>t delta 270 zcmey)G>>V5WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NVTGaFM1)6P4nJ@ErzW#^d=bQW)wP81g+`978Pp-}Za+9Z=wKVP&-cZeL*9ka=a>ZMC;K zZ0*looNF)eueisdBd)_>;#%wy%hM1s$sk~vozP{Tf=Ba;(o!axy_b5iZDDE>@0MJT zbvs;@pHbA)>OT{(*)&0y%EbL5Kz$?2ZWTJ)s(c z_p=X%oV0p zLg*T{(Mb=teSEZu95iGfPYrLhVu0&q@O_O8qIi{ zck`9lAWiwR+F1ie;CXqvBQ{85yB?LBI?Z?+GGJOIz?KFGJ)QI1g3DZw-RCW-2jsUv z+Q4MwL@uAlBO^4x)Eh<)U)+!9^8FdV@h4O$6p9ZSDH4d&2a=rB00000NkvXXu0mjf D#KOIV delta 276 zcmZ3%yo70jWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NVDg)5(X;?7cWr^bn@Id$ju3GAI-e)+T_v#K6Y)u*H#+kq5!NswRge>h<9@@M=6 z6y_}Oh%9Dc;5!V$jK}j=q%hPoFqC?_IEGmGzwJNBci4c#nR~0^$^Z2QyIG4o!rn%$ z{CbqDE+Qqn{tHuVIm@(GiH^2!1y|*G7);E$xQ=)jpJSM-Fy$#vV#D7o2eTThX>G;# z_wiO;e6aYS=l7>=7Jq+!p?c+idbAWzmUYN`>zwODK}i>i|w6%C!WfPx5Wg$&?`cpT0U;EP3d6_jGcvtAYCF5J1guDN z|I|mOmxt?@qht84fZB-kcBXj+C);hTA1o;~fch0E6A)&QxIB#p19?ko;C+z1`1s~E sl}?4!z#HzQvHg%0>2w;6MkD7FMCFR<1E(jj00000Ne4wvM6N<$f)X;X;s5{u delta 275 zcmbQsyqIZ%WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-NUMvy%X0^v+UoSJQ5N`Qmf?1oloZzkFJegFzFhD&%MDUm(R@666>B9}XD2{24z1 zg*gj6B8wRq_zr_GM@}-M%23Q9SB$?&Pu< zftklUR@%N`_sM6O#+c8rYg4$3F`I*q7EcIA%kP z57Zppo93N=xv6>mzW=To)vN}}4N_il*`~@33xDo2ORHtdc*{^Eru=US%jDZUKxZ*{ My85}Sb4q9e0H3{N7XSbN diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_1000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_1000.png index 6a5688cd866d413a9e40239c01388bd43c060164..6271c90e99b574eec91284b598c58f15ffbdecb9 100644 GIT binary patch delta 399 zcmV;A0dW4J0-ghq8Gi-<0047(dh`GQ0cA-ZbHVr*K7*Tv%DPM z-+9mPyyrb&Fc=I5!+&OfbJ6{4ji_Iu7>T&b4X(evE*aenLw`-2kH^9+tXDAz^X z4zPf>9geS;0Z`Hc2H)aih=ITkC~47ZzOZvTpj38I(n8w~S_touPffk}JTVMVX!Pk; z)06ew2DI&D%PDHLkV1gThv2FkW delta 274 zcmbQoyohOnWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hEfKP~P zf-R>jGjj|R)6P=yZe8sXdHHku1oloZzkFIzot*`!>daC19w5bC666>B9}XD2{24z1 zg*gj6B8wRq_zr_G9>|~9VIP?5#(lcQvP4?LR%AZ;H%Fbor20F{r L)z4*}Q$iB}6{%$8 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_10000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_10000.png new file mode 100644 index 0000000000000000000000000000000000000000..8038bb576ff4d6230e57d3a84e5236e4537574bd GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&DF*n2xF*%lz*@XD6JWp7ZJJj+EbTq+ZmCuX(&zb}9EAv3Q1k*FN6r zo5cFA+y1G2;(kVmYoVmg)0I2+8wLH^zbbET(Dr5a4$JBVuC9H^-&6Q^*S`K&H$Sl7 zSu_7_&9*;`k@v6t7i~}Z%>RXt`{$=$m8@m8@#`F3$xHlmSjxoy|KJDqMZ3&z~8v@{eJ~--u~`&|F~?_ul-?+x5_fUi3dD7@Z{ft7{=Z92j1x` z?B3rn`Cn6$y~3+|*S@EGWj~U0**@W|yv;K`pv^1i$g}@J@$aAdhHK03-DldOHNULE zWk36}gm3Hx9O29vf8`E+v1+q_(DI>=>q1;(!pmy&+UKXW7ksT=$>dpoP*(K9ue<+h z4*cP4Ud_1cK5Or<{gMkp|C=+1oIn38p6|nRPzrP?Z^&Qg=N^{3xUUuDVNX{-mvv4F FO#sI?K%oEt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_100000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_100000.png new file mode 100644 index 0000000000000000000000000000000000000000..26b4e80b1f11b135b707dc8876b90552619a076a GIT binary patch literal 1466 zcma)+X;4#F6vu-RsS8F+k>WyhKpD}Nsj@_;=79w604f3^Mxg{1NHkGWNfS(7LU`HeW3XTP$vboJIrq+-`JZ!sch1#7 ze;>;g>sKHU2us{SuOQfFz`OE`W$^ik5@AFj%rkLbo<~z@^2zVcZ8-b&Vzy&1hhB)^)M} z*2hIx?0wCxziiC{uZ}RAlG^lYoYI&+xCO6DdLGixY5*@Sl| zN!qnLf@Qfg`8*}_Y@6=q*z^5U;ehDI52o{=$nL_!%AgmzCwH&2FHlp$qPQVr@a1M_ z{v}`U8ouaoU@hyFjAc-V%670&P(0i3NHo4Pbp|hOCd3`CR8h#MC15WdEZ#A)9MnB!H zk~y0-?xKx&y^m4mmV#r?PWNXhb z`>pqq0;>2NUdbR`D-Uj+n(7gIR1s@Yi zissGVT{DMeMkg`B^*>Dmy{?2!=5Kwv!QIsKw%dx{8dU-MZgav;T$^6gN1*`beM9_F zUt{=Dg6t?oH|F;X1Q6Re{EvAjDp6(tV2VhBa>`9IJ96?pdvB{v{H&TJm!@b1 zQ}v9^s~wF9$?RycZzCf>hF1DVC-43(hv^+nf)g|I$3v;7Hw zoS>wP84VWbp>V*n-i=q06KrP7XQDStAT_d(G4UC>@;O>A1Kn(cP633+c>ABh{5VRlOa?Nciy=7Oa)+2R6Auk{7~P?6eHh4JXZG|(m|vX2ZX2C+ z%fJH5svUZ~c`le1w)_oFzx=^g>jV{Djm+k3z}kXW4m$Y(nNdzkssNIzKpH_6Di@j@pm6K3I)MEjgvMAw zI@K3zM7-l40X$Nju?liqt^tO@fZjq6p(ePE_ZdAnpxcijl*a%<>`jBfRCM3!&_0n# z9XC>3D5wTePwP^ROBc!_6H}dqy*{l0jp+E9-ty*XG&DG>dp;2rEO8v*03o@waXgTb zwlrHSmMEC*{iT<+V$zg*@}(;7N!OA`1E>m`_cM7Nx)L%RIuqk89Nq0fTTBKC=BP*- zE3ctVEsTuM8|kk)zXEjQ0@X@7ehwsBOM1?;82Z~3xN)2S$8F%yorn;Y#o=9iJ0)==P!bJ+>JbW zN1_0=<~aOMZN>ss*KT-09Id!?^`E1!G1vVSX@e;Kq;PMiY0GvM>CLfj+LV4j(7jQr n_W)qOYi*>_|F{5LoQ2zzK(z0~3A`g7SU`pI_V=paf9le|FkuZn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_1000000.png index 389f00ce1593c4b2949549e763bd4050733f6379..7077bf99f8937bd749549d9f750c47597e5f2804 100644 GIT binary patch literal 3037 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 literal 1109 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`V*`9bToY_L*__#!QkZs@inCa_^0_DSGdl?|M!QUP**m@5qRHa&X~lE< z1e_Wts^-+Wns)2U7qjTIFstfuFlf54xF#?qx-v7zFfnx+c9knubn9xD$jj?8>#DP} z0Bw*cm6#2rWD|{$K?F~fBub{rK7q-c|c|1r&KG!?N6S}u*ump`~Fl;CM8D)6^;%T zM!|Rop%|It;q`!AWOk(c1AkWuf(HOEca#rqTo4Z1(niJInrYz|) z()*;O*ZJe5@QPQfmRYSV@_N;^VqFcRTyW}3z0<~zE^3~&Y22j2t@SO{uR4iU%eFCU z;-kRVdzN)cUp&Ehetr+Las9PTi~`~|4TTOH=hW+yeu9{m5ndWFZu2MgwvDXeAuyPb`T@7Xnm==8m@PdYB-Z#QE|a&NKg6WplM$5A^; zfvItEa`V56EsP(Y-dOPem(!6?Z-MkbHx?%5f1A%g+VSPkX%@zb3JO9jE=>&{0s_Dg zn6IwDsn_?o`?93Vi}UHy4AZqcF2t|zh3)9o$G)zq_QPh0VkWmnvG@9E_( ze>zVHKj?|P`R2}(Z8s;}wqlf^*_7g#wQ{(q40u_<%7VRjWg@7|K_XsXS1qo z!E^h!4pGd%@_8$G<C5uTybayTPW3w#k`B&HdQ`*MI2-8UvdxSi z9s@o4)A2}?@zEncnFxFLd48Gh=a~zICEhJNdC#{$|GH(~yJctZ{`#AD>(hj}#c{u9 z+_q{AdRR8M{W{m;+oen2zyJF7S7S--f^RHxn~Ue#^WXfrm^u2PLHTQ8QNEyUb`vD{ zgZXmG>MniWKVP4XechpjvLBWg)*k4IdcH*VN;11m{lC~P%>O3-;4v;LSYP0?p7D5Y zZ9*FF9m)JW-VLSKZoBp!{mRIFPDJ=QH^&0C4=%L_2z%v2nIn(J-8Xjq!Y``My>H*0 z`LBAr!}=1|Ls!@>EZ_b8b>Op&mBcINTZeDUzOb$ie|W*PX}k4V6GSH*sIQy3o&SX}D0!SX#k7BaJ!hE_`>fV%LtwUJ@O1TaS?83{1OV)V@#_Ep diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_25000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_25000.png new file mode 100644 index 0000000000000000000000000000000000000000..b0f705a34f11b8e189255f7bd4cb7f30d22c8e96 GIT binary patch literal 681 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&DF*n2xF*6>kmD z%5#uEw@=`5ht}oOit_v{KvjkFd((gvcS(?6@P9a9@bYK;#K6F$t&D#k^mX+!tmH8t!@?jBs_f9Fo) zs_t0*DE1n~FZYf=f5)di_c4#NzwwE3py7Yt#EoXMzxGTv>tDaGv$t1 zUVlpcVJ#@25a7p@{G;Ek7hB1D+`D*!y(PPT|Mky@Pw=PxzjvP9rF?s6-Gv>|uKz># zZ8*>VWJ=9}3&C42HJ;kv{r0`BLue#MesQFi_ zAn#!JA@AT*thQad|9bcR)%(|%@1Oc>-fq3;+*0LhpE6hezjN=u`FZ{oyWf}YOPDV| zp^{Zw{zb`(9gpV}%-D6U@!0*@&)JXI*&C?qJp0+yT%)kFy7<4n-m|lR6y`b_d}@y9 z{mguV{ht1g8ie;itn_;Af7%CDe3oQi@wb}8XW{$z&I)`Fa~iJgX9os$RY$+J)rMWy z{n)$eeA%`B%WYwKvXos_QIb95+yA|#bq9X_k!MS1zVlB{;>-WT42%EOODy>PE92iw ghW~aT)9>(oV4h&(UKf92dp(Hn>FVdQ&MBb@07qjswg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_500.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_500.png index 5d68d914bfe725f19216c45bc268dc6376d0946f..ff3644af85cbea78268a8165e6a1d57ca1154d31 100644 GIT binary patch delta 385 zcmV-{0e=3g0+9od8Gi-<0047(dh`GQ0a!^yK~z|U?UXS~!$25@A4?r{3bzDGpz}?g z6c;z^(4pXB6gm_-v{RRYgFm2K7pHb8b|{ogg$|jz3fg}m1hLBzT!qx3delNL1$7Ya zSw6z|-p70I-32Tbi^XF3&(u#3RzIDQPivgz%PTMOjEk>NLVtL;$}}-b?)TDqInzQ} zlDI{e_IygG`$T&_#Vxu-xd>U36fO^uB}sce)xGVSMQQ>7Dpu5*GscY;!V#!}LO25N z*+a!jYXE{qOKbgMpWw6Jon06W7!weVU_7Ye5BpU7(b`0;h;k9a5n6L|euO{l>+j8) zh0%bD*EyW^)Y-^SQ-ta-p-v~K__I=s~9z4eg(z^qFj_Yd>0K#dMnkya`l=yck=kQlkU&> fjX$BqVzGPxvetu~=(ny#00000NkvXXu0mjff%C3? delta 283 zcmbQpyqal(WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKP~P zf-R>Di)#W?;?7d>PQ$Kp#fo$L1oloZzkFJ8lIs**W?i7dno0|GAjMM>=PdAuEM{QfI}E~%$LsS~qyR-LJY5_^Ed1a09~5d(;BaA1)cpJZ|5+iM4BzW% zS+)k7`bDRIS|FcMrEI`k(R^d-9wYO`%!>>(PHHvCrL$ZK35f`Aosn=jv}q0}i?!0S z7OQ^aM(xU}2@?~-=5NkqkN^8meBqO+DAmO2R`@e4eIv3A#h3U+NbxVef@j$4X?a1^>Zh~uptoUen> zB}11A4t5X&mU_|J4uw3+n?Jud`H{Q{I2;a#!||VqF3(rTu5q?&qF%4BM5HkJt}@}n z^Q|TZgTcwc1^|>&XswBYgi_|QyqFWGA+yW!>b*ufSSJmHmtDU;}xcTazCb@8oZG-JkIrKcU0n aaC`#C1BmQziS?-f0000ZsBH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/cash_50000.png b/Resources/Textures/Objects/Economy/cash.rsi/cash_50000.png new file mode 100644 index 0000000000000000000000000000000000000000..160e07af5b159fbc31b8efacc3a354db853f6083 GIT binary patch literal 701 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&DF*n2xF*e;_Xv~o7Y}ovUtB{b9eO)Qz^T%OqTn0 z{E+psS+o90d(L%67N^qO6oyS3J-d)^iM$FRC@v;Bgn>|bM6gpj1Ke?S)FTJdKsc-O?xrX)CKZd>g9eR)FtgS!r zBSO#h|8YL1$p7l%c<_tYD(&G;u0^M;>?aosoeHikzvCI4^!_{}+A4rJ#t=0D7r7CAd^{8F$L#P@Xd Kb6Mw<&;$TXy*vs4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Economy/cash.rsi/meta.json b/Resources/Textures/Objects/Economy/cash.rsi/meta.json index bd7b30e211..11f8b13b16 100644 --- a/Resources/Textures/Objects/Economy/cash.rsi/meta.json +++ b/Resources/Textures/Objects/Economy/cash.rsi/meta.json @@ -1,43 +1,136 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Modified by EmoGarbage404 and taken from https://github.com/goonstation/goonstation at commit b951a2c12d967af1295a3e6d33a861e7e1f21299.", - "states": [ - { - "name": "cash" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "cash_10" - }, - { - "name": "cash_100" - }, - { - "name": "cash_500" - }, - { - "name": "cash_1000" - }, - { - "name": "cash_1000000", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - } - ] + "license": "CC-BY-NC-SA-3.0", + "copyright": "Modified by EmoGarbage404 and taken from https://github.com/goonstation/goonstation at commit b951a2c12d967af1295a3e6d33a861e7e1f21299. cash_5k/10k/25k/50k/1M modified by whatston3, cash_100000 modified by Unkn0wnGh0st333.", + "states": [ + { + "name": "cash" + }, + { + "name": "cash_10" + }, + { + "name": "cash_100" + }, + { + "name": "cash_500" + }, + { + "name": "cash_1000" + }, + { + "name": "cash_5000" + }, + { + "name": "cash_10000", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "cash_25000", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "cash_50000", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "cash_100000", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "cash_1000000", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] }