diff --git a/TODO b/TODO index 625647d..66c02b4 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,8 @@ GAME +* fix news popup window + * change world to 2D array * optimise world creation & map transfer @@ -22,6 +24,8 @@ * save & load games +* create help window + * generate secondary seeds to smoothen landscape * split `naledi-ya-africa` package into `naledi-server` and `naledi-client`? @@ -51,6 +55,8 @@ -> haven't seen it in a long time (as of 31/12/2018) -> seemed to be a secondary bug from some other problem that is now fixed -> negative: appeared again 20/06/19 + -> was a string/symbol name issue + -> should be fixed now -> HEISENBUGS diff --git a/TODO b/TODO index 625647d..66c02b4 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,8 @@ GAME +* fix news popup window + * change world to 2D array * optimise world creation & map transfer @@ -22,6 +24,8 @@ * save & load games +* create help window + * generate secondary seeds to smoothen landscape * split `naledi-ya-africa` package into `naledi-server` and `naledi-client`? @@ -51,6 +55,8 @@ -> haven't seen it in a long time (as of 31/12/2018) -> seemed to be a secondary bug from some other problem that is now fixed -> negative: appeared again 20/06/19 + -> was a string/symbol name issue + -> should be fixed now -> HEISENBUGS diff --git a/content/biomes.lisp b/content/biomes.lisp index c678443..9e36231 100644 --- a/content/biomes.lisp +++ b/content/biomes.lisp @@ -31,6 +31,7 @@ (new-biome stream :ground "shallow flowing water" + :landscape NIL :char #\~ :col :blue :features '()) ;TODO diff --git a/TODO b/TODO index 625647d..66c02b4 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,8 @@ GAME +* fix news popup window + * change world to 2D array * optimise world creation & map transfer @@ -22,6 +24,8 @@ * save & load games +* create help window + * generate secondary seeds to smoothen landscape * split `naledi-ya-africa` package into `naledi-server` and `naledi-client`? @@ -51,6 +55,8 @@ -> haven't seen it in a long time (as of 31/12/2018) -> seemed to be a secondary bug from some other problem that is now fixed -> negative: appeared again 20/06/19 + -> was a string/symbol name issue + -> should be fixed now -> HEISENBUGS diff --git a/content/biomes.lisp b/content/biomes.lisp index c678443..9e36231 100644 --- a/content/biomes.lisp +++ b/content/biomes.lisp @@ -31,6 +31,7 @@ (new-biome stream :ground "shallow flowing water" + :landscape NIL :char #\~ :col :blue :features '()) ;TODO diff --git a/params.lisp b/params.lisp index e0327ad..3b1f3fa 100644 --- a/params.lisp +++ b/params.lisp @@ -28,7 +28,7 @@ (defparameter *framerate* 1000) ;;Localhost defaults -(defparameter *defaulthost* '("127.0.0.1" 21899)) ;default port: 21895 +(defparameter *defaulthost* '("127.0.0.1" 21895)) ;default port: 21895 ;;Host server address to connect to - XXX global variable! (defparameter *host* (first *defaulthost*)) diff --git a/TODO b/TODO index 625647d..66c02b4 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,8 @@ GAME +* fix news popup window + * change world to 2D array * optimise world creation & map transfer @@ -22,6 +24,8 @@ * save & load games +* create help window + * generate secondary seeds to smoothen landscape * split `naledi-ya-africa` package into `naledi-server` and `naledi-client`? @@ -51,6 +55,8 @@ -> haven't seen it in a long time (as of 31/12/2018) -> seemed to be a secondary bug from some other problem that is now fixed -> negative: appeared again 20/06/19 + -> was a string/symbol name issue + -> should be fixed now -> HEISENBUGS diff --git a/content/biomes.lisp b/content/biomes.lisp index c678443..9e36231 100644 --- a/content/biomes.lisp +++ b/content/biomes.lisp @@ -31,6 +31,7 @@ (new-biome stream :ground "shallow flowing water" + :landscape NIL :char #\~ :col :blue :features '()) ;TODO diff --git a/params.lisp b/params.lisp index e0327ad..3b1f3fa 100644 --- a/params.lisp +++ b/params.lisp @@ -28,7 +28,7 @@ (defparameter *framerate* 1000) ;;Localhost defaults -(defparameter *defaulthost* '("127.0.0.1" 21899)) ;default port: 21895 +(defparameter *defaulthost* '("127.0.0.1" 21895)) ;default port: 21895 ;;Host server address to connect to - XXX global variable! (defparameter *host* (first *defaulthost*)) diff --git a/server/world.lisp b/server/world.lisp index dd3cfe7..fb65c68 100644 --- a/server/world.lisp +++ b/server/world.lisp @@ -18,6 +18,7 @@ (defstruct biome (name "") (ground "") + (landscape T) ;part of the landscape? (features '()) ;an alist of possible features and their 1/p probabilities (char #\.) ;default map display character (col ':white)) ;default map display colour @@ -142,9 +143,8 @@ ;; current purposes they are good enough (let* ((wsize (world-size)) (seeds NIL) (nseeds (round (/ wsize size-factor))) - (biomes (remove-first-if - ;;FIXME very occasionally creates lakes? - #'(lambda (e) (eq e 'stream)) + (biomes (remove-if + #'(lambda (e) (null (biome-landscape (get-biome e)))) (available-biomes)))) ;;Initialize a set of biome 'seed' coordinates (dotimes (n nseeds)