From c6d7ac9ca8993f6f3d0a1d932074a4fdb016e352 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 3 Sep 2020 16:12:10 +0200 Subject: [PATCH] Fix sprite conflict with BD monsters. --- language.version | 2 +- textures.castdemo | 78 ++++++++++++++++++++--------------------- zscript/swwm_player.zsc | 12 +++---- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/language.version b/language.version index 57d09bcac..cd706da70 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r521 (Thu 3 Sep 13:11:44 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r522 (Thu 3 Sep 16:12:10 CEST 2020)"; diff --git a/textures.castdemo b/textures.castdemo index cc4f7e62f..a2ae22739 100644 --- a/textures.castdemo +++ b/textures.castdemo @@ -1,270 +1,270 @@ -Sprite "CCD1A0", 160, 224 +Sprite "ZYX1A0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0001.png", 0, 0 } -Sprite "CCD1B0", 160, 224 +Sprite "ZYX1B0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0002.png", 0, 0 } -Sprite "CCD1C0", 160, 224 +Sprite "ZYX1C0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0003.png", 0, 0 } -Sprite "CCD1D0", 160, 224 +Sprite "ZYX1D0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0004.png", 0, 0 } -Sprite "CCD1E0", 160, 224 +Sprite "ZYX1E0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0005.png", 0, 0 } -Sprite "CCD1F0", 160, 224 +Sprite "ZYX1F0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0006.png", 0, 0 } -Sprite "CCD1G0", 160, 224 +Sprite "ZYX1G0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0007.png", 0, 0 } -Sprite "CCD1H0", 160, 224 +Sprite "ZYX1H0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0008.png", 0, 0 } -Sprite "CCD1I0", 160, 224 +Sprite "ZYX1I0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0009.png", 0, 0 } -Sprite "CCD1J0", 160, 224 +Sprite "ZYX1J0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0010.png", 0, 0 } -Sprite "CCD1K0", 160, 224 +Sprite "ZYX1K0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0011.png", 0, 0 } -Sprite "CCD1L0", 160, 224 +Sprite "ZYX1L0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0012.png", 0, 0 } -Sprite "CCD1M0", 160, 224 +Sprite "ZYX1M0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0013.png", 0, 0 } -Sprite "CCD1N0", 160, 224 +Sprite "ZYX1N0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0014.png", 0, 0 } -Sprite "CCD1O0", 160, 224 +Sprite "ZYX1O0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0015.png", 0, 0 } -Sprite "CCD1P0", 160, 224 +Sprite "ZYX1P0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0016.png", 0, 0 } -Sprite "CCD2A0", 160, 224 +Sprite "ZYX2A0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0166.png", 0, 0 } -Sprite "CCD2B0", 160, 224 +Sprite "ZYX2B0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0167.png", 0, 0 } -Sprite "CCD2C0", 160, 224 +Sprite "ZYX2C0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0168.png", 0, 0 } -Sprite "CCD2D0", 160, 224 +Sprite "ZYX2D0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0169.png", 0, 0 } -Sprite "CCD2E0", 160, 224 +Sprite "ZYX2E0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0170.png", 0, 0 } -Sprite "CCD2F0", 160, 224 +Sprite "ZYX2F0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0171.png", 0, 0 } -Sprite "CCD3A0", 160, 224 +Sprite "ZYX3A0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0048.png", 0, 0 } -Sprite "CCD3B0", 160, 224 +Sprite "ZYX3B0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0049.png", 0, 0 } -Sprite "CCD3C0", 160, 224 +Sprite "ZYX3C0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0050.png", 0, 0 } -Sprite "CCD3D0", 160, 224 +Sprite "ZYX3D0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0051.png", 0, 0 } -Sprite "CCD3E0", 160, 224 +Sprite "ZYX3E0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0052.png", 0, 0 } -Sprite "CCD3F0", 160, 224 +Sprite "ZYX3F0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0053.png", 0, 0 } -Sprite "CCD3G0", 160, 224 +Sprite "ZYX3G0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0054.png", 0, 0 } -Sprite "CCD3H0", 160, 224 +Sprite "ZYX3H0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0055.png", 0, 0 } -Sprite "CCD3I0", 160, 224 +Sprite "ZYX3I0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0056.png", 0, 0 } -Sprite "CCD3J0", 160, 224 +Sprite "ZYX3J0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0057.png", 0, 0 } -Sprite "CCD3K0", 160, 224 +Sprite "ZYX3K0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0058.png", 0, 0 } -Sprite "CCD3L0", 160, 224 +Sprite "ZYX3L0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0059.png", 0, 0 } -Sprite "CCD3M0", 160, 224 +Sprite "ZYX3M0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0060.png", 0, 0 } -Sprite "CCD3N0", 160, 224 +Sprite "ZYX3N0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0061.png", 0, 0 } -Sprite "CCD3O0", 160, 224 +Sprite "ZYX3O0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0062.png", 0, 0 } -Sprite "CCD3P0", 160, 224 +Sprite "ZYX3P0", 160, 224 { XScale 3.2 YScale 3.0 Offset 80, 192 Patch "patches/castdemo_0063.png", 0, 0 } -Sprite "CCD3Q0", 160, 224 +Sprite "ZYX3Q0", 160, 224 { XScale 3.2 YScale 3.0 diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 5a6208f57..110bc90af 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -2190,16 +2190,16 @@ Class CastDemolitionist : Actor { Spawn: See: - CCD1 ABCDEFGHIJKLMNOP 2; + ZYX1 ABCDEFGHIJKLMNOP 2; Loop; Missile: - CCD1 A 2; - CCD2 ABCDEF 2; + ZYX1 A 2; + ZYX2 ABCDEF 2; Goto See; Death: - CCD1 A 2; - CCD3 ABCDEFGHIJKLMNOP 2; - CCD3 Q -1; + ZYX1 A 2; + ZYX3 ABCDEFGHIJKLMNOP 2; + ZYX3 Q -1; Stop; } }