[contraband-cvs] CVS: contraband/config objects.lisp,1.8,1.9 armour.lisp,1.5,1.6

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	objects.lisp armour.lisp 
Log Message:
finally killed off game-values object and incorporated the remaining combat-related info in okind and aobj.  also removed any game-values related code.  did some renaming of old functions that made more sense now.

Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/objects.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** objects.lisp	1 Jun 2003 23:36:39 -0000	1.8
--- objects.lisp	2 Jun 2003 12:33:40 -0000	1.9
***************
*** 194,198 ****
    :sort-value 301
    :the-kind '<body-armour>
!   :base-ac 1
    :stat-modifiers '((<pre> +2)))
  
--- 194,198 ----
    :sort-value 301
    :the-kind '<body-armour>
!   :armour-rating 1
    :stat-modifiers '((<pre> +2)))
  

Index: armour.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/armour.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** armour.lisp	2 Jun 2003 11:17:41 -0000	1.5
--- armour.lisp	2 Jun 2003 12:33:41 -0000	1.6
***************
*** 116,120 ****
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
--- 116,120 ----
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :armour-rating +ar-cloth+)
  
  (define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
***************
*** 129,133 ****
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "leather-boots" "& pair~ of leather boots"
--- 129,133 ----
    :bulk +ab-cloth+
    :the-kind '<boots>
!   :armour-rating +ar-cloth+)
  
  (define-object-kind "leather-boots" "& pair~ of leather boots"
***************
*** 144,148 ****
    :bulk +ab-leather+
    :the-kind '<boots>
!   :base-ac +ar-leather+)
  
  (define-object-kind "fur-boots" "& pair~ of fur boots"
--- 144,148 ----
    :bulk +ab-leather+
    :the-kind '<boots>
!   :armour-rating +ar-leather+)
  
  (define-object-kind "fur-boots" "& pair~ of fur boots"
***************
*** 157,161 ****
    :bulk +ab-fur+
    :the-kind '<boots>
!   :base-ac +ar-fur+)
  
  (define-object-kind "chain-boots" "& pair~ of chain boots"
--- 157,161 ----
    :bulk +ab-fur+
    :the-kind '<boots>
!   :armour-rating +ar-fur+)
  
  (define-object-kind "chain-boots" "& pair~ of chain boots"
***************
*** 172,176 ****
    :bulk +ab-chain-mail+
    :the-kind '<boots>
!   :base-ac +ar-chain-mail+)
  
  (define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
--- 172,176 ----
    :bulk +ab-chain-mail+
    :the-kind '<boots>
!   :armour-rating +ar-chain-mail+)
  
  (define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
***************
*** 187,191 ****
    :bulk +ab-bronze+
    :the-kind '<boots>
!   :base-ac +ar-steel+)
  
  (define-object-kind "steel-boots" "& pair~ of steel-plated boots"
--- 187,191 ----
    :bulk +ab-bronze+
    :the-kind '<boots>
!   :armour-rating +ar-steel+)
  
  (define-object-kind "steel-boots" "& pair~ of steel-plated boots"
***************
*** 202,206 ****
    :bulk +ab-steel+
    :the-kind '<boots>
!   :base-ac +ar-steel+)
  
  ;;; == headwear
--- 202,206 ----
    :bulk +ab-steel+
    :the-kind '<boots>
!   :armour-rating +ar-steel+)
  
  ;;; == headwear
***************
*** 219,223 ****
    :bulk +ab-cloth+
    :the-kind '<headgear>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "leather-cap" "& leather cap~"
--- 219,223 ----
    :bulk +ab-cloth+
    :the-kind '<headgear>
!   :armour-rating +ar-cloth+)
  
  (define-object-kind "leather-cap" "& leather cap~"
***************
*** 234,238 ****
    :bulk +ab-leather+
    :the-kind '<headgear>
!   :base-ac +ar-leather+)
  
  (define-object-kind "fur-cap" "& fur cap~"
--- 234,238 ----
    :bulk +ab-leather+
    :the-kind '<headgear>
!   :armour-rating +ar-leather+)
  
  (define-object-kind "fur-cap" "& fur cap~"
***************
*** 247,251 ****
    :bulk +ab-fur+
    :the-kind '<headgear>
!   :base-ac +ar-fur+)
  
  (define-object-kind "chain-coif" "& chain-coif~"
--- 247,251 ----
    :bulk +ab-fur+
    :the-kind '<headgear>
!   :armour-rating +ar-fur+)
  
  (define-object-kind "chain-coif" "& chain-coif~"
***************
*** 262,266 ****
    :bulk +ab-chain-mail+
    :the-kind '<headgear>
!   :base-ac +ar-chain-mail+)
  
  (define-object-kind "iron-helm" "& iron helm~"
--- 262,266 ----
    :bulk +ab-chain-mail+
    :the-kind '<headgear>
!   :armour-rating +ar-chain-mail+)
  
  (define-object-kind "iron-helm" "& iron helm~"
***************
*** 277,281 ****
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :base-ac 5)
  
  (define-object-kind "steel-helm" "& steel helm~"
--- 277,281 ----
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :armour-rating 5)
  
  (define-object-kind "steel-helm" "& steel helm~"
***************
*** 292,296 ****
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :base-ac 6)
  
  
--- 292,296 ----
    :bulk +ab-iron+
    :the-kind '<headgear>
!   :armour-rating 6)
  
  
***************
*** 310,314 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
--- 310,314 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 326,330 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
--- 326,330 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 342,346 ****
    :bulk +ab-leather+
    :the-kind '<body-armour>
!   :base-ac +ar-leather+)
  
  (define-object-kind "studded-leather" "studded leather~"
--- 342,346 ----
    :bulk +ab-leather+
    :the-kind '<body-armour>
!   :armour-rating +ar-leather+)
  
  (define-object-kind "studded-leather" "studded leather~"
***************
*** 357,361 ****
    :bulk +ab-studded-leather+
    :the-kind '<body-armour>
!   :base-ac 5)
  
  (define-object-kind "chain-mail" "chain mail~"
--- 357,361 ----
    :bulk +ab-studded-leather+
    :the-kind '<body-armour>
!   :armour-rating 5)
  
  (define-object-kind "chain-mail" "chain mail~"
***************
*** 372,376 ****
    :bulk +ab-chain-mail+
    :the-kind '<body-armour>
!   :base-ac +ar-chain-mail+)
  
  (define-object-kind "metal-lamellar" "metal lamellar armour~"
--- 372,376 ----
    :bulk +ab-chain-mail+
    :the-kind '<body-armour>
!   :armour-rating +ar-chain-mail+)
  
  (define-object-kind "metal-lamellar" "metal lamellar armour~"
***************
*** 387,391 ****
    :bulk +ab-lamellar+
    :the-kind '<body-armour>
!   :base-ac +ar-lamellar+)
  
  (define-object-kind "steel-plate" "steel plate armour~"
--- 387,391 ----
    :bulk +ab-lamellar+
    :the-kind '<body-armour>
!   :armour-rating +ar-lamellar+)
  
  (define-object-kind "steel-plate" "steel plate armour~"
***************
*** 402,406 ****
    :bulk +ab-steel+
    :the-kind '<body-armour>
!   :base-ac +ar-steel+)
  
  (define-object-kind "shirt-common" "& common shirt~"
--- 402,406 ----
    :bulk +ab-steel+
    :the-kind '<body-armour>
!   :armour-rating +ar-steel+)
  
  (define-object-kind "shirt-common" "& common shirt~"
***************
*** 417,421 ****
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :base-ac +ar-cloth+)
  
  
--- 417,421 ----
    :bulk +ab-cloth+
    :the-kind '<body-armour>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 435,439 ****
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "pants-common" "& common pants"
--- 435,439 ----
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :armour-rating +ar-cloth+)
  
  (define-object-kind "pants-common" "& common pants"
***************
*** 450,454 ****
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :base-ac +ar-cloth+)
  
  
--- 450,454 ----
    :bulk +ab-cloth+
    :the-kind '<legwear>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 469,473 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  
--- 469,473 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 485,489 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  (define-object-kind "shadow-cloak" "& shadow cloak~"
--- 485,489 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :armour-rating +ar-cloth+)
  
  (define-object-kind "shadow-cloak" "& shadow cloak~"
***************
*** 500,505 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac 6
!   :ac-modifier 4)
  
  (define-object-kind "coat-common" "& common coat~"
--- 500,505 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :armour-rating 6
!   :armour-modifier 4)
  
  (define-object-kind "coat-common" "& common coat~"
***************
*** 516,520 ****
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :base-ac +ar-cloth+)
  
  
--- 516,520 ----
    :bulk +ab-cloth+
    :the-kind '<cloak>
!   :armour-rating +ar-cloth+)
  
  
***************
*** 534,538 ****
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :base-ac +ar-leather+)
  
  (define-object-kind "gloves-leather" "& set~ of leather gloves"
--- 534,538 ----
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :armour-rating +ar-leather+)
  
  (define-object-kind "gloves-leather" "& set~ of leather gloves"
***************
*** 549,553 ****
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :base-ac 1)
  
  (define-object-kind "gauntlets" "& set~ of gauntlets"
--- 549,553 ----
    :bulk +ab-leather+
    :the-kind '<gloves>
!   :armour-rating 1)
  
  (define-object-kind "gauntlets" "& set~ of gauntlets"
***************
*** 564,568 ****
    :bulk +ab-chain-mail+
    :the-kind '<gloves>
!   :base-ac 2)
  
  (define-object-kind "cesti" "& set~ of cesti"
--- 564,568 ----
    :bulk +ab-chain-mail+
    :the-kind '<gloves>
!   :armour-rating 2)
  
  (define-object-kind "cesti" "& set~ of cesti"
***************
*** 579,583 ****
    :bulk +ab-steel+
    :the-kind '<gloves>
!   :base-ac 5)
  
  ;;; == shields
--- 579,583 ----
    :bulk +ab-steel+
    :the-kind '<gloves>
!   :armour-rating 5)
  
  ;;; == shields
***************
*** 596,600 ****
    :bulk 3
    :the-kind '<shield>
!   :base-ac 2)
  
  (define-object-kind "large-leather-shield" "& large leather shield~"
--- 596,600 ----
    :bulk 3
    :the-kind '<shield>
!   :armour-rating 2)
  
  (define-object-kind "large-leather-shield" "& large leather shield~"
***************
*** 611,615 ****
    :bulk 8
    :the-kind '<shield>
!   :base-ac 4)
  
  (define-object-kind "small-metal-shield" "& small metal shield~"
--- 611,615 ----
    :bulk 8
    :the-kind '<shield>
!   :armour-rating 4)
  
  (define-object-kind "small-metal-shield" "& small metal shield~"
***************
*** 626,630 ****
    :bulk 6
    :the-kind '<shield>
!   :base-ac 3)
  
  (define-object-kind "large-metal-shield" "& large metal shield~"
--- 626,630 ----
    :bulk 6
    :the-kind '<shield>
!   :armour-rating 3)
  
  (define-object-kind "large-metal-shield" "& large metal shield~"
***************
*** 641,644 ****
    :bulk 10
    :the-kind '<shield>
!   :base-ac 5)
  
--- 641,644 ----
    :bulk 10
    :the-kind '<shield>
!   :armour-rating 5)