Saya's Mug collectible.

FuturePlans.md

@@ -33,8 +33,8 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini
   - ✓ Explosion lines
   - ✓ Lead ball crit lines
   - ✓ Buttslam lines
-* ☐ **Additional Collectibles:**
-  - Saya's Mug
+* ☑ **Additional Collectibles:**
+  - ✓ Saya's Mug
 
 ## 1.4 update *(Fine Refinements)*:
 

language.def_lore

@@ -3517,6 +3517,23 @@ SWWM_LORETXT_SAYABEAN =
 "\cfOK, considering who made it, I AM betting this thing's really haunted. And of course I can tell what this is referencing. How the fuck does she even know anyway? It has to be some reality bending nonsense again.\c-\n"
 "\n"
 "\cfStill, it's beautiful... A work of art, yes. I'm sure you're squeezing it between your arms right now. Oh, I'll know. I will hear it giggle on stream when you do so.\c-";
+SWWM_LORETAG_SAYASMUG = "Saya's Mug";
+SWWM_LORETAB_SAYASMUG = "Item";
+SWWM_LOREREL_SAYASMUG = "Taro;Saya;Demolitionist";
+SWWM_LORETXT_SAYASMUG =
+"\cxDesignation:\c-\n"
+"\cf Moth Pussy Mug\c-\n"
+"\cxManufacturer:\c-\n"
+"\cf Taro Miyamoto\c-\n"
+"\cxClassification:\c-\n"
+"\cf Customized Gift\c-\n"
+"\n"
+"A customized coffee mug, which \cfTaro Miyamoto\c- gifted to his sister \cfSaya\c- on her 16th birthday, by personal request. The stencils on each side feature a picture of \cfMashiro\c-, Saya's favorite character, with the text \"MOTH PUSSY\".\n"
+"\n"
+"\cxSaya's Notes:\c-\n"
+"\cfMy love for moth girls is eternal, Demo-chan.\c-\n"
+"\n"
+"\cfBy the way, I made sure to clean it before those two put it in their gacha nonsense, but you can probably still smell the last coffee I had. Black coffee, dark as my soul...\c-";
 SWWM_LORETAG_SCORESYSTEM = "Score System";
 SWWM_LORETAB_SCORESYSTEM = "Item";
 SWWM_LOREREL_SCORESYSTEM = "Demolitionist;Cyrus;Saya";

language.es_lore

@@ -3267,6 +3267,21 @@ SWWM_LORETXT_SAYABEAN =
 "\cfOK, teniendo en cuenta quien lo ha hecho, SÍ que me apuesto a que esto está maldito. Y por supuesto sé también a que hace referencia. ¿Es que como coño lo sabe? Tiene que ser más de toda esa cosa de manipulación de realidad, otra vez.\c-\n"
 "\n"
 "\cfAun así, es precioso... Una obra de arte, sí. Estoy segura de que lo estás apretujando en tus brazos ahora mismo. Oh, lo sabré. Lo oiré reírse en el directo cuando lo hagas.\c-";
+SWWM_LORETAG_SAYASMUG = "Taza de Saya";
+SWWM_LORETXT_SAYASMUG =
+"\cxDesignación:\c-\n"
+"\cf Taza Moth Pussy\c-\n"
+"\cxFabricante:\c-\n"
+"\cf Taro Miyamoto\c-\n"
+"\cxClasificación:\c-\n"
+"\cf Regalo Personalizado\c-\n"
+"\n"
+"Una taza de café personalizada, la cual \cfTaro Miyamoto\c- regaló a su hermana \cfSaya\c- en su 16º cumpleaños, a petición personal. Los dibujos en ambos lados muestran una imagen de \cfMashiro\c-, el personaje favorito de Saya, con el texto \"MOTH PUSSY\".\n"
+"\n"
+"\cxNotas de Saya:\c-\n"
+"\cfMi amor por las chicas polilla es eterno, Demo-chan.\c-\n"
+"\n"
+"\cfPor cierto, me aseguré de lavarla antes de que esos dos la metieran en su cosa de gacha esa, pero igual aun puedes oler el último café que me he tomado. Café negro, oscuro como mi alma...\c-";
 SWWM_LORETAG_SCORESYSTEM = "Sistema de Puntos";
 SWWM_LORETXT_SCORESYSTEM =
 "\cxDesignación:\c-\n"

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r263 \cu(Sat  6 Aug 13:59:32 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r263 \cu(2022-08-06 13:59:32)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r264 \cu(Sat  6 Aug 15:11:33 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r264 \cu(2022-08-06 15:11:33)\c-";

lore/default/sayasmug.txt

@@ -0,0 +1,20 @@
+TAG
+Saya's Mug
+TAB
+Item
+REL
+Taro;Saya;Demolitionist
+TXT
+\cxDesignation:\c-
+\cf Moth Pussy Mug\c-
+\cxManufacturer:\c-
+\cf Taro Miyamoto\c-
+\cxClassification:\c-
+\cf Customized Gift\c-
+
+A customized coffee mug, which **Taro Miyamoto** gifted to his sister **Saya** on her 16th birthday, by personal request. The stencils on each side feature a picture of **Mashiro**, Saya's favorite character, with the text "MOTH PUSSY".
+
+\cxSaya's Notes:\c-
+\cfMy love for moth girls is eternal, Demo-chan.\c-
+
+\cfBy the way, I made sure to clean it before those two put it in their gacha nonsense, but you can probably still smell the last coffee I had. Black coffee, dark as my soul...\c-

lore/es/sayasmug.txt

@@ -0,0 +1,16 @@
+TAG
+Taza de Saya
+TXT
+\cxDesignación:\c-
+\cf Taza Moth Pussy\c-
+\cxFabricante:\c-
+\cf Taro Miyamoto\c-
+\cxClasificación:\c-
+\cf Regalo Personalizado\c-
+
+Una taza de café personalizada, la cual **Taro Miyamoto** regaló a su hermana **Saya** en su 16º cumpleaños, a petición personal. Los dibujos en ambos lados muestran una imagen de **Mashiro**, el personaje favorito de Saya, con el texto "MOTH PUSSY".
+
+\cxNotas de Saya:\c-
+\cfMi amor por las chicas polilla es eterno, Demo-chan.\c-
+
+\cfPor cierto, me aseguré de lavarla antes de que esos dos la metieran en su cosa de gacha esa, pero igual aun puedes oler el último café que me he tomado. Café negro, oscuro como mi alma...\c-

modeldef.collectibles

@@ -89,6 +89,20 @@ Model "MothPlushy"
 
 	FrameIndex XZW1 A 0 0
 }
+Model "SayasMug"
+{
+	Path "models"
+
+	Model 0 "SayasMug_d.3d"
+	Skin 0 "SayasMug.png"
+	Scale 0.02 0.02 0.02
+	ZOffset 16
+	AngleOffset 90
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
 Model "DemoPlush"
 {
 	Path "models"

modeldef.itemgesture

@@ -257,6 +257,71 @@ Model "MothPlushyGesture"
 	FrameIndex XZW2 C 0 28
 	FrameIndex XZW2 D 0 29
 }
+Model "SayasMugGesture"
+{
+	Path "models"
+	Model 0 "SayasMug1st_d.3d"
+	SurfaceSkin 0 0 "DemoTags.png"
+	SurfaceSkin 0 1 "DemoArms.png"
+	SurfaceSkin 0 2 "DemoSoft.png"
+	SurfaceSkin 0 3 "SayasMug.png"
+
+	AngleOffset -90
+	Scale -0.005 0.0025 0.005
+
+	// Base
+	FrameIndex XZW1 A 0 0
+	// Pickup
+	FrameIndex XZW1 B 0 1
+	FrameIndex XZW1 C 0 2
+	FrameIndex XZW1 D 0 3
+	FrameIndex XZW1 E 0 4
+	FrameIndex XZW1 F 0 5
+	FrameIndex XZW1 G 0 6
+	FrameIndex XZW1 H 0 7
+	FrameIndex XZW1 I 0 8
+	FrameIndex XZW1 J 0 9
+	FrameIndex XZW1 K 0 10
+	FrameIndex XZW1 L 0 11
+	FrameIndex XZW1 M 0 12
+	FrameIndex XZW1 N 0 13
+	FrameIndex XZW1 O 0 14
+	FrameIndex XZW1 P 0 15
+	FrameIndex XZW1 Q 0 16
+	FrameIndex XZW1 R 0 17
+	FrameIndex XZW1 S 0 18
+	FrameIndex XZW1 T 0 19
+	FrameIndex XZW1 U 0 20
+	FrameIndex XZW1 V 0 21
+	FrameIndex XZW1 W 0 22
+	FrameIndex XZW1 X 0 23
+	FrameIndex XZW1 Y 0 24
+	FrameIndex XZW1 Z 0 25
+	FrameIndex XZW2 A 0 26
+	FrameIndex XZW2 B 0 27
+	FrameIndex XZW2 C 0 28
+	FrameIndex XZW2 D 0 29
+	FrameIndex XZW2 E 0 30
+	FrameIndex XZW2 F 0 31
+	FrameIndex XZW2 G 0 32
+	FrameIndex XZW2 H 0 33
+	FrameIndex XZW2 I 0 34
+	FrameIndex XZW2 J 0 35
+	FrameIndex XZW2 K 0 36
+	FrameIndex XZW2 L 0 37
+	FrameIndex XZW2 M 0 38
+	FrameIndex XZW2 N 0 39
+	FrameIndex XZW2 O 0 40
+	FrameIndex XZW2 P 0 41
+	FrameIndex XZW2 Q 0 42
+	FrameIndex XZW2 R 0 43
+	FrameIndex XZW2 S 0 44
+	FrameIndex XZW2 T 0 45
+	FrameIndex XZW2 U 0 46
+	FrameIndex XZW2 V 0 47
+	FrameIndex XZW2 W 0 48
+	FrameIndex XZW2 X 0 49
+}
 Model "DemoPlushGesture"
 {
 	Path "models"

models/modelnotes.txt

@@ -39,7 +39,7 @@ Ammo models:
    - Mag
 
 Collectible models:
- - Saya's Mug
+ x Saya's Mug
 
 # Misc
 

zmapinfo.txt

@@ -213,13 +213,14 @@ DoomEdNums
 	4206904 = FrispyCorn
 	4206905 = SayaBean
 	4206906 = MothPlushy
+	4206907 = SayasMug
 	// Heretic collectibles
-	4206907 = DemoPlush
+	4206908 = DemoPlush
 	// Hexen collectibles
-	4206908 = KirinCummies
-	4206909 = MilkBreads
-	4206910 = KirinManga
-	4206911 = KirinPlush
+	4206909 = KirinCummies
+	4206910 = MilkBreads
+	4206911 = KirinManga
+	4206912 = KirinPlush
 	// ... and the chancebox
 	4206920 = Chancebox
 	// these are also pp stuff

zscript/compat/swwm_compat.zsc

@@ -482,7 +482,7 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 		case '81033F4F11F652E9CA875CED06C7AF8C':
 		case '0D1CAD582F63A179BF8A5E47C12D10C6':
 			// add collectibles
-			for ( int i=0; i<12; i++ )
+			for ( int i=0; i<13; i++ )
 				AddThing(4206900+i,(1472+64*i,640,0),0,SKILLS_ALL,MTF_SINGLE|MTF_COOPERATIVE);
 			break;
 		}

zscript/items/swwm_collectibles.zsc

@@ -226,6 +226,19 @@ Class MothPlushy : SWWMCollectible
 		Height 32;
 	}
 }
+Class SayasMug : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_SAYASMUG";
+		Inventory.PickupMessage "$T_SAYASMUG";
+		SWWMCollectible.GestureWeapon "SayasMugGesture";
+		SWWMCollectible.GetLine "mugget";
+		Stamina 1000;
+		Radius 4;
+		Height 20;
+	}
+}
 // Heretic
 Class DemoPlush : SWWMCollectible
 {

zscript/items/swwm_collectibles_gesture.zsc

@@ -181,6 +181,21 @@ Class MothPlushyGesture : SWWMItemGesture
 		Stop;
 	}
 }
+Class SayasMugGesture : SWWMItemGesture
+{
+	States
+	{
+	Fire:
+		XZW1 A 2;
+		XZW1 B 2 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW1 CDEFGHIJKLMNOPQRSTUVWXYZ 2;
+		XZW2 ABCDEFGHIJKLMNO 2;
+		XZW2 P 2 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW2 QRSTUVW 2;
+		XZW2 X -1 A_FinishGesture();
+		Stop;
+	}
+}
 Class DemoPlushGesture : SWWMItemGesture
 {
 	States