From daf7c6d1e65e507539ab758ae4ecc71169b16937 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 17 Nov 2007 11:39:40 +0000 Subject: [PATCH] enlarge map info dialog; commit map info files for our maps git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2981 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/aggressor.mapinfo | 11 ++++++ data/maps/aneurysm.mapinfo | 11 ++++++ data/maps/basement.mapinfo | 11 ++++++ data/maps/basementctf.mapinfo | 7 ++++ data/maps/bleach.mapinfo | 12 +++++++ data/maps/bloodprison.mapinfo | 9 +++++ data/maps/bluesky.mapinfo | 9 +++++ data/maps/darkzone.mapinfo | 11 ++++++ data/maps/dieselpower.mapinfo | 12 +++++++ data/maps/dismal.mapinfo | 12 +++++++ data/maps/downer.mapinfo | 11 ++++++ data/maps/evilspace.mapinfo | 9 +++++ data/maps/farewell.mapinfo | 11 ++++++ data/maps/final_rage.mapinfo | 11 ++++++ data/maps/reslimed.mapinfo | 11 ++++++ data/maps/ruiner.mapinfo | 11 ++++++ data/maps/runningman.mapinfo | 11 ++++++ data/maps/runningman_1on1remix.mapinfo | 11 ++++++ data/maps/runningmanctf.mapinfo | 13 +++++++ data/maps/silvercity.mapinfo | 13 +++++++ data/maps/skyway.mapinfo | 11 ++++++ data/maps/slimepit.mapinfo | 11 ++++++ data/maps/soylent.mapinfo | 11 ++++++ data/maps/starship.mapinfo | 12 +++++++ data/maps/stormkeep.mapinfo | 11 ++++++ data/maps/strength.mapinfo | 11 ++++++ data/maps/toxic.mapinfo | 11 ++++++ data/maps/warfare.mapinfo | 11 ++++++ .../dialog_multiplayer_create_mapinfo.c | 34 ++++++++++--------- 29 files changed, 324 insertions(+), 16 deletions(-) create mode 100644 data/maps/aggressor.mapinfo create mode 100644 data/maps/aneurysm.mapinfo create mode 100644 data/maps/basement.mapinfo create mode 100644 data/maps/basementctf.mapinfo create mode 100644 data/maps/bleach.mapinfo create mode 100644 data/maps/bloodprison.mapinfo create mode 100644 data/maps/bluesky.mapinfo create mode 100644 data/maps/darkzone.mapinfo create mode 100644 data/maps/dieselpower.mapinfo create mode 100644 data/maps/dismal.mapinfo create mode 100644 data/maps/downer.mapinfo create mode 100644 data/maps/evilspace.mapinfo create mode 100644 data/maps/farewell.mapinfo create mode 100644 data/maps/final_rage.mapinfo create mode 100644 data/maps/reslimed.mapinfo create mode 100644 data/maps/ruiner.mapinfo create mode 100644 data/maps/runningman.mapinfo create mode 100644 data/maps/runningman_1on1remix.mapinfo create mode 100644 data/maps/runningmanctf.mapinfo create mode 100644 data/maps/silvercity.mapinfo create mode 100644 data/maps/skyway.mapinfo create mode 100644 data/maps/slimepit.mapinfo create mode 100644 data/maps/soylent.mapinfo create mode 100644 data/maps/starship.mapinfo create mode 100644 data/maps/stormkeep.mapinfo create mode 100644 data/maps/strength.mapinfo create mode 100644 data/maps/toxic.mapinfo create mode 100644 data/maps/warfare.mapinfo diff --git a/data/maps/aggressor.mapinfo b/data/maps/aggressor.mapinfo new file mode 100644 index 000000000..51b663cc9 --- /dev/null +++ b/data/maps/aggressor.mapinfo @@ -0,0 +1,11 @@ +title Aggressor +description Small map with brutal fast vertical action +author Kevin "Tyrann" Shanahan, Paul Evers +_diameter 2554.305176 +_spawnpoints 7 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/aneurysm.mapinfo b/data/maps/aneurysm.mapinfo new file mode 100644 index 000000000..d0866f462 --- /dev/null +++ b/data/maps/aneurysm.mapinfo @@ -0,0 +1,11 @@ +title Aneurysm +description A multiple arena map with complex flow +author Paul Evers +_diameter 3652.639648 +_spawnpoints 8 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/basement.mapinfo b/data/maps/basement.mapinfo new file mode 100644 index 000000000..166f56157 --- /dev/null +++ b/data/maps/basement.mapinfo @@ -0,0 +1,11 @@ +title Basement +description A small map designed for fast constant gameplay +author Garth Hendy +_diameter 1966.839355 +_spawnpoints 5 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/basementctf.mapinfo b/data/maps/basementctf.mapinfo new file mode 100644 index 000000000..9b57ef977 --- /dev/null +++ b/data/maps/basementctf.mapinfo @@ -0,0 +1,7 @@ +title Basement CTF +description Remake of basement, "The Basement" for CTF +author Clinton "Kaziganthe" Freeman +_diameter 3282.301514 +_spawnpoints 15 +has weapons +type ctf 300 20 diff --git a/data/maps/bleach.mapinfo b/data/maps/bleach.mapinfo new file mode 100644 index 000000000..e4ceb4fcf --- /dev/null +++ b/data/maps/bleach.mapinfo @@ -0,0 +1,12 @@ +title Bleach +description A large multiple arena map +author Paul Evers +_diameter 5181.482910 +_spawnpoints 14 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type kh 1000 20 3 diff --git a/data/maps/bloodprison.mapinfo b/data/maps/bloodprison.mapinfo new file mode 100644 index 000000000..206f4d5ee --- /dev/null +++ b/data/maps/bloodprison.mapinfo @@ -0,0 +1,9 @@ +title Blood Prison +description Small and very fast Tourney Map +author Paul Evers +_diameter 4409.023926 +_spawnpoints 8 +has weapons +type dm 30 20 +type tdm 50 20 2 +type lms 9 20 diff --git a/data/maps/bluesky.mapinfo b/data/maps/bluesky.mapinfo new file mode 100644 index 000000000..970b9f67c --- /dev/null +++ b/data/maps/bluesky.mapinfo @@ -0,0 +1,9 @@ +title Blue Sky +description Small and fun map with a mighty jump +author Strahlemann +_diameter 6058.424805 +_spawnpoints 8 +has weapons +type dm 30 20 +type tdm 50 20 2 +type lms 9 20 diff --git a/data/maps/darkzone.mapinfo b/data/maps/darkzone.mapinfo new file mode 100644 index 000000000..b9a9f8f89 --- /dev/null +++ b/data/maps/darkzone.mapinfo @@ -0,0 +1,11 @@ +title Q1DM6 Remake +description The Dark Zone returns +author Maik Merten +_diameter 3713.385986 +_spawnpoints 6 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/dieselpower.mapinfo b/data/maps/dieselpower.mapinfo new file mode 100644 index 000000000..fd16b2417 --- /dev/null +++ b/data/maps/dieselpower.mapinfo @@ -0,0 +1,12 @@ +title Diesel Power +description A large multiple arena map +author Paul Evers +_diameter 5221.383789 +_spawnpoints 13 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type kh 1000 20 3 diff --git a/data/maps/dismal.mapinfo b/data/maps/dismal.mapinfo new file mode 100644 index 000000000..ff2fa5686 --- /dev/null +++ b/data/maps/dismal.mapinfo @@ -0,0 +1,12 @@ +title Dismal +description Small space map +author HReaper +_diameter 4258.493652 +_spawnpoints 20 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type ctf 300 20 +type rune 200 20 +type lms 9 20 diff --git a/data/maps/downer.mapinfo b/data/maps/downer.mapinfo new file mode 100644 index 000000000..603132b8d --- /dev/null +++ b/data/maps/downer.mapinfo @@ -0,0 +1,11 @@ +title Downer +description A multilevel map +author Eric Sambach, Maik Merten +_diameter 2466.622070 +_spawnpoints 5 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/evilspace.mapinfo b/data/maps/evilspace.mapinfo new file mode 100644 index 000000000..24ebb9e6b --- /dev/null +++ b/data/maps/evilspace.mapinfo @@ -0,0 +1,9 @@ +title [evilspace] +description A dark space map +author Yves Allaire +_diameter 3612.476074 +_spawnpoints 9 +has weapons +type dm 30 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/farewell.mapinfo b/data/maps/farewell.mapinfo new file mode 100644 index 000000000..3715d6898 --- /dev/null +++ b/data/maps/farewell.mapinfo @@ -0,0 +1,11 @@ +title Farewell +description Small and very fast Tourney Map +author Tymo aka Henning Janssen +author_email tymo@gmx.de +author_www http://home.arcor.de/dwalinn/ +_diameter 3425.280029 +_spawnpoints 9 +has weapons +type dm 30 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/final_rage.mapinfo b/data/maps/final_rage.mapinfo new file mode 100644 index 000000000..41f39452b --- /dev/null +++ b/data/maps/final_rage.mapinfo @@ -0,0 +1,11 @@ +title Final rage +description Small map with brutal fast vertical action +author Munyul Verminard and tZork +_diameter 3148.711426 +_spawnpoints 13 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/reslimed.mapinfo b/data/maps/reslimed.mapinfo new file mode 100644 index 000000000..1bfedb5f0 --- /dev/null +++ b/data/maps/reslimed.mapinfo @@ -0,0 +1,11 @@ +title Slimepit Revisited +description An industrial arena with deadly slime +author Paul Evers, Mattrew Rye, Garth Hendy, Maik Merten +_diameter 4519.555664 +_spawnpoints 10 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type rune 200 20 +type lms 9 20 diff --git a/data/maps/ruiner.mapinfo b/data/maps/ruiner.mapinfo new file mode 100644 index 000000000..8d196ca17 --- /dev/null +++ b/data/maps/ruiner.mapinfo @@ -0,0 +1,11 @@ +title RUINER +description Small rusty map +author Strahlemann +_diameter 3795.349365 +_spawnpoints 9 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/runningman.mapinfo b/data/maps/runningman.mapinfo new file mode 100644 index 000000000..5e9e92b14 --- /dev/null +++ b/data/maps/runningman.mapinfo @@ -0,0 +1,11 @@ +title Running Man +description Small DM-Level, best suited for 2 players +author Paul Evers +_diameter 3314.800781 +_spawnpoints 10 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/runningman_1on1remix.mapinfo b/data/maps/runningman_1on1remix.mapinfo new file mode 100644 index 000000000..7b23e08d0 --- /dev/null +++ b/data/maps/runningman_1on1remix.mapinfo @@ -0,0 +1,11 @@ +title Running Man (1on1) +description DM-Level especially designed for 1on1 Matches +author Paul Evers +_diameter 3826.595459 +_spawnpoints 10 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/runningmanctf.mapinfo b/data/maps/runningmanctf.mapinfo new file mode 100644 index 000000000..3ac65c227 --- /dev/null +++ b/data/maps/runningmanctf.mapinfo @@ -0,0 +1,13 @@ +title Running Man CTF +description Medium-sized CTF-Map +author Paul Evers +_diameter 5930.995117 +_spawnpoints 16 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type ctf 300 20 +type rune 200 20 +type lms 9 20 +type kh 1000 20 3 diff --git a/data/maps/silvercity.mapinfo b/data/maps/silvercity.mapinfo new file mode 100644 index 000000000..cc20380a4 --- /dev/null +++ b/data/maps/silvercity.mapinfo @@ -0,0 +1,13 @@ +title Silver City +description A very large very open map +author Forest Hale, Garth Hendy +_diameter 6067.411133 +_spawnpoints 34 +has weapons +type dm 30 20 +type tdm 50 20 2 +type dom 200 20 +type ctf 300 20 +type rune 200 20 +type lms 9 20 +type kh 1000 20 3 diff --git a/data/maps/skyway.mapinfo b/data/maps/skyway.mapinfo new file mode 100644 index 000000000..076981cff --- /dev/null +++ b/data/maps/skyway.mapinfo @@ -0,0 +1,11 @@ +title Skyway +description Vertical arena +author Mattrew Rye, Garth Hendy +_diameter 3072.279541 +_spawnpoints 12 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/slimepit.mapinfo b/data/maps/slimepit.mapinfo new file mode 100644 index 000000000..5d0bb0449 --- /dev/null +++ b/data/maps/slimepit.mapinfo @@ -0,0 +1,11 @@ +title The Slime Pit +description An industrial arena +author Mattrew Rye, Garth Hendy, Maik Merten +_diameter 3227.077881 +_spawnpoints 7 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/soylent.mapinfo b/data/maps/soylent.mapinfo new file mode 100644 index 000000000..13ebc1afa --- /dev/null +++ b/data/maps/soylent.mapinfo @@ -0,0 +1,11 @@ +title Soylent Space +description Medium sized vertical level +author Paul Evers +_diameter 3869.519775 +_spawnpoints 6 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/starship.mapinfo b/data/maps/starship.mapinfo new file mode 100644 index 000000000..98fd3070a --- /dev/null +++ b/data/maps/starship.mapinfo @@ -0,0 +1,12 @@ +title Starship +description A sprawling complex +author Chris Matz +_diameter 3048.152832 +_spawnpoints 27 +has weapons +type dm 30 20 +type dom 200 20 +type ctf 300 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/stormkeep.mapinfo b/data/maps/stormkeep.mapinfo new file mode 100644 index 000000000..c12175768 --- /dev/null +++ b/data/maps/stormkeep.mapinfo @@ -0,0 +1,11 @@ +title Stormkeep +description A large slow paced medieval complex +author William Libert, Maik Merten, Paul Evers +_diameter 3965.079590 +_spawnpoints 8 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/strength.mapinfo b/data/maps/strength.mapinfo new file mode 100644 index 000000000..606a46971 --- /dev/null +++ b/data/maps/strength.mapinfo @@ -0,0 +1,11 @@ +title Strength +description Medium sized industrial arena with a lot vertical action under the hot desert sun +author Strahlemann +_diameter 3377.715088 +_spawnpoints 15 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/toxic.mapinfo b/data/maps/toxic.mapinfo new file mode 100644 index 000000000..d26f56b4c --- /dev/null +++ b/data/maps/toxic.mapinfo @@ -0,0 +1,11 @@ +title Toxic +description Fast competitive map +author morfar +_diameter 3458.378906 +_spawnpoints 10 +has weapons +type dm 30 20 +type dom 200 20 +type rune 200 20 +type lms 9 20 +type arena 10 20 diff --git a/data/maps/warfare.mapinfo b/data/maps/warfare.mapinfo new file mode 100644 index 000000000..4c34beeeb --- /dev/null +++ b/data/maps/warfare.mapinfo @@ -0,0 +1,11 @@ +title Stabilized Warfare: Resurrection +description Medium sized map with a central area +author Tymo +author_email tymo@gmx.de +author_www http://home.arcor.de/dwalinn/ +_diameter 2806.050537 +_spawnpoints 8 +has weapons +type dm 30 20 +type lms 9 20 +type arena 10 20 diff --git a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c index 83ffb1504..ecebb5c01 100644 --- a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c +++ b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c @@ -4,9 +4,9 @@ CLASS(NexuizMapInfoDialog) EXTENDS(NexuizDialog) METHOD(NexuizMapInfoDialog, loadMapInfo, void(entity, float)) ATTRIB(NexuizMapInfoDialog, title, string, "Map Information") ATTRIB(NexuizMapInfoDialog, color, vector, SKINCOLOR_DIALOG_MAPINFO) - ATTRIB(NexuizMapInfoDialog, intendedWidth, float, 0.75) + ATTRIB(NexuizMapInfoDialog, intendedWidth, float, 0.85) ATTRIB(NexuizMapInfoDialog, rows, float, 9) - ATTRIB(NexuizMapInfoDialog, columns, float, 9) + ATTRIB(NexuizMapInfoDialog, columns, float, 10) ATTRIB(NexuizMapInfoDialog, previewImage, entity, NULL) ATTRIB(NexuizMapInfoDialog, titleLabel, entity, NULL) @@ -79,53 +79,55 @@ void loadMapInfoNexuizMapInfoDialog(entity me, float i) void fillNexuizMapInfoDialog(entity me) { entity e; + float w; me.TR(me); me.TD(me, me.rows - 2, 3, e = makeNexuizImage(string_null, 4.0/3.0)); me.previewImage = e; me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn); + w = me.columns - me.currentColumn; me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Title:")); - me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, "")); + me.TD(me, 1, w-1, e = makeNexuizTextLabel(0, "")); e.alpha = 1; e.colorL = SKINCOLOR_MAPLIST_TITLE; e.allowCut = 1; me.titleLabel = e; me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Author:")); - me.TD(me, 1, 4.5, e = makeNexuizTextLabel(0, "")); + me.TD(me, 1, w-1, e = makeNexuizTextLabel(0, "")); e.alpha = 1; e.colorL = SKINCOLOR_MAPLIST_AUTHOR; e.allowCut = 1; me.authorLabel = e; me.TR(me); - me.TD(me, 1, 5.5, e = makeNexuizTextLabel(0, "")); + me.TD(me, 1, w, e = makeNexuizTextLabel(0, "")); e.allowCut = 1; me.featuresLabel = e; me.TR(me); - me.TD(me, 1, 5.5, e = makeNexuizTextLabel(0, "Game types:")); + me.TD(me, 1, w, e = makeNexuizTextLabel(0, "Game types:")); me.TR(me); - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Deathmatch")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Deathmatch")); me.typeDeathmatchLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "TDM")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "TDM")); me.typeTDMLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "LMS")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "LMS")); me.typeLMSLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Arena")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Arena")); me.typeArenaLabel = e; me.TR(me); - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Rune")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Rune")); me.typeRuneLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Domination")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Domination")); me.typeDominationLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Key Hunt")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Key Hunt")); me.typeKeyHuntLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "CTF")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "CTF")); me.typeCTFLabel = e; me.TR(me); if(cvar("developer")) { - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Assault")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Assault")); me.typeAssaultLabel = e; - me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Onslaught")); + me.TD(me, 1, w/4, e = makeNexuizTextLabel(0, "Onslaught")); me.typeOnslaughtLabel = e; } -- 2.39.2