add variable *module-package-name*, enter that package after loading …

…module

cons/cons-package.lisp

@@ -4,3 +4,5 @@
   (:export cons-game))
 
 (in-package :cons-game)
+
+(setf xe2:*module-package-name* :cons-game)

cons/cons.lisp

@@ -19,7 +19,7 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 (in-package :cons-game)
-
+(setf xe2:*module-package-name* :cons-game)
 (setf xe2:*dt* 20)
 
 ;;; Splash screen

console.lisp

@@ -1277,6 +1277,14 @@ found."
 
 (defparameter *after-load-module-hook* nil)
 
+(defvar *module-package-name* nil)
+
+(defun module-package-name (&optional (module-name *module*))
+  (let ((default-name (or *module-package-name* (make-keyword module-name))))
+    (prog1 default-name
+      (unless (find-package default-name)
+	(error "Cannot find package ~S" default-name)))))
+
 (defun load-module (module &key (autoload t))
   "Load the module named MODULE. Load any resources marked with a
 non-nil :autoload property. This operation also sets the default
@@ -1293,7 +1301,8 @@ object save directory (by setting the current `*module*'. See also
     (when (probe-file object-index-file)
       (message "Loading saved objects from ~S" object-index-file)
       (index-pak module object-index-file)))
-  (run-hook '*after-load-module-hook*))
+  (run-hook '*after-load-module-hook*)
+  (setf *package* (find-package (module-package-name))))
 
 ;;; Playing music and sound effects
 
@@ -1568,6 +1577,7 @@ also the file LIBSDL-LICENSE for details.
 and its .startup resource is loaded."
   (format t "~A" *copyright-text*)
   (initialize-resource-table)
+  (setf *module-package-name* nil)
   (setf *initialization-hook* nil)
   (setf *play-args* args)
   (setf *random-state* (make-random-state t))

forest/forest.lisp

@@ -83,7 +83,7 @@
 			     "water-3"))
 
 (defcell water 
-  (tile :initform "floor")
+  (tile :initform "water-1")
   (description :initform "These waters of the wasteland are not always fit to drink.")
   (categories :initform '(:actor :reflective :water :exclusive)))
 
@@ -167,7 +167,7 @@
 (defparameter *snow-clock* 8)
 
 (defcell earth 
-  (tile :initform "floor")
+  (tile :initform "earth-1")
   (categories :initform '(:actor :reflective))
   (snow-clock :initform *snow-clock*)
   (description :initform "The solid earth beneath your feet.")
@@ -515,8 +515,8 @@
 
 (define-method generate forest (&key (height *forest-height*)
 				     (width *forest-width*)
-				     sequence-number
-				     description
+				     (sequence-number (genseq))
+				     (description "Forest")
 				     (fireflies 100)
 				     (graveyards 15)
 				     (ruins 15)

forms.lisp

@@ -611,8 +611,6 @@ DIRECTION is one of :up :down :right :left."
   (setf <cursor-row> 0)
   [scroll self])
 
-
-
 ;;; A var cell stores a value into a variable, and reads it.
 
 (defparameter *var-cell-style* '(:foreground ".white" :background ".blue"))

xe2.lisp

@@ -63,6 +63,7 @@
 *frequency* *output-chunksize* *output-channels* halt-sample *dt*
 *physics-function* =equipment= *default-world-axis-size* generic-keybind
 *default-world-z-size* =browser= install-widgets =label= =form=
+*module-package-name* module-package-name
 =data-cell= =var-cell= =option-cell= =toggle-cell= =event-cell=
 =buffer-cell= =comment-cell= install-widget uninstall-widget
 =button-cell= =image-cell= *initialization-hook* initialize-engine

xiomacs/xiomacs.lisp

@@ -96,12 +96,21 @@
     ("END" nil :move-end-of-line)
     ("PAGEUP" nil :move-beginning-of-column)
     ("PAGEDOWN" nil :move-end-of-column)
-;;    ("K" (:control) :clear-line)
-;;    ("BACKSPACE" nil :backward-delete-char)
+    ;; ("K" (:control) :clear-line)
+    ;;  ("BACKSPACE" nil :backward-delete-char)
     ("UP" (:control) :apply-right)
     ("DOWN" (:control) :apply-left)
     ("LEFT" (:control) :left-pane)
     ("RIGHT" (:control) :right-pane)
+    ;;
+    ("KP8" nil :move-cursor-up)
+    ("KP2" nil :move-cursor-down)
+    ("KP4" nil :move-cursor-left)
+    ("KP6" nil :move-cursor-right)
+    ("KP8" (:control) :apply-right)
+    ("KP2" (:control) :apply-left)
+    ("KP4" (:control) :left-pane)
+    ("KP6" (:control) :right-pane)
     ;; ("LEFTBRACKET" nil :apply-left)
     ;; ("RIGHTBRACKET" nil :apply-right)
     ("TAB" nil :switch-panes)

xiomacs/xiomacs.org

@@ -1,4 +1,9 @@
-** TODO command button runs its text to prompt
+** TODO [#B] command button runs its text to prompt
+** TODO [#A] pick up and put down, attach object to cursor? 
+** TODO [#A] move command to move objects w mouse or keyboard.
+** TODO [#C] auto moving speech bubbles
+** TODO search feature
+** TODO generic page browser with preview
 ** TODO fix text box RETURN keybinding not working
 ** TODO [#A] *menu* sheet, autogenerated, f5 refresh revisit
 ** TODO [#A] mark command and mark-row mark-column fields