codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 08:41:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Rob 2016-07-05 12:35:30 -07:00
commit 22efc269b5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/play/level/tome/editor/zatanna.coffee
View file

@ -316,7 +316,7 @@ module.exports = class Zatanna
# TODO: Generalize this snippet replacement # TODO: Generalize this snippet replacement
# TODO: Where should this logic live, and what format should it be in? # TODO: Where should this logic live, and what format should it be in?
if attackEntry? if attackEntry?
unless haveFindNearestEnemy or haveFindNearest or @options.level.get('slug') in ['known-enemy', 'course-known-enemy'] unless haveFindNearestEnemy or haveFindNearest or level.get('slug') in ['known-enemy', 'course-known-enemy']
# No findNearestEnemy, so update attack snippet to string-based target # No findNearestEnemy, so update attack snippet to string-based target
# (On Known Enemy, we are introducing enemy2 = "Gert", so we want them to do attack(enemy2).) # (On Known Enemy, we are introducing enemy2 = "Gert", so we want them to do attack(enemy2).)
attackEntry.content = attackEntry.content.replace '${1:enemy}', '"${1:Enemy Name}"' attackEntry.content = attackEntry.content.replace '${1:enemy}', '"${1:Enemy Name}"'