diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index 7b65053..bc11f2b 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -196,6 +196,9 @@ LANG_ENGLISH "The Only Easy Day... Was Yesterday" REFERENCE MPUI_NUKED LANG_ENGLISH "Nuketown" +REFERENCE MPUI_IW4_TEST_MAP +LANG_ENGLISH "IW4 Test Map" + REFERENCE MPUI_DESC_MAP_NUKED LANG_ENGLISH "A deserted nuke testing facility used in the Cold War." diff --git a/iw4x/iw4x_00/maps/mp/iw4_credits.gsc b/iw4x/iw4x_00/maps/mp/iw4_credits.gsc index a68a2a5..6bb3dcd 100644 --- a/iw4x/iw4x_00/maps/mp/iw4_credits.gsc +++ b/iw4x/iw4x_00/maps/mp/iw4_credits.gsc @@ -1,50 +1,45 @@ #include common_scripts\utility; - + main() { + maps\mp\_load::main(); - - maps\mp\_load::main(); - + game[ "attackers" ] = "allies"; + game[ "defenders" ] = "axis"; + maps\mp\_compass::setupMiniMap( "compass_map_hunted" ); + setdvar( "compassmaxrange", "4000" ); - - game[ "attackers" ] = "allies"; - game[ "defenders" ] = "axis"; - - maps\mp\_compass::setupMiniMap( "compass_map_hunted" ); - setdvar( "compassmaxrange", "4000" ); - - - array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think ); + array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think ); } - + self_delete() { - self delete(); + self delete(); } - compass_triggers_think() { - assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" ); - while( true ) - { - wait( 1 ); - self waittill( "trigger" ); - maps\mp\_compass::setupMiniMap( self.script_noteworthy ); - } + assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" ); + while ( true ) + { + wait( 1 ); + self waittill( "trigger" ); + maps\mp\_compass::setupMiniMap( self.script_noteworthy ); + } } - + createSpawnpoint( classname, origin, yaw ) { - spawnpoint = spawn( "script_origin", origin ); - spawnpoint.angles = (0,yaw,0); - - if ( !isdefined( level.extraspawnpoints ) ) - level.extraspawnpoints = []; - if ( !isdefined( level.extraspawnpoints[classname] ) ) - level.extraspawnpoints[classname] = []; - level.extraspawnpoints[classname][ level.extraspawnpoints[classname].size ] = spawnpoint; -} \ No newline at end of file + spawnpoint = spawn( "script_origin", origin ); + spawnpoint.angles = ( 0, yaw, 0 ); + + if ( !isdefined( level.extraspawnpoints ) ) + level.extraspawnpoints = []; + + if ( !isdefined( level.extraspawnpoints[classname] ) ) + level.extraspawnpoints[classname] = []; + + level.extraspawnpoints[classname][ level.extraspawnpoints[classname].size ] = spawnpoint; +} diff --git a/iw4x/iw4x_00/maps/mp/mp_bloc.gsc b/iw4x/iw4x_00/maps/mp/mp_bloc.gsc index 33ba898..e5c9cc4 100644 --- a/iw4x/iw4x_00/maps/mp/mp_bloc.gsc +++ b/iw4x/iw4x_00/maps/mp/mp_bloc.gsc @@ -8,7 +8,7 @@ main() setdvar( "compassmaxrange", "2000" ); - ambientPlay( "ambient_trainer_ext2" ); + ambientPlay( "ambient_trainer_ext2" ); game["attackers"] = "axis"; game["defenders"] = "allies"; @@ -17,4 +17,4 @@ main() level.airstrikeHeightScale = 1.8; setdvar( "r_specularcolorscale", "2" ); -} \ No newline at end of file +} diff --git a/iw4x/iw4x_00/mp/basemaps.arena b/iw4x/iw4x_00/mp/basemaps.arena index cdeee60..8bea286 100644 --- a/iw4x/iw4x_00/mp/basemaps.arena +++ b/iw4x/iw4x_00/mp/basemaps.arena @@ -391,7 +391,7 @@ */ { map "iw4_credits" - longname "IW4 Test Map" + longname "MPUI_IW4_TEST_MAP" gametype "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef" description "" mapimage "preview_iw4_credits"