Don't point out Lost Viking, since most players shouldn't attempt it. Adjust autocomplete default parameter from string to variable for Known Enemy.

This commit is contained in:
Nick Winter 2015-04-18 14:13:05 -07:00
parent 1952a8ea23
commit ea80e22dc6
2 changed files with 3 additions and 2 deletions

View file

@ -302,7 +302,7 @@ module.exports = class CampaignView extends RootView
unless foundNext unless foundNext
for nextLevelOriginal in level.nextLevels for nextLevelOriginal in level.nextLevels
nextLevel = _.find levels, original: nextLevelOriginal nextLevel = _.find levels, original: nextLevelOriginal
if nextLevel and not nextLevel.locked and @levelStatusMap[nextLevel.slug] isnt 'complete' and ( if nextLevel and not nextLevel.locked and @levelStatusMap[nextLevel.slug] isnt 'complete' and nextLevel.slug isnt 'lost-viking' and (
me.isPremium() or me.isPremium() or
not nextLevel.requiresSubscription or not nextLevel.requiresSubscription or
nextLevel.slug is 'apocalypse' or nextLevel.slug is 'apocalypse' or

View file

@ -446,8 +446,9 @@ module.exports = class SpellView extends CocoView
# 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 unless haveFindNearestEnemy or haveFindNearest or @options.level.get('slug') is '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).)
attackEntry.content = attackEntry.content.replace '${1:enemy}', '"${1:Enemy Name}"' attackEntry.content = attackEntry.content.replace '${1:enemy}', '"${1:Enemy Name}"'
snippetEntries.push attackEntry snippetEntries.push attackEntry