From 164d2e7c6ca5732d60f80c4c8dc1df4ee3920351 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sun, 6 Sep 2020 16:18:17 -0400 Subject: [PATCH 1/5] Update TKwarn.cs Added machineeggs exclude --- Classic/scripts/autoexec/TKwarn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/TKwarn.cs b/Classic/scripts/autoexec/TKwarn.cs index a5f745c..b7e0f85 100644 --- a/Classic/scripts/autoexec/TKwarn.cs +++ b/Classic/scripts/autoexec/TKwarn.cs @@ -15,7 +15,7 @@ function DefaultGame::testTeamKill(%game, %victimID, %killerID) return true; // Ignore this map - if($CurrentMission $= "Mac_FlagArena") + if($CurrentMission $= "Mac_FlagArena" || $CurrentMission $= "Machineeggs") return true; // warn the player From f077a873f3ae55e8f8dd944d5d6b3f1355ccebdb Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 7 Sep 2020 17:09:22 -0400 Subject: [PATCH 2/5] Observers var for reference --- Classic/scripts/autoexec/GetTeamCounts.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Classic/scripts/autoexec/GetTeamCounts.cs b/Classic/scripts/autoexec/GetTeamCounts.cs index d0aca39..759cfe0 100644 --- a/Classic/scripts/autoexec/GetTeamCounts.cs +++ b/Classic/scripts/autoexec/GetTeamCounts.cs @@ -47,6 +47,7 @@ function GetTeamCounts(%game) //Variables $TotalTeamPlayerCount = $TeamRank[1, count] + $TeamRank[2, count]; $AllPlayerCount = $HostGamePlayerCount; + $Observers = $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count]); //echo("$PlayerCount[0] " @ $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count])); //echo("$PlayerCount[1] " @ $TeamRank[1, count]); From 7e134b8d2d4da1ebec86f9d3d24653a8d0ceacc8 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sat, 12 Sep 2020 00:31:06 -0400 Subject: [PATCH 3/5] No-Schedule MineDisc Detection --- Classic/scripts/player.cs | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/Classic/scripts/player.cs b/Classic/scripts/player.cs index 3e29239..50436f2 100644 --- a/Classic/scripts/player.cs +++ b/Classic/scripts/player.cs @@ -2800,27 +2800,23 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am %flash = 0.75; // Teratos: Originally from Eolk? Mine+Disc tracking/death message support. - // client.mineDisc = [true|false] - // client.mineDiscCheck [0-None|1-Disc Damage|2-Mine Damage] - // Teratos: Don't understand why "%client = %targetClient;" -- possibly to avoid carrying .minediscCheck field? - // Teratos: A little more redundant code and less readable for a few less comparisons. + // No Schedules by DarkTiger %targetClient.mineDisc = false; - if(%damageType == $DamageType::Disc) { - %client = %targetClient; // Oops - if(%client.minediscCheck == 0) { // No Mine or Disc damage recently - %client.minediscCheck = 1; - schedule(300, 0, "resetMineDiscCheck", %client); - } else if(%client.minediscCheck == 2) { // Recent Mine damage - %client.mineDisc = true; - } - } else if (%damageType == $DamageType::Mine) { - %client = %targetClient; // Oops - if(%client.minediscCheck == 0) { // No Mine or Disc damage recently - %client.minediscCheck = 2; - schedule(300, 0, "resetMineDiscCheck", %client); - } else if(%client.minediscCheck == 1) { // Recent Disc damage - %client.mineDisc = true; - } + switch$(%damageType) + { + case $DamageType::Disc: + if(%targetClient.mdc == 1 && (getSimTime() - %targetClient.mdcTime1) < 256) + %targetClient.mineDisc = true; + + %targetClient.mdc = 2; + %targetClient.mdcTime2 = getSimTime(); + + case $DamageType::Mine: + if(%targetClient.mdc == 2 && (getSimTime() - %targetClient.mdcTime2) < 256) + %targetClient.mineDisc = true; + + %targetClient.mdc = 1; + %targetClient.mdcTime1 = getSimTime(); } // -- End Mine+Disc insert. From 5a29c4deafe776dd26d510a6915d0731a910f28e Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sun, 13 Sep 2020 19:25:37 -0400 Subject: [PATCH 4/5] Dont use mis file asset nameTags --- Classic/scripts/autoexec/TacoOverrides.cs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs index e1ede45..7ae13ba 100644 --- a/Classic/scripts/autoexec/TacoOverrides.cs +++ b/Classic/scripts/autoexec/TacoOverrides.cs @@ -171,7 +171,27 @@ function DefaultGame::missionLoadDone(%game) %obj = MissionGroup.getObject(%i); if(%obj.getClassName() $= "WaterBlock") %obj.viscosity = $globalviscosity; - } + } +} + +// Temp Fix for Asset nameTag Strings +function GameBaseData::onAdd(%data, %obj) +{ + if(%data.targetTypeTag !$= "") + { + // use the name given to the object in the mission file + //if(%obj.nameTag !$= "") + //{ + //%obj.nameTag = addTaggedString(%obj.nameTag); + //%nameTag = %obj.nameTag; + //} + //else + %nameTag = %data.targetNameTag; + + %obj.target = createTarget(%obj, %nameTag, "", "", %data.targetTypeTag, 0, 0); + } + else + %obj.target = -1; } }; From c5c020c614bd71d92ab06f6791fbf3aa94835f1f Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 14 Sep 2020 13:28:15 -0400 Subject: [PATCH 5/5] nameTag Fix Ver2 --- Classic/scripts/autoexec/TacoOverrides.cs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs index 7ae13ba..e85a4a8 100644 --- a/Classic/scripts/autoexec/TacoOverrides.cs +++ b/Classic/scripts/autoexec/TacoOverrides.cs @@ -180,14 +180,20 @@ function GameBaseData::onAdd(%data, %obj) if(%data.targetTypeTag !$= "") { // use the name given to the object in the mission file - //if(%obj.nameTag !$= "") - //{ - //%obj.nameTag = addTaggedString(%obj.nameTag); - //%nameTag = %obj.nameTag; - //} - //else + if(%obj.nameTag !$= "" && strpos(%obj.nameTag,"\x01") == -1) + { + %obj.nameTag = addTaggedString(%obj.nameTag); + %nameTag = %obj.nameTag; + } + else if(%data.targetNameTag !$= "") %nameTag = %data.targetNameTag; - + else + { + if(%obj.name !$= "") + %nameTag = %obj.nameTag = addTaggedString(%obj.name); + else + %nameTag = %obj.nameTag = addTaggedString("Base"); // fail safe so it shows up on cc + } %obj.target = createTarget(%obj, %nameTag, "", "", %data.targetTypeTag, 0, 0); } else