v23115 (05/30/01):

- (bug fix) Fixed an authentication hole that allowed arbitrary IP connections to a LAN server.  The policy now is: LAN servers will disallow any connections from IP addresses that do not match the Class B network address of the server (or match one of them, in a multihomed server).  So if your server's address is 12.13.14.15, clients from 12.13.*.* will be considered, but clients from 12.12.*.* will be immediately rejected.  In addition, a LAN server will only allow 4 unique Class C ids at any one time.  This should be sufficiently lenient for even the largest LAN parties, but should eliminate the auth hole.

- (bug fix) Fixed a server crash on mission change when the last human player leaves the game in mid cycle.

- (bug fix) Fixed a bug that could reset your Shape Detail setting to max

- (bug fix) Client join message name correction

- (bug fix) All known in-game Chat HUD bugs are fixed (partial lines from paging up/down and resize issues, etc.).

- (bug fix) Infinite missile lock-on sound bug is fixed. Dead. Finito. No more. Pushing up the daisies.

- (bug fix) Stitched up a hole associated with one of the base shapes. Small fry compared to the memory leaks.

- (bug fix) Found a particle crash issue and plugged it up good.

- (bug fix) Fixed a shield impact internal compile error that was crunching frame rate.

- (bug fix) Turns out we tweaked it so inventory stations were counting as turrets for turret placement purposes. D'oh. Fixed.

- (bug fix) A rare crash that occurred with the Radeon VE card has been resolved.

- (bug fix) Fixed a crash that could occur when a flare grenade was released when inside a force field.

- (bug fix) Deployable turrets (spider and spike) and Deployable inv stations now do damage in their explosion when they are destroyed.

- (optimization) The following missions were refined in order to optimize framerate:
	Alcatraz
	Caldera
	Flashpoint
	Gauntlet
	IceBound
	Insalubria
	Overreach
	Respite
	Sirocco

- (optimization) Adjusted the LOD of the logo projectors found in CnH missions.

- (optimization) Changed object shield shapes from the form-fitting forcefields into a less poly-intensive dome effect. Also gave shields a lower memory profile.

- (optimization) Changed the way the clouds' planes are clipped. Sky's the limit, right?

- (optimization) Missile sound script calls moved from script into code for faster processing.

- (memory leak) Fixed a large memory leak. This plus the other leaks mentioned here should finally put the nail in the coffin on the "degrading server performance" issue.

- (memory leak) Fixed a memory leak associated with the pretty lightning effects on maps like Casern Cavite.memory leaks:

- (memory leak) Fixed a memory leak in our fancy text list control and the gui text list.

- (memory leak) Fixed a memory leak involving memory use and resource allocation.

- (improvement) Targeting laser prediction should be better now.

- (improvement) You can specify a server's IP address manually at the join screen

- (improvement) You can now specify "-password <pw>" on the command line to join a server that requires a password.

- (improvement) Heavy armors are tougher against snipers. You now require four headshots or five body shots to kill a Juggernaut with a laser rifle.

- (improvement) Footspeed of all armors increased slightly, as well as a minor boost to jetpack performance. Some improvements made to air resistance for mediums and heavy armors (very subtle).

- (improvement) The jetpack effect was reverted back to the old effect (by popular demand).

- (improvement) A Chat HUD message has been added that is displayed whenever you try to deploy a mine, but your team's maximum number of mines has already been deployed. Previously, the mine would just blow up and not explain why it detonated. Now, it still blows up, but tells you why it happened.

- (improvement) Polished up the health meter on the HUD so when you're still alive, it displays a visible sliver of positive health.

- (improvement) Made framerate and gameplay changes to Caldera. The attackers' base has been moved farther from the defenders, and the switch has been put in one of the upper chambers, while the stations are located separately from the generators. The changes should fix a serious defensive advantage.

- (improvement) After you buy a vehicle, you now fade into the driver's seat if your armor and pack make you an eligible pilot/driver.

- (improvement) Added a "rogue" mine message so that if you are killed by a mine laid by someone who has left the building, the death message is more accurate.

- (improvement) Increased speed of belly turret projectiles so that it is more effective in general (especially for air defense).

- (improvement) Modified name tags of vehicles when you place your reticle over them. Names are now more consistent and descriptive.

- (improvement) Missile and AA turrets now have a longer maximum range (you'll still need to deploy sensors to get this added range, but they can fire farther if you do). They also react more quickly to available targets.

- (community) The "compose email", "forum post", and "news submission" windows are now resizable and movable.

SierraUp.cfg

@@ -1,7 +1,7 @@
 ProductName "Tribes2"
 DisplayName "Tribes 2"
 PatchFolder .\patch
-CurrentVersion 0.22755.0.0
+CurrentVersion 0.23115.0.0
 AutoStart
 MonitorPatch
 LaunchExe "tribes2.exe"

base/console_end.cs

@@ -212,6 +212,7 @@ loadGui("LaunchToolbarDlg");
 loadGui("GameGui");
 loadGui("ChooseFilterDlg");
 loadGui("ServerInfoDlg");
+loadGui("EnterIPDlg");
 loadGui("AdvancedHostDlg");
 loadGui("NewWarriorDlg");
 loadGui("JoinChatDlg");
@@ -250,7 +251,7 @@ loadGui("SinglePlayerEscapeDlg");
 loadGui("LobbyGui");
 loadGui("DebriefGui");
 loadGui("CreditsGui");
-
+loadGui("MoveThreadDlg");
 loadGui("NewMissionGui");
 loadGui("ChatDlg");
 loadGui("PlayGui");

base/gui/EmailComposeDlg.gui

@@ -1,84 +1,104 @@
 //--- OBJECT WRITE BEGIN ---
 new GuiControl(EMailComposeDlg) {
-	profile = "DlgBackProfile";
+	profile = "GuiModelessDialogProfile";
 	horizSizing = "right";
 	vertSizing = "bottom";
 	position = "0 0";
 	extent = "640 480";
 	minExtent = "8 8";
 	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
 	helpTag = "0";
-		key = "76";
-		state = "replyMail";
 
-	new ShellPaneCtrl() {
+	new ShellWindowCtrl(EmailComposeWindow) {
-		profile = "ShellDlgPaneProfile";
+		profile = "ShellWindowProfile";
-		horizSizing = "center";
+		horizSizing = "right";
-		vertSizing = "center";
+		vertSizing = "bottom";
-		position = "70 36";
+		position = "67 37";
 		extent = "500 408";
-		minExtent = "48 92";
+		minExtent = "386 230";
 		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
 		helpTag = "0";
 		text = "COMPOSE EMAIL";
 		maxLength = "255";
-		noTitleBar = "0";
+		frameBase = "gui/window";
+		borderWidth = "2";
+		resizeWidth = "1";
+		resizeHeight = "1";
+		canMove = "1";
+		canClose = "1";
+		closeCommand = "EmailComposeDlg.Cancel();";
 
 		new ShellTextEditCtrl(Email_ToEdit) {
 			profile = "NewTextEditProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "bottom";
-			position = "72 22";
+			position = "51 30";
-			extent = "408 38";
+			extent = "443 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			variable = "$EmailToAddress";
 			helpTag = "0";
-			text = "BigDevDawg,Symlink,Diamondback,Todesritter";
 			maxLength = "2000";
 			historySize = "0";
 			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
 			glowOffset = "9 9";
 		};
 		new ShellTextEditCtrl(EMail_CCEdit) {
 			profile = "NewTextEditProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "bottom";
-			position = "72 48";
+			position = "51 56";
-			extent = "408 38";
+			extent = "443 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			variable = "$EmailCCAddress";
 			helpTag = "0";
-			text = "brunhilda,jett,DrAwkward,Rated z";
 			maxLength = "2000";
 			historySize = "0";
 			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
 			glowOffset = "9 9";
 		};
-		new ShellTextEditCtrl(Email_Subject) {
+		new ShellTextEditCtrl(EMail_Subject) {
 			profile = "NewTextEditProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "bottom";
-			position = "72 74";
+			position = "51 82";
-			extent = "408 38";
+			extent = "443 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			variable = "$EmailSubject";
 			helpTag = "0";
 			maxLength = "48";
 			historySize = "0";
 			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
 			glowOffset = "9 9";
 		};
 		new ShellScrollCtrl() {
 			profile = "NewScrollCtrlProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "height";
-			position = "27 109";
+			position = "11 117";
-			extent = "447 244";
+			extent = "478 250";
 			minExtent = "24 52";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			willFirstRespond = "1";
 			hScrollBar = "alwaysOff";
@@ -93,23 +113,28 @@ new GuiControl(EMailComposeDlg) {
 				horizSizing = "width";
 				vertSizing = "height";
 				position = "7 7";
-				extent = "417 230";
+				extent = "448 236";
 				minExtent = "8 8";
 				visible = "1";
+				hideCursor = "0";
+				bypassHideCursor = "0";
 				helpTag = "0";
 
 				new GuiMLTextEditCtrl(EmailBodyText) {
 					profile = "ShellMessageTextProfile";
-					horizSizing = "right";
+					horizSizing = "width";
 					vertSizing = "height";
 					position = "0 0";
-					extent = "417 230";
+					extent = "448 236";
 					minExtent = "8 8";
 					visible = "1";
+					hideCursor = "0";
+					bypassHideCursor = "0";
 					helpTag = "0";
 					lineSpacing = "2";
 					allowColorChars = "0";
 					maxChars = "3600";
+					deniedSound = "InputDeniedSound";
 				};
 			};
 		};
@@ -117,10 +142,12 @@ new GuiControl(EMailComposeDlg) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "top";
-			position = "81 353";
+			position = "96 368";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "EmailComposeDlg.Cancel();";
 			accelerator = "escape";
 			helpTag = "0";
@@ -129,12 +156,14 @@ new GuiControl(EMailComposeDlg) {
 		};
 		new ShellBitmapButton() {
 			profile = "ShellButtonProfile";
-			horizSizing = "right";
+			horizSizing = "left";
 			vertSizing = "top";
-			position = "291 353";
+			position = "306 368";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "EMailComposeDlg.SendMail();";
 			helpTag = "0";
 			text = "SEND";
@@ -144,10 +173,12 @@ new GuiControl(EMailComposeDlg) {
 			profile = "ShellTextRightProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "28 84";
+			position = "8 91";
 			extent = "47 22";
 			minExtent = "8 8";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			text = "Subject:";
 			maxLength = "255";
@@ -156,10 +187,12 @@ new GuiControl(EMailComposeDlg) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "38 22";
+			position = "13 30";
 			extent = "50 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "LaunchAddressDlg();";
 			helpTag = "0";
 			text = "TO:";
@@ -169,10 +202,12 @@ new GuiControl(EMailComposeDlg) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "38 48";
+			position = "13 56";
 			extent = "50 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "LaunchAddressDlg();";
 			helpTag = "0";
 			text = "CC:";

base/gui/EnterIPDlg.gui

@@ -0,0 +1,81 @@
+//--- OBJECT WRITE BEGIN ---
+new GuiControl(EnterIPDlg) {
+	profile = "DlgBackProfile";
+	horizSizing = "right";
+	vertSizing = "bottom";
+	position = "0 0";
+	extent = "640 480";
+	minExtent = "8 8";
+	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
+	helpTag = "0";
+
+	new ShellPaneCtrl() {
+		profile = "ShellDlgPaneProfile";
+		horizSizing = "center";
+		vertSizing = "center";
+		position = "155 175";
+		extent = "330 130";
+		minExtent = "48 92";
+		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
+		helpTag = "0";
+		text = "ENTER IP ADDRESS";
+		maxLength = "255";
+		noTitleBar = "0";
+
+		new ShellTextEditCtrl(IPEntry) {
+			profile = "NewTextEditProfile";
+			horizSizing = "center";
+			vertSizing = "bottom";
+			position = "28 35";
+			extent = "273 38";
+			minExtent = "32 38";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			altCommand = "EnterIPDlg.onDone();";
+			helpTag = "0";
+			maxLength = "24";
+			historySize = "0";
+			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
+			glowOffset = "9 9";
+		};
+		new ShellBitmapButton() {
+			profile = "ShellButtonProfile";
+			horizSizing = "right";
+			vertSizing = "top";
+			position = "43 75";
+			extent = "100 38";
+			minExtent = "32 38";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "Canvas.popDialog( EnterIPDlg );";
+			accelerator = "escape";
+			helpTag = "0";
+			text = "CANCEL";
+			simpleStyle = "0";
+		};
+		new ShellBitmapButton() {
+			profile = "ShellButtonProfile";
+			horizSizing = "right";
+			vertSizing = "top";
+			position = "187 75";
+			extent = "100 38";
+			minExtent = "32 38";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "EnterIPDlg.onDone();";
+			helpTag = "0";
+			text = "DONE";
+			simpleStyle = "0";
+		};
+	};
+};
+//--- OBJECT WRITE END ---

base/gui/ForumsComposeDlg.gui

@@ -1,67 +1,80 @@
 //--- OBJECT WRITE BEGIN ---
 new GuiControl(ForumsComposeDlg) {
-	profile = "DlgBackProfile";
+	profile = "GuiModelessDialogProfile";
 	horizSizing = "right";
 	vertSizing = "bottom";
 	position = "0 0";
 	extent = "640 480";
 	minExtent = "8 8";
 	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
 	helpTag = "0";
-		action = "Reply";
-		parentPost = "18598";
-		forum = "58";
-		post = "12846";
-		topic = "3822";
 
-	new ShellPaneCtrl() {
+	new ShellWindowCtrl(FC_Window) {
-		profile = "ShellDlgPaneProfile";
+		profile = "ShellWindowProfile";
-		horizSizing = "center";
+		horizSizing = "right";
-		vertSizing = "center";
+		vertSizing = "bottom";
-		position = "70 36";
+		position = "69 32";
 		extent = "500 408";
-		minExtent = "48 92";
+		minExtent = "412 176";
 		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
 		helpTag = "0";
 		text = "FORUMS POST";
 		maxLength = "255";
-		noTitleBar = "0";
+		frameBase = "gui/window";
+		borderWidth = "2";
+		resizeWidth = "1";
+		resizeHeight = "1";
+		canMove = "1";
+		canClose = "1";
+		closeCommand = "Canvas.popDialog(ForumsComposeDlg);";
 
 		new GuiTextCtrl() {
 			profile = "ShellTextRightProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "22 37";
+			position = "8 37";
 			extent = "47 22";
 			minExtent = "8 8";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			text = "Subject:";
 			maxLength = "255";
 		};
 		new ShellTextEditCtrl(FP_SubjectEdit) {
 			profile = "NewTextEditProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "bottom";
-			position = "65 29";
+			position = "51 29";
-			extent = "360 38";
+			extent = "443 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			variable = "$ForumsSubject";
 			helpTag = "0";
 			maxLength = "255";
 			historySize = "0";
 			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
 			glowOffset = "9 9";
 		};
 		new ShellScrollCtrl() {
 			profile = "NewScrollCtrlProfile";
 			horizSizing = "width";
 			vertSizing = "height";
-			position = "27 63";
+			position = "11 63";
-			extent = "448 298";
+			extent = "478 304";
 			minExtent = "24 52";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			willFirstRespond = "1";
 			hScrollBar = "alwaysOff";
@@ -73,37 +86,44 @@ new GuiControl(ForumsComposeDlg) {
 
 			new GuiScrollContentCtrl() {
 				profile = "GuiDefaultProfile";
-				horizSizing = "right";
+				horizSizing = "width";
-				vertSizing = "bottom";
+				vertSizing = "height";
 				position = "7 7";
-				extent = "418 284";
+				extent = "448 290";
 				minExtent = "8 8";
 				visible = "1";
+				hideCursor = "0";
+				bypassHideCursor = "0";
 				helpTag = "0";
 
 				new GuiMLTextEditCtrl(ForumsBodyText) {
 					profile = "ShellMessageTextProfile";
 					horizSizing = "width";
 					vertSizing = "height";
-					position = "0 -130";
+					position = "0 0";
-					extent = "418 414";
+					extent = "448 290";
 					minExtent = "8 8";
 					visible = "1";
+					hideCursor = "0";
+					bypassHideCursor = "0";
 					helpTag = "0";
 					lineSpacing = "2";
 					allowColorChars = "1";
 					maxChars = "3600";
+					deniedSound = "InputDeniedSound";
 				};
 			};
 		};
 		new ShellBitmapButton() {
 			profile = "ShellButtonProfile";
-			horizSizing = "right";
+			horizSizing = "left";
 			vertSizing = "top";
-			position = "239 358";
+			position = "274 368";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "Canvas.popDialog(ForumsComposeDlg);";
 			helpTag = "0";
 			text = "CANCEL";
@@ -111,12 +131,14 @@ new GuiControl(ForumsComposeDlg) {
 		};
 		new ShellBitmapButton() {
 			profile = "ShellButtonProfile";
-			horizSizing = "right";
+			horizSizing = "left";
 			vertSizing = "top";
-			position = "351 358";
+			position = "366 368";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "ForumsPost();";
 			helpTag = "0";
 			text = "POST";
@@ -125,11 +147,13 @@ new GuiControl(ForumsComposeDlg) {
 		new ShellBitmapButton(QuoteBtn) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
-			vertSizing = "bottom";
+			vertSizing = "top";
-			position = "22 357";
+			position = "21 368";
 			extent = "172 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "GetQuotedText();";
 			helpTag = "0";
 			text = "INCLUDE TOPIC POST TEXT";

base/gui/GenDialog.gui

@@ -7,27 +7,35 @@ new GuiControl(GenDialog) {
 	extent = "640 480";
 	minExtent = "8 8";
 	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
 	helpTag = "0";
 
 	new ShellDlgFrame() {
 		profile = "ShellDlgProfile";
 		horizSizing = "center";
 		vertSizing = "center";
-		position = "185 93";
+		position = "161 168";
-		extent = "317 271";
+		extent = "317 143";
 		minExtent = "8 8";
 		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
 		helpTag = "0";
-		text = "EDITOR";
+		text = "LOCK TOPIC";
+		maxLength = "255";
 
 		new ShellBitmapButton() {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "169 229";
+			position = "169 99";
 			extent = "79 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "Canvas.PopDIalog(\"GenDialog\");";
 			helpTag = "0";
 			text = "CANCEL";
 			simpleStyle = "0";
@@ -36,11 +44,13 @@ new GuiControl(GenDialog) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "233 229";
+			position = "233 99";
 			extent = "79 38";
 			minExtent = "32 38";
 			visible = "1";
-			command = "Canvas.PopDIalog(\"GenDialog\");";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "TopicsPopupMenu.ExecuteLock();";
 			helpTag = "0";
 			text = "OK";
 			simpleStyle = "0";
@@ -50,15 +60,18 @@ new GuiControl(GenDialog) {
 			horizSizing = "right";
 			vertSizing = "bottom";
 			position = "9 53";
-			extent = "298 180";
+			extent = "298 52";
 			minExtent = "24 52";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			willFirstRespond = "1";
 			hScrollBar = "alwaysOff";
 			vScrollBar = "alwaysOn";
 			constantThumbHeight = "0";
 			defaultLineHeight = "15";
+			childMargin = "0 0";
 			fieldBase = "gui/shll_field";
 
 			new GuiScrollContentCtrl() {
@@ -66,32 +79,26 @@ new GuiControl(GenDialog) {
 				horizSizing = "right";
 				vertSizing = "bottom";
 				position = "4 4";
-				extent = "274 172";
+				extent = "274 44";
 				minExtent = "8 8";
 				visible = "1";
+				hideCursor = "0";
+				bypassHideCursor = "0";
 				helpTag = "0";
 
-				new ShellFancyTextList() {
+				new GuiMLTextEditCtrl(LockTopicReason) {
-					profile = "GuiDefaultProfile";
+					profile = "ShellMessageTextProfile";
-					horizSizing = "right";
+					horizSizing = "width";
-					vertSizing = "bottom";
+					vertSizing = "height";
 					position = "0 0";
-					extent = "289 26";
+					extent = "274 44";
-					minExtent = "8 20";
+					minExtent = "8 8";
 					visible = "1";
 					helpTag = "0";
-					startScrollRegion = "0 0";
+					lineSpacing = "2";
-					headerBitmap = "gui/server_tabs";
+					allowColorChars = "1";
-					sortArrowBitmap = "gui/shll_sortarrow";
+					maxChars = "80";
-					barBase = "gui/shll_bar";
+					deniedSound = "InputDeniedSound";
-					glowOffset = "4";
-					rowHeight = "17";
-					headerFontColor = "8 19 6 255";
-					headerFontColorHL = "25 68 56 255";
-					separatorColor = "192 192 192 255";
-					drawSeparators = "0";
-					headerSort = "1";
-					allowReposition = "0";
 				};
 			};
 		};
@@ -103,8 +110,11 @@ new GuiControl(GenDialog) {
 			extent = "286 17";
 			minExtent = "8 8";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
-			text = "TRIBE";
+			text = "REASON";
+			maxLength = "255";
 		};
 	};
 };

base/gui/HUDDlgs.gui

@@ -309,7 +309,7 @@ new GuiControl(MessageHud)
       horizSizing = "right";
       vertSizing = "bottom";
       position = "120 375";
-      extent = "400 24";
+      extent = "356 24";
       minExtent = "8 8";
       visible = "1";
 

base/gui/MoveThreadDlg.gui

@@ -0,0 +1,93 @@
+//--- OBJECT WRITE BEGIN ---
+new GuiControl(MoveThreadDlg) {
+	profile = "DlgBackProfile";
+	horizSizing = "right";
+	vertSizing = "bottom";
+	position = "0 0";
+	extent = "640 480";
+	minExtent = "8 8";
+	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
+	helpTag = "0";
+
+	new ShellPaneCtrl(MoveThreadDlgPane) {
+		profile = "ShellPaneProfile";
+		horizSizing = "right";
+		vertSizing = "bottom";
+		position = "168 155";
+		extent = "277 125";
+		minExtent = "48 92";
+		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
+		helpTag = "0";
+		text = "MOVE THREAD";
+		maxLength = "255";
+		noTitleBar = "0";
+
+		new ShellPopupMenu(MoveToForumList) {
+			profile = "ShellPopupProfile";
+			horizSizing = "right";
+			vertSizing = "bottom";
+			position = "17 43";
+			extent = "247 36";
+			minExtent = "49 36";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			helpTag = "0";
+			maxLength = "255";
+			maxPopupHeight = "200";
+			buttonBitmap = "gui/shll_pulldown";
+			rolloverBarBitmap = "gui/shll_pulldownbar_rol";
+			selectedBarBitmap = "gui/shll_pulldownbar_act";
+			noButtonStyle = "0";
+		};
+		new GuiTextCtrl() {
+			profile = "GuiDefaultProfile";
+			horizSizing = "right";
+			vertSizing = "bottom";
+			position = "27 35";
+			extent = "225 16";
+			minExtent = "8 8";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			helpTag = "0";
+			text = "Select New Forum:";
+			maxLength = "255";
+		};
+		new ShellBitmapButton(mtdOKbtn) {
+			profile = "ShellButtonProfile";
+			horizSizing = "right";
+			vertSizing = "bottom";
+			position = "201 72";
+			extent = "65 38";
+			minExtent = "32 38";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "TopicsPopupMenu.ExecuteMove();";
+			helpTag = "0";
+			text = "OK";
+			simpleStyle = "0";
+		};
+		new ShellBitmapButton(mtdCancelbtn) {
+			profile = "ShellButtonProfile";
+			horizSizing = "right";
+			vertSizing = "bottom";
+			position = "142 72";
+			extent = "75 38";
+			minExtent = "32 38";
+			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
+			command = "Canvas.PopDIalog(\"MoveThreadDlg\");";
+			helpTag = "0";
+			text = "CANCEL";
+			simpleStyle = "0";
+		};
+	};
+};
+//--- OBJECT WRITE END ---

base/gui/NewsGui.gui

@@ -28,7 +28,7 @@ new GuiChunkedBitmapCtrl(NewsGui) {
 		maxLength = "255";
 		noTitleBar = "0";
 
-		new ShellBitmapButton() {
+		new ShellBitmapButton(NewsSubmitBtn) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "top";

base/gui/NewsPostDlg.gui

@@ -1,35 +1,47 @@
 //--- OBJECT WRITE BEGIN ---
 new GuiControl(NewsPostDlg) {
-	profile = "DlgBackProfile";
+	profile = "GuiModelessDialogProfile";
 	horizSizing = "right";
 	vertSizing = "bottom";
 	position = "0 0";
 	extent = "640 480";
 	minExtent = "8 8";
 	visible = "1";
+	hideCursor = "0";
+	bypassHideCursor = "0";
 	helpTag = "0";
 
-	new ShellPaneCtrl() {
+	new ShellWindowCtrl(NP_Window) {
-		profile = "ShellDlgPaneProfile";
+		profile = "ShellWindowProfile";
-		horizSizing = "center";
+		horizSizing = "right";
-		vertSizing = "center";
+		vertSizing = "bottom";
-		position = "90 36";
+		position = "85 39";
-		extent = "460 408";
+		extent = "470 373";
-		minExtent = "48 92";
+		minExtent = "388 209";
 		visible = "1";
+		hideCursor = "0";
+		bypassHideCursor = "0";
 		helpTag = "0";
-		text = "POST NEWS";
+		text = "SUBMIT NEWS";
 		maxLength = "255";
-		noTitleBar = "0";
+		frameBase = "gui/window";
+		borderWidth = "2";
+		resizeWidth = "1";
+		resizeHeight = "1";
+		canMove = "1";
+		canClose = "1";
+		closeCommand = "Canvas.popDialog( NewsPostDlg );";
 
 		new GuiTextCtrl() {
 			profile = "ShellTextRightProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "24 40";
+			position = "3 40";
 			extent = "60 22";
 			minExtent = "8 8";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			text = "Category:";
 			maxLength = "255";
@@ -38,10 +50,12 @@ new GuiControl(NewsPostDlg) {
 			profile = "ShellPopupProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "81 31";
+			position = "60 31";
 			extent = "175 36";
 			minExtent = "49 36";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			maxLength = "255";
 			maxPopupHeight = "200";
@@ -54,37 +68,45 @@ new GuiControl(NewsPostDlg) {
 			profile = "ShellTextRightProfile";
 			horizSizing = "right";
 			vertSizing = "bottom";
-			position = "24 70";
+			position = "3 70";
 			extent = "60 22";
 			minExtent = "8 8";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			text = "Title:";
 			maxLength = "255";
 		};
 		new ShellTextEditCtrl() {
 			profile = "NewTextEditProfile";
-			horizSizing = "right";
+			horizSizing = "width";
 			vertSizing = "bottom";
-			position = "80 62";
+			position = "59 62";
-			extent = "359 38";
+			extent = "405 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			variable = "$NewsTitle";
 			helpTag = "0";
 			maxLength = "48";
 			historySize = "0";
 			password = "0";
+			tabComplete = "0";
+			deniedSound = "InputDeniedSound";
 			glowOffset = "9 9";
 		};
 		new ShellScrollCtrl() {
 			profile = "NewScrollCtrlProfile";
 			horizSizing = "width";
 			vertSizing = "height";
-			position = "27 97";
+			position = "11 97";
-			extent = "407 254";
+			extent = "448 236";
 			minExtent = "24 52";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			helpTag = "0";
 			willFirstRespond = "1";
 			hScrollBar = "alwaysOff";
@@ -96,26 +118,31 @@ new GuiControl(NewsPostDlg) {
 
 			new GuiScrollContentCtrl() {
 				profile = "GuiDefaultProfile";
-				horizSizing = "right";
+				horizSizing = "width";
-				vertSizing = "bottom";
+				vertSizing = "height";
 				position = "7 7";
-				extent = "377 240";
+				extent = "418 222";
 				minExtent = "8 8";
 				visible = "1";
+				hideCursor = "0";
+				bypassHideCursor = "0";
 				helpTag = "0";
 
 				new GuiMLTextEditCtrl(NewsPostBodyText) {
 					profile = "ShellMessageTextProfile";
-					horizSizing = "right";
+					horizSizing = "width";
-					vertSizing = "bottom";
+					vertSizing = "height";
 					position = "0 0";
-					extent = "377 240";
+					extent = "418 222";
 					minExtent = "8 8";
 					visible = "1";
+					hideCursor = "0";
+					bypassHideCursor = "0";
 					helpTag = "0";
 					lineSpacing = "2";
 					allowColorChars = "0";
 					maxChars = "3600";
+					deniedSound = "InputDeniedSound";
 				};
 			};
 		};
@@ -123,10 +150,12 @@ new GuiControl(NewsPostDlg) {
 			profile = "ShellButtonProfile";
 			horizSizing = "right";
 			vertSizing = "top";
-			position = "68 354";
+			position = "93 333";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "Canvas.popDialog(NewsPostDlg);";
 			accelerator = "escape";
 			helpTag = "0";
@@ -135,15 +164,17 @@ new GuiControl(NewsPostDlg) {
 		};
 		new ShellBitmapButton() {
 			profile = "ShellButtonProfile";
-			horizSizing = "right";
+			horizSizing = "left";
 			vertSizing = "top";
-			position = "264 354";
+			position = "277 333";
-			extent = "128 38";
+			extent = "100 38";
 			minExtent = "32 38";
 			visible = "1";
+			hideCursor = "0";
+			bypassHideCursor = "0";
 			command = "PostNewsProcess();";
 			helpTag = "0";
-			text = "POST";
+			text = "SUBMIT";
 			simpleStyle = "0";
 		};
 	};

base/gui/OptionsDlg.gui

@@ -2154,7 +2154,7 @@ new GuiControl(OptionsDlg) {
 				value = "32";
 				usePlusMinus = "1";
 			};
-			new GuiTextCtrl() {
+			new GuiTextCtrl(OP_MasterServerTxt) {
 				profile = "ShellTextRightProfile";
 				horizSizing = "right";
 				vertSizing = "bottom";
@@ -2220,7 +2220,7 @@ new GuiControl(OptionsDlg) {
 				selectedBarBitmap = "gui/shll_pulldownbar_act";
 				noButtonStyle = "0";
 			};
-			new ShellToggleButton() {
+			new ShellToggleButton(OP_CheckEmailTgl) {
 				profile = "ShellRadioProfile";
 				horizSizing = "right";
 				vertSizing = "bottom";
@@ -2235,7 +2235,7 @@ new GuiControl(OptionsDlg) {
 				text = "CHECK EMAIL WHILE PLAYING";
 				maxLength = "255";
 			};
-			new ShellToggleButton() {
+			new ShellToggleButton(OP_ChatDisconnectTgl) {
 				profile = "ShellRadioProfile";
 				horizSizing = "right";
 				vertSizing = "bottom";
@@ -2294,7 +2294,7 @@ new GuiControl(OptionsDlg) {
 				value = "500";
 				usePlusMinus = "1";
 			};
-			new ShellBitmapButton() {
+			new ShellBitmapButton(OP_EditChatMenuBtn) {
 				profile = "ShellButtonProfile";
 				horizSizing = "right";
 				vertSizing = "bottom";
@@ -2400,7 +2400,7 @@ new GuiControl(OptionsDlg) {
 				text = "SHOW PERSONAL SKINS";
 				maxLength = "255";
 			};
-			new GuiTextCtrl() {
+			new GuiTextCtrl(OP_LaunchScreenTxt) {
 				profile = "ShellTextRightProfile";
 				horizSizing = "right";
 				vertSizing = "bottom";

base/gui/PlayGui.gui

@@ -127,8 +127,8 @@ new GameTSCtrl(PlayGui) {
          horizSizing = "left";
          vertSizing = "bottom";
          position = "8 23";
-         extent = "92 5";
+         extent = "93 5";
-         minExtent = "92 5";
+         minExtent = "93 5";
          visible = "1";
          setFirstResponder = "0";
          modal = "1";
@@ -136,7 +136,7 @@ new GameTSCtrl(PlayGui) {
          fillColor = "0.353000 0.373000 0.933000 0.800000";
          frameColor = "0.000000 1.000000 0.000000 1.000000";
          opacity = "0.8";
-         subRegion = "0 0 92 10";
+         subRegion = "0 0 93 10";
          pulseRate = "500";
          pulseThreshold = "0.3";
       };
@@ -147,8 +147,8 @@ new GameTSCtrl(PlayGui) {
          horizSizing = "left";
          vertSizing = "bottom";
          position = "8 5";
-         extent = "92 8";
+         extent = "93 8";
-         minExtent = "92 8";
+         minExtent = "93 8";
          visible = "1";
          setFirstResponder = "0";
          modal = "1";
@@ -156,7 +156,7 @@ new GameTSCtrl(PlayGui) {
          fillColor = "0.000 1.000 0.000 0.800000";
          frameColor = "0.000000 1.000000 0.000000 0.000000";
          opacity = "0.8";
-         subRegion = "0 0 92 10";
+         subRegion = "0 0 93 10";
          pulseRate = "500";
          pulseThreshold = "0.3";
       };
@@ -167,8 +167,8 @@ new GameTSCtrl(PlayGui) {
          horizSizing = "left";
          vertSizing = "bottom";
          position = "8 30";
-         extent = "92 3";
+         extent = "93 3";
-         minExtent = "92 3";
+         minExtent = "93 3";
          visible = "1";
          setFirstResponder = "0";
          modal = "1";
@@ -410,6 +410,8 @@ new GameTSCtrl(PlayGui) {
 	  missileMarker2 = "gui/RET_missile_marker_red";
 	  missileFlash1 = "gui/RET_missile_horizflash_red";
 	  missileFlash2 = "gui/RET_missile_vertflash_red";
+
+	  LOSMarkerUpdate = 250; // amount of time in ms that markers get LOS updates. Turn this down to get more updates or up to get less.
    };
 
    new GuiControl(dashboardHud) {

base/gui/guiProfiles.cs

@@ -222,7 +222,7 @@ new GuiControlProfile ("LaunchTabProfile")
    fontSize = $ShellButtonFontSize;
    fontColor = "60 140 140";
    fontColorHL = "6 245 215";
-   fontColorNA = "5 5 5";
+   fontColorNA = "64 64 64";
    fontColorSEL = "6 245 215";
    fixedExtent = true;
    bitmapBase = "gui/lnch_tab";

base/input.log

@@ -1,4 +1,4 @@
-Input log opened at Fri May 11 15:28:52 2001
+Input log opened at Fri Jun  8 23:22:20 2001
 
 Operating System:
   WinNT version 5.0

base/missions/AgentsOfFortune.mis

@@ -39,13 +39,13 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "600";
+		visibleDistance = "500";
 		useSkyTextures = "1";
 		renderBottomTexture = "0";
 		SkySolidColor = "0.390000 0.390000 0.390000 0.000000";
 		fogDistance = "200";
 		fogColor = "0.500000 0.500000 0.500000 1.000000";
-		fogVolume1 = "0 0 0";
+		fogVolume1 = "600 0 190";
 		fogVolume2 = "0 0 0";
 		fogVolume3 = "0 0 0";
 		materialList = "Badlands_l4.dml";

base/missions/Caldera.mis

@@ -14,11 +14,11 @@
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
 		cdTrack = "3";
-		powerCount = "0";
 		musicTrack = "volcanic";
+		powerCount = "0";
 
 	new MissionArea(MissionArea) {
-		area = "-400 -336 1008 720";
+		area = "-272 -1040 944 1424";
 		flightCeiling = "300";
 		flightCeilingRange = "20";
 			locked = "true";
@@ -27,10 +27,10 @@ new SimGroup(MissionGroup) {
 		direction = "0.57735 0.57735 -0.57735";
 		color = "0.600000 0.600000 0.600000 1.000000";
 		ambient = "0.200000 0.200000 0.200000 1.000000";
+			rotation = "1 0 0 0";
 			scale = "1 1 1";
 			locked = "true";
 			position = "-1024 -1024 0";
-			rotation = "1 0 0 0";
 	};
 	new TerrainBlock(Terrain) {
 		rotation = "1 0 0 0";
@@ -40,23 +40,23 @@ new SimGroup(MissionGroup) {
 		squareSize = "8";
 		emptySquares = "250";
 			visibleDistance = "1200";
-			locked = "true";
 			hazeDistance = "250";
+			locked = "true";
 			position = "-1024 -1024 0";
 	};
 	new NavigationGraph(NavGraph) {
 		conjoinAngleDev = "45";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
-			scale = "1 1 1";
+			conjoinBowlDev = "20";
-			locked = "true";
+			rotation = "0 0 0 0";
 			coverage = "0";
 			XDimOverSize = "0";
-			position = "0 0 0 1";
+			scale = "1 1 1";
 			GraphFile = "Caldera.nav";
 			YDimOverSize = "0";
-			rotation = "0 0 0 0";
+			locked = "true";
-			conjoinBowlDev = "20";
+			position = "0 0 0 1";
 	};
 	new WaterBlock() {
 		position = "112 -96 63.1568";
@@ -85,14 +85,14 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "550";
+		visibleDistance = "500";
 		useSkyTextures = "1";
 		renderBottomTexture = "0";
 		SkySolidColor = "0.106000 0.125000 0.235000 0.000000";
-		fogDistance = "222";
+		fogDistance = "300";
 		fogColor = "0.850000 0.380000 0.100000 1.000000";
-		fogVolume1 = "0 0 0";
+		fogVolume1 = "300 0 150";
-		fogVolume2 = "0 0 0";
+		fogVolume2 = "2000 150 320";
 		fogVolume3 = "0 0 0";
 		materialList = "lava_dark.dml";
 		windVelocity = "1 0 0";
@@ -100,8 +100,8 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 -0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 -0.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 -0.000000";
-			locked = "true";
 			cloudSpeed0 = "0.001000 0.001000";
+			locked = "true";
 	};
 	new SimGroup(ObserverDropPoints) {
 
@@ -141,18 +141,18 @@ new SimGroup(MissionGroup) {
 			new SimGroup(WBase) {
 
 				new StaticShape() {
-					position = "-49.2609 -145.916 234.061";
+					position = "182.635 -663.221 201.981";
-					rotation = "0 0 1 63.5986";
+					rotation = "0 0 1 53.2853";
 					scale = "1 1 1";
 					nameTag = "West Tower";
 					dataBlock = "SensorMediumPulse";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new Item() {
-					position = "-50.2487 -152.88 193.418";
+					position = "182.91 -670.25 161.338";
-					rotation = "0 0 -1 25.2101";
+					rotation = "0 0 -1 35.5234";
 					scale = "1 1 1";
 					dataBlock = "RepairPack";
 					lockCount = "0";
@@ -160,32 +160,30 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new StaticShape() {
-					position = "-57.2069 -143.475 180.313";
+					position = "174.38 -662.242 148.233";
-					rotation = "-0 0 -1 58.0514";
+					rotation = "-0 0 -1 68.3647";
 					scale = "1 1 1";
 					nameTag = "West Tower";
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
-						damageTimeMS = "783957";
 				};
 				new StaticShape() {
-					position = "-50.5461 -154.429 180.337";
+					position = "182.895 -671.827 148.257";
-					rotation = "0 0 1 182.201";
+					rotation = "0 0 1 171.888";
 					scale = "1 1 1";
 					nameTag = "West Tower";
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
-						damageTimeMS = "782064";
 				};
 				new StaticShape() {
-					position = "-215.474 -235.369 148.1";
+					position = "107.962 -783.923 128.392";
 					rotation = "0 0 -1 117.456";
 					scale = "1 1 1";
 					nameTag = "Vehicle Pad";
@@ -193,18 +191,15 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						scoutVehicle = "Removed";
-						locked = "true";
-						damageTimeMS = "219608";
-						WayPoint = "3444";
 						AssaultVehicle = "Removed";
-						Ready = "1";
+						station = "6133";
 						mobileBaseVehicle = "Removed";
-						needsObjectiveWaypoint = "1";
+						Ready = "1";
-						station = "3373";
+						locked = "false";
 				};
 				new InteriorInstance() {
-					position = "-45.7829 -144.124 180.354";
+					position = "185.736 -660.835 148.274";
-					rotation = "0 0 1 59.4055";
+					rotation = "0 0 1 49.0922";
 					scale = "1 1 1";
 					interiorFile = "dtowr1.dif";
 					showTerrainInside = "0";
@@ -212,58 +207,85 @@ new SimGroup(MissionGroup) {
 						locked = "true";
 				};
 				new InteriorInstance() {
-					position = "-216.271 -235.459 148.4";
+					position = "107.165 -784.013 128.692";
 					rotation = "0 0 1 63.0253";
 					scale = "1 0.972192 1";
 					interiorFile = "dvpad1.dif";
 					showTerrainInside = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new ForceFieldBare() {
-					position = "-58.6739 -145.962 203.227";
+					position = "173.382 -664.951 171.147";
-					rotation = "-0 0 -1 29.7938";
+					rotation = "-0 0 -1 40.107";
 					scale = "5.1479 4.14776 0.526289";
 					dataBlock = "defaultTeamSlowFieldBare";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new ForceFieldBare() {
-					position = "-51.5789 -158.087 203.288";
+					position = "182.534 -675.611 171.208";
-					rotation = "-0 0 -1 29.7938";
+					rotation = "-0 0 -1 40.107";
 					scale = "5.1479 4.14776 0.526289";
 					dataBlock = "defaultTeamSlowFieldBare";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new ForceFieldBare() {
-					position = "-58.5844 -146.798 180.335";
+					position = "173.62 -665.758 148.255";
-					rotation = "0 0 1 149.152";
+					rotation = "0 0 1 138.839";
 					scale = "1.60793 8.34049 7.7216";
 					dataBlock = "defaultTeamSlowFieldBare";
 					lockCount = "0";
 					homingCount = "0";
-						locked = "true";
+						locked = "false";
 				};
 				new Turret() {
-					position = "-36.5039 -139.108 204.247";
+					position = "193.967 -654.239 172.167";
-					rotation = "0 0 1 60.1606";
+					rotation = "0 0 1 49.8474";
 					scale = "1 1 1";
 					nameTag = "Base";
 					dataBlock = "TurretBaseLarge";
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "PlasmaBarrelLarge";
-						locked = "true";
 						originalBarrel = "PlasmaBarrelLarge";
+						locked = "false";
+				};
+				new Turret() {
+					position = "191.694 -655.574 161.289";
+					rotation = "-0.352138 0.885271 -0.3038 97.4256";
+					scale = "1 1 1";
+					dataBlock = "SentryTurret";
+					lockCount = "0";
+					homingCount = "0";
+					initialBarrel = "SentryTurretBarrel";
+				};
+				new Turret() {
+					position = "182.469 -676.21 161.049";
+					rotation = "0.586525 0.534893 0.608176 120.529";
+					scale = "1 1 1";
+					dataBlock = "SentryTurret";
+					lockCount = "0";
+					homingCount = "0";
+					initialBarrel = "SentryTurretBarrel";
+				};
+				new Turret() {
+					position = "170.108 -661.95 161.017";
+					rotation = "0.710775 -0.0552493 0.701247 182.267";
+					scale = "1 1 1";
+					dataBlock = "SentryTurret";
+					lockCount = "0";
+					homingCount = "0";
+					initialBarrel = "SentryTurretBarrel";
 				};
 			};
 			new SimGroup(spawnspheres) {
 
 				new SpawnSphere() {
-					position = "-38.551 -142.676 186.637";
+					position = "192.592 -658.116 154.557";
-					rotation = "-0 0 -1 56.9052";
+					rotation = "-0 0 -1 67.2184";
 					scale = "1 1 1";
 					dataBlock = "SpawnSphereMarker";
 					lockCount = "0";
@@ -272,7 +294,7 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "100";
 					outdoorWeight = "100";
-						locked = "true";
+						locked = "false";
 				};
 			};
 		};
@@ -294,11 +316,11 @@ new SimGroup(MissionGroup) {
 						locked = "true";
 				};
 			};
-			new SimGroup(defense) {
+			new SimGroup(baseGroup) {
 
-				new SimGroup(FFDefGens) {
+				new SimGroup(TacticalPower) {
 
-					new StaticShape() {
+					new StaticShape(SENSOR) {
 						position = "210.92 24.27 295.821";
 						rotation = "0 0 -1 89.9544";
 						scale = "1 1 1";
@@ -308,44 +330,39 @@ new SimGroup(MissionGroup) {
 						homingCount = "0";
 							locked = "true";
 					};
-					new StaticShape() {
+					new StaticShape(EquipGen) {
-						position = "174.821 19.469 219.67";
+						position = "211.031 12.9246 239.71";
-						rotation = "0 0 1 90.5273";
+						rotation = "1 0 0 0";
 						scale = "1 1 1";
-						nameTag = "Secondary";
+						nameTag = "Equipment";
 						dataBlock = "GeneratorLarge";
 						lockCount = "0";
 						homingCount = "0";
-							locked = "true";
+							name = "Equipment Generator";
-							WayPoint = "3445";
-							name = "Tactical Generator";
-							scoreValue = "5";
 							needsObjectiveWaypoint = "1";
+							locked = "true";
 					};
-					new Item() {
+					new StaticShape(Inv1) {
-						position = "211.16 42.98 252.866";
+						position = "211.282 32.0482 258.68";
 						rotation = "1 0 0 0";
 						scale = "1 1 1";
-						dataBlock = "RepairPack";
+						nameTag = "Defense";
+						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-						collideable = "0";
+							locked = "false";
-						static = "1";
-						rotate = "0";
-							locked = "true";
 					};
-					new Turret() {
+					new StaticShape(Inv2) {
-						position = "211 20.6 255.3";
+						position = "223.136 -31.279 213.66";
 						rotation = "0 0 1 90";
 						scale = "1 1 1";
-						nameTag = "Upper Entrance";
+						nameTag = "Defense";
-						dataBlock = "SentryTurret";
+						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-						initialBarrel = "SentryTurretBarrel";
+							locked = "false";
-							locked = "true";
 					};
-					new Turret() {
+					new Turret(BaseTur) {
 						position = "210.96 -39.23 219.656";
 						rotation = "0 0 1 179.909";
 						scale = "1 1 1";
@@ -354,98 +371,147 @@ new SimGroup(MissionGroup) {
 						lockCount = "0";
 						homingCount = "0";
 						initialBarrel = "PlasmaBarrelLarge";
-							locked = "true";
 							originalBarrel = "PlasmaBarrelLarge";
+							locked = "true";
 					};
-					new StaticShape() {
+					new StaticShape(Inv3) {
-						position = "239.01 -4.57 219.7";
+						position = "260.336 19.2504 219.66";
+						rotation = "0 0 -1 90";
+						scale = "1 1 1";
+						nameTag = "Defense";
+						dataBlock = "StationInventory";
+						lockCount = "0";
+						homingCount = "0";
+							locked = "false";
+					};
+					new SimGroup(PrimaryPower) {
+
+						new StaticShape(ControlPoint) {
+							position = "210.948 6.3532 249.726";
+							rotation = "1 0 0 0";
+							scale = "1 1 1";
+							nameTag = "Control Point";
+							dataBlock = "FlipFlop";
+							lockCount = "0";
+							homingCount = "0";
+								needsObjectiveWaypoint = "1";
+								locked = "false";
+						};
+						new ForceFieldBare() {
+							position = "214.472 4.35818 249.655";
+							rotation = "1 0 0 0";
+							scale = "0.386444 4.32832 7.57281";
+							dataBlock = "defaultForceFieldBare";
+							lockCount = "0";
+							homingCount = "0";
+						};
+						new ForceFieldBare() {
+							position = "207.032 4.35818 249.655";
+							rotation = "1 0 0 0";
+							scale = "0.386444 4.32832 7.57281";
+							dataBlock = "defaultForceFieldBare";
+							lockCount = "0";
+							homingCount = "0";
+						};
+						new ForceFieldBare() {
+							position = "207.413 8.6955 249.655";
+							rotation = "0 0 1 90";
+							scale = "0.386444 7.06983 7.57281";
+							dataBlock = "defaultForceFieldBare";
+							lockCount = "0";
+							homingCount = "0";
+						};
+						new StaticShape(ShieldGen) {
+							position = "174.821 19.469 219.67";
+							rotation = "0 0 1 90.5273";
+							scale = "1 1 1";
+							nameTag = "Base";
+							dataBlock = "GeneratorLarge";
+							lockCount = "0";
+							homingCount = "0";
+								name = "Shield Generator";
+								needsObjectiveWaypoint = "1";
+								locked = "true";
+						};
+						new InteriorInstance(base) {
+							position = "210.961 -2.7616 219.719";
+							rotation = "1 0 0 0";
+							scale = "1 1 1";
+							interiorFile = "dbase3.dif";
+							showTerrainInside = "0";
+							AudioProfile = "Universal_Base_Pulse_1";
+								locked = "true";
+						};
+					};
+					new StaticShape(Inv5) {
+						position = "215.27 -7.64356 228.68";
 						rotation = "0 0 1 179.909";
 						scale = "1 1 1";
 						nameTag = "Defense";
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							locked = "true";
+							locked = "false";
-							scoreValue = "5";
 					};
-					new StaticShape() {
+					new StaticShape(Inv4) {
-						position = "237.588 19.7132 219.686";
+						position = "206.631 -7.77728 228.68";
-						rotation = "1 0 0 0";
-						scale = "1 1 1";
-						nameTag = "Control Point";
-						dataBlock = "FlipFlop";
-						lockCount = "0";
-						homingCount = "0";
-							locked = "true";
-							WayPoint = "3446";
-							needsObjectiveWaypoint = "1";
-					};
-					new InteriorInstance() {
-						position = "210.961 -2.7616 219.719";
-						rotation = "1 0 0 0";
-						scale = "1 1 1";
-						interiorFile = "dbase3.dif";
-						showTerrainInside = "0";
-						AudioProfile = "Universal_Base_Pulse_1";
-							locked = "true";
-					};
-					new StaticShape() {
-						position = "211.031 12.9246 239.71";
-						rotation = "1 0 0 0";
-						scale = "1 1 1";
-						nameTag = "Primary";
-						dataBlock = "GeneratorLarge";
-						lockCount = "0";
-						homingCount = "0";
-							locked = "true";
-							WayPoint = "3447";
-							damageTimeMS = "35412";
-							name = "Primary Generator";
-							scoreValue = "5";
-							needsObjectiveWaypoint = "1";
-					};
-					new StaticShape() {
-						position = "182.86 -5.01 219.7";
 						rotation = "0 0 1 179.909";
 						scale = "1 1 1";
 						nameTag = "Defense";
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							locked = "true";
+							locked = "false";
 					};
-					new StaticShape() {
+					new StaticShape(Inv6) {
-						position = "201.306 6.13267 219.7";
+						position = "198.896 -31.279 213.66";
-						rotation = "0 0 1 135.791";
+						rotation = "0 0 -1 90";
 						scale = "1 1 1";
 						nameTag = "Defense";
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							locked = "true";
+							locked = "false";
-					};
-					new StaticShape() {
-						position = "220.719 6.00303 219.7";
-						rotation = "0 0 1 228.037";
-						scale = "1 1 1";
-						nameTag = "Defense";
-						dataBlock = "StationInventory";
-						lockCount = "0";
-						homingCount = "0";
-							locked = "true";
-					};
-					new ForceFieldBare() {
-						position = "240.127 10.7499 219.625";
-						rotation = "1 0 0 0";
-						scale = "1 17.0756 8.19376";
-						dataBlock = "defaultForceFieldBare";
-						lockCount = "0";
-						homingCount = "0";
-							locked = "true";
 					};
 				};
+				new Item(RP1) {
+					position = "211.16 42.98 252.866";
+					rotation = "1 0 0 0";
+					scale = "1 1 1";
+					dataBlock = "RepairPack";
+					lockCount = "0";
+					homingCount = "0";
+					collideable = "0";
+					static = "1";
+					rotate = "0";
+						locked = "true";
+				};
+				new Item(RP2) {
+					position = "249.253 19.1488 221.256";
+					rotation = "0 0 1 89.3814";
+					scale = "1 1 1";
+					dataBlock = "RepairPack";
+					lockCount = "0";
+					homingCount = "0";
+					collideable = "0";
+					static = "1";
+					rotate = "0";
+				};
+				new Item(RP3) {
+					position = "190.864 13.5372 215.309";
+					rotation = "1 0 0 0";
+					scale = "1 1 1";
+					dataBlock = "RepairPack";
+					lockCount = "0";
+					homingCount = "0";
+					collideable = "0";
+					static = "1";
+					rotate = "0";
+				};
 			};
 		};
+		new SimGroup(team0) {
+		};
 	};
 	new AudioEmitter() {
 		position = "206.17 3.7 104.499";
@@ -471,37 +537,18 @@ new SimGroup(MissionGroup) {
 	};
 	new SimGroup(Ambients) {
 
-		new AudioEmitter() {
+		new TSStatic() {
-			position = "334.4 -0.33 148.5";
+			position = "179.92 19.1 228.7";
-			rotation = "1 0 0 0";
+			rotation = "0 0 1 89.9544";
 			scale = "1 1 1";
-			fileName = "fx/environment/lavahiss.wav";
+			shapeName = "stackable1m.dts";
-			useProfileDescription = "0";
-			outsideAmbient = "1";
-			volume = "1";
-			isLooping = "1";
-			is3D = "1";
-			minDistance = "5";
-			maxDistance = "320";
-			coneInsideAngle = "360";
-			coneOutsideAngle = "360";
-			coneOutsideVolume = "1";
-			coneVector = "0 0 1";
-			loopCount = "-1";
-			minLoopGap = "0";
-			maxLoopGap = "0";
-			type = "EffectAudioType";
 				locked = "true";
 		};
-		new ParticleEmissionDummy() {
+		new TSStatic() {
-			position = "334.414 -0.337833 148.474";
+			position = "242.21 34.57 230.27";
-			rotation = "1 0 0 0";
+			rotation = "0.578959 0.573655 0.57942 120.279";
 			scale = "1 1 1";
-			dataBlock = "doubleTimeEmissionDummy";
+			shapeName = "stackable1m.dts";
-			lockCount = "0";
-			homingCount = "0";
-			emitter = "LightDamageSmoke";
-			velocity = "1";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -518,28 +565,6 @@ new SimGroup(MissionGroup) {
 			shapeName = "stackable3m.dts";
 				locked = "true";
 		};
-		new TSStatic() {
-			position = "210.73 7.55 249.67";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "stackable1l.dts";
-				locked = "true";
-		};
-		new InteriorInstance() {
-			position = "334.291 -0.588567 147.974";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			interiorFile = "dvent.dif";
-			showTerrainInside = "0";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "242.23 36.81 230.27";
-			rotation = "0.578959 0.573655 0.57942 120.279";
-			scale = "1 1 1";
-			shapeName = "stackable1m.dts";
-				locked = "true";
-		};
 		new TSStatic() {
 			position = "242.12 35.7 230.27";
 			rotation = "0.578959 0.573655 0.57942 120.279";
@@ -547,20 +572,6 @@ new SimGroup(MissionGroup) {
 			shapeName = "stackable1m.dts";
 				locked = "true";
 		};
-		new TSStatic() {
-			position = "242.21 34.57 230.27";
-			rotation = "0.578959 0.573655 0.57942 120.279";
-			scale = "1 1 1";
-			shapeName = "stackable1m.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "179.92 19.1 228.7";
-			rotation = "0 0 1 89.9544";
-			scale = "1 1 1";
-			shapeName = "stackable1m.dts";
-				locked = "true";
-		};
 		new TSStatic() {
 			position = "180.2 16.8967 228.71";
 			rotation = "1 0 0 0";
@@ -568,28 +579,17 @@ new SimGroup(MissionGroup) {
 			shapeName = "stackable4m.dts";
 				locked = "true";
 		};
-		new ParticleEmissionDummy() {
+		new TSStatic() {
-			position = "265.95 17.2597 204.298";
+			position = "242.23 36.81 230.27";
-			rotation = "1 0 0 180.091";
+			rotation = "0.578959 0.573655 0.57942 120.279";
-			scale = "1.97494 1.80987 1";
-			dataBlock = "doubleTimeEmissionDummy";
-			lockCount = "0";
-			homingCount = "0";
-			emitter = "PlasmaExplosionEmitter";
-			velocity = "1";
-				locked = "true";
-		};
-		new ParticleEmissionDummy() {
-			position = "156.059 17.1336 204.271";
-			rotation = "0 1 0 180.664";
 			scale = "1 1 1";
-			dataBlock = "doubleTimeEmissionDummy";
+			shapeName = "stackable1m.dts";
-			lockCount = "0";
-			homingCount = "0";
-			emitter = "PlasmaExplosionEmitter";
-			velocity = "1";
 				locked = "true";
 		};
 	};
+	new SimGroup() {
+	};
+	new SimGroup() {
+	};
 };
 //--- OBJECT WRITE END ---

base/missions/Flashpoint.mis

@@ -13,10 +13,10 @@
 
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
-		musicTrack = "volcanic";
-		CnH_timeLimit = "25";
-		cdTrack = "3";
 		powerCount = "0";
+		CnH_timeLimit = "25";
+		musicTrack = "volcanic";
+		cdTrack = "3";
 
 	new MissionArea(MissionArea) {
 		area = "-600 -448 1072 1168";
@@ -41,23 +41,23 @@ new SimGroup(MissionGroup) {
 		squareSize = "8";
 		emptySquares = "250";
 			visibleDistance = "1200";
-			hazeDistance = "250";
 			locked = "true";
 			position = "-1024 -1024 0";
+			hazeDistance = "250";
 	};
 	new NavigationGraph(NavGraph) {
 		conjoinAngleDev = "70";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
+			YDimOverSize = "0";
 			rotation = "0 0 0 0";
 			XDimOverSize = "0";
-			scale = "1 1 1";
-			locked = "true";
-			conjoinBowlDev = "20";
 			GraphFile = "Flashpoint.nav";
-			position = "0 0 0 1";
+			scale = "1 1 1";
+			conjoinBowlDev = "20";
 			coverage = "0";
-			YDimOverSize = "0";
+			locked = "true";
+			position = "0 0 0 1";
 	};
 	new Sky(Sky) {
 		position = "-1024 -1024 0";
@@ -69,10 +69,11 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "400";
+		visibleDistance = "350";
 		useSkyTextures = "0";
+		renderBottomTexture = "0";
 		SkySolidColor = "0.450000 0.300000 0.250000 1.000000";
-		fogDistance = "125";
+		fogDistance = "100";
 		fogColor = "0.450000 0.300000 0.250000 1.000000";
 		fogVolume1 = "0 0 0";
 		fogVolume2 = "0 0 0";
@@ -83,8 +84,8 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 0.000000";
-			locked = "true";
 			cloudSpeed0 = "0.000000 0.000000";
+			locked = "true";
 	};
 	new SimGroup(Lava) {
 	};
@@ -197,7 +198,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "SensorLargePulse";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "33";
 						locked = "true";
 				};
 				new StaticShape(Team0flipflop1) {
@@ -208,8 +208,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						name = "Center Stronghold";
-						Projector = "3304";
-						Target = "34";
 						locked = "true";
 				};
 				new StaticShape(Team0generatorLarge1) {
@@ -220,7 +218,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "GeneratorLarge";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "35";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory1) {
@@ -231,7 +228,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "36";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory2) {
@@ -242,7 +238,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "37";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory3) {
@@ -253,7 +248,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "38";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory4) {
@@ -264,7 +258,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "39";
 						locked = "true";
 				};
 				new WayPoint() {
@@ -282,7 +275,7 @@ new SimGroup(MissionGroup) {
 					position = "-161.533 -52.577 121.054";
 					rotation = "1 0 0 0";
 					scale = "1 1 1";
-					interiorFile = "dplat3.dif";
+					interiorFile = "dplat1.dif";
 					showTerrainInside = "0";
 						locked = "true";
 				};
@@ -298,7 +291,7 @@ new SimGroup(MissionGroup) {
 					position = "-36.516 78.04 120.967";
 					rotation = "1 0 0 0";
 					scale = "1 1 1";
-					interiorFile = "dplat3.dif";
+					interiorFile = "dplat1.dif";
 					showTerrainInside = "0";
 						locked = "true";
 				};
@@ -311,15 +304,13 @@ new SimGroup(MissionGroup) {
 						locked = "true";
 				};
 				new StaticShape() {
-					position = "-98.521 22.97 199.379";
+					position = "-98.521 22.97 198.9";
 					rotation = "1 0 0 0";
 					scale = "1 1 1";
 					dataBlock = "LogoProjector";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
 						locked = "true";
-						holo = "0";
 				};
 				new TSStatic() {
 					position = "-91.995 69.78 143.41";
@@ -418,9 +409,7 @@ new SimGroup(MissionGroup) {
 					dataBlock = "LogoProjector";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
 						locked = "true";
-						holo = "0";
 				};
 				new WayPoint() {
 					position = "-422.852 -262.799 60.7275";
@@ -442,8 +431,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						name = "SW Tower";
-						Projector = "3318";
-						Target = "40";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory5) {
@@ -454,7 +441,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "41";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory6) {
@@ -465,7 +451,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "42";
 						locked = "true";
 				};
 				new Item() {
@@ -478,7 +463,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new SimGroup(ffield) {
@@ -488,8 +472,9 @@ new SimGroup(MissionGroup) {
 						rotation = "0.0399823 0.0187772 0.999024 129.73";
 						scale = "1 8.27421 6.59044";
 						dataBlock = "defaultAllSlowFieldBare";
+						lockCount = "0";
+						homingCount = "0";
 							color = "0.500000 0.500000 1.000000 1.000000";
-							Target = "43";
 							locked = "true";
 					};
 				};
@@ -517,7 +502,8 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationVehiclePad";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
+						Ready = "1";
+						station = "3539";
 						locked = "true";
 				};
 				new InteriorInstance() {
@@ -548,8 +534,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						name = "NW Tower";
-						Projector = "3352";
-						Target = "45";
 						locked = "true";
 				};
 				new Item() {
@@ -562,7 +546,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -575,7 +558,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -588,7 +570,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -601,7 +582,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -614,7 +594,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -627,20 +606,18 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
 					position = "-352.965 365.238 135.869";
 					rotation = "1 0 0 0";
 					scale = "1 1 1";
-					dataBlock = "Grenade";
+					dataBlock = "grenade";
 					lockCount = "0";
 					homingCount = "0";
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Turret(Team0TurretBaseLarge1) {
@@ -652,7 +629,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "MissileBarrelLarge";
-						Target = "46";
 						locked = "true";
 				};
 				new Turret(Team0TurretBaseLarge2) {
@@ -664,7 +640,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "MissileBarrelLarge";
-						Target = "47";
 						locked = "true";
 				};
 				new StaticShape(Team0generatorLarge3) {
@@ -675,7 +650,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "GeneratorLarge";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "48";
 						locked = "true";
 				};
 				new WayPoint() {
@@ -712,9 +686,7 @@ new SimGroup(MissionGroup) {
 					dataBlock = "LogoProjector";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
 						locked = "true";
-						holo = "0";
 				};
 			};
 			new SimGroup(Tower4) {
@@ -751,9 +723,7 @@ new SimGroup(MissionGroup) {
 					dataBlock = "LogoProjector";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
 						locked = "true";
-						holo = "0";
 				};
 				new StaticShape() {
 					position = "227.909 456.691 53.8";
@@ -763,7 +733,8 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationVehiclePad";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
+						Ready = "1";
+						station = "3564";
 						locked = "true";
 				};
 				new InteriorInstance() {
@@ -782,8 +753,9 @@ new SimGroup(MissionGroup) {
 						rotation = "0 0 1 130.677";
 						scale = "1 8.27421 6.59044";
 						dataBlock = "defaultAllSlowFieldBare";
+						lockCount = "0";
+						homingCount = "0";
 							color = "0.500000 0.500000 1.000000 1.000000";
-							Target = "50";
 							triggerCount = "0";
 							locked = "true";
 					};
@@ -798,7 +770,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory7) {
@@ -809,7 +780,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "51";
 						locked = "true";
 				};
 				new StaticShape(Team0StationInventory8) {
@@ -820,7 +790,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "52";
 						locked = "true";
 				};
 				new StaticShape(Team0flipflop4) {
@@ -832,8 +801,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						name = "NE Tower";
-						Projector = "3356";
-						Target = "53";
 						locked = "true";
 				};
 				new InteriorInstance() {
@@ -855,8 +822,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						name = "SE Tower";
-						Projector = "3387";
-						Target = "54";
 						locked = "true";
 				};
 				new InteriorInstance() {
@@ -877,7 +842,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -890,7 +854,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -903,7 +866,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -916,7 +878,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -929,7 +890,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
@@ -942,20 +902,18 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Item() {
 					position = "249.5 -193.952 134.386";
 					rotation = "1 0 0 0";
 					scale = "1 1 1";
-					dataBlock = "Grenade";
+					dataBlock = "grenade";
 					lockCount = "0";
 					homingCount = "0";
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
 						locked = "true";
 				};
 				new Turret(Team0TurretBaseLarge3) {
@@ -967,7 +925,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "MissileBarrelLarge";
-						Target = "55";
 						locked = "true";
 				};
 				new Turret(Team0TurretBaseLarge4) {
@@ -979,7 +936,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "MissileBarrelLarge";
-						Target = "56";
 						locked = "true";
 				};
 				new StaticShape(Team0generatorLarge5) {
@@ -990,7 +946,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "GeneratorLarge";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "57";
 						locked = "true";
 				};
 				new WayPoint() {
@@ -1027,31 +982,13 @@ new SimGroup(MissionGroup) {
 					dataBlock = "LogoProjector";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "-1";
 						locked = "true";
-						holo = "0";
 				};
 			};
 		};
 	};
 	new SimGroup(Ambiance) {
 
-		new ParticleEmissionDummy() {
-			position = "-200.388 -69.3782 53.3559";
-			rotation = "-0.870674 0.486579 0.0718842 16.5162";
-			scale = "1 1 1";
-			dataBlock = "defaultEmissionDummy";
-			emitter = "HeavyDamageSmoke";
-			velocity = "1";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-201.47 -66.557 50.2098";
-			rotation = "-0.455902 -0.353976 -0.816612 22.4156";
-			scale = "1 1 1";
-			shapeName = "vehicle_land_assault_wreck.dts";
-				locked = "true";
-		};
 		new AudioEmitter() {
 			position = "-243.602 -14.58 50.3803";
 			rotation = "1 0 0 0";
@@ -1074,28 +1011,10 @@ new SimGroup(MissionGroup) {
 			type = "EffectAudioType";
 				locked = "true";
 		};
-		new ParticleEmissionDummy() {
-			position = "-96.4604 -7.40853 138.913";
-			rotation = "1 0 0 179.909";
-			scale = "1 1 1";
-			dataBlock = "halftimeEmissionDummy";
-			emitter = "PlasmaExplosionEmitter";
-			velocity = "1";
-				locked = "true";
-		};
-		new ParticleEmissionDummy() {
-			position = "-96.4693 62.0943 139.032";
-			rotation = "1 0 0 179.909";
-			scale = "1 1 1";
-			dataBlock = "halftimeEmissionDummy";
-			emitter = "PlasmaExplosionEmitter";
-			velocity = "1";
-				locked = "true";
-		};
 		new WaterBlock() {
 			position = "-200 -136 34.9178";
 			rotation = "1 0 0 0";
-			scale = "192 288 9.27051";
+			scale = "160 160 9.27051";
 			liquidType = "CrustyLava";
 			density = "1";
 			viscosity = "15";
@@ -1104,10 +1023,10 @@ new SimGroup(MissionGroup) {
 			surfaceOpacity = "1";
 			envMapTexture = "desert/skies/d_n_move1";
 			envMapIntensity = "0.5";
-	      submergeTexture[0] = "special/lavadeath_1";
+			submergeTexture[0] = "special/lavadeath_1";
-	      submergeTexture[1] = "special/lavadeath_2";
+			submergeTexture[1] = "special/lavadeath_2";
 			removeWetEdges = "1";
-				locked = "true";
+				locked = "false";
 		};
 	};
 };

base/missions/Gehenna.mis

@@ -14,11 +14,11 @@
 
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
-		musicTrack = "volcanic";
-		powerCount = "0";
 		Hunters_timeLimit = "25";
 		cdTrack = "3";
+		musicTrack = "volcanic";
 		Team_Hunters_timeLimit = "25";
+		powerCount = "0";
 
 	new MissionArea(MissionArea) {
 		area = "-432 -656 992 1200";
@@ -30,10 +30,10 @@ new SimGroup(MissionGroup) {
 		direction = "0.57735 0.57735 -0.57735";
 		color = "0.800000 0.800000 0.800000 1.000000";
 		ambient = "0.400000 0.400000 0.400000 1.000000";
+			position = "-1024 -1024 0";
 			rotation = "1 0 0 0";
 			locked = "true";
 			scale = "1 1 1";
-			position = "-1024 -1024 0";
 	};
 	new TerrainBlock(Terrain) {
 		rotation = "1 0 0 0";
@@ -41,24 +41,24 @@ new SimGroup(MissionGroup) {
 		detailTexture = "details/lavadet1";
 		terrainFile = "Gehenna.ter";
 		squareSize = "8";
+			position = "-1024 -1024 0";
 			locked = "true";
 			visibleDistance = "1200";
 			hazeDistance = "250";
-			position = "-1024 -1024 0";
 	};
 	new NavigationGraph(NavGraph) {
 		conjoinAngleDev = "55";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
 			coverage = "0";
-			GraphFile = "Gehenna.nav";
+			position = "0 0 0 1";
-			rotation = "0 0 0 0";
 			XDimOverSize = "0";
+			rotation = "0 0 0 0";
 			locked = "true";
 			scale = "1 1 1";
 			YDimOverSize = "0";
 			conjoinBowlDev = "20";
-			position = "0 0 0 1";
+			GraphFile = "Gehenna.nav";
 	};
 	new Sky(Sky) {
 		position = "-536 -1136 0";
@@ -70,12 +70,13 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "500";
+		visibleDistance = "400";
 		useSkyTextures = "1";
+		renderBottomTexture = "0";
 		SkySolidColor = "0.365000 0.330000 0.310000 1.000000";
-		fogDistance = "225";
+		fogDistance = "200";
 		fogColor = "0.450000 0.300000 0.250000 1.000000";
-		fogVolume1 = "200 50 55";
+		fogVolume1 = "0 0 0";
 		fogVolume2 = "0 0 0";
 		fogVolume3 = "0 0 0";
 		materialList = "sky_lava_brown.dml";
@@ -84,11 +85,10 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 -198748244414614883000000000000000000000.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 -222768174765569861000000000000000000000.000000";
-			locked = "true";
 			cloudSpeed0 = "0.001000 0.001000";
+			locked = "true";
 	};
 	new SimGroup(ObserverDropPoints) {
-			powerCount = "0";
 
 		new Camera() {
 			position = "63.0383 -4.39411 233.976";
@@ -128,13 +128,10 @@ new SimGroup(MissionGroup) {
 		};
 	};
 	new SimGroup(Teams) {
-			powerCount = "0";
 
 		new SimGroup(Team1) {
-				powerCount = "0";
 
 			new SimGroup(spawnspheres) {
-					powerCount = "0";
 
 				new SpawnSphere() {
 					position = "295.144 371.862 61.7032";
@@ -147,8 +144,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "TeamHunters";
+						locked = "true";
 				};
 				new SpawnSphere() {
 					position = "-187.403 234.596 75.6892";
@@ -161,8 +158,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "TeamHunters";
+						locked = "true";
 				};
 				new SpawnSphere() {
 					position = "476.171 261.308 125.662";
@@ -175,8 +172,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "Hunters";
+						locked = "true";
 				};
 				new SpawnSphere() {
 					position = "260.282 -209.274 112.446";
@@ -189,8 +186,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "Hunters";
+						locked = "true";
 				};
 				new SpawnSphere() {
 					position = "-214.629 -99.2604 91.5018";
@@ -203,16 +200,14 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "Hunters";
+						locked = "true";
 				};
 			};
 		};
 		new SimGroup(team2) {
-				powerCount = "0";
 
 			new SimGroup(spawnspheres) {
-					powerCount = "0";
 
 				new SpawnSphere() {
 					position = "-302.462 -459.008 101.225";
@@ -225,8 +220,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "TeamHunters";
+						locked = "true";
 				};
 				new SpawnSphere() {
 					position = "277.523 -563.635 61.3461";
@@ -239,8 +234,8 @@ new SimGroup(MissionGroup) {
 					sphereWeight = "100";
 					indoorWeight = "0";
 					outdoorWeight = "100";
-						locked = "true";
 						missionTypesList = "TeamHunters";
+						locked = "true";
 				};
 			};
 		};
@@ -250,8 +245,8 @@ new SimGroup(MissionGroup) {
 			scale = "1 1 1";
 			interiorFile = "dplat1.dif";
 			showTerrainInside = "0";
-				locked = "true";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new InteriorInstance() {
 			position = "108.28 -28.7261 185.61";
@@ -259,8 +254,8 @@ new SimGroup(MissionGroup) {
 			scale = "1 1 1";
 			interiorFile = "dplat1.dif";
 			showTerrainInside = "0";
-				locked = "true";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new InteriorInstance() {
 			position = "105.28 -88.7261 185.61";
@@ -268,8 +263,8 @@ new SimGroup(MissionGroup) {
 			scale = "1 1 1";
 			interiorFile = "dplat1.dif";
 			showTerrainInside = "0";
-				locked = "true";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new InteriorInstance() {
 			position = "59.8795 -58.7261 185.61";
@@ -277,8 +272,8 @@ new SimGroup(MissionGroup) {
 			scale = "1 1 1";
 			interiorFile = "dplat1.dif";
 			showTerrainInside = "0";
-				locked = "true";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new Item(Nexus) {
 			position = "89.7978 -58.6047 205.61";
@@ -290,10 +285,9 @@ new SimGroup(MissionGroup) {
 			collideable = "0";
 			static = "1";
 			rotate = "0";
-				flashThreadDir = "1";
-				locked = "true";
-				Target = "33";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
+				flashThreadDir = "1";
 		};
 		new WayPoint() {
 			position = "89.5709 -58.3712 207.01";
@@ -305,20 +299,21 @@ new SimGroup(MissionGroup) {
 			homingCount = "0";
 			name = "The Nexus";
 			team = "0";
-				locked = "true";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new Trigger(NexusTrigger) {
 			position = "79.4439 -49.5435 192.34";
 			rotation = "1 0 0 0";
 			scale = "20.8041 18.1619 27.2131";
 			dataBlock = "gameTrigger";
-			polyhedron = "0.0000000 0.0000000 0.0000000 1.0000000 0.0000000 0.0000000 -0.0000000 -1.0000000 -0.0000000 -0.0000000 -0.0000000 1.0000000";
+			lockCount = "0";
-				locked = "true";
+			homingCount = "0";
+			polyhedron = "0.0000000 0.0000000 0.0000000 1.0000000 0.0000000 0.0000000 -0.0000000 -0.0000000 1.0000000 -0.0000000 -1.0000000 -0.0000000";
 				missionTypesList = "Hunters TeamHunters";
+				locked = "true";
 		};
 		new SimGroup(team0) {
-				powerCount = "2";
 				providesPower = "1";
 
 			new ForceFieldBare(FORCEFIELD) {
@@ -326,18 +321,18 @@ new SimGroup(MissionGroup) {
 				rotation = "1 0 0 0";
 				scale = "9.55232 8.42736 1";
 				dataBlock = "defaultForceFieldBare";
+				lockCount = "0";
+				homingCount = "0";
 					locked = "true";
-					Target = "34";
-					team = "0";
 			};
 			new ForceFieldBare(FORCEFIELD) {
 				position = "-90.0292 -116.684 183.242";
 				rotation = "1 0 0 0";
 				scale = "9.55232 8.42736 1";
 				dataBlock = "defaultForceFieldBare";
+				lockCount = "0";
+				homingCount = "0";
 					locked = "true";
-					Target = "35";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "317.046 178.658 63.1775";
@@ -347,7 +342,6 @@ new SimGroup(MissionGroup) {
 				showTerrainInside = "0";
 				AudioProfile = "Universal_Base_3";
 					locked = "true";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "403.563 -193.869 62.0471";
@@ -357,7 +351,6 @@ new SimGroup(MissionGroup) {
 				showTerrainInside = "0";
 				AudioProfile = "Universal_Base_3";
 					locked = "true";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "60.3802 -471.803 62.1601";
@@ -367,7 +360,6 @@ new SimGroup(MissionGroup) {
 				showTerrainInside = "0";
 				AudioProfile = "Universal_Base_3";
 					locked = "true";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "-321.842 -219.391 63.4496";
@@ -377,7 +369,6 @@ new SimGroup(MissionGroup) {
 				showTerrainInside = "0";
 				AudioProfile = "Universal_Base_3";
 					locked = "true";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "-22.2284 433.339 62.9738";
@@ -387,7 +378,6 @@ new SimGroup(MissionGroup) {
 				showTerrainInside = "0";
 				AudioProfile = "Universal_Base_3";
 					locked = "true";
-					team = "0";
 			};
 			new StaticShape() {
 				position = "328.76 178.09 75.2046";
@@ -397,9 +387,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "36";
-					team = "0";
-					Trigger = "3353";
 			};
 			new StaticShape() {
 				position = "341.11 184.407 -975.383";
@@ -409,8 +396,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "37";
-					team = "0";
 			};
 			new TSStatic() {
 				position = "328.19 176.965 63.1608";
@@ -418,7 +403,6 @@ new SimGroup(MissionGroup) {
 				scale = "1 1 1";
 				shapeName = "stackable1l.dts";
 					locked = "true";
-					team = "0";
 			};
 			new StaticShape() {
 				position = "409.846 -203.678 74.0342";
@@ -428,9 +412,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "38";
-					team = "0";
-					Trigger = "3357";
 			};
 			new TSStatic() {
 				position = "411.481 -188.392 62.19";
@@ -438,7 +419,6 @@ new SimGroup(MissionGroup) {
 				scale = "1 1 1";
 				shapeName = "stackable4l.dts";
 					locked = "true";
-					team = "0";
 			};
 			new StaticShape() {
 				position = "53.7353 -481.29 74.3159";
@@ -448,9 +428,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "39";
-					team = "0";
-					Trigger = "3360";
 			};
 			new TSStatic() {
 				position = "54.0822 -481.966 62.1909";
@@ -458,7 +435,6 @@ new SimGroup(MissionGroup) {
 				scale = "1 1 1";
 				shapeName = "stackable5l.dts";
 					locked = "true";
-					team = "0";
 			};
 			new StaticShape() {
 				position = "-318.013 -208.534 75.4921";
@@ -468,9 +444,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "40";
-					team = "0";
-					Trigger = "3363";
 			};
 			new StaticShape() {
 				position = "-23.2358 444.902 75.027";
@@ -480,9 +453,6 @@ new SimGroup(MissionGroup) {
 				lockCount = "0";
 				homingCount = "0";
 					locked = "true";
-					Target = "41";
-					team = "0";
-					Trigger = "3365";
 			};
 			new TSStatic() {
 				position = "-30.7756 433.268 62.9963";
@@ -490,7 +460,6 @@ new SimGroup(MissionGroup) {
 				scale = "1 1 1";
 				shapeName = "stackable3m.dts";
 					locked = "true";
-					team = "0";
 			};
 			new InteriorInstance() {
 				position = "89.8302 -58.6331 214.41";
@@ -498,9 +467,8 @@ new SimGroup(MissionGroup) {
 				scale = "0.3 0.3 0.3";
 				interiorFile = "dplat1.dif";
 				showTerrainInside = "0";
-					locked = "true";
-					team = "0";
 					missionTypesList = "Hunters TeamHunters";
+					locked = "true";
 			};
 		};
 		new StaticShape() {
@@ -511,7 +479,6 @@ new SimGroup(MissionGroup) {
 			lockCount = "0";
 			homingCount = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new StaticShape() {
 			position = "89.798 -58.604 213.681";
@@ -521,11 +488,9 @@ new SimGroup(MissionGroup) {
 			lockCount = "0";
 			homingCount = "0";
 				locked = "true";
-				Target = "-1";
 		};
 	};
 	new SimGroup(Ambiance) {
-			powerCount = "0";
 
 		new WaterBlock() {
 			position = "32 -176 104";
@@ -539,8 +504,8 @@ new SimGroup(MissionGroup) {
 			surfaceOpacity = "1";
 			envMapTexture = "desert/skies/d_n_move1";
 			envMapIntensity = "0.5";
-	      submergeTexture[0] = "special/lavadeath_1";
+			submergeTexture[0] = "special/lavadeath_1";
-	      submergeTexture[1] = "special/lavadeath_2";
+			submergeTexture[1] = "special/lavadeath_2";
 			removeWetEdges = "1";
 				locked = "true";
 		};
@@ -556,8 +521,8 @@ new SimGroup(MissionGroup) {
 			surfaceOpacity = "1";
 			envMapTexture = "desert/skies/d_n_move1";
 			envMapIntensity = "0.5";
-	      submergeTexture[0] = "special/lavadeath_1";
+			submergeTexture[0] = "special/lavadeath_1";
-	      submergeTexture[1] = "special/lavadeath_2";
+			submergeTexture[1] = "special/lavadeath_2";
 			removeWetEdges = "0";
 				locked = "true";
 		};
@@ -581,7 +546,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "250.147 -0.328957 146.5";
@@ -594,7 +558,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "250.024 -12.6038 146.5";
@@ -607,7 +570,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "249.957 -6.38556 146.36";
@@ -620,7 +582,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "-104.619 -112.469 189.25";
@@ -633,7 +594,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "-104.696 -106.251 189.4";
@@ -646,7 +606,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "-104.799 -118.526 189.4";
@@ -659,7 +618,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new Item() {
 			position = "-106.847 -118.451 196.648";
@@ -672,7 +630,6 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
 		new InteriorInstance() {
 			position = "-109.733 -112.469 188.244";
@@ -694,14 +651,27 @@ new SimGroup(MissionGroup) {
 			static = "1";
 			rotate = "0";
 				locked = "true";
-				Target = "-1";
 		};
-		new InteriorInstance() {
+		new AudioEmitter() {
-			position = "-80.7727 -422.333 54.6";
+			position = "114.043 -77.2696 164.61";
-			rotation = "0 0 -1 67.0361";
+			rotation = "1 0 0 0";
-			scale = "1.58453 1 1";
+			scale = "1 1 1";
-			interiorFile = "dbrdg10.dif";
+			fileName = "fx/environment/lavahostile.wav";
-			showTerrainInside = "0";
+			useProfileDescription = "0";
+			outsideAmbient = "1";
+			volume = "1";
+			isLooping = "1";
+			is3D = "1";
+			minDistance = "50";
+			maxDistance = "3200";
+			coneInsideAngle = "360";
+			coneOutsideAngle = "360";
+			coneOutsideVolume = "1";
+			coneVector = "0 0 1";
+			loopCount = "-1";
+			minLoopGap = "0";
+			maxLoopGap = "0";
+			type = "EffectAudioType";
 				locked = "true";
 		};
 		new AudioEmitter() {
@@ -1166,79 +1136,6 @@ new SimGroup(MissionGroup) {
 			type = "EffectAudioType";
 				locked = "true";
 		};
-		new InteriorInstance() {
-			position = "372.014 198.8 61.4916";
-			rotation = "0 0 1 36.6693";
-			scale = "1 1 1";
-			interiorFile = "dvent.dif";
-			showTerrainInside = "0";
-				locked = "true";
-		};
-		new ParticleEmissionDummy() {
-			position = "372.282 199.011 62.373";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			dataBlock = "doubleTimeEmissionDummy";
-			emitter = "SmallLightDamageSmoke";
-			velocity = "1";
-				locked = "true";
-		};
-		new ParticleEmissionDummy() {
-			position = "375.994 -249.152 63.8673";
-			rotation = "-0 -1 0 12.0321";
-			scale = "1 1 1";
-			dataBlock = "doubleTimeEmissionDummy";
-			emitter = "SmallLightDamageSmoke";
-			velocity = "1";
-				locked = "true";
-		};
-		new InteriorInstance() {
-			position = "375.548 -249.364 63.0611";
-			rotation = "0.0997732 -0.306194 0.946726 37.9855";
-			scale = "1 1 1";
-			interiorFile = "dvent.dif";
-			showTerrainInside = "0";
-				locked = "true";
-		};
-		new ParticleEmissionDummy() {
-			position = "-220.537 -168.198 62.6713";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			dataBlock = "doubleTimeEmissionDummy";
-			emitter = "SmallLightDamageSmoke";
-			velocity = "1";
-				locked = "true";
-		};
-		new InteriorInstance() {
-			position = "-220.805 -168.409 61.7899";
-			rotation = "0 0 1 36.6693";
-			scale = "1 1 1";
-			interiorFile = "dvent.dif";
-			showTerrainInside = "0";
-				locked = "true";
-		};
-		new AudioEmitter() {
-			position = "371.704 199.05 62.0366";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			fileName = "fx/environment/lavahiss.wav";
-			useProfileDescription = "0";
-			outsideAmbient = "1";
-			volume = "1";
-			isLooping = "1";
-			is3D = "1";
-			minDistance = "5";
-			maxDistance = "320";
-			coneInsideAngle = "360";
-			coneOutsideAngle = "360";
-			coneOutsideVolume = "1";
-			coneVector = "0 0 1";
-			loopCount = "-1";
-			minLoopGap = "0";
-			maxLoopGap = "0";
-			type = "EffectAudioType";
-				locked = "true";
-		};
 		new AudioEmitter() {
 			position = "376.411 -249.19 64.9593";
 			rotation = "1 0 0 0";
@@ -1283,34 +1180,26 @@ new SimGroup(MissionGroup) {
 			type = "EffectAudioType";
 				locked = "true";
 		};
-		new AudioEmitter() {
+		new InteriorInstance() {
-			position = "114.043 -77.2696 164.61";
+			position = "375.548 -249.364 63.0611";
-			rotation = "1 0 0 0";
+			rotation = "0.0997732 -0.306194 0.946726 37.9855";
 			scale = "1 1 1";
-			fileName = "fx/environment/lavahostile.wav";
+			interiorFile = "dvent.dif";
-			useProfileDescription = "0";
+			showTerrainInside = "0";
-			outsideAmbient = "1";
+				locked = "true";
-			volume = "1";
+		};
-			isLooping = "1";
+		new InteriorInstance() {
-			is3D = "1";
+			position = "-220.805 -168.409 61.7899";
-			minDistance = "50";
+			rotation = "0 0 1 36.6693";
-			maxDistance = "3200";
+			scale = "1 1 1";
-			coneInsideAngle = "360";
+			interiorFile = "dvent.dif";
-			coneOutsideAngle = "360";
+			showTerrainInside = "0";
-			coneOutsideVolume = "1";
-			coneVector = "0 0 1";
-			loopCount = "-1";
-			minLoopGap = "0";
-			maxLoopGap = "0";
-			type = "EffectAudioType";
 				locked = "true";
 		};
 	};
 	new SimGroup(RandomOrganics) {
-			powerCount = "0";
 
 		new SimGroup(Addition1DSPlant16) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-128.284 -185.398 92.2261";
@@ -1320,9 +1209,9 @@ new SimGroup(MissionGroup) {
 					locked = "true";
 			};
 			new TSStatic() {
-				position = "302.219 -116.813 72.8366";
+				position = "25.3474 228.305 56.0699";
-				rotation = "0.302969 -0.263367 0.915886 87.0094";
+				rotation = "0.232142 0.21504 0.948614 97.3866";
-				scale = "0.9 0.9 0.9";
+				scale = "1.1 1.1 1.1";
 				shapeName = "dorg16.dts";
 					locked = "true";
 			};
@@ -1347,30 +1236,8 @@ new SimGroup(MissionGroup) {
 				shapeName = "dorg16.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "340 -12 61.0375";
-				rotation = "0 0 1 34";
-				scale = "1 1 1";
-				shapeName = "dorg16.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "388 -324 61.1594";
-				rotation = "0 0 1 148";
-				scale = "0.9 0.9 0.9";
-				shapeName = "dorg16.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "25.3474 228.305 56.0699";
-				rotation = "0.232142 0.21504 0.948614 97.3866";
-				scale = "1.1 1.1 1.1";
-				shapeName = "dorg16.dts";
-					locked = "true";
-			};
 		};
 		new SimGroup(Addition3DSPlant18) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "368.844 164.703 51.1463";
@@ -1400,13 +1267,6 @@ new SimGroup(MissionGroup) {
 				shapeName = "dorg18.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-36 92 95.025";
-				rotation = "0 0 1 28";
-				scale = "1.3 1.3 1.3";
-				shapeName = "dorg18.dts";
-					locked = "true";
-			};
 			new TSStatic() {
 				position = "68 180 60.4468";
 				rotation = "0 0 -1 7.00012";
@@ -1414,16 +1274,8 @@ new SimGroup(MissionGroup) {
 				shapeName = "dorg18.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-204 -268 60.5469";
-				rotation = "0 0 1 214";
-				scale = "0.8 0.8 0.8";
-				shapeName = "dorg18.dts";
-					locked = "true";
-			};
 		};
 		new SimGroup(Addition4DSPlant19) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-188 -292 58.2156";
@@ -1432,27 +1284,6 @@ new SimGroup(MissionGroup) {
 				shapeName = "dorg19.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "61.8098 -299.75 161.673";
-				rotation = "-0.408512 -0.190864 0.892574 90.1504";
-				scale = "1.2 1.2 1.2";
-				shapeName = "dorg19.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "220.474 147.588 59.5219";
-				rotation = "0 0 -1 118";
-				scale = "1.3 1.3 1.3";
-				shapeName = "dorg19.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "229.591 262.609 50.1644";
-				rotation = "0.263624 -0.152203 0.952542 237.617";
-				scale = "1.1 1.1 1.1";
-				shapeName = "dorg19.dts";
-					locked = "true";
-			};
 			new TSStatic() {
 				position = "332 156 58.8593";
 				rotation = "0 0 -1 29.9998";
@@ -1460,6 +1291,13 @@ new SimGroup(MissionGroup) {
 				shapeName = "dorg19.dts";
 					locked = "true";
 			};
+			new TSStatic() {
+				position = "229.591 262.609 50.1644";
+				rotation = "0.263624 -0.152203 0.952542 237.617";
+				scale = "1.1 1.1 1.1";
+				shapeName = "dorg19.dts";
+					locked = "true";
+			};
 		};
 	};
 	new Lightning() {
@@ -1467,6 +1305,8 @@ new SimGroup(MissionGroup) {
 		rotation = "1 0 0 0";
 		scale = "1057.22 1334.77 375.171";
 		dataBlock = "DefaultStorm";
+		lockCount = "0";
+		homingCount = "0";
 		strikesPerMinute = "15";
 		strikeWidth = "5";
 		chanceToHitTarget = "0.9";

base/missions/MyrkWood.mis

@@ -13,9 +13,9 @@
 
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
-		cdTrack = "2";
-		powerCount = "0";
 		musicTrack = "lush";
+		powerCount = "0";
+		cdTrack = "2";
 
 	new MissionArea(MissionArea) {
 		area = "-528 -184 464 368";
@@ -35,8 +35,9 @@ new SimGroup(MissionGroup) {
 		cloudSpeed3 = "0.0003";
 		visibleDistance = "150";
 		useSkyTextures = "1";
+		renderBottomTexture = "0";
 		SkySolidColor = "0.000000 0.000000 0.000000 0.000000";
-		fogDistance = "10";
+		fogDistance = "50";
 		fogColor = "0.150000 0.150000 0.150000 1.000000";
 		fogVolume1 = "100 0 450";
 		fogVolume2 = "0 0 0";
@@ -47,40 +48,40 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 0.000000";
-			locked = "true";
 			cloudSpeed0 = "0.000000 0.000000";
+			locked = "true";
 	};
 	new Sun() {
 		direction = "0.57735 0.57735 -0.57735";
 		color = "0.600000 0.600000 0.600000 1.000000";
 		ambient = "0.400000 0.400000 0.400000 1.000000";
 			position = "680 824 0";
-			locked = "true";
 			rotation = "1 0 0 0";
+			locked = "true";
 			scale = "1 1 1";
 	};
 	new TerrainBlock(Terrain) {
 		rotation = "1 0 0 0";
 		scale = "1 1 1";
+		detailTexture = "details/lushdet2";
 		terrainFile = "MyrkWood.ter";
 		squareSize = "8";
 			position = "-1024 -1024 0";
 			locked = "true";
-		detailTexture = "details/lushdet2";
 	};
 	new NavigationGraph(NavGraph) {
 		conjoinAngleDev = "45";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
-			YDimOverSize = "0";
-			conjoinBowlDev = "20";
 			position = "0 0 0 1";
-			GraphFile = "Myrkwood.nav";
+			conjoinBowlDev = "20";
+			rotation = "0 0 0 0";
 			coverage = "0";
 			locked = "true";
-			rotation = "0 0 0 0";
-			XDimOverSize = "0";
 			scale = "1 1 1";
+			XDimOverSize = "0";
+			YDimOverSize = "0";
+			GraphFile = "Myrkwood.nav";
 	};
 	new WaterBlock(Water) {
 		position = "-688 -208 0";
@@ -197,7 +198,9 @@ new SimGroup(MissionGroup) {
 				rotation = "1 0 0 0";
 				scale = "60 60 20";
 				dataBlock = "gameTrigger";
-				polyhedron = "0.0000000 0.0000000 0.0000000 1.0000000 0.0000000 0.0000000 -0.0000000 -1.0000000 -0.0000000 -0.0000000 -0.0000000 1.0000000";
+				lockCount = "0";
+				homingCount = "0";
+				polyhedron = "0.0000000 0.0000000 0.0000000 1.0000000 0.0000000 0.0000000 -0.0000000 -0.0000000 1.0000000 -0.0000000 -1.0000000 -0.0000000";
 					locked = "true";
 					missionTypesList = "Hunters";
 			};
@@ -211,9 +214,9 @@ new SimGroup(MissionGroup) {
 				collideable = "0";
 				static = "1";
 				rotate = "0";
-					flashThreadDir = "1";
 					locked = "true";
 					missionTypesList = "Hunters";
+					flashThreadDir = "1";
 			};
 			new StaticShape() {
 				position = "-314.529 -7.57016 84.1054";
@@ -259,8 +262,8 @@ new SimGroup(MissionGroup) {
 				collideable = "0";
 				static = "0";
 				rotate = "0";
-					carrier = "0";
 					locked = "true";
+					carrier = "0";
 					missionTypesList = "Rabbit";
 			};
 			new StaticShape() {
@@ -303,11 +306,14 @@ new SimGroup(MissionGroup) {
 				homingCount = "0";
 					locked = "true";
 			};
-			new TSStatic() {
+			new StaticShape(TeamStationInventory5) {
-				position = "-346.432 124.13 75.6222";
+				position = "-159.989 118.456 81.226";
-				rotation = "0 0 1 34.3775";
+				rotation = "0 0 1 28.6479";
-				scale = "2 2 2";
+				scale = "1 1 1";
-				shapeName = "borg18.dts";
+				nameTag = "NE Bunker";
+				dataBlock = "StationInventory";
+				lockCount = "0";
+				homingCount = "0";
 					locked = "true";
 			};
 			new StaticShape(TeamStationInventory4) {
@@ -320,24 +326,14 @@ new SimGroup(MissionGroup) {
 				homingCount = "0";
 					locked = "true";
 			};
-			new StaticShape(TeamStationInventory5) {
-				position = "-159.989 118.456 81.226";
-				rotation = "0 0 1 28.6479";
-				scale = "1 1 1";
-				nameTag = "NE Bunker";
-				dataBlock = "StationInventory";
-				lockCount = "0";
-				homingCount = "0";
-					locked = "true";
-			};
 		};
 	};
 	new SimGroup(Organics) {
 
 		new TSStatic() {
-			position = "-415.638 22.0933 76.3932";
+			position = "-478.404 182.929 105.464";
-			rotation = "0 0 1 41.2529";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -370,30 +366,23 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-333.383 -50.6253 73.2547";
+			position = "-65.686 -29.5787 123.276";
-			rotation = "1 0 0 0";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
-		// new TSStatic() {
-		// 	position = "-267.332 -83.3934 72.1227";
-		// 	rotation = "0 0 -1 52.8946";
-		// 	scale = "2 2 2";
-		// 	shapeName = "borg16.dts";
-		// 		locked = "true";
-		// };
 		new TSStatic() {
-			position = "-345.094 83.1596 76.3744";
+			position = "-318.98 65.6104 76.3744";
 			rotation = "0 0 1 41.2529";
 			scale = "2 2 2";
 			shapeName = "borg16.dts";
-				locked = "true";
+				locked = "false";
 		};
 		new TSStatic() {
-			position = "-268.473 25.952 77.4621";
+			position = "-3.5302 40.3737 105.209";
-			rotation = "0 0 -1 17.1887";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -412,8 +401,8 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-215.32 -8.879 76.3941";
+			position = "-198.879 114.477 79.8738";
-			rotation = "0 0 -1 4.01071";
+			rotation = "-0.0762667 -0.298685 0.951299 30.0497";
 			scale = "2 2 2";
 			shapeName = "borg16.dts";
 				locked = "true";
@@ -426,9 +415,9 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-440.825 57.2678 74.3554";
+			position = "-336.358 37.8844 76.1395";
-			rotation = "0 0 -1 4.01071";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -454,10 +443,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-436.634 106.421 66.7278";
+			position = "-272.454 166.878 104.361";
-			rotation = "1 0 0 0";
+			rotation = "0 0 1 201.864";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -482,24 +471,24 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-218.105 -84.5642 69.5514";
+			position = "-407.067 -164.187 69.0597";
-			rotation = "0 0 1 63.0253";
-			scale = "2 2 2";
-			shapeName = "borg19.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-252.637 62.4072 77.5041";
-			rotation = "0 0 -1 1.71915";
-			scale = "2 2 2";
-			shapeName = "borg19.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-273.299 -8.0521 75.3508";
 			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
+				locked = "true";
+		};
+		new TSStatic() {
+			position = "-246.312 50.6312 80.1539";
+			rotation = "1 0 0 0";
+			scale = "1 1 1";
+			shapeName = "borg16.dts";
+				locked = "true";
+		};
+		new TSStatic() {
+			position = "-190.597 -188.859 75.0842";
+			rotation = "0 0 -1 44.1177";
+			scale = "1 1 1";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -538,10 +527,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-465.785 108.193 72.0249";
+			position = "-321.881 35.7059 75.3399";
-			rotation = "0 0 -1 21.1995";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -559,10 +548,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-297.787 48.9482 75.9243";
+			position = "-358.513 -36.881 75.74";
-			rotation = "0 0 -1 33.8045";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -580,17 +569,17 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-164.126 4.35196 79.3947";
+			position = "-440.571 75.2409 74.6431";
-			rotation = "0 0 1 6.8755";
+			rotation = "1 0 0 0";
 			scale = "2 2 2";
 			shapeName = "borg19.dts";
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-212.572 72.477 78.7461";
+			position = "-192.319 96.715 78.2198";
-			rotation = "0 0 1 192.123";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -629,10 +618,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-315.347 88.8928 76.034";
+			position = "-366.947 -56.2186 72.5292";
 			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -643,16 +632,16 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-394.12 -17.8722 74.6047";
+			position = "-176.17 45.8146 82.4821";
-			rotation = "0 0 1 42.3989";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-184.392 -22.4439 76.4233";
+			position = "-0.2455 -89.633 123.377";
-			rotation = "0 0 1 105.997";
+			rotation = "0 0 -1 82.5059";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -664,9 +653,9 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-343.397 -18.0407 76.0384";
+			position = "-343.237 108.208 77.4368";
-			rotation = "0 0 -1 4.01071";
+			rotation = "0 0 -1 116.31";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -678,16 +667,16 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-235.691 32.9008 79.1791";
+			position = "-245.948 -2.85577 79.1791";
 			rotation = "0 0 -1 4.01071";
 			scale = "2 2 2";
 			shapeName = "borg16.dts";
-				locked = "true";
+				locked = "false";
 		};
 		new TSStatic() {
-			position = "-257.633 48.185 77.8222";
+			position = "-360.249 -197.182 78.9132";
-			rotation = "0 0 -1 46.4096";
+			rotation = "0 0 -1 33.8045";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -699,10 +688,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-322.787 60.0202 75.5754";
+			position = "-56.7124 -167.401 71.3088";
-			rotation = "1 0 0 0";
+			rotation = "0 0 -1 100.268";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -713,9 +702,9 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-174.503 99.857 76.9572";
+			position = "-165.873 94.9849 78.6566";
-			rotation = "0 0 -1 4.01071";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
@@ -734,17 +723,17 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-241.778 290.45 106.952";
+			position = "-204.083 44.0345 80.8086";
-			rotation = "1 0 0 0";
+			rotation = "0 0 -1 38.3882";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-101.538 159.682 105.955";
+			position = "-76.9543 68.4643 118.259";
 			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -769,10 +758,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-157.734 322.267 127.358";
+			position = "-67.0733 41.2139 125.265";
-			rotation = "0 0 -1 56.1499";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -790,10 +779,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-595.632 -27.1304 121.997";
+			position = "-352.212 4.745 76.9591";
-			rotation = "0 0 -1 116.883";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -839,10 +828,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-369.932 418.912 124.589";
+			position = "-236.623 -163.727 70.65";
 			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -902,10 +891,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-557.401 -216.042 73.5052";
+			position = "-219.261 -40.4285 75.5622";
-			rotation = "0 0 -1 13.178";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -923,24 +912,24 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-620.039 77.4808 109.31";
+			position = "-299.978 17.6454 75.1239";
-			rotation = "0 0 -1 88.2355";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg19.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-571.159 54.5744 97.1391";
+			position = "-283.772 100.292 78.2563";
-			rotation = "1 0 0 0";
+			rotation = "0 0 -1 38.9611";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-545.779 188.17 128.709";
+			position = "-442.926 22.3572 77.7418";
 			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -958,10 +947,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-116.208 268.77 116.062";
+			position = "-172.87 182.123 106.093";
-			rotation = "0 0 -1 75.0575";
+			rotation = "1 0 0 0";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -1035,10 +1024,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-580.778 -74.4551 111.447";
+			position = "-362.955 -5.7265 76.3938";
-			rotation = "1 0 0 0";
+			rotation = "0 0 -1 52.1391";
-			scale = "2 2 2";
+			scale = "1 1 1";
-			shapeName = "borg18.dts";
+			shapeName = "borg16.dts";
 				locked = "true";
 		};
 		new TSStatic() {
@@ -1092,244 +1081,6 @@ new SimGroup(MissionGroup) {
 			shapeName = "borg16.dts";
 				locked = "true";
 		};
-		new TSStatic() {
-			position = "-56.7124 -167.401 71.3088";
-			rotation = "0 0 -1 100.268";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-65.686 -29.5787 123.276";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-3.5302 40.3737 105.209";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-192.319 96.715 78.2198";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-299.978 17.6454 75.1239";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-343.237 108.208 77.4368";
-			rotation = "0 0 -1 116.31";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-478.404 182.929 105.464";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-272.454 166.878 104.361";
-			rotation = "0 0 1 201.864";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-442.926 22.3572 77.7418";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-362.955 -5.7265 76.3938";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-352.212 4.745 76.9591";
-			rotation = "0 0 -1 52.1391";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-283.772 100.292 78.2563";
-			rotation = "0 0 -1 38.9611";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-301.626 93.7936 78.688";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-204.083 44.0345 80.8086";
-			rotation = "0 0 -1 38.3882";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-159.94 199.709 103.858";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-172.87 182.123 106.093";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-67.0733 41.2139 125.265";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-76.9543 68.4643 118.259";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-236.623 -163.727 70.65";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-198.879 114.477 79.8738";
-			rotation = "-0.0762667 -0.298685 0.951299 30.0497";
-			scale = "2 2 2";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-360.249 -197.182 78.9132";
-			rotation = "0 0 -1 33.8045";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-358.513 -36.881 75.74";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-366.947 -56.2186 72.5292";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-321.881 35.7059 75.3399";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-336.358 37.8844 76.1395";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-246.312 50.6312 80.1539";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-176.17 45.8146 82.4821";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-219.261 -40.4285 75.5622";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-190.597 -188.859 75.0842";
-			rotation = "0 0 -1 44.1177";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-407.067 -164.187 69.0597";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-0.2455 -89.633 123.377";
-			rotation = "0 0 -1 82.5059";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-440.571 75.2409 74.6431";
-			rotation = "1 0 0 0";
-			scale = "2 2 2";
-			shapeName = "borg19.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-420.185 90.4829 75.0559";
-			rotation = "0 0 1 41.2529";
-			scale = "2 2 2";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-165.873 94.9849 78.6566";
-			rotation = "1 0 0 0";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
 	};
 	new SimGroup(AudioCreatures) {
 

base/missions/Oasis.mis

@@ -11,10 +11,10 @@
 
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
-		DM_scoreLimit = "25";
-		musicTrack = "desert";
 		powerCount = "0";
+		DM_scoreLimit = "25";
 		cdTrack = "6";
+		musicTrack = "desert";
 		DM_timeLimit = "25";
 
 	new MissionArea(MissionArea) {
@@ -27,10 +27,10 @@ new SimGroup(MissionGroup) {
 		direction = "0.57735 0.57735 -0.57735";
 		color = "0.600000 0.600000 0.600000 1.000000";
 		ambient = "0.200000 0.200000 0.200000 1.000000";
-			locked = "true";
-			scale = "1 1 1";
 			position = "-1680 -1880 0";
 			rotation = "1 0 0 0";
+			locked = "true";
+			scale = "1 1 1";
 	};
 	new TerrainBlock(Terrain) {
 		rotation = "1 0 0 0";
@@ -39,24 +39,24 @@ new SimGroup(MissionGroup) {
 		terrainFile = "Oasis.ter";
 		squareSize = "8";
 		emptySquares = "359010";
-			hazeDistance = "250";
-			locked = "true";
 			position = "-1024 -1024 0";
+			locked = "true";
 			visibleDistance = "1200";
+			hazeDistance = "250";
 	};
 	new NavigationGraph(NavGraph) {
 		conjoinAngleDev = "45";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
-			XDimOverSize = "0";
-			locked = "true";
-			scale = "1 1 1";
-			GraphFile = "Oasis.nav";
-			YDimOverSize = "0";
-			conjoinBowlDev = "20";
 			position = "0 0 0 1";
 			coverage = "0";
+			XDimOverSize = "0";
 			rotation = "0 0 0 0";
+			YDimOverSize = "0";
+			locked = "true";
+			scale = "1 1 1";
+			conjoinBowlDev = "20";
+			GraphFile = "Oasis.nav";
 	};
 	new Sky(Sky) {
 		position = "-1680 -1880 0";
@@ -68,11 +68,11 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "900";
+		visibleDistance = "500";
 		useSkyTextures = "1";
 		renderBottomTexture = "0";
 		SkySolidColor = "0.390000 0.390000 0.390000 0.000000";
-		fogDistance = "600";
+		fogDistance = "275";
 		fogColor = "0.500000 0.500000 0.500000 1.000000";
 		fogVolume1 = "120 0 100";
 		fogVolume2 = "0 0 0";
@@ -83,8 +83,8 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 0.000000";
-			locked = "true";
 			cloudSpeed0 = "0.000000 0.000000";
+			locked = "true";
 	};
 	new WaterBlock() {
 		position = "-128 -96 90";
@@ -102,36 +102,7 @@ new SimGroup(MissionGroup) {
 			locked = "true";
 	};
 	new SimGroup(environment) {
-			powerCount = "0";
 
-		new TSStatic() {
-			position = "-99.589 -115.88 125.815";
-			rotation = "0 0 -1 55.0039";
-			scale = "1 1 1";
-			shapeName = "borg19.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-55.6873 14.5 124.435";
-			rotation = "0 0 1 123.186";
-			scale = "1 1 1";
-			shapeName = "borg18.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-103.306 -39.641 104.528";
-			rotation = "0 0 -1 12.605";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-122.789 -30.4939 104.096";
-			rotation = "0 0 1 63.5983";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
 		new TSStatic() {
 			position = "-46.068 -90.5109 114.357";
 			rotation = "0 0 -1 32.0856";
@@ -139,6 +110,13 @@ new SimGroup(MissionGroup) {
 			shapeName = "borg17.dts";
 				locked = "true";
 		};
+		new TSStatic() {
+			position = "-117.452 -39.1965 105.735";
+			rotation = "1 0 0 0";
+			scale = "1 1 1";
+			shapeName = "borg34.dts";
+				locked = "true";
+		};
 		new TSStatic() {
 			position = "-97.266 -33.5638 105.025";
 			rotation = "1 0 0 0";
@@ -147,15 +125,14 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-117.452 -39.1965 105.735";
+			position = "-122.789 -30.4939 104.096";
-			rotation = "1 0 0 0";
+			rotation = "0 0 1 63.5983";
 			scale = "1 1 1";
-			shapeName = "borg34.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 	};
 	new SimGroup(ObserverDropPoints) {
-			powerCount = "0";
 
 		new Camera() {
 			position = "-52.1118 -103.14 180.539";
@@ -195,13 +172,10 @@ new SimGroup(MissionGroup) {
 		};
 	};
 	new SimGroup(Teams) {
-			powerCount = "0";
 
 		new SimGroup(Team0) {
-				powerCount = "0";
 
 			new SimGroup(Base0) {
-					powerCount = "3";
 
 				new StaticShape() {
 					position = "-202.863 -44.7028 122.075";
@@ -212,9 +186,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "33";
-						Trigger = "3361";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-207.1 -40.064 97.59";
@@ -225,9 +196,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "34";
-						Trigger = "3363";
-						team = "0";
 				};
 				new InteriorInstance() {
 					position = "-202.509 -44.8018 107.6";
@@ -237,7 +205,6 @@ new SimGroup(MissionGroup) {
 					showTerrainInside = "0";
 					AudioProfile = "Universal_Base_3";
 						locked = "true";
-						team = "0";
 				};
 				new InteriorInstance() {
 					position = "-102.796 21.1962 139.043";
@@ -247,7 +214,6 @@ new SimGroup(MissionGroup) {
 					showTerrainInside = "0";
 					AudioProfile = "Universal_Base_2";
 						locked = "true";
-						team = "0";
 				};
 				new InteriorInstance() {
 					position = "-58.1054 -111.149 132.645";
@@ -257,7 +223,6 @@ new SimGroup(MissionGroup) {
 					showTerrainInside = "0";
 					AudioProfile = "Universal_Base_2";
 						locked = "true";
-						team = "0";
 				};
 				new Item() {
 					position = "-209.9 -44.7356 105.823";
@@ -270,8 +235,6 @@ new SimGroup(MissionGroup) {
 					static = "1";
 					rotate = "0";
 						locked = "true";
-						Target = "-1";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-208.747 -50.5824 97.59";
@@ -282,8 +245,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "35";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-70.6533 -106.666 126.66";
@@ -294,9 +255,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "36";
-						Trigger = "3370";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-101.038 26.3027 142.92";
@@ -307,8 +265,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "37";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-115.116 27.4632 132.54";
@@ -319,9 +275,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "38";
-						Trigger = "3373";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-90.4074 27.4432 132.54";
@@ -332,9 +285,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "39";
-						Trigger = "3375";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-60.196 -115.78 126.66";
@@ -345,9 +295,6 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "40";
-						Trigger = "3377";
-						team = "0";
 				};
 				new StaticShape() {
 					position = "-64.0443 -106.333 135.48";
@@ -358,16 +305,12 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 						locked = "true";
-						Target = "41";
-						team = "0";
 				};
 			};
 		};
 		new SimGroup(team1) {
-				powerCount = "0";
 
 			new SimGroup(spawnspheres) {
-					powerCount = "0";
 
 				new SpawnSphere() {
 					position = "-70.435 -46.3061 116.136";
@@ -397,10 +340,8 @@ new SimGroup(MissionGroup) {
 		};
 	};
 	new SimGroup(RandomOrganics) {
-			powerCount = "0";
 
 		new SimGroup(Addition4BEPlant1) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-105 -82 103.342";
@@ -446,11 +387,10 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new SimGroup(Addition5PhoenixPlant1) {
-				powerCount = "0";
 
 			new TSStatic() {
-				position = "-113 46 132.148";
+				position = "-41 206 179.164";
-				rotation = "0 0 1 129";
+				rotation = "0 0 1 6.00018";
 				scale = "1 1 1";
 				shapeName = "porg1.dts";
 					locked = "true";
@@ -574,16 +514,8 @@ new SimGroup(MissionGroup) {
 				shapeName = "porg1.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-41 206 179.164";
-				rotation = "0 0 1 6.00018";
-				scale = "1 1 1";
-				shapeName = "porg1.dts";
-					locked = "true";
-			};
 		};
 		new SimGroup(Addition6PhoenixPlant2) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-137 102 168.824";
@@ -685,7 +617,7 @@ new SimGroup(MissionGroup) {
 			};
 			new TSStatic() {
 				position = "-17 166 166.719";
-				rotation = "0 0 1 240";
+				rotation = "0 0 -1 120";
 				scale = "1 1 1";
 				shapeName = "porg2.dts";
 					locked = "true";
@@ -704,13 +636,6 @@ new SimGroup(MissionGroup) {
 				shapeName = "porg2.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-121 30 131.816";
-				rotation = "0 0 1 196";
-				scale = "1 1 1";
-				shapeName = "porg2.dts";
-					locked = "true";
-			};
 			new TSStatic() {
 				position = "-25 70 142";
 				rotation = "0 0 1 239";
@@ -720,26 +645,11 @@ new SimGroup(MissionGroup) {
 			};
 		};
 		new SimGroup(Addition1BELgTree18) {
-				powerCount = "0";
 
 			new TSStatic() {
-				position = "-121 14 128.484";
+				position = "-97.206 -50.249 101.355";
-				rotation = "0 0 -1 102";
+				rotation = "0 0 1 58.9997";
-				scale = "0.9 0.9 0.9";
+				scale = "1.2 1.2 1.2";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-49 6 119.805";
-				rotation = "0 0 1 57.9999";
-				scale = "1.4 1.4 1.4";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-105 -18 99.633";
-				rotation = "0 0 1 169";
-				scale = "0.8 0.8 0.8";
 				shapeName = "borg18.dts";
 					locked = "true";
 			};
@@ -750,24 +660,9 @@ new SimGroup(MissionGroup) {
 				shapeName = "borg18.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-97.206 -50.249 101.355";
-				rotation = "0 0 1 58.9997";
-				scale = "1.2 1.2 1.2";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-121 -74 104.211";
-				rotation = "0 0 -1 79";
-				scale = "1.1 1.1 1.1";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
 		};
 	};
 	new SimGroup(Ambiance) {
-			powerCount = "0";
 
 		new AudioEmitter() {
 			position = "-60.3481 -42.8411 108.656";

base/missions/Respite.mis

@@ -14,10 +14,10 @@
 
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
-		cdTrack = "6";
-		powerCount = "0";
-		musicTrack = "desert";
 		Siege_timeLimit = "20";
+		musicTrack = "desert";
+		powerCount = "0";
+		cdTrack = "6";
 
 	new MissionArea(MissionArea) {
 		area = "-608 -440 1040 1040";
@@ -29,9 +29,9 @@ new SimGroup(MissionGroup) {
 		direction = "0.57735 0.57735 -0.57735";
 		color = "0.600000 0.600000 0.600000 1.000000";
 		ambient = "0.200000 0.200000 0.200000 1.000000";
-			scale = "1 1 1";
 			position = "-1680 -1880 0";
 			rotation = "1 0 0 0";
+			scale = "1 1 1";
 			locked = "true";
 	};
 	new TerrainBlock(Terrain) {
@@ -41,8 +41,6 @@ new SimGroup(MissionGroup) {
 		terrainFile = "Respite.ter";
 		squareSize = "8";
 		emptySquares = "359010";
-			hazeDistance = "250";
-			visibleDistance = "1200";
 			position = "-1024 -1024 0";
 			locked = "true";
 	};
@@ -50,24 +48,21 @@ new SimGroup(MissionGroup) {
 		conjoinAngleDev = "45";
 		cullDensity = "0.3";
 		customArea = "0 0 0 0";
-			scale = "1 1 1";
-			conjoinBowlDev = "20";
-			GraphFile = "Respite.nav";
 			position = "0 0 0 1";
-			coverage = "0";
-			rotation = "0 0 0 0";
-			XDimOverSize = "0";
 			YDimOverSize = "0";
+			rotation = "0 0 0 0";
+			GraphFile = "Respite.nav";
+			conjoinBowlDev = "20";
+			coverage = "0";
+			scale = "1 1 1";
 			locked = "true";
+			XDimOverSize = "0";
 	};
 	new SimGroup(Teams) {
-			powerCount = "0";
 
 		new SimGroup(Team1) {
-				powerCount = "0";
 
 			new SimGroup(spawnspheres) {
-					powerCount = "0";
 
 				new SpawnSphere() {
 					position = "-428.893 446.853 123.677";
@@ -84,7 +79,6 @@ new SimGroup(MissionGroup) {
 				};
 			};
 			new SimGroup(Base1) {
-					powerCount = "1";
 					providesPower = "1";
 
 				new ForceFieldBare() {
@@ -92,8 +86,8 @@ new SimGroup(MissionGroup) {
 					rotation = "1 0 0 0";
 					scale = "0.772095 6.3679 5.62782";
 					dataBlock = "defaultTeamSlowFieldBare";
-						Target = "33";
+					lockCount = "0";
-						team = "1";
+					homingCount = "0";
 						locked = "true";
 				};
 				new ForceFieldBare() {
@@ -101,8 +95,8 @@ new SimGroup(MissionGroup) {
 					rotation = "1 0 0 0";
 					scale = "1 6.3679 5.62782";
 					dataBlock = "defaultTeamSlowFieldBare";
-						Target = "34";
+					lockCount = "0";
-						team = "1";
+					homingCount = "0";
 						locked = "true";
 				};
 				new ForceFieldBare() {
@@ -110,8 +104,8 @@ new SimGroup(MissionGroup) {
 					rotation = "1 0 0 0";
 					scale = "6.1382 0.587158 13.1878";
 					dataBlock = "defaultTeamSlowFieldBare";
-						Target = "35";
+					lockCount = "0";
-						team = "1";
+					homingCount = "0";
 						locked = "true";
 				};
 				new InteriorInstance() {
@@ -121,7 +115,6 @@ new SimGroup(MissionGroup) {
 					interiorFile = "ptowr4.dif";
 					showTerrainInside = "0";
 					AudioProfile = "Universal_Base_1";
-						team = "1";
 						locked = "true";
 				};
 				new StaticShape(Team1StationInventory8) {
@@ -132,9 +125,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "36";
-						team = "1";
-						Trigger = "6332";
 						locked = "true";
 				};
 				new StaticShape(Team1StationInventory7) {
@@ -145,9 +135,6 @@ new SimGroup(MissionGroup) {
 					dataBlock = "StationInventory";
 					lockCount = "0";
 					homingCount = "0";
-						Target = "37";
-						team = "1";
-						Trigger = "6334";
 						locked = "true";
 				};
 				new Item() {
@@ -160,8 +147,6 @@ new SimGroup(MissionGroup) {
 					collideable = "0";
 					static = "1";
 					rotate = "0";
-						Target = "-1";
-						team = "1";
 						locked = "true";
 				};
 				new Turret() {
@@ -172,10 +157,8 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "PlasmaBarrelLarge";
-						Target = "38";
-						team = "1";
-						originalBarrel = "PlasmaBarrelLarge";
 						locked = "true";
+						originalBarrel = "PlasmaBarrelLarge";
 				};
 				new Turret() {
 					position = "-433.407 435.186 151.05";
@@ -185,14 +168,11 @@ new SimGroup(MissionGroup) {
 					lockCount = "0";
 					homingCount = "0";
 					initialBarrel = "PlasmaBarrelLarge";
-						Target = "39";
-						team = "1";
-						originalBarrel = "PlasmaBarrelLarge";
 						locked = "true";
+						originalBarrel = "PlasmaBarrelLarge";
 				};
 			};
 			new SimGroup(AIObjectives) {
-					powerCount = "0";
 
 				new AIObjective(AIOAttackObject) {
 					position = "-61.3335 -115.982 128.367";
@@ -204,7 +184,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the StationInventory";
 					targetObject = "Team2StationInventory3";
 					targetClientId = "-1";
-					targetObjectId = "6367";
+					targetObjectId = "4479";
 					location = "-61.3335 -115.982 128.367";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -219,7 +199,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOAttackObject) {
 					position = "-66.0305 -111.598 137.022";
@@ -231,7 +210,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the generatorLarge";
 					targetObject = "Team2generatorLarge3";
 					targetClientId = "-1";
-					targetObjectId = "6366";
+					targetObjectId = "4478";
 					location = "-66.0305 -111.598 137.022";
 					weightLevel1 = "3100";
 					weightLevel2 = "1600";
@@ -246,7 +225,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOAttackObject) {
 					position = "-69.5116 -106.377 128.364";
@@ -258,7 +236,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the StationInventory";
 					targetObject = "Team2StationInventory4";
 					targetClientId = "-1";
-					targetObjectId = "6369";
+					targetObjectId = "4481";
 					location = "-69.5116 -106.377 128.364";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -273,7 +251,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOTouchObject) {
 					position = "-202.729 -45.0803 99.9606";
@@ -286,7 +263,7 @@ new SimGroup(MissionGroup) {
 					mode = "TouchFlipFlop";
 					targetObject = "Team2FlipFlop1";
 					targetClientId = "-1";
-					targetObjectId = "6354";
+					targetObjectId = "4466";
 					location = "-202.729 -45.0803 99.9606";
 					weightLevel1 = "3850";
 					weightLevel2 = "0";
@@ -301,7 +278,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOAttackObject) {
 					position = "-103.341 25.4572 144.392";
@@ -313,7 +289,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the generatorLarge";
 					targetObject = "Team2generatorLarge2";
 					targetClientId = "-1";
-					targetObjectId = "6357";
+					targetObjectId = "4469";
 					location = "-103.341 25.4572 144.392";
 					weightLevel1 = "3100";
 					weightLevel2 = "1600";
@@ -328,7 +304,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOAttackObject) {
 					position = "-115.004 27.3879 134.436";
@@ -340,7 +315,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the StationInventory";
 					targetObject = "Team2StationInventory1";
 					targetClientId = "-1";
-					targetObjectId = "6358";
+					targetObjectId = "4470";
 					location = "-115.004 27.3879 134.436";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -355,7 +330,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 				new AIObjective(AIOAttackObject) {
 					position = "-90.4107 27.457 134.412";
@@ -367,7 +341,7 @@ new SimGroup(MissionGroup) {
 					description = "Attack the StationInventory";
 					targetObject = "Team2StationInventory2";
 					targetClientId = "-1";
-					targetObjectId = "6360";
+					targetObjectId = "4472";
 					location = "-90.4107 27.457 134.412";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -382,15 +356,12 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "1";
 				};
 			};
 		};
 		new SimGroup(Team2) {
-				powerCount = "0";
 
 			new SimGroup(spawnspheres) {
-					powerCount = "0";
 
 				new SpawnSphere() {
 					position = "-114.601 -61.0651 119.369";
@@ -407,10 +378,9 @@ new SimGroup(MissionGroup) {
 				};
 			};
 			new SimGroup(Base0) {
-					powerCount = "0";
 
 				new SimGroup(ObjAlpha) {
-						providesPower = true;
+						providesPower = "1";
 
 					new InteriorInstance() {
 						position = "-202.509 -44.8018 107.6";
@@ -419,7 +389,6 @@ new SimGroup(MissionGroup) {
 						interiorFile = "pbunk1.dif";
 						showTerrainInside = "0";
 						AudioProfile = "Universal_Base_1";
-							team = "2";
 							locked = "true";
 					};
 					new Item() {
@@ -432,8 +401,6 @@ new SimGroup(MissionGroup) {
 						collideable = "0";
 						static = "1";
 						rotate = "0";
-							Target = "-1";
-							team = "2";
 							locked = "true";
 					};
 					new StaticShape(Team2FlipFlop1) {
@@ -444,15 +411,11 @@ new SimGroup(MissionGroup) {
 						dataBlock = "FlipFlop";
 						lockCount = "0";
 						homingCount = "0";
-							Target = "41";
-							team = "2";
-							Projector = "0";
 							locked = "true";
-					needsObjectiveWaypoint = true;
+							needsObjectiveWaypoint = "1";
 					};
 				};
 				new SimGroup(ObjBeta) {
-						powerCount = "1";
 
 					new InteriorInstance() {
 						position = "-102.692 20.9235 139.043";
@@ -461,7 +424,6 @@ new SimGroup(MissionGroup) {
 						interiorFile = "bbunk2.dif";
 						showTerrainInside = "0";
 						AudioProfile = "Universal_Base_2";
-							team = "2";
 							locked = "true";
 					};
 					new StaticShape(Team2generatorLarge2) {
@@ -473,11 +435,8 @@ new SimGroup(MissionGroup) {
 						lockCount = "0";
 						homingCount = "0";
 							name = "South Bunker Generator";
-							Target = "42";
-							team = "2";
-							scoreValue = "5";
 							locked = "true";
-					needsObjectiveWaypoint = true;
+							needsObjectiveWaypoint = "1";
 					};
 					new StaticShape(Team2StationInventory1) {
 						position = "-115.004 27.3879 132.533";
@@ -487,9 +446,6 @@ new SimGroup(MissionGroup) {
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							Target = "43";
-							team = "2";
-							Trigger = "6359";
 							locked = "true";
 					};
 					new StaticShape(Team2StationInventory2) {
@@ -500,9 +456,6 @@ new SimGroup(MissionGroup) {
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							Target = "44";
-							team = "2";
-							Trigger = "6361";
 							locked = "true";
 					};
 					new ForceFieldBare() {
@@ -510,13 +463,12 @@ new SimGroup(MissionGroup) {
 						rotation = "1 0 0 0";
 						scale = "1 4.49667 6.22947";
 						dataBlock = "defaultTeamSlowFieldBare";
-							Target = "45";
+						lockCount = "0";
-							team = "2";
+						homingCount = "0";
 							locked = "true";
 					};
 				};
 				new SimGroup(ObjLambda) {
-						powerCount = "1";
 
 					new InteriorInstance() {
 						position = "-58.1054 -111.149 132.645";
@@ -525,7 +477,6 @@ new SimGroup(MissionGroup) {
 						interiorFile = "bbunk1.dif";
 						showTerrainInside = "0";
 						AudioProfile = "Universal_Base_2";
-							team = "2";
 							locked = "true";
 					};
 					new StaticShape(Team2generatorLarge3) {
@@ -537,11 +488,8 @@ new SimGroup(MissionGroup) {
 						lockCount = "0";
 						homingCount = "0";
 							name = "North Bunker Generator";
-							Target = "46";
-							team = "2";
-							scoreValue = "5";
 							locked = "true";
-					needsObjectiveWaypoint = true;
+							needsObjectiveWaypoint = "1";
 					};
 					new StaticShape(Team2StationInventory3) {
 						position = "-61.3169 -115.977 126.67";
@@ -551,9 +499,6 @@ new SimGroup(MissionGroup) {
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							Target = "47";
-							team = "2";
-							Trigger = "6368";
 							locked = "true";
 					};
 					new StaticShape(Team2StationInventory4) {
@@ -564,9 +509,6 @@ new SimGroup(MissionGroup) {
 						dataBlock = "StationInventory";
 						lockCount = "0";
 						homingCount = "0";
-							Target = "48";
-							team = "2";
-							Trigger = "6370";
 							locked = "true";
 					};
 					new ForceFieldBare() {
@@ -574,14 +516,13 @@ new SimGroup(MissionGroup) {
 						rotation = "1 0 0 0";
 						scale = "0.985513 4.37129 6.19709";
 						dataBlock = "defaultTeamSlowFieldBare";
-							Target = "49";
+						lockCount = "0";
-							team = "2";
+						homingCount = "0";
 							locked = "true";
 					};
 				};
 			};
 			new SimGroup(AIObjectives) {
-					powerCount = "0";
 
 				new AIObjective(AIORepairObject) {
 					position = "-66.0305 -111.598 137.022";
@@ -593,7 +534,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the generatorLarge";
 					targetObject = "Team2generatorLarge3";
 					targetClientId = "-1";
-					targetObjectId = "6366";
+					targetObjectId = "4478";
 					location = "-66.0305 -111.598 137.022";
 					weightLevel1 = "3200";
 					weightLevel2 = "1600";
@@ -608,7 +549,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIORepairObject) {
 					position = "-61.3335 -115.982 128.367";
@@ -620,7 +560,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the StationInventory";
 					targetObject = "Team2StationInventory3";
 					targetClientId = "-1";
-					targetObjectId = "6367";
+					targetObjectId = "4479";
 					location = "-61.3335 -115.982 128.367";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -635,7 +575,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIORepairObject) {
 					position = "-69.5116 -106.377 128.364";
@@ -647,7 +586,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the StationInventory";
 					targetObject = "Team2StationInventory4";
 					targetClientId = "-1";
-					targetObjectId = "6369";
+					targetObjectId = "4481";
 					location = "-69.5116 -106.377 128.364";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -662,7 +601,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIODefendLocation) {
 					position = "-202.729 -45.0803 99.9606";
@@ -674,7 +612,7 @@ new SimGroup(MissionGroup) {
 					description = "Defend the FlipFlop";
 					targetObject = "Team2FlipFlop1";
 					targetClientId = "-1";
-					targetObjectId = "6354";
+					targetObjectId = "4466";
 					location = "-202.729 -45.0803 99.9606";
 					weightLevel1 = "3900";
 					weightLevel2 = "2000";
@@ -689,7 +627,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIORepairObject) {
 					position = "-103.341 25.4572 144.392";
@@ -701,7 +638,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the generatorLarge";
 					targetObject = "Team2generatorLarge2";
 					targetClientId = "-1";
-					targetObjectId = "6357";
+					targetObjectId = "4469";
 					location = "-103.341 25.4572 144.392";
 					weightLevel1 = "3200";
 					weightLevel2 = "1600";
@@ -716,7 +653,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIODefendLocation) {
 					position = "-103.341 25.4572 144.392";
@@ -728,7 +664,7 @@ new SimGroup(MissionGroup) {
 					description = "Defend the generatorLarge";
 					targetObject = "Team2generatorLarge2";
 					targetClientId = "-1";
-					targetObjectId = "6357";
+					targetObjectId = "4469";
 					location = "-103.341 25.4572 144.392";
 					weightLevel1 = "3100";
 					weightLevel2 = "1500";
@@ -743,7 +679,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIORepairObject) {
 					position = "-115.004 27.3879 134.436";
@@ -755,7 +690,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the StationInventory";
 					targetObject = "Team2StationInventory1";
 					targetClientId = "-1";
-					targetObjectId = "6358";
+					targetObjectId = "4470";
 					location = "-115.004 27.3879 134.436";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -770,7 +705,6 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 				new AIObjective(AIORepairObject) {
 					position = "-90.4107 27.457 134.412";
@@ -782,7 +716,7 @@ new SimGroup(MissionGroup) {
 					description = "Repair the StationInventory";
 					targetObject = "Team2StationInventory2";
 					targetClientId = "-1";
-					targetObjectId = "6360";
+					targetObjectId = "4472";
 					location = "-90.4107 27.457 134.412";
 					weightLevel1 = "2900";
 					weightLevel2 = "1400";
@@ -797,15 +731,12 @@ new SimGroup(MissionGroup) {
 					forceClientId = "-1";
 					locked = "1";
 						isInvalid = "0";
-						team = "2";
 				};
 			};
 		};
 		new SimGroup(team0) {
-				powerCount = "0";
 
 			new SimGroup(AIObjectives) {
-					powerCount = "0";
 			};
 		};
 	};
@@ -819,12 +750,13 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "900";
+		visibleDistance = "500";
 		useSkyTextures = "1";
+		renderBottomTexture = "0";
 		SkySolidColor = "0.390000 0.390000 0.390000 0.000000";
-		fogDistance = "600";
+		fogDistance = "275";
-		fogColor = "0.500000 0.500000 0.500000 1.000000";
+		fogColor = "0.400000 0.400000 0.400000 1.000000";
-		fogVolume1 = "120 0 100";
+		fogVolume1 = "0 0 0";
 		fogVolume2 = "0 0 0";
 		fogVolume3 = "0 0 0";
 		materialList = "Lush_l4.dml";
@@ -833,8 +765,8 @@ new SimGroup(MissionGroup) {
 		fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000000";
 		fogVolumeColor3 = "128.000000 128.000000 128.000000 0.000000";
-			cloudSpeed0 = "0.000001 0.000001";
 			locked = "true";
+			cloudSpeed0 = "0.000001 0.000001";
 	};
 	new WaterBlock() {
 		position = "-128 -96 90";
@@ -851,37 +783,8 @@ new SimGroup(MissionGroup) {
 		removeWetEdges = "1";
 			locked = "true";
 	};
-	new SimGroup(Environment) {
+	new SimGroup(environment) {
-			powerCount = "0";
 
-		new TSStatic() {
-			position = "-99.589 -115.88 125.815";
-			rotation = "0 0 -1 55.0039";
-			scale = "1 1 1";
-			shapeName = "borg19.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-55.6873 14.5 124.435";
-			rotation = "0 0 1 123.186";
-			scale = "1 1 1";
-			shapeName = "borg18.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-103.306 -39.641 104.528";
-			rotation = "0 0 -1 12.605";
-			scale = "1 1 1";
-			shapeName = "borg16.dts";
-				locked = "true";
-		};
-		new TSStatic() {
-			position = "-122.789 -30.4939 104.096";
-			rotation = "0 0 1 63.5983";
-			scale = "1 1 1";
-			shapeName = "borg17.dts";
-				locked = "true";
-		};
 		new TSStatic() {
 			position = "-46.068 -90.5109 114.357";
 			rotation = "0 0 -1 32.0856";
@@ -897,15 +800,14 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new TSStatic() {
-			position = "-117.452 -39.1965 105.735";
+			position = "-122.789 -30.4939 104.096";
-			rotation = "1 0 0 0";
+			rotation = "0 0 1 63.5983";
 			scale = "1 1 1";
-			shapeName = "borg34.dts";
+			shapeName = "borg17.dts";
 				locked = "true";
 		};
 	};
 	new SimGroup(ObserverDropPoints) {
-			powerCount = "0";
 
 		new Camera() {
 			position = "-31.5635 30.7804 157.928";
@@ -954,10 +856,8 @@ new SimGroup(MissionGroup) {
 		};
 	};
 	new SimGroup(RandomOrganics) {
-			powerCount = "0";
 
 		new SimGroup(Addition4BEPlant1) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-105 -82 103.342";
@@ -1003,7 +903,6 @@ new SimGroup(MissionGroup) {
 				locked = "true";
 		};
 		new SimGroup(Addition5PhoenixPlant1) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-113 46 132.148";
@@ -1140,7 +1039,6 @@ new SimGroup(MissionGroup) {
 			};
 		};
 		new SimGroup(Addition6PhoenixPlant2) {
-				powerCount = "0";
 
 			new TSStatic() {
 				position = "-137 102 168.824";
@@ -1277,26 +1175,11 @@ new SimGroup(MissionGroup) {
 			};
 		};
 		new SimGroup(Addition1BELgTree18) {
-				powerCount = "0";
 
 			new TSStatic() {
-				position = "-121 14 128.484";
+				position = "-97.206 -50.249 101.355";
-				rotation = "0 0 -1 102";
+				rotation = "0 0 1 58.9997";
-				scale = "0.9 0.9 0.9";
+				scale = "1.2 1.2 1.2";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-49 6 119.805";
-				rotation = "0 0 1 57.9999";
-				scale = "1.4 1.4 1.4";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-105 -18 99.633";
-				rotation = "0 0 1 169";
-				scale = "0.8 0.8 0.8";
 				shapeName = "borg18.dts";
 					locked = "true";
 			};
@@ -1307,24 +1190,9 @@ new SimGroup(MissionGroup) {
 				shapeName = "borg18.dts";
 					locked = "true";
 			};
-			new TSStatic() {
-				position = "-97.206 -50.249 101.355";
-				rotation = "0 0 1 58.9997";
-				scale = "1.2 1.2 1.2";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
-			new TSStatic() {
-				position = "-121 -74 104.211";
-				rotation = "0 0 -1 79";
-				scale = "1.1 1.1 1.1";
-				shapeName = "borg18.dts";
-					locked = "true";
-			};
 		};
 	};
 	new SimGroup(Ambiance) {
-			powerCount = "0";
 
 		new AudioEmitter() {
 			position = "-60.3481 -42.8411 108.656";

base/missions/Sirocco.mis

@@ -42,14 +42,14 @@ new SimGroup(MissionGroup) {
 		cloudSpeed1 = "0.0001";
 		cloudSpeed2 = "0.0002";
 		cloudSpeed3 = "0.0003";
-		visibleDistance = "900";
+		visibleDistance = "700";
 		useSkyTextures = "0";
 		SkySolidColor = "1.000000 0.450000 0.000000 0.000000";
-		fogDistance = "350";
+		fogDistance = "250";
 		fogColor = "0.600000 0.300000 0.000000 1.000000";
-		fogVolume1 = "0 0 0";
+		fogVolume1 = "250 0 75";
-		fogVolume2 = "0 0 0";
+		fogVolume2 = "600 75 120";
-		fogVolume3 = "0 0 0";
+		fogVolume3 = "2000 120 200";
 		materialList = "sky_desert_brown.dml";
 		windVelocity = "1 0 0";
 		windEffectPrecipitation = "0";

base/missions/Slapdash.mis

@@ -943,14 +943,6 @@ new SimGroup(MissionGroup) {
 			showTerrainInside = "0";
 				locked = "true";
 		};
-		new InteriorInstance() {
-			position = "-362.627 208.53 118.664";
-			rotation = "0 0 -1 40.68";
-			scale = "1 1 1";
-			interiorFile = "bbunkc.dif";
-			showTerrainInside = "0";
-				locked = "true";
-		};
 		new InteriorInstance() {
 			position = "-741.056 50.94 127.615";
 			rotation = "0 0 1 89.9544";

base/missions/Underhill.mis

@@ -33,7 +33,7 @@ new SimGroup(MissionGroup) {
 		cloudSpeed[0] = "0.000500 0.000030";
 		cloudSpeed[1] = "0.000120 0.000001";
 		cloudSpeed[2] = "0.000205 0.000002";
-		visibleDistance = "500";
+		visibleDistance = "400";
 		useSkyTextures = "1";
 		SkySolidColor = "0.39 0.39 0.39 0.000000";
 		fogDistance = "25";

base/prefs/French Config.cs

@@ -59,8 +59,6 @@ moveMap.bind(keyboard, "c", toggleCommanderMap);
 moveMap.bind(keyboard, "ctrl k", suicide);
 moveMap.bind(keyboard, "f1", toggleHelpGui);
 moveMap.bind(keyboard, "f2", toggleScoreScreen);
-moveMap.bind(keyboard, "f3", startRecordingDemo);
-moveMap.bind(keyboard, "f4", stopRecordingDemo);
 moveMap.bind(keyboard, "f6", toggleHudWaypoints);
 moveMap.bind(keyboard, "f7", toggleHudMarkers);
 moveMap.bind(keyboard, "f8", toggleHudCommands);

base/prefs/German config.cs

@@ -72,8 +72,6 @@ moveMap.bind(keyboard, "c", toggleCommanderMap);
 moveMap.bind(keyboard, "ctrl k", suicide);
 moveMap.bind(keyboard, "f1", toggleHelpGui);
 moveMap.bind(keyboard, "f2", toggleScoreScreen);
-moveMap.bind(keyboard, "f3", startRecordingDemo);
-moveMap.bind(keyboard, "f4", stopRecordingDemo);
 moveMap.bind(keyboard, "f6", toggleHudWaypoints);
 moveMap.bind(keyboard, "f7", toggleHudMarkers);
 moveMap.bind(keyboard, "f8", toggleHudTargets);

base/prefs/Italian Config.cs

@@ -73,8 +73,6 @@ moveMap.bind(keyboard, "c", toggleCommanderMap);
 moveMap.bind(keyboard, "ctrl k", suicide);
 moveMap.bind(keyboard, "f1", toggleHelpGui);
 moveMap.bind(keyboard, "f2", toggleScoreScreen);
-moveMap.bind(keyboard, "f3", startRecordingDemo);
-moveMap.bind(keyboard, "f4", stopRecordingDemo);
 moveMap.bind(keyboard, "f6", toggleHudWaypoints);
 moveMap.bind(keyboard, "f7", toggleHudMarkers);
 moveMap.bind(keyboard, "f8", toggleHudTargets);

base/prefs/Spanish Config.cs

@@ -72,8 +72,6 @@ moveMap.bind(keyboard, "c", toggleCommanderMap);
 moveMap.bind(keyboard, "ctrl k", suicide);
 moveMap.bind(keyboard, "f1", toggleHelpGui);
 moveMap.bind(keyboard, "f2", toggleScoreScreen);
-moveMap.bind(keyboard, "f3", startRecordingDemo);
-moveMap.bind(keyboard, "f4", stopRecordingDemo);
 moveMap.bind(keyboard, "f6", toggleHudWaypoints);
 moveMap.bind(keyboard, "f7", toggleHudMarkers);
 moveMap.bind(keyboard, "f8", toggleHudTargets);

base/prefs/WASDConfig.cs

@@ -61,8 +61,6 @@ moveMap.bind(keyboard, "c", toggleCommanderMap);
 moveMap.bind(keyboard, "ctrl k", suicide);
 moveMap.bind(keyboard, "f1", toggleHelpGui);
 moveMap.bind(keyboard, "f2", toggleScoreScreen);
-moveMap.bind(keyboard, "f3", startRecordingDemo);
-moveMap.bind(keyboard, "f4", stopRecordingDemo);
 moveMap.bind(keyboard, "f6", toggleHudWaypoints);
 moveMap.bind(keyboard, "f7", toggleHudMarkers);
 moveMap.bind(keyboard, "f8", toggleHudTargets);

base/scripts/ChatGui.cs

@@ -416,7 +416,7 @@ function ChatRoomMemberList::onRightMouseDown(%this,%column,%row,%mousePos)
 
    // if ( !ChatMember.player.isBot )
 
-   ChatMemberPopup.add(%nick,-1);
+   ChatMemberPopup.add(%nick,7);
    for (%i = 0; %i < strlen(%nick) * 1.5; %i++)
       %line = %line @ "-";
    ChatMemberPopup.add(%line,-1);
@@ -449,6 +449,7 @@ function ChatRoomMemberList::onRightMouseDown(%this,%column,%row,%mousePos)
          ChatMemberPopup.add("Mute",6);
 
 	  ChatMemberPopup.add( "--------------------",-1);
+//   	  ChatMemberPopup.add( "Instant Message", 9 );
    	  ChatMemberPopup.add( "TMail", 10 );
 	  ChatMemberPopup.add( "Add To Buddylist",11);
 
@@ -484,6 +485,8 @@ function ChatPrivate()
 function ChatMemberPopup::onSelect(%this,%id,%text)
 {
    %member = getSubStr(ChatMemberPopup.member.displayName,0,strlen(ChatMemberPopup.member.displayname)-strlen(nextToken(ChatMemberPopup.member.displayname,name,"^"))-1);
+   if(getsubstr(%member,strlen(%member)-1,strlen(%member)) $= "^")
+		%member = getsubstr(%member,0,strlen(%member)-1);
    switch( %id )
    {
       case 0:  // Set Back
@@ -502,6 +505,10 @@ function ChatMemberPopup::onSelect(%this,%id,%text)
          IRCClient::kick(ChatMemberPopup.member,$pref::IRCClient::banmsg);
       case 6:  // Mute/Unmute
          IRCClient::ignore(ChatMemberPopup.member,!(ChatMemberPopup.member.flags & $PERSON_IGNORE));
+	  case 7: // go to webbrowser page
+		 LinkBrowser(%member,"warrior");
+	  case 9: // Instant Message
+		IRCClient::invite(ChatMemberPopup.member, %id);
 	  case 10: // TMail
 		 LinkEMail(%member);
 	  case 11: // Add To Buddylist
@@ -848,6 +855,8 @@ function IRCClient::notify(%event)
       case IDIRC_INVITED: //invited to join existing channel.
          //MessageBoxOKCancel("Invite", "You have been invited to channel " @ IRCClient::displayChannel($IRCClient::invitechannel) @ " by " @ $IRCClient::inviteperson @ ".", "IRCClient::join($IRCClient::invitechannel);");
          IRCClient::newMessage($IRCClient::CurrentChannel, "You have been invited to channel " @ $IRCClient::invitechannel @ " by " @ $IRCClient::inviteperson @ ".");
+	  case IDIRC_INSTANTMSG:
+		   messageBoxOK("TESTING","This is a test of the Instant Messaging System.  Sent By: " @ $IRCClient::inviteperson @ ".");
       case IDIRC_BAN_LIST:
          ChannelBannedList_refresh();
       case IDIRC_TOPIC:
@@ -1537,9 +1546,10 @@ function IRCClient::dispatch(%prefix,%command,%params)
        IRCClient::onVersion(%prefix,%params);
      case "ACTION":
        IRCClient::onAction(%prefix,%params);
-     case "INVITE":
+     case "INVITE":		
        IRCClient::onInvite(%prefix,%params);
-
+	 case "INSTANTMSG":
+		IRCClient::onInstantMsg(%prefix,%params);
      case "301":
        IRCClient::onAwayReply(%prefix,%params);
      case "305":
@@ -1557,8 +1567,7 @@ function IRCClient::dispatch(%prefix,%command,%params)
      case "315":
        IRCClient::onEndOfWho(%prefix,%params);
      case "317":
-       IRCClient::onWhoisIdle(%prefix,%params);
+       IRCClient::onWhoisIdle(%prefix,%params);     
-     
      case "322":
        IRCClient::onList(%prefix,%params);
      case "323":
@@ -2348,8 +2357,8 @@ function IRCClient::onList(%prefix,%params)
      $IRCClient::channelTopics[$IRCClient::numChannels] = %topic;
      $IRCClient::numChannels++;
    }
-   else
+//    else
-      IRCClient::newMessage($IRCClient::currentChannel,%users @ " " @ %ch @ " -- " @ %topic);
+//       IRCClient::newMessage($IRCClient::currentChannel,%users @ " " @ %ch @ " -- " @ %topic);
 }
 
 //------------------------------------------------------------------------------
@@ -2525,7 +2534,25 @@ function IRCClient::onChannelInviteOnly(%prefix,%params)
    IRCClient::statusMessage("Cannot join " @ %channel @ ": room is invite only.");
    IRCClient::notify(IDIRC_INVITE_ONLY);
 }
+//------------------------------------------------------------------------------
+function IRCClient::onInstantMsg(%prefix,%params)
+{
+   %p = IRCClient::findPerson2(%prefix,true);
+   if (%p)
+   {
+      %params = nextToken(%params,channel,":");
+      %channel = %params;
 
+      // Only bother the user if they aren't ignoring this person
+      if (!(%person.flags & $PERSON_IGNORE))
+      {
+         // Set vars and notify the responder
+         $IRCClient::invitechannel = %channel;
+         $IRCClient::inviteperson = IRCClient::displayNick(%p);
+         IRCClient::notify(IDIRC_INSTANTMSG);
+      }
+   }
+}
 //------------------------------------------------------------------------------
 function IRCClient::onInvite(%prefix,%params)
 {
@@ -3166,7 +3193,7 @@ function IRCClient::ignore(%p,%tf)
 //------------------------------------------------------------------------------
 function IRCClient::invite(%p,%c)
 {
-   IRCClient::send("INVITE" SPC %p.displayName SPC %c.getName());
+	IRCClient::send("INVITE" SPC %p.displayName SPC %c.getName());
 }
 
 //------------------------------------------------------------------------------

base/scripts/GameGui.cs

@@ -18,16 +18,23 @@ function GameGui::onWake( %this )
 {
    Canvas.pushDialog( LaunchToolbarDlg );
 
-   GM_Frame.setTitle( $PlayingOnline ? "GAME" : "LAN GAME" );
+	if ( isDemo() || $PlayingOnline )
+   	GM_Frame.setTitle( "GAME" );
+	else
+   	GM_Frame.setTitle( "LAN GAME" );
 
    // This is essentially an "isInitialized" flag...
    if ( GM_TabView.tabCount() == 0 )
    {
       GM_TabView.addTab( 1, "JOIN" );
-      GM_TabView.addTab( 2, "HOST" );
+		if ( !isDemo() )
-      GM_TabView.addTab( 3, "WARRIOR SETUP", 1 );
+		{
-
+      	GM_TabView.addTab( 2, "HOST" );
-      queryMasterGameTypes();
+      	GM_TabView.addTab( 3, "WARRIOR SETUP", 1 );
+      	queryMasterGameTypes();
+		}
+		else
+			%this.pane = "Join";
    }
 
    switch$ ( %this.pane )
@@ -106,21 +113,27 @@ function GM_JoinPane::onActivate( %this )
 
    if ( %this.onceOnly $= "" )
    {
-      GM_VersionText.setText( "Version" SPC getT2VersionNumber() );
+		GM_VersionText.setText( "Version" SPC getT2VersionNumber() );
       GMJ_StopBtn.setActive( false );
 
       %this.onceOnly = 1;
-      GMJ_Browser.lastQuery = $PlayingOnline ? "Master" : "LanServers";
+		if ( isDemo() || isDemoServer() )
+			GMJ_Browser.lastQuery = "Demo";
+		else
+      	GMJ_Browser.lastQuery = $PlayingOnline ? "Master" : "LanServers";
       GMJ_Browser.runQuery();
    }
+   
+   if ( isObject( BrowserMap ) )
+   {
+      BrowserMap.pop();
+      BrowserMap.delete();
+   }
+   new ActionMap( BrowserMap );
+   BrowserMap.bindCmd( keyboard, insert, "GMJ_Browser.insertIPAddress();", "" );
+   BrowserMap.push();
 
-   GM_VersionText.setVisible( true );
+   GM_VersionText.setVisible( !isDemo() );
-
-   // Use Server Info prefs:
-   SI_Window.resize( firstWord( $pref::ServerBrowser::InfoWindowPos ),
-         getWord( $pref::ServerBrowser::InfoWindowPos, 1 ),
-         firstWord( $pref::ServerBrowser::InfoWindowExtent ),
-         getWord( $pref::ServerBrowser::InfoWindowExtent, 1 ) );
 
    if ( $pref::ServerBrowser::InfoWindowOpen )
       Canvas.pushDialog( ServerInfoDlg );
@@ -129,14 +142,12 @@ function GM_JoinPane::onActivate( %this )
 //------------------------------------------------------------------------------
 function GM_JoinPane::onDeactivate( %this )
 {
+   BrowserMap.pop();
+   BrowserMap.delete();
+   
    GM_VersionText.setVisible( false );
 
-   // Save off the Server Info Window prefs:
    $pref::ServerBrowser::InfoWindowOpen = GMJ_Browser.infoWindowOpen;
-   $pref::ServerBrowser::InfoWindowPos = SI_Window.getPosition();
-   $pref::ServerBrowser::InfoWindowExtent = SI_Window.getExtent();
-   $pref::ServerBrowser::InfoWindowBarPos = getWord( SI_InfoScroll.getExtent(), 1 );
-
    if ( GMJ_Browser.infoWindowOpen )
       Canvas.popDialog( ServerInfoDlg );
 }
@@ -173,9 +184,12 @@ $BrowserColumnCount++;
 $BrowserColumnName[9] = "IP Address";
 $BrowserColumnRange[9] = "25 200";
 $BrowserColumnCount++;
-$BrowserColumnName[10] = "Version";
+if ( !isDemo() )
-$BrowserColumnRange[10] = "25 200";
+{
-$BrowserColumnCount++;
+	$BrowserColumnName[10] = "Version";
+	$BrowserColumnRange[10] = "25 200";
+	$BrowserColumnCount++;
+}
 
 //------------------------------------------------------------------------------
 function GMJ_Browser::onAdd( %this )
@@ -184,8 +198,11 @@ function GMJ_Browser::onAdd( %this )
 	for ( %i = 0;  %i < $BrowserColumnCount; %i++ )
 	{
 		%key = firstWord( $pref::ServerBrowser::Column[%i] );
-		%width = getWord( $pref::ServerBrowser::Column[%i], 1 );
+		if ( $BrowserColumnName[%key] !$= "" && $BrowserColumnRange[%key] !$= "" )
-		%this.addColumn( %key, $BrowserColumnName[%key], %width, firstWord( $BrowserColumnRange[%key] ), getWord( $BrowserColumnRange[%key], 1 ) );
+		{
+			%width = getWord( $pref::ServerBrowser::Column[%i], 1 );
+			%this.addColumn( %key, $BrowserColumnName[%key], %width, firstWord( $BrowserColumnRange[%key] ), getWord( $BrowserColumnRange[%key], 1 ) );
+		}
 	}
 	%this.setSortColumn( $pref::ServerBrowser::SortColumnKey );
 	%this.setSortIncreasing( $pref::ServerBrowser::SortInc );
@@ -233,6 +250,15 @@ function GMJ_Browser::runQuery( %this )
       queryLanServers( $JoinGamePort );
       GMJ_StopBtn.setActive( true );
    }
+	else if ( %this.lastQuery $= "Demo" )
+	{
+      GMJ_StatusText.setValue( "Querying the master server..." );
+      GMJ_FilterBtn.setActive( false );
+		GMJ_FilterBtn.setVisible( false );
+      GMJ_FilterText.setText( "Demo Servers" );
+      queryMasterServer( $JoinGamePort );
+      GMJ_StopBtn.setActive( true );
+	}
    else
    {
 		GMJ_FilterBtn.setActive( true );
@@ -438,6 +464,36 @@ function GMJ_Browser::removeFavorite( %this, %address )
       $pref::ServerBrowser::FavoriteCount--;
 }
 
+//------------------------------------------------------------------------------
+function GMJ_Browser::insertIPAddress( %this )
+{
+   if ( isServerQueryActive() )
+   {
+      BrowserMap.pop();
+      MessageBoxOK( "ERROR", "Can't insert addresses while a query is running!", "BrowserMap.push();" );
+      alxPlay( InputDeniedSound, 0, 0, 0 );
+      return;
+   }
+   
+   IPEntry.setText( "IP:" );
+   Canvas.pushDialog( EnterIPDlg );
+}
+
+//------------------------------------------------------------------------------
+function EnterIPDlg::onDone( %this )
+{
+   Canvas.popDialog( EnterIPDlg );
+   %address = IPEntry.getValue();
+   if ( getSubStr( %address, 0, 3 ) !$= "IP:" )
+      %address = "IP:" @ %address;
+   if ( strpos( %address, ":", 3 ) == -1 )
+      %address = %address @ ":28000";
+      
+   error( ">> address = \"" @ %address @ "\" <<" );
+   pushServerAddress( %address );
+   GMJ_Browser.selectRowByAddress( %address );
+}
+
 //------------------------------------------------------------------------------
 function ServerInfoDlg::onAdd( %this )
 {
@@ -448,6 +504,25 @@ function ServerInfoDlg::onAdd( %this )
 function ServerInfoDlg::onWake( %this )
 {
    GMJ_Browser.infoWindowOpen = true;
+
+   // Get the position and size from the prefs:
+   %res = getResolution();
+   %resW = firstWord( %res );
+   %resH = getWord( %res, 1 );
+   %w = firstWord( $pref::ServerBrowser::InfoWindowExtent );
+   if ( %w > %resW )
+      %w = %resW;
+   %h = getWord( $pref::ServerBrowser::InfoWindowExtent, 1 );
+   if ( %h > %resH )
+      %h = %resH;
+   %x = firstWord( $pref::ServerBrowser::InfoWindowPos );
+   if ( %x > %resW - %w )
+      %x = %resW - %w;
+   %y = getWord( $pref::ServerBrowser::InfoWindowPos, 1 );
+   if ( %y > %resH - %h )
+      %y = %resH - %h;
+   SI_Window.resize( %x, %y, %w, %h );
+
    GMJ_InfoBtn.setActive( false );
    SI_RefreshBtn.setActive( false );
    %this.update();
@@ -572,6 +647,12 @@ function SI_ContentWindow::fill( %this, %content )
 function ServerInfoDlg::onSleep( %this )
 {
    GMJ_Browser.infoWindowOpen = false;
+
+   // Save off the Server Info Window prefs:
+   $pref::ServerBrowser::InfoWindowPos = SI_Window.getPosition();
+   $pref::ServerBrowser::InfoWindowExtent = SI_Window.getExtent();
+   $pref::ServerBrowser::InfoWindowBarPos = getWord( SI_InfoScroll.getExtent(), 1 );
+   
    GMJ_InfoBtn.setActive( true );
 }
 

base/scripts/LaunchLanGui.cs

@@ -83,7 +83,17 @@ function LaunchToolbarDlg::onWake(%this)
 
    LaunchToolbarMenu.clear();
 
-   if ( $PlayingOnline )
+   if ( isDemo() )
+   {
+      LaunchToolbarMenu.add( 1, "TRAINING" );
+      LaunchToolbarMenu.add( 0, "GAME" );
+      LaunchToolbarMenu.add( 2, "NEWS" );
+      //LaunchToolbarMenu.add( 3, "FORUMS" );
+      //LaunchToolbarMenu.add( 4, "EMAIL" );
+      //LaunchToolbarMenu.add( 5, "CHAT" );
+      //LaunchToolbarMenu.add( 6, "BROWSER" );
+   }
+   else if ( $PlayingOnline )
    {
       LaunchToolbarMenu.add( 0, "GAME" );
       LaunchToolbarMenu.add( 2, "NEWS" );
@@ -111,7 +121,17 @@ function LaunchToolbarDlg::onWake(%this)
 //       LaunchToolbarMenu.add( 11, "LOG ON" );
    LaunchToolbarMenu.add( 9, "QUIT" );
 
-   LaunchToolbarCloseButton.setVisible( LaunchTabView.tabCount() > 0 );
+   %on = false;
+   for ( %tab = 0; %tab < LaunchTabView.tabCount(); %tab++ )
+   {
+      if ( LaunchTabView.isTabActive( %tab ) )
+      {
+         %on = true;
+         break;
+      }
+   }
+   
+   LaunchToolbarCloseButton.setVisible( %on );
 }
 
 //----------------------------------------------------------------------------
@@ -125,14 +145,25 @@ function OpenLaunchTabs( %gotoWarriorSetup )
    $FirstLaunch = "";
 
    // Set up all of the launch bar tabs:
-   if ( $PlayingOnline )
+   if ( isDemo() )
+   {
+      LaunchTabView.addLaunchTab( "TRAINING",   TrainingGui );
+      LaunchTabView.addLaunchTab( "GAME",       GameGui );
+      LaunchTabView.addLaunchTab( "NEWS",       NewsGui );
+      LaunchTabView.addLaunchTab( "FORUMS",     "", true );
+      LaunchTabView.addLaunchTab( "EMAIL",      "", true );
+      LaunchTabView.addLaunchTab( "CHAT",       "", true );
+      LaunchTabView.addLaunchTab( "BROWSER",    "", true );
+      %launchGui = GameGui;
+   }
+   else if ( $PlayingOnline )
    {
       LaunchTabView.addLaunchTab( "GAME",    GameGui );
       LaunchTabView.addLaunchTab( "NEWS",    NewsGui );
       LaunchTabView.addLaunchTab( "FORUMS",  ForumsGui );
       LaunchTabView.addLaunchTab( "EMAIL",   EmailGui );
       LaunchTabView.addLaunchTab( "CHAT",    ChatGui );
-      LaunchTabView.addLaunchTab( "BROWSER", TribeAndWarriorBrowserGui );
+      LaunchTabView.addLaunchTab( "BROWSER", TribeandWarriorBrowserGui);
 
       switch$ ( $pref::Shell::LaunchGui )
       {
@@ -140,7 +171,7 @@ function OpenLaunchTabs( %gotoWarriorSetup )
          case "Forums":    %launchGui = ForumsGui;
          case "Email":     %launchGui = EmailGui;
          case "Chat":      %launchGui = ChatGui;
-         case "Browser":   %launchGui = TribeAndWarriorBrowserGui;
+         case "Browser":   %launchGui = TribeandWarriorBrowserGui;
          default:          %launchGui = GameGui;
       }
    }
@@ -158,12 +189,14 @@ function OpenLaunchTabs( %gotoWarriorSetup )
 }
 
 //--------------------------------------------------------
-function LaunchTabView::addLaunchTab( %this, %text, %gui )
+function LaunchTabView::addLaunchTab( %this, %text, %gui, %makeInactive )
 {
    %tabCount = %this.tabCount();
    %this.gui[%tabCount] = %gui;
    %this.key[%tabCount] = 0;
    %this.addTab( %tabCount, %text );
+	if ( %makeInactive )
+		%this.setTabActive( %tabCount, false );
 }
 
 //--------------------------------------------------------
@@ -219,10 +252,13 @@ function LaunchTabView::closeCurrentTab( %this )
 function LaunchTabView::closeTab( %this, %gui, %key )
 {
    %tabCount = %this.tabCount();
-   for ( %tab = 0; %tab < %tabCount; %tab++ )
+   %activeCount = 0;
+   for ( %i = 0; %i < %tabCount; %i++ )
    {
-      if( %this.gui[%tab] $= %gui && %this.key[%tab] $= %key )
+      if ( %this.gui[%i] $= %gui && %this.key[%i] $= %key )
-         break;
+         %tab = %i;
+      else if ( %this.isTabActive( %i ) )
+         %activeCount++;
    }
 
    if ( %tab == %tabCount )
@@ -237,7 +273,7 @@ function LaunchTabView::closeTab( %this, %gui, %key )
    %this.removeTabByIndex( %tab );
    %gui.onClose( %key );
    
-   if ( %tabCount == 1 )
+   if ( %activeCount == 0 )
    {
       %this.lastTab = "";
       Canvas.setContent( LaunchGui );
@@ -275,7 +311,10 @@ function LaunchGui::onWake(%this)
    if ( !$FirstLaunch )
       LaunchTabView.viewLastTab();
 
-   checkNamesAndAliases();
+	if ( !isDemo() )
+   	checkNamesAndAliases();
+	else
+		OpenLaunchTabs();
 }
 
 //----------------------------------------------------------------------------

base/scripts/OptionsDlg.cs

@@ -185,6 +185,18 @@ function OptionsDlg::onWake( %this )
       %selId = 1;
    OP_LaunchScreenMenu.setText( OP_LaunchScreenMenu.getTextById( %selId ) );
    OP_LaunchScreenMenu.setSelected( %selId );
+   
+   // Hide controls that are not relevant to the demo:
+   if ( isDemo() )
+   {
+      OP_MasterServerTxt.setVisible( false );
+      OP_MasterServerMenu.setVisible( false );
+      OP_CheckEmailTgl.setVisible( false );
+      OP_ChatDisconnectTgl.setVisible( false );
+      OP_EditChatMenuBtn.setVisible( false );
+      OP_LaunchScreenTxt.setVisible( false );
+      OP_LaunchScreenMenu.setVisible( false );
+   }
 
 	%this.setPane( %this.pane );
 }
@@ -1160,17 +1172,15 @@ function OP_VoiceListenMenu::init( %this )
    %this.add( ".v12",         1 );
    %this.add( ".v12 - .v24",  3 );
    %this.add( ".v12 - .v29",  7 );
-   %this.add( ".v12 - .gsm",  15 );
 
    switch ( $pref::Audio::decodingMask )
    {
-      case 0 or 3 or 7 or 15:
+      case 0 or 3 or 7:
          %this.setSelected( $pref::Audio::decodingMask );
       default:
          %this.setSelected( 1 );
    }
 
-   // Linux only has the GSM codec available for now
    if ( $platform $= "linux" ) {
       %this.setActive(false);
    }
@@ -1183,11 +1193,9 @@ function OP_VoiceSendMenu::init( %this )
    %this.add( ".v12",   0 );
    %this.add( ".v24",   1 );
    %this.add( ".v29",   2 );
-   %this.add( ".gsm",   3 );
 
    %this.setSelected($pref::Audio::encodingLevel);
 
-   // Linux only has the GSM codec available for now
    if ( $platform $= "linux" ) {
       %this.setActive(false);
    }
@@ -1201,7 +1209,6 @@ function OP_VoiceCodecInfo::init( %this )
                   "  .v12: variable bitrate codec (~1.2 kbits/sec win only)" NL
                   "  .v24: fixed bitrate codec (2.4 kbits/sec win only)" NL
                   "  .v29: fixed bitrate codec (2.9 kbits/sec win only)" NL
-                  "  .gsm: fixed bitrate codec (6.6 kbits/sec win/linux)" NL
                   "\n" @
                   "<bitmap:bullet_2><lmargin:24>" @ 
                      "Setting your codec levels too high can have adverse" @

base/scripts/TrainingGui.cs

@@ -252,6 +252,7 @@ function TrainingGui::startTraining( %this )
 {
    MessagePopup( "STARTING MISSION", "Initializing, please wait..." );
    Canvas.repaint();
+   cancelServerQuery();
    %file = getField( TrainingMissionList.getValue(), 1 );
 	$ServerName = "Single Player Training";
    $HostGameType = "SinglePlayer";

base/scripts/admin.cs

@@ -6,6 +6,7 @@ $VoteMessage["VoteChangeMission"] = "change the mission to";
 $VoteMessage["VoteTeamDamage", 0] = "enable team damage";
 $VoteMessage["VoteTeamDamage", 1] = "disable team damage";
 $VoteMessage["VoteTournamentMode"] = "change the server to";
+$VoteMessage["VoteFFAMode"] = "change the server to";
 $VoteMessage["VoteChangeTimeLimit"] = "change the time limit to";
 $VoteMessage["VoteMatchStart"] = "start the match";
 $VoteMessage["VoteGreedMode", 0] = "enable Hoard Mode";
@@ -15,6 +16,13 @@ $VoteMessage["VoteHoardMode", 1] = "disable Greed Mode";
 
 function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %playerVote)
 {
+   //DEMO VERSION - only voteKickPlayer is allowed
+   if ((isDemo() || isDemoServer()) && %typeName !$= "VoteKickPlayer")
+   {
+      messageClient(%client, '', "All voting options except to kick a player are disabled in the DEMO VERSION.");
+      return;
+   }
+
    // haha - who gets the last laugh... No admin for you!
    if( %typeName $= "VoteAdminPlayer" && !$Host::allowAdminPlayerVotes )
       return;

base/scripts/client.cs

@@ -50,9 +50,9 @@ function clientCmdPickTeamMenu( %teamA, %teamB )
 
 function clientCmdProcessPickTeam( %option )
 {
-   if( %option <= 4 )
+   if( %option !$= "" && %option <= 4 )
       CommandToServer( 'clientPickedTeam', %option );
-   else if( %option == 5 )     
+   else if( %option !$= "" && %option == 5 )     
       disconnect();
    
    Canvas.popDialog( PickTeamDlg );
@@ -64,16 +64,13 @@ $LastHudTarget = 0;
 
 function addMessageHudLine(%text)
 {
-   //first, see if we're "scrolled up"...
+   %adjustPos = false;
-   %textHeight = chatHud.profile.fontSize;
+   if( chatPageDown.isVisible() )
-   if (%textHeight <= 0)
+   {
-      %textHeight = 12;
+      %adjustPos = true;
-   %chatScrollHeight = getWord(chatHud.getGroup().getGroup().extent, 1);
-   %chatPosition = getWord(chatHud.extent, 1) - %chatScrollHeight + getWord(chatHud.position, 1);
-   %linesToScroll = mFloor((%chatPosition / %textHeight) + 0.5);
-   if (%linesToScroll > 0)
       %origPosition = chatHud.position;
-      
+   }
+   
    //add the message...
    while( !chatPageDown.isVisible() && HudMessageVector.getNumLines() && (HudMessageVector.getNumLines() >= $pref::HudMessageLogSize))
    {
@@ -86,7 +83,7 @@ function addMessageHudLine(%text)
    $LastHudTarget = 0;
 
    //now that we've added the message, see if we need to reset the position
-   if (%linesToScroll > 0)
+   if ( %adjustPos )
    {
       chatPageDown.setVisible(true);
       ChatPageDown.position = ( firstWord( outerChatHud.extent ) - 20 ) @ " " @ ( $chatScrollLenY[$Pref::chatHudLength] - 6 );
@@ -466,8 +463,8 @@ function clientCmdToggleDashHud(%val)
       if(isObject(turreteerHud))
          turreteerHud.delete();
       // reset in case of vehicle-specific reticle
-      reticleHud.setBitmap("");
+      //reticleHud.setBitmap("");
-      reticleFrameHud.setVisible(false);
+      //reticleFrameHud.setVisible(false);
    }
    dashboardHud.setVisible(%val);
 }

base/scripts/clientAudio.cs

@@ -89,6 +89,18 @@ function initAudio()
    alxSetChannelVolume( $RadioAudioType, $pref::Audio::radioVolume );
 
    alxSetCaptureGainScale( $pref::Audio::captureGainScale );
+   
+   // cap the codec levels
+   if( $platform $= "linux" )
+   {
+      $pref::Audio::encodingLevel = -1;
+      $pref::Audio::decodingMask = 0;
+   }
+
+   if( $pref::Audio::encodingLevel > 2)
+      $pref::Audio::encodingLevel = 2;
+
+   $pref::Audio::decodingMask &= 7;
 }
 
 if($Audio::initialized)

base/scripts/clientDefaults.cs

@@ -11,8 +11,8 @@ $pref::Audio::channels = 2;
 $pref::Audio::enableVoiceCapture = 1;
 $pref::Audio::voiceChannels = 1;
 if ( $platform $= "linux" ) {
-   $pref::Audio::encodingLevel = 3;             
+   $pref::Audio::encodingLevel = -1;             
-   $pref::Audio::decodingMask = 15;
+   $pref::Audio::decodingMask = 0;
 } else {
    $pref::Audio::encodingLevel = 0;             
    $pref::Audio::decodingMask = 1;
@@ -32,6 +32,8 @@ $pref::Email::Column0 = 30;
 $pref::Email::Column1 = 250;
 $pref::Email::Column2 = 250;
 $pref::Email::Column3 = 150;
+$pref::Email::ComposeWindowPos = "74 32";
+$pref::Email::ComposeWindowExtent = "500 408";
 $pref::Email::SortColumnKey = 3;
 $pref::Email::SortInc = 1;
 $pref::EnableBadWordFilter = 1;
@@ -79,6 +81,8 @@ $pref::Forum::Column0 = 290;
 $pref::Forum::Column1 = 265;
 $pref::Forum::Column2 = 159;
 $pref::Forum::CacheSize = 100;
+$pref::Forum::PostWindowPos = "69 32";
+$pref::Forum::PostWindowExtent = "500 408";
 $pref::HudMessageLogSize = 40;
 $pref::Input::ActiveConfig = "MyConfig";
 $pref::Input::LinkMouseSensitivity = 1;
@@ -105,7 +109,8 @@ $pref::Net::RegionMask = 2;
 $pref::Net::CheckEmail = 0;
 $pref::Net::DisconnectChat = 0;
 $pref::Net::LagThreshold = 400;
-$pref::overrideTeamSkins = 0;
+$pref::News::PostWindowPos = "85 39";
+$pref::News::PostWindowExtent = "470 396";
 $pref::Player::Count = 0;
 $pref::Player::Current = 0;
 $pref::Player::defaultFov = 90;
@@ -126,7 +131,8 @@ $pref::ServerBrowser::Column6 = "8 56";
 $pref::ServerBrowser::Column7 = "9 155";
 $pref::ServerBrowser::Column8 = "4 89";
 $pref::ServerBrowser::Column9 = "6 74";
-$pref::ServerBrowser::Column10 = "10 70";
+if ( !isDemo() )
+	$pref::ServerBrowser::Column10 = "10 70";
 $pref::ServerBrowser::FavoriteCount = 0;
 $pref::ServerBrowser::SortColumnKey = 0;
 $pref::ServerBrowser::SortInc = 1;

base/scripts/clientTasks.cs

@@ -336,4 +336,7 @@ function TaskHudDlg::onSleep(%this)
    TaskHudMap.pop();
    TaskList.setVisible(false);
    TaskList.updateSelected(false);
+
+   //make sure the action maps are still pushed in the correct order...
+   updateActionMaps();
 }

base/scripts/controlDefaults.cs

@@ -1330,4 +1330,5 @@ function cycleDebugRenderMode()
 }
 
 // Since the toggle console key is remappable, put it here:
-GlobalActionMap.bind(keyboard, "grave", toggleConsole);
+if (!isDemo())
+   GlobalActionMap.bind(keyboard, "grave", toggleConsole);

base/scripts/creditsText.cs

@@ -379,7 +379,7 @@ addCreditsLine("Gino \"tAngGSI\" Gard");
 addCreditsLine("Glenn \"IcyHot\" Wisbey");
 addCreditsLine("Gregory \"Brak Panda\" Pesochin");
 addCreditsLine("Gregory \"Strife\" Hill");
-addCreditsLine("Hannes \"Skace\" Wagner");
+addCreditsLine("Hannes \"Cohen\" Wagner");
 addCreditsLine("Ian \"Kowboy\" Gonsalves");
 addCreditsLine("Ian Threadgold");
 addCreditsLine("J Alex \"Blackheart\" Wheeler");
@@ -456,6 +456,7 @@ addCreditsLine("Shane \"Mental Trousers\" Taylor");
 addCreditsLine("Shane \"Santa\" Beaumont");
 addCreditsLine("Shane \"Shaneman\" Evans");
 addCreditsLine("Stefan Grufman");
+addCreditsLine("Stefan \"Skace\" Kiehne");
 addCreditsLine("Stephen \"Cato\" Farquhar");
 addCreditsLine("Stephen \"SL83\" Limowski");
 addCreditsLine("Steve \"Presto\" Eisner");

base/scripts/damageTypes.cs

@@ -100,7 +100,7 @@ $DamageTypeText[99] = "suicide";
 //**** SHRIKE SCOUT FIGHTER ****
 datablock SimDataBlock(ShrikeDamageProfile)
 {
-   shieldDamageScale[$DamageType::Blaster] 			= 1.0;
+   shieldDamageScale[$DamageType::Blaster] 			= 1.75;
    shieldDamageScale[$DamageType::Bullet] 			= 1.75;
    shieldDamageScale[$DamageType::ELF] 				= 1.0;
    shieldDamageScale[$DamageType::ShockLance] 		= 0.5;
@@ -108,10 +108,10 @@ datablock SimDataBlock(ShrikeDamageProfile)
    shieldDamageScale[$DamageType::ShrikeBlaster] 	= 4.0;
    shieldDamageScale[$DamageType::BellyTurret] 		= 2.0;
    shieldDamageScale[$DamageType::AATurret] 		= 3.0;
-   shieldDamageScale[$DamageType::IndoorDepTurret] 	= 2.25;
+   shieldDamageScale[$DamageType::IndoorDepTurret] 	= 2.5;
-   shieldDamageScale[$DamageType::OutdoorDepTurret] = 2.25;
+   shieldDamageScale[$DamageType::OutdoorDepTurret] = 2.5;
-   shieldDamageScale[$DamageType::SentryTurret] 	= 2.25;
+   shieldDamageScale[$DamageType::SentryTurret] 	= 2.5;
-   shieldDamageScale[$DamageType::Disc] 			= 1.0;
+   shieldDamageScale[$DamageType::Disc] 			= 1.5;
    shieldDamageScale[$DamageType::Grenade] 			= 1.0;
    shieldDamageScale[$DamageType::Mine] 			= 3.0;
    shieldDamageScale[$DamageType::Missile] 			= 3.0;
@@ -138,13 +138,13 @@ datablock SimDataBlock(ShrikeDamageProfile)
    damageScale[$DamageType::ShrikeBlaster] 			= 3.5;
    damageScale[$DamageType::BellyTurret] 			= 1.2;
    damageScale[$DamageType::AATurret] 				= 1.5;
-   damageScale[$DamageType::IndoorDepTurret] 		= 1.25;
+   damageScale[$DamageType::IndoorDepTurret] 		= 1.5;
-   damageScale[$DamageType::OutdoorDepTurret] 		= 1.25;
+   damageScale[$DamageType::OutdoorDepTurret] 		= 1.5;
-   damageScale[$DamageType::SentryTurret] 			= 1.25;
+   damageScale[$DamageType::SentryTurret] 			= 1.5;
-   damageScale[$DamageType::Disc] 					= 1.0;
+   damageScale[$DamageType::Disc] 					= 1.25;
    damageScale[$DamageType::Grenade] 				= 0.75;
    damageScale[$DamageType::Mine] 					= 4.0;
-   damageScale[$DamageType::Missile] 				= 1.5;
+   damageScale[$DamageType::Missile] 				= 2.0;
    damageScale[$DamageType::Mortar] 				= 2.0;
    damageScale[$DamageType::Plasma] 				= 0.5;
    damageScale[$DamageType::BomberBombs] 			= 2.0;
@@ -297,19 +297,19 @@ datablock SimDataBlock(WildcatDamageProfile)
    shieldDamageScale[$DamageType::ELF] 				= 1.0;
    shieldDamageScale[$DamageType::ShockLance] 		= 1.0;
    shieldDamageScale[$DamageType::Laser] 			= 4.0;
-   shieldDamageScale[$DamageType::ShrikeBlaster] 	= 5.0;
+   shieldDamageScale[$DamageType::ShrikeBlaster] 	= 6.0;
    shieldDamageScale[$DamageType::BellyTurret] 		= 2.0;
    shieldDamageScale[$DamageType::AATurret] 		= 2.0;
    shieldDamageScale[$DamageType::IndoorDepTurret] 	= 2.5;
    shieldDamageScale[$DamageType::OutdoorDepTurret] = 2.5;
    shieldDamageScale[$DamageType::Disc] 			= 2.5;
    shieldDamageScale[$DamageType::Grenade] 			= 2.0;
-   shieldDamageScale[$DamageType::Mine] 			= 3.5;
+   shieldDamageScale[$DamageType::Mine] 			= 4.0;
    shieldDamageScale[$DamageType::Missile] 			= 4.0;
    shieldDamageScale[$DamageType::Mortar] 			= 2.0;
-   shieldDamageScale[$DamageType::Plasma] 			= 1.6;
+   shieldDamageScale[$DamageType::Plasma] 			= 2.0;
-   shieldDamageScale[$DamageType::BomberBombs] 		= 2.0;
+   shieldDamageScale[$DamageType::BomberBombs] 		= 2.5;
-   shieldDamageScale[$DamageType::TankChaingun] 	= 2.0;
+   shieldDamageScale[$DamageType::TankChaingun] 	= 3.0;
    shieldDamageScale[$DamageType::TankMortar] 		= 2.0;
    shieldDamageScale[$DamageType::MissileTurret] 	= 4.0;
    shieldDamageScale[$DamageType::MortarTurret] 	= 2.0;
@@ -326,7 +326,7 @@ datablock SimDataBlock(WildcatDamageProfile)
    damageScale[$DamageType::ELF] = 0.0;
    damageScale[$DamageType::ShockLance] = 0.50;
    damageScale[$DamageType::Laser] = 2.0;
-   damageScale[$DamageType::ShrikeBlaster] = 2.5;
+   damageScale[$DamageType::ShrikeBlaster] = 4.0;
    damageScale[$DamageType::BellyTurret] = 1.5;
    damageScale[$DamageType::AATurret] = 1.0;
    damageScale[$DamageType::IndoorDepTurret] = 1.0;
@@ -336,9 +336,9 @@ datablock SimDataBlock(WildcatDamageProfile)
    damageScale[$DamageType::Mine] = 4.0;
    damageScale[$DamageType::Missile] = 1.2;
    damageScale[$DamageType::Mortar] = 1.0;
-   damageScale[$DamageType::Plasma] = 1.2;
+   damageScale[$DamageType::Plasma] = 1.5;
-   damageScale[$DamageType::BomberBombs] = 1.0;
+   damageScale[$DamageType::BomberBombs] = 2.0;
-   damageScale[$DamageType::TankChaingun] = 1.0;
+   damageScale[$DamageType::TankChaingun] = 2.0;
    damageScale[$DamageType::TankMortar] = 1.0;
    damageScale[$DamageType::MissileTurret] = 1.2;
    damageScale[$DamageType::MortarTurret] = 1.0;
@@ -686,7 +686,7 @@ datablock SimDataBlock(HeavyPlayerDamageProfile)
    damageScale[$DamageType::Bullet] = 0.6;
    damageScale[$DamageType::ELF] = 0.75;
    damageScale[$DamageType::ShockLance] = 1.0;
-   damageScale[$DamageType::Laser] = 0.63;
+   damageScale[$DamageType::Laser] = 0.67;
    damageScale[$DamageType::ShrikeBlaster] = 1.0;
    damageScale[$DamageType::BellyTurret] = 1.0;
    damageScale[$DamageType::AATurret] = 0.7;

base/scripts/deathMessages.cs

@@ -39,6 +39,9 @@ $DeathMessageSuicide[4] = '\c0%1 self-destructs in a fit of ennui.';
 $DeathMessageVehPadCount = 1;
 $DeathMessageVehPad[0] = '\c0%1 got caught in a vehicle\'s spawn field.'; 
 
+$DeathMessageRogueMineCount = 1;
+$DeathMessageRogueMine[$DamageType::Mine, 0] = '\c0%1 is all mine.';
+
 //these used when a player kills himself (other than by using ctrl - k)
 $DeathMessageSelfKillCount = 5;
 $DeathMessageSelfKill[$DamageType::Blaster, 0] = '\c0%1 kills %2self with a blaster.';	
@@ -349,9 +352,9 @@ $DeathMessageCTurretKill[$DamageType::TankMortars, 0] = '\c0Whoops! %1 + %4\'s t
 $DeathMessageCTurretKill[$DamageType::TankMortars, 1] = '\c0%1 learns the happy explosion dance from %4\'s tank mortar.';
 $DeathMessageCTurretKill[$DamageType::TankMortars, 2] = '\c0%4\'s tank mortar has a blast with %1.';
 
-$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 0] = '\c0%1 lunches on a Shrike blaster sandwich, courtesy of %4.';
+$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 0] = '\c0%1 dines on a Shrike blaster sandwich, courtesy of %4.';
-$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 1] = '\c0%4\'s Shrike blaster catches %1 with %3 pants down.';
+$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 1] = '\c0The blaster of %4\'s Shrike turns %1 into finely shredded meat.';
-$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 2] = '\c0%1 gets drilled big-time by %4\'s Shrike blaster.';
+$DeathMessageCTurretKill[$DamageType::ShrikeBlaster, 2] = '\c0%1 gets drilled big-time by the blaster of %4\'s Shrike.';
 
 $DeathMessageCTurretKill[$DamageType::MPBMissile, 0] = '\c0%1 intersects nicely with %4\'s MPB Missile.';
 $DeathMessageCTurretKill[$DamageType::MPBMissile, 1] = '\c0%4\'s MPB Missile makes armored chowder out of %1.';

base/scripts/defaultGame.cs

@@ -753,6 +753,18 @@ function DefaultGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType
          %clVictim.lastDamageTurretTime = getSimTime();
          %clVictim.lastDamageTurret = %sourceObject;
       }
+   
+      %turretAttacker = %sourceObject.getControllingClient();
+      // should get a damagae message from friendly fire turrets also
+       if(%turretAttacker && %turretAttacker != %clVictim && %turretAttacker.team == %clVictim.team)
+       {   
+          if (%game.numTeams > 1 && %turretAttacker.player.causedRecentDamage != %clVictim.player)    //is a teamgame & player just damaged a teammate
+          {
+                %turretAttacker.player.causedRecentDamage = %clVictim.player;
+             %turretAttacker.player.schedule(1000, "causedRecentDamage", "");   //allow friendly fire message every x ms
+             %game.friendlyFireMessage(%clVictim, %turretAttacker);          
+          }        
+       }
    }
    else if (%sourceClassType $= "PlayerData")
    {
@@ -1076,7 +1088,7 @@ function DefaultGame::displayDeathMessages(%game, %clVictim, %clKiller, %damageT
 	      logEcho(%clVictim.nameBase@" (pl "@%clVictim.player@"/cl "@%clVictim@") killed by a vehicle (unmanned)");
 		}
 	}
-   else if (isObject(%implement) && (%implement.getClassName() $= "Turret" || %implement.getClassName() $= "VehicleTurret"))   //player killed by a turret
+   else if (isObject(%implement) && (%implement.getClassName() $= "Turret" || %implement.getClassName() $= "VehicleTurret" || %implement.getClassName() $= "FlyingVehicle" ))   //player killed by a turret
    {
       if (%implement.getControllingClient() != 0)  //is turret being controlled?
       {
@@ -1150,6 +1162,11 @@ function DefaultGame::displayDeathMessages(%game, %clVictim, %clKiller, %damageT
       messageAll('msgLightningKill',  $DeathMessageLightning[mFloor(getRandom() * $DeathMessageLightningCount)], %victimName, %victimGender, %victimPoss, %killerName, %killerGender, %killerPoss, %damageType);
       logEcho(%clVictim.nameBase@" (pl "@%clVictim.player@"/cl "@%clVictim@") killed by lightning");
    }
+   else if ( %damageType == $DamageType::Mine && !isObject(%implement) )
+   {
+         error("Mine kill w/o source");
+         messageAll('MsgRogueMineKill', $DeathMessageRogueMine[%damageType, mFloor(getRandom() * $DeathMessageRogueMineCount)], %victimName, %victimGender, %victimPoss, %killerName, %killerGender, %killerPoss, %damageType);
+   }
    else  //was a legitimate enemy kill
    {  
       if(%damageType == 6 && (%clVictim.headShot))
@@ -2352,8 +2369,8 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
       %outrankTarget = !%targetClient.isSuperAdmin;
    else if ( %client.isAdmin )
       %outrankTarget = !%targetClient.isAdmin;
-      
+   
-   if( %client.isSuperAdmin && %targetClient.guid != 0 )
+   if( %client.isSuperAdmin && %targetClient.guid != 0 && !isDemo() && !isDemoServer())
    {   
       messageClient( %client, 'MsgPlayerPopupItem', "", %key, "addAdmin", "", 'Add to Server Admin List', 10);
       messageClient( %client, 'MsgPlayerPopupItem', "", %key, "addSuperAdmin", "", 'Add to Server SuperAdmin List', 11);
@@ -2363,9 +2380,9 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
    if ( !%isTargetSelf )
    {
       if ( %client.muted[%targetClient] )
-         messageClient( %client, 'MsgPlayerPopupItem', "", %key, "MutePlayer", "", 'Unmute', 1);
+         messageClient( %client, 'MsgPlayerPopupItem', "", %key, "MutePlayer", "", 'Unmute Text Chat', 1);
       else
-         messageClient( %client, 'MsgPlayerPopupItem', "", %key, "MutePlayer", "", 'Mute', 1);
+         messageClient( %client, 'MsgPlayerPopupItem', "", %key, "MutePlayer", "", 'Mute Text Chat', 1);
 
       if ( !%isTargetBot && %client.canListenTo( %targetClient ) )
       {
@@ -2382,7 +2399,7 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
    // regular vote options on players
    if ( %game.scheduleVote $= "" && !%isAdmin && !%isTargetAdmin )
    {
-      if ( $Host::allowAdminPlayerVotes && !%isTargetBot )
+      if ( $Host::allowAdminPlayerVotes && !%isTargetBot && !isDemo() && !isDemoServer())
          messageClient( %client, 'MsgPlayerPopupItem', "", %key, "AdminPlayer", "", 'Vote to Make Admin', 2 );
       
       if ( !%isTargetSelf )
@@ -2392,7 +2409,7 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
    }
 
    // Admin only options on players:
-   else if ( %isAdmin )
+   else if ( %isAdmin && !isDemo() && !isDemoServer())
    {
       if ( !%isTargetBot && !%isTargetAdmin )
          messageClient( %client, 'MsgPlayerPopupItem', "", %key, "AdminPlayer", "", 'Make Admin', 2 );
@@ -2472,6 +2489,9 @@ function DefaultGame::sendGameVoteMenu( %game, %client, %key )
 
    if( !%client.canVote && !%isAdmin )
       return;
+
+   if (isDemo() || isDemoServer())
+      return;
    
    if ( %game.scheduleVote $= "" )
    {

base/scripts/deployables.cs

@@ -111,7 +111,10 @@ datablock StaticShapeData(DeployedStationInventory) : StaticShapeDamageProfile
    maxDamage = 0.70;
    destroyedLevel = 0.70;
    disabledLevel = 0.42;
-   explosion = DeployablesExplosion;
+   explosion      = DeployablesExplosion;
+      expDmgRadius = 8.0;
+      expDamage = 0.35;
+      expImpulse = 500.0;
 
    dynamicType = $TypeMasks::StationObjectType;
    isShielded = true;
@@ -622,7 +625,7 @@ function TurretIndoorDeployableImage::testTurretTooClose(%item, %plyr)
    while((%found = containerSearchNext()) != 0)
    {
       %foundName = %found.getDataBlock().getName();
-      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) || (%foundName $= DeployedStationInventory))
+      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) )
          if (%found.team == %plyr.team)
          {
             %turretInRange = true;
@@ -642,7 +645,7 @@ function TurretOutdoorDeployableImage::testTurretTooClose(%item, %plyr)
    while((%found = containerSearchNext()) != 0)
    {
       %foundName = %found.getDataBlock().getName();
-      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) || (%foundName $= DeployedStationInventory))
+      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) )
          if (%found.team == %plyr.team)
          {
             %turretInRange = true;
@@ -666,7 +669,7 @@ function TurretIndoorDeployableImage::testTurretSaturation(%item)
    while(%found)
    {
       %foundName = %found.getDataBlock().getName();
-      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) || (%foundName $= DeployedStationInventory))
+      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) )
       {
            //found one
            %numTurretsNearby++;
@@ -691,7 +694,7 @@ function TurretOutdoorDeployableImage::testTurretSaturation(%item)
    while(%found)
    {
       %foundName = %found.getDataBlock().getName();
-      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) || (%foundName $= DeployedStationInventory))
+      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) )
       {
            //found one
            %numTurretsNearby++;
@@ -724,7 +727,7 @@ function testNearbyDensity(%item, %radius)
    while(%found)
    {
       %foundName = %found.getDataBlock().getName();
-      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) || (%foundName $= DeployedStationInventory))
+      if((%foundname $= TurretDeployedFloorIndoor) || (%foundName $= TurretDeployedWallIndoor) || (%foundName $= TurretDeployedCeilingIndoor) || (%foundName $= TurretDeployedOutdoor) )
          %turretCount++;       
      %found = containerSearchNext();      
    }

base/scripts/hud.cs

@@ -802,13 +802,13 @@ function MainChatHud::nextChatHudLen( %this )
    
    %totalLines = HudMessageVector.getNumLines();
    %posLines = $pref::chatHudLength * 4;
-   %linesOver = ( %totalLines - %posLines ) * 14;
+   %linesOver = %totalLines - %posLines;
    ChatPageDown.position = ( firstWord( outerChatHud.extent ) - 20 ) @ " " @ ( $chatScrollLenY[$pref::chatHudLength] - 6 );
    
    if( ( %linesOver > 0 ) && !%sizeIncrease )
    {
       %linesOver = %totalLines - %posLines;
-      %posAdjust = %linesOver * ChatHud.profile.fontSize + 3;
+      %posAdjust = %linesOver * $ShellFontSize;
       
       %newPos = "0" @ " " @ ( -1 * %posAdjust );   
       ChatHud.position = %newPos;
@@ -816,7 +816,7 @@ function MainChatHud::nextChatHudLen( %this )
    else if( %sizeIncrease && ( %linesOver > 0 ) )
    {
       %curPos = getWord( ChatHud.position, 1 );
-      %newY = %curPos + ( 4 * 14 );
+      %newY = %curPos + ( 4 * $ShellFontSize );
       %newPos = "0 " @ %newY;
       ChatHud.position = %newPos;
    }
@@ -1094,11 +1094,10 @@ function ClientCmdDisplayHuds()
          else
             mainVoteHud.setVisible(0);   
          
-         clientCmdSetWeaponsHudActive(0);
    }
 }
 
-function clientCmdTogglePlayHuds(%val)
+function clientcmdTogglePlayHuds(%val)
 {
    ammoHud.setVisible(%val);
    objectiveHud.setVisible(%val);
@@ -1748,4 +1747,13 @@ function displayObserverHud(%client, %targetClient, %potentialClient)
 function hudFirstPersonToggled()
 {
    ammoHud.setVisible($firstPerson);
+}
+
+$testCount = 0;
+
+function testChatHud()
+{
+   $testCount++;
+   messageAll( '', "This is test number " @ $testCount );
+   $tester = schedule( 50, 0, "testChatHud");
 }

base/scripts/packs/repairpack.cs

@@ -183,10 +183,6 @@ function RepairPackImage::onActivate(%data, %obj, %slot)
    {
       messageClient(%obj.client, 'MsgRepairPackOn', '\c2Repair pack activated.');
 
-      // unmount any weapon the player may have been holding
-      if(%obj.getMountedImage($WeaponSlot))
-         %obj.unmountImage($WeaponSlot);
-
       // make sure player's arm thread is "look"
       %obj.setArmThread(look);
 

base/scripts/player.cs

@@ -1216,7 +1216,7 @@ datablock PlayerData(LightMaleHumanArmor) : LightPlayerDamageProfile
    energyPerDamagePoint = 75.0; // shield energy required to block one point of damage
 
    rechargeRate = 0.256;
-   jetForce = 26.2 * 90;
+   jetForce = 28.2 * 90;
    underwaterJetForce = 26.2 * 90 * 2.0;
    underwaterVertJetFactor = 1.5;
    jetEnergyDrain =  0.8;
@@ -1224,12 +1224,12 @@ datablock PlayerData(LightMaleHumanArmor) : LightPlayerDamageProfile
    minJetEnergy = 1;
    maxJetHorizontalPercentage = 0.8;
 
-   runForce = 48 * 90;
+   runForce = 55.20 * 90;
    runEnergyDrain = 0;
    minRunEnergy = 0;
-   maxForwardSpeed = 14;
+   maxForwardSpeed = 15;
-   maxBackwardSpeed = 13;
+   maxBackwardSpeed = 14;
-   maxSideSpeed = 13;
+   maxSideSpeed = 14;
 
    maxUnderwaterForwardSpeed = 8.4;
    maxUnderwaterBackwardSpeed = 7.8;
@@ -1294,10 +1294,10 @@ datablock PlayerData(LightMaleHumanArmor) : LightPlayerDamageProfile
    minJumpSpeed = 20;
    maxJumpSpeed = 30;
 
-   maxJetForwardSpeed = 30;
    horizMaxSpeed = 68;
    horizResistSpeed = 33;
    horizResistFactor = 0.35;
+   maxJetForwardSpeed = 30;
 
    upMaxSpeed = 80;
    upResistSpeed = 25;
@@ -1474,7 +1474,7 @@ datablock PlayerData(MediumMaleHumanArmor) : MediumPlayerDamageProfile
    energyPerDamagePoint = 75.0; // shield energy required to block one point of damage
 
    rechargeRate = 0.256;
-   jetForce = 24.6 * 130;
+   jetForce = 27.06 * 130;
    underwaterJetForce = 24.6 * 130 * 2.0;
    underwaterVertJetFactor = 1.5;
    jetEnergyDrain =  1.0;
@@ -1482,12 +1482,12 @@ datablock PlayerData(MediumMaleHumanArmor) : MediumPlayerDamageProfile
    minJetEnergy = 1;
    maxJetHorizontalPercentage = 0.8;
 
-   runForce = 40 * 130;
+   runForce = 46 * 130;
    runEnergyDrain = 0;
    minRunEnergy = 0;
-   maxForwardSpeed = 11;
+   maxForwardSpeed = 12;
-   maxBackwardSpeed = 10;
+   maxBackwardSpeed = 11;
-   maxSideSpeed = 10;
+   maxSideSpeed = 11;
 
    maxUnderwaterForwardSpeed = 6.6;
    maxUnderwaterBackwardSpeed = 6;
@@ -1500,7 +1500,7 @@ datablock PlayerData(MediumMaleHumanArmor) : MediumPlayerDamageProfile
    heatDecayPerSec      = 1.0 / 3.0; // takes 3 seconds to clear heat sig.
    heatIncreasePerSec   = 1.0 / 3.0; // takes 3.0 seconds of constant jet to get full heat sig.
 
-   jumpForce = 8.4 * 130;
+   jumpForce = 8.3 * 130;
    jumpEnergyDrain = 0;
    minJumpEnergy = 0;
    jumpSurfaceAngle = 75;
@@ -1512,15 +1512,15 @@ datablock PlayerData(MediumMaleHumanArmor) : MediumPlayerDamageProfile
 
    minJumpSpeed = 15;
    maxJumpSpeed = 25;
-   maxJetForwardSpeed = 22;
 
    horizMaxSpeed = 60;
    horizResistSpeed = 28;
-   horizResistFactor = 0.2;
+   horizResistFactor = 0.32;
+   maxJetForwardSpeed = 22;
 
-   upMaxSpeed = 80;
+   upMaxSpeed = 70;
-   upResistSpeed = 35;
+   upResistSpeed = 30;
-   upResistFactor = 0.15;
+   upResistFactor = 0.23;
 
    minImpactSpeed = 45;
    speedDamageScale = 0.004;
@@ -1730,7 +1730,7 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile
    energyPerDamagePoint = 75.0; // shield energy required to block one point of damage
 
    rechargeRate = 0.256;
-   jetForce = 21.4 * 180;
+   jetForce = 23.54 * 180;
    underwaterJetForce = 21.4 * 180 * 2.0;
    underwaterVertJetFactor = 1.5;
    jetEnergyDrain =  1.1;
@@ -1738,12 +1738,12 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile
    minJetEnergy = 1;
    maxJetHorizontalPercentage = 0.8;
 
-   runForce = 35 * 180;
+   runForce = 40.25 * 180;
    runEnergyDrain = 0;
    minRunEnergy = 0;
-   maxForwardSpeed = 6.5;
+   maxForwardSpeed = 7.5;
-   maxBackwardSpeed = 5;
+   maxBackwardSpeed = 6;
-   maxSideSpeed = 5;
+   maxSideSpeed = 6;
 
    maxUnderwaterForwardSpeed = 3.9;
    maxUnderwaterBackwardSpeed = 3;
@@ -1768,14 +1768,14 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile
    minJumpSpeed = 20;
    maxJumpSpeed = 30;
 
-   horizMaxSpeed = 50;
+   horizMaxSpeed = 52;
-   horizResistSpeed = 20;
+   horizResistSpeed = 23;
-   horizResistFactor = 0.3;
+   horizResistFactor = 0.29;
    maxJetForwardSpeed = 16;
 
    upMaxSpeed = 60;
    upResistSpeed = 35;
-   upResistFactor = 0.15;
+   upResistFactor = 0.18;
 
    minImpactSpeed = 45;
    speedDamageScale = 0.006;
@@ -2137,6 +2137,10 @@ function Armor::onUnmount( %this, %obj, %vehicle, %node )
    {
       commandToClient( %obj.client, 'VehicleDismount' );
       %obj.mountImage(%obj.lastWeapon, $WeaponSlot);
+      //Inform gunner position when pilot leaves...
+      //if(%vehicle.getDataBlock().showPilotInfo !$= "")
+      //   if((%gunner = %vehicle.getMountNodeObject(1)) != 0)
+      //      commandToClient(%gunner.client, 'PilotInfo', "PILOT EJECTED", 6, 1);
    }
    // announce to any other passengers that you've left
    if(%vehicle.getDatablock().numMountPoints > 1)
@@ -2157,7 +2161,7 @@ $ammoType[3] = "MortarAmmo";
 $ammoType[4] = "MissileLauncherAmmo";
 $ammoType[5] = "ChaingunAmmo";
 
-function Armor::onCollision(%this,%obj,%col)
+function Armor::onCollision(%this,%obj,%col,%forceVehicleNode)
 {
    if (%obj.getState() $= "Dead")
       return;
@@ -2167,7 +2171,7 @@ function Armor::onCollision(%this,%obj,%col)
    %client = %obj.client;
    // player collided with a vehicle
    %node = -1;
-   if ((%className $= WheeledVehicleData || %className $= FlyingVehicleData || %className $= HoverVehicleData) &&
+   if (%forceVehicleNode !$= "" || (%className $= WheeledVehicleData || %className $= FlyingVehicleData || %className $= HoverVehicleData) &&
          %obj.mountVehicle && %obj.getState() $= "Move" && %col.mountable) {
 
       //if the player is an AI, he should snap to the mount points in node order,
@@ -2191,7 +2195,7 @@ function Armor::onCollision(%this,%obj,%col)
             %node = findAIEmptySeat(%col, %obj);
       }
       else
-         %node = findEmptySeat(%col, %obj);
+         %node = findEmptySeat(%col, %obj, %forceVehicleNode);
 
       //now mount the player in the vehicle
       if(%node >= 0)

base/scripts/scoreScreen.cs

@@ -31,6 +31,9 @@ function ScoreScreen::onSleep(%this)
 {
    hudMap.pop();
    hudMap.delete();
+
+   //make sure the action maps are still pushed in the correct order...
+   updateActionMaps();
 }
 
 //------------------------------------------------------------------------------

base/scripts/server.cs

@@ -265,31 +265,31 @@ function kick( %client, %admin, %guid )
    
    messageClient(%client, 'onClientKicked', "");
    messageAllExcept( %client, -1, 'MsgClientDrop', "", %client.name, %client );
-	
+   
-	if( %client.isAIControlled() )
+   if( %client.isAIControlled() )
-	{
+   {
       $HostGameBotCount--;
-		%client.drop();
+      %client.drop();
-	}
+   }
-	else
+   else
-	{
+   {
       %count = ClientGroup.getCount();
       for( %i = 0; %i < %count; %i++ )
       {
          %cl = ClientGroup.getObject( %i );
-	      if( %cl.guid == %guid )
+         if( %cl.guid == %guid )
          {
-	         // kill and delete this client
+            // kill and delete this client
-	         if( isObject( %cl.player ) )
+            if( isObject( %cl.player ) )
-	            %cl.player.scriptKill(0);
+               %cl.player.scriptKill(0);
             
-	         %cl.schedule(700, "delete");
+            %cl.schedule(700, "delete");
-	         
+            
-	         BanList::add( %guid, "0", $Host::KickBanTime );
+            BanList::add( %guid, "0", $Host::KickBanTime );
-	         Game.kickGuid = "";
+            Game.kickGuid = "";
          }   
-	   }
+      }
-	}
+   }
 }
 
 function ban( %client, %admin )
@@ -338,148 +338,162 @@ function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice,
    sendLoadInfoToClient( %client );
 
    //%client.setSimulatedNetParams(0.1, 30);
-   // if hosting this server, set this client to superAdmin
+   if ( isDemo() )
-   if(%client.getAddress() $= "Local")
-   {   
-      %client.isAdmin = true;
-      %client.isSuperAdmin = true;
-   }
-
-   // Get the client's unique id:
-   %authInfo = %client.getAuthInfo();
-   %client.guid = getField( %authInfo, 3 );
-   
-   // check admin and super admin list, and set status accordingly
-   if ( !%client.isSuperAdmin )
    {
-      if ( isOnSuperAdminList( %client ) )
+      %client.armor = "Light";
+      %client.sex = "Male";
+      %client.race = "Human";
+      %client.name = addTaggedString( "DemoGuy" );
+      %client.nameBase = "DemoGuy";
+      %client.voice = "Male1";
+      %client.voiceTag = addtaggedString( "Male1" );
+   }
+   else
+   {
+      // if hosting this server, set this client to superAdmin
+      if(%client.getAddress() $= "Local")
       {   
          %client.isAdmin = true;
-         %client.isSuperAdmin = true;   
+         %client.isSuperAdmin = true;
       }
-      else if( isOnAdminList( %client ) )
-      {
-         %client.isAdmin = true;
-      }
-   }
-         
-   // Sex/Race defaults
-   switch$ ( %raceGender )
-   {
-      case "Human Male":
-         %client.sex = "Male";
-         %client.race = "Human";
-      case "Human Female":
-         %client.sex = "Female";
-         %client.race = "Human";
-      case "Bioderm":
-         %client.sex = "Male";
-         %client.race = "Bioderm";
-      default:
-         error("Invalid race/gender combo passed: " @ %raceGender);
-         %client.sex = "Male";
-         %client.race = "Human";
-   }
-   %client.armor = "Light";
 
-   // Override the connect name if this server does not allow smurfs:
+      // Get the client's unique id:
-   %realName = getField( %authInfo, 0 );
+      %authInfo = %client.getAuthInfo();
-   if ( $PlayingOnline && $Host::NoSmurfs )
+      %client.guid = getField( %authInfo, 3 );
-      %name = %realName;
-
-   if ( strcmp( %name, %realName ) == 0 )
-   {
-      %client.isSmurf = false;
-
-      // Add the tribal tag:
-      %tag = getField( %authInfo, 1 );
-      %append = getField( %authInfo, 2 );
-      if ( %append )
-         %name = "\cp\c6" @ %name @ "\c7" @ %tag @ "\co";
-      else
-         %name = "\cp\c7" @ %tag @ "\c6" @ %name @ "\co";
-
-      %client.sendGuid = %client.guid;
-   }
-   else
-   {
-      %client.isSmurf = true;
-      %client.sendGuid = 0;
-      %name = stripTrailingSpaces( strToPlayerName( %name ) );
-      if ( strlen( %name ) < 3 )
-         %name = "Poser";
       
-      // Make sure the alias is unique:
+      // check admin and super admin list, and set status accordingly
-      %isUnique = true;
+      if ( !%client.isSuperAdmin )
-      %count = ClientGroup.getCount();
-      for ( %i = 0; %i < %count; %i++ )
       {
-         %test = ClientGroup.getObject( %i );
+         if ( isOnSuperAdminList( %client ) )
-         %rawName = stripChars( detag( getTaggedString( %test.name ) ), "\cp\co\c6\c7\c8\c9" );
+         {   
-         if ( strcmp( %name, %rawName ) == 0 )
+            %client.isAdmin = true;
+            %client.isSuperAdmin = true;   
+         }
+         else if( isOnAdminList( %client ) )
          {
-            %isUnique = false;
+            %client.isAdmin = true;
-            break;
          }
       }
-
+            
-      // Append a number to make the alias unique:
+      // Sex/Race defaults
-      if ( !%isUnique )
+      switch$ ( %raceGender )
       {
-         %suffix = 1;
+         case "Human Male":
-         while ( !%isUnique )
+            %client.sex = "Male";
-         {
+            %client.race = "Human";
-            %nameTry = %name @ "." @ %suffix;
+         case "Human Female":
-            %isUnique = true;
+            %client.sex = "Female";
+            %client.race = "Human";
+         case "Bioderm":
+            %client.sex = "Male";
+            %client.race = "Bioderm";
+         default:
+            error("Invalid race/gender combo passed: " @ %raceGender);
+            %client.sex = "Male";
+            %client.race = "Human";
+      }
+      %client.armor = "Light";
 
-            %count = ClientGroup.getCount();
+      // Override the connect name if this server does not allow smurfs:
-            for ( %i = 0; %i < %count; %i++ )
+      %realName = getField( %authInfo, 0 );
+      if ( $PlayingOnline && $Host::NoSmurfs )
+         %name = %realName;
+
+      if ( strcmp( %name, %realName ) == 0 )
+      {
+         %client.isSmurf = false;
+
+         // Add the tribal tag:
+         %tag = getField( %authInfo, 1 );
+         %append = getField( %authInfo, 2 );
+         if ( %append )
+            %name = "\cp\c6" @ %name @ "\c7" @ %tag @ "\co";
+         else
+            %name = "\cp\c7" @ %tag @ "\c6" @ %name @ "\co";
+
+         %client.sendGuid = %client.guid;
+      }
+      else
+      {
+         %client.isSmurf = true;
+         %client.sendGuid = 0;
+         %name = stripTrailingSpaces( strToPlayerName( %name ) );
+         if ( strlen( %name ) < 3 )
+            %name = "Poser";
+         
+         // Make sure the alias is unique:
+         %isUnique = true;
+         %count = ClientGroup.getCount();
+         for ( %i = 0; %i < %count; %i++ )
+         {
+            %test = ClientGroup.getObject( %i );
+            %rawName = stripChars( detag( getTaggedString( %test.name ) ), "\cp\co\c6\c7\c8\c9" );
+            if ( strcmp( %name, %rawName ) == 0 )
             {
-               %test = ClientGroup.getObject( %i );
+               %isUnique = false;
-               %rawName = stripChars( detag( getTaggedString( %test.name ) ), "\cp\co\c6\c7\c8\c9" );
+               break;
-               if ( strcmp( %nameTry, %rawName ) == 0 )
+            }
+         }
+
+         // Append a number to make the alias unique:
+         if ( !%isUnique )
+         {
+            %suffix = 1;
+            while ( !%isUnique )
+            {
+               %nameTry = %name @ "." @ %suffix;
+               %isUnique = true;
+
+               %count = ClientGroup.getCount();
+               for ( %i = 0; %i < %count; %i++ )
                {
-                  %isUnique = false;
+                  %test = ClientGroup.getObject( %i );
-                  break;
+                  %rawName = stripChars( detag( getTaggedString( %test.name ) ), "\cp\co\c6\c7\c8\c9" );
+                  if ( strcmp( %nameTry, %rawName ) == 0 )
+                  {
+                     %isUnique = false;
+                     break;
+                  }
                }
+
+               %suffix++;
             }
 
-            %suffix++;
+            // Success!
+            %name = %nameTry;
          }
 
-         // Success!
+         %smurfName = %name;
-         %name = %nameTry;
+         // Tag the name with the "smurf" color:
+         %name = "\cp\c8" @ %name @ "\co";
       }
 
-      %smurfName = %name;
+      %client.name = addTaggedString(%name);
-      // Tag the name with the "smurf" color:
+      if(%client.isSmurf)
-      %name = "\cp\c8" @ %name @ "\co";
+         %client.nameBase = %smurfName;
+      else
+         %client.nameBase = %realName;
+
+      // Make sure that the connecting client is not trying to use a bot skin:
+      %temp = detag( %skin );
+      if ( %temp $= "basebot" || %temp $= "basebbot" )
+         %client.skin = addTaggedString( "base" );
+      else
+         %client.skin = addTaggedString( %skin );
+
+      %client.voice = %voice;
+      %client.voiceTag = addtaggedString(%voice);
+      
+      //set the voice pitch based on a lookup table from their chosen voice
+      %client.voicePitch = getValidVoicePitch(%voice, %voicePitch);
    }
 
-   %client.name = addTaggedString(%name);
-   if(%client.isSmurf)
-      %client.nameBase = %smurfName;
-   else
-      %client.nameBase = %realName;
    %client.justConnected = true;
    %client.isReady = false;
 
-   // Make sure that the connecting client is not trying to use a bot skin:
-   %temp = detag( %skin );
-   if ( %temp $= "basebot" || %temp $= "basebbot" )
-      %client.skin = addTaggedString( "base" );
-   else
-      %client.skin = addTaggedString( %skin );
-
    // full reset of client target manager
    clientResetTargets(%client, false);
 
-   %client.voice = %voice;
-   %client.voiceTag = addtaggedString(%voice);
-   
-   //set the voice pitch based on a lookup table from their chosen voice
-   %client.voicePitch = getValidVoicePitch(%voice, %voicePitch);
-
    %client.target = allocClientTarget(%client, %client.name, %client.skin, %client.voiceTag, '_ClientConnection', 0, 0, %client.voicePitch);
    %client.score = 0;
    %client.team = 0;
@@ -517,7 +531,7 @@ function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice,
    if ( $CurrentMissionType !$= "SinglePlayer" ) 
    {
       messageClient(%client, 'MsgClientJoin', '\c2Welcome to Tribes2 %1.', 
-            %name, 
+            %client.name, 
             %client, 
             %client.target, 
             false,   // isBot 
@@ -527,7 +541,7 @@ function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice,
             %client.sendGuid );
 
       messageAllExcept(%client, -1, 'MsgClientJoin', '\c1%1 joined the game.', 
-            %name, 
+            %client.name, 
             %client, 
             %client.target, 
             false,   // isBot 
@@ -538,7 +552,7 @@ function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice,
    }
    else
       messageClient(%client, 'MsgClientJoin', "\c0Mission Insertion complete...", 
-            %name, 
+            %client.name, 
             %client, 
             %client.target, 
             false,   // isBot 
@@ -595,7 +609,8 @@ function dismountPlayers()
 
 function loadMission( %missionName, %missionType, %firstMission )
 {
-   cls();
+   if (!$pref::NoClearConsole)
+      cls();
    buildLoadInfo( %missionName, %missionType );
    
    // reset all of these
@@ -738,6 +753,10 @@ function loadMissionStage2()
    else
       $TeamDamage = $Host::TeamDamageOn;
 
+   //the demo version always has team damage off
+   if (isDemo() || isDemoServer())
+      $TeamDamage = 0;
+
    Game.missionLoadDone();
    
    // start all the clients in the mission
@@ -1304,6 +1323,10 @@ function serverCmdChangePlayersTeam( %clientRequesting, %client, %team)
 {
    if( isObject( Game ) && %client != Game.kickClient && %clientRequesting.isAdmin)
    {   
+      // clear the pickteam menu
+      if( !$MatchStarted && $Host::TournamentMode && !$CountdownStarted && %client.camera.Mode $= "pickingTeam" )
+         commandToClient( %client, 'processPickTeam' ); 
+      
       serverCmdClientJoinTeam(%client, %team);
       
       if(!$MatchStarted)
@@ -1853,8 +1876,12 @@ function resetServerDefaults()
 {
    echo( "Resetting server defaults..." );
    
+   allowConnections( false );// no connections when resetting the server   
+   
    if( isObject( Game ) )
       Game.gameOver();
+   else
+      schedule( 500, 0, "resetServerDefaults" );
    
    // Override server defaults with prefs:   
    exec( "scripts/ServerDefaults.cs" );
@@ -1867,17 +1894,20 @@ function resetServerDefaults()
    if( $Host::botsEnabled )
       initGameBots( $Host::Map, $Host::MissionType );
    
-   // load the missions
+   // load the mission
-   loadMission( $Host::Map, $Host::MissionType );   
+   loadMission( $Host::Map, $Host::MissionType );
+   
+   // allow connections since were ready to go.
+   allowConnections( true );    
 }
 
 function removeAllBots()
 {
    while( ClientGroup.getCount() )
-	{
+   {
-		%client = ClientGroup.getObject(0);
+      %client = ClientGroup.getObject(0);
-		if(%client.isAIControlled())
+      if(%client.isAIControlled())
-			%client.drop();
+         %client.drop();
       else
          %client.delete();
    }
@@ -1925,6 +1955,9 @@ function getAdmin()
 
 function serverCmdSetPDAPose(%client, %val)
 {
+   if(!isObject(%client.player))
+      return;
+
    // if client is in a vehicle, return
    if(%client.player.isMounted())
       return;

base/scripts/serverCommanderMap.cs

@@ -85,9 +85,9 @@ function serverCmdControlObject(%client, %targetId)
       return;
    }
 
-	//mounted in a vehicle?
+   //mounted in a vehicle?
-	if (%client.player.isMounted())
+   if (%client.player.isMounted())
-	{
+   {
       commandToClient(%client, 'ControlObjectResponse', false, "can't control objects while mounted in a vehicle.");
       return;
    }
@@ -173,14 +173,14 @@ function serverCmdAttachCommanderCamera(%client, %target)
       commandToClient(%client, 'CameraAttachResponse', false);
       return;
    }
-   
+
    %data = %obj.getDataBlock();
    %obsData = %data.observeParameters;
    %obsX = firstWord(%obsData);
    %obsY = getWord(%obsData, 1);
    %obsZ = getWord(%obsData, 2);
 
-   %client.camera.mode = "observerFollow";
+   // don't set the camera mode so that it does not interfere with spawning
    %transform = %obj.getTransform();
    %client.camera.setTransform(%transform);
    %client.camera.setOrbitMode(%obj, %transform, %obsX, %obsY, %obsZ);

base/scripts/serverDefaults.cs

@@ -56,8 +56,7 @@ $Host::TeamDamageOn = 0;
 $MasterServerAddress = "IP:198.74.40.152:28000";
 
 // 0: .v12 (1.2 kbits/sec), 1: .v24 (2.4 kbits/sec), 2: .v29 (2.9kbits/sec)
-// 3:  gsm (6.6 kbits/sec)
+$Audio::maxEncodingLevel = 2;
-$Audio::maxEncodingLevel = 3;
 $Audio::maxVoiceChannels = 2;
 
 $Host::MapPlayerLimits["Abominable", "CnH"] = "-1 32";

base/scripts/turrets/aaBarrelLarge.cs

@@ -168,12 +168,12 @@ datablock TurretImageData(AABarrelLarge)
    useTargetAudio = false;
 
    // Turret parameters
-   activationMS         = 500;
+   activationMS         = 250;
    deactivateDelayMS    = 500;
    thinkTimeMS          = 200;
    degPerSecTheta       = 600;
    degPerSecPhi         = 1080;
-   attackRadius         = 180;
+   attackRadius         = 200;
 
    // State transitions
    stateName[0]                     = "Activate";

base/scripts/turrets/indoorDeployableBarrel.cs

@@ -61,9 +61,12 @@ datablock TurretData(TurretDeployedFloorIndoor) : TurretDamageProfile
    maxDamage = 0.5;
    destroyedLevel = 0.5;
    disabledLevel = 0.21;
+   explosion      = SmallTurretExplosion;
+      expDmgRadius = 5.0;
+      expDamage = 0.25;
+      expImpulse = 500.0;
    repairRate = 0;
    heatSignature = 0.0;
-   explosion = SmallTurretExplosion;
 
 	deployedObject = true;
 
@@ -105,9 +108,12 @@ datablock TurretData(TurretDeployedWallIndoor) : TurretDamageProfile
    maxDamage = 0.5;
    destroyedLevel = 0.5;
    disabledLevel = 0.21;
+   explosion      = SmallTurretExplosion;
+      expDmgRadius = 5.0;
+      expDamage = 0.25;
+      expImpulse = 500.0;
    repairRate = 0;
    heatSignature = 0.0;
-   explosion = SmallTurretExplosion;
 
    thetaMin = 5;
    thetaMax = 145;
@@ -149,6 +155,10 @@ datablock TurretData(TurretDeployedCeilingIndoor) : TurretDamageProfile
    maxDamage = 0.5;
    destroyedLevel = 0.5;
    disabledLevel = 0.21;
+   explosion      = SmallTurretExplosion;
+      expDmgRadius = 5.0;
+      expDamage = 0.25;
+      expImpulse = 500.0;
    repairRate = 0;
    explosion = SmallTurretExplosion;
 

base/scripts/turrets/missileBarrelLarge.cs

@@ -99,12 +99,12 @@ datablock TurretImageData(MissileBarrelLarge)
    minTargetingDistance = 40;
 
    // Turret parameters
-   activationMS      = 500;
+   activationMS      = 250;
-   deactivateDelayMS = 1000;
+   deactivateDelayMS = 500;
    thinkTimeMS       = 200;
    degPerSecTheta    = 580;
    degPerSecPhi      = 1080;
-   attackRadius      = 180;
+   attackRadius      = 250;
 
    // State transitions
    stateName[0]                  = "Activate";

base/scripts/turrets/outdoorDeployableBarrel.cs

@@ -118,8 +118,11 @@ datablock TurretData(TurretDeployedOutdoor) : TurretDamageProfile
    maxDamage = 0.80;
    destroyedLevel = 0.80;
    disabledLevel = 0.35;
+   explosion      = HandGrenadeExplosion;
+      expDmgRadius = 5.0;
+      expDamage = 0.3;
+      expImpulse = 500.0;
    repairRate = 0;
-   explosion = HandGrenadeExplosion;
 	
 	deployedObject = true;
 

base/scripts/vehicles/serverVehicleHud.cs

@@ -126,7 +126,6 @@ function createVehicle(%client, %station, %blockName, %team , %pos, %rot, %angle
          %station.station.teleporter.MPB = %obj;
          %obj.teleporter = %station.station.teleporter;
       }
-
       %station.ready = false;
       %obj.team = %team;
       %obj.useCreateHeight(true);
@@ -169,6 +168,7 @@ function createVehicle(%client, %station, %blockName, %team , %pos, %rot, %angle
          stationObject = %station;
       };
 
+      %obj.getDataBlock().schedule(5000, "mountDriver", %obj, %client.player);
    }
    if(%obj.getTarget() != -1)
       setTargetSensorGroup(%obj.getTarget(), %client.getSensorGroup());
@@ -177,6 +177,15 @@ function createVehicle(%client, %station, %blockName, %team , %pos, %rot, %angle
    //VehicleHud.updateHud(%client, 'vehicleHud');
 }
 
+//------------------------------------------------------------------------------
+function VehicleData::mountDriver(%data, %obj, %player)
+{
+   %player.startFade(1000, 0, true);
+ 
+   %player.getDataBlock().schedule(1000,"onCollision",%player, %obj, 0);
+   %player.schedule(1500,"startFade",1000, 0, false);
+}
+
 //------------------------------------------------------------------------------
 function VehicleData::checkIfPlayersMounted(%data, %obj)
 {
@@ -226,31 +235,37 @@ function VehicleHud::updateHud( %obj, %client, %tag )
    if ( %station.vehicle[scoutVehicle] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "GRAV CYCLE", "", ScoutVehicle, $VehicleMax[ScoutVehicle] - $VehicleTotalCount[%team, ScoutVehicle] );
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'ScoutVehicle', $VehicleMax[ScoutVehicle] - $VehicleTotalCount[%team, ScoutVehicle], '', "GRAV CYCLE" );
       %count++;
    }
    if ( %station.vehicle[AssaultVehicle] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "ASSAULT TANK", "", AssaultVehicle, $VehicleMax[AssaultVehicle] - $VehicleTotalCount[%team, AssaultVehicle] );
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'AssaultVehicle', $VehicleMax[AssaultVehicle] - $VehicleTotalCount[%team, AssaultVehicle], '', "ASSAULT TANK");
       %count++;
    }
    if ( %station.vehicle[mobileBaseVehicle] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "MOBILE POINT BASE", "", MobileBaseVehicle, $VehicleMax[MobileBaseVehicle] - $VehicleTotalCount[%team, MobileBaseVehicle] );
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'MobileBaseVehicle', $VehicleMax[MobileBaseVehicle] - $VehicleTotalCount[%team, MobileBaseVehicle], '', "MOBILE POINT BASE" );
       %count++;
    }
    if ( %station.vehicle[scoutFlyer] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "SCOUT FLIER", "", ScoutFlyer, $VehicleMax[ScoutFlyer] - $VehicleTotalCount[%team, ScoutFlyer] );
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'ScoutFlyer', $VehicleMax[ScoutFlyer] - $VehicleTotalCount[%team, ScoutFlyer], '', "SCOUT FLIER");
       %count++;
    }
    if ( %station.vehicle[bomberFlyer] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "BOMBER", "", BomberFlyer, $VehicleMax[BomberFlyer] - $VehicleTotalCount[%team, BomberFlyer] );
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'BomberFlyer', $VehicleMax[BomberFlyer] - $VehicleTotalCount[%team, BomberFlyer], '', "BOMBER");
       %count++;
    }
    if ( %station.vehicle[hapcFlyer] )
    {
       messageClient( %client, 'SetLineHud', "", %tag, %count, "TRANSPORT", "", HAPCFlyer, $VehicleMax[HAPCFlyer] - $VehicleTotalCount[%team, HAPCFlyer] ); 
+//new      messageClient( %client, 'SetLineHud', "", %tag, %count, 'HAPCFlyer', $VehicleMax[HAPCFlyer] - $VehicleTotalCount[%team, HAPCFlyer], '', "TRANSPORT"); 
       %count++;
    }
    %station.lastCount = %count;

base/scripts/vehicles/vehicle.cs

@@ -1030,7 +1030,7 @@ function findAIEmptySeat(%vehicle, %player)
 	return %node;
 }
 
-function findEmptySeat(%vehicle, %player)
+function findEmptySeat(%vehicle, %player, %forceNode)
 {
    %minNode = 1;
    %node = -1;
@@ -1050,18 +1050,22 @@ function findEmptySeat(%vehicle, %player)
    else
       %minNode = findFirstHeavyNode(%dataBlock);
    
-   for(%i = 0; %i < %dataBlock.numMountPoints; %i++)
+   if(%forceNode !$= "")
-      if(!%vehicle.getMountNodeObject(%i))
+      %node = %forceNode;
-      {
+   else
-         %seatPos = getWords(%vehicle.getSlotTransform(%i), 0, 2);
+   {
-         %disTemp = VectorLen(VectorSub(%seatPos, %playerPos));
+      for(%i = 0; %i < %dataBlock.numMountPoints; %i++)
-         if(%disTemp <= %dis)
+         if(!%vehicle.getMountNodeObject(%i))
          {
-            %node = %i;
+            %seatPos = getWords(%vehicle.getSlotTransform(%i), 0, 2);
-            %dis = %disTemp;
+            %disTemp = VectorLen(VectorSub(%seatPos, %playerPos));
+            if(%disTemp <= %dis)
+            {
+               %node = %i;
+               %dis = %disTemp;
+            }
          }
-      }
+    }
-    
    if(%node != -1 && %node < %minNode)
    {
       if(%message $= "")
@@ -1110,6 +1114,7 @@ function VehicleData::damageObject(%data, %targetObject, %sourceObject, %positio
    if (%data.isShielded)
       %amount = %data.checkShields(%targetObject, %position, %amount, %damageType);
    
+   
    %damageScale = %data.damageScale[%damageType];
    if(%damageScale !$= "")
       %amount *= %damageScale;

base/scripts/vehicles/vehicle_bomber.cs

@@ -193,11 +193,11 @@ datablock FlyingVehicleData(BomberFlyer) : BomberDamageProfile
 
    // Ground Impact Damage (uses DamageType::Ground)
    minImpactSpeed = 20;      // If hit ground at speed above this then it's an impact. Meters/second
-   speedDamageScale = 0.150;
+   speedDamageScale = 0.060;
 
    // Object Impact Damage (uses DamageType::Impact)
    collDamageThresholdVel = 25;
-   collDamageMultiplier   = 0.030;
+   collDamageMultiplier   = 0.020;
 
    //
    minTrailSpeed = 15;      // The speed your contrail shows up at.
@@ -240,8 +240,8 @@ datablock FlyingVehicleData(BomberFlyer) : BomberDamageProfile
 
    checkRadius = 7.1895;
    observeParameters = "1 10 10";
-
    shieldEffectScale = "0.75 0.975 0.375";
+   showPilotInfo = 1;
 };
 
 //**************************************************************
@@ -334,8 +334,8 @@ datablock LinearFlareProjectileData(BomberFusionBolt)
    explosion           = BomberFusionBoltExplosion;
    sound               = BlasterProjectileSound;
 
-   dryVelocity       = 75.0;
+   dryVelocity       = 200.0;
-   wetVelocity       = 75.0;
+   wetVelocity       = 200.0;
    velInheritFactor  = 1.0;
    fizzleTimeMS      = 2000;
    lifetimeMS        = 3000;

base/scripts/vehicles/vehicle_havoc.cs

@@ -111,12 +111,12 @@ datablock FlyingVehicleData(HAPCFlyer) : HavocDamageProfile
    hardImpactSpeed = 15;    // Sound hooks. This is the hard hit.
 
    // Ground Impact Damage (uses DamageType::Ground)
-   minImpactSpeed = 12;      // If hit ground at speed above this then it's an impact. Meters/second
+   minImpactSpeed = 25;      // If hit ground at speed above this then it's an impact. Meters/second
    speedDamageScale = 0.060;
 
    // Object Impact Damage (uses DamageType::Impact)
-   collDamageThresholdVel = 12;
+   collDamageThresholdVel = 28;
-   collDamageMultiplier   = 0.080;
+   collDamageMultiplier   = 0.020;
 
    //
    minTrailSpeed = 15;
@@ -154,7 +154,7 @@ datablock FlyingVehicleData(HAPCFlyer) : HavocDamageProfile
    cmdIcon = CMDFlyingHAPCIcon;
    cmdMiniIconName = "commander/MiniIcons/com_hapc_grey";
    targetNameTag = 'Havoc';
-   targetTypeTag = 'Flying Vehicle';
+   targetTypeTag = 'Heavy Transport';
    sensorData = VehiclePulseSensor;
 
    checkRadius = 7.8115;

base/scripts/vehicles/vehicle_mpb.cs

@@ -150,8 +150,8 @@ datablock WheeledVehicleData(MobileBaseVehicle) : MPBDamageProfile
    speedDamageScale = 0.060;
 
    // Object Impact Damage (uses DamageType::Impact)
-   collDamageThresholdVel = 12;
+   collDamageThresholdVel = 18;
-   collDamageMultiplier   = 0.080;
+   collDamageMultiplier   = 0.070;
 
    // Engine
    engineTorque = 7.0 * 745;

base/scripts/vehicles/vehicle_shrike.cs

@@ -99,9 +99,10 @@ datablock FlyingVehicleData(ScoutFlyer) : ShrikeDamageProfile
    isShielded = true;
    energyPerDamagePoint = 160;
    maxEnergy = 280;      // Afterburner and any energy weapon pool
+   rechargeRate = 0.8;
+
    minDrag = 30;           // Linear Drag (eventually slows you down when not thrusting...constant drag)
    rotationalDrag = 900;        // Anguler Drag (dampens the drift after you stop moving the mouse...also tumble drag)
-   rechargeRate = 0.8;
 
    maxAutoSpeed = 15;       // Autostabilizer kicks in when less than this speed. (meters/second)
    autoAngularForce = 400;       // Angular stabilizer force (this force levels you out when autostabilizer kicks in)
@@ -112,7 +113,7 @@ datablock FlyingVehicleData(ScoutFlyer) : ShrikeDamageProfile
    maxSteeringAngle = 5;    // Max radiens you can rotate the wheel. Smaller number is more maneuverable.
    horizontalSurfaceForce = 6;   // Horizontal center "wing" (provides "bite" into the wind for climbing/diving and turning)
    verticalSurfaceForce = 4;     // Vertical center "wing" (controls side slip. lower numbers make MORE slide.)
-   maneuveringForce = 3000;      // Horizontal jets (W,S,D,A key thrust)
+   maneuveringForce = 2500;      // Horizontal jets (W,S,D,A key thrust)
    steeringForce = 1200;         // Steering jets (force applied when you move the mouse)
    steeringRollForce = 400;      // Steering jets (how much you heel over when you turn)
    rollForce = 4;                // Auto-roll (self-correction to right you after you roll/invert)
@@ -120,10 +121,10 @@ datablock FlyingVehicleData(ScoutFlyer) : ShrikeDamageProfile
    createHoverHeight = 3;  // Height off the ground when created
 
    // Turbo Jet
-   jetForce = 2000;      // Afterburner thrust (this is in addition to normal thrust)
+   jetForce = 1750;      // Afterburner thrust (this is in addition to normal thrust)
    minJetEnergy = 28;     // Afterburner can't be used if below this threshhold.
    jetEnergyDrain = 2.8;       // Energy use of the afterburners (low number is less drain...can be fractional)                                                                                                                                                                                                                                                                                          // Auto stabilize speed
-   vertThrustMultiple = 2.0;
+   vertThrustMultiple = 2.5;
 
    // Rigid body
    mass = 150;        // Mass of the vehicle
@@ -134,7 +135,7 @@ datablock FlyingVehicleData(ScoutFlyer) : ShrikeDamageProfile
    hardImpactSpeed = 25;    // Sound hooks. This is the hard hit.
 
    // Ground Impact Damage (uses DamageType::Ground)
-   minImpactSpeed = 23;      // If hit ground at speed above this then it's an impact. Meters/second
+   minImpactSpeed = 10;      // If hit ground at speed above this then it's an impact. Meters/second
    speedDamageScale = 0.06;
 
    // Object Impact Damage (uses DamageType::Impact)
@@ -192,7 +193,7 @@ datablock FlyingVehicleData(ScoutFlyer) : ShrikeDamageProfile
    cmdIcon = CMDFlyingScoutIcon;
    cmdMiniIconName = "commander/MiniIcons/com_scout_grey";
    targetNameTag = 'Shrike';
-   targetTypeTag = 'Flying Vehicle';
+   targetTypeTag = 'Turbograv';
    sensorData = AWACPulseSensor;
    sensorRadius = AWACPulseSensor.detectRadius;
    sensorColor = "255 194 9";

base/scripts/vehicles/vehicle_tank.cs

@@ -201,8 +201,8 @@ datablock HoverVehicleData(AssaultVehicle) : TankDamageProfile
    speedDamageScale = 0.060;
 
    // Object Impact Damage (uses DamageType::Impact)
-   collDamageThresholdVel = 17;
+   collDamageThresholdVel = 18;
-   collDamageMultiplier   = 0.070;
+   collDamageMultiplier   = 0.045;
 
    dragForce            = 40 / 20;
    vertFactor           = 0.0;
@@ -211,7 +211,7 @@ datablock HoverVehicleData(AssaultVehicle) : TankDamageProfile
    mainThrustForce    = 50;
    reverseThrustForce = 40;
    strafeThrustForce  = 40;
-   turboFactor        = 1.5;
+   turboFactor        = 1.25;
 
    brakingForce = 25;
    brakingActivationSpeed = 4;
@@ -276,18 +276,17 @@ datablock HoverVehicleData(AssaultVehicle) : TankDamageProfile
    cmdIcon = CMDGroundTankIcon;
    cmdMiniIconName = "commander/MiniIcons/com_tank_grey";
    targetNameTag = 'Beowulf';
-   targetTypeTag = 'Assault Vehicle';
+   targetTypeTag = 'Assault Tank';
    sensorData = VehiclePulseSensor;
    
    checkRadius = 5.5535;
    observeParameters = "1 10 10";
-
    runningLight[0] = TankLight1;
    runningLight[1] = TankLight2;
    runningLight[2] = TankLight3;
    runningLight[3] = TankLight4;
-
    shieldEffectScale = "0.9 1.0 0.6";
+   showPilotInfo = 1;
 };
 
 //**************************************************************

base/scripts/vehicles/vehicle_wildcat.cs

@@ -114,7 +114,7 @@ datablock HoverVehicleData(ScoutVehicle) : WildcatDamageProfile
 
    // Object Impact Damage (uses DamageType::Impact)
    collDamageThresholdVel = 23;
-   collDamageMultiplier   = 0.040;
+   collDamageMultiplier   = 0.030;
 
    dragForce            = 25 / 45.0;
    vertFactor           = 0.0;
@@ -123,7 +123,7 @@ datablock HoverVehicleData(ScoutVehicle) : WildcatDamageProfile
    mainThrustForce    = 25;
    reverseThrustForce = 10;
    strafeThrustForce  = 8;
-   turboFactor        = 2.0;
+   turboFactor        = 1.5;
 
    brakingForce = 25;
    brakingActivationSpeed = 4;
@@ -188,7 +188,7 @@ datablock HoverVehicleData(ScoutVehicle) : WildcatDamageProfile
    cmdIcon = CMDHoverScoutIcon;
    cmdMiniIconName = "commander/MiniIcons/com_landscout_grey";
    targetNameTag = 'WildCat';
-   targetTypeTag = 'Hover Vehicle';
+   targetTypeTag = 'Grav Cycle';
    sensorData = VehiclePulseSensor;
 
    checkRadius = 1.7785;

base/scripts/voiceChat.cs

@@ -232,8 +232,7 @@ function voiceCapStart()
          {
             case 0:   %level = "Codec .v12";
             case 1:   %level = "Codec .v24";
-            case 2:   %level = "Codec .v29";
+            default:  %level = "Codec .v29";
-            default:  %level = "Codec GSM";
          }
 
          addMessageHudLine("\c2System:\cr server has voice level capped at [\c1" @ %level @ "\cr].");

base/scripts/weapTurretCode.cs

@@ -741,19 +741,20 @@ function detonateFlashGrenade(%hg)
 // ----------------------------------------------
 
 
-function MineDeployed::onThrow(%this, %mine)
+function MineDeployed::onThrow(%this, %mine, %thrower)
 {
    %mine.armed = false;
    %mine.damaged = 0;
    %mine.detonated = false;
    %mine.depCount = 0;
-   schedule(1500, %mine, "deployMineCheck", %mine);
+   schedule(1500, %mine, "deployMineCheck", %mine, %thrower);
 }
 
-function deployMineCheck(%mineObj)
+function deployMineCheck(%mineObj, %player)
 {
    if(%mineObj.depCount > %mineObj.getDatablock().maxDepCount)
       explodeMine(%mineObj, true);
+   
    // wait until the mine comes to rest
    if(%mineObj.getVelocity() $= "0 0 0")
    {
@@ -779,7 +780,10 @@ function deployMineCheck(%mineObj)
       %mineTeam = %mineObj.sourceObject.team;
       $TeamDeployedCount[%mineTeam, MineDeployed]++;
       if($TeamDeployedCount[%mineTeam, MineDeployed] > $TeamDeployableMax[MineDeployed])
+      {   
+         messageClient( %player.client, '', 'Maximum allowable mines deployed.' );
          schedule(100, %mineObj, "explodeMine", %mineObj, true);
+      }
       else
       {
          //start the thread that keeps checking for objects near the mine...
@@ -796,7 +800,7 @@ function deployMineCheck(%mineObj)
    {
       //schedule this deploy check again a little later
       %mineObj.depCount++;
-      schedule(500, %mineObj, "deployMineCheck", %mineObj);
+      schedule(500, %mineObj, "deployMineCheck", %mineObj, %player);
    }
 }
 

base/scripts/weapons.cs

@@ -224,7 +224,7 @@ function HandInventory::onUse(%data, %obj)
       serverPlay3D(GrenadeThrowSound, %pos);
       %obj.lastThrowTime[%data] = getSimTime();
 
-      %thrownItem.getDataBlock().onThrow(%thrownItem);
+      %thrownItem.getDataBlock().onThrow(%thrownItem, %obj);
       %obj.throwStrength = 0;
    }
 }

base/scripts/webbrowser.cs

@@ -818,7 +818,7 @@ function BrowserSearchMatchList::onSelect( %this, %id, %text )
 //-----------------------------------------------------------------------------
 function BrowserSearchMatchList::onAdd(%this)
 {
-	BrowserSearchMatchList.addStyle( 1, "Univers", 12 , "150 150 150", "200 200 200", "60 60 60" );
+//	BrowserSearchMatchList.addStyle( 1, "Univers", 12 , "150 150 150", "200 200 200", "60 60 60" );
 }
 //==--  BrowserSearchPane ----------------------------------------------------
 function BrowserSearchPane::onDatabaseQueryResult(%this, %status, %resultStatus, %key)
@@ -1150,9 +1150,9 @@ function GuiMLTextCtrl::onURL(%this, %url)
             PostsPopupDlg.state = "adminRemovePostPlus";
             databaseQuery(63, 7 TAB getFields(%url,1), PostsPopupDlg, PostsPopupDlg.key);
 	  case "joinPublicChat":
-			TribePane.joinChat(getField(%url,1),0);
+			joinPublicTribeChannel(getField(%url,1));
 	  case "joinPrivateChat":
-			TribePane.joinChat(getField(%url,1),1);
+			joinPrivateTribeChannel(getField(%url,1));
 
       //if there is an unknown URL type, treat it as a weblink..
       default:
@@ -1248,13 +1248,9 @@ function TribePane::onWake(%this)
 function TribePane::JoinChat(%this, %tribe, %chanType)
 {
 	if(%chanType == 0)
-		%chan = "_Public";
+		joinPublicTribeChannel(%tribe);
 	else
-		%chan = "_Private";
+		joinPrivateTribeChannel(%tribe);
-
-	error("CHANNEL:" @ %chan);
-	IRCClient::join(IRCClient::channelName(%tribe) @ %chan);
-    LaunchTabView.viewTab("CHAT", ChatGui, 0);
 }
 //-----------------------------------------------------------------------------
 function TribePane::onDatabaseQueryResult(%this, %status, %resultString , %key)
@@ -2175,7 +2171,7 @@ function TribeMemberPopupDlg::onWake( %this )
 			    TribeMemberPopup.add( "Contact by EMail", 2 );
 			    TribeMemberPopup.add( "Add To Buddylist", 4 );
 			    TribeMemberPopup.add( "Add To Blocklist", 5 );
-				TribeMemberPopup.add( "Invite To Chat", 8);
+//				TribeMemberPopup.add( "Invite To Chat", 8);
 				if(%isMember)
 				{
 					TribeMemberPopup.add( "............................................", -1);

base/scripts/webemail.cs

@@ -439,6 +439,34 @@ function EmailBlockRemove()
    }
 }
 //-- EMailComposeDlg ----------------------------------------------------------------
+function EmailComposeDlg::onWake( %this )
+{
+   // Get the compose dialog position and size from the prefs:
+   %res = getResolution();
+   %resW = firstWord( %res );
+   %resH = getWord( %res, 1 );
+   %w = firstWord( $pref::Email::ComposeWindowExtent );
+   if ( %w > %resW )
+      %w = %resW;
+   %h = getWord( $pref::Email::ComposeWindowExtent, 1 );
+   if ( %h > %resH )
+      %h = %resH;
+   %x = firstWord( $pref::Email::ComposeWindowPos );
+   if ( %x > %resW - %w )
+      %x = %resW - %w;
+   %y = getWord( $pref::Email::ComposeWindowPos, 1 );
+   if ( %y > %resH - %h )
+      %y = %resH - %h;
+
+   EmailComposeWindow.resize( %x, %y, %w, %h );
+}
+//-----------------------------------------------------------------------------
+function EmailComposeDlg::onSleep( %this )
+{
+   $pref::Email::ComposeWindowPos = EmailComposeWindow.getPosition();
+   $pref::Email::ComposeWindowExtent = EmailComposeWindow.getExtent();
+}
+//-----------------------------------------------------------------------------
 function EMailComposeDlg::onDatabaseQueryResult(%this, %status, %RowCount_Result, %key)
 {
 	if(%this.key != %key)
@@ -950,13 +978,13 @@ function AddressDlg::onWake(%this)
 	LC_Search.clear();
 	StrToList(LC_ToList,$EmailToAddress,",");
 	StrToList(LC_CCList,$EmailCCAddress,",");
-    %info = WONGetAuthInfo();
+   %info = WONGetAuthInfo();
-    %tribeCount = getField( getRecord( %info, 1 ), 0 ); //%cert
+   %tribeCount = getField( getRecord( %info, 1 ), 0 ); //%cert
-    for ( %i = 0; %i < %tribeCount; %i++ )
+   for ( %i = 0; %i < %tribeCount; %i++ )
-    {
+   {
-	    %tribe = getField( getRecord( %info, %i + 2 ), 0 ); //%cert
+	   %tribe = getField( getRecord( %info, %i + 2 ), 0 ); //%cert
-		LC_ListBox.add(%tribe,%i);
+	   LC_ListBox.add(%tribe,%i);
-    }
+   }
 }
 //-- EMailGui ----------------------------------------------------------------
 function EmailGui::onWake(%this)

base/scripts/webforums.cs

@@ -20,7 +20,7 @@ $TopicColumnName[1]  = "Posts";
 $TopicColumnRange[1] = "25 100";
 $TopicColumnFlags[1] = "numeric center";
 $TopicColumnCount++;
-$TopicColumnName[2]  = "Posted By";
+$TopicColumnName[2]  = "Last Poster";
 $TopicColumnRange[2] = "50 300";
 $TopicColumnCount++;
 $TopicColumnName[3]  = "Last Post Date";
@@ -74,6 +74,8 @@ if(!isObject(ForumsMessageVector))
 //-----------------------------------------------------------------------------
 function isModerator()
 {
+   if(!$GuidTribes)
+   	$GuidTribes = getRecords(WonGetAuthInfo(),1);
    %result = 0;
    for(%checkID=0;%checkID<getField(getRecord($GuidTribes,0),0);%checkID++)
    {
@@ -86,6 +88,8 @@ function isModerator()
 //-----------------------------------------------------------------------------
 function isT2Admin()
 {
+	if(!$GuidTribes)
+		$GuidTribes = getRecords(wonGetAuthinfo(),1);
    %result = 0;
    for(%checkID=0;%checkID<getField(getRecord($GuidTribes,0),0);%checkID++)
    {
@@ -244,7 +248,7 @@ function CacheForumTopic()
        ForumsMessageList.highestUpdate = 0;
 
    %newGroup = TopicsListGroup.getObject(ForumsTopicsList.getSelectedRow());
-   ForumsMessageList.lastID = %newGroup.updateid;
+   ForumsMessageList.lastID = %newGroup.updateid-1;
    %latest = GetField(ForumsTopicsList.getRowTextbyID(ForumsTopicsList.getSelectedID()),3);
 	ForumsMessageVector.dump( $ForumCachePath @ "tpc" @ ForumsMessageVector.tid , ForumsMessageList.lastID TAB $ForumCacheVersion TAB %allRead TAB %latest);
 }
@@ -812,7 +816,7 @@ function ForumsGui::onDatabaseRow(%this,%row,%isLastRow,%key)
       		%name = getField(%row, 8);
 	   		%hasDeletes = getField(%row,12);
            %slevel = getField(%row,13);
-           %maxUpdateId = getField(%row,14);
+           %maxUpdateId = getField(%row,14)-1;
            ForumsTopicsList.addTopic( %id, %topic, %date, %maxUpdateID, %slevel, %row);
  			ForumsTopicsList.addRow( %id, %topic TAB %postCount TAB %name TAB %date TAB %hasDeletes);
  			if ( %isLastRow ) //is last line
@@ -869,7 +873,7 @@ function ForumsGui::onDatabaseRow(%this,%row,%isLastRow,%key)
 				{
                    ForumsMessageVector.tid = ForumsTopicsList.getSelectedID();
 	                ForumsTopicsList.thread = TopicsListGroup.getObject(ForumsTopicsList.getSelectedRow());
-                   ForumsTopicsList.thread.updateID = %high;
+                   ForumsTopicsList.thread.updateID = %high-1;
 				    CacheForumTopic();
 					ForumsMessageList.loadCache(ForumsTopicsList.getSelectedID());
 				}
@@ -998,7 +1002,7 @@ function ForumsTopicsList::AddTopic(%this, %id, %topicname, %date, %mid, %slevel
       Id = %id;
       name = %topicname;
       date = %date;
-      updateid = %mid;
+      updateid = %mid-1;
       slevel = %slevel;
 	   rcvrec = %vline;
    };
@@ -1043,10 +1047,11 @@ function TopicsPopupDlg::onWake( %this )
    if(isModerator())
       TopicsPopupMenu.add(%line,-1);
       TopicsPopupMenu.add("Request Admin Review", 3);   
-//      TopicsPopupMenu.add("Unlock Topic", 5);   
       if(isT2Admin())
       {
          TopicsPopupMenu.add("Lock Topic", 4);   
+         TopicsPopupMenu.add("Unlock Topic", 5);   
+	  	 TopicsPopupMenu.add("Move Topic",6);
          TopicsPopupMenu.add("Remove Topic", 10);   
       }
             
@@ -1159,14 +1164,15 @@ function TopicsPopupMenu::onSelect( %this, %id, %text )
                databaseQuery(60, %fieldData, TopicsPopupDlg, TopicsPopupDlg.key);
 
        case 4: //Lock Thread
-               TopicsPopupDlg.key = LaunchGui.key++;
+				LockTopicReason.setText("Locked at Admin Request");
-               TopicsPopupDlg.state = "lockTopic";
+				Canvas.pushDialog("GenDialog");
-               %fieldData = TopicsPopupMenu.topic.id TAB "Locked at Admin Request";
-               DatabaseQuery(66,%fieldData,topicsPopupDlg,topicsPopupDlg.key);
        case 5: //Unlock Thread
-              MessageBoxOK("NOTICE","Feature Not Yet Implemented");
+				TopicsPopupDlg.key = LaunchGui.key++;
-       case 6: //Not Implemented
+    			TopicsPopupDlg.state = "unlockTopic";
-              MessageBoxOK("NOTICE","Feature Not Yet Implemented");
+				%fieldData = TopicsPopupMenu.topic.id;
+			    DatabaseQuery(67,%fieldData,topicsPopupDlg,topicsPopupDlg.key);
+       case 6: //Move Thread
+				Canvas.pushDialog("MoveThreadDlg");
        case 7: //Not Implemented
               MessageBoxOK("NOTICE","Feature Not Yet Implemented");
        case 8: //Not Implemented
@@ -1183,6 +1189,34 @@ function TopicsPopupMenu::onSelect( %this, %id, %text )
    canvas.popDialog(TopicsPopupDlg);
 }
 //-----------------------------------------------------------------------------
+function MoveThreadDlg::onWake(%this)
+{
+	MoveToForumList.clear();
+	for(%i=0;%i<ForumsList.rowCount();%i++)
+	{
+		MoveToForumList.add(getField(ForumsList.getRowText(%i),0),ForumsList.getRowid(%i));
+	}
+}
+//-----------------------------------------------------------------------------
+function TopicsPopupMenu::ExecuteLock(%this)
+{
+	Canvas.popDialog("GenDialog");
+    %fieldData = TopicsPopupMenu.topic.id TAB LockTopicReason.getText();
+	TopicsPopupDlg.key = LaunchGui.key++;
+    TopicsPopupDlg.state = "lockTopic";
+    DatabaseQuery(66,%fieldData,topicsPopupDlg,topicsPopupDlg.key);
+}
+//-----------------------------------------------------------------------------
+function TopicsPopupMenu::ExecuteMove(%this)
+{
+    %fieldData = TopicsPopupMenu.topic.id TAB MoveToForumList.getSelected() TAB MoveToForumList.getText();
+	error("MOVE: " @ %fieldData);
+	Canvas.popDialog("MoveThreadDlg");
+	TopicsPopupDlg.key = LaunchGui.key++;
+    TopicsPopupDlg.state = "moveTopic";
+    DatabaseQuery(68,%fieldData,topicsPopupDlg,topicsPopupDlg.key);
+}
+//-----------------------------------------------------------------------------
 function TopicsPopupDlg::onSleep(%this)
 {
 	ForumsGui.TDialogOpen = false;
@@ -1214,11 +1248,18 @@ function TopicsPopupDlg::onDatabaseQueryResult(%this,%status,%recordCount,%key)
        }
        else
        {
-           if(%this.state $= "lockTopic")
+			switch$(%this.state)
-           {
+			{
+				case "lockTopic":
                      ForumsTopicsList.setRowStyle( getField(%recordCount,0), 3 );
-           }
+           			 MessageBoxOK("NOTICE",getField(%status,1));
-           MessageBoxOK("NOTICE",getField(%status,1));
+				case "unlockTopic":
+                     ForumsTopicsList.setRowStyle( getField(%recordCount,0), 1 );
+           			 MessageBoxOK("NOTICE",getField(%status,1));
+				case "moveTopic":
+                     ForumsTopicsList.setRowStyle( getField(%recordCount,0), 3 );
+           			 MessageBoxOK("NOTICE",getField(%status,1));
+			}
        }
    else
        messageBoxOK("ERROR",getField(%status,1));
@@ -1271,7 +1312,7 @@ function ForumsTopicsList::updateReadStatus( %this )
       {
          %header = %file.readLine();
          %topicDate = getField( %this.getRowText( %row ), 3 );
-         %updateID = getField(%header,0);
+         %updateID = getField(%header,0)-1;
          if ( getField( %header, 1 ) == $ForumCacheVersion        // Must have same cache version
               && getField( %header, 2 ) == 1                         // "all read" flag must be set
               && strcmp( getField( %header, 3 ), %topicDate ) >= 0
@@ -1337,7 +1378,7 @@ function ForumsMessageList::AddPost(%this, %id, %postname, %authorID, %authorNam
       author = %authorName;
       authorID = %authorID;
       date = %date;
-      updateid = %mid;
+      updateid = %mid-1;
       slevel = %slevel;
 	   rcvrec = %vline;
    };
@@ -1607,9 +1648,9 @@ function ForumsMessagelist::onDatabaseQueryResult(%this,%status,%resultString,%k
 			case "editPost":
                %this.state = "done";
           		%postId = getField( %status, 2 );
-           	%index = ForumsMessageVector.getLineIndexByTag( %postId );
+           		%index = ForumsMessageVector.getLineIndexByTag( %postId );
-           	%text = ForumsMessageVector.getLineTextByTag( %postId );
+	           	%text = ForumsMessageVector.getLineTextByTag( %postId );
-           	%parent = getRecord( %text, 2 );
+    	       	%parent = getRecord( %text, 2 );
           	    ForumsMessageVector.deleteLine( %index );
                %text = setRecord(%text,0,"1");
                ForumsMessageVector.pushBackLine(%text, %postID);
@@ -1618,9 +1659,9 @@ function ForumsMessagelist::onDatabaseQueryResult(%this,%status,%resultString,%k
 			case "deletePost":
 				%this.state = "done";
           		%postId = getField( %status, 2 );
-           	%index = ForumsMessageVector.getLineIndexByTag( %postId );
+	           	%index = ForumsMessageVector.getLineIndexByTag( %postId );
-           	%text = ForumsMessageVector.getLineTextByTag( %postId );
+    	       	%text = ForumsMessageVector.getLineTextByTag( %postId );
-           	%parent = getRecord( %text, 2 );
+        	   	%parent = getRecord( %text, 2 );
  		    	ForumsTopicsList.refreshFlag = true;
           	    ForumsMessageVector.deleteLine( %index );
       		    CacheForumTopic();
@@ -1653,4 +1694,31 @@ function ForumsMessagelist::onDatabaseQueryResult(%this,%status,%resultString,%k
 		MessageBoxOK("ERROR",getFields(%status,1));
 	}
    canvas.SetCursor(DefaultCursor);
+}
+//-----------------------------------------------------------------------------
+function ForumsComposeDlg::onWake( %this )
+{
+   // Get the window pos and extent from prefs:
+   %res = getResolution();
+   %resW = firstWord( %res );
+   %resH = getWord( %res, 1 );
+   %w = firstWord( $pref::Forum::PostWindowExtent );
+   if ( %w > %resW )
+      %w = %resW;
+   %h = getWord( $pref::Forum::PostWindowExtent, 1 );
+   if ( %h > %resH )
+      %h = %resH;
+   %x = firstWord( $pref::Forum::PostWindowPos );
+   if ( %x > %resW - %w )
+      %x = %resW - %w;
+   %y = getWord( $pref::Forum::PostWindowPos, 1 );
+   if ( %y > %resH - %h )
+      %y = %resH - %h;
+   FC_Window.resize( %x, %y, %w, %h );
+}
+//-----------------------------------------------------------------------------
+function ForumsComposeDlg::onSleep( %this )
+{
+   $pref::Forum::PostWindowPos = FC_Window.getPosition();
+   $pref::Forum::PostWindowExtent = FC_Window.getExtent();
 }

base/scripts/weblinks.cs

@@ -5,19 +5,22 @@ addWebLink( "Arc 2055", "www.arc2055.com" );
 addWebLink( "Atari Secret Society", "www.atarisecretsociety.org" );
 addWebLink( "BarrysWorld", "www.barrysworld.com" );
 addWebLink( "Bomb", "www.bomb.net" );
+addWebLink( "Box Factory Games", "http://www.bfgames1.com" );
 addWebLink( "Clan Happytyme", "www.happytyme.com" );
 addWebLink( "ClanBase", "www.clanbase.com" );
 addWebLink( "ClanServ", "www.clanserv.com" );
 addWebLink( "Dopplegangers", "www.dopplegangers.com" );
 addWebLink( "Dutchbat Homeworld", "www.dutchbat-homeworld.com" );
-addWebLink( "EDome Tribes 2", "http://games.edome.net/tribes2/" );
+addWebLink( "eDome Tribes 2", "http://games.edome.net/tribes2/" );
 addWebLink( "Euro Tribesplayers", "www.euro-tribesplayers.com" );
 addWebLink( "eXtreme-Players", "www.eXtreme-players.de" );
+addWebLink( "Game Forces", "www.gameforces.net" );
+addWebLink( "Game Planet", "www.gameplanet.co.nz" );
 addWebLink( "Game Surf", "www.gamesurf.de" );
 addWebLink( "Grave Diggers Union", "www.gravediggersunion.com" );
+addWebLink( "HomeLan", "www.homelan.com" );
 addWebLink( "IanStorm", "www.ianstorm.com" );
 addWebLink( "IMGaming", "www.imgaming.com" );
-addWebLink( "Inquest Entertainment", "www.inguestentertainment.com" );
 addWebLink( "Long Dongles", "www.longdongles.com" );
 addWebLink( "MaxBaud.Net", "www.maxbaud.net" );
 addWebLink( "MoreGaming", "www.moregaming.com" );
@@ -26,9 +29,12 @@ addWebLink( "NGI", "www.ngi.it" );
 addWebLink( "PlanetTribes", "www.planettribes.com" );
 addWebLink( "Raging Angels", "www.ragingangels.org" );
 addWebLink( "Rogue Disciples", "www.roguedisciples.com" );
-addWebLink( "Supreme Tribes", "www.supremetribes.com" );
 addWebLink( "StrikeForce", "www.strikeforcecenter.com" );
+addWebLink( "Supreme Tribes", "www.supremetribes.com" );
+addWebLink( "Sydney Gamers League", "www.sgl.org.au" );
+addWebLink( "System Recall", "www.systemrecall.com.com" );
 addWebLink( "TeamSound", "www.teamsound.com" );
+addWebLink( "Telenordia", "www.telenordia.se" );
 addWebLink( "Telepresence Heavy Assault Team", "www.that.co.nz" );
 addWebLink( "Temple of Blood", "www.templeofblood.com" );
 addWebLink( "The Ghostbear Tribe", "www.ghostbear.net" );

base/scripts/webnews.cs

@@ -15,20 +15,32 @@ function updatePageBtn(%prev,%next)
 //-----------------------------------------------------------------------------
 function NewsGui::onWake(%this)
 {
-   Canvas.SetCursor(ArrowWaitCursor);
    Canvas.pushDialog(LaunchToolbarDlg);
-   %this.key = LaunchGui.key++;
-   %this.state = "status";
    %this.articleCount = 0;
    %this.set = 1; // signifies the first (latest) set
    NewsText.setValue("");
-   %this.caller = "GETNEWS";
+	if ( isDemo() )
-   DatabaseQueryArray(0,0,"0" TAB "0",%this,%this.key);
+	{
-   // Fetch the message of the day:
+      NewsPrevBtn.setVisible( false );
-   NewsMOTDText.key = LaunchGui.key++;
+      NewsNextBtn.setVisible( false );
-   NewsMOTDText.state = "isvalid";
+		NewsSubmitBtn.setVisible( false );
-   NewsMOTDText.lineCount = 0;
+		NewsMOTDText.setValue( "This is the fake Message of the Day just for people playing the demo." );
-   DatabaseQuery(0,"",NewsMOTDText,NewsMOTDText.key);
+		%this.addStaticArticle( "ALIENS INVADE CLEVELAND!", "Oh, never mind.\nIt just usually looks like that.\nMy bad." );
+		%this.addStaticArticle( "OMG! Tribes 2 is the Coolest!", "It's official, Tribes 2 is the coolest thing since ice cream." );
+		%this.addStaticArticle( "BigDevDawg Worship Service Rescheduled", "Please note that the weekly devotional service for the followers of the almighty DevDawg has been rescheduled to 9pm so that it no longer conflicts with \"That 70\'s Show\"." );
+	}
+	else
+	{
+   	Canvas.SetCursor(ArrowWaitCursor);
+   	%this.state = "status";
+   	%this.key = LaunchGui.key++;
+	   %this.caller = "GETNEWS";
+	   DatabaseQueryArray(0,0,"0" TAB "0",%this,%this.key);
+	   // Fetch the message of the day:
+	   NewsMOTDText.key = LaunchGui.key++;
+	   NewsMOTDText.state = "isvalid";
+	   DatabaseQuery(0,"",NewsMOTDText,NewsMOTDText.key);
+	}
    WebLinksMenu.setSelected( 0 );
    NewsPrevBtn.setActive( false );
    NewsNextBtn.setActive( false );
@@ -49,52 +61,66 @@ function NewsGui::onClose( %this, %key )
 //-----------------------------------------------------------------------------
 function NewsGui::rebuildText(%this)
 {
-   NewsHeadlines.clear();
+	NewsHeadlines.clear();
-   for(%i = 0; %i < %this.articleCount; %i++)
+	for(%i = 0; %i < %this.articleCount; %i++)
-   {	  
+	{	  
-      %article = %this.article[%i];
+   	%article = %this.article[%i];
 
-	%ai = wonGetAuthInfo();
+		if ( isDemo() )
-	%isMem = 0;
+		{
-	for(%east=0;%east<getField(getRecord(%ai,1),0);%east++)
+			%topic = getField( %article, 0 );
-	{
+			%body = getFields( %article, 1 );
-		%tpv = GetRecord(%ai,2+%east);
-		if(getField(%tpv,3)==1401 || getField(%tpv,3)==1402)
-			%isMem = 1;
-	}
-   	%editable = %isMem;
 
-      %topicid = getField(%article,1);
+			%text = %text @ "<lmargin:10><color:adfffa><font:univers:22><tag:" @ %i @ ">"
-      %articleid = getField(%article, 2);
+					@ %topic
-	  %postcount = getField(%article,3)-1;
+					@ "<lmargin:30><rmargin%:80><color:82beb9><font:univers:16>\n"
-      %date = getField(%article,4);
+					NL %body
-	  %update_id = getField(%article,5);
+					@ "<sbreak>\n\n<rmargin%:100>";
-	  %author_id = getField(%article,6);
+		}
-      %nameLink = getLinkName(getField(%article,8) TAB getField(%article,9) TAB getField(%article,10) TAB getField(%article,11),0);
+		else
-      %category = getField(%article, 12);
+		{
-      %topic = getField(%article, 13);
+			%ai = wonGetAuthInfo();
-	  %body = getFields(%article,14);
+			%isMem = 0;
-      %rc = getRecordCount(%body);
+			for(%east=0;%east<getField(getRecord(%ai,1),0);%east++)
-      %atxt = "";
+			{
-      if ( %editable )
+				%tpv = GetRecord(%ai,2+%east);
-         %editText = "<a:editnews" TAB %i TAB %topicid TAB %articleid TAB %update_id @
+				if(getField(%tpv,3)==1401 || getField(%tpv,3)==1402)
-		     		 ">[edit]</a> <a:deletenews" TAB %i TAB %articleid TAB %topicid @
+					%isMem = 1;
-		     		 ">[delete]</a> <a:forumlink" TAB "NEWS" TAB %articleid TAB %topic @
+			}
-		     		 ">[comments ("@%postcount@")]</a>";
+	   	%editable = %isMem;
-      else
-         %editText = "<a:forumlink" TAB "NEWS" TAB %articleid TAB %topic @
-		     ">[comments ("@%postcount@"]</a>";
 
-      for(%l = 0; %l < %rc; %l++)
+      	%topicid = getField(%article,1);
-         %atxt = %atxt @ getRecord(%body,%l) @ "\n";
+      	%articleid = getField(%article, 2);
+	  		%postcount = getField(%article,3)-1;
+      	%date = getField(%article,4);
+	  		%update_id = getField(%article,5);
+	  		%author_id = getField(%article,6);
+      	%nameLink = getLinkName(getField(%article,8) TAB getField(%article,9) TAB getField(%article,10) TAB getField(%article,11),0);
+      	%category = getField(%article, 12);
+      	%topic = getField(%article, 13);
+	  		%body = getFields(%article,14);
+      	%rc = getRecordCount(%body);
+      	%atxt = "";
+      	if ( %editable )
+         	%editText = "<a:editnews" TAB %i TAB %topicid TAB %articleid TAB %update_id @
+		     		         ">[edit]</a> <a:deletenews" TAB %i TAB %articleid TAB %topicid @
+		     		         ">[delete]</a> <a:forumlink" TAB "NEWS" TAB %articleid TAB %topic @
+		     		         ">[comments ("@%postcount@")]</a>";
+      	else
+         	%editText = "<a:forumlink" TAB "NEWS" TAB %articleid TAB %topic @
+		     					">[comments ("@%postcount@"]</a>";
+
+      	for(%l = 0; %l < %rc; %l++)
+         	%atxt = %atxt @ getRecord(%body,%l) @ "\n";
+
+      	%text = %text @ "<lmargin:10><color:ADFFFA><font:Univers:22><tag:" @ %i @ ">" @
+                 %topic @ " <font:Univers Condensed:18>" @ %editText @ "\nPosted by: " @ %nameLink @ " on " @ %date NL
+                 "\n<lmargin:30><rmargin%:80><font:Univers:16><color:82BEB9>" @ %atxt @ "<sbreak>\n\n<rmargin%:100>";
+		}
 
       NewsHeadlines.addRow( %i, %topic );
-      %text = %text @ "<lmargin:10><color:ADFFFA><font:Univers:22><tag:" @ %i @ ">" @
-              %topic @ " <font:Univers Condensed:18>" @ %editText @ "\nPosted by: " @ %nameLink @ " on " @ %date NL
-              "\n<lmargin:30><rmargin%:80><font:Univers:16><color:82BEB9>" @ %atxt @ "<sbreak>\n\n<rmargin%:100>";
    }
-   	  NewsText.setValue(%text);
+   NewsText.setValue(%text);
-	  %article = "";
 }
 //-----------------------------------------------------------------------------
 function NewsGui::onDatabaseQueryResult(%this, %status, %RowCount_Result, %key)
@@ -168,6 +194,14 @@ function NewsGui::onDatabaseRow(%this, %row,%isLastRow,%key)
 	return;
 }
 //-----------------------------------------------------------------------------
+function NewsGui::addStaticArticle( %this, %topic, %body )
+{
+	%tag = %this.articleCount;
+	%this.article[%tag] = %topic TAB %body;
+	%this.articleCount++;
+	%this.rebuildText();
+}
+//-----------------------------------------------------------------------------
 function PostNews()
 {
 	messageBoxYesNo("CONFIRM","Please do not submit bug reports without a tested solution, test posts or recruiting posts." NL " " NL "Continue with your submittal?","StartPostNews();");
@@ -183,6 +217,24 @@ function StartPostNews()
 //-----------------------------------------------------------------------------
 function NewsPostDlg::onWake( %this )
 {
+   // Get the window pos and extent from prefs:
+   %res = getResolution();
+   %resW = firstWord( %res );
+   %resH = getWord( %res, 1 );
+   %w = firstWord( $pref::News::PostWindowExtent );
+   if ( %w > %resW )
+      %w = %resW;
+   %h = getWord( $pref::News::PostWindowExtent, 1 );
+   if ( %h > %resH )
+      %h = %resH;
+   %x = firstWord( $pref::News::PostWindowPos );
+   if ( %x > %resW - %w )
+      %x = %resW - %w;
+   %y = getWord( $pref::News::PostWindowPos, 1 );
+   if ( %y > %resH - %h )
+      %y = %resH - %h;
+   NP_Window.resize( %x, %y, %w, %h );
+
    // Fill the category menu (should we get this from somewhere?):
    NewsCategoryMenu.clear();
    NewsCategoryMenu.add( "General", 0 );
@@ -200,6 +252,12 @@ function NewsPostDlg::onWake( %this )
    NewsCategoryMenu.setSelected( %selId );
 }
 //-----------------------------------------------------------------------------
+function NewsPostDlg::onSleep( %this )
+{
+   $pref::News::PostWindowPos = NP_Window.getPosition();
+   $pref::News::PostWindowExtent = NP_Window.getExtent();
+}
+//-----------------------------------------------------------------------------
 function NewsCategoryMenu::onSelect( %this, %id, %text )
 {
    $NewsCategory = %text;

base/version.cs

@@ -1 +1 @@
-buildVersion.setValue( "MAY 11, 2001, 3:19 PM (dmoore)" );
+buildVersion.setValue( "JUN 8, 2001, 11:12 PM (dmoore)" );

console_start.cs

@@ -31,6 +31,7 @@ function cleanupAudio()
    AudioGui.delete();
    sButtonDown.delete();
    sButtonOver.delete();
+	InputDeniedSound.delete();
 }
 
 function startAudio()
@@ -59,6 +60,13 @@ function startAudio()
       preload = true;
    };
 
+   new AudioProfile(InputDeniedSound)
+   {
+      filename = "fx/misc/diagnostic_beep.wav";
+      description = "audioGui";
+      preload = true;
+   };
+
    $Audio::defaultDriver = "miles";
    audioDetect();
    if(!$noloadAudio)
@@ -110,158 +118,189 @@ function resetCanvas()
 }
 
 //------------------------------------------------------------------------------
-for($i = 1; $i < $Game::argc ; $i++)
+if ( isDemo() )
 {
-   $arg = $Game::argv[$i];
+	$SkipLogin = true;
-   $nextArg = $Game::argv[$i+1];
+	$LaunchMode = "Offline";
-   $nextArg2 = $Game::argv[$i+2];
+
-   $hasNextArg = $Game::argc - $i > 1;
+   new GuiChunkedBitmapCtrl(DemoSplashGui) {
-   $has2NextArgs = $Game::argc - $i > 2;
+	   profile = "GuiContentProfile";
-   
+	   bitmap = "gui/bg_DemoSplash.png";
-   if (!stricmp(fileExt($arg), ".dif"))
+	   horizSizing = "right";
-   {
+	   vertSizing = "bottom";
-      $LaunchMode = "InteriorView";
+	   position = "0 0";
-      //$SkipLogin = true;
+	   extent = "640 480";
-      $TestObjectFileName = $arg;
+	   minExtent = "8 8";
-      echo($TestObjectFileName);
+	   visible = "1";
-   }
+	   helpTag = "0";
-   else if(!stricmp(fileExt($arg), ".dif\""))
+	   useVariable = "0";
-   {
+	   hideCursor = "1";
-      $LaunchMode = "InteriorView";
+	   qLineCount = "0";
-      //$SkipLogin = true;
+   };
-      $TestObjectFileName = getSubStr($arg,1, strlen($arg) - 2);
+
-   }
+	$DemoMasterAddress = "IP:64.94.105.141:27999";
-   else if ( $arg $= "-mod" && $hasNextArg )
+   $ShellBackground = "gui/bg_Demo.png";
-   {
-      setModPaths( $nextArg );
-      $i += 2;
-   }
-   else if($arg $= "-dedicated")
-   {
-      $LaunchMode = "DedicatedServer";
-   }
-   else if($arg $= "-clientprefs" && $hasNextArg)
-   {
-      $i++;
-      $clientprefs = $nextArg;
-   }
-   else if($arg $= "-serverprefs" && $hasNextArg)
-   {
-      $i++;
-      $serverprefs = $nextArg;
-   }
-   else if($arg $= "-host")
-   {
-      $LaunchMode = "HostGame";
-   }
-   else if($arg $= "-mission" && $has2NextArgs)
-   {
-      $i += 2;
-      $mission = $nextArg;
-      $missionType = $nextArg2;
-   }
-   else if($arg $= "-connect" && $hasNextArg)
-   {
-      $i++;
-      $LaunchMode = "Connect";
-      $JoinGameAddress = $nextArg;
-   }
-   else if($arg $= "-jload" && $hasNextArg)
-   {
-      $i++;
-      $JournalFile = $nextArg;
-      $JournalMode = "LoadJournal";
-   }
-   else if($arg $= "-jsave" && $hasNextArg)
-   {                     
-      $i++;
-      $JournalFile = $nextArg;
-      $JournalMode = "SaveJournal";
-   }
-   else if($arg $= "-jplay" && $hasNextArg)
-   {
-      $i++;
-      $JournalFile = $nextArg;
-      $journalMode = "PlayJournal";
-   }
-   else if($arg $= "-navBuild" && $has2NextArgs)
-   {
-      $i += 2;
-      $LaunchMode = "NavBuild";
-      $mission = $nextArg;
-      $missionType = $nextArg2;
-   }
-   else if($arg $= "-spnBuild" && $has2NextArgs)
-   {
-      $i += 2;
-      $LaunchMode = "SpnBuild";
-      $mission = $nextArg;
-      $missionType = $nextArg2;
-   }
-   else if($arg $= "-demo")
-   {
-      $LaunchMode = "Demo";
-   }
-   else if($arg $= "-login" && $has2NextArgs)
-   {
-      $i += 2;
-      $Login = true;
-      $LoginName = $nextArg;
-      $LoginPassword = $nextArg2;
-   }
-   else if($arg $= "-show")
-   {
-      $LaunchMode = "TSShow";
-   }
-   else if($arg $= "-con")
-   {
-      $LaunchMode = "Console";
-   }
-   else if ($arg $= "-bot" && $hasNextArg)
-   {
-      $i++;
-      $CmdLineBotCount = $nextArg;
-   }
-   else if ($arg $= "-light" && $hasNextArg)
-   {
-      $LaunchMode = "SceneLight";
-      $mission = $nextArg;
-   }
-   else if ($arg $= "-prepbuild")
-   {
-      enableWinConsole(true);
-      prepBuild();
-      setLogMode(1);
-      setEchoFileLoads(true);
-   }
-   else if($arg $= "-quit")
-   {
-      quit();
-      return;
-   }
-   else if ($arg $= "-nologin")
-   {
-      $SkipLogin = true;
-      if ($LaunchMode !$= "DedicatedServer")
-         $LaunchMode = "Offline";
-   }
-   else if ( $arg $= "-online" )
-      $fromLauncher = true;
 }
-
+else
-// load autoexec once for command-line overrides:
-exec("autoexec.cs", true); 
-
-switch$( $JournalMode )
 {
-   case "LoadJournal":
+	for($i = 1; $i < $Game::argc ; $i++)
-      echo("Loading event log from journal: " @ $JournalFile);
+	{
-      loadJournal($JournalFile);
+	   $arg = $Game::argv[$i];
-   case "SaveJournal":
+	   $nextArg = $Game::argv[$i+1];
-      echo("Saving event log to journal: " @ $JournalFile);
+	   $nextArg2 = $Game::argv[$i+2];
-      saveJournal($JournalFile);
+	   $hasNextArg = $Game::argc - $i > 1;
-   case "PlayJournal":
+	   $has2NextArgs = $Game::argc - $i > 2;
-      playJournal($JournalFile);
+	   
+	   if (!stricmp(fileExt($arg), ".dif"))
+	   {
+	      $LaunchMode = "InteriorView";
+	      //$SkipLogin = true;
+	      $TestObjectFileName = $arg;
+	      echo($TestObjectFileName);
+	   }
+	   else if(!stricmp(fileExt($arg), ".dif\""))
+	   {
+	      $LaunchMode = "InteriorView";
+	      //$SkipLogin = true;
+	      $TestObjectFileName = getSubStr($arg,1, strlen($arg) - 2);
+	   }
+	   else if ( $arg $= "-mod" && $hasNextArg )
+	   {
+	      setModPaths( $nextArg );
+	      $i += 2;
+	   }
+	   else if($arg $= "-dedicated")
+	   {
+	      $LaunchMode = "DedicatedServer";
+	   }
+	   else if($arg $= "-clientprefs" && $hasNextArg)
+	   {
+	      $i++;
+	      $clientprefs = $nextArg;
+	   }
+	   else if($arg $= "-serverprefs" && $hasNextArg)
+	   {
+	      $i++;
+	      $serverprefs = $nextArg;
+	   }
+	   else if($arg $= "-host")
+	   {
+	      $LaunchMode = "HostGame";
+	   }
+	   else if($arg $= "-mission" && $has2NextArgs)
+	   {
+	      $i += 2;
+	      $mission = $nextArg;
+	      $missionType = $nextArg2;
+	   }
+	   else if($arg $= "-connect" && $hasNextArg)
+	   {
+	      $i++;
+	      $LaunchMode = "Connect";
+	      $JoinGameAddress = $nextArg;
+	   }
+	   else if($arg $= "-password" && $hasNextArg)
+	   {
+	      $i++;
+	      $JoinGamePassword = $nextArg;
+	   }
+	   else if($arg $= "-jload" && $hasNextArg)
+	   {
+	      $i++;
+	      $JournalFile = $nextArg;
+	      $JournalMode = "LoadJournal";
+	   }
+	   else if($arg $= "-jsave" && $hasNextArg)
+	   {                     
+	      $i++;
+	      $JournalFile = $nextArg;
+	      $JournalMode = "SaveJournal";
+	   }
+	   else if($arg $= "-jplay" && $hasNextArg)
+	   {
+	      $i++;
+	      $JournalFile = $nextArg;
+	      $journalMode = "PlayJournal";
+	   }
+	   else if($arg $= "-navBuild" && $has2NextArgs)
+	   {
+	      $i += 2;
+	      $LaunchMode = "NavBuild";
+	      $mission = $nextArg;
+	      $missionType = $nextArg2;
+	   }
+	   else if($arg $= "-spnBuild" && $has2NextArgs)
+	   {
+	      $i += 2;
+	      $LaunchMode = "SpnBuild";
+	      $mission = $nextArg;
+	      $missionType = $nextArg2;
+	   }
+	   else if($arg $= "-demo")
+	   {
+	      $LaunchMode = "Demo";
+	   }
+	   else if($arg $= "-login" && $has2NextArgs)
+	   {
+	      $i += 2;
+	      $Login = true;
+	      $LoginName = $nextArg;
+	      $LoginPassword = $nextArg2;
+	   }
+	   else if($arg $= "-show")
+	   {
+	      $LaunchMode = "TSShow";
+	   }
+	   else if($arg $= "-con")
+	   {
+	      $LaunchMode = "Console";
+	   }
+	   else if ($arg $= "-bot" && $hasNextArg)
+	   {
+	      $i++;
+	      $CmdLineBotCount = $nextArg;
+	   }
+	   else if ($arg $= "-light" && $hasNextArg)
+	   {
+	      $LaunchMode = "SceneLight";
+	      $mission = $nextArg;
+	   }
+	   else if ($arg $= "-prepbuild")
+	   {
+	      enableWinConsole(true);
+	      prepBuild();
+	      setLogMode(1);
+	      setEchoFileLoads(true);
+	   }
+	   else if($arg $= "-quit")
+	   {
+	      quit();
+	      return;
+	   }
+	   else if ($arg $= "-nologin")
+	   {
+	      $SkipLogin = true;
+	      if ($LaunchMode !$= "DedicatedServer")
+	         $LaunchMode = "Offline";
+	   }
+	   else if ( $arg $= "-online" )
+	      $fromLauncher = true;
+	}
+
+	// load autoexec once for command-line overrides:
+	exec("autoexec.cs", true); 
+
+	switch$( $JournalMode )
+	{
+	   case "LoadJournal":
+	      echo("Loading event log from journal: " @ $JournalFile);
+	      loadJournal($JournalFile);
+	   case "SaveJournal":
+	      echo("Saving event log to journal: " @ $JournalFile);
+	      saveJournal($JournalFile);
+	   case "PlayJournal":
+	      playJournal($JournalFile);
+	}
 }
 
 //--------------------------------------------------------------------------
@@ -318,20 +357,23 @@ if( $Pref::useImmersion )
 
 $showImmersionDialog = $Pref::useImmersion && $ImmEnabled;
 
-switch( $pref::Shell::lastBackground )
+if (!isDemo())
 {
-   case 0:
+   switch( $pref::Shell::lastBackground )
-      $ShellBackground = "gui/bg_Hammers.png";
+   {
-   case 1:
+      case 0:
-      $ShellBackground = "gui/bg_BloodEagle.png";
+         $ShellBackground = "gui/bg_Hammers.png";
-   case 2:
+      case 1:
-      $ShellBackground = "gui/bg_DiamondSword.png";
+         $ShellBackground = "gui/bg_BloodEagle.png";
-   case 3:
+      case 2:
-      $ShellBackground = "gui/bg_Starwolf.png";
+         $ShellBackground = "gui/bg_DiamondSword.png";
-   case 4:
+      case 3:
-      $ShellBackground = "gui/bg_Harbingers.png";
+         $ShellBackground = "gui/bg_Starwolf.png";
-   default:
+      case 4:
-      $ShellBackground = "gui/bg_Bioderm.png";
+         $ShellBackground = "gui/bg_Harbingers.png";
+      default:
+         $ShellBackground = "gui/bg_Bioderm.png";
+   }
 }
 
 //------------------------------------------------------------------------------
@@ -485,7 +527,7 @@ function EditAccountDlg::onDontUpdate(%this)
    schedule(0,0,LoginDone);
 }
 
-function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck )
+function StartupGui::checkLoginDone( %this, %editAcct, %emailCheck )
 {
    %result = WONLoginResult();
    %code = getField( %result, 1 );
@@ -496,7 +538,7 @@ function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck )
    if ( %status $= "Waiting" )
    {
       LoginMessagePopupText.setValue( "<just:center>" @ %code );
-      %this.loginSchedule = %this.schedule( 1000, checkLoginDone, %editAcct );
+      %this.loginSchedule = %this.schedule( 1000, checkLoginDone, %editAcct, %emailCheck );
    }
    else if ( %status !$= "OK" )
    {
@@ -540,10 +582,14 @@ function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck )
          default:
             if(%code <= -2900 && %code >= -2999)
             {				
-			   if(%code == -2902)
+			      if(%code == -2902)
-					%msg = "Account has already been created - Please login." @ %code;
+					   %msg = "Account has already been created - Please login." @ %code;
-			   else
+			      else
-               		%msg = "Account Creation Failed - That warrior name is already in use.  Please choose another warrior name and try again. Code = " @ %code;
+                  %msg = "Account Creation Failed - That warrior name is already in use.  Please choose another warrior name and try again. Code = " @ %code;
+            }
+            else if ( %code == -2809 )
+            {
+               %msg = "Email check failed - You can not request more than one account info email per every 24-hour period.";
             }
             else if(%errorString !$= "")
             {
@@ -555,6 +601,8 @@ function StartupGui::checkLoginDone( %this, %editAcct,%emailCheck )
       Canvas.popDialog( LoginMessagePopupDlg );
       if(StartupGui.updatingAccount)
          LoginMessageBox( "UPDATE FAILED", %msg, "OK", "schedule(0,0,LoginDone);" );
+      else if ( %emailCheck )
+         LoginMessageBox( "FETCH FAILED", %msg, "OK", "StartupGui::dumbFunction();" );
       else
          LoginMessageBox( "LOGIN FAILED", %msg, "OK", "StartupGui::dumbFunction();" );
    }
@@ -717,6 +765,50 @@ function updateSubmitButton()
    schedule( 1000, 0, updateSubmitButton );
 }
 
+//------------------------------------------------------------------------------
+function PickLoginInfoDlg::onWake( %this )
+{
+   FetchLoginNameEntry.setValue( $LoginName );
+   FetchLoginNameRdo.setValue( true );
+}
+
+//------------------------------------------------------------------------------
+function FetchLoginNameRdo::onAction( %this )
+{
+   FetchPasswordRdo.resize( 29, 144, 240, 30 );
+   FetchLoginNamePane.setVisible( true );
+   FetchPasswordPane.setVisible( false );
+   FetchEmailAddress.makeFirstResponder( true );
+}
+
+//------------------------------------------------------------------------------
+function FetchPasswordRdo::onAction( %this )
+{
+   FetchPasswordRdo.resize( 29, 65, 240, 30 );
+   FetchLoginNamePane.setVisible( false );
+   FetchPasswordPane.setVisible( true );
+   FetchLoginNameEntry.makeFirstResponder( true );
+}
+
+//------------------------------------------------------------------------------
+function FetchLoginInfo()
+{
+   Canvas.popDialog( PickLoginInfoDlg );
+
+   if ( FetchLoginNameRdo.getValue() )
+   {
+      LoginMessagePopup( "PLEASE WAIT", "Attempting to email you your login name..." );
+      WONStartLoginInfoFetch( FetchEmailAddress.getValue() );
+      StartupGui.loginSchedule = StartupGui.schedule( 1000, checkLoginDone, false, true );
+   }
+   else
+   {
+      LoginMessagePopup( "PLEASE WAIT", "Attempting to email you your login password..." );
+      WONStartEmailFetch( FetchLoginNameEntry.getValue() );
+      StartupGui.loginSchedule = StartupGui.schedule( 1000, checkLoginDone, false, true );
+   }
+}
+
 //------------------------------------------------------------------------------
 function CleanUpAndGo()
 {
@@ -745,6 +837,9 @@ function CleanUpAndGo()
    }
    StartupGui.delete();
 
+   if (isDemo())
+      DemoSplashGui.delete();
+
    DefaultCursor.delete();
    DlgBackProfile.delete();
    GuiContentProfile.delete();
@@ -866,10 +961,18 @@ function StartLoginProcess()
    else
    {
       $PlayingOnline = false;
-      LoginMessagePopup( "INITIALIZING", "Please wait..." );
+      if (!isDemo())
-      Canvas.repaint();
+      {
-
+         LoginMessagePopup( "INITIALIZING", "Please wait..." );
-      CleanUpAndGo();
+         Canvas.repaint();
+         CleanUpAndGo();
+      }
+      else
+      {
+         Canvas.setContent(DemoSplashGui);
+         Canvas.repaint();
+         schedule(5000, 0, CleanUpAndGo);
+      }
    }
 }
 
@@ -888,19 +991,16 @@ if ($LaunchMode $= "DedicatedServer" ||
       $PlayingOnline = true;
       LoginProcess();
    }
+   else if($SkipLogin)
+   {
+      $PlayingOnline = false;
+      exec("console_end.cs");
+   }
    else
    {
-      if($SkipLogin)
+      $PlayingOnline = true;
-      {
+      WONServerLogin();
-         $PlayingOnline = false;
+      schedule(1000, 0, dedCheckLoginDone);
-         exec("console_end.cs");
-      }
-      else
-      {
-         $PlayingOnline = true;
-         WONServerLogin();
-         schedule(1000, 0, dedCheckLoginDone);
-      }
    }
 }
 else
@@ -1496,9 +1596,9 @@ else
 			      extent = "180 38";
 			      minExtent = "32 38";
 			      visible = "1";
-			      command = "PasswordProcess(true);";
+			      command = "Canvas.pushDialog( PickLoginInfoDlg );";
 			      helpTag = "0";
-			      text = "EMAIL ME MY PASSWORD";
+			      text = "EMAIL ME MY LOGIN INFO";
 			      simpleStyle = "0";
 		      };
 	      };
@@ -1953,6 +2053,192 @@ else
          };
       };
 
+      //------------------------------
+      // Pick Login Info dialog:
+      new GuiControl(PickLoginInfoDlg) {
+	      profile = "DlgBackProfile";
+	      horizSizing = "right";
+	      vertSizing = "bottom";
+	      position = "0 0";
+	      extent = "640 480";
+	      minExtent = "8 8";
+	      visible = "1";
+	      hideCursor = "0";
+	      bypassHideCursor = "0";
+	      helpTag = "0";
+
+	      new ShellPaneCtrl() {
+		      profile = "ShellDlgPaneProfile";
+		      horizSizing = "center";
+		      vertSizing = "center";
+		      position = "120 126";
+		      extent = "400 228";
+		      minExtent = "48 92";
+		      visible = "1";
+		      hideCursor = "0";
+		      bypassHideCursor = "0";
+		      helpTag = "0";
+		      text = "SELECT LOGIN INFO";
+		      maxLength = "255";
+		      noTitleBar = "0";
+
+		      new ShellFieldCtrl(FetchLoginNamePane) {
+			      profile = "ShellFieldProfile";
+			      horizSizing = "width";
+			      vertSizing = "bottom";
+			      position = "55 68";
+			      extent = "310 70";
+			      minExtent = "16 18";
+			      visible = "0";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      helpTag = "0";
+
+			      new GuiTextCtrl() {
+				      profile = "ShellTextRightProfile";
+				      horizSizing = "right";
+				      vertSizing = "bottom";
+				      position = "9 7";
+				      extent = "130 22";
+				      minExtent = "8 8";
+				      visible = "1";
+				      hideCursor = "0";
+				      bypassHideCursor = "0";
+				      helpTag = "0";
+				      text = "Enter Your Email Address:";
+				      maxLength = "255";
+			      };
+			      new ShellTextEditCtrl(FetchEmailAddress) {
+				      profile = "NewTextEditProfile";
+				      horizSizing = "right";
+				      vertSizing = "bottom";
+				      position = "10 26";
+				      extent = "269 38";
+				      minExtent = "32 38";
+				      visible = "1";
+				      altCommand = "FetchLoginInfo();";
+				      hideCursor = "0";
+				      bypassHideCursor = "0";
+				      helpTag = "0";
+				      maxLength = "128";
+				      historySize = "0";
+				      password = "0";
+				      tabComplete = "0";
+				      deniedSound = "InputDeniedSound";
+				      glowOffset = "9 9";
+			      };
+		      };
+		      new ShellRadioButton(FetchPasswordRdo) {
+			      profile = "ShellRadioProfile";
+			      horizSizing = "right";
+			      vertSizing = "bottom";
+			      position = "29 144";
+			      extent = "240 30";
+			      minExtent = "26 27";
+			      visible = "1";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      helpTag = "0";
+			      text = "FETCH PASSWORD BY LOGIN NAME";
+			      maxLength = "255";
+			      groupNum = "1";
+		      };
+		      new ShellFieldCtrl(FetchPasswordPane) {
+			      profile = "ShellFieldProfile";
+			      horizSizing = "width";
+			      vertSizing = "bottom";
+			      position = "55 98";
+			      extent = "310 70";
+			      minExtent = "16 18";
+			      visible = "1";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      helpTag = "0";
+
+			      new GuiTextCtrl() {
+				      profile = "ShellTextRightProfile";
+				      horizSizing = "right";
+				      vertSizing = "bottom";
+				      position = "9 7";
+				      extent = "117 22";
+				      minExtent = "8 8";
+				      visible = "1";
+				      hideCursor = "0";
+				      bypassHideCursor = "0";
+				      helpTag = "0";
+				      text = "Enter Your Login Name:";
+				      maxLength = "255";
+			      };
+			      new ShellTextEditCtrl(FetchLoginNameEntry) {
+				      profile = "NewTextEditProfile";
+				      horizSizing = "right";
+				      vertSizing = "bottom";
+				      position = "55 26";
+				      extent = "200 38";
+				      minExtent = "32 38";
+				      visible = "1";
+                  altCommand = "FetchLoginInfo();";
+				      hideCursor = "0";
+				      bypassHideCursor = "0";
+				      helpTag = "0";
+				      maxLength = "255";
+				      historySize = "0";
+				      password = "0";
+				      tabComplete = "0";
+				      deniedSound = "InputDeniedSound";
+				      glowOffset = "9 9";
+			      };
+		      };
+		      new ShellRadioButton(FetchLoginNameRdo) {
+			      profile = "ShellRadioProfile";
+			      horizSizing = "right";
+			      vertSizing = "bottom";
+			      position = "29 35";
+			      extent = "240 30";
+			      minExtent = "26 27";
+			      visible = "1";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      helpTag = "0";
+			      text = "FETCH LOGIN INFO BY EMAIL ADDRESS";
+			      maxLength = "255";
+			      groupNum = "1";
+		      };
+		      new ShellBitmapButton() {
+			      profile = "ShellButtonProfile";
+			      horizSizing = "right";
+			      vertSizing = "top";
+			      position = "67 173";
+			      extent = "100 38";
+			      minExtent = "32 38";
+			      visible = "1";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      command = "Canvas.popDialog( PickLoginInfoDlg );";
+			      helpTag = "0";
+			      text = "CANCEL";
+			      simpleStyle = "0";
+		      };
+		      new ShellBitmapButton() {
+			      profile = "ShellButtonProfile";
+			      horizSizing = "right";
+			      vertSizing = "top";
+			      position = "233 173";
+			      extent = "100 38";
+			      minExtent = "32 38";
+			      visible = "1";
+			      hideCursor = "0";
+			      bypassHideCursor = "0";
+			      command = "FetchLoginInfo();";
+			      helpTag = "0";
+			      text = "SUBMIT";
+			      simpleStyle = "0";
+		      };
+	      };
+      };
+      // End Fetch Login Name dialog
+      //------------------------------
+
       if($Login == false)
          $LoginName = $pref::LastLoginName;
    }