diff --git a/language.version b/language.version index 434290625..53e1e0f71 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r660 \cu(Fri 4 Dec 13:19:43 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r660 \cu(Fri 4 Dec 17:56:25 CET 2020)"; diff --git a/modeldef.funstuff b/modeldef.funstuff index abb6abd1d..1720a08be 100644 --- a/modeldef.funstuff +++ b/modeldef.funstuff @@ -55,7 +55,7 @@ Model "NutatcoBar" Model 0 "Nutatco_d.3d" Skin 0 "Nutatco.png" - Scale 0.02 0.02 0.02 + Scale 0.018 0.018 0.018 ZOffset 16 PitchOffset -60 RollOffset 90 @@ -69,7 +69,7 @@ Model "FrispyCorn" Model 0 "FrispyCorn_d.3d" Skin 0 "FrispyCorn.png" - Scale 0.03 0.03 0.03 + Scale 0.025 0.025 0.025 ZOffset 16 RollOffset 30 ROTATING @@ -83,8 +83,8 @@ Model "DemoPlush" Model 0 "DemoPlush_d.3d" SurfaceSkin 0 0 "DemoPlush.png" SurfaceSkin 0 1 "DemoPlush2.png" - Scale 0.045 0.045 0.045 - ZOffset 16 + Scale 0.075 0.075 0.075 + ZOffset 20 RollOffset 30 ROTATING @@ -119,13 +119,12 @@ Model "KirinCummies" } Model "MilkBreads" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "MilkBreads_d.3d" + Skin 0 "MilkBreads.png" + Scale 0.016 0.016 0.016 ZOffset 16 - PitchOffset 30 ROTATING FrameIndex XZW1 A 0 0 @@ -136,7 +135,7 @@ Model "KirinManga" Model 0 "Book_d.3d" Skin 0 "KirinManga.png" - Scale 0.016 0.016 0.016 + Scale 0.018 0.018 0.018 ZOffset 16 PitchOffset 30 ROTATING @@ -149,8 +148,8 @@ Model "KirinPlush" Model 0 "KirinPlush_d.3d" Skin 0 "KirinPlush.png" - Scale 0.04 0.04 0.04 - ZOffset 16 + Scale 0.08 0.08 0.08 + ZOffset 20 RollOffset 30 ROTATING diff --git a/models/MilkBreads.blend b/models/MilkBreads.blend new file mode 100644 index 000000000..754dceb50 Binary files /dev/null and b/models/MilkBreads.blend differ diff --git a/models/MilkBreads.png b/models/MilkBreads.png new file mode 100644 index 000000000..d2b9e08c1 Binary files /dev/null and b/models/MilkBreads.png differ diff --git a/models/MilkBreads_a.3d b/models/MilkBreads_a.3d new file mode 100644 index 000000000..710c44bd4 Binary files /dev/null and b/models/MilkBreads_a.3d differ diff --git a/models/MilkBreads_d.3d b/models/MilkBreads_d.3d new file mode 100644 index 000000000..a975d1f58 Binary files /dev/null and b/models/MilkBreads_d.3d differ diff --git a/models/modelnotes.txt b/models/modelnotes.txt index fe5a2c2b1..85d7a28da 100644 --- a/models/modelnotes.txt +++ b/models/modelnotes.txt @@ -7,7 +7,7 @@ Collectible models: x Demo Plush - Saya Bean x Peach Juice - - Milk Breads + x Milk Breads x Kirin Manga x Kirin Plush diff --git a/sounds/BRUH.ogg b/sounds/BRUH.ogg new file mode 100644 index 000000000..ea3e02d88 Binary files /dev/null and b/sounds/BRUH.ogg differ diff --git a/sounds/CTF6.ogg b/sounds/CTF6.ogg new file mode 100644 index 000000000..16b128d15 Binary files /dev/null and b/sounds/CTF6.ogg differ diff --git a/sounds/DAB.ogg b/sounds/DAB.ogg index d5f69604b..f721dd3c8 100644 Binary files a/sounds/DAB.ogg and b/sounds/DAB.ogg differ diff --git a/sounds/SADTROMBONE.ogg b/sounds/SADTROMBONE.ogg index 1eea4b472..733c3f5b6 100644 Binary files a/sounds/SADTROMBONE.ogg and b/sounds/SADTROMBONE.ogg differ diff --git a/sounds/WOW.ogg b/sounds/WOW.ogg new file mode 100644 index 000000000..feda8b77f Binary files /dev/null and b/sounds/WOW.ogg differ diff --git a/sounds/YAY.ogg b/sounds/YAY.ogg new file mode 100644 index 000000000..f775b409e Binary files /dev/null and b/sounds/YAY.ogg differ diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index debf9f202..7f2e4e4bd 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -256,7 +256,7 @@ Class DemoPlush : SWWMCollectible Inventory.PickupMessage "$T_DEMOPLUSH"; SWWMCollectible.Availability AVAIL_Heretic; Stamina 6000; - Radius 9; + Radius 10; } } Class SayaBean : SWWMCollectible @@ -308,6 +308,7 @@ Class MilkBreads : SWWMCollectible Inventory.PickupMessage "$T_MILKBREAD"; SWWMCollectible.Availability AVAIL_Hexen; Stamina 900; + Radius 6; } } Class KirinManga : SWWMCollectible @@ -331,7 +332,7 @@ Class KirinPlush : SWWMCollectible Inventory.PickupMessage "$T_KIRINPLUSH"; SWWMCollectible.Availability AVAIL_Hexen; Stamina 8000; - Radius 8; + Radius 12; } override void AttachToOwner( Actor other ) {