From bd0067a804f1c78cd26628db9ca8b4376db807f3 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 22 Dec 2020 21:54:01 +0100
Subject: [PATCH] Saya Bean moved to Doom collectibles (there's nothing that
 would make it exclusive to latter IWADs) Increase the bean size. Come up with
 more collectibles for the future.

---
 FuturePlans.md            |  5 ++++-
 README.md                 |  2 +-
 language.version          |  2 +-
 modeldef.funstuff         |  2 +-
 zmapinfo.txt              |  4 ++--
 zscript/swwm_compat.zsc   |  2 +-
 zscript/swwm_funstuff.zsc | 27 +++++++++++++--------------
 7 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/FuturePlans.md b/FuturePlans.md
index 0391c17e3..82b91e924 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -22,7 +22,10 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - **[Hexen]** Lord Vilkreath - Fundaments of Puzzle Design *("What the hell is this crap?")*
   - **[Hexen]** Obelisk of the Golden Vale *("I puked out my guts when I touched that fucking thing")*
 * **Even more collectibles:**
-  - Dr. Locke's Super Happy Fun Ball *("I'd suggest not to drop it")*
+  - AA-12 *("Ibuki's favorite shotgun. It's just a collectible model, so it doesn't actually shoot")*
+  - Cube *("It's a cube")*
+  - Manarock *("A delicacy for gods, but instantly deadly for mortals")*
+  - Rubber Duck *("Is this some kind of convoluted joke from those two?")*
 * ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff**
 * **Visible legs in first person**
 * **Leaning**
diff --git a/README.md b/README.md
index f950f8136..8114a394c 100644
--- a/README.md
+++ b/README.md
@@ -424,7 +424,7 @@ Debut album of Maidbot Miyamoto. Very cute and romantic J-Pop. Yes, it's a CD, a
 
 A plush doll of Saya's favorite moth girl, handcrafted by Nukritas 2xx herself. Appears to be cursed, potentially putting you in the sights of a very real moth girl.
 
-### Haunted Saya Bean Plush (Heretic)
+### Haunted Saya Bean Plush
 ![](docimg/sayabean.png)
 
 Eats your snacks and calls you a horny. Emits a giggle when you squeeze it. Yet another of Nukritas 2xx's little handcrafted dolls. May or may not be really haunted.
diff --git a/language.version b/language.version
index cddb7e45a..40abf7bfa 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r702 \cu(Tue 22 Dec 21:03:17 CET 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r703 \cu(Tue 22 Dec 21:54:01 CET 2020)";
diff --git a/modeldef.funstuff b/modeldef.funstuff
index 7e41f2ae7..2d0a44766 100644
--- a/modeldef.funstuff
+++ b/modeldef.funstuff
@@ -96,7 +96,7 @@ Model "SayaBean"
 
 	Model 0 "SayaBean_d.3d"
 	Skin 0 "SayaBean.png"
-	Scale 0.012 0.012 0.012
+	Scale 0.025 0.025 0.025
 	ZOffset 16
 	RollOffset 30
 	ROTATING
diff --git a/zmapinfo.txt b/zmapinfo.txt
index 5b39eb43f..522ac2ff1 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -141,9 +141,9 @@ DoomEdNums
 	4206902 = LoveSignalsCD
 	4206903 = NutatcoBar
 	4206904 = FrispyCorn
+	4206905 = SayaBean
 	// Heretic
-	4206905 = DemoPlush
-	4206906 = SayaBean
+	4206906 = DemoPlush
 	// Hexen
 	4206907 = KirinCummies
 	4206908 = MilkBreads
diff --git a/zscript/swwm_compat.zsc b/zscript/swwm_compat.zsc
index e21c60040..885cd7665 100644
--- a/zscript/swwm_compat.zsc
+++ b/zscript/swwm_compat.zsc
@@ -7,7 +7,7 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 {
 	protected void Apply( Name checksum, String mapname )
 	{
-		int numcol = 5;
+		int numcol = 6;
 		switch ( checksum )
 		{
 		case 'none':
diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc
index 8b3234484..1f0c07098 100644
--- a/zscript/swwm_funstuff.zsc
+++ b/zscript/swwm_funstuff.zsc
@@ -302,6 +302,19 @@ Class FrispyCorn : SWWMCollectible
 		Height 23;
 	}
 }
+Class SayaBean : SWWMCollectible
+{
+	bool callout;	// already called the player a perv for loading h-doom
+
+	Default
+	{
+		Tag "$T_SAYABEAN";
+		Inventory.PickupMessage "$T_SAYABEAN";
+		Stamina 5000;
+		Radius 6;
+		Height 23;
+	}
+}
 // Heretic
 Class DemoPlush : SWWMCollectible
 {
@@ -315,20 +328,6 @@ Class DemoPlush : SWWMCollectible
 		Height 36;
 	}
 }
-Class SayaBean : SWWMCollectible
-{
-	bool callout;	// already called the player a perv for loading h-doom
-
-	Default
-	{
-		Tag "$T_SAYABEAN";
-		Inventory.PickupMessage "$T_SAYABEAN";
-		SWWMCollectible.Availability AVAIL_Heretic;
-		Stamina 5000;
-		Radius 3;
-		Height 20;
-	}
-}
 // Hexen
 Class KirinCummies : SWWMCollectible
 {