From 6f051ad621811fc80ff828bf34258d958588752b Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 27 Aug 2016 00:43:10 -0600 Subject: [PATCH] Intro text now displays when player sees home.html for first time TODO: rewrite the intro text, it's kinda crappy --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.13/taskArtifacts/fileHashes.bin | Bin 159445 -> 159445 bytes .../2.13/taskArtifacts/fileSnapshots.bin | Bin 4339306 -> 4339306 bytes .../2.13/taskArtifacts/taskArtifacts.bin | Bin 197279 -> 197279 bytes platforms/android/assets/www/js/main.js | 7 +------ .../android/assets/www/screens/home.html | 12 +++++++++--- .../android/assets/www/screens/intro.html | 2 +- .../android/assets/www/screens/settings.html | 4 ++-- www/js/main.js | 7 +------ www/screens/home.html | 12 +++++++++--- www/screens/intro.html | 6 +++++- 11 files changed, 28 insertions(+), 22 deletions(-) diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 21ec9bc5615a2610bdde54ba1f823627235f3401..221f1027be0616f351ad33ccbc800046b1941e5e 100644 GIT binary patch literal 17 VcmZQ>a$9jsqWiTJ0~qLT0{}7o1jPUV literal 17 VcmZQ>a$9jsqWiTJ0~qK!0RSR?51iv{E+Cx(e{_ljf`mSF~pPEROh%mFdBpD$(n#E5VquhL}wG|B1p zNlYT!f0i?b&c@+R_5u`la%(V(PM;;r6ph2NFy(k1d*BAdOo(HrzXF=My;6k9i;deJ zCS`tj`i5hS65F3iF|~;^1BJKe8!@RGfLPQ2mNS~LoC2}VCo#z@#2i@t#5S=+pk>F8 zpt4EZUqAu`YLIETAK0I_Dj7w#TPHJpXH`-Z@Cq!STfpC&oIK8Z0E8j1t?Q zNinsFGXsUU=NmDp8h}{S|CTeFu$%(1&L=U+Ddf4nTXN%UPkA>)dY!3i0hrGnrhOn9WlxroYW*3RO}Ru$8`+xjSK3-i+Vh k**-p0PDPCZN&D&ZOBp2;u&aWFi=;is&D*!;Fexwr0Qj)9YXATM diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 60369df6a2c8fa23bacd26c482cd0d1c0942f5e6..112e9ccb47969c5b6dd3a6a5353fc0a5ef8e336c 100644 GIT binary patch delta 2540 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 ZsbO~v7K_DUIxHSb!1SnLcjBdi{{Y3e0q+0+ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index deec893ed9b2dd643d66e26dbb7a900c2f0bc9ac..245615aa8a6063fd6f7e442b1c442a4ddf8a75db 100644 GIT binary patch delta 435 zcmbQ=$}_)}XM<+C#NE7b<+vn&f#C9|-&jsxzatvV-tETwRd2Inx<8}D%wFy}4aZd{ zhUL6?eMxt%+zH2(jaIDdD#5awHPh1>CpQGKZBEHHHIfi*QT=sme(q7rHZhJ>aaqT= zv~Nk^`2IP0^2WJ~B(kz5K9#)sq3_SCrMs5LHw(!3PxvF=Rw4tEoIG>xuIA(Ow;!L+ zxRObt+b(*|;@I`d@uwH>zpJMi#Ky`ZXg_7fhshVi6()bUue{x02_p-m9NXUNnbY}i zZi$xP{E%n=lg*n$g#VS?7TmhSeVwTJ1XRUrY>VYP>Wa1(EMiP$Y@ff3ar^vbOi#om z!k zM)N*io~-!ZVSD5)rkN}fyKYKc_gO7^;p4%(5B082%)32v&Rch;C9e@mw##2&`p7c* O-A%UbKkhLtR|Wt|e95!` delta 415 zcmbQ=$}_)}XM<+?=I@#5j1r&x`4;xMf7rQp+08doMVqg6H8<*=wq?A$*)iRpQR4R= zOR1l`c3slX@MC&7J5+6v!p?>JV_!c8%T8_xV%waOZE7@`cm6I3pKiU~y$=>f)hzh= zP%B9F(^Hj*ExPJDA0}^{yGUaG|4W;fPZMI9%rWbhO4x%nd8w9_4}Y%-2T3*`pTGV1 ze8!bb+pU%|rZP&XmuzWXl=gD1CAYhmrX^^XZ0r8Qr$`pJJ+Hl~}iW|AL~o zElRJ?mMqBHtZgZ-xO;-y!k@F@Y9_F5XS~Jqkws#O+$-<%p%rD`Rkz%V4!>WpSFw@( x;z8jblNH}PY>&LfG?PU_!DwQ_+OYaZ&l}fgI<|d`JEyELeMgkSAD9w14FJtw#_Iq8 diff --git a/platforms/android/assets/www/js/main.js b/platforms/android/assets/www/js/main.js index d79b313..2c3ff84 100644 --- a/platforms/android/assets/www/js/main.js +++ b/platforms/android/assets/www/js/main.js @@ -197,9 +197,4 @@ document.addEventListener("backbutton", function (event) { } else if ($('#chatmsgs').css('display') !== 'none') { toggleChat(); } -}, false); -// Show the rules -if (localStorage.getItem("seenintro") !== 'yes') { - openIntro(); - localStorage.setItem("seenintro", 'yes'); -} \ No newline at end of file +}, false); \ No newline at end of file diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index 3b3f918..549468a 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -89,7 +89,7 @@ $('#found-box').fadeOut('slow'); }, 5000); } - + function showFoundBox2(title, text, title2, text2) { $('#found-box-title-1').text(title); $('#found-box-text-1').text(text); @@ -104,10 +104,16 @@ $('#found-box').click(function (e) { $('#found-box').fadeOut('fast'); }); - + $('#found-box-2').click(function (e) { $('#found-box').fadeOut('fast'); }); - \ No newline at end of file + + \ No newline at end of file diff --git a/platforms/android/assets/www/screens/intro.html b/platforms/android/assets/www/screens/intro.html index faa20fc..f6276e8 100644 --- a/platforms/android/assets/www/screens/intro.html +++ b/platforms/android/assets/www/screens/intro.html @@ -27,7 +27,7 @@
- +
diff --git a/platforms/android/assets/www/screens/settings.html b/platforms/android/assets/www/screens/settings.html index 8a6c8fb..63349a4 100644 --- a/platforms/android/assets/www/screens/settings.html +++ b/platforms/android/assets/www/screens/settings.html @@ -6,11 +6,11 @@
Show Rules
-
+
Logout from app
diff --git a/www/js/main.js b/www/js/main.js index d79b313..2c3ff84 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -197,9 +197,4 @@ document.addEventListener("backbutton", function (event) { } else if ($('#chatmsgs').css('display') !== 'none') { toggleChat(); } -}, false); -// Show the rules -if (localStorage.getItem("seenintro") !== 'yes') { - openIntro(); - localStorage.setItem("seenintro", 'yes'); -} \ No newline at end of file +}, false); \ No newline at end of file diff --git a/www/screens/home.html b/www/screens/home.html index 3b3f918..549468a 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -89,7 +89,7 @@ $('#found-box').fadeOut('slow'); }, 5000); } - + function showFoundBox2(title, text, title2, text2) { $('#found-box-title-1').text(title); $('#found-box-text-1').text(text); @@ -104,10 +104,16 @@ $('#found-box').click(function (e) { $('#found-box').fadeOut('fast'); }); - + $('#found-box-2').click(function (e) { $('#found-box').fadeOut('fast'); }); - \ No newline at end of file + + \ No newline at end of file diff --git a/www/screens/intro.html b/www/screens/intro.html index faa20fc..25883a8 100644 --- a/www/screens/intro.html +++ b/www/screens/intro.html @@ -6,6 +6,7 @@
+

There are seven types of magic in this world. Six elements of nature: water, fire, earth, wind, light, and dark. There is also a seventh element: life. Life is the source of all magical power.

Long ago, the wielders of the six elements were united as one. The magics were harnessed with responsibility and respect.

Then disagreement and discord arose. Some become jealous of others. A great war followed, destroying much life. As a result of this bloodshed, the magic wilted and died.

@@ -13,8 +14,10 @@

Now, however, the world has come full circle. Science has become magic in a different form. The new sorcerers, scientists, harness the powers of the elements with their modern tools. They know little, but the whispers of ancient power has influenced their actions.

The old is become new. Magic is real, it only seems different. Control the elements and bring peace to the Earth. Channel the powers of magic through your smartphone or tablet. It is up to you to give your technology a true purpose. There are those who do not want unity, who thrive in chaos. They are all the more reason to go out and fight.

Will you join the quest?

+
- +