Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-12-05 18:29:20 -08:00
commit 42a0b2c4ce

View file

@ -353,7 +353,6 @@ dungeon = [
y: 15.5 y: 15.5
nextLevels: nextLevels:
continue: 'gems-in-the-deep' continue: 'gems-in-the-deep'
skip_ahead: 'shadow-guard'
} }
{ {
name: 'Gems in the Deep' name: 'Gems in the Deep'
@ -365,7 +364,6 @@ dungeon = [
y: 12 y: 12
nextLevels: nextLevels:
continue: 'shadow-guard' continue: 'shadow-guard'
skip_ahead: 'forgetful-gemsmith'
} }
{ {
name: 'Shadow Guard' name: 'Shadow Guard'
@ -376,7 +374,6 @@ dungeon = [
x: 40.54 x: 40.54
y: 11.03 y: 11.03
nextLevels: nextLevels:
more_practice: 'kounter-kithwise'
continue: 'forgetful-gemsmith' continue: 'forgetful-gemsmith'
} }
{ {
@ -425,7 +422,6 @@ dungeon = [
x: 68.44 x: 68.44
y: 10.70 y: 10.70
nextLevels: nextLevels:
more_practice: 'favorable-odds'
continue: 'the-raised-sword' continue: 'the-raised-sword'
} }
{ {
@ -461,8 +457,7 @@ dungeon = [
x: 78 x: 78
y: 29 y: 29
nextLevels: nextLevels:
more_practice: 'descending-further' continue: 'descending-further'
continue: 'the-second-kithmaze'
} }
{ {
name: 'Riddling Kithmaze' name: 'Riddling Kithmaze'
@ -473,8 +468,7 @@ dungeon = [
x: 69.97 x: 69.97
y: 28.03 y: 28.03
nextLevels: nextLevels:
more_practice: 'descending-further' continue: 'descending-further'
continue: 'the-second-kithmaze'
practice: true practice: true
requiresSubscription: true requiresSubscription: true
} }
@ -555,7 +549,6 @@ dungeon = [
x: 93 x: 93
y: 47 y: 47
nextLevels: nextLevels:
more_practice: 'tactical-strike'
continue: 'the-final-kithmaze' continue: 'the-final-kithmaze'
} }
{ {
@ -580,7 +573,6 @@ dungeon = [
x: 86.95 x: 86.95
y: 64.70 y: 64.70
nextLevels: nextLevels:
more_practice: 'the-gauntlet'
continue: 'kithgard-gates' continue: 'kithgard-gates'
} }
{ {
@ -648,7 +640,7 @@ forest = [
original: '546e97033f1c1c1be898402b' original: '546e97033f1c1c1be898402b'
description: 'Hunt ogres in the woods, but watch out for lumbering beasts.' description: 'Hunt ogres in the woods, but watch out for lumbering beasts.'
nextLevels: nextLevels:
continue: 'village-guard' continue: 'thornbush-farm'
x: 29 x: 29
y: 35 y: 35
} }