Merge branch 'codeCorrect' into develop

ChangeLog.txt

@@ -1,13 +1,27 @@
 ACCM 1.5.0 --------------------------------------------------
 * DarkDragonDX takes up development.
-* Fixed saving of objects with names set via /name (generators, solar panels, etc are excluded as they are supposed to display frequency #)
+* Fixed saving of objects with names set via /name
+	- Names of switches and generators now save albeit they need toggled first.
 * Removed a bunch of Sentinel Stuff (by Blnukem) -- their AI was never actually finished it seemed.
 * Chat command '/killzombies' used to only half the zombie population. Now it kills them all.
 * Several occurances of console spam were fixed.
 * Removed unused files, reorganized files slightly.
 * Added Linux shell script for deleting .dso files if you're weird like me and run on some Linux operating system via WINE.
-* Team 6 is now the 'offical zombie team'. This just means zombie teams are set to this by default.
+* Team 6 is now the 'offical zombie team'. This just means zombie targets are set to this by default.
 * Added player.setSkin() and player.setName() -- they need tested
+* Edited /changeName so that color sequences are accepted
+	\c0 - Very Dark Blue-ish color
+	\c1 - Bright Green in chat window / Cyan in Lobby
+	\c2 - Faded Orange in Chat / Gray in Lobby
+	\c3 - Bright Green in chat / Dark Green in Lobby
+	\c4	- Blue in Chat (normal) / White in Lobby (Bright)
+	\c5 - Gold in Chat / White in Lobby (Bright)
+	\c6 - Blue in Chat (Normal) / White in Lobby (Normal)
+	\c7 - Blue in Chat (Normal) / Gold in Lobby
+	\c8 - Blue in Chat (Normal) / Blue In Lobby (smurf color)
+	\c9 - Blue in Chat (Normal) / Green in Lobby (Bot)
+	- Ex: /changename dx \cp\c7[Faction]\c6Name\co
+	- Also any standard ASCII junk is supported as well -- figure it out yourself.
 
 ACCM 1.4.0 [For Deflun :] ------------------------------
 * The turret override (disable / enable turrets) now works outside of purebuild.

scripts/CombatConGame.cs

@@ -1076,7 +1076,7 @@ function CombatConGame::vehicleDestroyed(%game, %vehicle, %destroyer){
         %pref = (%vehicleType $= "Assault Tank") ? "an" : "a";
         messageAll( 'msgVehicleTeamDestroy', '\c0%1 TEAMKILLED %3 %2!', %destroyerName, %vehicleType, %pref);
     }
-    else{
+    else if (%destroyerName !$= "") {
         messageTeamExcept(%destroyer, 'msgVehicleDestroy', '\c0%1 destroyed an enemy %2.', %destroyerName, %vehicleType);
         messageTeam(%enemyTeam, 'msgVehicleDestroy', '\c0%1 destroyed your team\'s %2.', %destroyerName, %vehicleType);
 

scripts/modscripts/chatcommands/admin.cs

@@ -748,6 +748,7 @@ function ccChangeName(%sender, %args)
       return;
    }
 
+   %name = collapseEscape(%name);
    ChangeName(%target, %name);
    messageClient(%target, "", "\c2Your new name is \c3"@%name@"\c2.");
    warn(%sender.nameBase@" ("@%sender@") changed "@%target.nameBase@"'s ("@%target@") name to "@%name);

scripts/modscripts/chatcommands/public.cs

@@ -513,6 +513,7 @@ function ccName(%sender,%args, %special)
    }
       messageclient(%sender, 'MsgClient', "\c2Object name set to \c3"@%args@"");
       %obj.nametag = %args;
+      %obj.name = %args;
       setTargetName(%obj.target,addTaggedString("\c6"@%args@""));
          return;
 }

scripts/packs/switch.cs

@@ -142,7 +142,9 @@ function SwitchDeployableImage::onDeploy(%item, %plyr, %slot) {
 
 	// set power
 	%deplObj.setSelfPowered();
-	setTargetName(%deplObj.target,addTaggedString("Frequency" SPC %deplObj.powerFreq));
+	%name = "Frequency" SPC %deplObj.powerFreq;
+	setTargetName(%deplObj.target,addTaggedString(%name));
+	%deplObj.nameTag = %name;
 
 	// set the sensor group if it needs one
 	if (%deplObj.getTarget() != -1)
@@ -167,7 +169,9 @@ function SwitchDeployableImage::onDeploy(%item, %plyr, %slot) {
 
 	if (%deplObj.timed == 2) {
 		%deplObj.stopThread($AmbientThread);
-		setTargetName(%deplObj.target,addTaggedString("Disabled Frequency" SPC %deplObj.powerFreq));
+		%name = "Disabled Frequency" SPC %deplObj.powerFreq;
+		setTargetName(%deplObj.target,addTaggedString(%name));
+		%deplObj.nametag = %deplObj.name;
 		%deplObj.isSwitchedOff = true;
 	}
 
@@ -227,14 +231,37 @@ function toggleSwitch(%obj,%state,%col,%delayed) {
 	if (%state == true) {
 		%obj.play3D(SwitchToggledSound);
 		%obj.playThread($AmbientThread,"ambient");
-		setTargetName(%obj.target,addTaggedString("Frequency" SPC %obj.powerFreq));
+		if (%obj.name !$= "")
+		{
+			%name = "[" @ %obj.name @ "] Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
+		else
+		{
+			%name = "Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
 		if (!%force)
 			messageClient(%col.client, 'msgClient', '\c2%1 objects attempted switched on.',%switchCount);
 	}
 	else {
 		%obj.play3D(SwitchToggledSound);
 		%obj.stopThread($AmbientThread);
-		setTargetName(%obj.target,addTaggedString("Disabled Frequency" SPC %obj.powerFreq));
+		if (%obj.name !$= "")
+		{
+			%name = "[" @ %obj.name @ "] Disabled Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
+		else
+		{
+			%name = "Disabled Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
+
 		if (!%force)
 			messageClient(%col.client, 'msgClient', '\c2%1 objects attempted switched off.',%switchCount);
 	}

scripts/power.cs

@@ -340,7 +340,18 @@ function toggleGenerator(%obj,%state) {
 		%obj.isSwitchedOff = "";
 		%obj.getDataBlock().gainPower(%obj);
 		%obj.play3D(%powerOnSound);
-		setTargetName(%obj.target,addTaggedString("Frequency" SPC %obj.powerFreq));
+		if (%obj.name !$= "")
+		{
+			%name = "[" @ %obj.name @ "] Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
+		else
+		{
+			%name = "Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
 		%obj.switchTime = getSimTime();
 		return 2 SPC %taggedDisplayName;
 	}
@@ -348,7 +359,18 @@ function toggleGenerator(%obj,%state) {
 		%obj.getDataBlock().losePower(%obj);
 		%obj.isSwitchedOff = 1;
 		%obj.play3D(%powerOffSound);
-		setTargetName(%obj.target,addTaggedString("Disabled Frequency" SPC %obj.powerFreq));
+		if (%obj.name !$= "")
+		{
+			%name = "[" @ %obj.name @ "] Disabled Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
+		else
+		{
+			%name = "Disabled Frequency" SPC %obj.powerFreq;
+			setTargetName(%obj.target,addTaggedString(%name));
+			%obj.nameTag = %name;
+		}
 		%obj.switchTime = getSimTime();
 		return 1 SPC %taggedDisplayName;
 	}

scripts/saveBuilding.cs

@@ -229,7 +229,10 @@ function writeBuildingComponent(%obj) {
 			echo("Saving: " @ %obj @ " Name: " @ %dataBlockName);
 		%buildingPiece = "%building = new (" @ %obj.getClassName() @ ") () {";
 		%buildingPiece = %buildingPiece @ "datablock = \"" @ %dataBlockName @ "\";";
-		if (%obj.nameTag !$= "") %buildingPiece = %buildingPiece @ "nameTag = \"" @ %obj.nameTag @ "\";";
+		if (%obj.nameTag !$= "" && %obj.name $= "") %buildingPiece = %buildingPiece @ "nameTag = \"" @ %obj.nameTag @ "\";";
+		else %buildingPiece = %buildingPiece @ "nameTag = \"" @ %obj.name @ "\";";
+
+		if (%obj.name !$= "") %buildingPiece = %buildingPiece @ "name = \"" @ %obj.name @ "\";";
 		if (%obj.position !$= "") %buildingPiece = %buildingPiece @ "position = \"" @ %obj.position @ "\";";
 		if (%obj.rotation !$= "") %buildingPiece = %buildingPiece @ "rotation = \"" @ %obj.rotation @ "\";";
 		if (%obj.realScale !$= "") %buildingPiece = %buildingPiece @ "scale = \"" @ %obj.realScale @ "\";";
@@ -272,6 +275,7 @@ function writeBuildingComponent(%obj) {
 //			if (%obj.isdoor != "") %buildingPiece = %buildingPiece @ "isdoor = \"" @ %obj.isdoor@ "\";";
 			%buildingPiece = %buildingPiece @ "canmove = \"" @ %obj.canmove @ "\";";
 		}
+
 		if (%dataBlockName $= "DeployedZSpawnBase"){
 			if (%obj.ZType != "") %buildingPiece = %buildingPiece @ "ZType = \"" @ %obj.ZType@ "\";";
 			if (%obj.spawnTypeset != "") %buildingPiece = %buildingPiece @ "spawnTypeset = \"" @ %obj.spawnTypeset@ "\";";

scripts/server.cs

@@ -53,10 +53,10 @@ function CreateServer(%mission, %missionType) {
    exec("scripts/do_not_delete/loadscreen.cs");
    exec("scripts/do_not_delete/Innoculation.cs");
    exec("scripts/loadmenu.cs");
-   exec("scripts/libraries.cs");
+   exec("scripts/modscripts/libraries.cs");
    exec("scripts/do_not_delete/Dfunctions.cs");
    exec("scripts/do_not_delete/MergeToolSupport.cs");
-   exec("scripts/hfunctions.cs");
+   exec("scripts/modscripts/hfunctions.cs");
    exec("scripts/pack.cs");
    exec("scripts/vehicles/vehicle_spec_fx.cs");
    exec("scripts/vehicles/vehicle_effects.cs");
@@ -112,11 +112,12 @@ function CreateServer(%mission, %missionType) {
    exec("scripts/JTLmeteorStorm.cs");
    exec("scripts/prison.cs");
    exec("scripts/hazard.cs");
-   exec("scripts/ion.cs");
+   exec("scripts/modscripts/ion.cs");
    exec("scripts/solitudeBlock.cs");
-   exec("scripts/chatCommands.cs");
+   // Moved for organisational purposes
-   exec("scripts/skywrite.cs");
+   exec("scripts/modscripts/chatcommands/public.cs");
-   exec("scripts/dEffects.cs");
+   exec("scripts/modscripts/skywrite.cs");
+   exec("scripts/modscripts/dEffects.cs");
 
    // -- ACCM Executes
    exec("scripts/modscripts/ranking.cs");