diff --git a/game/assets/textures/frame_9.png b/game/assets/textures/frame_9.png index 1f74456..f0acecc 100644 Binary files a/game/assets/textures/frame_9.png and b/game/assets/textures/frame_9.png differ diff --git a/game/assets/textures/frame_line_9.png b/game/assets/textures/frame_line_9.png index 124ac7e..cc87f04 100644 Binary files a/game/assets/textures/frame_line_9.png and b/game/assets/textures/frame_line_9.png differ diff --git a/game/assets/textures/frame_red_9.png b/game/assets/textures/frame_red_9.png index 8cb5fd2..286b80b 100644 Binary files a/game/assets/textures/frame_red_9.png and b/game/assets/textures/frame_red_9.png differ 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(