Health

DancingBanana · Dec 1, 2012 · 0520705 · 0520705
1 parent 3853821
commit 0520705
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/public/coffee/models/Character.coffee b/public/coffee/models/Character.coffee
@@ -139,6 +139,7 @@ define ['cs!models/DynamicEntity', 'image!/img/character.png'], (DynamicEntity,
  @unlockCharacter()
  @canvas.trigger 'attack.soundOff'
  return
+ if @health? and not @actionLock then @health = @health + target.length
  @lockCharacter()
  target[0].$wrapper?.setAction 'disintegrate'
 
@@ -154,6 +155,7 @@ define ['cs!models/DynamicEntity', 'image!/img/character.png'], (DynamicEntity,
  @unlockCharacter()
  @canvas.trigger 'attack.soundOff'
  return
+ if @health? and not @actionLock then @health = @health + target.length
  @lockCharacter()
  target[0].$wrapper.setAction 'disintegrate'
 
@@ -177,6 +179,8 @@ define ['cs!models/DynamicEntity', 'image!/img/character.png'], (DynamicEntity,
  if @frame > 10
  @createClone()
  @unlockCharacter()
+ if @health? then @health = @health - 1
+ console.log @health
  @setAction @previousAction
 
  onImpact: =>

diff --git a/public/coffee/models/PlayableCharacter.coffee b/public/coffee/models/PlayableCharacter.coffee
@@ -3,6 +3,7 @@ define ['cs!models/Character', 'cs!models/CloneCharacter'], (Character, CloneCha
  class PlayableCharacter extends Character
 
  planted: false
+ health: 5
 
  constructor: (@world, @overrides = {}) ->
  @overrides.name = 'player'
@@ -39,6 +40,7 @@ define ['cs!models/Character', 'cs!models/CloneCharacter'], (Character, CloneCha
  # Clone Action
  if e.keyCode is 67
  if @actionLock then return
+ return unless @health > 1
  @setAction 'clone'
  @canvas.trigger 'clone.sound'
  return false