contraband-cvs Mailing List for contraband
Status: Pre-Alpha
Brought to you by:
stig
Menu
▾
▴
contraband-cvs — all cvs diffs/reports
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(115) |
May
(7) |
Jun
(13) |
Jul
(8) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Stig E S. <st...@us...> - 2003-07-27 19:54:37
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv1071
Modified Files:
levels.lisp keys.lisp
Log Message:
updated *update code to use a table and not bit-field
Index: levels.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/levels.lisp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** levels.lisp 27 Jul 2003 13:52:55 -0000 1.11
--- levels.lisp 27 Jul 2003 19:54:34 -0000 1.12
***************
*** 173,177 ****
)
! (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
(ask-for-redraw! player '[map])
--- 173,178 ----
)
! (ask-for-update! player '[forget-view])
! (ask-for-update! player '[update-view])
(ask-for-redraw! player '[map])
Index: keys.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/keys.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** keys.lisp 27 Jul 2003 13:52:55 -0000 1.9
--- keys.lisp 27 Jul 2003 19:54:34 -0000 1.10
***************
*** 372,379 ****
;; skip combine & reorder
! (bit-flag-add! *update* #.(logior +pl-upd-torch+
! +pl-upd-forget-view+
! +pl-upd-update-view+
! +pl-upd-monsters+))
(ask-for-redraw! player '[extra])
(ask-for-redraw! player '[basic])
--- 372,380 ----
;; skip combine & reorder
! (ask-for-update! player '[torch])
! (ask-for-update! player '[forget-view])
! (ask-for-update! player '[update-view])
! (ask-for-update! player '[monsters])
!
(ask-for-redraw! player '[extra])
(ask-for-redraw! player '[basic])
|
|
From: Stig E S. <st...@us...> - 2003-07-27 19:54:37
|
Update of /cvsroot/contraband/contraband/config In directory sc8-pr-cvs1:/tmp/cvs-serv1071/config Modified Files: dialogues.lisp Log Message: updated *update code to use a table and not bit-field Index: dialogues.lisp =================================================================== RCS file: /cvsroot/contraband/contraband/config/dialogues.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dialogues.lisp 19 Apr 2003 21:57:56 -0000 1.7 --- dialogues.lisp 27 Jul 2003 19:54:33 -0000 1.8 *************** *** 61,65 **** (remove-from-inventory quest-taker '(object "filled-out-export-forms")) (add-to-inventory player (get-new-object "signed-export-forms")) ! (bit-flag-add! *update* +pl-upd-bonuses+)) (:text "Ok, fair enough, since it's you.") (:dest :back "Good doing business with you.")) --- 61,65 ---- (remove-from-inventory quest-taker '(object "filled-out-export-forms")) (add-to-inventory player (get-new-object "signed-export-forms")) ! (ask-for-update! player '[bonuses])) (:text "Ok, fair enough, since it's you.") (:dest :back "Good doing business with you.")) *************** *** 73,77 **** (remove-from-inventory player '(object "filled-out-export-forms")) (add-to-inventory player (get-new-object "signed-export-forms")) ! (bit-flag-add! *update* +pl-upd-bonuses+)) (:node (:text "Thanks buddy.") (:dest :quit "We'll do business again."))) --- 73,77 ---- (remove-from-inventory player '(object "filled-out-export-forms")) (add-to-inventory player (get-new-object "signed-export-forms")) ! (ask-for-update! player '[bonuses])) (:node (:text "Thanks buddy.") (:dest :quit "We'll do business again."))) |
|
From: Stig E S. <st...@us...> - 2003-07-27 19:54:36
|
Update of /cvsroot/contraband/contraband/people In directory sc8-pr-cvs1:/tmp/cvs-serv1071/people Modified Files: fossgard.lisp Log Message: updated *update code to use a table and not bit-field Index: fossgard.lisp =================================================================== RCS file: /cvsroot/contraband/contraband/people/fossgard.lisp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fossgard.lisp 19 Apr 2003 16:34:14 -0000 1.1 --- fossgard.lisp 27 Jul 2003 19:54:33 -0000 1.2 *************** *** 44,48 **** (add-to-inventory player (get-new-object "green-silk-dress")) (decf (player.gold player) 50) ! (bit-flag-add! *update* +pl-upd-bonuses+)) (:dest :quit "Goodbye."))) --- 44,48 ---- (add-to-inventory player (get-new-object "green-silk-dress")) (decf (player.gold player) 50) ! (ask-for-update! player '[bonuses])) (:dest :quit "Goodbye."))) |
|
From: Stig E S. <st...@us...> - 2003-07-27 19:54:36
|
Update of /cvsroot/contraband/contraband/tasks
In directory sc8-pr-cvs1:/tmp/cvs-serv1071/tasks
Modified Files:
trader.lisp letters.lisp dress.lisp
Log Message:
updated *update code to use a table and not bit-field
Index: trader.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/tasks/trader.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** trader.lisp 28 May 2003 10:34:30 -0000 1.10
--- trader.lisp 27 Jul 2003 19:54:33 -0000 1.11
***************
*** 49,53 ****
(print-message! "You have completed your first task as diplomat, good work.")
(modify-xp! quest-taker 100)
! (bit-flag-add! *update* +pl-upd-bonuses+)
quest)
--- 49,53 ----
(print-message! "You have completed your first task as diplomat, good work.")
(modify-xp! quest-taker 100)
! (ask-for-update! quest-taker '[bonuses])
quest)
Index: letters.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/tasks/letters.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** letters.lisp 19 Apr 2003 16:34:15 -0000 1.7
--- letters.lisp 27 Jul 2003 19:54:33 -0000 1.8
***************
*** 55,60 ****
(print-message! "The Mereo's letter removed from backpack, you're given 15 florentins.")
(modify-gold! *player* 15)
! (modify-xp! quest-taker 70)
! (bit-flag-add! *update* +pl-upd-bonuses+))
(t
(print-message! "Letter to Mereo Junifer removed from inventory.")
--- 55,59 ----
(print-message! "The Mereo's letter removed from backpack, you're given 15 florentins.")
(modify-gold! *player* 15)
! (modify-xp! quest-taker 70))
(t
(print-message! "Letter to Mereo Junifer removed from inventory.")
***************
*** 62,66 ****
! (bit-flag-add! *update* +pl-upd-bonuses+)
;;(setf (quest.state quest) :finished)
--- 61,65 ----
! (ask-for-update! quest-taker '[bonuses])
;;(setf (quest.state quest) :finished)
***************
*** 78,88 ****
(print-message! "The Mereo's Letter removed from backpack, you're given 5 florentins.")
(modify-gold! *player* 5)
! (modify-xp! quest-taker 50)
! (bit-flag-add! *update* +pl-upd-bonuses+))
(t
(print-message! "Letter to Mereo Ulydes removed from inventory.")
(modify-xp! quest-taker 30))))
! (bit-flag-add! *update* +pl-upd-bonuses+)
;;(setf (quest.state quest) :finished)
--- 77,86 ----
(print-message! "The Mereo's Letter removed from backpack, you're given 5 florentins.")
(modify-gold! *player* 5)
! (modify-xp! quest-taker 50))
(t
(print-message! "Letter to Mereo Ulydes removed from inventory.")
(modify-xp! quest-taker 30))))
! (ask-for-update! quest-taker '[bonuses])
;;(setf (quest.state quest) :finished)
***************
*** 100,110 ****
(print-message! "The Consul's Letter removed from backpack, you're given 15 florentins.")
(modify-gold! *player* 15)
! (modify-xp! quest-taker 70)
! (bit-flag-add! *update* +pl-upd-bonuses+))
(t
(print-message! "Letter to Consul Tepesco removed from backpack.")
(modify-xp! quest-taker 30))))
! (bit-flag-add! *update* +pl-upd-bonuses+)
;;(setf (quest.state quest) :finished)
--- 98,108 ----
(print-message! "The Consul's Letter removed from backpack, you're given 15 florentins.")
(modify-gold! *player* 15)
! (modify-xp! quest-taker 70))
!
(t
(print-message! "Letter to Consul Tepesco removed from backpack.")
(modify-xp! quest-taker 30))))
! (ask-for-update! quest-taker '[bonuses])
;;(setf (quest.state quest) :finished)
Index: dress.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/tasks/dress.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dress.lisp 17 Apr 2003 16:37:58 -0000 1.4
--- dress.lisp 27 Jul 2003 19:54:33 -0000 1.5
***************
*** 21,25 ****
(modify-xp! quest-taker 100)
! (bit-flag-add! *update* +pl-upd-bonuses+)
;;(setf (quest.state quest) :finished)
--- 21,25 ----
(modify-xp! quest-taker 100)
! (ask-for-update! quest-taker '[bonuses])
;;(setf (quest.state quest) :finished)
|
|
From: Stig E S. <st...@us...> - 2003-07-27 13:52:58
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv425/variants/contraband
Modified Files:
variant.lisp levels.lisp keys.lisp
Log Message:
changed redraw system from bitfields to generic symbols that are more easily extended
Index: variant.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/variant.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** variant.lisp 1 May 2003 22:23:19 -0000 1.15
--- variant.lisp 27 Jul 2003 13:52:55 -0000 1.16
***************
*** 169,178 ****
(defmethod redraw-stuff ((variant contraband) (dungeon dungeon) (player player))
! (when (= 0 *redraw*) (return-from redraw-stuff nil))
(let ((retval nil))
! (when (bit-flag-set? *redraw* +print-extra+)
! (bit-flag-remove! *redraw* +print-extra+)
(setf retval t))
--- 169,178 ----
(defmethod redraw-stuff ((variant contraband) (dungeon dungeon) (player player))
! (unless (any-redraws? player) (return-from redraw-stuff nil))
(let ((retval nil))
! (when (want-redraw? player '[extra])
! (reset-redraw! player '[extra])
(setf retval t))
Index: levels.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/levels.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** levels.lisp 20 Apr 2003 12:35:45 -0000 1.10
--- levels.lisp 27 Jul 2003 13:52:55 -0000 1.11
***************
*** 174,178 ****
(bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
! (bit-flag-add! *redraw* +print-map+)
--- 174,178 ----
(bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
! (ask-for-redraw! player '[map])
Index: keys.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/keys.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** keys.lisp 19 May 2003 15:42:32 -0000 1.8
--- keys.lisp 27 Jul 2003 13:52:55 -0000 1.9
***************
*** 376,384 ****
+pl-upd-update-view+
+pl-upd-monsters+))
! (bit-flag-add! *redraw* #.(logior +print-extra+
! +print-basic+
! +print-map+
! ;; skip equippy
! ))
;; fix clear in the right areas!
;; do clear
--- 376,384 ----
+pl-upd-update-view+
+pl-upd-monsters+))
! (ask-for-redraw! player '[extra])
! (ask-for-redraw! player '[basic])
! (ask-for-redraw! player '[map])
! ;; skip equippy
!
;; fix clear in the right areas!
;; do clear
***************
*** 486,490 ****
(print-map dungeon player)
(refresh-window win)
! ;;(bit-flag-add! *redraw* +print-map+)
)))
||#
--- 486,490 ----
(print-map dungeon player)
(refresh-window win)
! ;; (ask-for-redraw! player '[map])
)))
||#
|
|
From: Stig E S. <st...@us...> - 2003-07-27 13:49:29
|
Update of /cvsroot/contraband/contraband In directory sc8-pr-cvs1:/tmp/cvs-serv32248/variants/contraband Modified Files: wizard.lisp Log Message: minor thing Index: wizard.lisp =================================================================== RCS file: /cvsroot/contraband/contraband/wizard.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wizard.lisp 18 Apr 2003 22:37:24 -0000 1.3 --- wizard.lisp 27 Jul 2003 13:49:25 -0000 1.4 *************** *** 33,36 **** --- 33,40 ---- )) + (define-key-operation 'cycle-water + #'(lambda (dungeon player) + )) + ;; just for testing (define-key-operation 'dummy-conversation |
|
From: Stig E S. <st...@us...> - 2003-07-20 11:57:54
|
Update of /cvsroot/contraband/contraband/config In directory sc8-pr-cvs1:/tmp/cvs-serv12315/config Modified Files: character.lisp Log Message: added bit-flags Index: character.lisp =================================================================== RCS file: /cvsroot/contraband/contraband/config/character.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** character.lisp 1 May 2003 22:31:56 -0000 1.3 --- character.lisp 20 Jul 2003 11:57:51 -0000 1.4 *************** *** 137,154 **** (define-character-stat '<str> "strength" ! :abbreviation "Str" :number 0 :positive-desc "strong" :negative-desc "weak") (define-character-stat '<agi> "agility" ! :abbreviation "Agi" :number 1 :positive-desc "agile" :negative-desc "clumsy") (define-character-stat '<con> "constitution" ! :abbreviation "Con" :number 2 :positive-desc "healthy" :negative-desc "sickly") (define-character-stat '<dis> "discipline" ! :abbreviation "Dis" :number 3 :positive-desc "focused" :negative-desc "weak-willed") (define-character-stat '<rea> "reasoning" ! :abbreviation "Rea" :number 4 :positive-desc "clever" :negative-desc "dumb") (define-character-stat '<pre> "presence" ! :abbreviation "Pre" :number 5 :positive-desc "celebrity" :negative-desc "anonymous") --- 137,154 ---- (define-character-stat '<str> "strength" ! :abbreviation "Str" :number 0 :bit-flag #x01 :positive-desc "strong" :negative-desc "weak") (define-character-stat '<agi> "agility" ! :abbreviation "Agi" :number 1 :bit-flag #x02 :positive-desc "agile" :negative-desc "clumsy") (define-character-stat '<con> "constitution" ! :abbreviation "Con" :number 2 :bit-flag #x04 :positive-desc "healthy" :negative-desc "sickly") (define-character-stat '<dis> "discipline" ! :abbreviation "Dis" :number 3 :bit-flag #x08 :positive-desc "focused" :negative-desc "weak-willed") (define-character-stat '<rea> "reasoning" ! :abbreviation "Rea" :number 4 :bit-flag #x10 :positive-desc "clever" :negative-desc "dumb") (define-character-stat '<pre> "presence" ! :abbreviation "Pre" :number 5 :bit-flag #x20 :positive-desc "celebrity" :negative-desc "anonymous") |
|
From: Stig E S. <st...@us...> - 2003-07-20 11:57:18
|
Update of /cvsroot/contraband/contraband/maps
In directory sc8-pr-cvs1:/tmp/cvs-serv12235/variants/contraband/maps
Modified Files:
towns.lmap
Log Message:
bugfix
Index: towns.lmap
===================================================================
RCS file: /cvsroot/contraband/contraband/maps/towns.lmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** towns.lmap 25 Jun 2003 16:20:23 -0000 1.3
--- towns.lmap 20 Jul 2003 11:57:14 -0000 1.4
***************
*** 61,65 ****
: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)
)
--- 61,65 ----
: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)
)
***************
*** 186,188 ****
#........................................................................~~~~~~~~~~~~..........................................................................#
################################################################################################################################################################
! ")
\ No newline at end of file
--- 186,188 ----
#........................................................................~~~~~~~~~~~~..........................................................................#
################################################################################################################################################################
! ")
|
|
From: Stig E S. <st...@us...> - 2003-06-27 08:03:31
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv4184
Modified Files:
armour.lisp leaders.lisp objects.lisp
Log Message:
started using text-sym
Index: armour.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/armour.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** armour.lisp 26 Jun 2003 21:41:30 -0000 1.7
--- armour.lisp 27 Jun 2003 08:03:27 -0000 1.8
***************
*** 107,112 ****
(define-object-kind "sandals" "& pair~ of sandals"
:numeric-id 2100
! :text-attr #\w
! :text-char #\]
:weight 10
:cost 4
--- 107,111 ----
(define-object-kind "sandals" "& pair~ of sandals"
:numeric-id 2100
! :text-sym (text-paint-value +term-white+ #\])
:weight 10
:cost 4
***************
*** 120,125 ****
(define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
:numeric-id 2101
! :text-attr #\w
! :text-char #\]
:weight 10
:cost 4
--- 119,123 ----
(define-object-kind "cloth-shoes" "& pair~ of cloth shoes"
:numeric-id 2101
! :text-sym (text-paint-value +term-white+ #\])
:weight 10
:cost 4
***************
*** 134,139 ****
:numeric-id 2102
:gfx-sym (tile-paint-value +tilefile-armour+ 20)
! :text-attr #\U
! :text-char #\]
:weight 20
:cost 7
--- 132,136 ----
:numeric-id 2102
:gfx-sym (tile-paint-value +tilefile-armour+ 20)
! :text-sym (text-paint-value +term-l-umber+ #\])
:weight 20
:cost 7
***************
*** 147,152 ****
(define-object-kind "fur-boots" "& pair~ of fur boots"
:numeric-id 2103
! :text-attr #\s
! :text-char #\]
:weight 40
:cost 12
--- 144,148 ----
(define-object-kind "fur-boots" "& pair~ of fur boots"
:numeric-id 2103
! :text-sym (text-paint-value +term-slate+ #\])
:weight 40
:cost 12
***************
*** 161,166 ****
:numeric-id 2104
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-attr #\s
! :text-char #\]
:weight 80
:cost 50
--- 157,161 ----
:numeric-id 2104
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-sym (text-paint-value +term-slate+ #\])
:weight 80
:cost 50
***************
*** 175,180 ****
:numeric-id 2105
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-attr #\s
! :text-char #\]
:weight 80
:cost 50
--- 170,174 ----
:numeric-id 2105
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-sym (text-paint-value +term-slate+ #\])
:weight 80
:cost 50
***************
*** 189,194 ****
:numeric-id 2106
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-attr #\s
! :text-char #\]
:weight 80
:cost 50
--- 183,187 ----
:numeric-id 2106
:gfx-sym (tile-paint-value +tilefile-armour+ 22)
! :text-sym (text-paint-value +term-slate+ #\])
:weight 80
:cost 50
***************
*** 205,210 ****
:numeric-id 2200
:gfx-sym (tile-paint-value +tilefile-armour+ 71)
! :text-attr #\u
! :text-char #\]
:weight 15
:cost 12
--- 198,202 ----
:numeric-id 2200
:gfx-sym (tile-paint-value +tilefile-armour+ 71)
! :text-sym (text-paint-value +term-umber+ #\])
:weight 15
:cost 12
***************
*** 219,224 ****
:numeric-id 2201
:gfx-sym (tile-paint-value +tilefile-armour+ 70)
! :text-attr #\u
! :text-char #\]
:weight 15
:cost 12
--- 211,215 ----
:numeric-id 2201
:gfx-sym (tile-paint-value +tilefile-armour+ 70)
! :text-sym (text-paint-value +term-umber+ #\])
:weight 15
:cost 12
***************
*** 232,237 ****
(define-object-kind "fur-cap" "& fur cap~"
:numeric-id 2202
! :text-attr #\u
! :text-char #\]
:weight 15
:cost 12
--- 223,227 ----
(define-object-kind "fur-cap" "& fur cap~"
:numeric-id 2202
! :text-sym (text-paint-value +term-umber+ #\])
:weight 15
:cost 12
***************
*** 246,251 ****
:numeric-id 2203
:gfx-sym (tile-paint-value +tilefile-armour+ 11)
! :text-attr #\s
! :text-char #\]
:weight 20
:cost 30
--- 236,240 ----
:numeric-id 2203
:gfx-sym (tile-paint-value +tilefile-armour+ 11)
! :text-sym (text-paint-value +term-slate+ #\])
:weight 20
:cost 30
***************
*** 260,265 ****
:numeric-id 2204
:gfx-sym (tile-paint-value +tilefile-armour+ 12)
! :text-attr #\s
! :text-char #\]
:weight 75
:cost 75
--- 249,253 ----
:numeric-id 2204
:gfx-sym (tile-paint-value +tilefile-armour+ 12)
! :text-sym (text-paint-value +term-slate+ #\])
:weight 75
:cost 75
***************
*** 274,279 ****
:numeric-id 2205
:gfx-sym (tile-paint-value +tilefile-armour+ 13)
! :text-attr #\W
! :text-char #\]
:weight 60
:cost 200
--- 262,266 ----
:numeric-id 2205
:gfx-sym (tile-paint-value +tilefile-armour+ 13)
! :text-sym (text-paint-value +term-l-white+ #\])
:weight 60
:cost 200
***************
*** 291,296 ****
:numeric-id 2300
:gfx-sym (tile-paint-value 47 0)
! :text-attr #\b
! :text-char #\(
:weight 20
:cost 40
--- 278,282 ----
:numeric-id 2300
:gfx-sym (tile-paint-value 47 0)
! :text-sym (text-paint-value +term-blue+ #\()
:weight 20
:cost 40
***************
*** 306,311 ****
:numeric-id 2301
:gfx-sym (tile-paint-value +tilefile-armour+ 34)
! :text-attr #\b
! :text-char #\(
:weight 20
:cost 4
--- 292,296 ----
:numeric-id 2301
:gfx-sym (tile-paint-value +tilefile-armour+ 34)
! :text-sym (text-paint-value +term-blue+ #\()
:weight 20
:cost 4
***************
*** 321,326 ****
:numeric-id 2302
:gfx-sym (tile-paint-value +tilefile-armour+ 38)
! :text-attr #\U
! :text-char #\(
:weight 80
:cost 18
--- 306,310 ----
:numeric-id 2302
:gfx-sym (tile-paint-value +tilefile-armour+ 38)
! :text-sym (text-paint-value +term-l-umber+ #\()
:weight 80
:cost 18
***************
*** 335,340 ****
:numeric-id 2303
:gfx-sym (tile-paint-value +tilefile-armour+ 39)
! :text-attr #\U
! :text-char #\(
:weight 90
:cost 35
--- 319,323 ----
:numeric-id 2303
:gfx-sym (tile-paint-value +tilefile-armour+ 39)
! :text-sym (text-paint-value +term-l-umber+ #\()
:weight 90
:cost 35
***************
*** 349,354 ****
:numeric-id 2305
:gfx-sym (tile-paint-value +tilefile-armour+ 45)
! :text-attr #\s
! :text-char #\[
:weight 220
:cost 750
--- 332,336 ----
:numeric-id 2305
:gfx-sym (tile-paint-value +tilefile-armour+ 45)
! :text-sym (text-paint-value +term-slate+ #\[)
:weight 220
:cost 750
***************
*** 363,368 ****
:numeric-id 2306
:gfx-sym (tile-paint-value +tilefile-armour+ 51)
! :text-attr #\W
! :text-char #\[
:weight 340
:cost 1250
--- 345,349 ----
:numeric-id 2306
:gfx-sym (tile-paint-value +tilefile-armour+ 51)
! :text-sym (text-paint-value +term-l-white+ #\[)
:weight 340
:cost 1250
***************
*** 377,382 ****
:numeric-id 2307
:gfx-sym (tile-paint-value +tilefile-armour+ 52)
! :text-attr #\W
! :text-char #\[
:weight 380
:cost 1350
--- 358,362 ----
:numeric-id 2307
:gfx-sym (tile-paint-value +tilefile-armour+ 52)
! :text-sym (text-paint-value +term-l-white+ #\[)
:weight 380
:cost 1350
***************
*** 391,396 ****
:numeric-id 2308
:gfx-sym (tile-paint-value 47 0)
! :text-attr #\b
! :text-char #\(
:weight 20
:cost 40
--- 371,375 ----
:numeric-id 2308
:gfx-sym (tile-paint-value 47 0)
! :text-sym (text-paint-value +term-blue+ #\()
:weight 20
:cost 40
***************
*** 408,413 ****
:numeric-id 2400
:gfx-sym (tile-paint-value 47 1)
! :text-attr #\b
! :text-char #\(
:weight 20
:cost 40
--- 387,391 ----
:numeric-id 2400
:gfx-sym (tile-paint-value 47 1)
! :text-sym (text-paint-value +term-blue+ #\()
:weight 20
:cost 40
***************
*** 422,427 ****
:numeric-id 2401
:gfx-sym (tile-paint-value 47 1)
! :text-attr #\b
! :text-char #\(
:weight 20
:cost 40
--- 400,404 ----
:numeric-id 2401
:gfx-sym (tile-paint-value 47 1)
! :text-sym (text-paint-value +term-blue+ #\()
:weight 20
:cost 40
***************
*** 440,445 ****
:numeric-id 2500
:gfx-sym (tile-paint-value +tilefile-armour+ 6)
! :text-attr #\g
! :text-char #\(
:weight 10
:cost 3
--- 417,421 ----
:numeric-id 2500
:gfx-sym (tile-paint-value +tilefile-armour+ 6)
! :text-sym (text-paint-value +term-green+ #\()
:weight 10
:cost 3
***************
*** 455,460 ****
:numeric-id 2501
:gfx-sym (tile-paint-value +tilefile-armour+ 0)
! :text-attr #\g
! :text-char #\(
:weight 10
:cost 3
--- 431,435 ----
:numeric-id 2501
:gfx-sym (tile-paint-value +tilefile-armour+ 0)
! :text-sym (text-paint-value +term-green+ #\()
:weight 10
:cost 3
***************
*** 469,474 ****
:numeric-id 2502
:gfx-sym (tile-paint-value +tilefile-armour+ 1)
! :text-attr #\D
! :text-char #\(
:weight 5
:cost 4000
--- 444,448 ----
:numeric-id 2502
:gfx-sym (tile-paint-value +tilefile-armour+ 1)
! :text-sym (text-paint-value +term-l-dark+ #\()
:weight 5
:cost 4000
***************
*** 484,489 ****
:numeric-id 2503
:gfx-sym (tile-paint-value +tilefile-armour+ 6)
! :text-attr #\g
! :text-char #\(
:weight 10
:cost 3
--- 458,462 ----
:numeric-id 2503
:gfx-sym (tile-paint-value +tilefile-armour+ 6)
! :text-sym (text-paint-value +term-green+ #\()
:weight 10
:cost 3
***************
*** 501,506 ****
:numeric-id 2600
:gfx-sym (tile-paint-value +tilefile-armour+ 24)
! :text-attr #\U
! :text-char #\]
:weight 5
:cost 20
--- 474,478 ----
:numeric-id 2600
:gfx-sym (tile-paint-value +tilefile-armour+ 24)
! :text-sym (text-paint-value +term-l-umber+ #\])
:weight 5
:cost 20
***************
*** 515,520 ****
:numeric-id 2601
:gfx-sym (tile-paint-value +tilefile-armour+ 23)
! :text-attr #\U
! :text-char #\]
:weight 5
:cost 3
--- 487,491 ----
:numeric-id 2601
:gfx-sym (tile-paint-value +tilefile-armour+ 23)
! :text-sym (text-paint-value +term-l-umber+ #\])
:weight 5
:cost 3
***************
*** 529,534 ****
:numeric-id 2602
:gfx-sym (tile-paint-value +tilefile-armour+ 26)
! :text-attr #\U
! :text-char #\]
:weight 25
:cost 35
--- 500,504 ----
:numeric-id 2602
:gfx-sym (tile-paint-value +tilefile-armour+ 26)
! :text-sym (text-paint-value +term-l-umber+ #\])
:weight 25
:cost 35
***************
*** 543,548 ****
:numeric-id 2603
:gfx-sym (tile-paint-value +tilefile-armour+ 27)
! :text-attr #\W
! :text-char #\]
:weight 40
:cost 100
--- 513,517 ----
:numeric-id 2603
:gfx-sym (tile-paint-value +tilefile-armour+ 27)
! :text-sym (text-paint-value +term-l-white+ #\])
:weight 40
:cost 100
***************
*** 559,564 ****
:numeric-id 2700
:gfx-sym (tile-paint-value +tilefile-armour+ 90)
! :text-attr #\U
! :text-char #\)
:weight 50
:cost 30
--- 528,532 ----
:numeric-id 2700
:gfx-sym (tile-paint-value +tilefile-armour+ 90)
! :text-sym (text-paint-value +term-l-umber+ #\))
:weight 50
:cost 30
***************
*** 573,578 ****
:numeric-id 2701
:gfx-sym (tile-paint-value +tilefile-armour+ 29)
! :text-attr #\U
! :text-char #\)
:weight 100
:cost 120
--- 541,545 ----
:numeric-id 2701
:gfx-sym (tile-paint-value +tilefile-armour+ 29)
! :text-sym (text-paint-value +term-l-umber+ #\))
:weight 100
:cost 120
***************
*** 587,592 ****
:numeric-id 2702
:gfx-sym (tile-paint-value +tilefile-armour+ 93)
! :text-attr #\s
! :text-char #\)
:weight 65
:cost 50
--- 554,558 ----
:numeric-id 2702
:gfx-sym (tile-paint-value +tilefile-armour+ 93)
! :text-sym (text-paint-value +term-slate+ #\))
:weight 65
:cost 50
***************
*** 601,606 ****
:numeric-id 2703
:gfx-sym (tile-paint-value +tilefile-armour+ 89)
! :text-attr #\s
! :text-char #\)
:weight 120
:cost 200
--- 567,571 ----
:numeric-id 2703
:gfx-sym (tile-paint-value +tilefile-armour+ 89)
! :text-sym (text-paint-value +term-slate+ #\))
:weight 120
:cost 200
Index: leaders.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/leaders.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** leaders.lisp 26 Jun 2003 21:41:31 -0000 1.8
--- leaders.lisp 27 Jun 2003 08:03:27 -0000 1.9
***************
*** 5,10 ****
:gfx-sym (tile-paint-value 24 17)
:desc "She's respected and loved by her soldiers."
! :text-char #\p
! :text-attr #\r
;; :alignment '<good>
:depth 0
--- 5,9 ----
:gfx-sym (tile-paint-value 24 17)
:desc "She's respected and loved by her soldiers."
! :text-sym (text-paint-value +term-red+ #\p)
;; :alignment '<good>
:depth 0
***************
*** 28,33 ****
:gfx-sym (tile-paint-value 14 10)
:desc "He's in command of Renuo civil matters."
! :text-char #\p
! :text-attr #\r
;; :alignment '<good>
:depth 0
--- 27,31 ----
:gfx-sym (tile-paint-value 14 10)
:desc "He's in command of Renuo civil matters."
! :text-sym (text-paint-value +term-red+ #\p)
;; :alignment '<good>
:depth 0
***************
*** 51,56 ****
:gfx-sym (tile-paint-value 24 2)
:desc "He's the Imperial Mereo of Bartertown."
! :text-char #\p
! :text-attr #\r
;; :alignment '<good>
:depth 0
--- 49,53 ----
:gfx-sym (tile-paint-value 24 2)
:desc "He's the Imperial Mereo of Bartertown."
! :text-sym (text-paint-value +term-red+ #\p)
;; :alignment '<good>
:depth 0
***************
*** 74,79 ****
:gfx-sym (tile-paint-value 6 38)
:desc "He's the Atrocitan Consul of Bartertown."
! :text-char #\p
! :text-attr #\r
;; :alignment '<good>
:depth 0
--- 71,75 ----
:gfx-sym (tile-paint-value 6 38)
:desc "He's the Atrocitan Consul of Bartertown."
! :text-sym (text-paint-value +term-red+ #\p)
;; :alignment '<good>
:depth 0
***************
*** 98,103 ****
:gfx-sym (tile-paint-value 24 67)
:desc "He's an atrocitan trader."
! :text-char #\p
! :text-attr #\b
:power-lvl 7
:hitpoints '(7 . 10)
--- 94,98 ----
:gfx-sym (tile-paint-value 24 67)
:desc "He's an atrocitan trader."
! :text-sym (text-paint-value +term-blue+ #\p)
:power-lvl 7
:hitpoints '(7 . 10)
***************
*** 115,120 ****
:gfx-sym (tile-paint-value 24 61)
:desc "He's a well-known elven tailour, known for his mastery of silk."
! :text-char #\e
! :text-attr #\b
;; :alignment '<good>
:depth 0
--- 110,114 ----
:gfx-sym (tile-paint-value 24 61)
:desc "He's a well-known elven tailour, known for his mastery of silk."
! :text-sym (text-paint-value +term-blue+ #\e)
;; :alignment '<good>
:depth 0
***************
*** 139,144 ****
:gfx-sym (tile-paint-value 14 8)
:desc "He's an important merchant in the copian merchant guild."
! :text-char #\p
! :text-attr #\r
:depth 0
:rarity 1
--- 133,137 ----
:gfx-sym (tile-paint-value 14 8)
:desc "He's an important merchant in the copian merchant guild."
! :text-sym (text-paint-value +term-red+ #\p)
:depth 0
:rarity 1
Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/objects.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** objects.lisp 26 Jun 2003 21:41:31 -0000 1.10
--- objects.lisp 27 Jun 2003 08:03:27 -0000 1.11
***************
*** 5,10 ****
(define-object-kind "backpack" "backpack"
:numeric-id 750
! :text-attr #\w
! :text-char #\&
:power-lvl 3
:weight nil
--- 5,9 ----
(define-object-kind "backpack" "backpack"
:numeric-id 750
! :text-sym (text-paint-value +term-white+ #\&)
:power-lvl 3
:weight nil
***************
*** 18,23 ****
(define-object-kind "sealed-letter-to-junifer" "sealed letter for Mereo Junifer"
:numeric-id 200
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 17,21 ----
(define-object-kind "sealed-letter-to-junifer" "sealed letter for Mereo Junifer"
:numeric-id 200
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 35,40 ****
(define-object-kind "opened-letter-to-junifer" "letter for Mereo Junifer (seal broken)"
:numeric-id 201
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 90)
:weight 5
--- 33,37 ----
(define-object-kind "opened-letter-to-junifer" "letter for Mereo Junifer (seal broken)"
:numeric-id 201
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 90)
:weight 5
***************
*** 50,55 ****
(define-object-kind "sealed-letter-to-ulydes" "sealed letter for Mereo Ulydes"
:numeric-id 202
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 47,51 ----
(define-object-kind "sealed-letter-to-ulydes" "sealed letter for Mereo Ulydes"
:numeric-id 202
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 66,71 ****
(define-object-kind "opened-letter-to-ulydes" "letter for Mereo Ulydes (seal broken)"
:numeric-id 203
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 62,66 ----
(define-object-kind "opened-letter-to-ulydes" "letter for Mereo Ulydes (seal broken)"
:numeric-id 203
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 82,87 ****
(define-object-kind "sealed-letter-to-tepesco" "sealed letter for Consul Tepesco"
:numeric-id 204
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 77,81 ----
(define-object-kind "sealed-letter-to-tepesco" "sealed letter for Consul Tepesco"
:numeric-id 204
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 98,103 ****
(define-object-kind "opened-letter-to-tepesco" "letter for Consul Tepesco (seal broken)"
:numeric-id 205
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 92,96 ----
(define-object-kind "opened-letter-to-tepesco" "letter for Consul Tepesco (seal broken)"
:numeric-id 205
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 114,119 ****
(define-object-kind "measurements-junifer" "Junifer's physical measurements"
:numeric-id 206
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 86)
:weight 5
--- 107,111 ----
(define-object-kind "measurements-junifer" "Junifer's physical measurements"
:numeric-id 206
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 86)
:weight 5
***************
*** 129,134 ****
(define-object-kind "export-forms" "export forms"
:numeric-id 207
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 121,125 ----
(define-object-kind "export-forms" "export forms"
:numeric-id 207
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 144,149 ****
(define-object-kind "filled-out-export-forms" "export forms (filled out)"
:numeric-id 208
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 135,139 ----
(define-object-kind "filled-out-export-forms" "export forms (filled out)"
:numeric-id 208
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 159,164 ****
(define-object-kind "signed-export-forms" "export forms (signed)"
:numeric-id 209
! :text-attr #\w
! :text-char #\?
:gfx-sym (tile-paint-value 10 19)
:weight 5
--- 149,153 ----
(define-object-kind "signed-export-forms" "export forms (signed)"
:numeric-id 209
! :text-sym (text-paint-value +term-white+ #\?)
:gfx-sym (tile-paint-value 10 19)
:weight 5
***************
*** 176,181 ****
:numeric-id 301
:gfx-sym (tile-paint-value 42 0)
! :text-attr #\g
! :text-char #\(
:weight 5
:cost 50
--- 165,169 ----
:numeric-id 301
:gfx-sym (tile-paint-value 42 0)
! :text-sym (text-paint-value +term-green+ #\()
:weight 5
:cost 50
***************
*** 189,194 ****
:numeric-id 302
:gfx-sym (tile-paint-value 8 37)
! :text-attr #\b
! :text-char #\"
:weight 1
:cost 75
--- 177,181 ----
:numeric-id 302
:gfx-sym (tile-paint-value 8 37)
! :text-sym (text-paint-value +term-blue+ #\")
:weight 1
:cost 75
***************
*** 201,206 ****
:numeric-id 701
:gfx-sym (tile-paint-value 43 0)
! :text-attr #\u
! :text-char #\o
:weight 5
:cost 5000
--- 188,192 ----
:numeric-id 701
:gfx-sym (tile-paint-value 43 0)
! :text-sym (text-paint-value +term-umber+ #\o)
:weight 5
:cost 5000
|
|
From: Stig E S. <st...@us...> - 2003-06-26 21:41:35
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv31313
Modified Files:
armour.lisp leaders.lisp objects.lisp townies.lisp
weapons.lisp
Log Message:
moved more info to gfx-sym
Index: armour.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/armour.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** armour.lisp 2 Jun 2003 12:33:41 -0000 1.6
--- armour.lisp 26 Jun 2003 21:41:30 -0000 1.7
***************
*** 133,138 ****
(define-object-kind "leather-boots" "& pair~ of leather boots"
:numeric-id 2102
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 20)
:text-attr #\U
:text-char #\]
--- 133,137 ----
(define-object-kind "leather-boots" "& pair~ of leather boots"
:numeric-id 2102
! :gfx-sym (tile-paint-value +tilefile-armour+ 20)
:text-attr #\U
:text-char #\]
***************
*** 161,166 ****
(define-object-kind "chain-boots" "& pair~ of chain boots"
:numeric-id 2104
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 22)
:text-attr #\s
:text-char #\]
--- 160,164 ----
(define-object-kind "chain-boots" "& pair~ of chain boots"
:numeric-id 2104
! :gfx-sym (tile-paint-value +tilefile-armour+ 22)
:text-attr #\s
:text-char #\]
***************
*** 176,181 ****
(define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
:numeric-id 2105
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 22)
:text-attr #\s
:text-char #\]
--- 174,178 ----
(define-object-kind "bronze-boots" "& pair~ of bronze-plated boots"
:numeric-id 2105
! :gfx-sym (tile-paint-value +tilefile-armour+ 22)
:text-attr #\s
:text-char #\]
***************
*** 191,196 ****
(define-object-kind "steel-boots" "& pair~ of steel-plated boots"
:numeric-id 2106
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 22)
:text-attr #\s
:text-char #\]
--- 188,192 ----
(define-object-kind "steel-boots" "& pair~ of steel-plated boots"
:numeric-id 2106
! :gfx-sym (tile-paint-value +tilefile-armour+ 22)
:text-attr #\s
:text-char #\]
***************
*** 208,213 ****
(define-object-kind "hat" "& hat~"
:numeric-id 2200
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 71)
:text-attr #\u
:text-char #\]
--- 204,208 ----
(define-object-kind "hat" "& hat~"
:numeric-id 2200
! :gfx-sym (tile-paint-value +tilefile-armour+ 71)
:text-attr #\u
:text-char #\]
***************
*** 223,228 ****
(define-object-kind "leather-cap" "& leather cap~"
:numeric-id 2201
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 70)
:text-attr #\u
:text-char #\]
--- 218,222 ----
(define-object-kind "leather-cap" "& leather cap~"
:numeric-id 2201
! :gfx-sym (tile-paint-value +tilefile-armour+ 70)
:text-attr #\u
:text-char #\]
***************
*** 251,256 ****
(define-object-kind "chain-coif" "& chain-coif~"
:numeric-id 2203
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 11)
:text-attr #\s
:text-char #\]
--- 245,249 ----
(define-object-kind "chain-coif" "& chain-coif~"
:numeric-id 2203
! :gfx-sym (tile-paint-value +tilefile-armour+ 11)
:text-attr #\s
:text-char #\]
***************
*** 266,271 ****
(define-object-kind "iron-helm" "& iron helm~"
:numeric-id 2204
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 12)
:text-attr #\s
:text-char #\]
--- 259,263 ----
(define-object-kind "iron-helm" "& iron helm~"
:numeric-id 2204
! :gfx-sym (tile-paint-value +tilefile-armour+ 12)
:text-attr #\s
:text-char #\]
***************
*** 281,286 ****
(define-object-kind "steel-helm" "& steel helm~"
:numeric-id 2205
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 13)
:text-attr #\W
:text-char #\]
--- 273,277 ----
(define-object-kind "steel-helm" "& steel helm~"
:numeric-id 2205
! :gfx-sym (tile-paint-value +tilefile-armour+ 13)
:text-attr #\W
:text-char #\]
***************
*** 299,304 ****
(define-object-kind "shirt-expensive" "& expensive shirt~"
:numeric-id 2300
! :x-attr (tile-file 47)
! :x-char (tile-number 0)
:text-attr #\b
:text-char #\(
--- 290,294 ----
(define-object-kind "shirt-expensive" "& expensive shirt~"
:numeric-id 2300
! :gfx-sym (tile-paint-value 47 0)
:text-attr #\b
:text-char #\(
***************
*** 315,320 ****
(define-object-kind "robe" "& robe~"
:numeric-id 2301
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 34)
:text-attr #\b
:text-char #\(
--- 305,309 ----
(define-object-kind "robe" "& robe~"
:numeric-id 2301
! :gfx-sym (tile-paint-value +tilefile-armour+ 34)
:text-attr #\b
:text-char #\(
***************
*** 331,336 ****
(define-object-kind "leather-armour" "leather armour~"
:numeric-id 2302
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 38)
:text-attr #\U
:text-char #\(
--- 320,324 ----
(define-object-kind "leather-armour" "leather armour~"
:numeric-id 2302
! :gfx-sym (tile-paint-value +tilefile-armour+ 38)
:text-attr #\U
:text-char #\(
***************
*** 346,351 ****
(define-object-kind "studded-leather" "studded leather~"
:numeric-id 2303
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 39)
:text-attr #\U
:text-char #\(
--- 334,338 ----
(define-object-kind "studded-leather" "studded leather~"
:numeric-id 2303
! :gfx-sym (tile-paint-value +tilefile-armour+ 39)
:text-attr #\U
:text-char #\(
***************
*** 361,366 ****
(define-object-kind "chain-mail" "chain mail~"
:numeric-id 2305
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 45)
:text-attr #\s
:text-char #\[
--- 348,352 ----
(define-object-kind "chain-mail" "chain mail~"
:numeric-id 2305
! :gfx-sym (tile-paint-value +tilefile-armour+ 45)
:text-attr #\s
:text-char #\[
***************
*** 376,381 ****
(define-object-kind "metal-lamellar" "metal lamellar armour~"
:numeric-id 2306
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 51)
:text-attr #\W
:text-char #\[
--- 362,366 ----
(define-object-kind "metal-lamellar" "metal lamellar armour~"
:numeric-id 2306
! :gfx-sym (tile-paint-value +tilefile-armour+ 51)
:text-attr #\W
:text-char #\[
***************
*** 391,396 ****
(define-object-kind "steel-plate" "steel plate armour~"
:numeric-id 2307
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 52)
:text-attr #\W
:text-char #\[
--- 376,380 ----
(define-object-kind "steel-plate" "steel plate armour~"
:numeric-id 2307
! :gfx-sym (tile-paint-value +tilefile-armour+ 52)
:text-attr #\W
:text-char #\[
***************
*** 406,411 ****
(define-object-kind "shirt-common" "& common shirt~"
:numeric-id 2308
! :x-attr (tile-file 47)
! :x-char (tile-number 0)
:text-attr #\b
:text-char #\(
--- 390,394 ----
(define-object-kind "shirt-common" "& common shirt~"
:numeric-id 2308
! :gfx-sym (tile-paint-value 47 0)
:text-attr #\b
:text-char #\(
***************
*** 424,429 ****
(define-object-kind "pants-expensive" "& expensive pants"
:numeric-id 2400
! :x-attr (tile-file 47)
! :x-char (tile-number 1)
:text-attr #\b
:text-char #\(
--- 407,411 ----
(define-object-kind "pants-expensive" "& expensive pants"
:numeric-id 2400
! :gfx-sym (tile-paint-value 47 1)
:text-attr #\b
:text-char #\(
***************
*** 439,444 ****
(define-object-kind "pants-common" "& common pants"
:numeric-id 2401
! :x-attr (tile-file 47)
! :x-char (tile-number 1)
:text-attr #\b
:text-char #\(
--- 421,425 ----
(define-object-kind "pants-common" "& common pants"
:numeric-id 2401
! :gfx-sym (tile-paint-value 47 1)
:text-attr #\b
:text-char #\(
***************
*** 458,463 ****
(define-object-kind "coat-expensive" "& expensive coat~"
:numeric-id 2500
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 6)
:text-attr #\g
:text-char #\(
--- 439,443 ----
(define-object-kind "coat-expensive" "& expensive coat~"
:numeric-id 2500
! :gfx-sym (tile-paint-value +tilefile-armour+ 6)
:text-attr #\g
:text-char #\(
***************
*** 474,479 ****
(define-object-kind "cloak" "& cloak~"
:numeric-id 2501
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 0)
:text-attr #\g
:text-char #\(
--- 454,458 ----
(define-object-kind "cloak" "& cloak~"
:numeric-id 2501
! :gfx-sym (tile-paint-value +tilefile-armour+ 0)
:text-attr #\g
:text-char #\(
***************
*** 489,494 ****
(define-object-kind "shadow-cloak" "& shadow cloak~"
:numeric-id 2502
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 1)
:text-attr #\D
:text-char #\(
--- 468,472 ----
(define-object-kind "shadow-cloak" "& shadow cloak~"
:numeric-id 2502
! :gfx-sym (tile-paint-value +tilefile-armour+ 1)
:text-attr #\D
:text-char #\(
***************
*** 505,510 ****
(define-object-kind "coat-common" "& common coat~"
:numeric-id 2503
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 6)
:text-attr #\g
:text-char #\(
--- 483,487 ----
(define-object-kind "coat-common" "& common coat~"
:numeric-id 2503
! :gfx-sym (tile-paint-value +tilefile-armour+ 6)
:text-attr #\g
:text-char #\(
***************
*** 523,528 ****
(define-object-kind "gloves-calfskin" "& set~ of calfskin gloves"
:numeric-id 2600
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 24)
:text-attr #\U
:text-char #\]
--- 500,504 ----
(define-object-kind "gloves-calfskin" "& set~ of calfskin gloves"
:numeric-id 2600
! :gfx-sym (tile-paint-value +tilefile-armour+ 24)
:text-attr #\U
:text-char #\]
***************
*** 538,543 ****
(define-object-kind "gloves-leather" "& set~ of leather gloves"
:numeric-id 2601
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 23)
:text-attr #\U
:text-char #\]
--- 514,518 ----
(define-object-kind "gloves-leather" "& set~ of leather gloves"
:numeric-id 2601
! :gfx-sym (tile-paint-value +tilefile-armour+ 23)
:text-attr #\U
:text-char #\]
***************
*** 553,558 ****
(define-object-kind "gauntlets" "& set~ of gauntlets"
:numeric-id 2602
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 26)
:text-attr #\U
:text-char #\]
--- 528,532 ----
(define-object-kind "gauntlets" "& set~ of gauntlets"
:numeric-id 2602
! :gfx-sym (tile-paint-value +tilefile-armour+ 26)
:text-attr #\U
:text-char #\]
***************
*** 568,573 ****
(define-object-kind "cesti" "& set~ of cesti"
:numeric-id 2603
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 27)
:text-attr #\W
:text-char #\]
--- 542,546 ----
(define-object-kind "cesti" "& set~ of cesti"
:numeric-id 2603
! :gfx-sym (tile-paint-value +tilefile-armour+ 27)
:text-attr #\W
:text-char #\]
***************
*** 585,590 ****
(define-object-kind "small-leather-shield" "& small leather shield~"
:numeric-id 2700
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 90)
:text-attr #\U
:text-char #\)
--- 558,562 ----
(define-object-kind "small-leather-shield" "& small leather shield~"
:numeric-id 2700
! :gfx-sym (tile-paint-value +tilefile-armour+ 90)
:text-attr #\U
:text-char #\)
***************
*** 600,605 ****
(define-object-kind "large-leather-shield" "& large leather shield~"
:numeric-id 2701
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 29)
:text-attr #\U
:text-char #\)
--- 572,576 ----
(define-object-kind "large-leather-shield" "& large leather shield~"
:numeric-id 2701
! :gfx-sym (tile-paint-value +tilefile-armour+ 29)
:text-attr #\U
:text-char #\)
***************
*** 615,620 ****
(define-object-kind "small-metal-shield" "& small metal shield~"
:numeric-id 2702
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 93)
:text-attr #\s
:text-char #\)
--- 586,590 ----
(define-object-kind "small-metal-shield" "& small metal shield~"
:numeric-id 2702
! :gfx-sym (tile-paint-value +tilefile-armour+ 93)
:text-attr #\s
:text-char #\)
***************
*** 630,635 ****
(define-object-kind "large-metal-shield" "& large metal shield~"
:numeric-id 2703
! :x-attr (tile-file +tilefile-armour+)
! :x-char (tile-number 89)
:text-attr #\s
:text-char #\)
--- 600,604 ----
(define-object-kind "large-metal-shield" "& large metal shield~"
:numeric-id 2703
! :gfx-sym (tile-paint-value +tilefile-armour+ 89)
:text-attr #\s
:text-char #\)
Index: leaders.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/leaders.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** leaders.lisp 20 Apr 2003 00:40:06 -0000 1.7
--- leaders.lisp 26 Jun 2003 21:41:31 -0000 1.8
***************
*** 3,8 ****
(define-monster-kind "mereo-junifer" "Mereo Junifer"
:numeric-id 1002
! :x-attr (tile-file 24)
! :x-char (tile-number 17)
:desc "She's respected and loved by her soldiers."
:text-char #\p
--- 3,7 ----
(define-monster-kind "mereo-junifer" "Mereo Junifer"
:numeric-id 1002
! :gfx-sym (tile-paint-value 24 17)
:desc "She's respected and loved by her soldiers."
:text-char #\p
***************
*** 27,32 ****
(define-monster-kind "captain-perpetro" "Captain Perpetro"
:numeric-id 1003
! :x-attr (tile-file 14)
! :x-char (tile-number 10)
:desc "He's in command of Renuo civil matters."
:text-char #\p
--- 26,30 ----
(define-monster-kind "captain-perpetro" "Captain Perpetro"
:numeric-id 1003
! :gfx-sym (tile-paint-value 14 10)
:desc "He's in command of Renuo civil matters."
:text-char #\p
***************
*** 51,56 ****
(define-monster-kind "mereo-ulydes" "Mereo Ulydes"
:numeric-id 1002
! :x-attr (tile-file 24)
! :x-char (tile-number 2)
:desc "He's the Imperial Mereo of Bartertown."
:text-char #\p
--- 49,53 ----
(define-monster-kind "mereo-ulydes" "Mereo Ulydes"
:numeric-id 1002
! :gfx-sym (tile-paint-value 24 2)
:desc "He's the Imperial Mereo of Bartertown."
:text-char #\p
***************
*** 75,80 ****
(define-monster-kind "consul-tepesco" "Consul Tepesco"
:numeric-id 1002
! :x-attr (tile-file 6)
! :x-char (tile-number 38)
:desc "He's the Atrocitan Consul of Bartertown."
:text-char #\p
--- 72,76 ----
(define-monster-kind "consul-tepesco" "Consul Tepesco"
:numeric-id 1002
! :gfx-sym (tile-paint-value 6 38)
:desc "He's the Atrocitan Consul of Bartertown."
:text-char #\p
***************
*** 100,105 ****
(define-monster-kind "trader-farethan" "Avi Farethan"
:numeric-id 1101
! :x-attr (tile-file 24)
! :x-char (tile-number 67)
:desc "He's an atrocitan trader."
:text-char #\p
--- 96,100 ----
(define-monster-kind "trader-farethan" "Avi Farethan"
:numeric-id 1101
! :gfx-sym (tile-paint-value 24 67)
:desc "He's an atrocitan trader."
:text-char #\p
***************
*** 118,123 ****
(define-monster-kind "elf-fossgard" "Fossgard the tailour"
:numeric-id 1201
! :x-attr (tile-file 24)
! :x-char (tile-number 61)
:desc "He's a well-known elven tailour, known for his mastery of silk."
:text-char #\e
--- 113,117 ----
(define-monster-kind "elf-fossgard" "Fossgard the tailour"
:numeric-id 1201
! :gfx-sym (tile-paint-value 24 61)
:desc "He's a well-known elven tailour, known for his mastery of silk."
:text-char #\e
***************
*** 143,148 ****
(define-monster-kind "merchant-lodicus" "Lodicus Archus"
:numeric-id 1102
! :x-attr (tile-file 14)
! :x-char (tile-number 8)
:desc "He's an important merchant in the copian merchant guild."
:text-char #\p
--- 137,141 ----
(define-monster-kind "merchant-lodicus" "Lodicus Archus"
:numeric-id 1102
! :gfx-sym (tile-paint-value 14 8)
:desc "He's an important merchant in the copian merchant guild."
:text-char #\p
Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/objects.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** objects.lisp 2 Jun 2003 12:33:40 -0000 1.9
--- objects.lisp 26 Jun 2003 21:41:31 -0000 1.10
***************
*** 20,25 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 20,24 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 38,43 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 90)
:weight 5
:cost 125
--- 37,41 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 90)
:weight 5
:cost 125
***************
*** 54,59 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 52,56 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 71,76 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 68,72 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 88,93 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 84,88 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 105,110 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 100,104 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 122,127 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 86)
:weight 5
:cost 125
--- 116,120 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 86)
:weight 5
:cost 125
***************
*** 138,143 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 131,135 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 154,159 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 146,150 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 170,175 ****
:text-attr #\w
:text-char #\?
! :x-attr (tile-file 10)
! :x-char (tile-number 19)
:weight 5
:cost 125
--- 161,165 ----
:text-attr #\w
:text-char #\?
! :gfx-sym (tile-paint-value 10 19)
:weight 5
:cost 125
***************
*** 185,190 ****
(define-object-kind "green-silk-dress" "& green dress~ of silk"
:numeric-id 301
! :x-attr (tile-file 42)
! :x-char (tile-number 0)
:text-attr #\g
:text-char #\(
--- 175,179 ----
(define-object-kind "green-silk-dress" "& green dress~ of silk"
:numeric-id 301
! :gfx-sym (tile-paint-value 42 0)
:text-attr #\g
:text-char #\(
***************
*** 199,204 ****
(define-object-kind "trader-amulet" "& amulet~ of the atrocitan trader's guild"
:numeric-id 302
! :x-attr (tile-file 8)
! :x-char (tile-number 37)
:text-attr #\b
:text-char #\"
--- 188,192 ----
(define-object-kind "trader-amulet" "& amulet~ of the atrocitan trader's guild"
:numeric-id 302
! :gfx-sym (tile-paint-value 8 37)
:text-attr #\b
:text-char #\"
***************
*** 212,217 ****
(define-object-kind "facts-machine" "& atrocitan facts-machine~"
:numeric-id 701
! :x-attr (tile-file 43)
! :x-char (tile-number 0)
:text-attr #\u
:text-char #\o
--- 200,204 ----
(define-object-kind "facts-machine" "& atrocitan facts-machine~"
:numeric-id 701
! :gfx-sym (tile-paint-value 43 0)
:text-attr #\u
:text-char #\o
Index: townies.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/townies.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** townies.lisp 13 Apr 2003 15:33:17 -0000 1.4
--- townies.lisp 26 Jun 2003 21:41:31 -0000 1.5
***************
*** 3,11 ****
(define-monster-kind "copian-guard" "Imperial Guard"
:numeric-id 13
! :x-attr (tile-file 7)
! :x-char (tile-number 5)
:desc "He is there to make you and other citizens safe."
! :text-char #\p
! :text-attr #\r
:power-lvl 10
:hitpoints '(10 . 10)
--- 3,9 ----
(define-monster-kind "copian-guard" "Imperial Guard"
:numeric-id 13
! :gfx-sym (tile-paint-value 7 5)
:desc "He is there to make you and other citizens safe."
! :text-sym (text-paint-value +term-red+ #\p)
:power-lvl 10
:hitpoints '(10 . 10)
***************
*** 20,28 ****
(define-monster-kind "copian-customs-officer" "Customs officer"
:numeric-id 14
! :x-attr (tile-file 14)
! :x-char (tile-number 9)
:desc "He ensures that papers are ok, all taxes are paid and no illegal goods are trafficked."
! :text-char #\p
! :text-attr #\r
:power-lvl 7
:hitpoints '(7 . 10)
--- 18,24 ----
(define-monster-kind "copian-customs-officer" "Customs officer"
:numeric-id 14
! :gfx-sym (tile-paint-value 14 9)
:desc "He ensures that papers are ok, all taxes are paid and no illegal goods are trafficked."
! :text-sym (text-paint-value +term-red+ #\p)
:power-lvl 7
:hitpoints '(7 . 10)
Index: weapons.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/weapons.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** weapons.lisp 2 Jun 2003 11:17:41 -0000 1.3
--- weapons.lisp 26 Jun 2003 21:41:31 -0000 1.4
***************
*** 18,25 ****
(define-object-kind "dagger" "& dagger~"
:numeric-id 1001
! :x-attr (tile-file +tilefile-weapons+)
! :x-char (tile-number 3)
! :text-attr #\W
! :text-char #\|
:locations '((0 . 1) (5 . 1) (10 . 1) (20 . 1))
:weight 12
--- 18,23 ----
(define-object-kind "dagger" "& dagger~"
:numeric-id 1001
! :gfx-sym (tile-paint-value +tilefile-weapons+ 3)
! :text-sym (text-paint-value +term-l-white+ #\|)
:locations '((0 . 1) (5 . 1) (10 . 1) (20 . 1))
:weight 12
***************
*** 33,40 ****
(define-object-kind "short-sword" "& short sword~"
:numeric-id 1002
! :x-attr (tile-file 13)
! :x-char (tile-number 8)
! :text-attr #\W
! :text-char #\|
:locations '((5 . 1))
:weight 80
--- 31,36 ----
(define-object-kind "short-sword" "& short sword~"
:numeric-id 1002
! :gfx-sym (tile-paint-value 13 8)
! :text-sym (text-paint-value +term-l-white+ #\|)
:locations '((5 . 1))
:weight 80
|
|
From: Stig E S. <st...@us...> - 2003-06-25 16:20:26
|
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)
)
|
|
From: Stig E S. <st...@us...> - 2003-06-25 16:20:26
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv28388/variants/contraband/config
Modified Files:
defines.lisp
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: defines.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/defines.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** defines.lisp 4 Apr 2003 11:49:16 -0000 1.1
--- defines.lisp 25 Jun 2003 16:20:23 -0000 1.2
***************
*** 24,31 ****
(register-information& "which-town" "bartertown")
! (define-floor-type* "nothing" "nothing"
:numeric-id 73
! :text-attr +term-white+
! :text-char #\Space
:flags 0
! :x-attr (tile-file 0) :x-char (tile-number 0))
--- 24,30 ----
(register-information& "which-town" "bartertown")
! (define-floor-type "nothing" "nothing"
:numeric-id 73
! :text-sym (text-paint-value +term-white+ #\Space)
:flags 0
! :gfx-sym (tile-paint-value 0 0))
|
|
From: Stig E S. <st...@us...> - 2003-06-05 14:05:10
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv31392/variants/contraband
Modified Files:
print.lisp
Log Message:
changed return-value of print-text
Index: print.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/print.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** print.lisp 3 Jun 2003 11:07:28 -0000 1.6
--- print.lisp 5 Jun 2003 14:03:02 -0000 1.7
***************
*** 25,29 ****
(put-coloured-str! title-attr "======" title-col (1+ title-row))
! (let ((row (+ title-row 3)))
(loop for x being the hash-values of (variant.quests var-obj)
do
--- 25,30 ----
(put-coloured-str! title-attr "======" title-col (1+ title-row))
! (let ((row (+ title-row 3))
! (dummy-col 9))
(loop for x being the hash-values of (variant.quests var-obj)
do
***************
*** 31,35 ****
(not (quest.parent x)))
(put-coloured-str! title-attr (quest.title x) title-col (incf row))
! (setf row (print-text! title-col (incf row) +term-green+ (quest.desc x) :end-col 45))
(when (stringp (quest.step x))
--- 32,37 ----
(not (quest.parent x)))
(put-coloured-str! title-attr (quest.title x) title-col (incf row))
! (multiple-value-setq (dummy-col row)
! (print-text! title-col (incf row) +term-green+ (quest.desc x) :end-col 45))
(when (stringp (quest.step x))
***************
*** 37,41 ****
(when (eq (quest.state q) :active)
(put-coloured-str! title-attr (quest.title q) (+ 2 title-col) (incf row))
! (setf row (print-text! (+ 2 title-col) (incf row) +term-green+ (quest.desc q) :end-col 45)))))
(incf row)
--- 39,46 ----
(when (eq (quest.state q) :active)
(put-coloured-str! title-attr (quest.title q) (+ 2 title-col) (incf row))
! (multiple-value-setq (dummy-col row)
! (print-text! (+ 2 title-col) (incf row) +term-green+ (quest.desc q) :end-col 45))
!
! )))
(incf row)
|
|
From: Stig E S. <st...@us...> - 2003-06-03 11:07:33
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv4090/variants/contraband
Modified Files:
print.lisp combat.lisp
Log Message:
renamed pl-ability functions to use same names as the combat slots in aobj and okind
Index: print.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/print.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** print.lisp 1 May 2003 22:23:19 -0000 1.5
--- print.lisp 3 Jun 2003 11:07:28 -0000 1.6
***************
*** 95,102 ****
"Prints AC to left frame."
! (let* (;;(perc (player.perceived-abilities player))
! ;;(ac (+ (pl-ability.base-ac perc)
! ;;(pl-ability.ac-modifier perc)))
! (ac-set (setting-lookup setting "ac")))
(output-string! +charinfo-frame+ 0 ac-set +term-white+ "Defence")
--- 95,99 ----
"Prints AC to left frame."
! (let* ((ac-set (setting-lookup setting "ac")))
(output-string! +charinfo-frame+ 0 ac-set +term-white+ "Defence")
Index: combat.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/combat.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** combat.lisp 2 Jun 2003 12:36:33 -0000 1.4
--- combat.lisp 3 Jun 2003 11:07:29 -0000 1.5
***************
*** 194,201 ****
(let ((actual (player.actual-abilities player))
(perc (player.perceived-abilities player)))
! (setf (pl-ability.base-ac actual) sum
! (pl-ability.ac-modifier actual) 0
! (pl-ability.base-ac perc) sum
! (pl-ability.ac-modifier perc) 0))
--- 194,201 ----
(let ((actual (player.actual-abilities player))
(perc (player.perceived-abilities player)))
! (setf (get-armour-rating actual) sum
! (get-armour-modifier actual) 0
! (get-armour-rating perc) sum
! (get-armour-modifier perc) 0))
|
|
From: Stig E S. <st...@us...> - 2003-06-02 12:36:36
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv466/variants/contraband
Modified Files:
combat.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: combat.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/combat.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** combat.lisp 1 Jun 2003 23:38:07 -0000 1.3
--- combat.lisp 2 Jun 2003 12:36:33 -0000 1.4
***************
*** 43,47 ****
(player.skills *player*))))
! (* (aobj.base-ac obj) skill-score)))
(defun con/calculate-body-armour-rating (player)
--- 43,47 ----
(player.skills *player*))))
! (* (get-armour-rating obj) skill-score)))
(defun con/calculate-body-armour-rating (player)
***************
*** 212,218 ****
(when wpn
! (let ((gval (object.game-values wpn)))
! (check-type gval game-values)
! (setf roll (roll-dice (gval.num-dice gval) (gval.base-dice gval)))))
(when (< roll 1) (setf roll 1))
--- 212,216 ----
(when wpn
! (setf roll (roll-dice (get-number-of-damage-dice wpn) (get-damage-dice wpn))))
(when (< roll 1) (setf roll 1))
|
|
From: Stig E S. <st...@us...> - 2003-06-02 12:33:48
|
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)
|
|
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")
|
|
From: Stig E S. <st...@us...> - 2003-06-01 23:47:45
|
Update of /cvsroot/contraband/contraband In directory sc8-pr-cvs1:/tmp/cvs-serv9868 Modified Files: combat.lisp Log Message: moved armour-related values out of gvals to aobj and okind Index: combat.lisp =================================================================== RCS file: /cvsroot/contraband/contraband/combat.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** combat.lisp 5 Apr 2003 18:29:39 -0000 1.2 --- combat.lisp 1 Jun 2003 23:38:07 -0000 1.3 *************** *** 43,47 **** (player.skills *player*)))) ! (* (gval.base-ac (aobj.game-values obj)) skill-score))) (defun con/calculate-body-armour-rating (player) --- 43,47 ---- (player.skills *player*)))) ! (* (aobj.base-ac obj) skill-score))) (defun con/calculate-body-armour-rating (player) |
|
From: Stig E S. <st...@us...> - 2003-06-01 23:37:08
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv9437
Modified Files:
spells.lisp
Log Message:
removed dead code
Index: spells.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/spells.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spells.lisp 28 May 2003 10:34:31 -0000 1.5
--- spells.lisp 1 Jun 2003 23:36:59 -0000 1.6
***************
*** 495,1065 ****
state-object)
-
-
- ;(defun teleport-creature! (dungeon player creature range)
- ; (assert (numberp range))
- ;
- ; (let* ((minimum (floor range))
- ; (cx (location-x creature))
- ; (cy (location-y creature))
- ; (tx cx)
- ; (ty cy)
- ; (cur-d range))
- ; (block find-grid
- ; (loop
- ; (when (> range 200)
- ; (setf range 200))
- ;
- ; (block legal-dist
- ; (dotimes (i 500)
- ; (setf tx (rand-spread cx range)
- ; ty (rand-spread cy range))
- ; (setf cur-d (distance cx cy tx ty))
- ; (when (and (>= cur-d minimum) (<= cur-d minimum))
- ; (return-from legal-dist))))
- ;
- ; (when (and (in-bounds-fully? dungeon tx ty)
- ; (can-place? dungeon tx ty :creature)
- ; (not (cave-icky? dungeon tx ty)))
- ; (return-from find-grid))
- ;
- ; (setf range (* 2 range)
- ; minimum (floor minimum 2))))
- ;
- ; ;; we found an ok spot!
- ; (assert (and (in-bounds-fully? dungeon tx ty)
- ; (can-place? dungeon tx ty :creature)
- ; (not (cave-icky? dungeon tx ty))))
- ;
- ; ;; sound
- ;
- ; ;; swap monster
- ; (swap-monsters! dungeon player cx cy tx ty)
- ;#||
- ; (warn "UPD: ~s (~s ~s ~a) -> (~s ~s ~a), ~s"
- ; *update* cx cy (multiple-value-bind (a b) (map-info dungeon cx cy) b)
- ; (location-x player) (location-y player)
- ; (multiple-value-bind (a b) (map-info dungeon (location-x player) (location-y player)) b)
- ; (distance cx cy tx ty))
- ; ||#
- ;;; (handle-stuff dungeon player) ;; hack
- ;
- ;;; (print-map dungeon player)
- ; ))
-
- ;(defun summon-monster (dungeon x y depth &key (type :any))
- ; "Returns T if it summoned a monster successfully."
- ; (declare (ignore type depth))
- ;;; (warn "summoning at (~s,~s) type ~s" x y type)
- ;
- ; ;; we ignore type now, and fix that later.
- ;
- ; (let ((variant *variant*)
- ; (player *player*)
- ; (retval t))
- ; (loop for i from 1 to 10
- ; do
- ; (let ((fx (+ (randint i) x))
- ; (fy (+ (randint i) y))) ;; hack
- ; (when (cave-empty-bold? dungeon fx fy)
- ; (place-monster! variant dungeon player fx fy nil nil)
- ; (setf retval t))
- ; ))
- ; retval))
-
- ;; this one uses radius, not panel
- ;; fix it to use center-x and center-y instead of using the distance flag!
- ;(defun detect-invisible! (dungeon player center-x center-y radius)
- ; (declare (ignore center-x center-y)) ;; remove ignore
- ; (let ((success nil))
- ; (dolist (mon (dungeon.monsters dungeon))
- ; (when (creature-alive? mon)
- ; (let ((mx (location-x mon))
- ; (my (location-y mon)))
- ; (when (and (< (amon.distance mon) radius)
- ; (panel-contains? player mx my))
- ; (when (has-ability? (amon.kind mon) '<invisible>)
- ; ;; skip lore
- ; ;; skip recall
- ; (bit-flag-add! (amon.vis-flag mon) #.(logior +monster-flag-mark+ +monster-flag-show+))
- ; (update-monster! *variant* mon nil)
- ; (setf success t)
- ; ))
- ; )))
- ;
- ; (when success
- ; (print-message! "You detect invisible creatures!"))
- ;
- ; success))
-
-
- ;; FIX for type '<powerful>
- ;(defun interactive-identify-object! (dungeon player &key (type '<normal>))
- ;
- ; (block id-obj
- ; (let* ((limit-from '(:backpack :floor :worn))
- ; (prompt "Identify which item? ")
- ; (variant *variant*)
- ; (selection (select-item dungeon player limit-from
- ; :prompt prompt
- ; :where (first limit-from))))
- ;
- ; (unless (and selection (consp selection))
- ; (return-from id-obj nil))
- ;
- ; (let* ((the-table (get-item-table dungeon player (car selection)))
- ; (removed-obj (item-table-remove! the-table (cdr selection))))
- ;
- ; (unless (and removed-obj (typep removed-obj 'active-object))
- ; (return-from id-obj nil))
- ;
- ; (ecase type
- ; (<normal>
- ; (possible-identify! player removed-obj))
- ; (<powerful>
- ; (possible-identify! player removed-obj)
- ; (learn-about-object! player removed-obj :fully-known)))
- ;
- ; ;; put object back where it was found
- ; (put-object-in-container! dungeon player the-table removed-obj)
- ;
- ; (format-message! "Object is ~a."
- ; (with-output-to-string (s)
- ; (write-obj-description variant removed-obj s)))
- ;
- ; t))
- ; ))
-
-
- ; (block cast-spell
- ; (when-bind (book (with-dialogue ()
- ; (interactive-book-selection dungeon player)))
- ; (let* ((okind (aobj.kind book))
- ; (book-id (get-id okind))
- ; (which-one 0))
- ; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
- ; (with-dialogue ()
- ; (setf which-one (interactive-spell-selection player spell-info)))
- ;
- ; (cond ((eq which-one nil)
- ; (return-from cast-spell nil))
- ; ((not (and (integerp which-one) (>= which-one 0) (< which-one (spellbook.size spell-info))))
- ; (warn "Spell ~s not found." which-one)
- ; (return-from cast-spell nil)))
- ;
- ; ;; let us find the spell now.
- ; (let* ((the-spell (aref (spellbook.spells spell-info) which-one))
- ; (spell-effect (spell.effect the-spell))
- ; (spell-data (get-spell-data player the-spell))
- ; (learnt-spell (has-learnt-spell? player the-spell)))
- ;
- ; ;;(warn "Spell ~s: know (~s), learnt (~s)" the-spell spell-data learnt-spell)
- ;
- ; (unless (and spell-data learnt-spell)
- ; (format-message! "You don't know the ~a spell." (spell.name the-spell))
- ; (return-from cast-spell nil))
- ;
- ; (unless (>= (current-mana player) (spell.mana spell-data))
- ; (print-message! "You don't have enough mana to cast that spell.")
- ; (return-from cast-spell nil))
- ;
- ;
- ; (cond ((and spell-effect (functionp spell-effect))
- ; (funcall spell-effect dungeon player the-spell)
- ; ;; deduct mana, better way?
- ; (decf (current-mana player) (spell.mana spell-data))
- ; (bit-flag-add! *redraw* +print-mana+)
- ; (unless (spell.tried spell-data)
- ; ;;(warn "Tried spell ~s" (spell.id spell-data))
- ; (setf (spell.tried spell-data) t)
- ; (modify-xp! player (spell.xp spell-data)))
- ;
- ; )
- ; (t
- ; (format-message! "The ~a spell is not implemented yet." (spell.name the-spell))))
- ; ))
- ;
- ; ;; clean up some!
- ; ;; (put-coloured-line! +term-white+ "" 0 0)
- ;
- ; )))
-
- ; (unless (can-learn-more-spells? variant player)
- ; (print-message! "You cannot learn more spells at this level.")
- ; (return-from contra-learn-spell! nil))
- ;
- ;
- ; (block learn-spell
- ; (with-dialogue ()
- ; (when-bind (book (interactive-book-selection dungeon player))
- ; (let* ((okind (aobj.kind book))
- ; (book-id (get-id okind)))
- ; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
- ; (when-bind (which-one (interactive-spell-selection player spell-info
- ; :prompt "Learn which spell? "))
- ; (unless (and (integerp which-one) (>= which-one 0)
- ; (< which-one (spellbook.size spell-info)))
- ; (warn "Illegal choice ~s" which-one)
- ; (return-from learn-spell nil))
- ;
- ; (let ((the-spell (aref (spellbook.spells spell-info) which-one)))
- ; (learn-spell! player the-spell))
- ;
- ; )))
- ; ))
- ; )
-
- ; (when (is-spellcaster? player)
- ; (let* ((pl-class (player.class player))
- ; (stats (variant.stats variant))
- ; (stat-obj (find (class.spell-stat pl-class) stats :key #'stat.symbol))
- ; )
- ; (when stat-obj
- ; (let* ((stat-val (aref (player.active-stats player) (stat.number stat-obj)))
- ; (half-spells (get-stat-info stat-obj stat-val :half-spells))
- ; (learnt-spells (class.learnt-spells pl-class))
- ; (num-learnt (length learnt-spells))
- ; (max-spells (int-/ (* (player.power-lvl player) half-spells) 2)))
- ;
- ;
- ; ;;(warn "Max spells ~s vs learnt ~s" max-spells num-learnt)
- ;
- ; (> max-spells num-learnt)))
- ; ))
-
-
-
- ;(defun light-room! (dungeon x y &key (type '<light>))
- ; "Lights the room."
- ; (let ((coords (lb-ds:make-queue)))
- ; (flet ((add-coord (bx by)
- ; (let ((flag (cave-flags dungeon bx by)))
- ; ;; no recursion
- ; ;;(warn "flag at ~s,~s is ~s" bx by flag)
- ; (when (or (bit-flag-set? flag +cave-temp+)
- ; ;; don't leave the room
- ; (not (bit-flag-set? flag +cave-room+)))
- ; (return-from add-coord))
- ;
- ; (bit-flag-add! (cave-flags dungeon bx by) +cave-temp+)
- ; ;;(warn "adding ~s ~s" bx by)
- ; (lb-ds:enqueue (cons bx by) coords))))
- ;
- ; ;; add first grid
- ; (add-coord x y)
- ;
- ; (dolist (i (lb-ds:queue-as-list coords))
- ; (let ((cx (car i))
- ; (cy (cdr i)))
- ; (when (cave-floor-bold? dungeon cx cy)
- ; ;; next to
- ; (add-coord (1+ cx) cy)
- ; (add-coord (1- cx) cy)
- ; (add-coord cx (1+ cy))
- ; (add-coord cx (1- cy))
- ;
- ; ;; diagonal
- ; (add-coord (1+ cx) (1+ cy))
- ; (add-coord (1- cx) (1- cy))
- ; (add-coord (1+ cx) (1- cy))
- ; (add-coord (1- cx) (1+ cy))
- ; ))))
- ;
- ; ;;(warn "coords ~s" coords)
- ;
- ; (dolist (i (lb-ds:queue-as-list coords))
- ; (let ((flag (cave-flags dungeon (car i) (cdr i))))
- ; (bit-flag-remove! flag +cave-temp+)
- ; ;;(warn "lighting ~s ~s" (car i) (cdr i))
- ; (ecase type
- ; (<light>
- ; (bit-flag-add! flag +cave-glow+))
- ; (<darkness>
- ; (bit-flag-remove! flag +cave-glow+)))
- ; (setf (cave-flags dungeon (car i) (cdr i)) flag)))
- ;
- ; ;; redraw things
- ; (bit-flag-add! *update* +pl-upd-forget-view+ +pl-upd-update-view+)
- ; (bit-flag-add! *redraw* +print-map+)
- ;
- ; t))
-
-
- ;(defun light-area! (dungeon player damage radius &key (type '<light>))
- ; "Lights the area."
- ;
- ; ;; unless blind
- ; (let ((blind-player nil)
- ; (px (location-x player))
- ; (py (location-y player)))
- ;
- ; (unless blind-player
- ; (ecase type
- ; (<light>
- ; (print-message! "You are surrounded by a white light."))
- ; (<darkness>
- ; (print-message! "Darkness surrounds you!"))
- ; ))
- ;
- ; (do-projection player px py (logior +project-grid+ +project-kill+)
- ; :damage damage
- ; :radius radius
- ; :effect (get-spell-effect type))
- ; (light-room! dungeon px py :type type))
- ;
- ; t)
-
-
- ;(defun enchant-item! (dungeon player &key (type '<weapon>) (bonus 1) (restrict nil))
- ;
- ; (flet ((%local-enchant (item)
- ; (let ((gvals (object.game-values item)))
- ; (warn "enchant ~s ~s ~s ~s" item type bonus restrict)
- ; ;; improve later
- ; (ecase type
- ; (<weapon>
- ; (when (< (gval.tohit-modifier gvals) +10)
- ; (incf (gval.tohit-modifier gvals) bonus)
- ; (incf (gval.dmg-modifier gvals) bonus)
- ; :used))
- ;
- ; (<armour>
- ; (when (< (gval.ac-modifier gvals) +10)
- ; (incf (gval.ac-modifier gvals) bonus)
- ; :used))))))
- ;
- ; (let ((retval :still-useful)
- ; (selection (select-item dungeon player '(:backpack :equip)
- ; :prompt "Enchant item: "
- ; :where :backpack)))
- ;
- ; (cond (selection
- ; (let* ((the-table (get-item-table dungeon player (car selection)))
- ; (removed-obj (item-table-remove! the-table (cdr selection))))
- ; (cond (removed-obj
- ; (format-message! "~a ~a glow~a brightly." "The" "[some-object, FIX]" "s")
- ; (setf retval (%local-enchant removed-obj))
- ;
- ; (item-table-add! the-table removed-obj))
- ; (t
- ; (warn "Did not find selected obj ~a" selection)))))
- ; (t
- ; (warn "Did not select anything.")))
- ;
- ;
- ; retval)))
-
- #||
- (defun define-spell (name id &key effect-type effect)
- "Defines and registers a new spell."
-
- (assert (stringp name))
- (assert (stringp id))
-
- (let ((variant *variant*)
- (spell (make-instance 'magic-spell :name name :id id)))
-
- (when (and effect (functionp effect))
- (setf (spell.effect spell) (compile nil effect)))
-
- ;; checking carefully
- (when effect-type
- (unless (is-legal-effect-type? effect-type)
- (warn "Unknown spell-type ~s for spell ~s" effect-type id))
-
- (when-bind (lookup (gethash effect-type (variant.visual-effects variant)))
- ;;(warn "spell lookup is ~s" lookup)
- (setf (spell.effect-type spell) lookup)))
-
-
- ;; register spell in variant
- (multiple-value-bind (value present-p)
- (gethash (spell.id spell) (variant.spells variant))
- (when present-p
- (warn "Replacing spell ~s in contraband variant" value))
- (setf (gethash (spell.id spell) (variant.spells variant)) spell))
-
-
- spell))
-
- (defmethod get-visual-projectile ((obj magic-spell))
- (spell.effect-type obj))
-
- (defun create-spellbook (name id spells)
- "Creates and returns a spellbook."
-
- (check-type name string)
- (assert (verify-id id))
- (assert (consp spells))
-
- (let* ((variant *variant*)
- (len (length spells))
- (book (make-instance 'spellbook :name name :id id :size len)))
-
- (setf (spellbook.spells book) (make-array len :initial-element nil))
-
- (loop for i from 0
- for spell in spells
- do
- (let ((spell-obj (gethash spell (variant.spells variant))))
- (cond ((and spell-obj (typep spell-obj 'magic-spell))
- (setf (aref (spellbook.spells book) i) spell-obj))
- (t
- (warn "Unable to find spell ~s in contraband" spell))
- )))
- book))
- ||#
-
- #||
-
- (defun get-spell-id (spell)
- (etypecase spell
- (string spell)
- (spell-classdata (spell.id spell))
- (magic-spell (spell.id spell))))
-
- (defun get-spell-data (player spell)
- (when (is-spellcaster? player)
- (let ((spell-id (get-spell-id spell))
- (spell-arr (class.spells (player.class player))))
-
- (loop for x across spell-arr
- do
- (when (equal spell-id (spell.id x))
- (return-from get-spell-data x)))
-
- nil)))
-
-
- (defun learn-spell! (player spell)
- "Tries to ensure that the player learns the given spell."
-
- (unless (is-spellcaster? player)
- (print-message! "You are not a spellcaster and cannot learn spells.")
- (return-from learn-spell! nil))
-
- ;; (warn "Trying to learn ~s" spell)
-
- (let ((spell-id (etypecase spell
- (magic-spell (spell.id spell))
- (spell-classdata (spell.id spell))
- (string spell)))
- (learnt-spells (class.learnt-spells (player.class player))))
-
- (when (find spell-id learnt-spells :test #'equal)
- (print-message! "You already know the spell.")
- (return-from learn-spell! nil))
-
- (let ((spell-data (get-spell-data player spell-id)))
- (cond ((and (typep spell-data 'spell-classdata)
- (<= (spell.level spell-data) (player.power-lvl player)))
- (vector-push-extend spell-id learnt-spells)
- (format-message! "~a learnt." (spell.name spell))
- (bit-flag-add! *redraw* +print-study+)
- (return-from learn-spell! t))
-
- ((and (typep spell-data 'spell-classdata)
- (> (spell.level spell-data) (player.power-lvl player)))
- (print-message! "You're not powerful enough to learn that spell yet."))
-
- ((eq spell-data nil)
- (print-message! "You are unable to learn that spell."))
-
- (t
- (warn "Unknown value returned ~s, ~s." spell-data spell)))
-
- nil)))
-
-
-
- (defun has-learnt-spell? (player spell)
- "Returns NIL if the player has not learnt the spell,
- returns T if the player knows the spell."
- (let* ((spell-id (get-spell-id spell))
- (learnt-spells (class.learnt-spells (player.class player)))
- (existing-spell (find spell-id learnt-spells :test #'equal)))
- ;; (warn "Checked for ~s in ~s" spell-id learnt-spells)
- (when existing-spell
- t)))
-
- (defun can-learn-more-spells? (variant player)
- "Returns T if the player can learn spells, NIL otherwise."
-
- t)
-
- (defun interactive-book-selection (dungeon player)
- "Selects a book and returns it or NIL."
- (declare (ignore dungeon))
- (block select-book
- (let ((carrying (aobj.contains (get-creature-inventory player)))
- (books '())
- ;;(variant *variant*)
- )
-
- (item-table-iterate! carrying
- #'(lambda (table num obj)
- (declare (ignore table))
- (when (typep obj 'active-object/book)
- (push (cons obj num) books))))
- (setf books (nreverse books))
-
- (unless books
- (put-coloured-line! +term-white+ "No books" 0 0)
- (return-from select-book nil))
-
- (let* ((first-num (i2a (cdar books)))
- (last-num (i2a (cdar (last books))))
- (select-string (format nil "Inven: (~a-~a), * to see, ESC) Use which book? "
- first-num last-num)))
-
- (put-coloured-line! +term-white+ select-string 0 0)
- (loop
- (let ((selection (read-one-character)))
- (cond ((eql selection +escape+)
- (return-from select-book nil))
- ((eql selection #\*)
- (warn "Show book-selection not implemented."))
- ((alpha-char-p selection)
- (let ((num (a2i selection)))
- (loop for (book . key) in books
- do
- (when (eql key num)
- (return-from select-book book)))
- (warn "Selection ~a not found, please try again." selection)
- nil))
- (t
- (warn "Fell through with book-selection ~s" selection)
- nil))
- ))
-
- ))))
-
- ||#
- #||
-
-
- (defmethod print-object ((inst magic-spell) stream)
- (print-unreadable-object
- (inst stream :identity t)
- (format stream "~:(~S~) [~S ~S]" (class-name (class-of inst))
- (spell.id inst)
- (spell.name inst)))
- inst)
-
- (defmethod print-object ((inst spellbook) stream)
- (print-unreadable-object
- (inst stream :identity t)
- (format stream "~:(~S~) [~S ~S]" (class-name (class-of inst))
- (spellbook.id inst)
- (spellbook.name inst)))
- inst)
-
- (defmethod print-object ((inst spell-classdata) stream)
- (print-unreadable-object
- (inst stream :identity t)
- (format stream "~:(~S~) [~S ~S]" (class-name (class-of inst))
- (spell.id inst)
- (spell.level inst)))
- inst)
-
- ||#
\ No newline at end of file
--- 495,496 ----
|
|
From: Stig E S. <st...@us...> - 2003-06-01 23:36:44
|
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)))
|
|
From: Stig E S. <st...@us...> - 2003-06-01 16:09:11
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv14395/variants/contraband/config
Modified Files:
objects.lisp
Log Message:
moved gval.abilities to object-kind and updated all surrounding code
Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/objects.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objects.lisp 19 Apr 2003 11:08:06 -0000 1.6
--- objects.lisp 1 Jun 2003 16:09:07 -0000 1.7
***************
*** 194,198 ****
:sort-value 301
:the-kind '<body-armour>
! :game-values (make-game-values :base-ac 1 :stat-modifiers '((<pre> +2))))
(define-object-kind "trader-amulet" "& amulet~ of the atrocitan trader's guild"
--- 194,199 ----
:sort-value 301
:the-kind '<body-armour>
! :game-values (make-game-values :base-ac 1)
! :stat-modifiers '((<pre> +2)))
(define-object-kind "trader-amulet" "& amulet~ of the atrocitan trader's guild"
***************
*** 207,211 ****
:sort-value 302
:the-kind '<amulet>
! :game-values (make-game-values :stat-modifiers '((<pre> +1))))
(define-object-kind "facts-machine" "& atrocitan facts-machine~"
--- 208,212 ----
:sort-value 302
:the-kind '<amulet>
! :stat-modifiers '((<pre> +1)))
(define-object-kind "facts-machine" "& atrocitan facts-machine~"
|
|
From: Stig E S. <st...@us...> - 2003-05-28 10:34:35
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv12498/variants/contraband
Modified Files:
spells.lisp quests.lisp objects.lisp creatures.lisp
Log Message:
renamed several .id function to use one generic called GET-ID
Index: spells.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/spells.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spells.lisp 19 May 2003 15:42:32 -0000 1.4
--- spells.lisp 28 May 2003 10:34:31 -0000 1.5
***************
*** 335,339 ****
(when-bind (book (interactive-book-selection dungeon player))
(let* ((okind (aobj.kind book))
! (book-id (object.id okind)))
(when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
;; (warn "SI: ~s" spell-info)
--- 335,339 ----
(when-bind (book (interactive-book-selection dungeon player))
(let* ((okind (aobj.kind book))
! (book-id (get-id okind)))
(when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
;; (warn "SI: ~s" spell-info)
***************
*** 636,640 ****
; (interactive-book-selection dungeon player)))
; (let* ((okind (aobj.kind book))
! ; (book-id (object.id okind))
; (which-one 0))
; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
--- 636,640 ----
; (interactive-book-selection dungeon player)))
; (let* ((okind (aobj.kind book))
! ; (book-id (get-id okind))
; (which-one 0))
; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
***************
*** 694,698 ****
; (when-bind (book (interactive-book-selection dungeon player))
; (let* ((okind (aobj.kind book))
! ; (book-id (object.id okind)))
; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
; (when-bind (which-one (interactive-spell-selection player spell-info
--- 694,698 ----
; (when-bind (book (interactive-book-selection dungeon player))
; (let* ((okind (aobj.kind book))
! ; (book-id (get-id okind)))
; (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
; (when-bind (which-one (interactive-spell-selection player spell-info
Index: quests.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/quests.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** quests.lisp 19 May 2003 15:42:32 -0000 1.7
--- quests.lisp 28 May 2003 10:34:31 -0000 1.8
***************
*** 85,89 ****
do
(when (typep x 'active-object)
! (when (equal obj (object.id (aobj.kind x)))
(return-from has-object? i)))))
--- 85,89 ----
do
(when (typep x 'active-object)
! (when (equal obj (get-id (aobj.kind x)))
(return-from has-object? i)))))
Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/objects.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** objects.lisp 4 Apr 2003 11:49:16 -0000 1.1
--- objects.lisp 28 May 2003 10:34:31 -0000 1.2
***************
*** 87,91 ****
(unless the-effect
! (warn "Didn't find ~s effect for ~s" which-use (object.id okind))
(return-from use-object! retval))
--- 87,91 ----
(unless the-effect
! (warn "Didn't find ~s effect for ~s" which-use (get-id okind))
(return-from use-object! retval))
Index: creatures.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/creatures.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** creatures.lisp 19 Apr 2003 15:30:14 -0000 1.4
--- creatures.lisp 28 May 2003 10:34:31 -0000 1.5
***************
*** 82,86 ****
(unless (is-creatable? variant the-kind)
! (warn "Tried to produce dead unique ~a, failed" (monster.id the-kind))
(return-from produce-active-monster nil))
--- 82,86 ----
(unless (is-creatable? variant the-kind)
! (warn "Tried to produce dead unique ~a, failed" (get-id the-kind))
(return-from produce-active-monster nil))
|
|
From: Stig E S. <st...@us...> - 2003-05-28 10:34:34
|
Update of /cvsroot/contraband/contraband/tasks
In directory sc8-pr-cvs1:/tmp/cvs-serv12498/variants/contraband/tasks
Modified Files:
trader.lisp
Log Message:
renamed several .id function to use one generic called GET-ID
Index: trader.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/tasks/trader.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trader.lisp 20 Apr 2003 09:26:24 -0000 1.9
--- trader.lisp 28 May 2003 10:34:30 -0000 1.10
***************
*** 60,64 ****
(call-next-method)
;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
! (assert (equal (monster.id quest-giver) "trader-farethan"))
(let ((strategy (make-instance 'peaceful-mover)))
(setf (strategy.destinations strategy) '((10 35) (10 46)
--- 60,64 ----
(call-next-method)
;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
! (assert (equal (get-id quest-giver) "trader-farethan"))
(let ((strategy (make-instance 'peaceful-mover)))
(setf (strategy.destinations strategy) '((10 35) (10 46)
***************
*** 82,86 ****
;;(warn "Finish ~s" quest)
;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
! (assert (equal (monster.id (quest.giver quest)) "trader-farethan"))
(let ((strategy (first (amon.strategies (quest.giver quest)))))
(check-type strategy peaceful-mover)
--- 82,86 ----
;;(warn "Finish ~s" quest)
;;(warn "QG ~s, QT ~s, Q.G ~s, Q.T ~s" quest-giver quest-taker (quest.giver quest) (quest.taker quest))
! (assert (equal (get-id (quest.giver quest)) "trader-farethan"))
(let ((strategy (first (amon.strategies (quest.giver quest)))))
(check-type strategy peaceful-mover)
|
|
From: Stig E S. <st...@us...> - 2003-05-19 15:42:36
|
Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv985/variants/contraband
Modified Files:
spells.lisp quests.lisp player.lisp keys.lisp
Log Message:
renamed player.inventory to get-creature-inventory
Index: spells.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/spells.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spells.lisp 12 Apr 2003 14:36:25 -0000 1.3
--- spells.lisp 19 May 2003 15:42:32 -0000 1.4
***************
*** 992,996 ****
(declare (ignore dungeon))
(block select-book
! (let ((carrying (aobj.contains (player.inventory player)))
(books '())
;;(variant *variant*)
--- 992,996 ----
(declare (ignore dungeon))
(block select-book
! (let ((carrying (aobj.contains (get-creature-inventory player)))
(books '())
;;(variant *variant*)
Index: quests.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/quests.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** quests.lisp 18 Apr 2003 12:32:05 -0000 1.6
--- quests.lisp 19 May 2003 15:42:32 -0000 1.7
***************
*** 80,84 ****
(check-type creature player)
(check-type obj string)
! (let ((objs (items.objs (aobj.contains (player.inventory creature)))))
(loop for i from 0
for x across objs
--- 80,84 ----
(check-type creature player)
(check-type obj string)
! (let ((objs (items.objs (aobj.contains (get-creature-inventory creature)))))
(loop for i from 0
for x across objs
***************
*** 235,239 ****
(defun add-to-inventory (creature object &key identified)
(check-type creature player)
! (let* ((backpack (player.inventory creature))
(inventory (aobj.contains backpack)))
(when identified
--- 235,239 ----
(defun add-to-inventory (creature object &key identified)
(check-type creature player)
! (let* ((backpack (get-creature-inventory creature))
(inventory (aobj.contains backpack)))
(when identified
***************
*** 249,253 ****
(let ((pos (has-object? creature key)))
(when pos
! (item-table-remove! (aobj.contains (player.inventory creature)) pos))))
(defun get-new-object (id)
--- 249,253 ----
(let ((pos (has-object? creature key)))
(when pos
! (item-table-remove! (aobj.contains (get-creature-inventory creature)) pos))))
(defun get-new-object (id)
Index: player.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/player.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** player.lisp 20 Apr 2003 10:30:21 -0000 1.6
--- player.lisp 19 May 2003 15:42:32 -0000 1.7
***************
*** 68,72 ****
(let ((eq-slots (player.equipment player)))
(item-table-add! eq-slots backpack 'eq.backpack)
! (setf (player.inventory player) backpack)))
--- 68,72 ----
(let ((eq-slots (player.equipment player)))
(item-table-add! eq-slots backpack 'eq.backpack)
! (setf (get-creature-inventory player) backpack)))
Index: keys.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/keys.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** keys.lisp 17 Apr 2003 14:43:13 -0000 1.7
--- keys.lisp 19 May 2003 15:42:32 -0000 1.8
***************
*** 114,118 ****
(with-dialogue ()
(clear-window *cur-win*) ;; hack
! (let* ((backpack (player.inventory player))
(inventory (aobj.contains backpack)))
(item-table-print inventory :show-pause t :start-x 3))
--- 114,118 ----
(with-dialogue ()
(clear-window *cur-win*) ;; hack
! (let* ((backpack (get-creature-inventory player))
(inventory (aobj.contains backpack)))
(item-table-print inventory :show-pause t :start-x 3))
|
|
From: Stig E S. <st...@us...> - 2003-05-01 22:31:59
|
Update of /cvsroot/contraband/contraband/config
In directory sc8-pr-cvs1:/tmp/cvs-serv21859/variants/contraband/config
Modified Files:
character.lisp
Log Message:
tweaked titles
Index: character.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/config/character.lisp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** character.lisp 17 Apr 2003 10:51:17 -0000 1.2
--- character.lisp 1 May 2003 22:31:56 -0000 1.3
***************
*** 102,108 ****
suitable for many tasks for the Foreign Office."
! :titles '("Briefcase boy" "Clerk" "Newbie Diplomat"
! "Junior Diplomat" "Asst Diplomat" "Diplomat"
! "Senior Diplomat" "Consul" "Ambassador" "Richelieu")
:starting-equipment '((obj :id "short-sword")
--- 102,108 ----
suitable for many tasks for the Foreign Office."
! :titles '("Aspirant" "Clerk" "Aide"
! "Attache" "First Secretary" "Vice-Consul"
! "Consul" "Counselor" "Ambassador" "Richelieu")
:starting-equipment '((obj :id "short-sword")
|
