r2981 - in trunk/data: maps qcsrc/menu-div0test/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Nov 17 06:39:40 EST 2007
Author: div0
Date: 2007-11-17 06:39:40 -0500 (Sat, 17 Nov 2007)
New Revision: 2981
Added:
trunk/data/maps/aggressor.mapinfo
trunk/data/maps/aneurysm.mapinfo
trunk/data/maps/basement.mapinfo
trunk/data/maps/basementctf.mapinfo
trunk/data/maps/bleach.mapinfo
trunk/data/maps/bloodprison.mapinfo
trunk/data/maps/bluesky.mapinfo
trunk/data/maps/darkzone.mapinfo
trunk/data/maps/dieselpower.mapinfo
trunk/data/maps/dismal.mapinfo
trunk/data/maps/downer.mapinfo
trunk/data/maps/evilspace.mapinfo
trunk/data/maps/farewell.mapinfo
trunk/data/maps/final_rage.mapinfo
trunk/data/maps/reslimed.mapinfo
trunk/data/maps/ruiner.mapinfo
trunk/data/maps/runningman.mapinfo
trunk/data/maps/runningman_1on1remix.mapinfo
trunk/data/maps/runningmanctf.mapinfo
trunk/data/maps/silvercity.mapinfo
trunk/data/maps/skyway.mapinfo
trunk/data/maps/slimepit.mapinfo
trunk/data/maps/soylent.mapinfo
trunk/data/maps/starship.mapinfo
trunk/data/maps/stormkeep.mapinfo
trunk/data/maps/strength.mapinfo
trunk/data/maps/toxic.mapinfo
trunk/data/maps/warfare.mapinfo
Modified:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c
Log:
enlarge map info dialog; commit map info files for our maps
Added: trunk/data/maps/aggressor.mapinfo
===================================================================
--- trunk/data/maps/aggressor.mapinfo (rev 0)
+++ trunk/data/maps/aggressor.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/aneurysm.mapinfo
===================================================================
--- trunk/data/maps/aneurysm.mapinfo (rev 0)
+++ trunk/data/maps/aneurysm.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/basement.mapinfo
===================================================================
--- trunk/data/maps/basement.mapinfo (rev 0)
+++ trunk/data/maps/basement.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/basementctf.mapinfo
===================================================================
--- trunk/data/maps/basementctf.mapinfo (rev 0)
+++ trunk/data/maps/basementctf.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/bleach.mapinfo
===================================================================
--- trunk/data/maps/bleach.mapinfo (rev 0)
+++ trunk/data/maps/bleach.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/bloodprison.mapinfo
===================================================================
--- trunk/data/maps/bloodprison.mapinfo (rev 0)
+++ trunk/data/maps/bloodprison.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/bluesky.mapinfo
===================================================================
--- trunk/data/maps/bluesky.mapinfo (rev 0)
+++ trunk/data/maps/bluesky.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/darkzone.mapinfo
===================================================================
--- trunk/data/maps/darkzone.mapinfo (rev 0)
+++ trunk/data/maps/darkzone.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/dieselpower.mapinfo
===================================================================
--- trunk/data/maps/dieselpower.mapinfo (rev 0)
+++ trunk/data/maps/dieselpower.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/dismal.mapinfo
===================================================================
--- trunk/data/maps/dismal.mapinfo (rev 0)
+++ trunk/data/maps/dismal.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/downer.mapinfo
===================================================================
--- trunk/data/maps/downer.mapinfo (rev 0)
+++ trunk/data/maps/downer.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/evilspace.mapinfo
===================================================================
--- trunk/data/maps/evilspace.mapinfo (rev 0)
+++ trunk/data/maps/evilspace.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/farewell.mapinfo
===================================================================
--- trunk/data/maps/farewell.mapinfo (rev 0)
+++ trunk/data/maps/farewell.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -0,0 +1,11 @@
+title Farewell
+description Small and very fast Tourney Map
+author Tymo aka Henning Janssen
+author_email tymo at 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
Added: trunk/data/maps/final_rage.mapinfo
===================================================================
--- trunk/data/maps/final_rage.mapinfo (rev 0)
+++ trunk/data/maps/final_rage.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/reslimed.mapinfo
===================================================================
--- trunk/data/maps/reslimed.mapinfo (rev 0)
+++ trunk/data/maps/reslimed.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/ruiner.mapinfo
===================================================================
--- trunk/data/maps/ruiner.mapinfo (rev 0)
+++ trunk/data/maps/ruiner.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/runningman.mapinfo
===================================================================
--- trunk/data/maps/runningman.mapinfo (rev 0)
+++ trunk/data/maps/runningman.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/runningman_1on1remix.mapinfo
===================================================================
--- trunk/data/maps/runningman_1on1remix.mapinfo (rev 0)
+++ trunk/data/maps/runningman_1on1remix.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/runningmanctf.mapinfo
===================================================================
--- trunk/data/maps/runningmanctf.mapinfo (rev 0)
+++ trunk/data/maps/runningmanctf.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/silvercity.mapinfo
===================================================================
--- trunk/data/maps/silvercity.mapinfo (rev 0)
+++ trunk/data/maps/silvercity.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/skyway.mapinfo
===================================================================
--- trunk/data/maps/skyway.mapinfo (rev 0)
+++ trunk/data/maps/skyway.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/slimepit.mapinfo
===================================================================
--- trunk/data/maps/slimepit.mapinfo (rev 0)
+++ trunk/data/maps/slimepit.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/soylent.mapinfo
===================================================================
--- trunk/data/maps/soylent.mapinfo (rev 0)
+++ trunk/data/maps/soylent.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/starship.mapinfo
===================================================================
--- trunk/data/maps/starship.mapinfo (rev 0)
+++ trunk/data/maps/starship.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/stormkeep.mapinfo
===================================================================
--- trunk/data/maps/stormkeep.mapinfo (rev 0)
+++ trunk/data/maps/stormkeep.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/strength.mapinfo
===================================================================
--- trunk/data/maps/strength.mapinfo (rev 0)
+++ trunk/data/maps/strength.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/toxic.mapinfo
===================================================================
--- trunk/data/maps/toxic.mapinfo (rev 0)
+++ trunk/data/maps/toxic.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -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
Added: trunk/data/maps/warfare.mapinfo
===================================================================
--- trunk/data/maps/warfare.mapinfo (rev 0)
+++ trunk/data/maps/warfare.mapinfo 2007-11-17 11:39:40 UTC (rev 2981)
@@ -0,0 +1,11 @@
+title Stabilized Warfare: Resurrection
+description Medium sized map with a central area
+author Tymo
+author_email tymo at 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
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c 2007-11-17 11:13:55 UTC (rev 2980)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c 2007-11-17 11:39:40 UTC (rev 2981)
@@ -4,9 +4,9 @@
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 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;
}
More information about the nexuiz-commits
mailing list