From da72991260970194c38f3558acb7bdba1c94e4fa Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 17 Dec 2014 12:42:36 -0800 Subject: [PATCH] A few misc tweaks for the new desert level options. --- app/lib/LevelOptions.coffee | 8 ++++---- app/lib/world/GoalManager.coffee | 2 +- app/views/play/WorldMapView.coffee | 21 +++++++-------------- app/views/play/menu/InventoryModal.coffee | 2 +- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/lib/LevelOptions.coffee b/app/lib/LevelOptions.coffee index a167745cf..ac3b0c050 100644 --- a/app/lib/LevelOptions.coffee +++ b/app/lib/LevelOptions.coffee @@ -315,14 +315,14 @@ module.exports = LevelOptions = requiredGear: {} restrictedGear: {} 'sarven-gaps': - requiredGear: {} + requiredGear: {'right-hand': 'crude-builders-hammer'} restrictedGear: {} 'thunderhooves': - requiredGear: {} + requiredGear: {'right-hand': 'crude-builders-hammer'} restrictedGear: {} 'medical-attention': - #requiredGear: {neck: 'polished-sense-stone'} # We don't have a way to require players to buy it yet. - restrictedGear: {} + requiredGear: {'right-hand': 'long-sword'}, #neck: 'polished-sense-stone'} # We don't have a way to require players to buy it yet. + restrictedGear: {'right-hand': 'crude-builders-hammer'} 'minesweeper': requiredGear: {} restrictedGear: {} diff --git a/app/lib/world/GoalManager.coffee b/app/lib/world/GoalManager.coffee index a9c933221..abef73901 100644 --- a/app/lib/world/GoalManager.coffee +++ b/app/lib/world/GoalManager.coffee @@ -278,7 +278,7 @@ module.exports = class GoalManager extends CocoClass # saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be 'done' numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1 numDone = _.filter(stateThangs).length - #console.log 'needed', numNeeded, 'done', numDone, 'of total', _.size(stateThangs), 'with how many', goal.howMany, 'and stateThangs', stateThangs, 'for', goalID, thangID, 'on frame', frameNumber + #console.log 'needed', numNeeded, 'done', numDone, 'of total', _.size(stateThangs), 'with how many', goal.howMany, 'and stateThangs', stateThangs, 'for', goalID, thangID, 'on frame', frameNumber, 'all Thangs', _.keys(stateThangs), _.values(stateThangs) return unless numDone >= numNeeded return if state.status and not success # already failed it; don't wipe keyframe state.status = if success then 'success' else 'failure' diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee index dd776dca7..489ccae03 100644 --- a/app/views/play/WorldMapView.coffee +++ b/app/views/play/WorldMapView.coffee @@ -629,6 +629,7 @@ dungeon = [ description: 'Stay alive longer than your opponent amidst hordes of ogres!' x: 17.54 y: 78.39 + adventurer: true } ] @@ -665,8 +666,7 @@ forest = [ continue: 'thornbush-farm' x: 34 y: 25 - adventurer: true - } + } { name: 'Endangered Burl' type: 'hero' @@ -929,7 +929,6 @@ forest = [ continue: 'the-dunes' x: 85.5 y: 83.5 - adventurer: true } { name: 'Multiplayer Treasure Grove' @@ -963,7 +962,6 @@ desert = [ continue: 'the-mighty-sand-yak' x: 8.47 y: 21.93 - adventurer: true requiresSubscription: true } { @@ -976,7 +974,6 @@ desert = [ continue: 'oasis' x: 16.56 y: 27.77 - adventurer: true requiresSubscription: false } { @@ -989,7 +986,6 @@ desert = [ continue: 'sarven-road' x: 23.35 y: 31.60 - adventurer: true requiresSubscription: false } { @@ -997,21 +993,20 @@ desert = [ type: 'hero' id: 'sarven-road' original: '548c82360ffdc235e80ef04b' - description: 'Coming Soon' + description: 'Watch out for ogre scouts on the road as you search for water.' nextLevels: continue: 'sarven-gaps' x: 28.36 y: 24.59 adventurer: true requiresSubscription: false - disabled: not me.isAdmin() } { name: 'Sarven Gaps' type: 'hero' id: 'sarven-gaps' original: '548c8f4a0ffdc235e80ef0a8' - description: 'Coming Soon' + description: 'Keep the oasis safe by building fences to hold back the enemy.' nextLevels: continue: 'thunderhooves' x: 21.13 @@ -1024,35 +1019,33 @@ desert = [ type: 'hero' id: 'thunderhooves' original: '548c90020ffdc235e80ef0ad' - description: 'Coming Soon' + description: 'Fence off the stampeding sand yaks to reach the next watering hole.' nextLevels: continue: 'medical-attention' x: 35.08 y: 20.48 adventurer: true requiresSubscription: false - disabled: not me.isAdmin() } { name: 'Medical Attention' type: 'hero' id: 'medical-attention' original: '548ce3300ffdc235e80ef0b2' - description: 'Coming Soon' + description: 'Get help from a helpful wizard while you fend off an ogre attack.' nextLevels: continue: 'minesweeper' x: 42.84 y: 21.82 adventurer: true requiresSubscription: false - disabled: not me.isAdmin() } { name: 'Minesweeper' type: 'hero' id: 'minesweeper' original: '5490cb7c623b972aa26b25a3' - description: 'Coming Soon' + description: 'Lead a band of hapless peasants through a treacherous canyon while you heroically trigger the mines.' nextLevels: continue: 'sarven-sentry' x: 47.64 diff --git a/app/views/play/menu/InventoryModal.coffee b/app/views/play/menu/InventoryModal.coffee index fe1b44441..7a231b982 100644 --- a/app/views/play/menu/InventoryModal.coffee +++ b/app/views/play/menu/InventoryModal.coffee @@ -382,7 +382,7 @@ module.exports = class InventoryModal extends ModalView for slot, item of requiredGear if (slot in ['right-hand', 'left-hand', 'head', 'torso']) and not (heroClass is 'Warrior' or (heroClass is 'Ranger' and @options.levelID in ['swift-dagger', 'shrapnel']) or - (heroClass is 'Wizard' and @options.levelID in ['touch-of-death', 'bonemender'])) + (heroClass is 'Wizard' and @options.levelID in ['touch-of-death', 'bonemender'])) and item isnt 'crude-builders-hammer' # After they switch to a ranger or wizard, we stop being so finicky about class-specific gear. continue continue if item is 'tarnished-bronze-breastplate' and inWorldMap and @options.levelID is 'the-raised-sword' # Don't tell them they need it until they need it in the level