Simplify overall file tree, packages and systems

There is a unnecessary complexity on this game has been structured.

Author: ryukinix

README

@@ -0,0 +1,18 @@
+![game](https://i.imgur.com/QZSerTN.png)
+
+# starwar (from xzpeter)
+
+This is a game written in CL.
+
+You may check the homepage at http://xzpeter.github.com/starwar for more information.
+
+
+# Fork reason
+
+This is a exploratory fork into the deepness of the CLOS, Common Lisp Object System.
+An additional music was integrated made by the band Miami Vice, track
+[Synth Colour](https://miamivice.bandcamp.com/track/synth-colour) from Palm Haze album
+
+
+All the rights are reserved to xzpeter, the original game author and the background
+music to the Miami Vice band.

README.md

@@ -1,5 +1,5 @@
 ;; define all the classes in the game
-(in-package :org.xzpeter.game.starwar)
+(in-package :starwar)
 
 (defclass star (hittable-circle)
   ((planet :initarg :planet :initform (error "cannot without planet!")
@@ -10,7 +10,7 @@
    (vect :initarg :vect :initform #(0.5 0) :accessor vect)
    (life :initarg :life :initform star-life-min)
    (target :initform nil :accessor target :documentation
-	   "target star to fight with") 
+	   "target star to fight with")
    (status :initform :idle :accessor status :documentation
 	   "what does the star think now? possble status are:
 :idle -- not doing anything now

lib/org.xzpeter.game.lib.asd

@@ -1,12 +1,12 @@
 ;; variables definitions
-(in-package :org.xzpeter.game.starwar)
+(in-package :starwar)
 
 (defparameter *debug-string* "")
 
 (defvar color-grey (sdl:color :r 80 :g 80 :b 80))
 
 (defparameter screen-width 800)
-(defparameter screen-height 600) 
+(defparameter screen-height 600)
 (defparameter bg-color sdl:*black*)
 (defparameter game-frame-color sdl:*white*)
 
@@ -68,16 +68,16 @@ generateing the map. ")
   "how far can a star moves away from its owner")
 
 ;; when the mouse moves to the edge of the screen, we should move the screen
-;; position on the worldmap. 
-;; these are the margin place, outside which the moving is activated. 
+;; position on the worldmap.
+;; these are the margin place, outside which the moving is activated.
 (defparameter margin-left 10)
 (defparameter margin-top 10)
 
 ;; defines the background
 (defparameter bg-star-size-max 2)
 (defparameter bg-star-size-min 1)
 (defparameter bg-star-n 50)
-    
+
 (defparameter *star-color-selected* sdl:*yellow*)
 
 (defparameter star-safe-distance 40)
@@ -103,15 +103,15 @@ generateing the map. ")
 (defun load-file-set-parameters (filename)
   "read one file and load all the parameters"
   ;; here, we MUST make sure that we are in the RIGHT package (that is the
-  ;; starwar package. or the parameters will not be set! 
+  ;; starwar package. or the parameters will not be set!
   (with-open-file (s filename)
     (do ((form (read s) (read s nil 'eof)))
 	((eq form 'eof) nil)
       (if (not (= (length form) 2))
 	  (error "configure file format not right!"))
       (setq form (cons 'defparameter form))
       (format t "eval: ~a~%" form)
-      (eval form)))) 
+      (eval form))))
 
 (defun auto-generate-planets (amount)
   "auto generate planets and normally set the *planet-list* var.
@@ -190,10 +190,10 @@ INIT-AMOUNT is how many planets one player own at the beginning of game"
 	*bg-stars* (generate-bg-stars bg-star-n)
 	*planet-list* (planet-sort-by-size
 		       (auto-generate-planets planet-total)))
-  
+
   (setf (player (fifth *planet-list*)) *player1*)
   (setf (player (sixth *planet-list*)) *player2*)
-  
+
   ;; load all the configure file
   (load-file-set-parameters "starwar.conf")
 

packages.lisp

@@ -1,10 +1,10 @@
 ;; defines the hittable-circle object
-(in-package :org.xzpeter.game.starwar)
+(in-package :starwar)
 
 (defclass hittable-circle ()
   ((pos :initarg :pos :initform (error "must have init position")
 	:accessor pos :documentation "center of the circle")
-   (r :initarg :r :initform 0 
+   (r :initarg :r :initform 0
       :accessor r :documentation "radius of the circle"))
   (:documentation "A circle that is hittable"))
 

classes.lisp renamed to src/classes.lisp

@@ -1,5 +1,5 @@
 ;; I will put misc functions related to CL game here
-(in-package :org.xzpeter.game.lib)
+(in-package :starwar-lib)
 
 ;; use run-game to run any game with threading
 (defvar *game-thread* nil)

globals.lisp renamed to src/globals.lisp

@@ -1,7 +1,8 @@
 (in-package :cl-user)
-(defpackage :org.xzpeter.game.lib
+(defpackage :starwar-lib
   (:use :cl :lispbuilder-sdl)
-  (:export :run-game			; in misc.lisp
+  (:export
+       :run-game			; in misc.lisp
 	   :color-random
 	   :color-darken
 	   :color-invert
@@ -13,8 +14,8 @@
 	   :vector-norm
 	   :vector-length
 	   :vec2rad
-	   :rad2vec
-	   :vector+
+       :rad2vec
+       :vector+
 	   :vector-
 	   :vector*
 	   :vector-floor

hittable-circle.lisp renamed to src/hittable-circle.lisp

@@ -1,5 +1,5 @@
 ;; some vector related functions
-(in-package :org.xzpeter.game.lib)
+(in-package :starwar-lib)
 
 ;; fix any rad to: -pi/2 ~ 3pi/2
 (defun rad-fix (rad)
@@ -8,18 +8,23 @@
 		  (> r (* pi 1.5)))
 	     (* pi 2)
 	     0))))
+
 (defmacro vx (v)
   `(aref ,v 0))
+
 (defmacro vy (v)
   `(aref ,v 1))
+
 (defun vector-norm (vect)
   (let* ((x (vx vect))
 	 (y (vy vect))
 	 (a (sqrt (+ (* x x) (* y y)))))
     (vector (/ x a) (/ y a))))
+
 (defun vector-length (vect)
   (let ((x (vx vect)) (y (vy vect)))
     (sqrt (+ (* x x) (* y y)))))
+
 ;; from -pi/2 ~ 3pi/2
 (defun vec2rad (vect)
   (let ((x (vx vect)) (y (vy vect)))
@@ -30,6 +35,7 @@
 	(if (plusp y) (/ pi 2) (/ pi -2))
 	(let ((rad (atan (/ y x))))
 	  (+ rad (if (minusp x) pi 0))))))
+
 ;; rad should be from -pi/2~3pi/2
 ;; the vector returned are NOT normalized!!!
 (defun rad2vec (rad)
@@ -41,6 +47,7 @@
     (t (if (> rad (* pi 0.5))
 	   (vector -1 (- (tan rad)))
 	   (vector 1 (tan rad))))))
+
 (defun vector+ (a b)
   (if (not (and (vectorp a) (vectorp b)))
       (error "A and B must be vector!"))
@@ -49,6 +56,7 @@
 	(y0 (vy a))
 	(y1 (vy b)))
     (vector (+ x0 x1) (+ y0 y1))))
+
 (defun vector- (a b)
   (if (not (and (vectorp a) (vectorp b)))
       (error "A and B must be vector!"))
@@ -57,6 +65,7 @@
 	(y0 (vy a))
 	(y1 (vy b)))
     (vector (- x0 x1) (- y0 y1))))
+
 (defun vector* (a n)
   (cond ((and (vectorp a) (numberp n))
 	 (let ((x (vx a))
@@ -69,6 +78,7 @@
 	       (y1 (vy n)))
 	   (vector (* x0 x1) (* y0 y1))))
 	(t (error "not supported *!"))))
+
 (defun vector-floor (vect)
   (vector (floor (vx vect)) (floor (vy vect))))