Newstrat

rogue.opt

@@ -147,6 +147,14 @@ menu=true
 ;
 room_bugfix=true
 
+;
+; This controls the behavior when the user types an invalid command, i.e. ';'.
+; If true, monsters can wake up after the invalid command. If false, monsters
+; can only wake up after a valid command. This was added to not penalize
+; Rogomatic, which uses ';' for synchronization.
+;
+illegal_commands_wake_monsters=false
+
 ;
 ; If set to true, the experience level name (e.g Warrior) is shown.  If set to
 ; false, the numeric value is shown.
@@ -273,6 +281,13 @@ rogomatic_delay=0
 ;
 rogomatic_level_delay=0
 
+;
+; If Rogomatic reaches this level, it will pause in the in-game debugger
+;
+; Possible values: Any non-negative integer, e.g. 26
+;
+rogomatic_pause_at_level=
+
 ;
 ; If set to true, a debug log will be written, and the in-game debugger will
 ; break on any fatal, error, or warning breakpoints.
@@ -281,6 +296,13 @@ rogomatic_level_delay=0
 ;
 rogomatic_debug=false
 
+;
+; If set to verbose, more detailed information will be included in the debug log.
+;
+; Possible values: verbose
+;
+rogomatic_log_verbosity=
+
 ;
 ; If set to true, a file named ipc.txt will be used for communication from
 ; Rogue to Rogomatic, and a log of the token stream will be written. If set

src/Rogomatic/command.c

@@ -55,9 +55,7 @@ int   d;
 }
 
 /* Move 'count' squares in direction 'd', with time use mode 'mode' */
-void rmove(desc, count, d, mode)
-const char* desc;
-int   count, d, mode;
+void rmove(const char* desc, int count, int d, int mode)
 {
   command (desc, mode, "%d%c", count, keydir[d]);
 }
@@ -151,6 +149,8 @@ void command (const char* description, int tmode, char* f, ...)
     default:  movedir = NOTAMOVE;
   }
 
+  debuglog("movedir %s\n", get_move_dir_str(movedir));
+
   /* If command takes time to execute, mark monsters as sleeping */
   /* If they move, wakemonsters will mark them as awake */
   if (tmode != T_OTHER)
@@ -171,14 +171,15 @@ void command (const char* description, int tmode, char* f, ...)
   if (previous/1000 != current/1000)
   {
       dosnapshot();
-      int severity = (current > 15000) ? D_FATAL : D_WARNING;
+      int severity = (current > 15000) ? D_FATAL : D_ERROR;
       dwait(severity, "Excessive %s for %d turns on level %d", tmode_to_str(tmode), timespent[Level].activity[tmode], Level);
   }
 
   /* mdk:clear active item if we're doing something different than inventory */
   if (cmd[0] != 'i' && cmd[0] != 'I')
   {
       clear_active_item();
+      is_exploring_passage = 0;
   }
 
   /* Do the inventory stuff */
@@ -206,19 +207,54 @@ char *cmd;
   return (max (times, 1));
 }
 
+int is_dir_key(char c)
+{
+  switch (c)
+  {
+    case 'y':
+    case 'u':
+    case 'h':
+    case 'j':
+    case 'k':
+    case 'l':
+    case 'n':
+    case 'm':
+      return 1;
+  }
+
+  return 0;
+}
+
+int is_command_only_dir_keys(const char* command)
+{
+  for (const char* s = command; *s != 0; ++s)
+  {
+    if (!is_dir_key(*s))
+      return 0;
+  }
+
+  return 1;
+}
+
 /*
  * functionchar: return the function character of a command.
  */
 
-char
-functionchar (cmd)
-char *cmd;
+char functionchar(const char* cmd)
 {
-  register char *s = cmd;
+  if (is_command_only_dir_keys(cmd))
+  {
+    int len = strlen(cmd);
+    return cmd[len - 1];
+  }
 
-  while (ISDIGIT (*s) || *s == 'f') s++;
+  const char *s = cmd;
+
+  while (ISDIGIT(*s) || *s == 'f') s++;
+  if (can_move_without_pickup())
+      while (ISDIGIT(*s) || *s == 'm') s++;
 
-  return (*s);
+  return *s;
 }
 
 /*

src/Rogomatic/database.c

@@ -185,7 +185,7 @@ char  *codename;
 char  *name;
 stuff item_type;
 {
-  debuglog("infer: '%s' is '%s' (%s)\n", codename, name, get_item_type_string(item_type));
+  debuglog("infer: '%s' is '%s' (%s)\n", codename, name, get_item_type_str(item_type));
 
   register int i;
 
@@ -223,7 +223,7 @@ char *codename;
     if (streq (dbase[i].fakename, codename))
       return (dbase[i].used);
 
-  dwait (D_PACK, "used: unknown codename '%s'", codename); /* mdk: added dwait */
+  //dwait (D_PACK, "used: unknown codename '%s'", codename); /* mdk: added dwait */
   return 0;
 }
 

src/Rogomatic/debug.c

@@ -54,11 +54,12 @@ void print_command_line(FILE *errfil)
 {
   fprintf(
     errfil,
-    "RogueCollection.exe %c --rogomatic --seed %d --genes \"%d %d %d %d %d %d %d %d %d\"\n\n",
+    "RogueCollection.exe %c --rogomatic --seed %d --genes \"%d %d %d %d %d %d %d %d %d\" --debug-at-level %d\n\n",
     get_game_char(),
     g_seed,
     knob[0], knob[1], knob[2], knob[3], knob[4], knob[5], knob[6], knob[7],
-    g_bug_fixes);
+    g_bug_fixes,
+    Level);
 }
 #endif
 
@@ -81,7 +82,7 @@ int dwait (int msgtype, char* f, ...)
   vsprintf (msg, f, args);
   va_end(args);
 
-  debuglog("dwait: %s\n", msg);
+  debuglog("dwait: %s: %s\n", get_debug_str(msgtype), msg);
 
   /* Log the message if the error is severe enough */
   if (!replaying && (msgtype & (D_FATAL | D_ERROR | D_WARNING))) {
@@ -90,8 +91,8 @@ int dwait (int msgtype, char* f, ...)
     sprintf (errfn, "%s/error%s", getRgmDir (), versionstr);
 
     if ((errfil = wopen (errfn, "a")) != NULL) {
-      fprintf (errfil, "Level %d, error %d:  %s\n\n",
-               Level, msgtype, msg);
+      fprintf (errfil, "%d Level %d, error %d:  %s\n\n",
+               g_seed, Level, msgtype, msg);
 #ifdef ROGUE_COLLECTION
     print_command_line(errfil);
 #endif
@@ -136,6 +137,9 @@ int dwait (int msgtype, char* f, ...)
         say ("i=inv, d=debug !=stf, @=mon, #=wls, $=id, ^=flg, &=chr");
         break;
       case 'i': at (1,0); dumpinv ((FILE *) NULL); at (row, col); break;
+      case 'r':
+        redrawscreen();
+        break;
       case 'd': toggledebug (); 	break;
       case 't': transparent = 1;        break;
       case '!': dumpstuff ();           break;
@@ -151,7 +155,11 @@ int dwait (int msgtype, char* f, ...)
       case '(': dumpdatabase (); at (row, col); break;
       case ')': new_mark++; markcycles (DOPRINT); at (row, col); break;
       case '~': saynow ("Version %s, quit at %d", versionstr, quitat); break;
-      case '/': dosnapshot (); break;
+      case '/':
+          printscreen();
+          printscreenattrs();
+          printtimessearched();
+          break;
       default: at (row, col); return (1);
     }
   }
@@ -241,20 +249,14 @@ void toggledebug ()
   char debugstr[100];
   int type = debugging & ~(D_FATAL | D_ERROR | D_WARNING);
 
-  if (debugging == D_ALL)         debugging = D_NORMAL;
+  if (debugging == D_ALL)         debugging = 0;
+  else if (debugging == 0)        debugging = D_NORMAL;
   else if (debugging == D_NORMAL) debugging = D_NORMAL | D_ITEM;
   else if (type == D_ITEM)        debugging = D_NORMAL | D_SCROLL;
   else if (type == D_SCROLL)      debugging = D_NORMAL | D_POTION;
   else if (type == D_POTION)      debugging = D_NORMAL | D_WAND;
   else if (type == D_WAND)        debugging = D_NORMAL | D_RING;
-  else if (type == D_RING)        debugging = D_NORMAL | D_BATTLE;
-  else if (type == D_BATTLE)      debugging = D_NORMAL | D_MESSAGE;
-  else if (type == D_MESSAGE)     debugging = D_NORMAL | D_PACK;
-  else if (type == D_PACK)        debugging = D_NORMAL | D_MONSTER;
-  else if (type == D_MONSTER)     debugging = D_NORMAL | D_CONTROL;
-  else if (type == D_CONTROL)     debugging = D_NORMAL | D_SCREEN;
-  else if (type == D_SCREEN)      debugging = D_NORMAL | D_WARNING;
-  else if (!debug (D_INFORM))     debugging = D_NORMAL | D_WARNING | D_INFORM;
+  else if (type == D_RING)        debugging = D_NORMAL | D_ALL;
   else                            debugging = D_ALL;
 
   strncpy (debugstr, "Debugging :", 100);

src/Rogomatic/debuglog.c

@@ -46,18 +46,38 @@ err_doit(int errnoflag, int error, const char *fmt, va_list ap)
   }*/
 }
 
-void debuglog_open (const char *log)
+void debuglog_open()
 {
-  if (g_debug)
-    debug = fopen (log, "w");
+    if (!debug)
+    {
+        debug = fopen("debug-rogomatic.log", "w");
+        print_command_line(debug);
+    }
+}
+
+void debuglog_close()
+{
+    if (debug)
+        fclose(debug);
+
+    debug = NULL;
 }
 
-void debuglog_close (void)
+void toggledebuglog()
 {
-  if (debug != NULL)
-    fclose (debug);
+    if (debug)
+    {
+        saynow("Closing debug log");
+        debuglog_close();
+    }
+    else
+    {
+        saynow("Opening debug log");
+        debuglog_open();
+    }
 }
 
+
 void debuglog (const char *fmt, ...)
 {
   va_list  ap;
@@ -67,11 +87,9 @@ void debuglog (const char *fmt, ...)
   va_end (ap);
 }
 
-int g_verbose = 0; //todo:mdk add config
-
 void debuglog_protocol(const char* fmt, ...)
 {
-    if (g_verbose)
+    if (g_verbose_logs)
     {
         va_list  ap;