From 6b74fe279f33a1bc6471f3e658f75127a2cda195 Mon Sep 17 00:00:00 2001 From: number Zero Date: Fri, 3 Mar 2017 17:26:44 +0300 Subject: [PATCH] Improve visuals --- banked-ram.lua | 16 ++++++++-------- ram.lua | 14 +++++++------- textures/digiline_memory_banked_ram_1.png | Bin 282 -> 92 bytes textures/digiline_memory_banked_ram_2.png | Bin 252 -> 93 bytes textures/digiline_memory_banked_ram_4.png | Bin 197 -> 93 bytes textures/digiline_memory_banked_ram_base.png | Bin 262 -> 247 bytes textures/digiline_memory_banked_ram_side.png | Bin 122 -> 127 bytes textures/digiline_memory_banked_ram_side2.png | Bin 127 -> 86 bytes textures/digiline_memory_ram_1.png | Bin 200 -> 121 bytes textures/digiline_memory_ram_2.png | Bin 248 -> 150 bytes textures/digiline_memory_ram_4.png | Bin 266 -> 158 bytes textures/digiline_memory_ram_8.png | Bin 264 -> 205 bytes textures/digiline_memory_ram_base.png | Bin 165 -> 173 bytes textures/digiline_memory_ram_side.png | Bin 122 -> 128 bytes 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/banked-ram.lua b/banked-ram.lua index c2b6d49..ada3d5a 100644 --- a/banked-ram.lua +++ b/banked-ram.lua @@ -40,10 +40,10 @@ for bank_count, layout in pairs(ram_layouts) do { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, { -7/16, -7/16, -7/16, 7/16, -6/16, 7/16 }, - { -8/16, -7/16, -1/16, -7/16, -6/16, 1/16 }, - { 8/16, -7/16, -1/16, 7/16, -6/16, 1/16 }, - { -1/16, -7/16, -8/16, 1/16, -6/16, -7/16 }, - { -1/16, -7/16, 8/16, 1/16, -6/16, 7/16 }, + { -8/16, -7/16, -2/16, -7/16, -6/16, 2/16 }, + { 8/16, -7/16, -2/16, 7/16, -6/16, 2/16 }, + { -2/16, -7/16, -8/16, 2/16, -6/16, -7/16 }, + { -2/16, -7/16, 8/16, 2/16, -6/16, 7/16 }, } for i = 1, 4 do local x = bank_positions[i] @@ -62,18 +62,18 @@ for bank_count, layout in pairs(ram_layouts) do description = string.format("Digiline %d-bank RAM module (%d rows)", bank_count, row_count), drawtype = "nodebox", tiles = { - string.format("digiline_memory_banked_ram_%d.png", bank_count), + string.format("digiline_memory_banked_ram_base.png^digiline_memory_banked_ram_%d.png", bank_count), "digiline_memory_flat.png", "digiline_memory_ram_bank.png^digiline_memory_banked_ram_side.png", "digiline_memory_ram_bank.png^digiline_memory_banked_ram_side.png", - "digiline_memory_banked_ram_side2.png", - "digiline_memory_banked_ram_side2.png", + "digiline_memory_banked_ram_side2.png^digiline_memory_banked_ram_side.png", + "digiline_memory_banked_ram_side2.png^digiline_memory_banked_ram_side.png", }, paramtype = "light", groups = { dig_immediate = 2 }, selection_box = { type = "fixed", - fixed = {{ -8/16, -8/16, -8/16, 8/16, 4/16, 8/16 }} + fixed = {{ -8/16, -8/16, -8/16, 8/16, 6/16, 8/16 }} }, node_box = { type = "fixed", diff --git a/ram.lua b/ram.lua index a4e237a..fcb5276 100644 --- a/ram.lua +++ b/ram.lua @@ -11,8 +11,8 @@ local ram_layouts = { }, [4] = { {x=3, y=4, w=4, h=2}, - {x=3, y=4, w=4, h=2}, - {x=9, y=10, w=4, h=2}, + {x=3, y=10, w=4, h=2}, + {x=9, y=4, w=4, h=2}, {x=9, y=10, w=4, h=2}, }, [8] = { @@ -58,10 +58,10 @@ for chip_count, layout in pairs(ram_layouts) do { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, { -7/16, -7/16, -7/16, 7/16, -6/16, 7/16 }, - { -8/16, -7/16, -1/16, -7/16, -6/16, 1/16 }, - { 8/16, -7/16, -1/16, 7/16, -6/16, 1/16 }, - { -1/16, -7/16, -8/16, 1/16, -6/16, -7/16 }, - { -1/16, -7/16, 8/16, 1/16, -6/16, 7/16 }, + { -8/16, -7/16, -2/16, -7/16, -6/16, 2/16 }, + { 8/16, -7/16, -2/16, 7/16, -6/16, 2/16 }, + { -2/16, -7/16, -8/16, 2/16, -6/16, -7/16 }, + { -2/16, -7/16, 8/16, 2/16, -6/16, 7/16 }, } for _, chip in ipairs(layout) do nodeboxes[#nodeboxes + 1] = { @@ -77,7 +77,7 @@ for chip_count, layout in pairs(ram_layouts) do description = string.format("Digiline %d-chip RAM module (%d rows)", chip_count, row_count), drawtype = "nodebox", tiles = { - string.format("digiline_memory_ram_%d.png", chip_count), + string.format("digiline_memory_ram_base.png^digiline_memory_ram_%d.png", chip_count), "digiline_memory_flat.png", "digiline_memory_ram_side.png", }, diff --git a/textures/digiline_memory_banked_ram_1.png b/textures/digiline_memory_banked_ram_1.png index 1f1c9c60d6085a4b1b8b0c6cd4710c24c553ca8e..191e49f63c26c0206fac2de2d7f5e06fc8b51f59 100644 GIT binary patch delta 62 zcmbQm6f;4^LfO;BF~s6@a>4>ukK_k`<{vxobH2n@pD9shSqD}yE@lhhWMH^j!Suc0 S-kCfGAnfnSS>x2B!BcU-$5PfPC-J9D{CgFG$0 z4NT^8cQ*)z$w~mb&kcE6GA3+aA)^n#WAWT(#?O=YziEIZRm9pCQ>}SWMXZcS8IdaD ztIYP2^bcO4=Yl@jneE$;Z{L8?OY+vaiCbK7?>S!pnx&d7{t>f600000NkvXXu0mjf DDp_|T diff --git a/textures/digiline_memory_banked_ram_2.png b/textures/digiline_memory_banked_ram_2.png index 5919675a4b5e13e6e632232959a5b032b53028bd..956b4a1afec22c17140912cd9c1aa4e0cf2ed849 100644 GIT binary patch delta 63 zcmeyv7&}45QpMB7F~s6@a>4>ukK_k`<{vxoQ(jzN(jYMF<_gBeY&}vAstgP+@vN6w Snt$A400K`}KbLh*2~7Y7mlpE? delta 223 zcmV<503iQe`~i?8f5S;cK~y-)-IK2lf>0R6f7cP5kx_huOQu*!6q@g#fowDp%@m)5 zLb4Jh!$UB#!R;DA{@jVXj^;^s=lkvK?E7|wQc5u+$4vmJ%V-Y40w{z%F|Rz@hr9rA z6dM2ztS6kOnl=ES;MtmkMOK}=z(G2A$4!sWGja18RY-~002ovPDHLkV1f(LXI%gQ diff --git a/textures/digiline_memory_banked_ram_4.png b/textures/digiline_memory_banked_ram_4.png index 7c87b449978b66c31c1e13ae7700fe132af74381..0a3656c715b8ca3d581e82dbceec3663b16f4fcd 100644 GIT binary patch delta 63 zcmX@g7&}45QpMB7F~s6@a>4>JkK_k`<{vxoQ+}?mM_*@9w>z(dX~Go-Ek*|ad)(a; S*Z=!70D-5gpUXO@geCwT7#FVq delta 168 zcmV;Z09XHA#Q~5ce~d{)K~y-)?UNx6gfI|AUpEMX-1HEw<`BIJD>wtH5?#YhI0PCF zLD0Bau^S92gwzq9nq>a`O!8-xhzJq14FJqz9g~m&4C+nC3P44^)tDB5k1BS(ikwoG zpFxa%Y5?dCG%pglgMqdIXZ+cvK5=4xK~F2!0B=b z>KXf2f)@AZB~}9l@Kwv$BXQZZ%@N``4J3KRniW!ZwjA-4MpTkML1#-=NJl)SktC$5 z7gr!v&BVE_Z4Og3zE8)Wv12zOZ=xw0Z_qo>X}*Oe9!OR552g@XLG)Mt%`(NT^8=}; VT^i$1?Xmy>002ovPDHLkV1gW#VVnQ} delta 234 zcmV5CblCu0I_LRTW?OC z_myBIDK;%)ZjViz0s~g(E1{94jl%&|{LUds2b$X8>Jko1Tw~`XDG#`WLv3(NT;~b_ zpWeWn*z=!pET-_Hzab>x`$~0^r%iT@d9BdgXWS_dWQ7SNQfT=K)nUN{4BG ko>_;<$)K{*akhHk4t_me!0%!YD*ylh07*qoM6N<$f>?%U8vp|AFKzqy z|NsAp*acaeTOYpuy_p9D?lc|a+1~#np_Gw9{+Mt*Yu5YA3_#%N>gTe~DWM4fOH?Zg delta 91 zcmb=gnxGQq=;`7ZVsSb-L4tL0f=B?X!7{^wf6GrWB=&0lFTc0qsMgDM7tb63f(HM2 tAOHXVZxO4o$Z~2U5Ij8lHD`_<1H^)8DGvYu diff --git a/textures/digiline_memory_banked_ram_side2.png b/textures/digiline_memory_banked_ram_side2.png index ad01620269ce7844c467b8c3cfc8eeb1b907e150..0341455fe1582b0c755f45aff1903dd10f610c11 100644 GIT binary patch delta 55 zcmb;qo1kJO>*?YcVsSdzC;7pj^A3y&NecveqztkStYBHl-mTO(BOn$D7x y0D=!EjsN}sFP~l}c5%+B13>WMS(TZeI0M7HzXD;BI=@{RfWXt$&t;ucLK6Vz^C@8k9attFYSPO z{l@1KM;KxbWc|u)Ymd%*7<}l!5eG#HHZ}vUY@eU}+y*HhRz2e4ieKZ*-deA7Swygx zhlfXE;n~hK;j|nFo&>NRcV0F$I^J{VO%I8CV`-);)!V{TvCC9SF4p2Q}xV#Ha9i9VdRA$x&RgNATI b8h8KzNfsy5mS*#500000NkvXXu0mjfh^jU( delta 220 zcmV<203-jF0r&xsB!9n2L_t(I%VYfi|Nnmm96&^KDgy%p1H+r^*|?N2urM$%FzA<9 z;gF7Iz$bsP=NJPM10Eply_CUf`e}Sh@Ebr37Y;{9<5WU|_DVf9jpGW@v0}5uBNvm)DcDIHH}883+!q?$Xwn z!NOW=<%+Q{2^}rE{!ktXB)pFvLw8Ro-ZD?iBO>TT5 gp`dPRWXMy=z|fUqP-(>P5Y7Mup00i_>zopr0LlO^-2eap delta 238 zcmVHm7$H~4`>4Uij%Avnx@Q2{WMrGsn?c%pDN*5oY>Bk@QieCzv$4m*t0Pw!I2jli#5#1~;xI9iVu4T$V2uTA0GBvb oQX*aho^FkXM;9)@NNIKk0K+s^k2zayEdT%j07*qoM6N<$f@H^Nod5s; diff --git a/textures/digiline_memory_ram_8.png b/textures/digiline_memory_ram_8.png index 9aceb9566b967f7456c5e369b6a72be39b495848..c7c97f96f50db57b7242295c800c3eae1196d4b8 100644 GIT binary patch delta 177 zcmeBRI?FggrGAR1i(`nz>Er~7D+kK!|I|BWMI`VP7eD^b0|e^+^HN(jemptXrgGZE zMj+^%u(l=Upv#HQ*|OqBK`9Iu6BVv4WEQun{G_9N=HEu8E|NpONlW}k<)?x;N!?R!C+%d&qg8>k{m>%(PLSNbe z_4|5Bcvt5qyR3?z7O@T70&iK1 z7#D9iHs${Y2Ip;}H(#Du*U%|{+QijGd6QD5yy*_58ICU=rZNO_8#a6dTK@m5_nHTa z+Se8y{;=v17uXHu(q?Qxl@{``?~=|No-t4m$q->xGCQo<$6BFKw>>fWz%ezI_Uo+v k+uaT?=1#X-U}DY8aH~D`%3UwJeGEY0>FVdQ&MBb@0A?;|2LJ#7 diff --git a/textures/digiline_memory_ram_base.png b/textures/digiline_memory_ram_base.png index cecae8a4bbae7bef43082d061568dd7ed50f14eb..1d3b93a625e877e62bf3cf809203e60638f6b32e 100644 GIT binary patch delta 145 zcmZ3=xR!B(N_~l^i(`nz>Eu8E|NpON({Z?(#?AHro1lEoDG3Rn(Es@TN4Qo$*)AN) z0|GH(xe-tGzsV#gBpzTc$aG=z;Sp(aOkk+Wn9LNCyUihnfjc*d!H2)}P{WKDheVJ1 x>?0?I1&H= delta 137 zcmZ3>xRh~%N_~!}i(`nz>Eu8E|NpONlW}k<)?x;N!?R!C+%d&qg8>k{m>%(PLSNbe z_4~7+vlf$PJ?3e^614YpELoD`G0&a--qUI+v9GF oCr)7W-|lvJF?YUBz@)j1{$9!g7ZdB98Gyjk)z4*}6H`JH05F9*G5`Po diff --git a/textures/digiline_memory_ram_side.png b/textures/digiline_memory_ram_side.png index 4a31ba0104ff908b73634df928a0ce6ca336f169..6a523d34209bcb2c47a655414ab24e8d6f1a184e 100644 GIT binary patch delta 98 zcmb5F=7-DfcIYEMTae_zytHG?<(*KtqVVJgEhnFWtELTG4zF)|~4}~ie z|NQ@NA11!yR!-uNU;lKNL16m=!^3Zt?IL0s7%oZ(i#(N`Ai)3xp00i_>zopr08)e` A@Bjb+ delta 92 zcmZo*teT(_=IH6-7-DfcIYEMTae_zytHG?<(*KtqVVGtuFD$ua@ARapHM>k_H8wUf vuD5yo|NsBOT@EhATFgLjc=qd?7O@Nr7xe@#ep6BqWdH(CS3j3^P6