--- a/src/config.lisp Sun Jan 08 00:31:45 2017 +0000
+++ b/src/config.lisp Sun Jan 08 11:12:19 2017 +0000
@@ -14,3 +14,18 @@
(defparameter *ruin-size-dev* 2.0)
(defparameter *graffiti-chance* 1/10)
(defparameter *flavor-chance* 1/300)
+
+(defcolors
+ (+white-black+ charms/ll:COLOR_WHITE charms/ll:COLOR_BLACK)
+ (+blue-black+ charms/ll:COLOR_BLUE charms/ll:COLOR_BLACK)
+ (+cyan-black+ charms/ll:COLOR_CYAN charms/ll:COLOR_BLACK)
+ (+yellow-black+ charms/ll:COLOR_YELLOW charms/ll:COLOR_BLACK)
+ (+green-black+ charms/ll:COLOR_GREEN charms/ll:COLOR_BLACK)
+ (+pink-black+ charms/ll:COLOR_MAGENTA charms/ll:COLOR_BLACK)
+
+ (+black-white+ charms/ll:COLOR_BLACK charms/ll:COLOR_WHITE)
+ (+black-blue+ charms/ll:COLOR_BLACK charms/ll:COLOR_BLUE)
+ (+black-cyan+ charms/ll:COLOR_BLACK charms/ll:COLOR_CYAN)
+ (+black-yellow+ charms/ll:COLOR_BLACK charms/ll:COLOR_YELLOW)
+ (+black-green+ charms/ll:COLOR_BLACK charms/ll:COLOR_GREEN)
+ (+black-pink+ charms/ll:COLOR_BLACK charms/ll:COLOR_MAGENTA))
--- a/src/entities/food.lisp Sun Jan 08 00:31:45 2017 +0000
+++ b/src/entities/food.lisp Sun Jan 08 11:12:19 2017 +0000
@@ -22,7 +22,7 @@
:coords/x x
:coords/y y
:visible/glyph "%"
- :visible/color ap::+yellow-black+
+ :visible/color ap::+black-yellow+
:holdable/description (random-food-description)
:food/energy (random-food-energy)))
--- a/src/entities/jewelery.lisp Sun Jan 08 00:31:45 2017 +0000
+++ b/src/entities/jewelery.lisp Sun Jan 08 11:12:19 2017 +0000
@@ -29,5 +29,5 @@
:coords/x x
:coords/y y
:visible/glyph "*"
- :visible/color ap::+green-black+
+ :visible/color ap::+black-pink+
:holdable/description (random-jewelery-description)))
--- a/src/main.lisp Sun Jan 08 00:31:45 2017 +0000
+++ b/src/main.lisp Sun Jan 08 11:12:19 2017 +0000
@@ -25,19 +25,6 @@
(defparameter *player* nil)
-;;;; Colors -------------------------------------------------------------------
-(defcolors
- (+white-black+ charms/ll:COLOR_WHITE charms/ll:COLOR_BLACK)
- (+blue-black+ charms/ll:COLOR_BLUE charms/ll:COLOR_BLACK)
- (+cyan-black+ charms/ll:COLOR_CYAN charms/ll:COLOR_BLACK)
- (+yellow-black+ charms/ll:COLOR_YELLOW charms/ll:COLOR_BLACK)
- (+green-black+ charms/ll:COLOR_GREEN charms/ll:COLOR_BLACK)
- (+pink-black+ charms/ll:COLOR_MAGENTA charms/ll:COLOR_BLACK)
-
- (+black-white+ charms/ll:COLOR_BLACK charms/ll:COLOR_WHITE)
- )
-
-
;;;; Heightmap ----------------------------------------------------------------
;;; TODO: Switch to something less samey