Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed jDoom/jHeretic: Moved the definitions for which music track t…
…o play on each map into the external (default) Map Info definitions.

Changed jDoom: Removed hardcoded limit on track numbers playable via the IDMUS cheat. Now all music tracks can be played, even ones added by addons.
  • Loading branch information
danij committed Dec 5, 2008
1 parent 88c0641 commit 7dbed68
Show file tree
Hide file tree
Showing 18 changed files with 970 additions and 1,353 deletions.
77 changes: 6 additions & 71 deletions doomsday/plugins/jdoom/defs/audio.ded
Expand Up @@ -2,77 +2,12 @@

Header { Version = 5; }

#####====--- MUSIC ---====#####

Music { ID = "None"; }
Music { ID = "e1m1"; Lump = "D_E1M1"; }
Music { ID = "e1m2"; Lump = "D_E1M2"; }
Music { ID = "e1m3"; Lump = "D_E1M3"; }
Music { ID = "e1m4"; Lump = "D_E1M4"; }
Music { ID = "e1m5"; Lump = "D_E1M5"; }
Music { ID = "e1m6"; Lump = "D_E1M6"; }
Music { ID = "e1m7"; Lump = "D_E1M7"; }
Music { ID = "e1m8"; Lump = "D_E1M8"; }
Music { ID = "e1m9"; Lump = "D_E1M9"; }
Music { ID = "e2m1"; Lump = "D_E2M1"; }
Music { ID = "e2m2"; Lump = "D_E2M2"; }
Music { ID = "e2m3"; Lump = "D_E2M3"; }
Music { ID = "e2m4"; Lump = "D_E2M4"; }
Music { ID = "e2m5"; Lump = "D_E2M5"; }
Music { ID = "e2m6"; Lump = "D_E2M6"; }
Music { ID = "e2m7"; Lump = "D_E2M7"; }
Music { ID = "e2m8"; Lump = "D_E2M8"; }
Music { ID = "e2m9"; Lump = "D_E2M9"; }
Music { ID = "e3m1"; Lump = "D_E3M1"; }
Music { ID = "e3m2"; Lump = "D_E3M2"; }
Music { ID = "e3m3"; Lump = "D_E3M3"; }
Music { ID = "e3m4"; Lump = "D_E3M4"; }
Music { ID = "e3m5"; Lump = "D_E3M5"; }
Music { ID = "e3m6"; Lump = "D_E3M6"; }
Music { ID = "e3m7"; Lump = "D_E3M7"; }
Music { ID = "e3m8"; Lump = "D_E3M8"; }
Music { ID = "e3m9"; Lump = "D_E3M9"; }
Music { ID = "inter"; Lump = "D_INTER"; }
Music { ID = "intro"; Lump = "D_INTRO"; }
Music { ID = "bunny"; Lump = "D_BUNNY"; }
Music { ID = "victor"; Lump = "D_VICTOR"; }
Music { ID = "introa"; Lump = "D_INTROA"; }
Music { ID = "runnin"; Lump = "D_RUNNIN"; }
Music { ID = "stalks"; Lump = "D_STALKS"; }
Music { ID = "countd"; Lump = "D_COUNTD"; }
Music { ID = "betwee"; Lump = "D_BETWEE"; }
Music { ID = "doom"; Lump = "D_DOOM"; }
Music { ID = "the_da"; Lump = "D_THE_DA"; }
Music { ID = "shawn"; Lump = "D_SHAWN"; }
Music { ID = "ddtblu"; Lump = "D_DDTBLU"; }
Music { ID = "in_cit"; Lump = "D_IN_CIT"; }
Music { ID = "dead"; Lump = "D_DEAD"; }
Music { ID = "stlks2"; Lump = "D_STLKS2"; }
Music { ID = "theda2"; Lump = "D_THEDA2"; }
Music { ID = "doom2"; Lump = "D_DOOM2"; }
Music { ID = "ddtbl2"; Lump = "D_DDTBL2"; }
Music { ID = "runni2"; Lump = "D_RUNNI2"; }
Music { ID = "dead2"; Lump = "D_DEAD2"; }
Music { ID = "stlks3"; Lump = "D_STLKS3"; }
Music { ID = "romero"; Lump = "D_ROMERO"; }
Music { ID = "shawn2"; Lump = "D_SHAWN2"; }
Music { ID = "messag"; Lump = "D_MESSAG"; }
Music { ID = "count2"; Lump = "D_COUNT2"; }
Music { ID = "ddtbl3"; Lump = "D_DDTBL3"; }
Music { ID = "ampie"; Lump = "D_AMPIE"; }
Music { ID = "theda3"; Lump = "D_THEDA3"; }
Music { ID = "adrian"; Lump = "D_ADRIAN"; }
Music { ID = "messg2"; Lump = "D_MESSG2"; }
Music { ID = "romer2"; Lump = "D_ROMER2"; }
Music { ID = "tense"; Lump = "D_TENSE"; }
Music { ID = "shawn3"; Lump = "D_SHAWN3"; }
Music { ID = "openin"; Lump = "D_OPENIN"; }
Music { ID = "evil"; Lump = "D_EVIL"; }
Music { ID = "ultima"; Lump = "D_ULTIMA"; }
Music { ID = "read_m"; Lump = "D_READ_M"; }
Music { ID = "dm2ttl"; Lump = "D_DM2TTL"; }
Music { ID = "dm2int"; Lump = "D_DM2INT"; }

IncludeIf doom1 "doom1music.ded";
IncludeIf doom1-share "doom1music.ded";
IncludeIf doom1-ultimate "doom1music.ded";
IncludeIf doom2 "doom2music.ded";
IncludeIf doom2-plut "doom2music.ded";
IncludeIf doom2-tnt "doom2music.ded";

#####====--- SOUND EFFECTS ---====#####

Expand Down
297 changes: 297 additions & 0 deletions doomsday/plugins/jdoom/defs/doom1maps.ded
@@ -0,0 +1,297 @@
#
# jDoom: DOOM1 Maps
#

# The default definition, used for any maps without a map info definition.
Map Info {
ID = "*";
Author = "Unknown";
Music = "e1m1";
Gravity = 1;
Sky height = 0.49;
Horizon offset = -0.105;
Sky Layer 1 {
Flags = "slf_enable";
Texture = "SKY1";
};
}

Map Info {
ID = "E1M1";
Name = "E1M1: Hangar";
Author = "id Software";
Music = "e1m1";
Par time = 30;
Gravity = 1;
Sky height = 0.49;
Horizon offset = -0.105;
Sky Layer 1 {
Flags = enable;
Texture = "SKY1";
}
}

Copy Map Info {
ID = "E1M2";
Name = "E1M2: Nuclear Plant";
Music = "e1m2";
Par time = 75;
}

Copy Map Info {
ID = "E1M3";
Name = "E1M3: Toxin Refinery";
Music = "e1m3";
Par time = 120;
}

Copy Map Info {
ID = "E1M4";
Name = "E1M4: Command Control";
Music = "e1m4";
Par time = 90;
}

Copy Map Info {
ID = "E1M5";
Name = "E1M5: Phobos Lab";
Music = "e1m5";
Par time = 165;
}

Copy Map Info {
ID = "E1M6";
Name = "E1M6: Central Processing";
Music = "e1m6";
Par time = 180;
}

Copy Map Info {
ID = "E1M7";
Name = "E1M7: Computer Station";
Music = "e1m7";
Par time = 180;
}

Copy Map Info {
ID = "E1M8";
Name = "E1M8: Phobos Anomaly";
Music = "e1m8";
Par time = 30;
}

Copy Map Info {
ID = "E1M9";
Name = "E1M9: Military Base";
Music = "e1m9";
Par time = 165;
}

# The rest of this file is skipped if DOOM1 Shareware
SkipIf doom1-share

Copy Map Info {
ID = "E2M1";
Name = "E2M1: Deimos Anomaly";
Music = "e2m1";
Par time = 90;
Sky light color { 1.0 0.85 0.85 };
Sky Layer 1 {
Texture = "SKY2";
};
}

Copy Map Info {
ID = "E2M2";
Name = "E2M2: Containment Area";
Music = "e2m2";
Par time = 90;
}

Copy Map Info {
ID = "E2M3";
Name = "E2M3: Refinery";
Music = "e2m3";
Par time = 90;
}

Copy Map Info {
ID = "E2M4";
Name = "E2M4: Deimos Lab";
Music = "e2m4";
Par time = 120;
}

Copy Map Info {
ID = "E2M5";
Name = "E2M5: Command Center";
Music = "e2m5";
Par time = 90;
}

Copy Map Info {
ID = "E2M6";
Name = "E2M6: Halls of the Damned";
Music = "e2m6";
Par time = 360;
}

Copy Map Info {
ID = "E2M7";
Name = "E2M7: Spawning Vats";
Music = "e2m7";
Par time = 240;
}

Copy Map Info {
ID = "E2M8";
Name = "E2M8: Tower of Babel";
Music = "e2m8";
Par time = 30;
}

Copy Map Info {
ID = "E2M9";
Name = "E2M9: Fortress of Mystery";
Music = "e2m9";
Par time = 170;
}

Copy Map Info {
ID = "E3M1";
Name = "E3M1: Hell Keep";
Music = "e3m1";
Par time = 90;
# This is hell, give it a reddish tint.
Sky light color { 1.0 0.7 0.7 };
Sky Layer 1 {
Texture = "SKY3";
};
}

Copy Map Info {
ID = "E3M2";
Name = "E3M2: Slough of Despair";
Music = "e3m2";
Par time = 45;
}

Copy Map Info {
ID = "E3M3";
Name = "E3M3: Pandemonium";
Music = "e3m3";
Par time = 90;
}

Copy Map Info {
ID = "E3M4";
Name = "E3M4: House of Pain";
Music = "e3m4";
Par time = 150;
}

Copy Map Info {
ID = "E3M5";
Name = "E3M5: Unholy Cathedral";
Music = "e3m5";
Par time = 90;
}

Copy Map Info {
ID = "E3M6";
Name = "E3M6: Mt. Erebus";
Music = "e3m6";
Par time = 90;
}

Copy Map Info {
ID = "E3M7";
Name = "E3M7: Limbo";
Music = "e3m7";
Par time = 165;
}

Copy Map Info {
ID = "E3M8";
Name = "E3M8: Dis";
Music = "e3m8";
Par time = 30;
}

Copy Map Info {
ID = "E3M9";
Name = "E3M9: Warrens";
Music = "e3m9";
Par time = 135;
}

# The rest of this file is skipped if not DOOM1 Ultimate.
SkipIf Not doom1-ultimate

Copy Map Info {
ID = "E4M1";
Name = "E4M1: Hell Beneath";
Music = "e3m4";
Par time = 90;
# The sky is orange.
Sky light color { 1.0 0.75 0.6 };
Sky Layer 1 {
Texture = "SKY4";
};
}

Copy Map Info {
ID = "E4M2";
Name = "E4M2: Perfect Hatred";
Music = "e3m2";
Par time = 120;
}

Copy Map Info {
ID = "E4M3";
Name = "E4M3: Sever The Wicked";
Music = "e3m3";
Par time = 120;
}

Copy Map Info {
ID = "E4M4";
Name = "E4M4: Unruly Evil";
Music = "e1m5";
Par time = 90;
}

Copy Map Info {
ID = "E4M5";
Name = "E4M5: They Will Repent";
Music = "e2m7";
Par time = 150;
}

Copy Map Info {
ID = "E4M6";
Name = "E4M6: Against Thee Wickedly";
Music = "e2m4";
Par time = 120;
}

Copy Map Info {
ID = "E4M7";
Name = "E4M7: And Hell Followed";
Music = "e2m6";
Par time = 120;
}

Copy Map Info {
ID = "E4M8";
Name = "E4M8: Unto The Cruel";
Music = "e2m5";
# Doesn't have a par time
}

Copy Map Info {
ID = "E4M9";
Name = "E4M9: Fear";
Music = "e1m9";
Par time = 90;
}

0 comments on commit 7dbed68

Please sign in to comment.