README update, a few small things

README.md

@@ -18,21 +18,26 @@ NOTE: This 'game' is just a playground for me to play with Lisp. It is not a ref
 
 ** Systems
 *** Systems
-- Ship Systems
-  - Hull Integrity
-    - When 0 game over
-  - Repulsor Shield
-    - Each % of shield integrity reduces damage by some %
-  - Warp Drive
-    - How far you can jump per 1 fuel
-  - Reactors
-    - Powers warp drive and warp field
-    - Will always have some power, but if power is too low
-      you with have to jump without a warp field
-  - Munitions
-    - Ammo for weapons
-  - Warp Field
-    - Jumping without a warp field will have random effects
+- Ship Systems/Combat
+  - TODO:
+    - [ ] Basic combat system, perhaps like battleship
+    - [ ] Implemention of crew buffs
+    - [ ] Basic 'move to new sector' system
+  - Notes:
+    - Hull Integrity
+      - When 0 game over
+    - Repulsor Shield
+      - Each % of shield integrity reduces damage by some %
+    - Warp Drive
+      - How far you can jump per 1 fuel
+    - Reactors
+      - Powers warp drive and warp field
+      - Will always have some power, but if power is too low
+        you with have to jump without a warp field
+    - Munitions
+      - Ammo for weapons
+    - Warp Field
+      - Jumping without a warp field will have random effects
 - Weapons Systems
   - Weapons have attributes depending on type
   - Plasma Weapon

combat.lisp

@@ -0,0 +1,7 @@
+;;; Combat systems implemented here
+
+(defvar *combat-menu-options-display* NIL)
+(defvar *combat-opt-lookup NIL)
+
+(defun combat-loop (sector)
+  "The main loop responsbile for resolving combat situations")

game.lisp

@@ -11,7 +11,7 @@
 (defun init-game-state ()
   (setq *sector* (make-instance 'sector :market (make-instance 'market)
 					:player-ship-obj
-					(make-instance 'player-ship
+					(make-instance 'ship
 						       :weapons (list (make-instance 'weapon
 										     :name "Plamsa"
 										     :shield-dmg 3

structs.lisp

@@ -21,7 +21,7 @@
     :accessor enemy-ships
     :initform NIL)))
 
-(defclass player-ship ()
+(defclass ship ()
   ((armor-val
     :initarg :armor-val
     :accessor armor-val