Skip to content

Commit

Permalink
Added tomorrow's tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
neauoire committed Aug 1, 2018
1 parent e36c52d commit 35f88d5
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
11 changes: 1 addition & 10 deletions SPRITESHEET.md
Expand Up @@ -21,13 +21,4 @@
- DEATH
- RECOVER
- TAUNT
- STASIS









- STASIS
10 changes: 8 additions & 2 deletions TODO.md
@@ -1,14 +1,18 @@
# TODOs

## Fightland
## Fightlang
- Rename Default, or Any, to Else?
- Add a before-last turn where winner is in taunt status.
- Add a last turn where winner is idle.

## Editor

- Drag and drop runes in list interface.
- Implement player.tp in list editor.
- Update fight style, and re-run battle.

## Interface
- Implement leaderboard/score.

### List Editor

- Remove?
Expand All @@ -33,11 +37,13 @@
- Migrate to canvas?
- Check stasis state.
- Don't animate wait? Maybe display an effect?
- Animate death -> dead status

### Interface

- Camera follows cursor.
- Camera centers on character.
- Migrate camera animation to translate.
- Display health bars.

### Sprites
Expand Down
4 changes: 2 additions & 2 deletions desktop/sources/scripts/editor/code.editor.js
Expand Up @@ -53,8 +53,8 @@ function CodeEditor()
this.highlighter.style.top = `${line * 20}px`
}

this.status = function(history)
this.status = function(state)
{
return ""
return ''
}
}
7 changes: 6 additions & 1 deletion desktop/sources/scripts/editor/editor.js
Expand Up @@ -272,7 +272,12 @@ function Editor()
this.update_status = function(state)
{
var html = this.is_running ? "" : "Idle. "
html += this.history && this.history.length > 0 && this.index > 0 ? `${this.index}/${this.history.length} ` : ''

if(this.is_running && this.history && this.history.length > 0 && this.index > 0 && state){
html += `${this.index}/${this.history.length} `
// html += `<t class='trigger'>${state.reaction.trigger}</t>(<t class='event'>${state.reaction.event}</t>).<t class='condition'>${state.reaction.condition}</t> `
}

html += this.code_editor.status(state)+" "
html += this.rune_editor.status(state)+" "
html += this.list_editor.status(state)+" "
Expand Down

0 comments on commit 35f88d5

Please sign in to comment.