From 7750c0add2d9c8f795a910d82884e4da6ad51734 Mon Sep 17 00:00:00 2001 From: Kirill Leyfer Date: Tue, 8 Oct 2019 12:55:38 +0600 Subject: [PATCH] Nicer frames. --- game/assets/textures/frame_9.png | Bin 183 -> 1694 bytes game/assets/textures/frame_line_9.png | Bin 195 -> 1321 bytes game/assets/textures/frame_red_9.png | Bin 181 -> 1827 bytes .../catinthedark/jvcrplotter/game/Tutorials.kt | 1 + .../jvcrplotter/game/editor/Editor.kt | 8 ++++++++ .../jvcrplotter/game/states/CodeEditorState.kt | 4 ++-- .../game/states/PlottingScreenState.kt | 2 +- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/game/assets/textures/frame_9.png b/game/assets/textures/frame_9.png index 1f74456a348d05cdd8122856f52ab313e11e7ef8..f0aceccd83d2ba64d40ca325f069e162e1f0bbf8 100644 GIT binary patch delta 1679 zcmV;A25|Ye0iF$zBYy-(dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-_JmLw+( z-E#^b0VIUrIE?T420p&O2r8>GJ8S5&7q#e!%n&FDODY;KJ4TczVuc z9Ku*YD@Ntl__Z%65^MS*Ub>8(X`c=d0u zH}P9*yZ4=-wJgm;@c9-i*hQ9KFvF0uCsqNFuzyZWWyd$Ti}=UOfMp;kJIoml zR^KiWO~Pw#@y40GI4q4<;`^ZE2tbISTVPCJAmCGA2`P9b(hv~G416jqCyvyBKoBQ1 zU?oN71aMFd(2Z|2?6o9xvC&=tgm7X7G$VzeVND`GSMQY*{lcbb1 zS)Z!P8h=$ZscP1uHFJ(xa>|->F1Z#ej5a2&q@pF4Qfh_L8Y^T~tgm1+YTROzmYTNQ zN~;~|(_@#Oy7t^luY(2;v;a5K(2++Ob%u#lnsLfZQ)ixK)`eVKyyB9Tmae?YsyEaQ zs`scpBKI+B;h;tvC|jqmsDZ8eA|hBj5yK3KQGX0TTnzyvG#O?-hZxC_Gt7J;cFaPs zQVg6C3^5=WXCPVOhTSW2@8aeV-QUHHo+0N9y8i7mx4Z$eDnv}t zAsOYDMu-v+7O#+E<0!V(JW!dQWv+42G2?*zDXW&{By`pVy}ITYYedQwzomXvw7@;{ zpMTTk6xL%qU7Id0s|ENn{3<#rE?8SsmN_=_Wf>x@y=B=m?+*Oz57 z3Dx%u4fhltv;Kn7(xCcxVf;+cXVgOVkbf^f*rII&veocIfg?YWRv2e8bb*C2d^A29 z!vfocS&Bm-&H;em5&-!4{A~Hj!ImNJ!&Gx$%Ejk2pz3a}IBc9Rp4brtCiiCJZCt$g zX54o2-ka?V+Q4?l9e*A^`Lahh>b~#UA3=Wv{dhrg%Fp^U_M*Nzb~$fnBNWVR1b;r) zU00>qi(PJ4Q__{Xy>ZGoOj&*5yZ1i%O4+&p>eY)g?uj?AhP~&><;I;8?ks+~ZT-$3 z;J(xQpX~weqhrj^v*^!3>qj575baS=!T$o&N-cA@W4qbP}&NuI+$Gg1x*@~6cs^Frxu5%U^eQ=%0UnWfj_HO)ynjJFy=m#3 z_lZNSC@I9}#G?jXkob}7a+BXU7aSINX2?h<=ZQnaVxfcO4rWC|C7vP8MLZ-w{bJi6!+>uWXw+=```ES{CxG`ExYFAGN*$Q_B)!(w z!bd>gHgIv>*5p0lat9cA(j`N3Bri=Np9kL0=$o=Y|1A($YxdUK$LRx*rmmK6fP+I| zq(Is0F7Nht_V(|YR)0Ut8FI^F*2wk%000JJOGiWi4*&%K0Dai*MSlPQ010qNS#tmY z4`BcR4`BhQKc{H`000McNliru;|d4{GalLL*CPM`07pqgK~z}7V`R7@@SlMY(D}f~ zKn@_nY$k>Q2BQvO#E2(y! Z05W3}tu0|-D%PDHLkV1gCL9oGN= delta 128 zcmbQoyPa`@vH$~HlDE4H!+#K5uy^_7$>MAZDQwJAjNdkYc*?-Q;Nt1x7!q+fIc0~^ zhxv@s7k(Z%;o#eFSWc~tk*%j-df@HjE^Q|o+7GN?b~~sc!MZp>q^Bv+fD6QVE8b(( ePaB^>EX>4U6ba`-PAZ2)IW&i+q+U=K3lG`8< zh4-8yN1*>`I1Un`DmTdS^FUZ0dz@4zl|>d7Wk4;|-MkO59gZL0d-#TnifB;toJvX& zmliEt(aG_=&X%IidS1L9;r_uMt_KX0pq2AB9cz4r-R>{AE`R&>Xb-+GKY2M?4{i=+ zL>|%FN^&_8KJB#bLs==+^kF*d!#}0R?n<{=kA2V{hLVVJ% z_m+D<&e>H>0e^C(HL2TFW)A})smgpUp*TKP$)nH<3X35;L6{|^-CQB)K8s}7Xadq?L z?%9jiEPq+E<&-_=Tyia31jm?#l8TpHN~sk=t5*1`7++!7c#};x+tTJ+-pW>YET3I> z+tcoQ-pgJaH)%KmLQBnCZl%?O4lJcZ4?EJ~M?T6?JJwp4uHAa--g7U#Uep%VM{3XH zeou`SHJ+fxIKNYa+5P5%#&KeU8HlkGi2ERb1%J(hS{!1ESzB)lWI`F$oRRkxu{s0flKp zLw`_7Lqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#wWU-X>>%Qhp*mR<6%kydibb$c+6t{Y zm|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3krMxx7Fxu3aNLh~_a1le0HI!H zs@XLTsG4OYV^J}aT@`(=2*8gXjA2${rhgt!EvDf*zV6}S>s^Frxu5%U^eQ=%0UnWf zj_HO)yg@v@Y3ZEzi9@U?Da7Z*qXu1&_>t>!lixTO92R(H$VeyWi9^Iw3au9k0rgF|4XK-udq@Ah~0_J8l0R)0Ut8FI^F*2wk%000JJOGiWi4*&%K0Dai* zMF0Q*32;bRa{vGjVE_ORVF9Q=r)dBH00(qQO+^Re3J3-^F%M53KL7v#FiAu~R9M69 z&OreHFbD*oa|sM)d;=|pA4ouDdvfUIn1FzQfPjF2fPjF2fPjF&2RKs!a1iLA!nXhb N002ovPDHLkV1jc9R|5b5 delta 140 zcmV;70CWGT3c~@ABM<-vVoOIv0RI600RN!9r<0Sp1R!t*3NRS*Vy}V#002-)L_t(o z!((K)BJiI9JMd+oF4&AskcnY{0V7ff_|n<#&4VHYMjgP&a7DmpGzvx?FzSF&2aGyk u)B&Ro7aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ajw3e= z{nsgS1W6P{={VX5)G-SvlvEy760GOzP|!#>|$kbiXU_xpV(R`+;BEZ(Hd{i9)<`j&~A; zt0O$wPjwd6b$@8rQg$#`K9#ztvS&C5lcvKO8Molen9IH^?&6ytKy56>y#b zCu0CHL-Fo*j~l;w-w{$ZHxFjwi>)A6H2;DahMYZd3V(nEJ#EU{zQG-Xf4mG>0)o8F zT%cg{{UFgf+}IB!nMcEG?F%HIQaxtY}OBJSu8{@;FD0O}l{COioK*2zwB#Lb~~`*+OD`q%9dR z+<#tq|KaFtf)`k7nCDoV<>RWW$ZT*T(b1Q&>LOsZ4*B{hw5H#pHY?fZ41aI$_iWtp+Uf_ZEmkmz)vIIUNfC|!BtAXv3CDV zsV73FW!aHvO6fvW?x0xPe|&I{;s^AfKlXao)?u6m}5p@a4p;`${-7ILNawF6)X+%3x0V-KB8PF%J zNs9l7wrYaZQIGPDM#ORl?=*sJ*ndzU=g=Yce+lUjMGT$CP8?{oEbq*x0`{gFxNl03 z4}^|H`AhZbUzX@a1Lod!U|(&(+((_*R~j()t^@n(=-zc;Uv0qL&pNTsHel{u2lmo^ zVEkF3#^0Xyh;jD^%)tNv0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#eZK@wWU-X z>>%Qhp*mR<6%kydibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3 zkrMxx7Fxu3aNLh~_a1le0HI!Hs@XLTsG4OYV^J}aT@`(=2*8gXjA2${rXEi%rr|oi z?&0Ct>!lixTO z92R(H$VeyWi9^I$cx4?6w?xny#cz{s(H3RFmrAN&t~cYkZw3au9k0rgF|4XK-udq@Ah~0_V1Zie?QC_a?4`Y z$o2pL00v@9M??S*05b&u0Dai*MF0Q*32;bRa{vGjVE_ORVF9Q=r)dBH00(qQO+^Re z3J3-^HjyifoB#j-Mv-3@L_H124M_YA5Lt4H#MM>W@Q@WancZ|50lfB<_MPqp6%YUb k0C18K;Jv?q-|)Kt6Pyhcf%wwgv;Y7A07*qoM6N<$f+f98g8%>k delta 126 zcmZ3?x0P{%vH$~HlDE4H!+#K5uy^_7$#dBhlGs?J^&HJ!RWL9xIC;7_hD02GdwnA> zg8~n;<7~ql^=8*NLaiofC@p=E-)Qmf%?vKtij!I;yN$1$nYrfIq!oZV84l9zO^7RPgg&ebxsLQ0JIe_yZ`_I diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/Tutorials.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/Tutorials.kt index b3f5375..cb35da3 100644 --- a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/Tutorials.kt +++ b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/Tutorials.kt @@ -132,6 +132,7 @@ private val useKeyboardDialog = HelperDialog( 400, 300, 550, 300, "You can also use a keyboard.\n" + "Press [RED]M[] for MOV, [RED]I[] for INT\n" + + "[RED]A[] for ADD, [RED]C[] for CMP\n" + "[RED]0[] .. [RED]9[] for digits and\n" + "[RED]A[], [RED]B[], [RED]X[] or [RED]Y[] for the registers" ) diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/editor/Editor.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/editor/Editor.kt index 219db0f..efad32b 100644 --- a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/editor/Editor.kt +++ b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/editor/Editor.kt @@ -248,6 +248,14 @@ class Editor(private val widthInBlocks: Int) { setSymbolUnderCursor("MOV") moveCursorRight() } + in listOf('c', 'C') -> { + setSymbolUnderCursor("CMP") + moveCursorRight() + } + in listOf('a', 'A') -> { + setSymbolUnderCursor("ADD") + moveCursorRight() + } } } } diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/CodeEditorState.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/CodeEditorState.kt index 95cc95e..bf50d09 100644 --- a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/CodeEditorState.kt +++ b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/CodeEditorState.kt @@ -25,8 +25,8 @@ class CodeEditorState : IState { private val inputProcessor = Gdx.input.inputProcessor private lateinit var editor: Editor private var showHelp: Boolean = false - private val cursorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.CURSOR_FRAME), 6, 6, 6, 6) } - private val errorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.ERROR_FRAME), 6, 6, 6, 6) } + private val cursorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.CURSOR_FRAME), 9, 9, 9, 9) } + private val errorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.ERROR_FRAME), 9, 9, 9, 9) } private val buttonPanel = ButtonPanel { instruction: String, update: Boolean -> when { update -> editor.appendNumberUnderCursor(instruction[0]) diff --git a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt index 49d93c8..061672e 100644 --- a/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt +++ b/game/src/main/kotlin/org/catinthedark/jvcrplotter/game/states/PlottingScreenState.kt @@ -40,7 +40,7 @@ class PlottingScreenState : IState { private var errorMessage: String? = "" private lateinit var editor: Editor private val cursorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.LINE_FRAME), 6, 6, 6, 6) } - private val errorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.ERROR_FRAME), 6, 6, 6, 6) } + private val errorFrame: NinePatch by lazy { NinePatch(am.texture(Assets.Names.ERROR_FRAME), 9, 9, 9, 9) } private val font by lazy { am.font(Assets.Names.FONT_BIG_GREEN) } private val editorRender: EditorRender by lazy { EditorRender(