diff --git a/app/styles/play/level/tome/debug.sass b/app/styles/play/level/tome/debug.sass index 99f9fa378..91b0b0b21 100644 --- a/app/styles/play/level/tome/debug.sass +++ b/app/styles/play/level/tome/debug.sass @@ -9,7 +9,4 @@ background-size: 100% 100% border: 0 @include box-shadow(0 0 0 #000) - - h3 - color: red diff --git a/app/styles/play/level/tome/spell.sass b/app/styles/play/level/tome/spell.sass index 0ff18cf23..e7da541eb 100644 --- a/app/styles/play/level/tome/spell.sass +++ b/app/styles/play/level/tome/spell.sass @@ -75,11 +75,7 @@ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDowMjgwMTE3NDA3MjA2ODExOEE2REU4Q0M1MTM1MkIxRiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpBQjVEQUNDMzQ4RUIxMUUxOEVGRUUyNzFENDM3RDVFMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpBQjVEQUNDMjQ4RUIxMUUxOEVGRUUyNzFENDM3RDVFMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTU1MjE3RDIzMTIwNjgxMThEQkI4NTlBMjQ1QTEwOTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDI4MDExNzQwNzIwNjgxMThBNkRFOENDNTEzNTJCMUYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7SazaGAAAAiElEQVR42mL8//8/AzUBEwOVweA3kAWboI2jCyhgDwBx4ZH9ey5Qy4UOQHweaHg/EAtQ08sFUIMDqBmGCkC8HmgoCCtQM1ICoK5toGYsg8KzHmjo+UGbDj8AcSMwORkSnQ7xgA3QtPmApISNBTyAGrSBGl6eAMSGxBhGyIVkZT3G0fKQYgAQYACL+C2ZM6PC7AAAAABJRU5ErkJggg==) background-position: 0px center - //.user-code-problem - //.ace_scroller - // background-color: #470000 - .ace_marker-layer .ace_bracket // Override faint gray - border-color: #0FF + border-color: #8FF diff --git a/app/templates/play/level/tome/debug.jade b/app/templates/play/level/tome/debug.jade index ddceb13ff..3bdec800a 100644 --- a/app/templates/play/level/tome/debug.jade +++ b/app/templates/play/level/tome/debug.jade @@ -1 +1 @@ -h3 a debug view \ No newline at end of file +code a debug view \ No newline at end of file diff --git a/app/views/play/level/tome/debug_view.coffee b/app/views/play/level/tome/debug_view.coffee index c586d2048..2c19c9283 100644 --- a/app/views/play/level/tome/debug_view.coffee +++ b/app/views/play/level/tome/debug_view.coffee @@ -1,5 +1,6 @@ View = require 'views/kinds/CocoView' template = require 'templates/play/level/tome/debug' +Range = ace.require("ace/range").Range module.exports = class DebugView extends View className: 'tome-debug-view' @@ -27,17 +28,27 @@ module.exports = class DebugView extends View if token?.type is 'identifier' and token.value of @variableStates @variable = token.value @pos = {left: e.domEvent.offsetX + 50, top: e.domEvent.offsetY + 10} + @markerRange = new Range pos.row, token.start, pos.row, token.start + token.value.length else @variable = null + @markerRange = null @update() update: -> if @variable value = @variableStates[@variable] - @$el.find("h3").text "#{@variable}: #{value}" + @$el.find("code").text "#{@variable}: #{value}" @$el.show().css(@pos) else @$el.hide() + @updateMarker() + + updateMarker: -> + if @marker + @ace.getSession().removeMarker @marker + @marker = null + if @markerRange + @marker = @ace.getSession().addMarker @markerRange, "ace_bracket", "text" destroy: -> super() diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee index c77b472be..5a6cb7df4 100644 --- a/app/views/play/level/tome/spell.coffee +++ b/app/views/play/level/tome/spell.coffee @@ -64,10 +64,13 @@ module.exports = class Spell functionParameters: @parameters yieldConditionally: thang.plan? requiresThis: thang.requiresThis - includeFlow: true - if @name is 'chooseAction' or not (me.team in @permissions.readwrite) or thang.id is 'Thoktar' # Gridmancer can't handle it - #console.log "Turning off includeFlow for", @spellKey - aetherOptions.includeFlow = false + includeFlow: + callIndex: 9001 + #timelessVariables: ['i'] + #statementIndex: 9001 + #if @name is 'chooseAction' or not (me.team in @permissions.readwrite) or thang.id is 'Thoktar' # Gridmancer can't handle it + # #console.log "Turning off includeFlow for", @spellKey + # aetherOptions.includeFlow = false aether = new Aether aetherOptions aether