diff --git a/README.md b/README.md index 5292d48bc..293c6d73c 100644 --- a/README.md +++ b/README.md @@ -416,6 +416,7 @@ Saya's favorite barbecue-flavored corn nuts. She snacks on so many bags of these A copy of Saya's famous sci-fi novel about interdimensional travel. Saya has frequently cited it to dab hard on the UAC and their failures. The interportal system devised by Saya in 2171 was named after this. ### Meidobot - Love Signals +![](docimg/lovesignals.png) Debut album of Maidbot Miyamoto. Very cute and romantic J-Pop. Yes, it's a CD, and yes, some people still have CD drives out there. The album is considered a declaration of love to Saya, although it should be noted that this predates Maidbot gaining sentience (not that it makes much of a difference, as her feelings for Saya turned out to be very real). @@ -438,6 +439,7 @@ A soft and squishy plush doll of you! This became very popular after the events Saya began to stock up on these after her marriage with Kirin, for some unexplained reason. She says the taste reminds her of him. Kirin also seems to enjoy drinking them, perhaps a bit too much, in fact. ### Akkouxhei Milk Breads (Hexen) +![](docimg/milkbreads.png) A tasty treat from Kirin's homeland. These soft and fluffy pastries are so sweet they may be even lethal if consumed in excess. Saya gave herself a heart attack once after stuffing her face full of them. diff --git a/docimg/lovesignals.png b/docimg/lovesignals.png new file mode 100644 index 000000000..1cfa8e2d2 Binary files /dev/null and b/docimg/lovesignals.png differ diff --git a/docimg/milkbreads.png b/docimg/milkbreads.png new file mode 100644 index 000000000..b9d60b918 Binary files /dev/null and b/docimg/milkbreads.png differ diff --git a/language.version b/language.version index de0b80279..43570c765 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r682 \cu(Tue 15 Dec 22:27:07 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r683 \cu(Wed 16 Dec 00:44:30 CET 2020)"; diff --git a/modeldef.funstuff b/modeldef.funstuff index 1720a08be..1952a96c2 100644 --- a/modeldef.funstuff +++ b/modeldef.funstuff @@ -9,7 +9,7 @@ Model "FroggyChair" FrameIndex XZW1 A 0 0 } -// placeholders +// collectibles Model "MothPlushy" { Path "models/extra" @@ -38,13 +38,13 @@ Model "AkariProject" } Model "LoveSignalsCD" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "CD_d.3d" + Skin 0 "LoveSignals.png" + Scale 0.013 0.013 0.013 ZOffset 16 - PitchOffset 30 + RollOffset 30 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/CD.blend b/models/CD.blend new file mode 100644 index 000000000..80fc4d816 Binary files /dev/null and b/models/CD.blend differ diff --git a/models/CD_a.3d b/models/CD_a.3d new file mode 100644 index 000000000..487712c16 Binary files /dev/null and b/models/CD_a.3d differ diff --git a/models/CD_d.3d b/models/CD_d.3d new file mode 100644 index 000000000..9910d53f1 Binary files /dev/null and b/models/CD_d.3d differ diff --git a/models/LoveSignals.png b/models/LoveSignals.png new file mode 100644 index 000000000..2a4fb59d3 Binary files /dev/null and b/models/LoveSignals.png differ diff --git a/models/LoveSignals.xcf b/models/LoveSignals.xcf new file mode 100644 index 000000000..baae396a7 Binary files /dev/null and b/models/LoveSignals.xcf differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 061ad2917..9d5bcfd3d 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -1,7 +1,7 @@ Collectible models: - Moth Plushy x Akari Project - - Love Signals CD + x Love Signals CD x Nutatco Bar x Frispy Corn x Demo Plush diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index b5249854c..895a44dfa 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -276,6 +276,8 @@ Class LoveSignalsCD : SWWMCollectible Tag "$T_LOVESIGNALS"; Inventory.PickupMessage "$T_LOVESIGNALS"; Stamina 3000; + Radius 4; + Height 21; } } Class NutatcoBar : SWWMCollectible