Merge pull request HabitRPG#3449 from deilann/removingthelevelcap

Removing level cap, free rebirth at 100
lacedwithlilacs · May 11, 2014 · de47de0 · de47de0
2 parents ce69b42 + d801ece
commit de47de0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/models/user.js b/src/models/user.js
@@ -108,6 +108,7 @@ var UserSchema = new Schema({
     classSelected: {type: Boolean, 'default': false},
     mathUpdates: Boolean,
     rebirthEnabled: {type: Boolean, 'default': false},
+    freeRebirth: {type: Boolean, 'default': false},
     levelDrops: {type:Schema.Types.Mixed, 'default':{}}
   },
   history: {

diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade
@@ -157,7 +157,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
                     span.Pet_Currency_Gem1x.inline-gems
                 div(ng-show='user.flags.rebirthEnabled')
                   button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='openModal("rebirth")', class='rebirth_orb')
-                  p
+                  p(ng-show='user.stats.lvl < 100')
                     | 8
                     span.Pet_Currency_Gem1x.inline-gems
                 div(ng-if='user.purchased.plan.planId')

diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade
@@ -41,11 +41,22 @@ script(type='text/ng-template', id='modals/rebirth.html')
       =env.t('rebirthEarnAchievement')      
   .modal-footer
     button.btn.btn-default(ng-click='$close()')=env.t('neverMind')
-    span(ng-if='user.balance < 2')
+    span(ng-if='user.balance < 2 && user.stats.lvl < 100')
       a.btn.btn-success(ng-click='openModal("buyGems",{track:"Gems > Rebirth"})')=env.t('buyMoreGems')
       span.gem-cost=env.t('notEnoughGems')
-    span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl')
+    span(ng-if='user.balance >= 2 || user.stats.lvl >= 100', ng-controller='SettingsCtrl')
       a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('beReborn')
       span.gem-cost
         | 8&nbsp;
         =env.t('gems')
+script(type='text/ng-template', id='modals/freeRebirth.html')
+  .modal-header
+    h4=env.t('welcome100')
+    figure
+      .rebirth_orb
+    p=env.t('intro100')
+    p=env.t('followup100')
+    p=env.t('rebirth100Info')
+  .modal-footer
+    button.btn.btn-default(ng-click='$close()')=env.t('rebirthWait')
+    a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('rebirthNow')