diff --git a/gldefs.funstuff b/gldefs.funstuff new file mode 100644 index 000000000..bf74eb512 --- /dev/null +++ b/gldefs.funstuff @@ -0,0 +1,8 @@ +Brightmap Texture "models/DemoPlush.png" +{ + Map "models/DemoPlush_bright.png" +} +Brightmap Texture "models/DemoPlush2.png" +{ + Map "models/DemoPlush2_bright.png" +} diff --git a/language.version b/language.version index d55debcec..2ef4b04bb 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r628 \cu(Fri 20 Nov 14:08:00 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r629 \cu(Fri 20 Nov 21:20:26 CET 2020)"; diff --git a/modeldef.funstuff b/modeldef.funstuff index 729a1bf21..abb6abd1d 100644 --- a/modeldef.funstuff +++ b/modeldef.funstuff @@ -78,13 +78,14 @@ Model "FrispyCorn" } Model "DemoPlush" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "DemoPlush_d.3d" + SurfaceSkin 0 0 "DemoPlush.png" + SurfaceSkin 0 1 "DemoPlush2.png" + Scale 0.045 0.045 0.045 ZOffset 16 - PitchOffset 30 + RollOffset 30 ROTATING FrameIndex XZW1 A 0 0 diff --git a/models/AkariProject.png b/models/AkariProject.png index 518e8c422..956193c42 100644 Binary files a/models/AkariProject.png and b/models/AkariProject.png differ diff --git a/models/AkariProject.xcf b/models/AkariProject.xcf new file mode 100644 index 000000000..aca9bd038 Binary files /dev/null and b/models/AkariProject.xcf differ diff --git a/models/Book.blend b/models/Book.blend index c0fa5c4fd..f14c5f535 100644 Binary files a/models/Book.blend and b/models/Book.blend differ diff --git a/models/DemoPlush.blend b/models/DemoPlush.blend new file mode 100644 index 000000000..054ca8608 Binary files /dev/null and b/models/DemoPlush.blend differ diff --git a/models/DemoPlush.png b/models/DemoPlush.png new file mode 100644 index 000000000..2808f4c10 Binary files /dev/null and b/models/DemoPlush.png differ diff --git a/models/DemoPlush2.png b/models/DemoPlush2.png new file mode 100644 index 000000000..1f6a40f3e Binary files /dev/null and b/models/DemoPlush2.png differ diff --git a/models/DemoPlush2_bright.png b/models/DemoPlush2_bright.png new file mode 100644 index 000000000..9c3a21562 Binary files /dev/null and b/models/DemoPlush2_bright.png differ diff --git a/models/DemoPlush_a.3d b/models/DemoPlush_a.3d new file mode 100644 index 000000000..cff217898 Binary files /dev/null and b/models/DemoPlush_a.3d differ diff --git a/models/DemoPlush_bright.png b/models/DemoPlush_bright.png new file mode 100644 index 000000000..1a54cec59 Binary files /dev/null and b/models/DemoPlush_bright.png differ diff --git a/models/DemoPlush_d.3d b/models/DemoPlush_d.3d new file mode 100644 index 000000000..8cce737f6 Binary files /dev/null and b/models/DemoPlush_d.3d differ diff --git a/models/KirinManga.png b/models/KirinManga.png index ec2bbdd3d..bcc7e3298 100644 Binary files a/models/KirinManga.png and b/models/KirinManga.png differ diff --git a/models/KirinManga.xcf b/models/KirinManga.xcf new file mode 100644 index 000000000..0ebf1883e Binary files /dev/null and b/models/KirinManga.xcf differ diff --git a/models/TootFroot.blend b/models/TootFroot.blend index 52b2454d7..fbcd79fdb 100644 Binary files a/models/TootFroot.blend and b/models/TootFroot.blend differ diff --git a/models/TootFroot.png b/models/TootFroot.png index c66c3f52a..c2c5a2dbd 100644 Binary files a/models/TootFroot.png and b/models/TootFroot.png differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index 61d7d62e6..6a1e39ae9 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -4,9 +4,9 @@ Collectible models: - Love Signals CD x Nutatco Bar x Frispy Corn - - Demo Plush + x Demo Plush - Saya Bean - + Peach Juice + x Peach Juice - Milk Breads + Kirin Manga x Kirin Plush diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index 1aee3b3dc..debf9f202 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -256,6 +256,7 @@ Class DemoPlush : SWWMCollectible Inventory.PickupMessage "$T_DEMOPLUSH"; SWWMCollectible.Availability AVAIL_Heretic; Stamina 6000; + Radius 9; } } Class SayaBean : SWWMCollectible