Add some new files, misc changes + combat system

Author: shader

.gitignore

@@ -0,0 +1,2 @@
+db/
+.floo

actors.arc

@@ -0,0 +1,20 @@
+(def -> (proc . msg)
+  "Send a message to a process"
+  (thread-send rep.proc msg))
+
+(mac <- body
+  "Receive a message using pattern matching"
+  `(apply (p-m:fn ,@body)
+          (thread-receive)))
+
+(mac defproc (name args . body)
+  `(def ,name ,args
+     (annotate 'proc
+        (thread ((afn ,args
+                   (<- ,@(apply join 
+                                (map [list car._ `(do ,cadr._ (self ,@args))] 
+                                     pair.body))))
+                 ,@args)))))
+
+(defcall proc (p . msg)
+  (thread-send rep.p msg))

auth.arc

@@ -42,4 +42,4 @@
 (def set-session-id (id)
   " Assign the user a new session-id, and return it "
   (let sid (trunc (* (rand) (expt 10 10)))
-    (= users*.id!session-id sid)))
+    (= users*.id!session-id sid)))

combat.arc

@@ -0,0 +1,72 @@
+(deftem ship
+  type 'ship
+  unit-type nil         ; type of unit
+  weapons nil            ; temp placeholder (defines attack value)
+  hull nil             ; temp placeholder (defines armor value)
+)
+
+(deftem weapon
+  type 'weapon
+  weapon-type nil
+  damage nil
+  speed 1
+  )
+
+(= weapons* (table))
+(mac defweap (name offense speed)
+  `(= weapons.name (inst 'weapon 'weapon-type ,name 'damage ,damage 'speed ,speed)))
+
+(= weapons*!laser (inst 'weapon 'weapon-type 'laser 'damage 1 'speed 1))
+
+(deftem (frigate ship)
+  unit-type 'frigate
+  weapons (list weapons*!laser)
+  hull 2
+)
+
+(def fire (weapon target)
+  (-- target!hull weapon!damage))
+
+(def choose (xs)
+  (let l len.xs
+    (xs rand.l)))
+
+(def alternate (f a b)
+  (f a b)
+  (f b a))
+
+(def barrage (red blue)
+  (each s red
+    (each w s!weapons
+      (repeat w!speed (fire w choose.blue)))))
+
+(def triage (fleet)
+  (pull [< _!hull 1] fleet))
+
+(= prepare idfn)
+
+(def engage (red blue)
+  (prepare red)
+  (barrage red blue)
+  red)
+
+(mac multizap (op . xs)
+  `(do
+     ,@(accum acc 
+       (each x xs
+         (acc `(zap ,op ,x))))))
+
+(def battle (red blue)
+  (alternate engage red blue)
+  (map triage (list red blue)))
+
+(def status (army)
+  (let c (counts army)
+    (map (fn ((t n)) (list t!unit-type t!hull n)) tablist.c)))
+
+(def list-of (n f)
+  (accum acc
+    (repeat n (acc (f)))))
+
+(def fleet units
+  (mappend (fn ((t n)) (list-of n [inst t])) pair.units))

main.arc

@@ -1,3 +1,4 @@
+($ (require web-server/private/timer))
 (load "git-db.arc")
 (load "objects.arc")
 (load "auth.arc")
@@ -14,13 +15,64 @@
    objects* (table))
 
 (def file? (path)
+  "Return t or nil depending on whether a given file exists"
   ($ (tnil (file-exists? ,path))))
 
 (def dir? (path)
+  "Return t or nil depending on whether a given directory exists"
   ($ (tnil (directory-exists? ,path))))
 
 (git-connect git-dir* git-ref*)
 
 ;Load all objects from the repo
 (load-objects)
-(restore-tables)
+(restore-tables)
+
+(def start-timer-manager ()
+  "Setup function required before timers can be used"
+    ($ (start-timer-manager)))
+
+(def start-timer (s f)
+  "Start a timer that waits s seconds before invoking function f"
+  ($ (start-timer s f)))
+
+;money
+(deftem (mine building)
+  name "mine"
+  type 'money
+  last-update (seconds)
+  cost 100
+  rate 3600
+  build-time 10)
+
+(def income (prod)
+  (with (t (seconds)
+         last-update prod!last-update)
+    (= prod!last-update t)
+    (* (/ prod!rate 3600) (- t last-update))))
+
+(def get-balance (u)
+  (each p (keep [is _!type 'money] u!mines) 
+        (++ u!balance
+            (income p)))
+  u!balance)
+
+(def buy (u type)
+  "Create an instance of an item, deducting its cost from the users balance"
+  (withs (i (inst type 'owner u!id)
+         bal (- u!balance i!cost))
+    (when (> bal 0)
+        (= u!balance bal)
+        i)))
+
+(def start-build (u type planet)
+  (whenlet b (buy u type)
+           (= b!location planet)
+           (start-timer b!build-time [finish-build b])))
+
+(def finish-build (b)
+  (let u (get-user b!owner)
+    (= b!complete t
+       b!last-update (seconds)
+       (buildings* b!id) b)
+    ( b)))

objects.arc

@@ -33,15 +33,16 @@
 (deftem (planet object) 
   type 'planet 
   system nil            ; reference to system
-  planet_type nil       ; type of planet
+  planet-type nil       ; type of planet
   size nil              ; size of planet
   location nil          ; 3D coordinates
   residents nil         ; list of references to players
+  buildings nil
 )                       ; that live on the planet (may just be one)
 
 (deftem (unit object)
   type 'unit
-  unit_type nil         ; type of unit
+  unit-type nil         ; type of unit
   location nil          ; reference to planet,system,space,etc
   health nil            ; health of unit
   attack nil            ; temp placeholder (defines attack value)