From 4c70995eacc29fdd77d8c2d67f3bec2fa8d24f27 Mon Sep 17 00:00:00 2001 From: mc776 Date: Wed, 13 Oct 2021 22:52:23 -0700 Subject: [PATCH 1/3] sprites: correct offsets. Turns out #753 applies to all projectiles except the rocket pre-explosion frames. (Yes, I am aware that this is how it's done in Doom. It's wrong there too and we're under no obligation to perpetuate that error.) Also fixes a PLYC gibbing sprite copypaste error. --- buildcfg.txt | 148 +++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 77f144ac..ddc8621c 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1472,19 +1472,19 @@ SKELN0 22 51 SKELO0 34 49 SKELP0 37 39 SKELQ0 36 17 -FATBA1 11 10 ; revenant rocket -FATBA2A8 22 10 -FATBA3A7 31 9 -FATBA4A6 22 9 -FATBA5 11 10 -FATBB1 11 10 -FATBB2B8 22 10 -FATBB3B7 31 9 -FATBB4B6 23 9 -FATBB5 11 10 -FBXPA0 13 10 ; revenant explosion -FBXPB0 17 14 -FBXPC0 17 15 +FATBA1 11 19 ; revenant rocket +FATBA2A8 15 19 +FATBA3A7 17 19 +FATBA4A6 11 19 +FATBA5 11 19 +FATBB1 11 20 +FATBB2B8 14 19 +FATBB3B7 16 19 +FATBB4B6 11 19 +FATBB5 11 19 +FBXPA0 13 20 ; revenant explosion +FBXPB0 17 28 +FBXPC0 18 31 SSWVA1 18 61 SSWVA2A8 15 64 SSWVA3A7 11 66 @@ -2220,27 +2220,27 @@ SPIDS0 128 100 ; in doom.wad, and so must be included for compatibility reasons (some ; mods use them): -APBXA0 12 11 ; Arachnotron plasma ball -APBXB0 15 14 -APBXC0 17 17 -APBXD0 18 17 -APBXE0 19 17 -APLSA0 7 9 -APLSB0 6 8 +APBXA0 11 19 ; Arachnotron plasma ball +APBXB0 15 23 +APBXC0 16 28 +APBXD0 19 28 +APBXE0 19 29 +APLSA0 9 15 +APLSB0 8 15 BOSFA0 25 50 ; Spinning boss 'cube' BOSFB0 24 50 BOSFC0 21 50 BOSFD0 25 50 -MANFA1 19 17 ; Mancubus shot -MANFA5 13 15 -MANFA6A4 25 19 -MANFA7A3 34 16 -MANFA8A2 33 17 -MANFB1 19 17 -MANFB5 12 13 -MANFB6B4 18 19 -MANFB7B3 30 17 -MANFB8B2 27 17 +MANFA1 17 31 ; Mancubus shot +MANFA5 14 29 +MANFA6A4 40 30 +MANFA7A3 50 28 +MANFA8A2 39 28 +MANFB1 17 32 +MANFB5 12 28 +MANFB6B4 33 29 +MANFB7B3 45 30 +MANFB8B2 35 28 ; These are normal items that appear in both Freedoom and FreeDM. @@ -2249,22 +2249,22 @@ ARM1A0 15 17 ARM1B0 15 17 ARM2A0 15 22 ARM2B0 15 22 -BAL1A0 8 8 -BAL1B0 8 8 -BAL1C0 16 17 -BAL1D0 20 19 -BAL1E0 23 21 -BAL7A1A5 10 9 -BAL7A2A8 20 9 -BAL7A3A7 28 8 -BAL7A4A6 21 8 -BAL7B1B5 10 9 -BAL7B2B8 20 9 -BAL7B3B7 27 8 -BAL7B4B6 21 8 -BAL7C0 16 16 -BAL7D0 20 19 -BAL7E0 21 20 +BAL1A0 8 15 +BAL1B0 8 15 +BAL1C0 17 25 +BAL1D0 19 28 +BAL1E0 22 31 +BAL7A1A5 10 18 +BAL7A2A8 14 17 +BAL7A3A7 15 16 +BAL7A4A6 12 17 +BAL7B1B5 10 18 +BAL7B2B8 13 17 +BAL7B3B7 14 16 +BAL7B4B6 12 16 +BAL7C0 17 25 +BAL7D0 20 29 +BAL7E0 21 30 BAR1A0 11 30 BAR1B0 11 30 BEXPA0 11 30 @@ -2316,9 +2316,9 @@ MISLA5 5 12 MISLA6A4 14 12 MISLA7A3 18 12 MISLA8A2 14 12 -MISLB0 36 37 -MISLC0 39 38 -MISLD0 45 41 +MISLB0 39 42 +MISLC0 38 46 +MISLD0 45 47 PINSA0 15 35 PINSB0 15 35 PINSC0 15 35 @@ -2429,8 +2429,8 @@ PLYCQ0 18 50 PLYCR0 22 51 PLYCS0 25 52 PLYCT0 26 40 -PLYCU0 26 19 -PLYCV0 26 29 +PLYCU0 26 29 +PLYCV0 26 19 PLYCW0 25 14 PMAPA0 14 28 @@ -2530,12 +2530,12 @@ POB2A0 #endif -BAL2A0 8 8 -BAL2B0 8 8 -BAL2C0 16 16 -BAL2D0 20 19 -BAL2E0 25 24 -BFS1A0 28 33 +BAL2A0 8 14 +BAL2B0 8 15 +BAL2C0 16 23 +BAL2D0 20 27 +BAL2E0 25 34 +BFS1A0 30 36 BFS1B0 29 33 BFUGA0 28 20 BFGGA0 -95 -106 @@ -2543,16 +2543,16 @@ BFGGB0 -95 -106 BFGGC0 -88 -101 BFGFA0 -88 -83 BFGFB0 -88 -82 -BFE1A0 69 45 -BFE1B0 69 45 -BFE1C0 69 63 -BFE1D0 69 61 -BFE1E0 12 10 -BFE1F0 4 4 -BFE2A0 36 28 -BFE2B0 34 28 -BFE2C0 12 10 -BFE2D0 4 4 +BFE1A0 69 48 +BFE1B0 69 48 +BFE1C0 70 68 +BFE1D0 69 65 +BFE1E0 12 15 +BFE1F0 4 9 +BFE2A0 36 36 +BFE2B0 34 35 +BFE2C0 12 16 +BFE2D0 4 10 BSKUA0 6 17 BSKUB0 6 17 CELLA0 8 12 @@ -2585,17 +2585,17 @@ PINVB0 12 32 PINVC0 12 32 PINVD0 12 32 PLASA0 29 16 -PLSEA0 11 11 -PLSEB0 15 14 -PLSEC0 16 17 -PLSED0 18 19 -PLSEE0 18 19 +PLSEA0 11 19 +PLSEB0 15 24 +PLSEC0 17 29 +PLSED0 18 32 +PLSEE0 19 32 PLSFA0 -115 -87 PLSFB0 -115 -86 PLSGA0 -115 -104 PLSGB0 -50 -100 -PLSSA0 8 8 -PLSSB0 7 9 +PLSSA0 9 16 +PLSSB0 8 17 POL1A0 22 62 POL2A0 19 62 POL3A0 19 48 From 6d01502472f5eb7b1aa3b4f82b055bbe152cb47d Mon Sep 17 00:00:00 2001 From: mc776 Date: Tue, 2 Nov 2021 18:39:58 -0700 Subject: [PATCH 2/3] sprites: move combatslugball Y offset 10px higher. --- buildcfg.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index ddc8621c..0c8d4246 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -2231,16 +2231,16 @@ BOSFA0 25 50 ; Spinning boss 'cube' BOSFB0 24 50 BOSFC0 21 50 BOSFD0 25 50 -MANFA1 17 31 ; Mancubus shot -MANFA5 14 29 -MANFA6A4 40 30 -MANFA7A3 50 28 -MANFA8A2 39 28 -MANFB1 17 32 -MANFB5 12 28 -MANFB6B4 33 29 -MANFB7B3 45 30 -MANFB8B2 35 28 +MANFA1 17 21 ; Mancubus shot +MANFA5 14 19 +MANFA6A4 40 20 +MANFA7A3 50 18 +MANFA8A2 39 18 +MANFB1 17 22 +MANFB5 12 18 +MANFB6B4 33 19 +MANFB7B3 45 20 +MANFB8B2 35 18 ; These are normal items that appear in both Freedoom and FreeDM. From 88ae24a645a99f384b46b71fce5e8964fc9f7900 Mon Sep 17 00:00:00 2001 From: mc776 Date: Tue, 2 Nov 2021 22:16:00 -0700 Subject: [PATCH 3/3] projectiles: center now instead of using base. --- buildcfg.txt | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 0c8d4246..529d8141 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1472,19 +1472,19 @@ SKELN0 22 51 SKELO0 34 49 SKELP0 37 39 SKELQ0 36 17 -FATBA1 11 19 ; revenant rocket -FATBA2A8 15 19 -FATBA3A7 17 19 -FATBA4A6 11 19 -FATBA5 11 19 -FATBB1 11 20 -FATBB2B8 14 19 -FATBB3B7 16 19 -FATBB4B6 11 19 -FATBB5 11 19 -FBXPA0 13 20 ; revenant explosion -FBXPB0 17 28 -FBXPC0 18 31 +FATBA1 11 15 ; revenant rocket +FATBA2A8 15 15 +FATBA3A7 17 15 +FATBA4A6 11 15 +FATBA5 11 15 +FATBB1 11 16 +FATBB2B8 14 15 +FATBB3B7 16 15 +FATBB4B6 11 15 +FATBB5 11 15 +FBXPA0 13 16 ; revenant explosion +FBXPB0 17 24 +FBXPC0 18 27 SSWVA1 18 61 SSWVA2A8 15 64 SSWVA3A7 11 66 @@ -2220,13 +2220,13 @@ SPIDS0 128 100 ; in doom.wad, and so must be included for compatibility reasons (some ; mods use them): -APBXA0 11 19 ; Arachnotron plasma ball -APBXB0 15 23 -APBXC0 16 28 -APBXD0 19 28 -APBXE0 19 29 -APLSA0 9 15 -APLSB0 8 15 +APBXA0 11 17 ; Arachnotron plasma ball +APBXB0 15 22 +APBXC0 16 26 +APBXD0 19 26 +APBXE0 19 27 +APLSA0 9 13 +APLSB0 8 13 BOSFA0 25 50 ; Spinning boss 'cube' BOSFB0 24 50 BOSFC0 21 50 @@ -2249,11 +2249,11 @@ ARM1A0 15 17 ARM1B0 15 17 ARM2A0 15 22 ARM2B0 15 22 -BAL1A0 8 15 -BAL1B0 8 15 -BAL1C0 17 25 -BAL1D0 19 28 -BAL1E0 22 31 +BAL1A0 8 12 +BAL1B0 8 12 +BAL1C0 17 21 +BAL1D0 19 25 +BAL1E0 22 28 BAL7A1A5 10 18 BAL7A2A8 14 17 BAL7A3A7 15 16 @@ -2311,11 +2311,11 @@ MISFA0 -110 -99 MISFB0 -110 -94 MISFC0 -111 -96 MISFD0 -115 -91 -MISLA1 5 12 -MISLA5 5 12 -MISLA6A4 14 12 -MISLA7A3 18 12 -MISLA8A2 14 12 +MISLA1 5 10 +MISLA5 5 9 +MISLA6A4 14 10 +MISLA7A3 18 10 +MISLA8A2 14 10 MISLB0 39 42 MISLC0 38 46 MISLD0 45 47 @@ -2585,17 +2585,17 @@ PINVB0 12 32 PINVC0 12 32 PINVD0 12 32 PLASA0 29 16 -PLSEA0 11 19 -PLSEB0 15 24 -PLSEC0 17 29 -PLSED0 18 32 -PLSEE0 19 32 +PLSEA0 11 15 +PLSEB0 15 19 +PLSEC0 17 24 +PLSED0 18 27 +PLSEE0 19 30 PLSFA0 -115 -87 PLSFB0 -115 -86 PLSGA0 -115 -104 PLSGB0 -50 -100 -PLSSA0 9 16 -PLSSB0 8 17 +PLSSA0 9 12 +PLSSB0 8 13 POL1A0 22 62 POL2A0 19 62 POL3A0 19 48