~jb55/protoverse

e127c848c0029d1f8521c6d1f81a68eb54e9d4a8 — William Casarin 3 months ago 0a3bec4
fixes
3 files changed, 32 insertions(+), 37 deletions(-)

M satoshis-citadel.space
M src/describe.c
M src/protoverse.c
M satoshis-citadel.space => satoshis-citadel.space +30 -36
@@ 1,13 1,13 @@
(room (shape rectangle)
      (name "Satoshi's Den")
      (condition "clean")
      (condition "shiny")
      (material "solid gold")
      (name "Satoshi's Den")
      (width 10) (depth 10) (height 100)
      (group
	 (table (name "hardy")
	 	(material "rock")
	        (object (name "pencil")))
         (table (name "hardy")
                (material "rock")
                (object (name "pencil")))
         (table (id welcome-desk)
                (name "welcome desk")
                (material "marble")


@@ 15,39 15,33 @@
                (condition "new")
                (width 1) (depth 2) (height 1)
                (location center)
                (group 
		  (light (name "desk")
		  	 (condition "dirty")
		  	 (material "tin")
			 )
		  (obj (name "chessboard")
		       (condition "pristine")
		       (material "oak")
		    (group
		      (obj (p "a1") (color "white") (material "marble") (name "rook"))
		      (obj (p "b1") (color "white") (material "marble") (name "knight"))
		      (obj (p "c1") (color "white") (material "marble") (name "bishop"))
		      (obj (p "d1") (color "white") (material "marble") (name "queen"))
		      (obj (p "e1") (color "white") (material "marble") (name "king"))
		      (obj (p "f1") (color "white") (material "marble") (name "bishop"))
		      (obj (p "g1") (color "white") (material "marble") (name "knight"))
		      (obj (p "h1") (color "white") (material "marble") (name "rook"))
		      (obj (p "a8") (color "black") (material "marble") (name "rook"))
		      (obj (p "b8") (color "black") (material "marble") (name "knight"))
		      (obj (p "c8") (color "black") (material "marble") (name "bishop"))
		      (obj (p "d8") (color "black") (material "marble") (name "queen"))
		      (obj (p "e8") (color "black") (material "marble") (name "king"))
		      (obj (p "f8") (color "black") (material "marble") (name "bishop"))
		      (obj (p "g8") (color "black") (material "marble") (name "knight"))
		      (obj (p "h8") (color "black") (material "marble") (name "rook"))
		    ))))

         (chair (id a))
         (chair (id b))
         (chair (id c))
         (chair (id d))
                (group
                  (light (name "desk")
                         (condition "dirty")
                         (material "tin"))
                  (obj (name "chessboard")
                       (condition "pristine")
                       (material "oak")
                    (group
                      (obj (p "a1") (color "white") (material "marble") (name "rook"))
                      (obj (p "b1") (color "white") (material "marble") (name "knight"))
                      (obj (p "c1") (color "white") (material "marble") (name "bishop"))
                      (obj (p "d1") (color "white") (material "marble") (name "queen"))
                      (obj (p "e1") (color "white") (material "marble") (name "king"))
                      (obj (p "f1") (color "white") (material "marble") (name "bishop"))
                      (obj (p "g1") (color "white") (material "marble") (name "knight"))
                      (obj (p "h1") (color "white") (material "marble") (name "rook"))
                      (obj (p "a8") (color "black") (material "marble") (name "rook"))
                      (obj (p "b8") (color "black") (material "marble") (name "knight"))
                      (obj (p "c8") (color "black") (material "marble") (name "bishop"))
                      (obj (p "d8") (color "black") (material "marble") (name "queen"))
                      (obj (p "e8") (color "black") (material "marble") (name "king"))
                      (obj (p "f8") (color "black") (material "marble") (name "bishop"))
                      (obj (p "g8") (color "black") (material "marble") (name "knight"))
                      (obj (p "h8") (color "black") (material "marble") (name "rook"))
                    ))))

         (chair (name "throne") (material "invisible"))
         (chair (name "throne") (condition "invisible"))

         (light (location ceiling)
                (name "ceiling")

M src/describe.c => src/describe.c +1 -0
@@ 33,6 33,7 @@ static int push_adjective(struct cursor *strs, struct attribute *attr)
	int ok;

	switch (attr->type) {
	case A_COLOR:
	case A_CONDITION:
		ok = cursor_push_str(strs, " ");
		if (!ok) return 0;

M src/protoverse.c => src/protoverse.c +1 -1
@@ 176,7 176,7 @@ int main(int argc, const char *argv[])
				root = found;
		}

		print_cell_tree(&parser, root, 0);
		//print_cell_tree(&parser, root, 0);

		describe(&parser, root);
		free_parser(&parser);