[contraband-cvs] CVS: contraband/config armour.lisp,1.4,1.5 weapons.lisp,1.2,1.3
Status: Pre-Alpha
Brought to you by:
stig
|
From: Stig E S. <st...@us...> - 2003-06-02 11:17:44
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv5581
Modified Files:
armour.lisp weapons.lisp
Log Message:
moved game-objects away from game-values for combat info to use a :damage argument to okind instead
Index: armour.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/armour.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** armour.lisp 1 Jun 2003 23:36:38 -0000 1.4
--- armour.lisp 2 Jun 2003 11:17:41 -0000 1.5
***************
*** 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"
--- 116,120 ----
:bulk +ab-cloth+
:the-kind '<boots>
! :base-ac +ar-cloth+)
(define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
***************
*** 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"
--- 129,133 ----
:bulk +ab-cloth+
:the-kind '<boots>
! :base-ac +ar-cloth+)
(define-object-kind "leather-boots" "& pair~ of leather 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"
--- 144,148 ----
:bulk +ab-leather+
:the-kind '<boots>
! :base-ac +ar-leather+)
(define-object-kind "fur-boots" "& pair~ of fur 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"
--- 157,161 ----
:bulk +ab-fur+
:the-kind '<boots>
! :base-ac +ar-fur+)
(define-object-kind "chain-boots" "& pair~ of chain 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"
--- 172,176 ----
:bulk +ab-chain-mail+
:the-kind '<boots>
! :base-ac +ar-chain-mail+)
(define-object-kind "bronze-boots" "& pair~ of bronze-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"
--- 187,191 ----
:bulk +ab-bronze+
:the-kind '<boots>
! :base-ac +ar-steel+)
(define-object-kind "steel-boots" "& pair~ of steel-plated boots"
***************
*** 208,213 ****
:bulk +ab-steel+
:the-kind '<boots>
! :base-ac +ar-steel+
! :game-values (make-game-values :base-dice 1 :num-dice 1))
;;; == headwear
--- 202,206 ----
:bulk +ab-steel+
:the-kind '<boots>
! :base-ac +ar-steel+)
;;; == headwear
***************
*** 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~"
--- 262,266 ----
:bulk +ab-chain-mail+
:the-kind '<headgear>
! :base-ac +ar-chain-mail+)
(define-object-kind "iron-helm" "& iron 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~"
--- 277,281 ----
:bulk +ab-iron+
:the-kind '<headgear>
! :base-ac 5)
(define-object-kind "steel-helm" "& steel helm~"
***************
*** 301,306 ****
:bulk +ab-iron+
:the-kind '<headgear>
! :base-ac 6
! :game-values (make-game-values :base-dice 3 :num-dice 1))
--- 292,296 ----
:bulk +ab-iron+
:the-kind '<headgear>
! :base-ac 6)
***************
*** 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~"
--- 357,361 ----
:bulk +ab-studded-leather+
:the-kind '<body-armour>
! :base-ac 5)
(define-object-kind "chain-mail" "chain mail~"
***************
*** 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~"
--- 372,376 ----
:bulk +ab-chain-mail+
:the-kind '<body-armour>
! :base-ac +ar-chain-mail+)
(define-object-kind "metal-lamellar" "metal lamellar 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~"
--- 387,391 ----
:bulk +ab-lamellar+
:the-kind '<body-armour>
! :base-ac +ar-lamellar+)
(define-object-kind "steel-plate" "steel plate armour~"
***************
*** 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~"
--- 402,406 ----
:bulk +ab-steel+
:the-kind '<body-armour>
! :base-ac +ar-steel+)
(define-object-kind "shirt-common" "& common shirt~"
***************
*** 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"
--- 564,568 ----
:bulk +ab-chain-mail+
:the-kind '<gloves>
! :base-ac 2)
(define-object-kind "cesti" "& set~ of cesti"
***************
*** 594,599 ****
:bulk +ab-steel+
:the-kind '<gloves>
! :base-ac 5
! :game-values (make-game-values :base-dice 1 :num-dice 1))
;;; == shields
--- 579,583 ----
:bulk +ab-steel+
:the-kind '<gloves>
! :base-ac 5)
;;; == shields
***************
*** 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~"
--- 596,600 ----
:bulk 3
:the-kind '<shield>
! :base-ac 2)
(define-object-kind "large-leather-shield" "& large leather 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~"
--- 611,615 ----
:bulk 8
:the-kind '<shield>
! :base-ac 4)
(define-object-kind "small-metal-shield" "& small 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~"
--- 626,630 ----
:bulk 6
:the-kind '<shield>
! :base-ac 3)
(define-object-kind "large-metal-shield" "& large metal shield~"
***************
*** 660,664 ****
:bulk 10
:the-kind '<shield>
! :base-ac 5
! :game-values (make-game-values :base-dice 3 :num-dice 1))
--- 641,644 ----
:bulk 10
:the-kind '<shield>
! :base-ac 5)
Index: weapons.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/weapons.lisp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** weapons.lisp 13 Apr 2003 15:33:17 -0000 1.2
--- weapons.lisp 2 Jun 2003 11:17:41 -0000 1.3
***************
*** 29,33 ****
:sort-value 1001
:the-kind '<short-blade>
! :game-values (make-game-values :base-dice 4 :num-dice 1))
(define-object-kind "short-sword" "& short sword~"
--- 29,33 ----
:sort-value 1001
:the-kind '<short-blade>
! :damage "1d4")
(define-object-kind "short-sword" "& short sword~"
***************
*** 44,46 ****
:sort-value 1002
:the-kind '<short-blade>
! :game-values (make-game-values :base-dice 7 :num-dice 1))
--- 44,46 ----
:sort-value 1002
:the-kind '<short-blade>
! :damage "1d7")
|