01ab77c9d46a

Unfuck things
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Sat, 07 Jan 2017 19:17:56 +0000
parents 86c388644ac5
children dd9a7ef86a21
branches/tags (none)
files antipodes.asd src/config.lisp src/main.lisp

Changes

diff -r 86c388644ac5 -r 01ab77c9d46a antipodes.asd
--- a/antipodes.asd	Sat Jan 07 19:14:51 2017 +0000
+++ b/antipodes.asd	Sat Jan 07 19:17:56 2017 +0000
@@ -22,6 +22,7 @@
                (:module "src" :serial t
                 :components
                 ((:file "utilities")
+                 (:file "config")
                  (:module "aspects" :serial t
                   :components ((:file "coordinates")
                                (:file "holdable")
@@ -29,4 +30,5 @@
                  (:module "entities" :serial t
                   :components ((:file "food")
                                (:file "player")))
+                 (:file "flavor")
                  (:file "main")))))
diff -r 86c388644ac5 -r 01ab77c9d46a src/config.lisp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/config.lisp	Sat Jan 07 19:17:56 2017 +0000
@@ -0,0 +1,8 @@
+(in-package :ap)
+
+(defparameter *sidebar-width* 30)
+(defparameter *food-density* 1/6000)
+(defparameter *map-size* 2000)
+(defparameter *noise-scale* 0.03)
+(defparameter *noise-seed-x* (random 1000.0))
+(defparameter *noise-seed-y* (random 1000.0))
diff -r 86c388644ac5 -r 01ab77c9d46a src/main.lisp
--- a/src/main.lisp	Sat Jan 07 19:14:51 2017 +0000
+++ b/src/main.lisp	Sat Jan 07 19:17:56 2017 +0000
@@ -1,6 +1,5 @@
 (in-package :ap)
 
-
 ;;;; Data ---------------------------------------------------------------------
 (defparameter *logo* (read-file-into-string "data/logo.txt"))
 (defparameter *intro1* (read-file-into-string "data/intro1.txt"))
@@ -22,18 +21,11 @@
 (defparameter *view-x* nil)
 (defparameter *view-y* nil)
 
-(defparameter *wat* nil)
 (defparameter *player* nil)
-(defparameter *sidebar-width* 30)
-(defparameter *food-density* 1/6000)
 
 
 ;;;; Heightmap ----------------------------------------------------------------
 ;;; TODO: Switch to something less samey
-(defparameter *map-size* 2000)
-(defparameter *noise-scale* 0.03)
-(defparameter *noise-seed-x* (random 1000.0))
-(defparameter *noise-seed-y* (random 1000.0))
 
 (defun make-empty-heightmap ()
   (make-array (list *map-size* *map-size*)