Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking.

This commit is contained in:
Nick Winter 2014-05-23 12:04:42 -07:00
parent ff171588d9
commit 690fbc6919
3 changed files with 5 additions and 4 deletions

View file

@ -576,7 +576,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
@marks[range['name']].toggle false for range in @ranges
if @thangType.get('name') in ['Arrow', 'Spear'] and @thang.action is 'die'
@marks.shadow.hide()
@marks.shadow?.hide()
mark.update() for name, mark of @marks
#@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'haste']
@updateEffectMarks() if @thang?.effectNames?.length or @previousEffectNames?.length

View file

@ -52,6 +52,7 @@ module.exports = class LadderTabView extends CocoView
@fbStatusRes.load()
FB.getLoginStatus (response) =>
return if @destroyed
@facebookStatus = response.status
@loadFacebookFriends() if @facebookStatus is 'connected'
@fbStatusRes.markLoaded()

View file

@ -25,7 +25,7 @@ module.exports = class Spell
teamSpells = @session.get('teamSpells')
team = @session.get('team') ? 'humans'
@useTranspiledCode = @permissions.readwrite.length and ((teamSpells and not _.contains(teamSpells[team], @spellKey)) or (@session.get('creator') isnt me.id) or @spectateView)
console.log @spellKey, "using transpiled code?", @useTranspiledCode
#console.log @spellKey, "using transpiled code?", @useTranspiledCode
@source = @originalSource = p.source
@parameters = p.parameters
if @permissions.readwrite.length and sessionSource = @session.getSourceFor(@spellKey)
@ -73,12 +73,12 @@ module.exports = class Spell
transpiledCode = @session.get('code')
for thangID, spellThang of @thangs
unless pure
if @useTranspiledCode and transpiledSpell = transpiledCode[_.string.slugify thangID]?[@name]
if @useTranspiledCode and transpiledSpell = transpiledCode[@spellKey.split('/')[0]]?[@name]
spellThang.aether.pure = transpiledSpell
else
pure = spellThang.aether.transpile source
problems = spellThang.aether.problems
#console.log "aether transpiled", source.length, "to", pure.length, "for", thangID, @spellKey
#console.log "aether transpiled", source.length, "to", spellThang.aether.pure.length, "for", thangID, @spellKey
else
spellThang.aether.pure = pure
spellThang.aether.problems = problems