aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Pouar <pouar@pouar.net>2020-09-16 16:25:25 -0500
committerGravatar Pouar <pouar@pouar.net>2020-09-16 16:25:25 -0500
commitf493af196dbd51bf1af85b2fce85b8389c8d9475 (patch)
treec3a02aecce22631960ee0a0a30068770e574bc78
parentpatch McCLIM bug, revert when this gets fixed (diff)
WTF am I doing?
-rw-r--r--core/classes.lisp59
-rw-r--r--data/enemies/fursuiters.lisp20
-rw-r--r--data/enemies/navy.lisp62
-rw-r--r--data/enemies/pirates.lisp48
-rw-r--r--data/enemies/rpgmaker.lisp90
-rw-r--r--data/props/base.lisp67
-rw-r--r--data/team-members/allies.lisp18
-rw-r--r--data/team-members/catchables.lisp20
8 files changed, 176 insertions, 208 deletions
diff --git a/core/classes.lisp b/core/classes.lisp
index ae7fbb3..628ef81 100644
--- a/core/classes.lisp
+++ b/core/classes.lisp
@@ -469,27 +469,25 @@
(defclass ally-feral (ally potty-trained-team-member) ())
(defclass playable-ally (ally) ())
(defmethod initialize-instance :after
- ((c base-character) &rest initargs &key &allow-other-keys)
- (destructuring-bind (&key (health nil healthp) (energy nil energyp)
- (base-health nil base-health-p) (base-attack nil base-attack-p)
- (base-defense nil base-defense-p) (base-speed nil base-speed-p) (base-energy nil base-energy-p)&allow-other-keys)
- initargs
- (declare (ignore health energy))
- (when base-health-p
- (setf (getf (base-stats-of c) :health) base-health))
- (when base-attack-p
- (setf (getf (base-stats-of c) :attack) base-attack))
- (when base-defense-p
- (setf (getf (base-stats-of c) :defence) base-defense))
- (when base-speed-p
- (setf (getf (base-stats-of c) :speed) base-speed))
- (when base-energy-p
- (setf (getf (base-stats-of c) :energy) base-energy))
- (unless healthp
- (setf (health-of c) (calculate-stat c :health)))
- (unless energyp
- (setf (energy-of c) (calculate-stat c :energy)))
- (setf (exp-of c) (calculate-level-to-exp (level-of c)))))
+ ((c base-character) &key (health nil healthp) (energy nil energyp)
+ (base-health nil base-health-p) (base-attack nil base-attack-p)
+ (base-defense nil base-defense-p) (base-speed nil base-speed-p) (base-energy nil base-energy-p) &allow-other-keys)
+ (declare (ignore health energy))
+ (when base-health-p
+ (setf (getf (base-stats-of c) :health) base-health))
+ (when base-attack-p
+ (setf (getf (base-stats-of c) :attack) base-attack))
+ (when base-defense-p
+ (setf (getf (base-stats-of c) :defence) base-defense))
+ (when base-speed-p
+ (setf (getf (base-stats-of c) :speed) base-speed))
+ (when base-energy-p
+ (setf (getf (base-stats-of c) :energy) base-energy))
+ (unless healthp
+ (setf (health-of c) (calculate-stat c :health)))
+ (unless energyp
+ (setf (energy-of c) (calculate-stat c :energy)))
+ (setf (exp-of c) (calculate-level-to-exp (level-of c))))
(defclass player (potty-trained-team-member pantsable-character)
((position
:initarg :position
@@ -524,12 +522,10 @@
:tail '(:medium :fur)
:skin '(:fur)))
(defmethod initialize-instance :after
- ((c player) &rest initargs)
- (destructuring-bind (&key (warp-on-death-point nil warp) &allow-other-keys)
- initargs
- (declare (ignore warp-on-death-point))
- (unless warp
- (setf (warp-on-death-point-of c) (position-of c)))))
+ ((c player) &key (warp-on-death-point nil warp) &allow-other-keys)
+ (declare (ignore warp-on-death-point))
+ (unless warp
+ (setf (warp-on-death-point-of c) (position-of c))))
(defclass zone (yadfa-class)
((description
:initarg :description
@@ -940,14 +936,12 @@
(setf (thickness-capacity-threshold-of new) (cdr (slot-value old 'onesie-thickness-capacity-threshold)))
(setf (bulge-text-of new) (cdr (slot-value old 'onesie-bulge-text))))
(defmethod initialize-instance :after
- ((c onesie/opened) &rest initargs &key &allow-other-keys)
- (declare (ignore initargs))
+ ((c onesie/opened) &key &allow-other-keys)
(setf (thickness-capacity-of c) (cdr (onesie-thickness-capacity-of c)))
(setf (thickness-capacity-threshold-of c) (cdr (onesie-thickness-capacity-threshold-of c)))
(setf (bulge-text-of c) (cdr (onesie-bulge-text-of c))))
(defmethod initialize-instance :after
- ((c onesie/closed) &rest initargs &key &allow-other-keys)
- (declare (ignore initargs))
+ ((c onesie/closed) &key &allow-other-keys)
(setf (thickness-capacity-of c) (car (onesie-thickness-capacity-of c)))
(setf (thickness-capacity-threshold-of c) (car (onesie-thickness-capacity-threshold-of c)))
(setf (waterproofp c) (onesie-waterproof-p c))
@@ -1092,8 +1086,7 @@
:documentation "Characters that have fainted in battle, used so the \"X has fainted\" messages don't appear repeatedly"))
(:documentation "Class that contains the information about the battle"))
(defmethod initialize-instance :after
- ((c battle) &rest initargs &key &allow-other-keys)
- (declare (ignore initargs))
+ ((c battle) &key &allow-other-keys)
(unless (enter-battle-text-of c)
(setf
(enter-battle-text-of c)
diff --git a/data/enemies/fursuiters.lisp b/data/enemies/fursuiters.lisp
index 69770ee..53595e9 100644
--- a/data/enemies/fursuiters.lisp
+++ b/data/enemies/fursuiters.lisp
@@ -43,17 +43,15 @@
(format t "~a squats down and messes ~aself in the middle of battle~%" (name-of character) himher)
(mess :messer character)))))
(defmethod initialize-instance :after
- ((c padded-fursuiter-servant) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) &allow-other-keys)
- args
- (declare (ignore watersport-limit mudsport-limit))
- (cond ((and watersportp mudsportp)
- (let ((limits (a:random-elt (list (cons (bladder/need-to-potty-limit-of c) (bowels/need-to-potty-limit-of c)) '(nil)))))
- (setf (watersport-limit-of c) (car limits) (mudsport-limit-of c) (cdr limits))))
- (watersportp
- (setf (mudsport-limit-of c) (a:random-elt (list (bowels/need-to-potty-limit-of c) nil))))
- (mudsportp
- (setf (watersport-limit-of c) (a:random-elt (list (bladder/need-to-potty-limit-of c) nil)))))))
+ ((c padded-fursuiter-servant) &key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) &allow-other-keys)
+ (declare (ignore watersport-limit mudsport-limit))
+ (cond ((and watersportp mudsportp)
+ (let ((limits (a:random-elt (list (cons (bladder/need-to-potty-limit-of c) (bowels/need-to-potty-limit-of c)) '(nil)))))
+ (setf (watersport-limit-of c) (car limits) (mudsport-limit-of c) (cdr limits))))
+ (watersportp
+ (setf (mudsport-limit-of c) (a:random-elt (list (bowels/need-to-potty-limit-of c) nil))))
+ (mudsportp
+ (setf (watersport-limit-of c) (a:random-elt (list (bladder/need-to-potty-limit-of c) nil))))))
(defclass fursuiter-servant (potty-enemy) ()
(:default-initargs
:name "Fursuiter Servant"
diff --git a/data/enemies/navy.lisp b/data/enemies/navy.lisp
index 27de13f..c316276 100644
--- a/data/enemies/navy.lisp
+++ b/data/enemies/navy.lisp
@@ -75,21 +75,19 @@
pampsname)
(mess :messer character)))))
(defmethod initialize-instance :after
- ((c navy-officer) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore watersport-limit mudsport-limit wear))
- (unless wearp
- (push (make-instance 'yadfa-items:navy-pullups) (wear-of c))
- (when (and (not (malep c)) (= (random 5) 0))
- (push (make-instance 'yadfa-items:navy-skirt) (wear-of c)))
- (unless (malep c)
- (push (make-instance 'yadfa-items:bra) (wear-of c)))
- (push (make-instance 'yadfa-items:navy-shirt) (wear-of c)))
- (unless watersportp
- (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
- (unless mudsportp
- (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c))))))
+ ((c navy-officer) &key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) (wear nil wearp) &allow-other-keys)
+ (declare (ignore watersport-limit mudsport-limit wear))
+ (unless wearp
+ (push (make-instance 'yadfa-items:navy-pullups) (wear-of c))
+ (when (and (not (malep c)) (= (random 5) 0))
+ (push (make-instance 'yadfa-items:navy-skirt) (wear-of c)))
+ (unless (malep c)
+ (push (make-instance 'yadfa-items:bra) (wear-of c)))
+ (push (make-instance 'yadfa-items:navy-shirt) (wear-of c)))
+ (unless watersportp
+ (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
+ (unless mudsportp
+ (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c)))))
(defclass navy-officer* (navy-officer) ()
(:default-initargs
:description "A variant of the Navy Officer. This variant still wears the standard pullups, but supplements them with stuffers to avoid changing the pullups out and is a bit less likely to try and hold it"
@@ -100,21 +98,19 @@
(iter (for i from 0 to (random 15))
(collect (make-instance 'yadfa-items:cloth-incontinence-pad))))))
(defmethod initialize-instance :after
- ((c navy-officer*) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore watersport-limit mudsport-limit wear))
- (unless wearp
- (push (make-instance 'yadfa-items:cloth-incontinence-pad) (wear-of c))
- (push (make-instance 'yadfa-items:navy-pullups) (wear-of c))
- (when (and (not (malep c)) (= (random 5) 0))
- (push (make-instance 'yadfa-items:navy-skirt) (wear-of c)))
- (unless (malep c)
- (push (make-instance 'yadfa-items:bra) (wear-of c)))
- (push (make-instance 'yadfa-items:navy-shirt) (wear-of c)))
- (unless watersportp
- (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c)
- (a:random-elt (list (bladder/potty-dance-limit-of c) (bladder/need-to-potty-limit-of c))))))
- (unless mudsportp
- (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c)
- (a:random-elt (list (bowels/potty-dance-limit-of c) (bowels/need-to-potty-limit-of c))))))))
+ ((c navy-officer*) &key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp) (wear nil wearp) &allow-other-keys)
+ (declare (ignore watersport-limit mudsport-limit wear))
+ (unless wearp
+ (push (make-instance 'yadfa-items:cloth-incontinence-pad) (wear-of c))
+ (push (make-instance 'yadfa-items:navy-pullups) (wear-of c))
+ (when (and (not (malep c)) (= (random 5) 0))
+ (push (make-instance 'yadfa-items:navy-skirt) (wear-of c)))
+ (unless (malep c)
+ (push (make-instance 'yadfa-items:bra) (wear-of c)))
+ (push (make-instance 'yadfa-items:navy-shirt) (wear-of c)))
+ (unless watersportp
+ (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c)
+ (a:random-elt (list (bladder/potty-dance-limit-of c) (bladder/need-to-potty-limit-of c))))))
+ (unless mudsportp
+ (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c)
+ (a:random-elt (list (bowels/potty-dance-limit-of c) (bowels/need-to-potty-limit-of c)))))))
diff --git a/data/enemies/pirates.lisp b/data/enemies/pirates.lisp
index 2940c1e..994925a 100644
--- a/data/enemies/pirates.lisp
+++ b/data/enemies/pirates.lisp
@@ -12,19 +12,17 @@
:watersport-limit 300
:mudsport-limit 400
:inventory (iter (for i from 0 to (random 20)) (collect (make-instance 'yadfa-items:diaper)))))
-(defmethod initialize-instance :after ((c diaper-pirate) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore wear))
- (unless wearp
- (setf (wear-of c) nil)
- (push (make-instance 'yadfa-items:diaper) (wear-of c))
- (unless (malep c)
- (push (make-instance 'yadfa-items:bra) (wear-of c)))
- (push (make-instance (if (and (not (malep c)) (= (random 2) 0))
- 'yadfa-items:pirate-dress
- 'yadfa-items:pirate-shirt))
- (wear-of c)))))
+(defmethod initialize-instance :after ((c diaper-pirate) &key (wear nil wearp) &allow-other-keys)
+ (declare (ignore wear))
+ (unless wearp
+ (setf (wear-of c) nil)
+ (push (make-instance 'yadfa-items:diaper) (wear-of c))
+ (unless (malep c)
+ (push (make-instance 'yadfa-items:bra) (wear-of c)))
+ (push (make-instance (if (and (not (malep c)) (= (random 2) 0))
+ 'yadfa-items:pirate-dress
+ 'yadfa-items:pirate-shirt))
+ (wear-of c))))
(defclass thickly-diaper-pirate (diaper-pirate) ()
(:default-initargs
:description "A variant of the Diaper Pirate that wears 3 layers of padding. A stuffer, a normal diaper, and a super thick diaper."
@@ -33,16 +31,14 @@
(iter (for i from 0 to (random 20))
(collect (make-instance 'yadfa-items:cloth-diaper)))
(iter (for i from 0 to (random 20))
- (collect (make-instance 'yadfa-items:thick-rubber-diaper))))))
-(defmethod initialize-instance :after ((c thickly-diaper-pirate) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore wear))
- (unless wearp
- (setf (wear-of c) nil)
- (a:appendf (wear-of c)
- (iter (for i in '(yadfa-items:thick-rubber-diaper yadfa-items:cloth-diaper yadfa-items:incontinence-pad))
- (collect (make-instance i))))
- (unless (malep c)
- (push (make-instance 'yadfa-items:bra) (wear-of c)))
- (push (make-instance 'yadfa-items:pirate-shirt) (wear-of c)))))
+ (collect (make-instance 'yadfa-items:thick-rubber-diaper))))))
+(defmethod initialize-instance :after ((c thickly-diaper-pirate) &key (wear nil wearp) &allow-other-keys)
+ (declare (ignore wear))
+ (unless wearp
+ (setf (wear-of c) nil)
+ (a:appendf (wear-of c)
+ (iter (for i in '(yadfa-items:thick-rubber-diaper yadfa-items:cloth-diaper yadfa-items:incontinence-pad))
+ (collect (make-instance i))))
+ (unless (malep c)
+ (push (make-instance 'yadfa-items:bra) (wear-of c)))
+ (push (make-instance 'yadfa-items:pirate-shirt) (wear-of c))))
diff --git a/data/enemies/rpgmaker.lisp b/data/enemies/rpgmaker.lisp
index 7e88475..7028d1c 100644
--- a/data/enemies/rpgmaker.lisp
+++ b/data/enemies/rpgmaker.lisp
@@ -13,17 +13,15 @@
(collect (make-instance 'yadfa-items:cloth-diaper)))))
(setf (get 'diapered-kobold 'change-class-target) 'yadfa-allies:diapered-kobold)
(defmethod initialize-instance :after
- ((c diapered-kobold) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore wear))
- (unless wearp
- (push (let ((a (make-instance 'yadfa-items:thick-cloth-diaper)))
- (setf (sogginess-of a) (random (sogginess-capacity-of a)))
- (setf (messiness-of a) (random (messiness-capacity-of a)))
- a)
- (wear-of c))
- (push (make-instance (if (malep c) 'yadfa-items:shendyt 'yadfa-items:kalasiris)) (wear-of c)))))
+ ((c diapered-kobold) &key (wear nil wearp) &allow-other-keys)
+ (declare (ignore wear))
+ (unless wearp
+ (push (let ((a (make-instance 'yadfa-items:thick-cloth-diaper)))
+ (setf (sogginess-of a) (random (sogginess-capacity-of a)))
+ (setf (messiness-of a) (random (messiness-capacity-of a)))
+ a)
+ (wear-of c))
+ (push (make-instance (if (malep c) 'yadfa-items:shendyt 'yadfa-items:kalasiris)) (wear-of c))))
(defclass diapered-skunk (potty-enemy skunk-boop-mixin) ()
(:default-initargs
:name "Diapered Skunk"
@@ -40,24 +38,21 @@
:element-types (make-instances yadfa-element-types:poison)
:moves (make-instances yadfa-moves:spray yadfa-moves:face-sit)))
(defmethod initialize-instance :after
- ((c diapered-skunk) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp)
- (wear nil wearp)
- &allow-other-keys)
- args
- (declare (ignore watersport-limit mudsport-limit wear))
- (unless wearp
- (push (let ((a (make-instance 'yadfa-items:high-capacity-diaper)))
- (setf (sogginess-of a) (+ (bladder/potty-desperate-limit-of c) (random (+ (bladder/maximum-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))))
- (setf (messiness-of a) (+ (bowels/potty-desperate-limit-of c) (random (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c)))))
- a)
- (wear-of c))
- (push (make-instance (if (malep c) 'yadfa-items:tshirt 'yadfa-items:bikini-top)) (wear-of c))
- (push (make-instance 'yadfa-items:black-leather-jacket) (wear-of c)))
- (unless watersportp
- (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
- (unless mudsportp
- (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c))))))
+ ((c diapered-skunk) &key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp)
+ (wear nil wearp) &allow-other-keys)
+ (declare (ignore watersport-limit mudsport-limit wear))
+ (unless wearp
+ (push (let ((a (make-instance 'yadfa-items:high-capacity-diaper)))
+ (setf (sogginess-of a) (+ (bladder/potty-desperate-limit-of c) (random (+ (bladder/maximum-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))))
+ (setf (messiness-of a) (+ (bowels/potty-desperate-limit-of c) (random (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c)))))
+ a)
+ (wear-of c))
+ (push (make-instance (if (malep c) 'yadfa-items:tshirt 'yadfa-items:bikini-top)) (wear-of c))
+ (push (make-instance 'yadfa-items:black-leather-jacket) (wear-of c)))
+ (unless watersportp
+ (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
+ (unless mudsportp
+ (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c)))))
(defmethod process-battle-accident ((character diapered-skunk) attack (item item) reload (selected-target base-character))
(declare (ignore attack item reload selected-target))
(let* ((watersport-chance (random (watersport-chance-of character)))
@@ -112,26 +107,23 @@
:element-types (make-instances yadfa-element-types:poison)
:moves (make-instances yadfa-moves:spray yadfa-moves:face-sit)))
(defmethod initialize-instance :after
- ((c diapered-skunk*) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp)
- (wear nil wearp) (description nil descriptionp)
- &allow-other-keys)
- args
- (declare (ignore watersport-limit mudsport-limit wear description))
- (unless wearp
- (push (let ((a (make-instance 'yadfa-items:high-capacity-diaper)))
- (setf (sogginess-of a) (sogginess-capacity-of a))
- (setf (messiness-of a) (messiness-capacity-of a))
- a)
- (wear-of c)))
- (unless watersportp
- (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
- (unless mudsportp
- (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c))))
- (unless descriptionp
- (let* ((male (malep c))
- (hisher (if male "his" "her")))
- (setf (description-of c) (format nil "If you thought the other skunk was stinky, that's nothing compared to this one. Apparently this skunk never changes ~a pamps at all and just continues to flood, mess, and spray ~a current one. ~a doesn't wear anything else because it just gets covered in too much of ~a own stinky juices." hisher hisher (if male "He" "She") hisher))))))
+ ((c diapered-skunk*) &key (watersport-limit nil watersportp) (mudsport-limit nil mudsportp)
+ (wear nil wearp) (description nil descriptionp) &allow-other-keys)
+ (declare (ignore watersport-limit mudsport-limit wear description))
+ (unless wearp
+ (push (let ((a (make-instance 'yadfa-items:high-capacity-diaper)))
+ (setf (sogginess-of a) (sogginess-capacity-of a))
+ (setf (messiness-of a) (messiness-capacity-of a))
+ a)
+ (wear-of c)))
+ (unless watersportp
+ (setf (watersport-limit-of c) (- (bladder/maximum-limit-of c) (bladder/potty-desperate-limit-of c))))
+ (unless mudsportp
+ (setf (mudsport-limit-of c) (- (bowels/maximum-limit-of c) (bowels/potty-desperate-limit-of c))))
+ (unless descriptionp
+ (let* ((male (malep c))
+ (hisher (if male "his" "her")))
+ (setf (description-of c) (format nil "If you thought the other skunk was stinky, that's nothing compared to this one. Apparently this skunk never changes ~a pamps at all and just continues to flood, mess, and spray ~a current one. ~a doesn't wear anything else because it just gets covered in too much of ~a own stinky juices." hisher hisher (if male "He" "She") hisher)))))
(defmethod process-battle-accident ((character diapered-skunk*) attack (item item) reload (selected-target base-character))
(declare (ignore attack item reload selected-target))
(let* ((watersport-chance (random (watersport-chance-of character)))
diff --git a/data/props/base.lisp b/data/props/base.lisp
index 0223079..f25caef 100644
--- a/data/props/base.lisp
+++ b/data/props/base.lisp
@@ -144,8 +144,7 @@
:description "A place to buy crap with your bitcoins")
(:documentation "Class for shops, you can buy stuff from these."))
(defmethod initialize-instance :after
- ((c shop) &rest args &key &allow-other-keys)
- (declare (ignore args))
+ ((c shop) &key &allow-other-keys)
(setf (getf (actions-of c) :list-items-for-sale)
(make-action :documentation "List items for sale"
:lambda '(lambda (prop &rest keys &key &allow-other-keys)
@@ -183,8 +182,7 @@
:description "An automated machine where you can buy items from")
(:documentation "Class for vending machines, Functions like a shop, but only lets you buy items instead of selling them"))
(defmethod initialize-instance :after
- ((c vending-machine) &rest args &key &allow-other-keys)
- (declare (ignore args))
+ ((c vending-machine) &key &allow-other-keys)
(setf (getf (actions-of c) :list-items-for-sale)
(make-action :documentation "List items for sale"
:lambda '(lambda (prop &rest keys &key &allow-other-keys)
@@ -209,8 +207,7 @@
:description "A place to buy crap with your bitcoins")
(:documentation "Class for shops, you can buy stuff from these."))
(defmethod initialize-instance :after
- ((c debug-shop) &rest args &key &allow-other-keys)
- (declare (ignore args))
+ ((c debug-shop) &key &allow-other-keys)
(setf (getf (actions-of c) :list-items-for-sale)
(make-action :documentation "List items for sale"
:lambda '(lambda (prop &rest keys &key &allow-other-keys)
@@ -220,15 +217,15 @@
#-sbcl (check-type prop prop)
(shopfun (let ((a ()))
(iter (for i in (list-all-packages))
- (unless (equal i (find-package :yadfa))
- (do-external-symbols (s i)
- (when (and
- (find-class s nil)
- (c2mop:subclassp
- (find-class s)
- (find-class 'item))
- (tossablep (make-instance s)))
- (push (cons s nil) a)))))
+ (unless (equal i (find-package :yadfa))
+ (do-external-symbols (s i)
+ (when (and
+ (find-class s nil)
+ (c2mop:subclassp
+ (find-class s)
+ (find-class 'item))
+ (tossablep (make-instance s)))
+ (push (cons s nil) a)))))
a)
:format-items t)))
(getf (actions-of c) :buy-items)
@@ -243,16 +240,16 @@
(shopfun
(let ((a ()))
(iter (for i in (list-all-packages))
- (unless
- (equal i (find-package :yadfa))
- (do-external-symbols (s i)
- (when (and
- (find-class s nil)
- (c2mop:subclassp
- (find-class s)
- (find-class 'item))
- (tossablep (make-instance s)))
- (push (cons s nil) a)))))
+ (unless
+ (equal i (find-package :yadfa))
+ (do-external-symbols (s i)
+ (when (and
+ (find-class s nil)
+ (c2mop:subclassp
+ (find-class s)
+ (find-class 'item))
+ (tossablep (make-instance s)))
+ (push (cons s nil) a)))))
a)
:items-to-buy items
:user (player-of *game*))))
@@ -268,16 +265,16 @@
(shopfun
(let ((a ()))
(iter
- (for i in (list-all-packages))
- (unless (equal i (find-package :yadfa))
- (do-external-symbols (s i)
- (when (and
- (find-class s nil)
- (c2mop:subclassp
- (find-class s)
- (find-class 'item))
- (tossablep (make-instance s)))
- (push (cons s nil) a)))))
+ (for i in (list-all-packages))
+ (unless (equal i (find-package :yadfa))
+ (do-external-symbols (s i)
+ (when (and
+ (find-class s nil)
+ (c2mop:subclassp
+ (find-class s)
+ (find-class 'item))
+ (tossablep (make-instance s)))
+ (push (cons s nil) a)))))
a)
:items-to-sell items
:user (player-of *game*))))))
diff --git a/data/team-members/allies.lisp b/data/team-members/allies.lisp
index a4de269..91c261e 100644
--- a/data/team-members/allies.lisp
+++ b/data/team-members/allies.lisp
@@ -26,16 +26,14 @@
(f:fmt stream (name-of user) "tries to fart to relieve the pressure but ends up messing " (if (malep user) "his" "her")
"pamps, doesn't seem to realize it wasn't a fart and just continues on in a messy diaper" #\Newline)))
(defmethod initialize-instance :after
- ((c slynk) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (bladder/contents nil bladderp) (bowels/contents nil bowelsp) &allow-other-keys)
- args
- (declare (ignore bladder/contents bowels/contents))
- (unless bladderp
- (setf (bladder/contents-of c)
- (random (coerce (+ (bladder/potty-desperate-limit-of c) (/ (- (bladder/potty-desperate-limit-of c) (bladder/potty-dance-limit-of c)))) 'long-float))))
- (unless bowelsp
- (setf (bowels/contents-of c)
- (random (coerce (+ (bowels/potty-desperate-limit-of c) (/ (- (bowels/potty-desperate-limit-of c) (bowels/potty-dance-limit-of c)))) 'long-float))))))
+ ((c slynk) &key (bladder/contents nil bladderp) (bowels/contents nil bowelsp) &allow-other-keys)
+ (declare (ignore bladder/contents bowels/contents))
+ (unless bladderp
+ (setf (bladder/contents-of c)
+ (random (coerce (+ (bladder/potty-desperate-limit-of c) (/ (- (bladder/potty-desperate-limit-of c) (bladder/potty-dance-limit-of c)))) 'long-float))))
+ (unless bowelsp
+ (setf (bowels/contents-of c)
+ (random (coerce (+ (bowels/potty-desperate-limit-of c) (/ (- (bowels/potty-desperate-limit-of c) (bowels/potty-dance-limit-of c)))) 'long-float)))))
(defclass chris (playable-ally ally-rebel-potty-training) ()
(:default-initargs
:name "Chris"
diff --git a/data/team-members/catchables.lisp b/data/team-members/catchables.lisp
index fa2f112..a5965ee 100644
--- a/data/team-members/catchables.lisp
+++ b/data/team-members/catchables.lisp
@@ -23,17 +23,15 @@
:moves (list (make-instance 'yadfa-moves:watersport)
(make-instance 'yadfa-moves:mudsport))))
(defmethod initialize-instance :after
- ((c diapered-kobold) &rest args &key &allow-other-keys)
- (destructuring-bind (&key (wear nil wearp) &allow-other-keys)
- args
- (declare (ignore wear))
- (unless wearp
- (push (let ((a (make-instance 'yadfa-items:thick-cloth-diaper)))
- (setf (sogginess-of a) (random (sogginess-capacity-of a)))
- (setf (messiness-of a) (random (messiness-capacity-of a)))
- a)
- (wear-of c))
- (push (make-instance (if (malep c) 'yadfa-items:shendyt 'yadfa-items:kalasiris)) (wear-of c)))))
+ ((c diapered-kobold) &key (wear nil wearp) &allow-other-keys)
+ (declare (ignore wear))
+ (unless wearp
+ (push (let ((a (make-instance 'yadfa-items:thick-cloth-diaper)))
+ (setf (sogginess-of a) (random (sogginess-capacity-of a)))
+ (setf (messiness-of a) (random (messiness-capacity-of a)))
+ a)
+ (wear-of c))
+ (push (make-instance (if (malep c) 'yadfa-items:shendyt 'yadfa-items:kalasiris)) (wear-of c))))
(defclass diapered-raccoon-bandit (adopted-enemy ally-last-minute-potty-training pantsable-character) ()
(:default-initargs
:name "Diapered Raccoon Bandit"