Remove derogatory term

A few fixes for the codebase

Approved-by: Eric Fredricksen

Config.dfm

@@ -32,7 +32,7 @@ object K: TK
     Top = 228
     Width = 70
     Height = 13
-    Caption = 'Defense Atrtrib'
+    Caption = 'Defense Attrib'
   end
   object Label4: TLabel
     Left = 140
@@ -60,7 +60,7 @@ object K: TK
     Top = 428
     Width = 40
     Height = 13
-    Caption = 'Speicals'
+    Caption = 'Specials'
   end
   object Label8: TLabel
     Left = 8
@@ -151,9 +151,8 @@ object K: TK
       'Good Move'
       'Sadness'
       'Seasick'
-      'Gyp'
       'Shoelaces'
-      'Innoculate'
+      'Inoculate'
       'Cone of Annoyance'
       'Magnetic Orb'
       'Invisible Hands'
@@ -188,7 +187,7 @@ object K: TK
       'Animate Tunic'
       'Ursine Armor'
       'Holy Roller'
-      'Tonsilectomy'
+      'Tonsillectomy'
       'Curse Family'
       'Infinite Confusion')
     TabOrder = 0
@@ -545,7 +544,7 @@ object K: TK
       'Beholder|10|eyestalk'
       'Black Pudding|10|saliva'
       'Blink Dog|4|eyelid'
-      'Cub Scout|1|neckercheif'
+      'Cub Scout|1|neckerchief'
       'Girl Scout|2|cookie'
       'Boy Scout|3|merit badge'
       'Eagle Scout|4|merit badge'
@@ -583,7 +582,7 @@ object K: TK
       'Ice Devil|11|snow'
       'Lemure|3|blob'
       'Pit Fiend|13|seed'
-      'Anklyosaurus|9|tail'
+      'Ankylosaurus|9|tail'
       'Brontosaurus|30|brain'
       'Diplodocus|24|fin'
       'Elasmosaurus|15|neck'
@@ -594,9 +593,9 @@ object K: TK
       'Pentasaurus|12|head'
       'Stegosaurus|18|plate'
       'Triceratops|16|horn'
-      'Tyranosauraus Rex|18|forearm'
+      'Tyrannosaurus Rex|18|forearm'
       'Djinn|7|lamp'
-      'Doppleganger|4|face'
+      'Doppelganger|4|face'
       'Black Dragon|7|*'
       'Plaid Dragon|7|sporrin'
       'Blue Dragon|9|*'
@@ -665,7 +664,7 @@ object K: TK
       'Hippocampus|4|mane'
       'Hippogriff|3|egg'
       'Hobgoblin|1|patella'
-      'Homonculus|2|fluid'
+      'Homunculus|2|fluid'
       'Hydra|8|gyrum'
       'Imp|2|tail'
       'Invisible Stalker|8|*'

Front.dfm

@@ -105,7 +105,7 @@ object FrontForm: TFrontForm
       Height = 13
       Align = alBottom
       Alignment = taCenter
-      Caption = #169' 2002-2022 Eric Fredricksen - v6.4.2'
+      Caption = #169' 2002-2022 Eric Fredricksen - v6.4.4'
       Color = clWhite
       Font.Charset = DEFAULT_CHARSET
       Font.Color = 11382189

HTTPGet.pas

@@ -13,9 +13,9 @@
 {*  BinaryData: Boolean - This setting specifies which type   }
 {*                        of data will taken from the web.    }
 {*                        If you set this property TRUE then  }
-{*                        component will determinee the size  }
-{*                        of files *before* getting them from }
-{*                        the web.                            }
+{*                        component will determine the size of}
+{*                        files *before* getting them from the}
+{*                        web.                                }
 {*                        If this property is FALSE then as we}
 {*                        do not knows the file size the      }
 {*                        OnProgress event will doesn't work. }
@@ -46,7 +46,7 @@
 { EVENTS:                                                     }
 {   OnDoneFile - Occurs when the file is downloaded           }
 {   OnDoneString - Occurs when the string is received         }
-{   OnError - Occurs when error happend                       }
+{   OnError - Occurs when error happens                       }
 {   OnProgress - Occurs at the receiving of the BINARY DATA   }
 {*************************************************************}
 { Please see demo program for more information.               }

Main.pas

@@ -831,25 +831,55 @@ end;
 
 procedure TMainForm.WinStat;
 var
-  i,t: Integer;
-  function Square(x: Integer): Integer; begin Result := x * x; end;
+  i: Integer;
+  t: Int64;
+  function Square(x: Int64): Int64; begin Result := x * x; end;
+
+  function Random64: Int64; overload;
   begin
+    Int64Rec(Result).Hi := Random($3FFFFFFF);
+    Int64Rec(Result).Lo := Random($FFFFFFFF);
+  end;
+
+  function Random64(below: Int64): Int64; overload;
+  begin
+    Result := Random64 mod below;
+  end;
+
+{
+  procedure TestRandom;
+  var
+    i, b: Integer;
+    c: Integer;
+    v: Int64;
+  begin
+    for b := 0 to 63 do begin
+      c := 0;
+      for i := 1 to 1000 do begin
+        v := Random64($0fffffffffffffff);
+        if ((v shr b) and 1) = 1 then Inc(c);
+      end;
+      OutputDebugString(PChar(IntToStr(b) + ' ' + IntToStr(c) + '\n'));
+    end
+  end;
+}
+
+begin
+  // TestRandom;
+
   if Odds(1,2)
   then i := Random(Stats.Items.Count)
   else begin
-    // favor the best stat so it will tend to clump
+    // Favor the best stats so they will tend to clump
     t := 0;
     for i := 0 to 5 do Inc(t, Square(GetI(Stats,i)));
-    t := Random(t);
-    if t < 0 then i := Random(Stats.Items.Count)
-    else begin
+    t := Random64(t);
     i := -1;
     while t >= 0 do begin
       Inc(i);
       Dec(t, Square(GetI(Stats,i)));
     end;
   end;
-  end;
   Add(Stats, Stats.Items[i].Caption, 1);
 end;
 
@@ -1103,7 +1133,7 @@ begin
   WrLn( Format('  CHA%7d      MP Max%7d', [GetI(Stats,'CHA'), GetI(Stats,'MP Max')]));
   WrLn;
   WrLn( 'Equipment:');
-  for i := 1 to Equips.Items.Count-1 do
+  for i := 0 to Equips.Items.Count-1 do
     if Get(Equips,i) <> '' then
       WrLn( '  ' + LeftStr(Equips.Items[i].Caption + '            ', 12) + Get(Equips,i));
   WrLn;
@@ -1536,6 +1566,13 @@ begin
   for i := 0 to ComponentCount-1 do
     m.ReadComponent(Components[i]);
   m.Free;
+  // Patch old misspellings found in save
+  with Spells do for i := 1 to Items.Count-1 do begin
+    if Items[i].Caption = 'Tonsilectomy' then
+      Items[i].Caption := 'Tonsillectomy';
+    if Items[i].Caption = 'Innoculate' then
+      Items[i].Caption := 'Inoculate';
+  end;
   {$IFDEF LOGGING}
   Log('Loaded game: ' + name);
   {$ENDIF}
@@ -1601,7 +1638,7 @@ begin
     Navigate(GetHostAddr + 'name=' + UrlEncode(Get(Traits,'Name')));
   end;
   if (ssCtrl in Shift) and (Key = ord('G')) then begin
-    SetGuild(InputBox('Progress Quest', 'Choose a guild.'#13#13'Make sure you undestand the guild rules before you join one. To learn more about guilds, visit http://progressquest.com/guilds.php', GetGuild));
+    SetGuild(InputBox('Progress Quest', 'Choose a guild.'#13#13'Make sure you understand the guild rules before you join one. To learn more about guilds, visit http://progressquest.com/guilds.php', GetGuild));
     Guildify;
   end;
 end;

README.md

@@ -24,9 +24,9 @@ thataway.
 (I didn't add this README file in PQ 6.0, but after that you can use
 this README to trace the checkin history using version control.)
 
-Subversion revsion numbers vs. versions:
+Subversion revision numbers vs. versions:
 
-* r321 v6.3 as I found it after a couple years of inactivity
+* r321 v6.3 as I found it after a couple of years of inactivity
 * r320 v6.2 probably as released, though I'm not totally sure
 * r318 v6.2 but probably a slightly older version
 * r317 v6.1

ZLIBEX.PAS

@@ -18,7 +18,7 @@
 *                                                                            *
 *  acknowledgements                                                          *
 *    erik turner    Z*Stream routines                                        *
-*    david bennion  finding the nastly little endless loop quirk with the    *
+*    david bennion  finding the nasty little endless loop quirk with the     *
 *                     TZDecompressionStream.Read method                      *
 *    burak kalayci  informing me about the zlib 1.1.4 update                 *
 *****************************************************************************}

dist/README.html

@@ -12,7 +12,7 @@ The ancient reckoning held that the Five Skrelkampi (and their Truebine) would
 return when the great Trond-feast could be held anew and the Belnap reunited.
 But this legend became lost to all but the Papperboxen at Horbug.
 One of their own was Yallow the Speldrig, who found an unlikely pupil in
-Torbole Understeady, the discarded illigitimate waif of Wainthane Topknox,
+Torbole Understeady, the discarded illegitimate waif of Wainthane Topknox,
 whom Yallow renamed Grumdrig and began to school as a boar-pulmet's apprentice. ...And, as it
 was said by some, in aberdoxy.
 <p>
@@ -20,13 +20,13 @@ As our story opens young Grumdrig has returned to Horbug following a trying stin
 Spilwaer Spond where his laconic disposition and fertile mind bred a series 
 of misadventures which had landed him outside the good graces of the Jordref there,
 Welham, who had secretly begun a long term course of slow but 
-disaccomodating illpeel in the lad's morning fanwael.
+disaccommodating illpeel in the lad's morning fanwael.
 Meanwhile, though scarce a tuft of <i>mansefur</i> had yet made its appearance
 on the boy's <i>manssach</i>, a number of visiting Roilwachhs have begun to 
 exhibit a discreet
 and seemingly inexplicable interest in the boy. Strange indeed, as he would not reach
 his krouchensterm for another harvest or more. 
-And when Grumdrig's resiliant compatriot Paedri
+And when Grumdrig's resilient compatriot Paedri
 appears at Grumdrig's lochnotat with a Scrolstamp from the old Speldrig,
 a woozy foreboding feeling rises from his young gut...
 
@@ -48,40 +48,40 @@ and other frustrations common to that older generation of RPG's.
 <h3> User manual </h3>
 
 Even inexperienced gamers will find <b>Progress Quest</b> 
-remarkably intutive and simple to play.  Start the program
+remarkably intuitive and simple to play.  Start the program
 and click the <code>New Game (Single Player)</code> button, 
 or click <code>New Game (Multiplayer)</code> and select a Realm to
 compete against players from all over the world.
 You will then be presented with the character creation screen.
 
 Select a name, race and class for the new character. Then, use the <code>Roll</code> button 
-until you are statisfied with the stats
+until you are satisfied with the stats
 for your character. <i>Tip: You can use the <code>Unroll</code> button (a feature exclusive to <b>Progress Quest</b>)
 to go back to any previous roll if you find that you've
 clicked too hastily.</i>  
 <p>
 If you choose to play an online game, your character will share adventures with other <b>Progress
 Quest</b> characters in an online virtual world. Online play requires
-internet connectivity, though sophisiticated algorithms 
+internet connectivity, though sophisticated algorithms
 keep the bandwidth usage to a minimum. You can compare your character against
 the top <b>Progress Quest</b> players by visiting
 <a href=http://progressquest.com/realms.php>http://progressquest.com/realms.php</a>
 (or hit &lt;Ctrl&gt;-&lt;B&gt; from within the game).
 <p>
-Finally, hit the <code>Sold!</code> button to begin the game.  The game will start immediately and
+Finally, hit the <code>Sold!</code> button to begin the game.  The game will start immediately, and
 you can safely familiarize yourself with the game's single interface screen as the game progresses
 on its own.
-Soon your avatar will will be seeking and destroying an exotic panopoly of beasts while you
+Soon your avatar will be seeking and destroying an exotic panoply of beasts while you
 gaze proudly on.  Missing, you will notice, is the tedious march from town, the bewildering maze of cookie cutter
 streets hiding some specific merchant or NPC,
-and the repetetive hunt for just the right beast to execute.  <b>Progress Quest</b> supplies
+and the repetitive hunt for just the right beast to execute.  <b>Progress Quest</b> supplies
 your character with an endless series of victims, as well as exciting quests which keep your quest
 log full to the brim at all times.  
 <p>
 TREASURE: Each slain creature yields a trophy, which can be sold in any town.
 When the encumbrance bar reaches maximum, your character automatically returns to the nearest town
-to sell your loot.  If sufficiently liquid, he may then purchase an upgrade in equpiment (weapon or armor).
-That being done, the interpid adventurer then returns to the frontier to spill more blood.
+to sell your loot.  If sufficiently liquid, he may then purchase an upgrade in equipment (weapon or armor).
+That being done, the intrepid adventurer then returns to the frontier to spill more blood.
 <i>Tip: The amount your character can carry before his encumbrance bar fills up 
 increases as his STR stat improves.</i>
 <p>
@@ -121,8 +121,8 @@ running</i>.  Your character will make <i>no</i> progress once you quit the prog
 
 <h3> Keyboard quick reference </h3>
 
-<table border=1 cellspacing=5><th>Key</th><th>Description</tr>
-<tr><td>Alt-F4<td>Exit <b>Progress Quest</b></table>
+<table border=1 cellspacing=5><tr><th>Key</th><th>Description</th></tr>
+<tr><td>Alt-F4</td><td>Exit <b>Progress Quest</b></td></tr></table>
 
 <p>
 <small>&copy:Copyright 2022

dist/dist.txt

@@ -0,0 +1,22 @@
+Reminder: How I publish a new version
+-------------------------------------
+
+	$ cd pq/dist
+	$ cp ../pq.exe .
+	$ zip pq6-MAJOR-MINOR pq.exe README.html license.txt
+	$ md5 pq6-MAJOR-MINOR.zip
+	$ shasum pq6-MAJOR-MINOR.zip
+	$ du -h pq6-MAJOR-MINOR.zip
+	$ git add pq6-MAJOR_MINOR.zip
+	$ git commit -am "new version!"
+	$ scp pq6-MAJOR-MINOR.zip progressquest.com:www/progressquest.com/dl/
+	$ ssh progressquest.com
+	$ cd www/progressquest.com
+	$ nano dl.php
+	[copypasta in the new version and checksums and size]
+	$ nano releasenotes.php
+	[type in the changes]
+	$ cd dl
+	$ git add pq6-MAJOR-MINOR.zip
+	$ git commit -am "New version published!"
+	$ did Released PQ version 6-MAJOR-MINOR