Merge branch 'freedoom:master' into Illost-AGM-CEO

CREDITS

@@ -1053,6 +1053,10 @@ D: lumps
 S: Devalaous
 D: umapinfo template
 
+N: José Miguel Muñoz
+S: megustanlosfrijoles
+D: Spanish translation
+
 S: WishedTomato200
 S: quarry24
 D: patches

CREDITS-MUSIC

@@ -6,14 +6,14 @@ Victory: "Distance" by Korp
 Bunny: "Impactean Welcome Party" by Goji
 
 Episode 1 - Outpost Outbreak
-	E1M1: "Stanky Leg Specialist" by Lola "BlueWorrior" Harvey
+	E1M1: "Steel and Brass" by J.Astartes and Mr795
 	E1M2: "Look At Me I'm Underhalls Too" by Mark "TheMisterCat" McGill-Smith
 	E1M3: "Alone with Colors" by Kevin "Velvetic" Martins & Jonathan "julnen" Martins
 		E1M9: "Hidden Between Spades" by Korp, remix of dave3d42.mid by jute
 	E1M4: "Flood the City" by Kevin "Velvetic" Martins & Jonathan "julnen" Martins
 	E1M5: e1m1.mid by Ralph "Ralphis" Vickers
 	E1M6: "Oxidine" by Korp, remix of dave3d35.mid by jute
-	E1M7: "Totally Surrounded" by Josephus "DH4050" Astartes
+	E1M7: "Totally Surrounded" by J.Astartes
 	E1M8: "On the Next Day" by Kevin "Velvetic" Martins
 
 Episode 2 - Ruin Upon Ruin
@@ -80,7 +80,7 @@ Cluster 2
 	MAP17: "Mow Them Down!" by Lola "BlueWorrior" Harvey
 	MAP18: "Realistic Approach" by Kevin "Velvetic" Martins
 	MAP19: "Deceit" by Julian "Julian Hope" Aubourg, modified by m
-	MAP20: "Wrath of Horizon" by Josephus "J.Astartes" Astartes
+	MAP20: "Wrath of Horizon" by J.Astartes
 
 Cluster 3
 	MAP21: "Rough Landing" by Korp, remix of dave3d08.mid by jute
@@ -129,7 +129,7 @@ Story: "Geoff's Vinyl Collection" by MoonDeLaAxel, remix of "Why?" by Joshua "wa
 	DM24: "Constructive Criticism" by Matias "jupiter_ex" Roldan
 
 	DM25: "Shoot 'em All" by rostuhan
-	DM26: "World of Pain" by Josephus "DH4050" Astartes
+	DM26: "World of Pain" by J.Astartes
 	DM27: "White Lights" by Kevin "Velvetic" Martins and Jonathan "julnen" Martins
 	DM28: "Bobby Sent Me" by Ralph "Ralphis" Vickers
 	DM29: "SevenFour" by Ralph "Ralphis" Vickers
@@ -140,6 +140,8 @@ Story: "Geoff's Vinyl Collection" by MoonDeLaAxel, remix of "Why?" by Joshua "wa
 
 --Previously Featured in 0.13.0--
 
+E1M1: "Stanky Leg Specialist" by Lola "Blueworrior" Harvey
+
 E1M5: "The Raging Sun" by Kevin "Velvetic" Martins & Jonathan "julnen" Martins, modified by Goji
 
 MAP07: "Fun is Infinite at AGM" by continuum.mid

buildcfg.txt

@@ -146,6 +146,10 @@ FREEDOOM
 ; Big font used by ZDoom-based ports for menu text.
 DBIGFONT
 
+; Language used by ZDoom-based ports for string replacement
+; and internationalization.
+LANGUAGE
+
 #ifdef FREEDM
 DEHACKED = fdm_deh
 UMAPINFO = fdmuminf
@@ -871,6 +875,8 @@ M_VIDEO		0	1
 M_WAD		0	1
 M_WADOPT	0	1
 M_CRISPY	0	1
+M_LVLTBL	0	1
+M_CSTSKL	0	1
 
 BRDR_TL	-5	-5
 BRDR_T	0	-5
@@ -2465,9 +2471,9 @@ COL4A0 18 40
 COL5A0 18 53
 COL5B0 18 53
 COL6A0 18 49
-FCANA0	12	62
-FCANB0	12	62
-FCANC0	12	62
+FCANA0	12	57
+FCANB0	12	57
+FCANC0	12	57
 FSKUA0 17 47
 FSKUB0 17 47
 FSKUC0 17 47

graphics/text/Makefile

@@ -7,7 +7,7 @@ TEXTGEN_GRAPHIC_LUMPS = \
   m_gdlow.png  m_hurt.png   m_jkill.png  m_lgttl.png  m_loadg.png  \
   m_messg.png  m_msens.png  m_msgoff.png m_msgon.png  m_musvol.png \
   m_newg.png   m_ngame.png  m_nmare.png  m_option.png m_optttl.png \
-  m_quitg.png  m_rdthis.png m_rough.png  m_saveg.png  \
+  m_quitg.png  m_rdthis.png m_rough.png  m_saveg.png               \
   m_scrnsz.png m_sfxvol.png m_sgttl.png  m_skill.png  m_svol.png   \
   m_about.png  m_accel.png  m_auto.png   m_chat.png   m_chatm.png  \
   m_compat.png m_demos.png  m_dmflag.png m_enem.png   m_etcopt.png \
@@ -16,7 +16,7 @@ TEXTGEN_GRAPHIC_LUMPS = \
   m_mess.png   m_mouse.png  m_multi.png  m_player.png m_serial.png \
   m_setup.png  m_sound.png  m_stat.png   m_status.png m_tcpip.png  \
   m_versen.png m_video.png  m_wad.png    m_wadopt.png m_weap.png   \
-  m_crispy.png                                                     \
+  m_crispy.png m_lvltbl.png m_cstskl.png                           \
   prboom.png   t_phase1.png t_phase2.png                           \
   m_ultra.png  wibp1.png    wibp2.png    wibp3.png    wibp4.png    \
   wicolon.png  wienter.png  wif.png      wifrgs.png   wipcnt.png   \

graphics/text/config.py

@@ -236,6 +236,10 @@ red_graphics = {
     "m_multi": "Multiplayer",
     # Crispy Doom's Crispness menu:
     "m_crispy": "Crispness",
+    # DSDA's Level Table
+    "m_lvltbl": "Level Table",
+    # Nugget's Custom Skill
+    "m_cstskl": "Custom Skill...",
 }
 
 

lumps/dehacked/dehacked.txt

@@ -238,7 +238,7 @@ PD_YELLOWS = Yellow skeleton key needed for this door.
 PD_ANY = Any key will open this door.
 PD_ALL3 = This door requires all three keys.
 PD_ALL6 = This door requires all six keys!
-HUSTR_E1M1 = E1M1: Outer Prison
+HUSTR_E1M1 = E1M1: Filtration System
 HUSTR_E1M2 = E1M2: Communications Center
 HUSTR_E1M3 = E1M3: Waste Disposal
 HUSTR_E1M4 = E1M4: Supply Depot

lumps/p1_uminf.lmp

@@ -4,16 +4,16 @@
 
 map E1M1
 {
-	LevelName = "Outer Prison"
+	LevelName = "Filtration System"
 	LevelPic = "WILV00"
 	Label = "E1M1"
 	Next = "E1M2"
 	Music = "D_E1M1"
 	SkyTexture = "SKY1"
-	ParTime = 30
+	ParTime = 90
 	Episode = clear
 	Episode = "M_EPI1", "Outpost Outbreak", "1"
-	Author = "YukiHerz"
+	Author = "Charli Reef"
 }
 
 map E1M2

lumps/textures/textures.cfg

@@ -3217,8 +3217,12 @@ AQMETL03                128     128
 *       AQMETL03        0       0
 AQMETL04                128     128
 *       AQMETL04        0       0
+*	AQTRIM05	0	112
+*	AQTRIM05	0	120
 AQMETL05                128     128
-*       AQMETL05        0       0
+*       AQMETL06        0       0
+*	AQTRIM05	0	112
+*	AQTRIM05	0	120
 AQMETL06                128     128
 *       AQMETL06        0       0
 AQMETL07                64      128
@@ -3269,13 +3273,15 @@ AQMETL26                64      128
 AQMETL27                64      128
 *       AQMETL27        0       0
 AQMETL28                64      128
-*       AQMETL28        0       0
-*       AQMETL28        0       64
+*	PDUMMY		0	0
+*       AQMETL29        0       0
+*       AQMETL29        0       64
 AQMETL29                64      64
 *       AQMETL29        0       0
 AQMETL30                64      128
-*       AQMETL30        0       0
-*       AQMETL30        0       64
+*	PDUMMY		0	0
+*       AQMETL31        0       0
+*       AQMETL31        0       64
 AQMETL31                64      64
 *       AQMETL31        0       0
 AQMETL32                64      128
@@ -3289,9 +3295,12 @@ AQPANL01                128     128
 AQPANL02                128     128
 *       AQPANL02        0       0
 AQPANL03                128     128
-*       AQPANL03        0       0
+*       AQPANL02        0       0
+*	AQPANL03	0	0
+*	AQPANL06	0	64
 AQPANL04                128     128
-*       AQPANL04        0       0
+*       AQPANL02        0       0
+*	AQPANL07	0	64
 AQPANL05                128     128
 *       AQPANL05        0       0
 *       AQPANL05        0       64
@@ -3476,37 +3485,73 @@ AQBRIK03                64      128
 *       AQBRIK03        0       0
 *       AQBRIK03        0       64
 AQSECT01                128     128
-*       AQSECT01        0       0
+*	AQPIPE13	0	0
+*       AQSECT01        0       32
+*       AQSECT01        64      32
+*	AQTRIM05	0	120
 AQSECT02                64      128
 *       AQSECT02        0       0
 AQSECT03                64      128
 *       AQSECT03        0       0
 AQSECT04                128     128
-*       AQSECT04        0       0
+*	AQPIPE13	0	0
+*       AQSECT04        0       32
+*       AQSECT04        64      32
+*	AQTRIM05	0	120
 AQSECT05                128     128
-*       AQSECT05        0       0
+*	AQPIPE13	0	0
+*       AQSECT05        0       32
+*       AQSECT05        64      32
+*	AQTRIM05	0	120
 AQSECT06                64      128
 *       AQSECT06        0       0
 AQSECT07                64      128
 *       AQSECT07        0       0
 AQSECT08                128     128
-*       AQSECT08        0       0
+*	AQCONC13	0	0
+*       AQSECT04        0       32
+*       AQSECT04        64      32
+*	AQTRIM05	0	120
 AQSECT09                128     128
-*       AQSECT09        0       0
+*	AQCONC13	0	0
+*       AQSECT05        0       32
+*       AQSECT05        64      32
+*	AQTRIM05	0	120
 AQSECT10                128     128
-*       AQSECT10        0       0
+*	AQCONC13	0	0
+*       AQSECT01        0       32
+*       AQSECT01        64      32
+*	AQTRIM05	0	120
 AQSECT11                128     128
-*       AQSECT11        0       0
+*	AQCONC14	0	0
+*       AQSECT04        0       32
+*       AQSECT04        64      32
+*	AQTRIM05	0	120
 AQSECT12                128     128
-*       AQSECT12        0       0
+*	AQCONC14	0	0
+*       AQSECT05        0       32
+*       AQSECT05        64      32
+*	AQTRIM05	0	120
 AQSECT13                128     128
-*       AQSECT13        0       0
+*	AQCONC14	0	0
+*       AQSECT01        0       32
+*       AQSECT01        64      32
+*	AQTRIM05	0	120
 AQSECT14                128     128
-*       AQSECT14        0       0
+*	AQCONC15	0	0
+*       AQSECT04        0       32
+*       AQSECT04        64      32
+*	AQTRIM05	0	120
 AQSECT15                128     128
-*       AQSECT15        0       0
+*	AQCONC15	0	0
+*       AQSECT05        0       32
+*       AQSECT05        64      32
+*	AQTRIM05	0	120
 AQSECT16                128     128
-*       AQSECT16        0       0
+*	AQCONC15	0	0
+*       AQSECT01        0       32
+*       AQSECT01        64      32
+*	AQTRIM05	0	120
 AQCOMP01                256     128
 *       AQCOMP01        0       0
 AQTILE01                64      128