[contraband-cvs] CVS: contraband/maps towns.lmap,1.2,1.3 warehouse.lmap,1.1,1.2

[Stig E S. <st...@us...>]

Update of /cvsroot/contraband/contraband/maps
In directory sc8-pr-cvs1:/tmp/cvs-serv28388/variants/contraband/maps

Modified Files:
	towns.lmap warehouse.lmap 
Log Message:
updgraded decor/traps/doors and floors from x-attr/x-char/text-attr/text-char to strictly gfx-sym and text-sym, also updated code that uses this

Index: towns.lmap
===================================================================
RCS file: /cvsroot/contraband/contraband/maps/towns.lmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** towns.lmap	20 Apr 2003 10:30:22 -0000	1.2
--- towns.lmap	25 Jun 2003 16:20:23 -0000	1.3
***************
*** 1,6 ****
  (define-map-symbol #\# "perm-solid" "solid outer wall"
!    :text-attr +term-white+
!    :text-char #\#
!    :x-attr (tile-file 29) :x-char (tile-number 1)
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
--- 1,5 ----
  (define-map-symbol #\# "perm-solid" "solid outer wall"
!    :text-sym (text-paint-value +term-white+ #\#)
!    :gfx-sym (tile-paint-value 29 1)
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
***************
*** 8,55 ****
  
  (define-map-symbol #\+ "building" "wooden building"
!    :text-attr +term-umber+
!    :text-char #\#
     :flags +floor-flag-wall+
!    :x-attr (tile-file 28) :x-char (tile-number 0)
!    )
  
  (define-map-symbol #\% "town-door" "a building door"
!    :text-attr +term-l-umber+
!    :text-char #\+
     :flags +floor-flag-wall+
!    :x-attr (tile-file 28) :x-char (tile-number 31)
!    )
  
  (define-map-symbol #\p "broken-town-door" "a broken building door"
!    :text-attr +term-l-dark+
!    :text-char #\+
     :flags +floor-flag-floor+
!    :x-attr (tile-file 28) :x-char (tile-number 33)
!    )
! 
  
  (define-map-symbol #\. "grass" "grass"
!    :text-attr +term-l-umber+
!    :text-char #\.
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
! ;;   :x-attr (tile-file 26) :x-char (tile-number 10)
!    :x-attr (tile-file 41) :x-char (tile-number 356)
     )
  
  (define-map-symbol #\~ "water" "water"
!    :text-attr +term-l-blue+
!    :text-char #\~
     :flags #.(logior +floor-flag-wall+ +floor-flag-use-light-effect+)
! ;;   :x-attr (tile-file 26) :x-char (tile-number 20)
!    :x-attr (tile-file 41) :x-char (tile-number 328)
     )
  
  (define-map-symbol #\= "bridge" "bridge"
!    :text-attr +term-l-dark+
!    :text-char #\=
     ;; improve
! ;;   :x-attr (tile-file 27) :x-char (tile-number 18)
!    :x-attr (tile-file 41) :x-char (tile-number 401)
     :flags #.(logior +floor-flag-floor+ 
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
--- 7,41 ----
  
  (define-map-symbol #\+ "building" "wooden building"
!    :text-sym (text-paint-value +term-umber+ #\#)
     :flags +floor-flag-wall+
!    :gfx-sym (tile-paint-value 28 0))
  
  (define-map-symbol #\% "town-door" "a building door"
!    :text-sym (text-paint-value +term-l-umber+ #\+)
     :flags +floor-flag-wall+
!    :gfx-sym (tile-paint-value 28 31))
  
  (define-map-symbol #\p "broken-town-door" "a broken building door"
!    :text-sym (text-paint-value +term-l-dark+ #\+)
     :flags +floor-flag-floor+
!    :gfx-sym (tile-paint-value 28 33))
  
  (define-map-symbol #\. "grass" "grass"
!    :text-sym (text-paint-value +term-l-umber+ #\.)
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
!    :gfx-sym (tile-paint-value 41 356) ;; (tile-paint-value 26 10)
     )
  
  (define-map-symbol #\~ "water" "water"
!    :text-sym (text-paint-value +term-l-blue+ #\~)
     :flags #.(logior +floor-flag-wall+ +floor-flag-use-light-effect+)
!    :gfx-sym (tile-paint-value 41 328) ;; (tile-paint-value 26 20)
     )
  
  (define-map-symbol #\= "bridge" "bridge"
!    :text-sym (text-paint-value +term-l-dark+ #\=)
     ;; improve
!    :gfx-sym (tile-paint-value 41 401) ;; (tile-paint-value 27 18)
     :flags #.(logior +floor-flag-floor+ 
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
***************
*** 57,65 ****
  
  (define-map-symbol #\* "pier" "pier"
!    :text-attr +term-l-umber+
!    :text-char #\=
     ;; improve
! ;;   :x-attr (tile-file 27) :x-char (tile-number 18)
!    :x-attr (tile-file 41) :x-char (tile-number 401)
     :flags #.(logior +floor-flag-floor+ 
                      +floor-flag-allow-creatures+)
--- 43,49 ----
  
  (define-map-symbol #\* "pier" "pier"
!    :text-sym (text-paint-value +term-l-umber+ #\=)
     ;; improve
!    :gfx-sym (tile-paint-value 41 401) ;; (tile-paint-value 27 18)
     :flags #.(logior +floor-flag-floor+ 
                      +floor-flag-allow-creatures+)
***************
*** 67,106 ****
  
  (define-map-symbol #\] "gate" "gate"
!    :text-attr +term-l-red+
!    :text-char #\#
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
!    :x-attr (tile-file 28) :x-char (tile-number 34)
     )
  
  (define-map-symbol #\, "road" "road"
!    :text-attr +term-l-dark+
!    :text-char #\.
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
! ;;   :x-attr (tile-file 26) :x-char (tile-number 13)
!    :x-attr (tile-file 41) :x-char (tile-number 424)
     )
  
  (define-map-symbol #\@ "wood" "wood"
!    :text-attr +term-green+
!    :text-char #\#
     :flags #.(logior +floor-flag-wall+ +floor-flag-use-light-effect+)
!    :x-attr (tile-file 26) :x-char (tile-number 61)
     )
  
  (define-map-symbol #\& "tree-house" "house in a tree"
!    :text-attr +term-l-green+
!    :text-char #\#
     ;; fix later	
!    :x-attr (tile-file 28) :x-char (tile-number 0)
     :flags +floor-flag-wall+
     )
  
  (define-map-symbol #\£ "mountainside" "mountainside"
!    :text-attr +term-l-dark+
!    :text-char #\#
     :flags #.(logior +floor-flag-use-light-effect+ +floor-flag-wall+)
!    :x-attr (tile-file 26) :x-char (tile-number 118)
     )
  
--- 51,84 ----
  
  (define-map-symbol #\] "gate" "gate"
!    :text-sym (text-paint-value +term-l-red+ #\#)
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
!    :gfx-sym (tile-paint-value 28 34)
     )
  
  (define-map-symbol #\, "road" "road"
!    :text-sym (text-paint-value +term-l-dark+ #\.)
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
!    :gfx-sym tile-paint-value 41 424) ;; (tile-paint-value 26 13)
     )
  
  (define-map-symbol #\@ "wood" "wood"
!    :text-sym (text-paint-value +term-green+ #\#)
     :flags #.(logior +floor-flag-wall+ +floor-flag-use-light-effect+)
!    :gfx-sym (tile-paint-value 26 61)
     )
  
  (define-map-symbol #\& "tree-house" "house in a tree"
!    :text-sym (text-paint-value +term-l-green+ #\#)
     ;; fix later	
!    :gfx-sym (tile-paint-value 28 0)
     :flags +floor-flag-wall+
     )
  
  (define-map-symbol #\£ "mountainside" "mountainside"
!    :text-sym (text-paint-value +term-l-dark+ #\#)
     :flags #.(logior +floor-flag-use-light-effect+ +floor-flag-wall+)
!    :gfx-sym (tile-paint-value 26 118)
     )
  

Index: warehouse.lmap
===================================================================
RCS file: /cvsroot/contraband/contraband/maps/warehouse.lmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** warehouse.lmap	20 Apr 2003 12:35:04 -0000	1.1
--- warehouse.lmap	25 Jun 2003 16:20:23 -0000	1.2
***************
*** 1,6 ****
  (define-map-symbol #\# "perm-solid" "solid outer wall"
!    :text-attr +term-white+
!    :text-char #\#
!    :x-attr (tile-file 29) :x-char (tile-number 1)
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
--- 1,5 ----
  (define-map-symbol #\# "perm-solid" "solid outer wall"
!    :text-sym (text-paint-value attr +term-white+ #\#)
!    :gfx-sym (tile-paint-value 29 1)
     :flags #.(logior +floor-flag-wall+
  	      	   +floor-flag-permanent+)
***************
*** 8,32 ****
  
  (define-map-symbol #\% "town-door" "a building door"
!    :text-attr +term-l-umber+
!    :text-char #\+
     :flags +floor-flag-wall+
!    :x-attr (tile-file 28) :x-char (tile-number 31)
     )
  
  
  (define-map-symbol #\p "broken-town-door" "a broken building door"
!    :text-attr +term-l-dark+
!    :text-char #\+
     :flags +floor-flag-floor+
!    :x-attr (tile-file 28) :x-char (tile-number 33)
     )
  
  (define-map-symbol #\. "floor" "floor"
!    :text-attr +term-l-umber+
!    :text-char #\.
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
!    :x-attr (tile-file 26) :x-char (tile-number 8)
! ;;   :x-attr (tile-file 41) :x-char (tile-number 356)
     )
  
--- 7,27 ----
  
  (define-map-symbol #\% "town-door" "a building door"
!    :text-sym (text-paint-value +term-l-umber+ #\+)
     :flags +floor-flag-wall+
!    :gfx-sym (tile-paint-value 28 31)
     )
  
  
  (define-map-symbol #\p "broken-town-door" "a broken building door"
!    :text-sym (text-paint-value +term-l-dark+ #\+)
     :flags +floor-flag-floor+
!    :gfx-sym (tile-paint-value 28 33)
     )
  
  (define-map-symbol #\. "floor" "floor"
!    :text-sym (text-paint-value +term-l-umber+ #\.)
     :flags #.(logior +floor-flag-floor+ +floor-flag-use-light-effect+
                      +floor-flag-allow-items+ +floor-flag-allow-creatures+)
!    :gfx-sym (tile-paint-value 26 8) ;; (tile-paint-value 41 356)
     )