From c4012ad762629faa60e3628eeb35784fbd904ae7 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Thu, 27 Aug 2015 16:04:59 -0400
Subject: [PATCH] WIP(tutorial): New intro splash

---
 common/locales/en/npc.json               | 13 ++++---
 website/views/shared/modals/welcome.jade | 45 ++++++++++++++++--------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/common/locales/en/npc.json b/common/locales/en/npc.json
index 796eac5d6b..94af730f35 100644
--- a/common/locales/en/npc.json
+++ b/common/locales/en/npc.json
@@ -78,11 +78,14 @@
     "tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
     "tourRewardsProceed": "That's all!",
 
-    "welcomeToHabit": "Welcome to Habitica, a game to improve your life!",
-    "welcome1": "Create and customize an in-game avatar to represent you.",
-    "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
-    "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+    "welcomeToHabit": "Welcome to Habitica!",
+    "welcome1": "Create a basic avatar.",
+    "welcome1notes": "This avatar will represent you as you progress.",
+    "welcome2": "Set up your tasks.",
+    "welcome2notes": "How well you do on your real-life tasks will control how well you do in the game!",
+    "welcome3": "Progress in life and the game!",
+    "welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
     "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
     "welcome5": "Now you'll customize your avatar and set up your tasks...",
-    "imReady": "I'm Ready!"
+    "imReady": "Enter Habitica"
 }
diff --git a/website/views/shared/modals/welcome.jade b/website/views/shared/modals/welcome.jade
index bf8fe48dd1..b2bf89aa96 100644
--- a/website/views/shared/modals/welcome.jade
+++ b/website/views/shared/modals/welcome.jade
@@ -1,18 +1,33 @@
 // Created by sabrecat on 5/18/15.
 
 script(type='text/ng-template', id='modals/welcome.html')
-   .modal-header
-      h4=env.t('welcomeToHabit')
-   .modal-body.text-center
-      h4=env.t('welcome1')
-      .welcome_to_Habit_1.center-block
-      h4=env.t('welcome2')
-      .welcome_to_Habit_2.center-block
-      h4=env.t('welcome3')
-      .welcome_to_Habit_3.center-block
-      h4=env.t('welcome4')
-      .welcome_to_Habit_4.center-block
-   .modal-footer
-      span.h4=env.t('welcome5')
-      |&nbsp;
-      span.button.btn.btn-primary(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
\ No newline at end of file
+  .modal-header.text-center
+    h1=env.t('welcomeToHabit')
+  .modal-body
+    .container-fluid
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | &#9312;
+          h3(style='margin:auto auto auto .5em')=env.t('welcome1')
+        .welcome_basic_avatars
+        h4=env.t('welcome1notes')
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | &#9313;
+          h3(style='margin:.3em auto 1em .5em')=env.t('welcome2')
+        .welcome_sample_tasks
+        h4=env.t('welcome2notes')
+      .col-sm-4.col-centered
+        span(style='display:flex')
+          h1
+            | &#9314;
+          h3(style='margin:auto auto 1em .5em')=env.t('welcome3')
+        .welcome_promo_party
+        h4=env.t('welcome3notes')
+  .modal-footer.text-center
+    .col-sm-3
+    .col-sm-6
+      a.btn.btn-primary.btn-lg.flex-column(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
+    .col-sm-3