aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Pouar <pouar@pouar.net>2020-09-20 09:29:01 -0500
committerGravatar Pouar <pouar@pouar.net>2020-09-20 09:29:56 -0500
commit25c362eb37dd2dd738da68685e4dd7940ce01c23 (patch)
tree9f69997630248807a367b2c5c20451f1dcfd323b
parentanother optimization (diff)
change the convention for initargs in mods
avoids different mods from clobbering each other's initargs
-rw-r--r--data/items/misc.lisp24
-rw-r--r--data/map/bandits-domain.lisp42
-rw-r--r--data/map/ironside.lisp36
-rw-r--r--data/map/secret-underground.lisp4
-rw-r--r--data/map/sky.lisp24
-rw-r--r--data/prolog/enemies.lisp4
-rw-r--r--data/props/base.lisp8
-rw-r--r--packages.lisp14
8 files changed, 83 insertions, 73 deletions
diff --git a/data/items/misc.lisp b/data/items/misc.lisp
index 36c70ec..03c917e 100644
--- a/data/items/misc.lisp
+++ b/data/items/misc.lisp
@@ -62,38 +62,38 @@
:tossable nil
:description "Collect as many of these fuckers as you possibly can. Don't ask why, just do it."))
(defclass enemy-catcher (item)
- ((contained-enemies
- :initarg :contained-enemies
+ ((contained-enemies%
+ :initarg contained-enemies
:accessor contained-enemies-of
:initform nil
:type list
:documentation "list that contains the caught enemies")
- (contained-enemies-max-length
- :initarg :contained-enemies-max-length
+ (contained-enemies-max-length%
+ :initarg contained-enemies-max-length
:accessor contained-enemies-max-length-of
:initform 1
:type unsigned-byte
:documentation "Maximum amount of enemies this can hold")
- (catch-chance-multiplier
- :initarg :catch-chance-multiplier
+ (catch-chance-multiplier%
+ :initarg catch-chance-multiplier
:accessor catch-chance-multiplier-of
:initform 1
:type (real 0)
:documentation "Multiplier of the chance this item might catch an enemy")
- (catch-chance-delta
- :initarg :catch-chance-delta
+ (catch-chance-delta%
+ :initarg catch-chance-delta
:accessor catch-chance-delta-of
:initform 0
:type real
:documentation "How much of an increase this item might catch an enemy. if the multiplier is also specified, then this gets multiplied too")
- (device-health
- :initarg :device-health
+ (device-health%
+ :initarg device-health
:accessor device-health-of
:initform 1
:type (or unsigned-byte null)
:documentation "How many times it can fail to catch the enemy before it gets destroyed. @code{T} means it never gets destroyed")
- (max-device-health
- :initarg :max-device-health
+ (max-device-health%
+ :initarg max-device-health
:accessor max-device-health-of
:initform 1
:type (or unsigned-byte null)
diff --git a/data/map/bandits-domain.lisp b/data/map/bandits-domain.lisp
index fd62cb2..4d01093 100644
--- a/data/map/bandits-domain.lisp
+++ b/data/map/bandits-domain.lisp
@@ -126,27 +126,27 @@
(format t "~a: So why do you even need this shop? Why not just steal everything?~%~%"
(name-of (player-of *game*)))
(write-line "Shop Owner: In case you haven't noticed, being stealthy enough to steal everything isn't all that easy when your diaper crinkles with each and every step you take. *crinkles and blushes*"))))
- :items-for-sale '((yadfa-items:gold-pacifier)
- (yadfa-items:recovering-pacifier)
- (yadfa-items:healing-pacifier)
- (yadfa-items:bandit-swimsuit)
- (yadfa-items:bandit-uniform-tunic)
- (yadfa-items:bandit-uniform-shirt)
- (yadfa-items:bandit-uniform-sports-bikini-top)
- (yadfa-items:monster-energy-drink)
- (yadfa-items:spiked-bottle-of-milk)
- (yadfa-items:bandit-diaper)
- (yadfa-items:bandit-adjustable-diaper)
- (yadfa-items:bandit-female-diaper)
- (yadfa-items:bandit-swim-diaper-cover)
- (yadfa-items:lower-bandit-swim-diaper-cover)
- (yadfa-items:female-bandit-swim-diaper-cover)
- (yadfa-items:gold-collar)
- (yadfa-items:ak47)
- (yadfa-items:box-of-7.62×39mm)
- (yadfa-items:pink-sword)
- (yadfa-items:toddler-dress)
- (yadfa-props:placable-bed)))
+ 'yadfa-props:items-for-sale '((yadfa-items:gold-pacifier)
+ (yadfa-items:recovering-pacifier)
+ (yadfa-items:healing-pacifier)
+ (yadfa-items:bandit-swimsuit)
+ (yadfa-items:bandit-uniform-tunic)
+ (yadfa-items:bandit-uniform-shirt)
+ (yadfa-items:bandit-uniform-sports-bikini-top)
+ (yadfa-items:monster-energy-drink)
+ (yadfa-items:spiked-bottle-of-milk)
+ (yadfa-items:bandit-diaper)
+ (yadfa-items:bandit-adjustable-diaper)
+ (yadfa-items:bandit-female-diaper)
+ (yadfa-items:bandit-swim-diaper-cover)
+ (yadfa-items:lower-bandit-swim-diaper-cover)
+ (yadfa-items:female-bandit-swim-diaper-cover)
+ (yadfa-items:gold-collar)
+ (yadfa-items:ak47)
+ (yadfa-items:box-of-7.62×39mm)
+ (yadfa-items:pink-sword)
+ (yadfa-items:toddler-dress)
+ (yadfa-props:placable-bed)))
:changing-table (make-instance 'yadfa-props:automatic-changing-table)
:bed (make-instance 'yadfa-props:bed)
:checkpoint (make-instance 'yadfa-props:checkpoint))
diff --git a/data/map/ironside.lisp b/data/map/ironside.lisp
index 5292f1e..5c2ccfd 100644
--- a/data/map/ironside.lisp
+++ b/data/map/ironside.lisp
@@ -28,17 +28,17 @@
:potty-trigger 'trigger-diaper-police
:props (list
:shop (make-instance 'yadfa-props:shop
- :items-for-sale (list
- '(yadfa-items:monster-energy-drink)
- '(yadfa-items:generic-diapers-package)
- '(yadfa-items:generic-pullons-package)
- '(yadfa-items:dress)
- '(yadfa-items:jeans)
- '(yadfa-items:tshirt)
- '(yadfa-items:boxers)
- '(yadfa-items:panties)
- '(yadfa-items:knights-armor)
- '(yadfa-items:potion)))
+ 'yadfa-props:items-for-sale (list
+ '(yadfa-items:monster-energy-drink)
+ '(yadfa-items:generic-diapers-package)
+ '(yadfa-items:generic-pullons-package)
+ '(yadfa-items:dress)
+ '(yadfa-items:jeans)
+ '(yadfa-items:tshirt)
+ '(yadfa-items:boxers)
+ '(yadfa-items:panties)
+ '(yadfa-items:knights-armor)
+ '(yadfa-items:potion)))
:changing-table (make-instance 'yadfa-props:automatic-changing-table)))
(ensure-zone (0 -1 0 ironside)
@@ -49,13 +49,13 @@
:potty-trigger 'trigger-diaper-police
:props (list
:shop (make-instance 'yadfa-props:shop
- :items-for-sale (list
- '(yadfa-items:bottle-of-milk)
- '(yadfa-items:incontinence-pad-package)
- '(yadfa-items:diaper-package)
- '(yadfa-items:pullups-package)
- '(yadfa-items:toddler-dress)
- '(yadfa-items:onesie/opened)))
+ 'yadfa-props:items-for-sale (list
+ '(yadfa-items:bottle-of-milk)
+ '(yadfa-items:incontinence-pad-package)
+ '(yadfa-items:diaper-package)
+ '(yadfa-items:pullups-package)
+ '(yadfa-items:toddler-dress)
+ '(yadfa-items:onesie/opened)))
:changing-table (make-instance 'yadfa-props:automatic-changing-table)))
(ensure-zone (2 1 0 ironside)
:name "Ironside University Entrance"
diff --git a/data/map/secret-underground.lisp b/data/map/secret-underground.lisp
index af3ebb5..3e22b85 100644
--- a/data/map/secret-underground.lisp
+++ b/data/map/secret-underground.lisp
@@ -44,5 +44,5 @@
:description "A shop where you can buy stuff. Be sure to buy a training potty for your base. You don't want to have an accident now do you?"
:enter-text "You enter the shop"
:props (list :shop (make-instance 'yadfa-props:shop
- :items-for-sale '((yadfa-props:pet-bed)
- (yadfa-props:training-potty)))))
+ 'yadfa-props:items-for-sale '((yadfa-props:pet-bed)
+ (yadfa-props:training-potty)))))
diff --git a/data/map/sky.lisp b/data/map/sky.lisp
index 09f1ba7..e4cc89b 100644
--- a/data/map/sky.lisp
+++ b/data/map/sky.lisp
@@ -58,30 +58,30 @@
:enter-text "You're inside the power room"
:props (list
:vending-machine (make-instance 'yadfa-props:shop
- :items-for-sale '((yadfa-items:disposable-swim-diaper . (list :value 10))
- (yadfa-items:diaper . (list :value 10))))))
+ 'yadfa-props:items-for-sale '((yadfa-items:disposable-swim-diaper . (list :value 10))
+ (yadfa-items:diaper . (list :value 10))))))
(ensure-zone (4 -18 0 candle-carnival)
:name "Changing room"
:description "A place where you can change your clothes for swimming. There's a vending machine for people to buy diapers from while they're here"
:enter-text "You enter the changing room"
:props (list
:vending-machine (make-instance 'yadfa-props:vending-machine
- :items-for-sale '((yadfa-items:disposable-swim-diaper . (list :value 11))
- (yadfa-items:diaper . (list :value 10))
- (yadfa-items:pullups . (list :value 5))))))
+ 'yadfa-props:items-for-sale '((yadfa-items:disposable-swim-diaper . (list :value 11))
+ (yadfa-items:diaper . (list :value 10))
+ (yadfa-items:pullups . (list :value 5))))))
(ensure-zone (-4 -18 0 candle-carnival)
:name "Gift Shop"
:description "Here you can buy stuff"
:enter-text "You enter the shop"
:props (list
:shop (make-instance 'yadfa-props:shop
- :items-for-sale '((yadfa-items:disposable-swim-diaper-package)
- (yadfa-items:swim-diaper-cover)
- (yadfa-items:blanket)
- (yadfa-items:plushie)
- (yadfa-items:pirate-dress)
- (yadfa-items:pirate-shirt)
- (yadfa-items:orca-suit-lite)))))
+ 'yadfa-props:items-for-sale '((yadfa-items:disposable-swim-diaper-package)
+ (yadfa-items:swim-diaper-cover)
+ (yadfa-items:blanket)
+ (yadfa-items:plushie)
+ (yadfa-items:pirate-dress)
+ (yadfa-items:pirate-shirt)
+ (yadfa-items:orca-suit-lite)))))
(uiop:define-package #:sky-base
(:export
#:main-office
diff --git a/data/prolog/enemies.lisp b/data/prolog/enemies.lisp
index e623ca1..0151654 100644
--- a/data/prolog/enemies.lisp
+++ b/data/prolog/enemies.lisp
@@ -4,8 +4,8 @@
`(list ,@(iter (for symbol in symbols)
(collect `(make-instance ',symbol)))))
(defclass catchable-enemy (enemy)
- ((catch-chance
- :initarg :catch-chance
+ ((catch-chance%
+ :initarg catch-chance
:accessor catch-chance-of
:initform (lambda (enemy)
(let ((rate 1)) ; number between 0 and 1
diff --git a/data/props/base.lisp b/data/props/base.lisp
index f25caef..7fa8d7b 100644
--- a/data/props/base.lisp
+++ b/data/props/base.lisp
@@ -133,8 +133,8 @@
(format t "You will now teleport here when you black out")))))
(:documentation "Class for washers, you can wash your diapers and all the clothes you've ruined in these."))
(defclass shop (prop)
- ((items-for-sale
- :initarg :items-for-sale
+ ((items-for-sale%
+ :initarg items-for-sale
:initform ()
:accessor items-for-sale-of
:type list
@@ -171,8 +171,8 @@
:items-to-sell (or items t)
:user (player-of *game*))))))
(defclass vending-machine (prop)
- ((items-for-sale
- :initarg :items-for-sale
+ ((items-for-sale%
+ :initarg items-for-sale
:initform ()
:accessor items-for-sale-of
:type list
diff --git a/packages.lisp b/packages.lisp
index 8cb51d7..99a14ad 100644
--- a/packages.lisp
+++ b/packages.lisp
@@ -552,7 +552,15 @@
#:contained-enemies-of
#:contained-enemies-max-length-of
#:catch-chance-multiplier-of
- #:catch-chance-delta-of)
+ #:catch-chance-delta-of
+ #:contained-enemies
+ #:contained-enemies-max-length
+ #:catch-chance-multiplier
+ #:catch-chance-delta
+ #:device-health
+ #:max-device-health
+ #:device-health-of
+ #:max-device-health-of)
(:documentation "Contains all the items in the game")
(:local-nicknames (:s :serapeum) (:a :alexandria) (:u :ugly-tiny-infix-macro) (:g :global-vars)
(:c :clim) (:ce :clim-extensions) (:cc :conditional-commands) (:f :fmt)))
@@ -622,6 +630,7 @@
#:domesticated-werewolf
#:catchable-enemy
#:catch-chance-of
+ #:catch-chance
#:raptor
#:change-class-target
#:change-class-text
@@ -646,7 +655,8 @@
#:placable-washer
#:pet-bed
#:training-potty
- #:items-for-sale-of)
+ #:items-for-sale-of
+ #:items-for-sale)
(:documentation "Contains all the enemies in the game")
(:local-nicknames (:s :serapeum) (:a :alexandria) (:u :ugly-tiny-infix-macro) (:g :global-vars)
(:c :clim) (:ce :clim-extensions) (:cc :conditional-commands) (:f :fmt)))