Env updates

nle/env/base.py

@@ -31,13 +31,7 @@
 ASCII_n = ord("n")
 ASCII_ESC = nethack.C("[")
 
-FULL_ACTIONS = list(nethack.ACTIONS)
-# Removing some problematic actions
-FULL_ACTIONS.remove(nethack.Command.SAVE)
-# TODO: consider re-adding help eventually, when we can handle its state machine
-# and output.
-FULL_ACTIONS.remove(nethack.Command.HELP)
-FULL_ACTIONS = tuple(FULL_ACTIONS)
+FULL_ACTIONS = nethack.USEFUL_ACTIONS
 
 BLSTATS_SCORE_INDEX = 9
 
@@ -241,6 +235,16 @@ def __init__(
                 high=np.iinfo(np.uint8).max,
                 **nethack.OBSERVATION_DESC["message"],
             ),
+            "program_state": gym.spaces.Box(
+                low=np.iinfo(np.int32).min,
+                high=np.iinfo(np.int32).max,
+                **nethack.OBSERVATION_DESC["program_state"],
+            ),
+            "internal": gym.spaces.Box(
+                low=np.iinfo(np.int32).min,
+                high=np.iinfo(np.int32).max,
+                **nethack.OBSERVATION_DESC["internal"],
+            ),
             "inv_glyphs": gym.spaces.Box(
                 low=0, high=nethack.MAX_GLYPH, **nethack.OBSERVATION_DESC["inv_glyphs"]
             ),

nle/nethack/actions.py

@@ -93,6 +93,7 @@ class Command(enum.IntEnum):
     DROP = ord("d")  # drop an item
     DROPTYPE = ord("D")  # drop specific item types
     EAT = ord("e")  # eat something
+    ESC = C("[")  # escape from the current query/action
     ENGRAVE = ord("E")  # engrave writing on the floor
     ENHANCE = M("e")  # advance or check weapon and spell skills
     FIRE = ord("f")  # fire ammunition from quiver
@@ -111,8 +112,8 @@ class Command(enum.IntEnum):
     LOOK = ord(":")  # look at what is here
     LOOT = M("l")  # loot a box on the floor
     MONSTER = M("m")  # use monster's special ability
-    MOVE = ord("m")  # move, no pickup
-    MOVEFAR = ord("M")  # move far, no pickup
+    MOVE = ord("m")  # Prefix: move without picking up objects/fighting
+    MOVEFAR = ord("M")  # Prefix: run without picking up objects/fighting
     OFFER = M("o")  # offer a sacrifice to the gods
     OPEN = ord("o")  # open a door
     OPTIONS = ord("O")  # show option settings, possibly change them
@@ -130,7 +131,7 @@ class Command(enum.IntEnum):
     REMOVE = ord("R")  # remove an accessory (ring, amulet, etc)
     RIDE = M("R")  # mount or dismount a saddled steed
     RUB = M("r")  # rub a lamp or a stone
-    RUSH = ord("g")  # rush to a chosen direction
+    RUSH = ord("g")  # Prefix: rush until something interesting is seen
     SAVE = ord("S")  # save the game and exit
     SEARCH = ord("s")  # search for traps and secret doors
     SEEALL = ord("*")  # show all equipment in use
@@ -164,6 +165,37 @@ class Command(enum.IntEnum):
     + list(Command)
 )
 
+NON_RL_ACTIONS = (
+    Command.ANNOTATE,  # Could potentially be useful.
+    Command.AUTOPICKUP,
+    Command.CONDUCT,  # Could potentially be useful.
+    Command.EXTCMD,  # Potentially useful for some wizard actions.
+    Command.EXTLIST,
+    Command.GLANCE,
+    Command.HELP,
+    Command.HISTORY,
+    Command.KNOWN,  # Could potentially be useful.
+    Command.KNOWNCLASS,  # Could potentially be useful.
+    Command.OPTIONS,
+    Command.OVERVIEW,  # Could potentially be useful.
+    Command.PREVMSG,  # Could potentially be useful.
+    Command.QUIT,
+    Command.REDRAW,
+    Command.SAVE,
+    Command.SEEALL,  # Could potentially be useful.
+    Command.TRAVEL,  # Could potentially be useful.
+    Command.VERSION,
+    Command.VERSIONSHORT,
+    Command.WHATDOES,
+    Command.WHATIS,
+)
+
+_USEFUL_ACTIONS = list(ACTIONS)
+for action in NON_RL_ACTIONS:
+    _USEFUL_ACTIONS.remove(action)
+USEFUL_ACTIONS = tuple(_USEFUL_ACTIONS)
+del _USEFUL_ACTIONS
+
 _ACTIONS_DICT = {}
 for enum_class in [
     CompassDirection,