From 4746cea675bbdcbdaedf6e9a2ae17c4a81c83fee Mon Sep 17 00:00:00 2001
From: Eric Fredricksen <e@fredricksen.net>
Date: Fri, 16 Jul 2010 14:12:57 -0700
Subject: [PATCH] Moved cheats aside and finalize nav links. Moved to
 pq.com/insitu/.

---
 cheat.js    | 74 +++++++++++++++++++++++++++++++++++++++++++++++
 index.html  |  3 ++
 main.js     | 82 -----------------------------------------------------
 newguy.js   |  7 ++---
 publish.py  |  3 +-
 roster.html | 10 +++----
 sim.js      |  2 +-
 7 files changed, 85 insertions(+), 96 deletions(-)
 create mode 100644 cheat.js
diff --git a/cheat.js b/cheat.js
new file mode 100644
index 0000000..96a3087
--- /dev/null
+++ b/cheat.js
@@ -0,0 +1,74 @@
+function Cheats() {
+  if ($(".cheater").length) return;
+
+  function cheat(label, effect) {
+    $("<button/>", {
+      "class": "cheater",
+      text: label,
+      click: effect}).appendTo('body');
+  }
+
+  cheat("Task", function () {
+    TaskBar.reposition(TaskBar.Max());
+  });
+
+  cheat("Level", function () {
+    LevelUp();
+  });
+
+  cheat("Quest", function () {
+    QuestBar.reposition(QuestBar.Max());
+    TaskBar.reposition(TaskBar.Max());
+  });
+
+  cheat("Plot", function () {
+    PlotBar.reposition(PlotBar.Max());
+    TaskBar.reposition(TaskBar.Max());
+  });
+
+
+  cheat("Pause", function () {
+    if (timerid) {
+      StopTimer();
+    } else {
+      StartTimer();
+    }
+  });
+
+  cheat("Break", function () {
+    debugger;
+  });
+  cheat("Equip", function () {
+    WinEquip();
+  });
+
+  cheat("Item", function () {
+    WinItem();
+  });
+
+  cheat("Clear items", function () {
+    while (Inventory.length() > 1)
+      Inventory.remove1();
+  });
+
+  cheat("Spell", function () {
+    WinSpell();
+  });
+
+  cheat("Stat", function () {
+    WinStat();
+  });
+
+  cheat("$$$", function () {
+    Add(Inventory,'Gold',Random(100));
+  });
+
+  cheat("Save", function () {
+    SaveGame();
+    alert(JSON.stringify(game).length);
+  });
+
+  cheat("Quit", quit);
+
+}
+
diff --git a/index.html b/index.html
index 99910e5..2fe7283 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,9 @@ font-size: 30pt;
 
 <body>
 
+<a href="/">
 <img src="pq.gif" alt="Progress Quest">
+</a>
 
 <h1>Progress Quest in Your Browser</h1>
 
@@ -78,6 +80,7 @@ Fame yet. If anyone cares, that will come later.
   <a href="/">Home</a> &middot;
   <a href="/info.php">Info</a> &middot;
   <a href="/faq.php">FAQ</a> &middot;
+  <a href="/insitu/">Play</a> &middot;
   <a href="/dl.php">Download</a> &middot;
   <a href="/realms.php">Realms</a> &middot;
   <a href="/acct.php">Accounts</a> &middot;
diff --git a/main.js b/main.js
index d584dd3..cf11fc2 100644
--- a/main.js
+++ b/main.js
@@ -993,87 +993,9 @@ function LoadCharacter() {
 
   if (document)
     $("#title").text("Progress Quest - " + GameSaveName());
-
-  if (window.location.href.indexOf("?quit#") > 0)
-    quit();  // TODO: cheesy
 }
 
 
-
-function Cheats() {
-  if ($(".cheater").length) return;
-
-  function cheat(label, effect) {
-    $("<button/>", {
-      "class": "cheater",
-      text: label,
-      click: effect}).appendTo('body');
-  }
-
-  cheat("Task", function () {
-    TaskBar.reposition(TaskBar.Max());
-  });
-
-  cheat("Level", function () {
-    LevelUp();
-  });
-
-  cheat("Quest", function () {
-    QuestBar.reposition(QuestBar.Max());
-    TaskBar.reposition(TaskBar.Max());
-  });
-
-  cheat("Plot", function () {
-    PlotBar.reposition(PlotBar.Max());
-    TaskBar.reposition(TaskBar.Max());
-  });
-
-
-  cheat("Pause", function () {
-    if (timerid) {
-      StopTimer();
-    } else {
-      StartTimer();
-    }
-  });
-
-  cheat("Break", function () {
-    debugger;
-  });
-  cheat("Equip", function () {
-    WinEquip();
-  });
-
-  cheat("Item", function () {
-    WinItem();
-  });
-
-  cheat("Clear items", function () {
-    while (Inventory.length() > 1)
-      Inventory.remove1();
-  });
-
-  cheat("Spell", function () {
-    WinSpell();
-  });
-
-  cheat("Stat", function () {
-    WinStat();
-  });
-
-  cheat("$$$", function () {
-    Add(Inventory,'Gold',Random(100));
-  });
-
-  cheat("Save", function () {
-    SaveGame();
-    alert(JSON.stringify(game).length);
-  });
-
-  cheat("Quit", quit);
-
-}
-
 function HotOrNot() {
   // Figure out which spell is best
   if (Spells.length()) {
@@ -1150,10 +1072,6 @@ function FormKeyDown(e) {
     //Navigate(GetHostAddr() + 'name=' + UrlEncode(Get(Traits,'Name')));
   }
 
-  if (e.which == 3) { // ^C
-    Cheats();
-  }
-
   if (e.which == 7) { // ^G
     game.guild = InputBox('Choose a guild.\r\rMake sure you undestand the guild rules before you join one. To learn more about guilds, visit http://progressquest.com/guilds.php', game.guild);
     Brag("guild");
diff --git a/newguy.js b/newguy.js
index 1c1628f..c4338a0 100644
--- a/newguy.js
+++ b/newguy.js
@@ -186,7 +186,7 @@ function sold() {
       'task|10|Experiencing an enigmatic and foreboding night vision',
       "task|6|Much is revealed about that wise old bastard you'd underestimated",
       'task|6|A shocking series of events leaves you alone and bewildered, but resolute',
-      'task|4|Drawing upon an unexpected reserve of determination, you set out on a long and dangerous journey',
+      'task|4|Drawing upon an unrealized reserve of determination, you set out on a long and dangerous journey',
       'plot|2|Loading'
     ]
   };
@@ -207,10 +207,7 @@ function sold() {
 
   addToRoster(newguy);
 
-  // TODO: cheesy
-  var args = (window.location.href.indexOf("?sold") > 0) ? "?quit" : "";
-
-  window.location.href = "main.html" + args + "#" + newguy.Traits.Name;
+  window.location.href = "main.html#" + newguy.Traits.Name;
 }
 
 function cancel() {
diff --git a/publish.py b/publish.py
index 540490a..03531fe 100755
--- a/publish.py
+++ b/publish.py
@@ -16,8 +16,7 @@ manifest = [
   "close*.png",
   "*.css"]
 includes = sum(map(list, zip(["--include"] * len(manifest), manifest)), [])
-server = "play.progressquest.com"
-destination = "grumdrig.com:www/" + server + "/"
+destination = "progressquest.com:www/progressquest.com/insitu/"
 
 print manifest
 output = subprocess.call(
diff --git a/roster.html b/roster.html
index 2817b86..580cdd7 100644
--- a/roster.html
+++ b/roster.html
@@ -70,7 +70,9 @@ a.x, a.sheet {
 
 <body>
 
+<a href="/">
 <img src="pq.gif" alt="Progress Quest">
+</a>
 
 <h1>Character Roster</h1>
 
@@ -88,17 +90,13 @@ a.x, a.sheet {
 </table>
 
 
-<div>
-Testing:
-<button id=test>Test</button>
-<button id=clear>Clear</button>
-</div>
-
+<br>
 <br>
 <div align="center" id="nabar">
   <a href="/">Home</a> &middot;
   <a href="/info.php">Info</a> &middot;
   <a href="/faq.php">FAQ</a> &middot;
+  <a href="/insitu/">Play</a> &middot;
   <a href="/dl.php">Download</a> &middot;
   <a href="/realms.php">Realms</a> &middot;
   <a href="/acct.php">Accounts</a> &middot;
diff --git a/sim.js b/sim.js
index 682819a..12d9a98 100644
--- a/sim.js
+++ b/sim.js
@@ -141,7 +141,7 @@ for (var i = 0; i < 100000000; ++i) {
     SaveGame();
     charsheet(game);
     l = game.Traits.Level;
-    if (l >= 5) break;
+    //if (l >= 5) break;
   }
   //assert(timers.length == 2);// TODO: this is for simplicity
   now += timers[1].interval;
