[contraband-cvs] CVS: contraband/config armour.lisp,1.3,1.4 objects.lisp,1.7,1.8

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

Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv9282

Modified Files:
	armour.lisp objects.lisp 
Log Message:
moved armour-related values out of gvals to aobj and okind

Index: armour.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/armour.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** armour.lisp	17 Apr 2003 10:51:33 -0000	1.3
--- armour.lisp	1 Jun 2003 23:36:38 -0000	1.4
***************
*** 116,120 ****
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-cloth+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
--- 116,121 ----
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :base-ac +ar-cloth
!   :game-values (make-game-values + :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
***************
*** 129,133 ****
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-cloth+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "leather-boots" "& pair~ of leather boots"
--- 130,135 ----
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :base-ac +ar-cloth+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "leather-boots" "& pair~ of leather boots"
***************
*** 144,148 ****
    :bulk +ab-leather+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-leather+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "fur-boots" "& pair~ of fur boots"
--- 146,151 ----
    :bulk +ab-leather+
    :the-kind '<boots>
!   :base-ac +ar-leather+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "fur-boots" "& pair~ of fur boots"
***************
*** 157,161 ****
    :bulk +ab-fur+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-fur+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "chain-boots" "& pair~ of chain boots"
--- 160,165 ----
    :bulk +ab-fur+
    :the-kind '<boots>
!   :base-ac +ar-fur+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "chain-boots" "& pair~ of chain boots"
***************
*** 172,176 ****
    :bulk +ab-chain-mail+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-chain-mail+ :base-dice 1 :num-dice 1))
  
  (define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
--- 176,181 ----
    :bulk +ab-chain-mail+
    :the-kind '<boots>
!   :base-ac +ar-chain-mail+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1))
  
  (define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
***************
*** 187,191 ****
    :bulk +ab-bronze+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-steel+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "steel-boots" "& pair~ of steel-plated boots"
--- 192,197 ----
    :bulk +ab-bronze+
    :the-kind '<boots>
!   :base-ac +ar-steel+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "steel-boots" "& pair~ of steel-plated boots"
***************
*** 202,206 ****
    :bulk +ab-steel+
    :the-kind '<boots>
!   :game-values (make-game-values :base-ac +ar-steel+ :base-dice 1 :num-dice 1)) 
  
  ;;; == headwear
--- 208,213 ----
    :bulk +ab-steel+
    :the-kind '<boots>
!   :base-ac +ar-steel+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  ;;; == headwear
***************
*** 219,223 ****
    :bulk +ab-cloth+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  (define-object-kind "leather-cap" "& leather cap~"
--- 226,230 ----
    :bulk +ab-cloth+
    :the-kind '<headgear>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "leather-cap" "& leather cap~"
***************
*** 234,238 ****
    :bulk +ab-leather+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac +ar-leather+)) 
  
  (define-object-kind "fur-cap" "& fur cap~"
--- 241,245 ----
    :bulk +ab-leather+
    :the-kind '<headgear>
!   :base-ac +ar-leather+)
  
  (define-object-kind "fur-cap" "& fur cap~"
***************
*** 247,251 ****
    :bulk +ab-fur+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac +ar-fur+)) 
  
  (define-object-kind "chain-coif" "& chain-coif~"
--- 254,258 ----
    :bulk +ab-fur+
    :the-kind '<headgear>
!   :base-ac +ar-fur+)
  
  (define-object-kind "chain-coif" "& chain-coif~"
***************
*** 262,266 ****
    :bulk +ab-chain-mail+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac +ar-chain-mail+ :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "iron-helm" "& iron helm~"
--- 269,274 ----
    :bulk +ab-chain-mail+
    :the-kind '<headgear>
!   :base-ac +ar-chain-mail+
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "iron-helm" "& iron helm~"
***************
*** 277,281 ****
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac 5 :base-dice 3 :num-dice 1)) 
  
  (define-object-kind "steel-helm" "& steel helm~"
--- 285,290 ----
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :base-ac 5
!   :game-values (make-game-values  :base-dice 3 :num-dice 1)) 
  
  (define-object-kind "steel-helm" "& steel helm~"
***************
*** 292,296 ****
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :game-values (make-game-values :base-ac 6 :base-dice 3 :num-dice 1)) 
  
  
--- 301,306 ----
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :base-ac 6
!   :game-values (make-game-values  :base-dice 3 :num-dice 1)) 
  
  
***************
*** 310,314 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 320,324 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
***************
*** 326,330 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 336,340 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
***************
*** 342,346 ****
    :bulk +ab-leather+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-leather+)) 
  
  (define-object-kind "studded-leather" "studded leather~"
--- 352,356 ----
    :bulk +ab-leather+
    :the-kind '<body-armour>
!   :base-ac +ar-leather+)
  
  (define-object-kind "studded-leather" "studded leather~"
***************
*** 357,361 ****
    :bulk +ab-studded-leather+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac 5 :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "chain-mail" "chain mail~"
--- 367,372 ----
    :bulk +ab-studded-leather+
    :the-kind '<body-armour>
!   :base-ac 5
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "chain-mail" "chain mail~"
***************
*** 372,376 ****
    :bulk +ab-chain-mail+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-chain-mail+ :base-dice 4 :num-dice 1 :tohit-modifier -2)) 
  
  (define-object-kind "metal-lamellar" "metal lamellar armour~"
--- 383,388 ----
    :bulk +ab-chain-mail+
    :the-kind '<body-armour>
!   :base-ac +ar-chain-mail+
!   :game-values (make-game-values  :base-dice 4 :num-dice 1 :tohit-modifier -2)) 
  
  (define-object-kind "metal-lamellar" "metal lamellar armour~"
***************
*** 387,391 ****
    :bulk +ab-lamellar+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-lamellar+ :base-dice 6 :num-dice 1 :tohit-modifier -3)) 
  
  (define-object-kind "steel-plate" "steel plate armour~"
--- 399,404 ----
    :bulk +ab-lamellar+
    :the-kind '<body-armour>
!   :base-ac +ar-lamellar+
!   :game-values (make-game-values  :base-dice 6 :num-dice 1 :tohit-modifier -3)) 
  
  (define-object-kind "steel-plate" "steel plate armour~"
***************
*** 402,406 ****
    :bulk +ab-steel+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-steel+ :base-dice 4 :num-dice 2 :tohit-modifier -3)) 
  
  (define-object-kind "shirt-common" "& common shirt~"
--- 415,420 ----
    :bulk +ab-steel+
    :the-kind '<body-armour>
!   :base-ac +ar-steel+
!   :game-values (make-game-values  :base-dice 4 :num-dice 2 :tohit-modifier -3)) 
  
  (define-object-kind "shirt-common" "& common shirt~"
***************
*** 417,421 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 431,435 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
***************
*** 435,439 ****
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  (define-object-kind "pants-common" "& common pants"
--- 449,453 ----
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "pants-common" "& common pants"
***************
*** 450,454 ****
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 464,468 ----
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :base-ac +ar-cloth+)
  
  
***************
*** 469,473 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 483,487 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  
***************
*** 485,489 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  (define-object-kind "shadow-cloak" "& shadow cloak~"
--- 499,503 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "shadow-cloak" "& shadow cloak~"
***************
*** 500,504 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :game-values (make-game-values :base-ac 6 :ac-modifier 4)) 
  
  (define-object-kind "coat-common" "& common coat~"
--- 514,519 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac 6
!   :ac-modifier 4)
  
  (define-object-kind "coat-common" "& common coat~"
***************
*** 515,519 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :game-values (make-game-values :base-ac +ar-cloth+)) 
  
  
--- 530,534 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  
***************
*** 533,537 ****
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :game-values (make-game-values :base-ac +ar-leather+)) 
  
  (define-object-kind "gloves-leather" "& set~ of leather gloves"
--- 548,552 ----
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :base-ac +ar-leather+)
  
  (define-object-kind "gloves-leather" "& set~ of leather gloves"
***************
*** 548,552 ****
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :game-values (make-game-values :base-ac 1)) 
  
  (define-object-kind "gauntlets" "& set~ of gauntlets"
--- 563,567 ----
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :base-ac 1)
  
  (define-object-kind "gauntlets" "& set~ of gauntlets"
***************
*** 563,567 ****
    :bulk +ab-chain-mail+
    :the-kind '<gloves>
!   :game-values (make-game-values :base-ac 2 :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "cesti" "& set~ of cesti"
--- 578,583 ----
    :bulk +ab-chain-mail+
    :the-kind '<gloves>
!   :base-ac 2
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "cesti" "& set~ of cesti"
***************
*** 578,582 ****
    :bulk +ab-steel+
    :the-kind '<gloves>
!   :game-values (make-game-values :base-ac 5 :base-dice 1 :num-dice 1)) 
  
  ;;; == shields
--- 594,599 ----
    :bulk +ab-steel+
    :the-kind '<gloves>
!   :base-ac 5
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  ;;; == shields
***************
*** 595,599 ****
    :bulk 3
    :the-kind '<shield>
!   :game-values (make-game-values :base-ac 2 :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "large-leather-shield" "& large leather shield~"
--- 612,617 ----
    :bulk 3
    :the-kind '<shield>
!   :base-ac 2
!   :game-values (make-game-values  :base-dice 1 :num-dice 1)) 
  
  (define-object-kind "large-leather-shield" "& large leather shield~"
***************
*** 610,614 ****
    :bulk 8
    :the-kind '<shield>
!   :game-values (make-game-values :base-ac 4 :base-dice 2 :num-dice 1)) 
  
  (define-object-kind "small-metal-shield" "& small metal shield~"
--- 628,633 ----
    :bulk 8
    :the-kind '<shield>
!   :base-ac 4 
!   :game-values (make-game-values :base-dice 2 :num-dice 1)) 
  
  (define-object-kind "small-metal-shield" "& small metal shield~"
***************
*** 625,629 ****
    :bulk 6
    :the-kind '<shield>
!   :game-values (make-game-values :base-ac 3 :base-dice 2 :num-dice 1)) 
  
  (define-object-kind "large-metal-shield" "& large metal shield~"
--- 644,649 ----
    :bulk 6
    :the-kind '<shield>
!   :base-ac 3
!   :game-values (make-game-values  :base-dice 2 :num-dice 1)) 
  
  (define-object-kind "large-metal-shield" "& large metal shield~"
***************
*** 640,643 ****
    :bulk 10
    :the-kind '<shield>
!   :game-values (make-game-values :base-ac 5 :base-dice 3 :num-dice 1)) 
  
--- 660,664 ----
    :bulk 10
    :the-kind '<shield>
!   :base-ac 5
!   :game-values (make-game-values  :base-dice 3 :num-dice 1)) 
  

Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/objects.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** objects.lisp	1 Jun 2003 16:09:07 -0000	1.7
--- objects.lisp	1 Jun 2003 23:36:39 -0000	1.8
***************
*** 194,198 ****
    :sort-value 301
    :the-kind '<body-armour>
!   :game-values (make-game-values :base-ac 1)
    :stat-modifiers '((<pre> +2)))
  
--- 194,198 ----
    :sort-value 301
    :the-kind '<body-armour>
!   :base-ac 1
    :stat-modifiers '((<pre> +2)))