- Freedoom: Phase 1 contains four chapters, nine levels each, to + Freedoom: Phase 1 contains four episodes, nine levels each, to provide a smoothly-paced first person action game. In it is a wide variety of mazes and enemies to fight and challenge your reflexes. diff --git a/dist/io.github.freedoom.Phase2.desktop b/dist/io.github.freedoom.Phase2.desktop index 93ed6db4..ff1167de 100644 --- a/dist/io.github.freedoom.Phase2.desktop +++ b/dist/io.github.freedoom.Phase2.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Phase 2 Name[he]=מופע 2 -Comment=Battle monsters in one massive 32-level chapter +Comment=Battle monsters in one massive 32-level episode Comment[he]=הילחם במפלצות בפרק אדיר אחד בעל 32 שלבים GenericName=First Person Shooter Game GenericName[he]=משחק יריות בגוף ראשון diff --git a/graphics/text/config.py b/graphics/text/config.py index 719993b0..cb5f9255 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -88,7 +88,7 @@ white_graphics = { blue_graphics = { "m_disopt": "DISPLAY OPTIONS", - "m_episod": "Choose Chapter:", + "m_episod": "Choose Episode:", "m_optttl": "OPTIONS", "m_skill": "Choose Skill Level:", } diff --git a/levels/README b/levels/README index 1c4d1301..05f93942 100644 --- a/levels/README +++ b/levels/README @@ -1,7 +1,7 @@ This directory contains the game levels. The files are named by the IWAD into which they are included: - * cXmY.wad - Freedoom: Phase 1 + * eXmY.wad - Freedoom: Phase 1 * mapXY.wad - Freedoom: Phase 2 * dmXY.wad - FreeDM diff --git a/levels/c1m1.wad b/levels/e1m1.wad similarity index 100% rename from levels/c1m1.wad rename to levels/e1m1.wad diff --git a/levels/c1m2.wad b/levels/e1m2.wad similarity index 100% rename from levels/c1m2.wad rename to levels/e1m2.wad diff --git a/levels/c1m3.wad b/levels/e1m3.wad similarity index 100% rename from levels/c1m3.wad rename to levels/e1m3.wad diff --git a/levels/c1m4.wad b/levels/e1m4.wad similarity index 100% rename from levels/c1m4.wad rename to levels/e1m4.wad diff --git a/levels/c1m5.wad b/levels/e1m5.wad similarity index 100% rename from levels/c1m5.wad rename to levels/e1m5.wad diff --git a/levels/c1m6.wad b/levels/e1m6.wad similarity index 100% rename from levels/c1m6.wad rename to levels/e1m6.wad diff --git a/levels/c1m7.wad b/levels/e1m7.wad similarity index 100% rename from levels/c1m7.wad rename to levels/e1m7.wad diff --git a/levels/c1m8.wad b/levels/e1m8.wad similarity index 100% rename from levels/c1m8.wad rename to levels/e1m8.wad diff --git a/levels/c1m9.wad b/levels/e1m9.wad similarity index 100% rename from levels/c1m9.wad rename to levels/e1m9.wad diff --git a/levels/c2m1.wad b/levels/e2m1.wad similarity index 100% rename from levels/c2m1.wad rename to levels/e2m1.wad diff --git a/levels/c2m2.wad b/levels/e2m2.wad similarity index 100% rename from levels/c2m2.wad rename to levels/e2m2.wad diff --git a/levels/c2m3.wad b/levels/e2m3.wad similarity index 100% rename from levels/c2m3.wad rename to levels/e2m3.wad diff --git a/levels/c2m4.wad b/levels/e2m4.wad similarity index 100% rename from levels/c2m4.wad rename to levels/e2m4.wad diff --git a/levels/c2m5.wad b/levels/e2m5.wad similarity index 100% rename from levels/c2m5.wad rename to levels/e2m5.wad diff --git a/levels/c2m6.wad b/levels/e2m6.wad similarity index 100% rename from levels/c2m6.wad rename to levels/e2m6.wad diff --git a/levels/c2m7.wad b/levels/e2m7.wad similarity index 100% rename from levels/c2m7.wad rename to levels/e2m7.wad diff --git a/levels/c2m8.wad b/levels/e2m8.wad similarity index 100% rename from levels/c2m8.wad rename to levels/e2m8.wad diff --git a/levels/c2m9.wad b/levels/e2m9.wad similarity index 100% rename from levels/c2m9.wad rename to levels/e2m9.wad diff --git a/levels/c3m1.wad b/levels/e3m1.wad similarity index 100% rename from levels/c3m1.wad rename to levels/e3m1.wad diff --git a/levels/c3m2.wad b/levels/e3m2.wad similarity index 100% rename from levels/c3m2.wad rename to levels/e3m2.wad diff --git a/levels/c3m3.wad b/levels/e3m3.wad similarity index 100% rename from levels/c3m3.wad rename to levels/e3m3.wad diff --git a/levels/c3m4.wad b/levels/e3m4.wad similarity index 100% rename from levels/c3m4.wad rename to levels/e3m4.wad diff --git a/levels/c3m5.wad b/levels/e3m5.wad similarity index 100% rename from levels/c3m5.wad rename to levels/e3m5.wad diff --git a/levels/c3m6.wad b/levels/e3m6.wad similarity index 100% rename from levels/c3m6.wad rename to levels/e3m6.wad diff --git a/levels/c3m7.wad b/levels/e3m7.wad similarity index 100% rename from levels/c3m7.wad rename to levels/e3m7.wad diff --git a/levels/c3m8.wad b/levels/e3m8.wad similarity index 100% rename from levels/c3m8.wad rename to levels/e3m8.wad diff --git a/levels/c3m9.wad b/levels/e3m9.wad similarity index 100% rename from levels/c3m9.wad rename to levels/e3m9.wad diff --git a/levels/c4m1.wad b/levels/e4m1.wad similarity index 100% rename from levels/c4m1.wad rename to levels/e4m1.wad diff --git a/levels/c4m2.wad b/levels/e4m2.wad similarity index 100% rename from levels/c4m2.wad rename to levels/e4m2.wad diff --git a/levels/c4m3.wad b/levels/e4m3.wad similarity index 100% rename from levels/c4m3.wad rename to levels/e4m3.wad diff --git a/levels/c4m4.wad b/levels/e4m4.wad similarity index 100% rename from levels/c4m4.wad rename to levels/e4m4.wad diff --git a/levels/c4m5.wad b/levels/e4m5.wad similarity index 100% rename from levels/c4m5.wad rename to levels/e4m5.wad diff --git a/levels/c4m6.wad b/levels/e4m6.wad similarity index 100% rename from levels/c4m6.wad rename to levels/e4m6.wad diff --git a/levels/c4m7.wad b/levels/e4m7.wad similarity index 100% rename from levels/c4m7.wad rename to levels/e4m7.wad diff --git a/levels/c4m8.wad b/levels/e4m8.wad similarity index 100% rename from levels/c4m8.wad rename to levels/e4m8.wad diff --git a/levels/c4m9.wad b/levels/e4m9.wad similarity index 100% rename from levels/c4m9.wad rename to levels/e4m9.wad diff --git a/lumps/dehacked/dehacked.txt b/lumps/dehacked/dehacked.txt index 266728b6..a76b0986 100644 --- a/lumps/dehacked/dehacked.txt +++ b/lumps/dehacked/dehacked.txt @@ -202,42 +202,42 @@ PD_YELLOWS = This door requires the yellow skeleton key. PD_ANY = This door requires any key. PD_ALL3 = This door requires all three keys. PD_ALL6 = This door requires all six keys! -HUSTR_E1M1 = C1M1: Outer Prison -HUSTR_E1M2 = C1M2: Communications Center -HUSTR_E1M3 = C1M3: Waste Disposal -HUSTR_E1M4 = C1M4: Supply Depot -HUSTR_E1M5 = C1M5: Main Control -HUSTR_E1M6 = C1M6: Training Facility -HUSTR_E1M7 = C1M7: Transportation Bay -HUSTR_E1M8 = C1M8: Outpost Quarry -HUSTR_E1M9 = C1M9: Armory -HUSTR_E2M1 = C2M1: Ruins -HUSTR_E2M2 = C2M2: Power Plant -HUSTR_E2M3 = C2M3: Archaelogy Site -HUSTR_E2M4 = C2M4: Sample Holding Site -HUSTR_E2M5 = C2M5: Fortress 31 -HUSTR_E2M6 = C2M6: Trepidation Site -HUSTR_E2M7 = C2M7: Quarantine Vessel -HUSTR_E2M8 = C2M8: Containment Cell -HUSTR_E2M9 = C2M9: Corruption of Man -HUSTR_E3M1 = C3M1: Land of the Lost -HUSTR_E3M2 = C3M2: Infernal Caverns -HUSTR_E3M3 = C3M3: Derelict Temple -HUSTR_E3M4 = C3M4: Sacrificial Bastion -HUSTR_E3M5 = C3M5: Oblation Temple -HUSTR_E3M6 = C3M6: Igneous Intrusion -HUSTR_E3M7 = C3M7: No Regrets -HUSTR_E3M8 = C3M8: Ancient Lair -HUSTR_E3M9 = C3M9: Acquainted With Grief -HUSTR_E4M1 = C4M1: Maintenance Area -HUSTR_E4M2 = C4M2: Research Complex -HUSTR_E4M3 = C4M3: Central Computing -HUSTR_E4M4 = C4M4: Hydroponic Facility -HUSTR_E4M5 = C4M5: Engineering Station -HUSTR_E4M6 = C4M6: Command Center -HUSTR_E4M7 = C4M7: Waste Treatment -HUSTR_E4M8 = C4M8: Launch Bay -HUSTR_E4M9 = C4M9: Operations +HUSTR_E1M1 = E1M1: Outer Prison +HUSTR_E1M2 = E1M2: Communications Center +HUSTR_E1M3 = E1M3: Waste Disposal +HUSTR_E1M4 = E1M4: Supply Depot +HUSTR_E1M5 = E1M5: Main Control +HUSTR_E1M6 = E1M6: Training Facility +HUSTR_E1M7 = E1M7: Transportation Bay +HUSTR_E1M8 = E1M8: Outpost Quarry +HUSTR_E1M9 = E1M9: Armory +HUSTR_E2M1 = E2M1: Ruins +HUSTR_E2M2 = E2M2: Power Plant +HUSTR_E2M3 = E2M3: Archaelogy Site +HUSTR_E2M4 = E2M4: Sample Holding Site +HUSTR_E2M5 = E2M5: Fortress 31 +HUSTR_E2M6 = E2M6: Trepidation Site +HUSTR_E2M7 = E2M7: Quarantine Vessel +HUSTR_E2M8 = E2M8: Containment Cell +HUSTR_E2M9 = E2M9: Corruption of Man +HUSTR_E3M1 = E3M1: Land of the Lost +HUSTR_E3M2 = E3M2: Infernal Caverns +HUSTR_E3M3 = E3M3: Derelict Temple +HUSTR_E3M4 = E3M4: Sacrificial Bastion +HUSTR_E3M5 = E3M5: Oblation Temple +HUSTR_E3M6 = E3M6: Igneous Intrusion +HUSTR_E3M7 = E3M7: No Regrets +HUSTR_E3M8 = E3M8: Ancient Lair +HUSTR_E3M9 = E3M9: Acquainted With Grief +HUSTR_E4M1 = E4M1: Maintenance Area +HUSTR_E4M2 = E4M2: Research Complex +HUSTR_E4M3 = E4M3: Central Computing +HUSTR_E4M4 = E4M4: Hydroponic Facility +HUSTR_E4M5 = E4M5: Engineering Station +HUSTR_E4M6 = E4M6: Command Center +HUSTR_E4M7 = E4M7: Waste Treatment +HUSTR_E4M8 = E4M8: Launch Bay +HUSTR_E4M9 = E4M9: Operations CC_ZOMBIE = zombie CC_SHOTGUN = shotgun zombie CC_HEAVY = minigun zombie @@ -410,7 +410,7 @@ STSTR_BEHOLD = v=invuln, s=steroids, i=invis, r=hazard, a=map, l=night vision NIGHTMARE = This is the highest skill level.\n\ Not recommended unless you're experienced.\n\n\ (Press Y to confirm) -# End-of-chapter texts, now with a consistent story. Feel free to edit them. +# End-of-episode texts, now with a consistent story. Feel free to edit them. E1TEXT = You've made it out of the outpost.\n\ But you're still stuck on this rock.\n\ AGM sure has been busy with their\n\ diff --git a/manual/images/menu-chapter.png b/manual/images/menu-episode.png similarity index 100% rename from manual/images/menu-chapter.png rename to manual/images/menu-episode.png diff --git a/manual/manual.adoc b/manual/manual.adoc index 7831d0ef..fbe6edc8 100644 --- a/manual/manual.adoc +++ b/manual/manual.adoc @@ -35,7 +35,7 @@ following: Freedoom is split into _Freedoom: Phase 1_ (`freedoom1.wad`) and _Freedoom: Phase 2_ (`freedoom2.wad`). _Phase 1_ is split into four separate -chapters of eight levels each, while _Phase 2_ is a single, 30 level campaign. +episodes of eight levels each, while _Phase 2_ is a single, 30 level campaign. This gives 62 levels to play through, and there are also secret levels -- if you can discover how to reach them. @@ -70,19 +70,19 @@ items you’ll encounter in the game. To start a new game, press _Esc_ to bring up the main menu, and choose _New Game_. -When starting a new game, you may be prompted to choose which chapter to +When starting a new game, you may be prompted to choose which episode to start playing. -image::images/menu-chapter.png[Freedoom Chapter Menu,align="center",width=432,pdfwidth=50vw] +image::images/menu-episode.png[Freedoom Episode Menu,align="center",width=432,pdfwidth=50vw] If you’re new to the game, start with _Outpost Outbreak_, the first -chapter (and easiest). Once you finish one chapter, you can move on to -the next. If you’re bored with the chapter you’re playing or stuck, you -can always try playing a different chapter instead. There’s no requirement -to play chapters in order. +episode (and easiest). Once you finish one episode, you can move on to +the next. If you’re bored with the episode you’re playing or stuck, you +can always try playing a different episode instead. There’s no requirement +to play episodes in order. [[skill]] -After choosing a chapter, you need to pick a skill level. Skill level +After choosing a episode, you need to pick a skill level. Skill level affects several factors in the game, most importantly the number of monsters you’ll encounter. diff --git a/musics/README b/musics/README index 50168c9d..4005a72d 100644 --- a/musics/README +++ b/musics/README @@ -2,7 +2,7 @@ This directory contains the background music heard during play. In general, most files are per-level music files: - * d_eXmY.mid - Freedoom: Phase 1 music for cXmY. + * d_eXmY.mid - Freedoom: Phase 1 music for eXmY. * d_mapXY.mid - Freedoom: Phase 2 music for mapXY. * d_dmXY.mid - FreeDM music for level XY. @@ -10,7 +10,7 @@ There are a few other MIDI files: * d_intro.mid / d_introa.mid - Freedoom: Phase 1 title music * d_inter.mid - Freedoom: Phase 1 intermission music - * d_bunny.mid - Freedoom: Phase 1 Chapter 3 end music + * d_bunny.mid - Freedoom: Phase 1 Episode 3 end music * d_victor.mid - Freedoom: Phase 1 victory screen music * d_dm2ttl.mid - Freedoom: Phase 2 / FreeDM title music diff --git a/musics/d_c1m1.mid b/musics/d_e1m1.mid similarity index 100% rename from musics/d_c1m1.mid rename to musics/d_e1m1.mid diff --git a/musics/d_c1m2.mid b/musics/d_e1m2.mid similarity index 100% rename from musics/d_c1m2.mid rename to musics/d_e1m2.mid diff --git a/musics/d_c1m3.mid b/musics/d_e1m3.mid similarity index 100% rename from musics/d_c1m3.mid rename to musics/d_e1m3.mid diff --git a/musics/d_c1m4.mid b/musics/d_e1m4.mid similarity index 100% rename from musics/d_c1m4.mid rename to musics/d_e1m4.mid diff --git a/musics/d_c1m5.mid b/musics/d_e1m5.mid similarity index 100% rename from musics/d_c1m5.mid rename to musics/d_e1m5.mid diff --git a/musics/d_c1m6.mid b/musics/d_e1m6.mid similarity index 100% rename from musics/d_c1m6.mid rename to musics/d_e1m6.mid diff --git a/musics/d_c1m7.mid b/musics/d_e1m7.mid similarity index 100% rename from musics/d_c1m7.mid rename to musics/d_e1m7.mid diff --git a/musics/d_c1m8.mid b/musics/d_e1m8.mid similarity index 100% rename from musics/d_c1m8.mid rename to musics/d_e1m8.mid diff --git a/musics/d_c1m9.mid b/musics/d_e1m9.mid similarity index 100% rename from musics/d_c1m9.mid rename to musics/d_e1m9.mid diff --git a/musics/d_c2m1.mid b/musics/d_e2m1.mid similarity index 100% rename from musics/d_c2m1.mid rename to musics/d_e2m1.mid diff --git a/musics/d_c2m2.mid b/musics/d_e2m2.mid similarity index 100% rename from musics/d_c2m2.mid rename to musics/d_e2m2.mid diff --git a/musics/d_c2m3.mid b/musics/d_e2m3.mid similarity index 100% rename from musics/d_c2m3.mid rename to musics/d_e2m3.mid diff --git a/musics/d_c2m4.mid b/musics/d_e2m4.mid similarity index 100% rename from musics/d_c2m4.mid rename to musics/d_e2m4.mid diff --git a/musics/d_c2m5.mid b/musics/d_e2m5.mid similarity index 100% rename from musics/d_c2m5.mid rename to musics/d_e2m5.mid diff --git a/musics/d_c2m6.mid b/musics/d_e2m6.mid similarity index 100% rename from musics/d_c2m6.mid rename to musics/d_e2m6.mid diff --git a/musics/d_c2m7.mid b/musics/d_e2m7.mid similarity index 100% rename from musics/d_c2m7.mid rename to musics/d_e2m7.mid diff --git a/musics/d_c2m8.mid b/musics/d_e2m8.mid similarity index 100% rename from musics/d_c2m8.mid rename to musics/d_e2m8.mid diff --git a/musics/d_c2m9.mid b/musics/d_e2m9.mid similarity index 100% rename from musics/d_c2m9.mid rename to musics/d_e2m9.mid diff --git a/musics/d_c3m1.mid b/musics/d_e3m1.mid similarity index 100% rename from musics/d_c3m1.mid rename to musics/d_e3m1.mid diff --git a/musics/d_c3m2.mid b/musics/d_e3m2.mid similarity index 100% rename from musics/d_c3m2.mid rename to musics/d_e3m2.mid diff --git a/musics/d_c3m3.mid b/musics/d_e3m3.mid similarity index 100% rename from musics/d_c3m3.mid rename to musics/d_e3m3.mid diff --git a/musics/d_c3m4.mid b/musics/d_e3m4.mid similarity index 100% rename from musics/d_c3m4.mid rename to musics/d_e3m4.mid diff --git a/musics/d_c3m5.mid b/musics/d_e3m5.mid similarity index 100% rename from musics/d_c3m5.mid rename to musics/d_e3m5.mid diff --git a/musics/d_c3m6.mid b/musics/d_e3m6.mid similarity index 100% rename from musics/d_c3m6.mid rename to musics/d_e3m6.mid diff --git a/musics/d_c3m7.mid b/musics/d_e3m7.mid similarity index 100% rename from musics/d_c3m7.mid rename to musics/d_e3m7.mid diff --git a/musics/d_c3m8.mid b/musics/d_e3m8.mid similarity index 100% rename from musics/d_c3m8.mid rename to musics/d_e3m8.mid diff --git a/musics/d_c3m9.mid b/musics/d_e3m9.mid similarity index 100% rename from musics/d_c3m9.mid rename to musics/d_e3m9.mid