diff --git a/buildcfg.txt b/buildcfg.txt index f32a9ad9..6002b359 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -1453,11 +1453,11 @@ SKELN0 30 50 SKELO0 27 34 SKELP0 30 24 SKELQ0 32 21 -FATBA1 11 15 ; revenant rocket -FATBA2A8 15 15 -FATBA3A7 17 15 -FATBA4A6 11 15 -FATBA5 11 15 +FATBA1 11 13 ; revenant rocket +FATBA2A8 15 13 +FATBA3A7 17 13 +FATBA4A6 11 13 +FATBA5 11 13 FATBB1 11 16 FATBB2B8 14 15 FATBB3B7 16 15 @@ -2206,32 +2206,32 @@ APBXB0 15 22 APBXC0 16 26 APBXD0 19 26 APBXE0 19 27 -APLSA0 9 13 -APLSB0 8 13 +APLSA0 10 12 +APLSB0 8 12 BOSFA0 25 50 ; Spinning boss 'cube' BOSFB0 24 50 BOSFC0 21 50 BOSFD0 25 50 -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 +MANFA1 17 19 ; Mancubus shot +MANFA5 14 17 +MANFA6A4 40 18 +MANFA7A3 50 16 +MANFA8A2 39 16 +MANFB1 17 20 +MANFB5 12 16 +MANFB6B4 33 17 +MANFB7B3 45 18 +MANFB8B2 35 16 ; These are normal items that appear in both Freedoom and FreeDM. AMMOA0 8 16 ARM1A0 18 28 ARM1B0 18 28 -ARM2A0 18 28 -ARM2B0 18 28 -BAL1A0 8 12 -BAL1B0 8 12 +ARM2A0 18 26 +ARM2B0 18 26 +BAL1A0 8 11 +BAL1B0 8 11 BAL1C0 17 21 BAL1D0 19 25 BAL1E0 22 28 @@ -2292,11 +2292,11 @@ MISFA0 -110 -99 MISFB0 -110 -94 MISFC0 -111 -96 MISFD0 -115 -91 -MISLA1 7 13 -MISLA5 7 13 -MISLA6A4 18 13 -MISLA7A3 32 13 -MISLA8A2 18 13 +MISLA1 7 11 +MISLA5 7 11 +MISLA6A4 18 11 +MISLA7A3 32 11 +MISLA8A2 18 11 MISLB0 39 42 MISLC0 38 46 MISLD0 45 47 @@ -2507,8 +2507,8 @@ POB2A0 #endif -BAL2A0 8 14 -BAL2B0 8 15 +BAL2A0 8 12 +BAL2B0 8 13 BAL2C0 16 23 BAL2D0 20 27 BAL2E0 25 34 @@ -2567,12 +2567,12 @@ PLSEB0 15 19 PLSEC0 17 24 PLSED0 18 27 PLSEE0 19 30 -PLSFA0 -115 -87 -PLSFB0 -115 -86 +PLSFA0 -115 -86 +PLSFB0 -115 -85 PLSGA0 -115 -104 PLSGB0 -50 -100 PLSSA0 9 12 -PLSSB0 8 13 +PLSSB0 9 12 POL1A0 22 62 POL2A0 19 62 POL3A0 19 48 diff --git a/lumps/dehacked/dehacked.txt b/lumps/dehacked/dehacked.txt index cd31e7b9..37e4768b 100644 --- a/lumps/dehacked/dehacked.txt +++ b/lumps/dehacked/dehacked.txt @@ -187,7 +187,7 @@ GOTBFG9000 = The SKAG 1337 ... time to kick some ass! GOTCHAINGUN = You got the minigun! GOTCHAINSAW = You got the angle grinder! GOTLAUNCHER = You got the missile launcher! -GOTPLASMA = You got the polaric energy cannon! +GOTPLASMA = You got the polaric energy weapon! GOTSHOTGUN = You got the pump-action shotgun! GOTSHOTGUN2 = You got the double-barrelled shotgun! TAG_FIST = fist @@ -195,7 +195,7 @@ TAG_BFG9000 = SKAG 1337 TAG_CHAINGUN = minigun TAG_CHAINSAW = angle grinder TAG_ROCKETLAUNCHER = missile launcher -TAG_PLASMARIFLE = polaric energy cannon +TAG_PLASMARIFLE = polaric energy weapon TAG_SHOTGUN = pump-action shotgun TAG_SUPERSHOTGUN = double-barrelled shotgun PD_BLUEO = This object requires a blue key. @@ -649,7 +649,7 @@ OB_MPSSHOTGUN=%k swapped two barrels upside %o's head. OB_MPCHAINGUN=%o was perforated by %k's minigun. OB_MPROCKET=%o was mutilated by %k's missile. OB_MPR_SPLASH=%o couldn't dodge %k's missile. -OB_MPPLASMARIFLE=%o swallowed too much of %k's polaric energy. +OB_MPPLASMARIFLE=%o went QQ over %k's pew pew. OB_MPBFG_BOOM=%o had %p ass kicked by %k's SKAG! OB_MPBFG_SPLASH=%o couldn't hide from %k's SKAG. OB_MPTELEFRAG=%o stood where %k was teleporting. diff --git a/sprites/aplsa0.png b/sprites/aplsa0.png index 1f9e35e5..2d35d855 100644 Binary files a/sprites/aplsa0.png and b/sprites/aplsa0.png differ diff --git a/sprites/aplsb0.png b/sprites/aplsb0.png index 6d15dc3a..a4d0ebeb 100644 Binary files a/sprites/aplsb0.png and b/sprites/aplsb0.png differ diff --git a/sprites/plasa0.png b/sprites/plasa0.png index 803971b0..b679c831 100644 Binary files a/sprites/plasa0.png and b/sprites/plasa0.png differ diff --git a/sprites/plsea0.png b/sprites/plsea0.png index 3d8bacd1..f57bf6da 100644 Binary files a/sprites/plsea0.png and b/sprites/plsea0.png differ diff --git a/sprites/plsfa0.png b/sprites/plsfa0.png index d3146995..8e5aded2 100644 Binary files a/sprites/plsfa0.png and b/sprites/plsfa0.png differ diff --git a/sprites/plsfb0.png b/sprites/plsfb0.png index 31d6bc81..c66583ab 100644 Binary files a/sprites/plsfb0.png and b/sprites/plsfb0.png differ diff --git a/sprites/plsga0.png b/sprites/plsga0.png index 76916e62..2e9f3b58 100644 Binary files a/sprites/plsga0.png and b/sprites/plsga0.png differ diff --git a/sprites/plsgb0.png b/sprites/plsgb0.png index 8730a50c..82d4e89d 100644 Binary files a/sprites/plsgb0.png and b/sprites/plsgb0.png differ diff --git a/sprites/plssa0.png b/sprites/plssa0.png index eaf3f84d..1b369f92 100644 Binary files a/sprites/plssa0.png and b/sprites/plssa0.png differ diff --git a/sprites/plssb0.png b/sprites/plssb0.png index 2fcfbf59..0bb50ac7 100644 Binary files a/sprites/plssb0.png and b/sprites/plssb0.png differ