diff --git a/decaldef.txt b/decaldef.txt index 41fd58154..5b0bb0777 100644 --- a/decaldef.txt +++ b/decaldef.txt @@ -639,6 +639,22 @@ decal DemoSpray } // replace vanilla blood +stretcher BloodStretcherExtra +{ + StretchTime 35 + GoalY 1.5 +} +slider BloodSliderExtra +{ + SlideTime 35 + DistY -16 +} +combiner BloodSmearerExtra +{ + BloodStretcherExtra + BloodSliderExtra +} + decal BloodSplat1 { pic blsplat1 @@ -711,6 +727,15 @@ decal BloodSplat8 randomflipx randomflipy } +decal BloodSlide1 +{ + pic blslide1 + shade "BloodDefault" + x-scale 0.875 + y-scale 0.2 + randomflipx + animator BloodSmearerExtra +} decal BloodSplatX1 { pic blsplat1 @@ -721,14 +746,14 @@ decal BloodSplatX1 randomflipy LowerDecal "BloodSlide1" } -decal BloodSlide1 +decal BloodSlide2 { - pic blslide1 + pic blslide2 shade "BloodDefault" - x-scale 0.875 - y-scale 0.875 + x-scale 0.9 + y-scale 0.225 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX2 { @@ -740,14 +765,14 @@ decal BloodSplatX2 randomflipy LowerDecal "BloodSlide2" } -decal BloodSlide2 +decal BloodSlide3 { - pic blslide2 + pic blslide3 shade "BloodDefault" - x-scale 0.9 - y-scale 0.9 + x-scale 0.925 + y-scale 0.25 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX3 { @@ -759,14 +784,14 @@ decal BloodSplatX3 randomflipy LowerDecal "BloodSlide3" } -decal BloodSlide3 +decal BloodSlide4 { - pic blslide3 + pic blslide4 shade "BloodDefault" - x-scale 0.925 - y-scale 0.925 + x-scale 0.95 + y-scale 0.275 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX4 { @@ -778,14 +803,14 @@ decal BloodSplatX4 randomflipy LowerDecal "BloodSlide4" } -decal BloodSlide4 +decal BloodSlide5 { - pic blslide4 + pic blslide5 shade "BloodDefault" - x-scale 0.95 - y-scale 0.95 + x-scale 0.975 + y-scale 0.3 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX5 { @@ -797,14 +822,14 @@ decal BloodSplatX5 randomflipy LowerDecal "BloodSlide5" } -decal BloodSlide5 +decal BloodSlide6 { - pic blslide5 + pic blslide6 shade "BloodDefault" - x-scale 0.975 - y-scale 0.975 + x-scale 1.0 + y-scale 0.325 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX6 { @@ -816,14 +841,14 @@ decal BloodSplatX6 randomflipy LowerDecal "BloodSlide6" } -decal BloodSlide6 +decal BloodSlide7 { - pic blslide6 + pic blslide7 shade "BloodDefault" - x-scale 1.0 - y-scale 1.0 + x-scale 1.25 + y-scale 0.35 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX7 { @@ -835,14 +860,14 @@ decal BloodSplatX7 randomflipy LowerDecal "BloodSlide7" } -decal BloodSlide7 +decal BloodSlide8 { - pic blslide7 + pic blslide8 shade "BloodDefault" - x-scale 1.25 - y-scale 1.25 + x-scale 1.5 + y-scale 0.375 randomflipx - animator BloodStretcher + animator BloodSmearerExtra } decal BloodSplatX8 { @@ -854,15 +879,6 @@ decal BloodSplatX8 randomflipy LowerDecal "BloodSlide8" } -decal BloodSlide8 -{ - pic blslide8 - shade "BloodDefault" - x-scale 1.5 - y-scale 1.5 - randomflipx - animator BloodStretcher -} decalgroup BloodSplat { @@ -874,7 +890,6 @@ decalgroup BloodSplat BloodSplat6 1 BloodSplat7 1 BloodSplat8 1 - BloodSplatX1 1 BloodSplatX2 1 BloodSplatX3 1 @@ -887,7 +902,7 @@ decalgroup BloodSplat decal BloodSmear1 { - pic blslide1 + pic blsmear1 x-scale 0.625 y-scale 0.625 randomflipx @@ -896,76 +911,16 @@ decal BloodSmear1 } decal BloodSmear2 { - pic blslide2 + pic blsmear2 x-scale 0.65 y-scale 0.65 randomflipx shade "BloodDefault" animator BloodSmearer } -decal BloodSmear3 -{ - pic blslide3 - x-scale 0.675 - y-scale 0.675 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear4 -{ - pic blslide4 - x-scale 0.7 - y-scale 0.7 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear5 -{ - pic blslide5 - x-scale 0.725 - y-scale 0.725 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear6 -{ - pic blslide6 - x-scale 0.75 - y-scale 0.75 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear7 -{ - pic blslide7 - x-scale 0.775 - y-scale 0.775 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} -decal BloodSmear8 -{ - pic blslide8 - x-scale 0.8 - y-scale 0.8 - randomflipx - shade "BloodDefault" - animator BloodSmearer -} decalgroup BloodSmear { BloodSmear1 1 BloodSmear2 1 - BloodSmear3 1 - BloodSmear4 1 - BloodSmear5 1 - BloodSmear6 1 - BloodSmear7 1 - BloodSmear8 1 } diff --git a/graphics/Decals/blslide1.png b/graphics/Decals/blslide1.png index eae700760..a9cb5f05d 100644 Binary files a/graphics/Decals/blslide1.png and b/graphics/Decals/blslide1.png differ diff --git a/graphics/Decals/blslide2.png b/graphics/Decals/blslide2.png index 819edfeb1..7f73dfc5a 100644 Binary files a/graphics/Decals/blslide2.png and b/graphics/Decals/blslide2.png differ diff --git a/graphics/Decals/blslide3.png b/graphics/Decals/blslide3.png index cb4fd0723..7fa9303cf 100644 Binary files a/graphics/Decals/blslide3.png and b/graphics/Decals/blslide3.png differ diff --git a/graphics/Decals/blslide4.png b/graphics/Decals/blslide4.png index 4f2edf028..2d1239d97 100644 Binary files a/graphics/Decals/blslide4.png and b/graphics/Decals/blslide4.png differ diff --git a/graphics/Decals/blslide5.png b/graphics/Decals/blslide5.png index d51eb12b8..a34e6392e 100644 Binary files a/graphics/Decals/blslide5.png and b/graphics/Decals/blslide5.png differ diff --git a/graphics/Decals/blslide6.png b/graphics/Decals/blslide6.png index 60093c912..84e91e881 100644 Binary files a/graphics/Decals/blslide6.png and b/graphics/Decals/blslide6.png differ diff --git a/graphics/Decals/blslide7.png b/graphics/Decals/blslide7.png index f9f62117a..6dd54a0be 100644 Binary files a/graphics/Decals/blslide7.png and b/graphics/Decals/blslide7.png differ diff --git a/graphics/Decals/blslide8.png b/graphics/Decals/blslide8.png index 301b51665..cbcb01b75 100644 Binary files a/graphics/Decals/blslide8.png and b/graphics/Decals/blslide8.png differ diff --git a/graphics/Decals/blsmear1.png b/graphics/Decals/blsmear1.png new file mode 100644 index 000000000..4f84f1232 Binary files /dev/null and b/graphics/Decals/blsmear1.png differ diff --git a/graphics/Decals/blsmear2.png b/graphics/Decals/blsmear2.png new file mode 100644 index 000000000..2c67c4f37 Binary files /dev/null and b/graphics/Decals/blsmear2.png differ diff --git a/language.version b/language.version index 8c10b6d95..448672ff6 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1208 \cu(jue 20 mar 2025 21:41:56 CET)\c-"; -SWWM_SHORTVER="\cw1.3pre r1208 \cu(2025-03-20 21:41:56)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1209 \cu(mié 26 mar 2025 01:05:27 CET)\c-"; +SWWM_SHORTVER="\cw1.3pre r1209 \cu(2025-03-26 01:05:27)\c-";