diff --git a/language.version b/language.version index 8e03c6e45..e8efb7d62 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r610 \cu(Sun 8 Nov 21:12:26 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r610 \cu(Mon 9 Nov 21:03:28 CET 2020)"; diff --git a/modeldef.funstuff b/modeldef.funstuff index 008484360..9d7635942 100644 --- a/modeldef.funstuff +++ b/modeldef.funstuff @@ -25,11 +25,11 @@ Model "MothPlushy" } Model "AkariProject" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "Book_d.3d" + Skin 0 "AkariProject.png" + Scale 0.02 0.02 0.02 ZOffset 16 PitchOffset 30 ROTATING @@ -104,11 +104,12 @@ Model "SayaBean" } Model "KirinCummies" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "TootFroot_d.3d" + SurfaceSkin 0 0 "TootFroot.png" + SurfaceSkin 0 1 "silvermap.png" + Scale 0.015 0.015 0.015 ZOffset 16 PitchOffset 30 ROTATING @@ -130,11 +131,11 @@ Model "MilkBreads" } Model "KirinManga" { - Path "models/extra" + Path "models" - Model 0 "BaseCube_d.3d" - Skin 0 "CHIPTILE" - Scale 0.04 0.04 0.04 + Model 0 "Book_d.3d" + Skin 0 "KirinManga.png" + Scale 0.016 0.016 0.016 ZOffset 16 PitchOffset 30 ROTATING diff --git a/models/Book.blend b/models/Book.blend index a551f95dc..c0fa5c4fd 100644 Binary files a/models/Book.blend and b/models/Book.blend differ diff --git a/models/Book_a.3d b/models/Book_a.3d new file mode 100644 index 000000000..35fb78b1c Binary files /dev/null and b/models/Book_a.3d differ diff --git a/models/Book_d.3d b/models/Book_d.3d new file mode 100644 index 000000000..f452ca69c Binary files /dev/null and b/models/Book_d.3d differ diff --git a/models/KirinManga.png b/models/KirinManga.png new file mode 100644 index 000000000..ec2bbdd3d Binary files /dev/null and b/models/KirinManga.png differ diff --git a/models/TootFroot.blend b/models/TootFroot.blend new file mode 100644 index 000000000..52b2454d7 Binary files /dev/null and b/models/TootFroot.blend differ diff --git a/models/TootFroot.png b/models/TootFroot.png new file mode 100644 index 000000000..c66c3f52a Binary files /dev/null and b/models/TootFroot.png differ diff --git a/models/TootFroot_a.3d b/models/TootFroot_a.3d new file mode 100644 index 000000000..76a484bce Binary files /dev/null and b/models/TootFroot_a.3d differ diff --git a/models/TootFroot_d.3d b/models/TootFroot_d.3d new file mode 100644 index 000000000..fed3b00a3 Binary files /dev/null and b/models/TootFroot_d.3d differ diff --git a/zscript/swwm_deepdarkimpact.zsc b/zscript/swwm_deepdarkimpact.zsc index 322ce770a..c12b5acbd 100644 --- a/zscript/swwm_deepdarkimpact.zsc +++ b/zscript/swwm_deepdarkimpact.zsc @@ -376,7 +376,7 @@ Class DeepImpact : SWWMWeapon Vector3 avgdir = list[i].avgdir/list[i].nhits; double avgdist = list[i].avgdist/list[i].nhits; double dmg = 5000.*(1.-clamp(avgdist/200.,0.,1.)); - SWWMUtility.DoKnockback(list[i].a,avgdir,dmg); + SWWMUtility.DoKnockback(list[i].a,avgdir,dmg*35.); list[i].a.DamageMobj(invoker,self,int(dmg/350.),'Push',DMG_THRUSTLESS); } let ti = ThinkerIterator.Create("Actor"); diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index 85dfbc84d..ae1aff2e9 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -215,6 +215,7 @@ Class AkariProject : SWWMCollectible Tag "$T_AKARIPROJECT"; Inventory.PickupMessage "$T_AKARIPROJECT"; Stamina 2000; + Radius 6; } } Class LoveSignalsCD : SWWMCollectible @@ -295,6 +296,7 @@ Class KirinCummies : SWWMCollectible Inventory.PickupMessage "$T_PEACH"; SWWMCollectible.Availability AVAIL_Hexen; Stamina 300; + Radius 4; } } Class MilkBreads : SWWMCollectible @@ -315,6 +317,7 @@ Class KirinManga : SWWMCollectible Inventory.PickupMessage "$T_KIRINMANGA"; SWWMCollectible.Availability AVAIL_Hexen; Stamina 1600; + Radius 4; } } Class KirinPlush : SWWMCollectible