Merge branch 'master' into c4m2-teleport
|
@ -1,4 +1,4 @@
|
||||||
Copyright © 2001-2020
|
Copyright © 2001-2021
|
||||||
Contributors to the Freedoom project. All rights reserved.
|
Contributors to the Freedoom project. All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
|
23
CREDITS
|
@ -809,3 +809,26 @@ D: map26
|
||||||
S: Craneo
|
S: Craneo
|
||||||
E: memod_99@hotmail.com
|
E: memod_99@hotmail.com
|
||||||
D: sprites: technospider reshading
|
D: sprites: technospider reshading
|
||||||
|
|
||||||
|
S: northivanastan
|
||||||
|
N: Ivan Stanton
|
||||||
|
E: northivanastan@gmail.com
|
||||||
|
D: musics: d_e1m5
|
||||||
|
|
||||||
|
S: MothraMaster
|
||||||
|
D: sprites: Zombieman/Shotgunners boots update
|
||||||
|
|
||||||
|
S: Korp
|
||||||
|
E: korpkat@gmail.com
|
||||||
|
D: Sprites, Textures and Musics
|
||||||
|
|
||||||
|
S: ajanddino
|
||||||
|
N: Anthony Pierce
|
||||||
|
E: ajanddino@gmail.com
|
||||||
|
D: musics: e1m6, e2m8, e2m9
|
||||||
|
|
||||||
|
N: Jaden LeMieux
|
||||||
|
S: i"Red"MC
|
||||||
|
E: jadenquinn8@hotmail.com
|
||||||
|
D: Map balancing fixes, C3M4
|
||||||
|
=======
|
2
Makefile
|
@ -10,7 +10,7 @@ DEUTEX=deutex
|
||||||
DEUTEX_BASIC_ARGS=-v0 -rate accept
|
DEUTEX_BASIC_ARGS=-v0 -rate accept
|
||||||
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
|
DEUTEX_ARGS=$(DEUTEX_BASIC_ARGS) -doom2 bootstrap/
|
||||||
NODE_BUILDER=ZenNode
|
NODE_BUILDER=ZenNode
|
||||||
NODE_BUILDER_LEVELS=c?m? dm?? map??
|
NODE_BUILDER_LEVELS=e?m? dm?? map??
|
||||||
|
|
||||||
FREEDOOM1=$(WADS)/freedoom1.wad
|
FREEDOOM1=$(WADS)/freedoom1.wad
|
||||||
FREEDOOM2=$(WADS)/freedoom2.wad
|
FREEDOOM2=$(WADS)/freedoom2.wad
|
||||||
|
|
634
buildcfg.txt
|
@ -301,13 +301,13 @@ DSSKESWG
|
||||||
DSBSPDTH
|
DSBSPDTH
|
||||||
DSVILDTH
|
DSVILDTH
|
||||||
DSKNTDTH
|
DSKNTDTH
|
||||||
DSPEDTH = dummy
|
DSPEDTH
|
||||||
DSSKEDTH
|
DSSKEDTH
|
||||||
DSBSPACT
|
DSBSPACT
|
||||||
DSBSPWLK = dummy
|
DSBSPWLK
|
||||||
DSVILACT
|
DSVILACT
|
||||||
DSFLAME = dummy
|
DSFLAME
|
||||||
DSFLAMST = dummy
|
DSFLAMST
|
||||||
DSBOSPIT
|
DSBOSPIT
|
||||||
DSBOSCUB
|
DSBOSCUB
|
||||||
DSBOSSIT
|
DSBOSSIT
|
||||||
|
@ -1101,8 +1101,8 @@ CWILV31 = DMWILV31
|
||||||
|
|
||||||
#ifdef PHASE2
|
#ifdef PHASE2
|
||||||
|
|
||||||
BBRNA0 ; boss brain
|
BBRNA0 25 118 ; boss brain
|
||||||
BBRNB0
|
BBRNB0 31 113
|
||||||
BOS2A1 24 69 ; hell knight
|
BOS2A1 24 69 ; hell knight
|
||||||
BOS2A2 24 69
|
BOS2A2 24 69
|
||||||
BOS2A3 26 69
|
BOS2A3 26 69
|
||||||
|
@ -1167,13 +1167,13 @@ BOS2H5 23 73
|
||||||
BOS2H6 22 73
|
BOS2H6 22 73
|
||||||
BOS2H7 22 73
|
BOS2H7 22 73
|
||||||
BOS2H8 26 73
|
BOS2H8 26 73
|
||||||
BOS2I0 28 73
|
BOS2I0 39 69
|
||||||
BOS2J0 31 73
|
BOS2J0 43 65
|
||||||
BOS2K0 39 69
|
BOS2K0 43 63
|
||||||
BOS2L0 43 67
|
BOS2L0 40 48
|
||||||
BOS2M0 49 63
|
BOS2M0 40 42
|
||||||
BOS2N0 46 58
|
BOS2N0 42 33
|
||||||
BOS2O0 43 33
|
BOS2O0 43 19
|
||||||
BRS1A0
|
BRS1A0
|
||||||
bspia1d1 ; arachnotron
|
bspia1d1 ; arachnotron
|
||||||
bspia2a8
|
bspia2a8
|
||||||
|
@ -1221,54 +1221,54 @@ bspim0
|
||||||
bspin0
|
bspin0
|
||||||
bspio0
|
bspio0
|
||||||
bspip0
|
bspip0
|
||||||
CPOSA1 22 52
|
CPOSA1 18 52 ; heavy weapons guy
|
||||||
CPOSA2A8 16 52
|
CPOSB1 18 52
|
||||||
CPOSA3A7 21 50
|
CPOSC1 17 52
|
||||||
CPOSA4A6 23 49
|
CPOSD1 18 52
|
||||||
CPOSA5 19 47
|
CPOSE1 15 52
|
||||||
CPOSB1 19 53
|
CPOSF1 15 52
|
||||||
|
CPOSG1 16 52
|
||||||
|
CPOSA2A8 16 51
|
||||||
CPOSB2B8 18 52
|
CPOSB2B8 18 52
|
||||||
CPOSB3B7 19 52
|
|
||||||
CPOSB4B6 21 52
|
|
||||||
CPOSB5 18 51
|
|
||||||
CPOSC1 20 53
|
|
||||||
CPOSC2C8 16 51
|
CPOSC2C8 16 51
|
||||||
CPOSC3C7 18 51
|
CPOSD2D8 16 52
|
||||||
CPOSC4C6 22 51
|
CPOSE2E8 33 52
|
||||||
CPOSC5 17 50
|
CPOSF2F8 42 52
|
||||||
CPOSD1 19 52
|
CPOSG2G8 22 52
|
||||||
CPOSD2D8 17 52
|
CPOSA3A7 18 52
|
||||||
CPOSD3D7 19 52
|
CPOSB3B7 24 52
|
||||||
CPOSD4D6 23 52
|
CPOSC3C7 13 52
|
||||||
CPOSD5 19 51
|
CPOSD3D7 21 52
|
||||||
CPOSE1 14 54
|
CPOSE3E7 30 52
|
||||||
CPOSE2E8 29 54
|
CPOSF3F7 40 52
|
||||||
CPOSE3E7 39 53
|
CPOSG3G7 24 52
|
||||||
CPOSE4E6 29 50
|
CPOSA4A6 24 54
|
||||||
CPOSE5 13 51
|
CPOSB4B6 27 53
|
||||||
CPOSF1 14 54
|
CPOSC4C6 26 55
|
||||||
CPOSF2F8 28 54
|
CPOSD4D6 26 54
|
||||||
CPOSF3F7 39 53
|
CPOSE4E6 32 55
|
||||||
CPOSF4F6 30 50
|
CPOSF4F6 40 55
|
||||||
CPOSF5 13 51
|
CPOSG4G6 29 55
|
||||||
CPOSG1 20 52
|
CPOSA5 25 52
|
||||||
CPOSG2G8 16 52
|
CPOSB5 26 51
|
||||||
CPOSG3G7 21 52
|
CPOSC5 26 52
|
||||||
CPOSG4G6 20 50
|
CPOSD5 25 51
|
||||||
CPOSG5 17 50
|
CPOSE5 15 52
|
||||||
CPOSH0 19 47
|
CPOSF5 15 52
|
||||||
CPOSI0 9 42
|
CPOSG5 27 52
|
||||||
CPOSJ0 13 46
|
CPOSH0 15 56
|
||||||
CPOSK0 17 37
|
CPOSI0 16 47
|
||||||
CPOSL0 27 12
|
CPOSJ0 15 36
|
||||||
CPOSM0 27 12
|
CPOSK0 15 21
|
||||||
CPOSN0 27 12
|
CPOSL0 18 17
|
||||||
CPOSO0 16 53
|
CPOSM0 18 15
|
||||||
CPOSP0 20 50
|
CPOSN0 18 15
|
||||||
CPOSQ0 21 47
|
CPOSO0 21 52
|
||||||
CPOSR0 24 38
|
CPOSP0 20 49
|
||||||
CPOSS0 25 33
|
CPOSQ0 22 45
|
||||||
CPOST0 27 14
|
CPOSR0 24 35
|
||||||
|
CPOSS0 24 31
|
||||||
|
CPOST0 26 12
|
||||||
FATTA1 39 60 ; mancubus
|
FATTA1 39 60 ; mancubus
|
||||||
FATTA2A8 39 61
|
FATTA2A8 39 61
|
||||||
FATTA3A7 38 60
|
FATTA3A7 38 60
|
||||||
|
@ -1354,47 +1354,47 @@ KEENK0 19 65
|
||||||
KEENL0 19 22
|
KEENL0 19 22
|
||||||
KEENM0 10 68
|
KEENM0 10 68
|
||||||
|
|
||||||
PAINA1 31 63 ; pain elemental
|
PAINA1 37 62 ; pain elemental
|
||||||
PAINA2A8 30 60
|
PAINA2A8 43 60
|
||||||
PAINA3A7 30 63
|
PAINA3A7 47 62
|
||||||
PAINA4A6 30 60
|
PAINA4A6 37 58
|
||||||
PAINA5 30 60
|
PAINA5 33 60
|
||||||
PAINB1 30 63
|
PAINB1 37 62
|
||||||
PAINB2B8 30 60
|
PAINB2B8 43 60
|
||||||
PAINB3B7 30 60
|
PAINB3B7 47 62
|
||||||
PAINB4B6 30 60
|
PAINB4B6 37 58
|
||||||
PAINB5 30 60
|
PAINB5 33 60
|
||||||
PAINC1 31 65
|
PAINC1 37 62
|
||||||
PAINC2C8 30 61
|
PAINC2C8 43 60
|
||||||
PAINC3C7 30 61
|
PAINC3C7 47 62
|
||||||
PAINC4C6 30 60
|
PAINC4C6 37 58
|
||||||
PAINC5 31 60
|
PAINC5 33 60
|
||||||
PAIND1 30 61
|
PAIND1 37 56
|
||||||
PAIND2D8 31 60
|
PAIND2D8 44 57
|
||||||
PAIND3D7 34 60
|
PAIND3D7 48 57
|
||||||
PAIND4D6 30 60
|
PAIND4D6 37 59
|
||||||
PAIND5 30 60
|
PAIND5 33 60
|
||||||
PAINE1 30 60
|
PAINE1 37 62
|
||||||
PAINE2E8 34 60
|
PAINE2E8 44 63
|
||||||
PAINE3E7 37 60
|
PAINE3E7 49 65
|
||||||
PAINE4E6 30 60
|
PAINE4E6 37 58
|
||||||
PAINE5 31 60
|
PAINE5 33 62
|
||||||
PAINF1 31 60
|
PAINF1 36 63
|
||||||
PAINF2F8 35 60
|
PAINF2F8 48 63
|
||||||
PAINF3F7 41 60
|
PAINF3F7 50 64
|
||||||
PAINF4F6 32 60
|
PAINF4F6 39 59
|
||||||
PAINF5 31 60
|
PAINF5 33 61
|
||||||
PAING1 30 63
|
PAING1 37 61
|
||||||
PAING2G8 30 60
|
PAING2G8 44 61
|
||||||
PAING3G7 30 60
|
PAING3G7 47 62
|
||||||
PAING4G6 30 60
|
PAING4G6 37 59
|
||||||
PAING5 30 60
|
PAING5 33 61
|
||||||
PAINH0 30 68
|
PAINH0 37 61
|
||||||
PAINI0 30 61
|
PAINI0 38 62
|
||||||
PAINJ0 31 61
|
PAINJ0 40 71
|
||||||
PAINK0 31 60
|
PAINK0 37 71
|
||||||
PAINL0 31 61
|
PAINL0 38 67
|
||||||
PAINM0 30 61
|
PAINM0 45 69
|
||||||
SKELA1D1 20 58 ; revenant
|
SKELA1D1 20 58 ; revenant
|
||||||
SKELA2D8 17 57
|
SKELA2D8 17 57
|
||||||
SKELA3D7 13 58
|
SKELA3D7 13 58
|
||||||
|
@ -1472,19 +1472,19 @@ SKELN0 22 51
|
||||||
SKELO0 34 49
|
SKELO0 34 49
|
||||||
SKELP0 37 39
|
SKELP0 37 39
|
||||||
SKELQ0 36 17
|
SKELQ0 36 17
|
||||||
FATBA1 11 10 ; revenant rocket
|
FATBA1 11 15 ; revenant rocket
|
||||||
FATBA2A8 22 10
|
FATBA2A8 15 15
|
||||||
FATBA3A7 31 9
|
FATBA3A7 17 15
|
||||||
FATBA4A6 22 9
|
FATBA4A6 11 15
|
||||||
FATBA5 11 10
|
FATBA5 11 15
|
||||||
FATBB1 11 10
|
FATBB1 11 16
|
||||||
FATBB2B8 22 10
|
FATBB2B8 14 15
|
||||||
FATBB3B7 31 9
|
FATBB3B7 16 15
|
||||||
FATBB4B6 23 9
|
FATBB4B6 11 15
|
||||||
FATBB5 11 10
|
FATBB5 11 15
|
||||||
FBXPA0 13 10 ; revenant explosion
|
FBXPA0 13 16 ; revenant explosion
|
||||||
FBXPB0 17 14
|
FBXPB0 17 24
|
||||||
FBXPC0 17 15
|
FBXPC0 18 27
|
||||||
SSWVA1 18 61
|
SSWVA1 18 61
|
||||||
SSWVA2A8 15 64
|
SSWVA2A8 15 64
|
||||||
SSWVA3A7 11 66
|
SSWVA3A7 11 66
|
||||||
|
@ -1753,62 +1753,83 @@ BOSSH5 23 73
|
||||||
BOSSH6 24 72
|
BOSSH6 24 72
|
||||||
BOSSH7 23 73
|
BOSSH7 23 73
|
||||||
BOSSH8 26 73
|
BOSSH8 26 73
|
||||||
BOSSI0 28 73
|
BOSSI0 25 69
|
||||||
BOSSJ0 31 73
|
BOSSJ0 35 65
|
||||||
BOSSK0 39 69
|
BOSSK0 39 63
|
||||||
BOSSL0 43 67
|
BOSSL0 40 48
|
||||||
BOSSM0 49 63
|
BOSSM0 42 42
|
||||||
BOSSN0 46 58
|
BOSSN0 42 33
|
||||||
BOSSO0 43 33
|
BOSSO0 48 19
|
||||||
POSSA1 17 50 ; former human
|
POSSA1 22 53 ; former human
|
||||||
POSSA2A8 20 50
|
POSSA2 21 53
|
||||||
POSSA3A7 20 50
|
POSSA3 21 53
|
||||||
POSSA4A6 26 48
|
POSSA4 26 53
|
||||||
POSSA5 17 47
|
POSSA5 18 52
|
||||||
POSSB1 18 52
|
POSSA6 14 52
|
||||||
POSSB2B8 20 51
|
POSSA7 18 52
|
||||||
POSSB3B7 22 52
|
POSSA8 14 52
|
||||||
POSSB4B6 28 52
|
POSSB1 21 53
|
||||||
POSSB5 17 51
|
POSSB2 21 53
|
||||||
POSSC1 19 50
|
POSSB3 24 53
|
||||||
POSSC2C8 19 50
|
POSSB4 26 53
|
||||||
POSSC3C7 21 52
|
POSSB5 18 52
|
||||||
POSSC4C6 30 51
|
POSSB6 11 52
|
||||||
POSSC5 17 51
|
POSSB7 20 52
|
||||||
POSSD1 19 52
|
POSSB8 15 52
|
||||||
POSSD2D8 19 51
|
POSSC1 21 53
|
||||||
POSSD3D7 23 52
|
POSSC2 21 53
|
||||||
POSSD4D6 26 52
|
POSSC3 29 53
|
||||||
POSSD5 19 51
|
POSSC4 26 53
|
||||||
POSSE1 12 50
|
POSSC5 16 52
|
||||||
POSSE2E8 33 50
|
POSSC6 17 52
|
||||||
POSSE3E7 38 50
|
POSSC7 20 52
|
||||||
POSSE4E6 28 50
|
POSSC8 17 53
|
||||||
POSSE5 12 48
|
POSSD1 21 53
|
||||||
POSSF1 13 50
|
POSSD2 21 53
|
||||||
POSSF2F8 31 51
|
POSSD3 26 53
|
||||||
POSSF3F7 39 50
|
POSSD4 31 53
|
||||||
POSSF4F6 32 49
|
POSSD5 18 47
|
||||||
POSSF5 11 48
|
POSSD6 14 52
|
||||||
POSSG1 20 52
|
POSSD7 19 52
|
||||||
POSSG2G8 16 53
|
POSSD8 15 53
|
||||||
POSSG3G7 21 53
|
POSSE1 17 52
|
||||||
POSSG4G6 20 51
|
POSSE2 34 51
|
||||||
|
POSSE3 38 50
|
||||||
|
POSSE4 29 49
|
||||||
|
POSSE5 11 48
|
||||||
|
POSSE6 9 49
|
||||||
|
POSSE7 12 50
|
||||||
|
POSSE8 14 53
|
||||||
|
POSSF1 18 52
|
||||||
|
POSSF2 37 52
|
||||||
|
POSSF3 44 51
|
||||||
|
POSSF4 34 50
|
||||||
|
POSSF5 10 49
|
||||||
|
POSSF6 10 49
|
||||||
|
POSSF7 12 50
|
||||||
|
POSSF8 14 52
|
||||||
|
POSSG1 19 51
|
||||||
|
POSSG2 18 51
|
||||||
|
POSSG3 20 50
|
||||||
|
POSSG4 20 48
|
||||||
POSSG5 17 49
|
POSSG5 17 49
|
||||||
POSSH0 19 57
|
POSSG6 20 48
|
||||||
POSSI0 19 42
|
POSSG7 19 50
|
||||||
POSSJ0 22 34
|
POSSG8 19 53
|
||||||
POSSK0 24 27
|
POSSH0 26 51
|
||||||
POSSL0 25 19
|
POSSI0 19 38
|
||||||
POSSM0 20 59
|
POSSJ0 22 30
|
||||||
POSSN0 21 62
|
POSSK0 24 23
|
||||||
POSSO0 24 61
|
POSSL0 25 15
|
||||||
POSSP0 26 55
|
POSSM0 22 57
|
||||||
POSSQ0 27 51
|
POSSN0 23 52
|
||||||
POSSR0 28 43
|
POSSO0 26 51
|
||||||
POSSS0 28 36
|
POSSP0 28 43
|
||||||
POSST0 28 26
|
POSSQ0 32 36
|
||||||
POSSU0 28 21
|
POSSR0 33 25
|
||||||
|
POSSS0 32 19
|
||||||
|
POSST0 32 13
|
||||||
|
POSSU0 33 12
|
||||||
|
|
||||||
SARGA1 17 55
|
SARGA1 17 55
|
||||||
SARGA2A8 25 54
|
SARGA2A8 25 54
|
||||||
|
@ -1908,15 +1929,16 @@ SPOSI0 17 48
|
||||||
SPOSJ0 21 34
|
SPOSJ0 21 34
|
||||||
SPOSK0 22 29
|
SPOSK0 22 29
|
||||||
SPOSL0 26 20
|
SPOSL0 26 20
|
||||||
SPOSM0 18 54
|
SPOSM0 18 61
|
||||||
SPOSN0 23 57
|
SPOSN0 19 56
|
||||||
SPOSO0 24 56
|
SPOSO0 24 55
|
||||||
SPOSP0 26 50
|
SPOSP0 27 47
|
||||||
SPOSQ0 27 46
|
SPOSQ0 31 40
|
||||||
SPOSR0 28 38
|
SPOSR0 32 30
|
||||||
SPOSS0 28 31
|
SPOSS0 31 23
|
||||||
SPOST0 28 21
|
SPOST0 32 17
|
||||||
SPOSU0 28 11
|
SPOSU0 34 16
|
||||||
|
|
||||||
TROOA1 23 56
|
TROOA1 23 56
|
||||||
TROOA2A8 17 57
|
TROOA2A8 17 57
|
||||||
TROOA3A7 16 56
|
TROOA3A7 16 56
|
||||||
|
@ -1963,13 +1985,13 @@ TROOK0 23 50
|
||||||
TROOL0 21 39
|
TROOL0 21 39
|
||||||
TROOM0 29 22
|
TROOM0 29 22
|
||||||
TROON0 25 59
|
TROON0 25 59
|
||||||
TROOO0 26 61
|
TROOO0 26 59
|
||||||
TROOP0 21 54
|
TROOP0 27 53
|
||||||
TROOQ0 28 47
|
TROOQ0 25 44
|
||||||
TROOR0 29 39
|
TROOR0 28 37
|
||||||
TROOS0 29 32
|
TROOS0 30 31
|
||||||
TROOT0 29 22
|
TROOT0 31 28
|
||||||
TROOU0 29 7
|
TROOU0 32 28
|
||||||
|
|
||||||
CYBRA1 47 103 ; Cyberdemon
|
CYBRA1 47 103 ; Cyberdemon
|
||||||
CYBRA2 39 103
|
CYBRA2 39 103
|
||||||
|
@ -2067,43 +2089,43 @@ HEADF2F8 31 63
|
||||||
HEADF3F7 34 64
|
HEADF3F7 34 64
|
||||||
HEADF4F6 31 62
|
HEADF4F6 31 62
|
||||||
HEADF5 31 61
|
HEADF5 31 61
|
||||||
HEADG0 30 61
|
HEADG0 30 64
|
||||||
HEADH0 39 61
|
HEADH0 46 65
|
||||||
HEADI0 41 68
|
HEADI0 50 69
|
||||||
HEADJ0 38 71
|
HEADJ0 39 68
|
||||||
HEADK0 41 47
|
HEADK0 37 47
|
||||||
HEADL0 41 24
|
HEADL0 38 28
|
||||||
SKULA1 22 44 ; lost soul
|
SKULA1 15 35 ; lost soul
|
||||||
SKULA8A2 18 39
|
SKULA8A2 14 35
|
||||||
SKULA7A3 19 43
|
SKULA7A3 15 35
|
||||||
SKULA6A4 17 43
|
SKULA6A4 15 35
|
||||||
SKULA5 20 43
|
SKULA5 15 35
|
||||||
SKULB1 20 42
|
SKULB1 15 35
|
||||||
SKULB8B2 18 39
|
SKULB8B2 14 35
|
||||||
SKULB7B3 19 43
|
SKULB7B3 15 35
|
||||||
SKULB6B4 16 42
|
SKULB6B4 15 35
|
||||||
SKULB5 20 43
|
SKULB5 15 35
|
||||||
SKULC1 22 44
|
SKULC1 16 33
|
||||||
SKULC8C2 18 39
|
SKULC8C2 17 33
|
||||||
SKULC7C3 19 43
|
SKULC7C3 15 34
|
||||||
SKULC6C4 16 42
|
SKULC6C4 19 32
|
||||||
SKULC5 20 43
|
SKULC5 17 32
|
||||||
SKULD1 22 44
|
SKULD1 16 32
|
||||||
SKULD8D2 18 39
|
SKULD8D2 16 33
|
||||||
SKULD7D3 19 43
|
SKULD7D3 17 34
|
||||||
SKULD6D4 16 42
|
SKULD6D4 18 33
|
||||||
SKULD5 20 43
|
SKULD5 17 32
|
||||||
SKULE1 22 44
|
SKULE1 17 33
|
||||||
SKULE8E2 18 39
|
SKULE8E2 16 33
|
||||||
SKULE7E3 19 43
|
SKULE7E3 16 35
|
||||||
SKULE6E4 16 42
|
SKULE6E4 18 32
|
||||||
SKULE5 20 43
|
SKULE5 17 32
|
||||||
SKULF0 22 47
|
SKULF0 14 32
|
||||||
SKULG0 22 47
|
SKULG0 15 32
|
||||||
SKULH0 24 46
|
SKULH0 13 33
|
||||||
SKULI0 24 46
|
SKULI0 15 36
|
||||||
SKULJ0 34 68
|
SKULJ0 20 38
|
||||||
SKULK0 40 73
|
SKULK0 24 42
|
||||||
SPIDA1 128 100 ; spider mastermind
|
SPIDA1 128 100 ; spider mastermind
|
||||||
SPIDA2 128 100
|
SPIDA2 128 100
|
||||||
SPIDA3 128 100
|
SPIDA3 128 100
|
||||||
|
@ -2198,27 +2220,27 @@ SPIDS0 128 100
|
||||||
; in doom.wad, and so must be included for compatibility reasons (some
|
; in doom.wad, and so must be included for compatibility reasons (some
|
||||||
; mods use them):
|
; mods use them):
|
||||||
|
|
||||||
APBXA0 12 11 ; Arachnotron plasma ball
|
APBXA0 11 17 ; Arachnotron plasma ball
|
||||||
APBXB0 15 14
|
APBXB0 15 22
|
||||||
APBXC0 17 17
|
APBXC0 16 26
|
||||||
APBXD0 18 17
|
APBXD0 19 26
|
||||||
APBXE0 19 17
|
APBXE0 19 27
|
||||||
APLSA0 7 9
|
APLSA0 9 13
|
||||||
APLSB0 6 8
|
APLSB0 8 13
|
||||||
BOSFA0 25 29 ; Spinning boss 'cube'
|
BOSFA0 25 50 ; Spinning boss 'cube'
|
||||||
BOSFB0 24 29
|
BOSFB0 24 50
|
||||||
BOSFC0 21 29
|
BOSFC0 21 50
|
||||||
BOSFD0 25 29
|
BOSFD0 25 50
|
||||||
MANFA1 19 17 ; Mancubus shot
|
MANFA1 17 21 ; Mancubus shot
|
||||||
MANFA5 13 15
|
MANFA5 14 19
|
||||||
MANFA6A4 25 19
|
MANFA6A4 40 20
|
||||||
MANFA7A3 34 16
|
MANFA7A3 50 18
|
||||||
MANFA8A2 33 17
|
MANFA8A2 39 18
|
||||||
MANFB1 19 17
|
MANFB1 17 22
|
||||||
MANFB5 12 13
|
MANFB5 12 18
|
||||||
MANFB6B4 18 19
|
MANFB6B4 33 19
|
||||||
MANFB7B3 30 17
|
MANFB7B3 45 20
|
||||||
MANFB8B2 27 17
|
MANFB8B2 35 18
|
||||||
|
|
||||||
; These are normal items that appear in both Freedoom and FreeDM.
|
; These are normal items that appear in both Freedoom and FreeDM.
|
||||||
|
|
||||||
|
@ -2227,26 +2249,26 @@ ARM1A0 15 17
|
||||||
ARM1B0 15 17
|
ARM1B0 15 17
|
||||||
ARM2A0 15 22
|
ARM2A0 15 22
|
||||||
ARM2B0 15 22
|
ARM2B0 15 22
|
||||||
BAL1A0 8 8
|
BAL1A0 8 12
|
||||||
BAL1B0 8 8
|
BAL1B0 8 12
|
||||||
BAL1C0 16 17
|
BAL1C0 17 21
|
||||||
BAL1D0 20 19
|
BAL1D0 19 25
|
||||||
BAL1E0 23 21
|
BAL1E0 22 28
|
||||||
BAL7A1A5 10 9
|
BAL7A1A5 10 18
|
||||||
BAL7A2A8 20 9
|
BAL7A2A8 14 17
|
||||||
BAL7A3A7 28 8
|
BAL7A3A7 15 16
|
||||||
BAL7A4A6 21 8
|
BAL7A4A6 12 17
|
||||||
BAL7B1B5 10 9
|
BAL7B1B5 10 18
|
||||||
BAL7B2B8 20 9
|
BAL7B2B8 13 17
|
||||||
BAL7B3B7 27 8
|
BAL7B3B7 14 16
|
||||||
BAL7B4B6 21 8
|
BAL7B4B6 12 16
|
||||||
BAL7C0 16 16
|
BAL7C0 17 25
|
||||||
BAL7D0 20 19
|
BAL7D0 20 29
|
||||||
BAL7E0 21 20
|
BAL7E0 21 30
|
||||||
BAR1A0 11 32
|
BAR1A0 11 30
|
||||||
BAR1B0 11 32
|
BAR1B0 11 30
|
||||||
BEXPA0 11 33
|
BEXPA0 11 30
|
||||||
BEXPB0 12 32
|
BEXPB0 12 29
|
||||||
BEXPC0 18 40
|
BEXPC0 18 40
|
||||||
BEXPD0 28 50
|
BEXPD0 28 50
|
||||||
BEXPE0 29 53
|
BEXPE0 29 53
|
||||||
|
@ -2283,20 +2305,20 @@ IFOGE0 25 44
|
||||||
LAUNA0 30 20
|
LAUNA0 30 20
|
||||||
MEDIA0 13 19
|
MEDIA0 13 19
|
||||||
MGUNA0 25 25
|
MGUNA0 25 25
|
||||||
MISGA0 -111 -110
|
MISGA0 -111 -104
|
||||||
MISGB0 -103 -109
|
MISGB0 -107 -106
|
||||||
MISFA0 -110 -102
|
MISFA0 -110 -99
|
||||||
MISFB0 -110 -99
|
MISFB0 -110 -94
|
||||||
MISFC0 -110 -98
|
MISFC0 -111 -96
|
||||||
MISFD0 -110 -97
|
MISFD0 -115 -91
|
||||||
MISLA1 5 12
|
MISLA1 5 10
|
||||||
MISLA5 5 12
|
MISLA5 5 9
|
||||||
MISLA6A4 14 12
|
MISLA6A4 14 10
|
||||||
MISLA7A3 18 12
|
MISLA7A3 18 10
|
||||||
MISLA8A2 14 12
|
MISLA8A2 14 10
|
||||||
MISLB0 36 37
|
MISLB0 39 42
|
||||||
MISLC0 39 38
|
MISLC0 38 46
|
||||||
MISLD0 45 41
|
MISLD0 45 47
|
||||||
PINSA0 15 35
|
PINSA0 15 35
|
||||||
PINSB0 15 35
|
PINSB0 15 35
|
||||||
PINSC0 15 35
|
PINSC0 15 35
|
||||||
|
@ -2407,8 +2429,8 @@ PLYCQ0 18 50
|
||||||
PLYCR0 22 51
|
PLYCR0 22 51
|
||||||
PLYCS0 25 52
|
PLYCS0 25 52
|
||||||
PLYCT0 26 40
|
PLYCT0 26 40
|
||||||
PLYCU0 26 19
|
PLYCU0 26 29
|
||||||
PLYCV0 26 29
|
PLYCV0 26 19
|
||||||
PLYCW0 25 14
|
PLYCW0 25 14
|
||||||
|
|
||||||
PMAPA0 14 28
|
PMAPA0 14 28
|
||||||
|
@ -2446,7 +2468,7 @@ SOULA0 12 32
|
||||||
SOULB0 12 32
|
SOULB0 12 32
|
||||||
SOULC0 12 32
|
SOULC0 12 32
|
||||||
SOULD0 12 32
|
SOULD0 12 32
|
||||||
STIMA0 7 15
|
STIMA0 8 18
|
||||||
SUITA0 11 52
|
SUITA0 11 52
|
||||||
TFOGA0 25 59
|
TFOGA0 25 59
|
||||||
TFOGB0 25 59
|
TFOGB0 25 59
|
||||||
|
@ -2508,12 +2530,12 @@ POB2A0
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BAL2A0 8 8
|
BAL2A0 8 14
|
||||||
BAL2B0 8 8
|
BAL2B0 8 15
|
||||||
BAL2C0 16 16
|
BAL2C0 16 23
|
||||||
BAL2D0 20 19
|
BAL2D0 20 27
|
||||||
BAL2E0 25 24
|
BAL2E0 25 34
|
||||||
BFS1A0 28 33
|
BFS1A0 30 36
|
||||||
BFS1B0 29 33
|
BFS1B0 29 33
|
||||||
BFUGA0 28 20
|
BFUGA0 28 20
|
||||||
BFGGA0 -95 -106
|
BFGGA0 -95 -106
|
||||||
|
@ -2521,16 +2543,16 @@ BFGGB0 -95 -106
|
||||||
BFGGC0 -88 -101
|
BFGGC0 -88 -101
|
||||||
BFGFA0 -88 -83
|
BFGFA0 -88 -83
|
||||||
BFGFB0 -88 -82
|
BFGFB0 -88 -82
|
||||||
BFE1A0 69 45
|
BFE1A0 69 48
|
||||||
BFE1B0 69 45
|
BFE1B0 69 48
|
||||||
BFE1C0 69 63
|
BFE1C0 70 68
|
||||||
BFE1D0 69 61
|
BFE1D0 69 65
|
||||||
BFE1E0 12 10
|
BFE1E0 12 15
|
||||||
BFE1F0 4 4
|
BFE1F0 4 9
|
||||||
BFE2A0 36 28
|
BFE2A0 36 36
|
||||||
BFE2B0 34 28
|
BFE2B0 34 35
|
||||||
BFE2C0 12 10
|
BFE2C0 12 16
|
||||||
BFE2D0 4 4
|
BFE2D0 4 10
|
||||||
BSKUA0 6 17
|
BSKUA0 6 17
|
||||||
BSKUB0 6 17
|
BSKUB0 6 17
|
||||||
CELLA0 8 12
|
CELLA0 8 12
|
||||||
|
@ -2563,17 +2585,17 @@ PINVB0 12 32
|
||||||
PINVC0 12 32
|
PINVC0 12 32
|
||||||
PINVD0 12 32
|
PINVD0 12 32
|
||||||
PLASA0 29 16
|
PLASA0 29 16
|
||||||
PLSEA0 11 11
|
PLSEA0 11 15
|
||||||
PLSEB0 15 14
|
PLSEB0 15 19
|
||||||
PLSEC0 16 17
|
PLSEC0 17 24
|
||||||
PLSED0 18 19
|
PLSED0 18 27
|
||||||
PLSEE0 18 19
|
PLSEE0 19 30
|
||||||
PLSFA0 -117 -91
|
PLSFA0 -115 -87
|
||||||
PLSFB0 -117 -90
|
PLSFB0 -115 -86
|
||||||
PLSGA0 -117 -108
|
PLSGA0 -115 -104
|
||||||
PLSGB0 -117 -116
|
PLSGB0 -50 -100
|
||||||
PLSSA0 8 8
|
PLSSA0 9 12
|
||||||
PLSSB0 7 9
|
PLSSB0 8 13
|
||||||
POL1A0 22 62
|
POL1A0 22 62
|
||||||
POL2A0 19 62
|
POL2A0 19 62
|
||||||
POL3A0 19 48
|
POL3A0 19 48
|
||||||
|
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 385 B After Width: | Height: | Size: 926 B |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 1.2 KiB |
|
@ -11,7 +11,7 @@ import os
|
||||||
font = ImageFont.load_default()
|
font = ImageFont.load_default()
|
||||||
|
|
||||||
|
|
||||||
txt1 = "© 2001-2020"
|
txt1 = "© 2001-2021"
|
||||||
txt2 = os.environ["VERSION"]
|
txt2 = os.environ["VERSION"]
|
||||||
background_image = Image.open(sys.argv[1])
|
background_image = Image.open(sys.argv[1])
|
||||||
background_image.load()
|
background_image.load()
|
||||||
|
|
BIN
levels/e1m1.wad
BIN
levels/e1m3.wad
BIN
levels/e1m5.wad
BIN
levels/e1m6.wad
BIN
levels/e1m7.wad
BIN
levels/e1m9.wad
BIN
levels/e2m1.wad
BIN
levels/e2m2.wad
BIN
levels/e2m3.wad
BIN
levels/e2m4.wad
BIN
levels/e2m5.wad
BIN
levels/e2m6.wad
BIN
levels/e2m9.wad
BIN
levels/e3m2.wad
BIN
levels/e3m3.wad
BIN
levels/e3m4.wad
BIN
levels/e3m5.wad
BIN
levels/e3m7.wad
BIN
levels/e3m9.wad
BIN
levels/e4m2.wad
BIN
levels/e4m7.wad
BIN
levels/e4m8.wad
BIN
levels/map01.wad
BIN
levels/map02.wad
BIN
levels/map03.wad
BIN
levels/map05.wad
BIN
levels/map08.wad
BIN
levels/map09.wad
BIN
levels/map10.wad
BIN
levels/map11.wad
BIN
levels/map12.wad
BIN
levels/map18.wad
BIN
levels/map20.wad
BIN
levels/map21.wad
BIN
levels/map22.wad
BIN
levels/map25.wad
BIN
levels/map27.wad
BIN
levels/map29.wad
BIN
levels/map31.wad
|
@ -243,12 +243,12 @@ CC_SHOTGUN = shotgun zombie
|
||||||
CC_HEAVY = minigun zombie
|
CC_HEAVY = minigun zombie
|
||||||
CC_IMP = serpentipede
|
CC_IMP = serpentipede
|
||||||
CC_DEMON = flesh worm
|
CC_DEMON = flesh worm
|
||||||
CC_LOST = deadflare
|
CC_LOST = hatchling
|
||||||
CC_CACO = trilobite
|
CC_CACO = trilobite
|
||||||
CC_HELL = pain bringer
|
CC_HELL = pain bringer
|
||||||
CC_BARON = pain lord
|
CC_BARON = pain lord
|
||||||
CC_ARACH = technospider
|
CC_ARACH = technospider
|
||||||
CC_PAIN = summoner
|
CC_PAIN = matribite
|
||||||
CC_REVEN = dark soldier
|
CC_REVEN = dark soldier
|
||||||
CC_MANCU = combat slug
|
CC_MANCU = combat slug
|
||||||
CC_ARCH = necromancer
|
CC_ARCH = necromancer
|
||||||
|
@ -616,7 +616,7 @@ OB_VILE=%o was incinerated by a necromancer.
|
||||||
OB_UNDEAD=%o couldn't evade the dark soldier's fireball.
|
OB_UNDEAD=%o couldn't evade the dark soldier's fireball.
|
||||||
OB_FATSO=%o was blasted by a combat slug.
|
OB_FATSO=%o was blasted by a combat slug.
|
||||||
OB_CHAINGUY=%o was perforated by a minigun zombie.
|
OB_CHAINGUY=%o was perforated by a minigun zombie.
|
||||||
OB_SKULL=%o was slammed by a deadflare.
|
OB_SKULL=%o was slammed by a hatchling.
|
||||||
OB_IMP=%o was burned by a serpentipede.
|
OB_IMP=%o was burned by a serpentipede.
|
||||||
OB_CACO=%o was smitten by a trilobite.
|
OB_CACO=%o was smitten by a trilobite.
|
||||||
OB_BARON=%o was bruised by a pain lord.
|
OB_BARON=%o was bruised by a pain lord.
|
||||||
|
|
|
@ -1601,7 +1601,7 @@ GSTONE1 256 128
|
||||||
* WALL48_3 128 0
|
* WALL48_3 128 0
|
||||||
* WALL48_4 192 0
|
* WALL48_4 192 0
|
||||||
GSTONE2 256 128
|
GSTONE2 256 128
|
||||||
* WALL59_3 0 0
|
* WALL59_1 0 0
|
||||||
* WALL59_2 64 0
|
* WALL59_2 64 0
|
||||||
* WALL59_3 128 0
|
* WALL59_3 128 0
|
||||||
* WALL59_4 192 0
|
* WALL59_4 192 0
|
||||||
|
|
Before Width: | Height: | Size: 24 KiB |
After Width: | Height: | Size: 19 KiB |
After Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 24 KiB |
|
@ -411,13 +411,13 @@ image:images/monster-flesh-worm.png[Flesh Worm,100,100]
|
||||||
These flesh worm variants have been given stealth abilities which make them
|
These flesh worm variants have been given stealth abilities which make them
|
||||||
practically invisible. |
|
practically invisible. |
|
||||||
image:images/monster-stealth-worm.png[Stealth Worm,100,100]
|
image:images/monster-stealth-worm.png[Stealth Worm,100,100]
|
||||||
| **Deadflare** |
|
| **Hatchling** |
|
||||||
Floating skulls which charge from a distance. |
|
Floating alien larvae which charge from a distance. |
|
||||||
image:images/monster-deadflare.png[Deadflare,100,100]
|
image:images/monster-hatchling.png[hatchling,100,100]
|
||||||
| **Summoner** |
|
| **Matribite** |
|
||||||
These mobile Deadflare production factories will ensure you always have more
|
The mother of the Hatchlings will ensure you always have more of her babies
|
||||||
work to do. |
|
to deal with. |
|
||||||
image:images/monster-summoner.png[Summoner,100,100]
|
image:images/monster-matribite.png[matribite,100,100]
|
||||||
| **Trilobite** |
|
| **Trilobite** |
|
||||||
These flying orb-like creatures spit fireballs and bite if you get too
|
These flying orb-like creatures spit fireballs and bite if you get too
|
||||||
close. |
|
close. |
|
||||||
|
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 8.1 KiB |
Before Width: | Height: | Size: 753 B After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.6 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.0 KiB |
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |
BIN
patches/sky3.png
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.8 KiB |