Merged in fixes (pull request #1)

Lots of fixes for the codebase

Approved-by: Eric Fredricksen
This commit is contained in:
txtsd authored and Eric Fredricksen committed 2022-11-10 19:47:32 +00:00
commit b1fa424302
9 files changed
+28 -32

No files matched your search

+6 -6
View File
@@ -302,7 +302,7 @@ Number.prototype.div = function (divisor) {
function LevelUpTime(level) { // seconds function LevelUpTime(level) { // seconds
// 20 minutes for for level 1 // 20 minutes for level 1
// exponential increase after that // exponential increase after that
return Math.round((20 + Math.pow(1.15, level)) * 60); return Math.round((20 + Math.pow(1.15, level)) * 60);
} }
@@ -342,7 +342,7 @@ K.Spells = [
"Sadness", "Sadness",
"Seasick", "Seasick",
"Shoelaces", "Shoelaces",
"Innoculate", "Inoculate",
"Cone of Annoyance", "Cone of Annoyance",
"Magnetic Orb", "Magnetic Orb",
"Invisible Hands", "Invisible Hands",
@@ -379,7 +379,7 @@ K.Spells = [
"Animate Tunic", "Animate Tunic",
"Ursine Armor", "Ursine Armor",
"Holy Roller", "Holy Roller",
"Tonsilectomy", "Tonsillectomy",
"Curse Family", "Curse Family",
"Infinite Confusion"]; "Infinite Confusion"];
@@ -717,9 +717,9 @@ K.Monsters = [
"Pentasaurus|12|head", "Pentasaurus|12|head",
"Stegosaurus|18|plate", "Stegosaurus|18|plate",
"Triceratops|16|horn", "Triceratops|16|horn",
"Tyranosauraus Rex|18|forearm", "Tyrannosaurus Rex|18|forearm",
"Djinn|7|lamp", "Djinn|7|lamp",
"Doppleganger|4|face", "Doppelganger|4|face",
"Black Dragon|7|*", "Black Dragon|7|*",
"Plaid Dragon|7|sporrin", "Plaid Dragon|7|sporrin",
"Blue Dragon|9|*", "Blue Dragon|9|*",
@@ -788,7 +788,7 @@ K.Monsters = [
"Hippocampus|4|mane", "Hippocampus|4|mane",
"Hippogriff|3|egg", "Hippogriff|3|egg",
"Hobgoblin|1|patella", "Hobgoblin|1|patella",
"Homonculus|2|fluid", "Homunculus|2|fluid",
"Hydra|8|gyrum", "Hydra|8|gyrum",
"Imp|2|tail", "Imp|2|tail",
"Invisible Stalker|8|*", "Invisible Stalker|8|*",
+3 -7
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico">
<title>Play Progress Quest</title> <title>Play Progress Quest</title>
@@ -22,9 +22,6 @@ p {
color: #808080; color: #808080;
text-decoration: none; text-decoration: none;
} }
.banter {
font-size: 11pt;
}
#go { #go {
font-size: 30pt; font-size: 30pt;
} }
@@ -33,7 +30,6 @@ img {
} }
th, td { text-align: left; padding-right: 2em; } th, td { text-align: left; padding-right: 2em; }
.good { color: #2a2; } .good { color: #2a2; }
.bad { color: #a22; }
.ugly { color: #c82; } .ugly { color: #c82; }
</style> </style>
</head> </head>
@@ -57,12 +53,12 @@ or install anything to play Progress Quest; just hit the button:
<p> <p>
Does that sound easy to you? Well it wasn't; we started with hardware Does that sound easy to you? Well it wasn't; we started with hardware
emulation of a 80386-equipped PC clone running a novel Windows XP emulation of a 80386-equipped PC clone running a novel Windows XP
compatable operating system called ProgrOS, implemented in a clean compatible operating system called ProgrOS, implemented in a clean
room in the Seychelles by a team of people who had never programmed room in the Seychelles by a team of people who had never programmed
before (to keep the lawyers at bay). before (to keep the lawyers at bay).
<p> <p>
Unfortuantely that wan't fast enough (there was too much lag death), Unfortunately that wasn't fast enough (there was too much lag death),
so we instead emulated the much faster Cray-2 supercomputer and ran so we instead emulated the much faster Cray-2 supercomputer and ran
the 80386 emulator in that. But the 80386 kept getting hot, so we the 80386 emulator in that. But the 80386 kept getting hot, so we
switched to a 6502 overclocked at 120GHz with emulated liquid helium switched to a 6502 overclocked at 120GHz with emulated liquid helium
+1 -1
View File
@@ -210,7 +210,7 @@ if (!this.JSON) {
// If the string contains no control characters, no quote characters, and no // If the string contains no control characters, no quote characters, and no
// backslash characters, then we can safely slap some quotes around it. // backslash characters, then we can safely slap some quotes around it.
// Otherwise we must also replace the offending characters with safe escape // Otherwise, we must also replace the offending characters with safe escape
// sequences. // sequences.
escapable.lastIndex = 0; escapable.lastIndex = 0;
+4 -4
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico">
@@ -13,7 +13,7 @@
maximum-scale=1.0, maximum-scale=1.0,
minimum-scale=1.0, minimum-scale=1.0,
user-scalable=0" /> user-scalable=0" />
<meta names="apple-mobile-web-app-status-bar-style" content="black" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" href="touch-icon.png" /> <link rel="apple-touch-icon" href="touch-icon.png" />
</head> </head>
@@ -24,9 +24,9 @@
<div class="vbox window" id="main"> <div class="vbox window" id="main">
<div id="titlebar"> <div id="titlebar">
<img src="swords.gif"> <img src="swords.gif" alt="Progress Quest Logo">
<span id="title">Progress Quest</span> <span id="title">Progress Quest</span>
<a id="quit"><img src="closeup.png"></a> <a id="quit"><img src="closeup.png" alt="Close button"></a>
</div> </div>
<script src="json2.js"></script> <script src="json2.js"></script>
+4 -4
View File
@@ -90,7 +90,7 @@ function Split(s, field, separator) {
function Indefinite(s, qty) { function Indefinite(s, qty) {
if (qty == 1) { if (qty == 1) {
if (Pos(s.charAt(0), 'AEIOUÜaeiouü') > 0) if (Pos(s.charAt(0), 'AEIOUÜaeiouü') > 0)
return 'an ' + s; return 'an ' + s;
else else
return 'a ' + s; return 'a ' + s;
@@ -156,13 +156,13 @@ function InterplotCinematic() {
case 2: Q('task|2|You seem to gain the advantage over ' + nemesis); break; case 2: Q('task|2|You seem to gain the advantage over ' + nemesis); break;
} }
} }
Q('task|3|Victory! ' + nemesis + ' is slain! Exhausted, you lose conciousness'); Q('task|3|Victory! ' + nemesis + ' is slain! Exhausted, you lose consciousness');
Q('task|2|You awake in a friendly place, but the road awaits'); Q('task|2|You awake in a friendly place, but the road awaits');
break; break;
case 2: case 2:
var nemesis2 = ImpressiveGuy(); var nemesis2 = ImpressiveGuy();
Q("task|2|Oh sweet relief! You've reached the kind protection of " + nemesis2); Q("task|2|Oh sweet relief! You've reached the kind protection of " + nemesis2);
Q('task|3|There is rejoicing, and an unnerving encouter with ' + nemesis2 + ' in private'); Q('task|3|There is rejoicing, and an unnerving encounter with ' + nemesis2 + ' in private');
Q('task|2|You forget your ' + BoringItem() + ' and go back to get it'); Q('task|2|You forget your ' + BoringItem() + ' and go back to get it');
Q("task|2|What's this!? You overhear something shocking!"); Q("task|2|What's this!? You overhear something shocking!");
Q('task|2|Could ' + nemesis2 + ' be a dirty double-dealer?'); Q('task|2|Could ' + nemesis2 + ' be a dirty double-dealer?');
@@ -1195,7 +1195,7 @@ function FormKeyDown(e) {
} }
if (e.key === 'g') { if (e.key === 'g') {
Guildify(InputBox('Choose a guild.\n\nMake sure you undestand the guild rules before you join one. To learn more about guilds, visit http://progressquest.com/guilds.php\n', game.guild)); Guildify(InputBox('Choose a guild.\n\nMake sure you understand the guild rules before you join one. To learn more about guilds, visit http://progressquest.com/guilds.php\n', game.guild));
} }
if (e.key === 'm') { if (e.key === 'm') {
+1 -1
View File
@@ -18,7 +18,7 @@ fieldset {
fieldset table { fieldset table {
width: 100px; width: 100px;
border: none 0px black; border: none 0 black;
border-right: none !IMPORTANT; border-right: none !IMPORTANT;
border-spacing: 10px; border-spacing: 10px;
border-collapse: separate; border-collapse: separate;
+4 -4
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico">
@@ -24,14 +24,14 @@ input, button { display: inline; }
<div class="vbox window" id="newguy"> <div class="vbox window" id="newguy">
<div id="titlebar"> <div id="titlebar">
<img src="swords.gif"> <img src="swords.gif" alt="Progress Quest Logo">
<span>Progress Quest - New Character</span> <span>Progress Quest - New Character</span>
<a id="quit"><img src="closeup.png"></a> <a id="quit"><img src="closeup.png" alt="Close button"></a>
</div> </div>
<div class="client"> <div class="client">
<div class="hbox"> <div class="hbox">
Name <label for="Name">Name</label>
<input id="Name" spellcheck="false"> <input id="Name" spellcheck="false">
<button id="RandomName">?</button> <button id="RandomName">?</button>
</div> </div>
+2 -2
View File
@@ -76,7 +76,7 @@ th:first-child {
#titlebar > img { #titlebar > img {
vertical-align: bottom; vertical-align: bottom;
margin: 2 0 0 2; margin: 2px 0 0 2px;
} }
#quit { #quit {
@@ -89,7 +89,7 @@ th:first-child {
} }
#quit:active img { #quit:active img {
aopacity: 0; opacity: 0;
} }
.window { .window {
+3 -3
View File
@@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="http://progressquest.com/favicon.ico">
@@ -46,7 +46,7 @@ p {
margin-right: 10%; margin-right: 10%;
text-align: left; text-align: left;
} }
#newc, #newm { #newc {
text-align: center; text-align: center;
} }
.brag a, .brag a:visited { .brag a, .brag a:visited {
@@ -101,7 +101,7 @@ img {
<tr> <tr>
<td id="newc"> <td id="newc">
<b>New Character</b><br> <b>New Character</b><br>
<img src="dicebar.jpg"><br> <img src="dicebar.jpg" alt="four dice"><br>
<button id="roll">Roll One Up</button> <button id="roll">Roll One Up</button>
</td> </td>
</tr> </tr>