Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-07-15 00:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Syntax Error Fixing

Browse source 
Fixed all of the syntax errors in the current version of the mod.

* NOTE: You can now run a server on this current version although some
of the zombie features are non-functional at the moment.
This commit is contained in:
Robert Fritzen 2017-12-20 12:48:36 -06:00
parent 00e88cd9ea
commit 34dc29b805
9 changed files with 47 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/TWM2/ArmorFunctions.cs
View file

@ -576,7 +576,7 @@ function SummonerZombieArmor::onTrigger(%data, %player, %triggerNum, %val) {
%c.schedule(((%Ct * 1000) + 500), "delete"); %c.schedule(((%Ct * 1000) + 500), "delete");
for(%i = 1; %i <= %ct; %i++) { for(%i = 1; %i <= %ct; %i++) {
%time = %i * 1000; %time = %i * 1000;
schedule(%time, 0, "TWM2Lib_Zombie_Core" "SpawnZombie", "zSpawnCommand", %type, %SumPos); schedule(%time, 0, "TWM2Lib_Zombie_Core", "SpawnZombie", "zSpawnCommand", %type, %SumPos);
} }
} }
} }

2
scripts/TWM2/Bosses/GeneralVegenor.cs
View file

@ -274,7 +274,7 @@ function VegenorAttack_FUNC(%att, %args) {
for(%i = 0; %i < 6; %i++) { for(%i = 0; %i < 6; %i++) {
%pos = vectoradd(%z.getPosition(), TWM2Lib_MainControl("getRandomPosition", 10 TAB 1)); %pos = vectoradd(%z.getPosition(), TWM2Lib_MainControl("getRandomPosition", 10 TAB 1));
%fpos = vectoradd("0 0 5",%pos); %fpos = vectoradd("0 0 5",%pos);
TWM2Lib_Zombie_Core("SpawnZombie", "zSpawnCommand", %type, %fpos) TWM2Lib_Zombie_Core("SpawnZombie", "zSpawnCommand", %type, %fpos);
} }
%z.setMoveState(true); %z.setMoveState(true);
%z.setActionThread($Zombie::RogThread, true); %z.setActionThread($Zombie::RogThread, true);

1
scripts/TWM2/LoadMod.cs
View file

@ -74,7 +74,6 @@ exec("scripts/TWM2/ExteriorFunctioning/cmdArmor.cs"); //cmdArmor patch
exec("scripts/TWM2/ChatCommands/Public.cs"); //Public CCs exec("scripts/TWM2/ChatCommands/Public.cs"); //Public CCs
exec("scripts/TWM2/ChatCommands/Admin.cs"); //Admin CCs exec("scripts/TWM2/ChatCommands/Admin.cs"); //Admin CCs
exec("scripts/TWM2/ChatCommands/Zombie.cs"); //Zombie CCs
exec("scripts/TWM2/ChatCommands/SuperAdmin.cs"); //SuperAdmin CCs exec("scripts/TWM2/ChatCommands/SuperAdmin.cs"); //SuperAdmin CCs
exec("scripts/TWM2/ChatCommands/DevAndHost.cs"); //Dev/Host CCs exec("scripts/TWM2/ChatCommands/DevAndHost.cs"); //Dev/Host CCs

34
scripts/TWM2/Systems/NWChallengeIndex.cs
View file

@ -308,10 +308,10 @@ $Challenge::Challenge[5, 3] = "MaximizedPotential";
$Challenge::Info["MaximizedPotential"] = "Maximized Potential\t5\t10000\tNone\tReach the maximum hazard level (5) in a living world session"; $Challenge::Info["MaximizedPotential"] = "Maximized Potential\t5\t10000\tNone\tReach the maximum hazard level (5) in a living world session";
$Challenge::IsNotMultiTier["MaximizedPotential"] = true; $Challenge::IsNotMultiTier["MaximizedPotential"] = true;
$Challenge::Challenge[5, 4] = "TheThunderdome"; $Challenge::Challenge[5, 4] = "TheThunderdome";
$Challenge::Info["TheThunderdome"] = "The Thunderdome\t5\t7500\tNone\tEnter a boss areana during a living world session"; $Challenge::Info["TheThunderdome"] = "The Thunderdome\t5\t7500\tNone\tEnter a boss arena during a living world session";
$Challenge::IsNotMultiTier["TheThunderdome"] = true; $Challenge::IsNotMultiTier["TheThunderdome"] = true;
$Challenge::Challenge[5, 5] = "HVTDown"; $Challenge::Challenge[5, 5] = "HVTDown";
$Challenge::Info["HVTDown"] = "HVT Down\t5\t10000\tNone\tDefeat an enemy field commander during a living world session"; $Challenge::Info["HVTDown"] = "HVT Down\t5\t10000\tNone\tComplete a boss arena encounter during a living world session";
$Challenge::IsNotMultiTier["HVTDown"] = true; $Challenge::IsNotMultiTier["HVTDown"] = true;
$Challenge::Challenge[5, 6] = "ReaperOfReapers"; $Challenge::Challenge[5, 6] = "ReaperOfReapers";
$Challenge::Info["ReaperOfReapers"] = "Reaper Of Reapers\t5\t5000\tNone\tComplete the 'Aerieal Reaping' flashpoint operation."; $Challenge::Info["ReaperOfReapers"] = "Reaper Of Reapers\t5\t5000\tNone\tComplete the 'Aerieal Reaping' flashpoint operation.";
@ -417,22 +417,40 @@ $Challenge::Info["WraithHunter2"] = "Anti Spec-Ops II\t6\t5000\tNone\tSlay 750 W
$Challenge::Challenge[6, 38] = "WraithHunter3"; $Challenge::Challenge[6, 38] = "WraithHunter3";
$Challenge::Info["WraithHunter3"] = "Anti Spec-Ops III\t6\t10000\tNone\tSlay 1,000 Wraith Zombies"; $Challenge::Info["WraithHunter3"] = "Anti Spec-Ops III\t6\t10000\tNone\tSlay 1,000 Wraith Zombies";
$Challenge::Challenge[6, 39] = "ShieldBreaker"; $Challenge::Challenge[6, 39] = "ShieldBreaker";
$Challenge::Info["ShieldBreaker"] = "Shield Breaker\t6\t1000\tNone\tDestroy a Zombie Lord Defensive Barrier"; $Challenge::Info["ShieldBreaker"] = "Shield Breaker\t6\t1000\tNone\tDestroy a Zombie Lord's Defensive Barrier";
$Challenge::IsNotMultiTier["ShieldBreaker"] = true; $Challenge::IsNotMultiTier["ShieldBreaker"] = true;
//Drone Hunter //Drone Hunter
$Challenge::Category[7] = "Drone Hunter Challenges\tTasks related to scrapping Harbinger Sentry Drones\t33"; $Challenge::Category[7] = "Drone Hunter Challenges\tTasks related to scrapping Harbinger Sentry Drones\t33";
$Challenge::Challenge[7, 0] = "DroningOn1"; $Challenge::Challenge[7, 0] = "DroningOn1";
$Challenge::Info["DroningOn1"] = "Droning On I\t7\t5000\tNone\tEliminate 100 Harbinger Sentry Drones (Any Type)"; $Challenge::Info["DroningOn1"] = "Droning On I\t7\t5000\tNone\tEliminate 500 Harbinger Sentry Drones (Any Type)";
$Challenge::Challenge[7, 1] = "DroningOn2"; $Challenge::Challenge[7, 1] = "DroningOn2";
$Challenge::Info["DroningOn2"] = "Droning On II\t7\t10000\tNone\tEliminate 250 Harbinger Sentry Drones (Any Type)"; $Challenge::Info["DroningOn2"] = "Droning On II\t7\t10000\tNone\tEliminate 1000 Harbinger Sentry Drones (Any Type)";
$Challenge::Challenge[7, 2] = "DroningOn3"; $Challenge::Challenge[7, 2] = "DroningOn3";
$Challenge::Info["DroningOn3"] = "Droning On III\t7\t15000\tNone\tEliminate 500 Harbinger Sentry Drones (Any Type)"; $Challenge::Info["DroningOn3"] = "Droning On III\t7\t15000\tNone\tEliminate 2500 Harbinger Sentry Drones (Any Type)";
$Challenge::Challenge[7, 3] = "DroningOn4"; $Challenge::Challenge[7, 3] = "DroningOn4";
$Challenge::Info["DroningOn4"] = "Droning On IV\t7\t25000\tNone\tEliminate 1000 Harbinger Sentry Drones (Any Type)"; $Challenge::Info["DroningOn4"] = "Droning On IV\t7\t25000\tNone\tEliminate 7500 Harbinger Sentry Drones (Any Type)";
$Challenge::Challenge[7, 4] = "DroningOn5"; $Challenge::Challenge[7, 4] = "DroningOn5";
$Challenge::Info["DroningOn5"] = "Droning On V\t7\t50000\tNone\tEliminate 2500 Harbinger Sentry Drones (Any Type)"; $Challenge::Info["DroningOn5"] = "Droning On V\t7\t50000\tNone\tEliminate 25000 Harbinger Sentry Drones (Any Type)";
$Challenge::Challenge[7, 5] = "GunEmDown1";
$Challenge::Info["GunEmDown1"] = "Gun Em' Down I\t7\t2500\tNone\tEliminate 100 H1-CMS Drones";
$Challenge::Challenge[7, 6] = "GunEmDown2";
$Challenge::Info["GunEmDown2"] = "Gun Em' Down II\t7\t5000\tNone\tEliminate 250 H1-CMS Drones";
$Challenge::Challenge[7, 7] = "GunEmDown3";
$Challenge::Info["GunEmDown3"] = "Gun Em' Down III\t7\t7500\tNone\tEliminate 500 H1-CMS Drones";
$Challenge::Challenge[7, 8] = "AAInfantry1";
$Challenge::Info["AAInfantry1"] = "Anti-Anti Infantry Scrapper I\t7\t2500\tNone\tEliminate 100 H2-APDS Drones";
$Challenge::Challenge[7, 9] = "AAInfantry2";
$Challenge::Info["AAInfantry2"] = "Anti-Anti Infantry Scrapper II\t7\t5000\tNone\tEliminate 250 H2-APDS Drones";
$Challenge::Challenge[7, 10] = "AAInfantry3";
$Challenge::Info["AAInfantry3"] = "Anti-Anti Infantry Scrapper III\t7\t7500\tNone\tEliminate 500 H2-APDS Drones";
$Challenge::Challenge[7, 11] = "TheyGotTheRockets1";
$Challenge::Info["TheyGotTheRockets1"] = "They've Got The Rockets I\t7\t2500\tNone\tEliminate 100 H3-MSEDS Drones";
$Challenge::Challenge[7, 12] = "TheyGotTheRockets2";
$Challenge::Info["TheyGotTheRockets2"] = "They've Got The Rockets II\t7\t5000\tNone\tEliminate 250 H3-MSEDS Drones";
$Challenge::Challenge[7, 13] = "TheyGotTheRockets3";
$Challenge::Info["TheyGotTheRockets3"] = "They've Got The Rockets III\t7\t7500\tNone\tEliminate 500 H3-MSEDS Drones";
//Sabotage //Sabotage
$Challenge::Category[8] = "Sabotage Challenges\tTasks related to the Sabotage game mode\t40"; $Challenge::Category[8] = "Sabotage Challenges\tTasks related to the Sabotage game mode\t40";

17
scripts/TWM2/Zombie/ZombieCore.cs
View file

@ -169,7 +169,7 @@ function TWM2Lib_Zombie_Core(%functionName, %arg1, %arg2, %arg3, %arg4) {
} }
%rx = getRandom(-10, 10); %rx = getRandom(-10, 10);
%ry = getRandom(-10, 10); %ry = getRandom(-10, 10);
%vec = %rx @ SPC @ %ry @ SPC @ 0; %vec = %rx @ " " @ %ry @ " " @ 0;
%arg1.direction = vectorNormalize(%vec); %arg1.direction = vectorNormalize(%vec);
%arg1.Mnum = getRandom(1, 20); %arg1.Mnum = getRandom(1, 20);
%arg1.zombieRmove = schedule($Zombie::SpeedUpdateTime, %arg1, "TWM2Lib_Zombie_Core", "zRandomMoveLoop", %arg1); %arg1.zombieRmove = schedule($Zombie::SpeedUpdateTime, %arg1, "TWM2Lib_Zombie_Core", "zRandomMoveLoop", %arg1);
@ -186,7 +186,7 @@ function TWM2Lib_Zombie_Core(%functionName, %arg1, %arg2, %arg3, %arg4) {
if(%arg1.Mnum >= 1) { if(%arg1.Mnum >= 1) {
%x = getWord(%arg1.direction, 1); %x = getWord(%arg1.direction, 1);
%y = getWord(%arg1.direction, 0) * -1; %y = getWord(%arg1.direction, 0) * -1;
%vec = %x @ SPC @ %y @ SPC @ 0; %vec = %x @ " " @ %y @ " " @ 0;
%arg1.setRotation(fullrot("0 0 0", %vec)); %arg1.setRotation(fullrot("0 0 0", %vec));
%speed = %arg1.speed; %speed = %arg1.speed;
%vector = vectorScale(%vec, %speed); %vector = vectorScale(%vec, %speed);
@ -290,7 +290,7 @@ function TWM2Lib_Zombie_Core(%functionName, %arg1, %arg2, %arg3, %arg4) {
if(!isSet(%arg3)) { if(!isSet(%arg3)) {
%arg3 = 0; %arg3 = 0;
} }
switch$(strlwr(%arg2)): switch$(strlwr(%arg2)) {
case "canjump": case "canjump":
%arg1.canJump = %arg3; %arg1.canJump = %arg3;
case "recentshift": case "recentshift":
@ -303,6 +303,7 @@ function TWM2Lib_Zombie_Core(%functionName, %arg1, %arg2, %arg3, %arg4) {
%arg1.firingWeapon = %arg3; %arg1.firingWeapon = %arg3;
case "canfireweapon": case "canfireweapon":
%arg1.canFireWeapon = %arg3; %arg1.canFireWeapon = %arg3;
}
//lookForTarget(%zombie, [%pilot], [%groundVeh]): Identify the closest target, and the distance to that target //lookForTarget(%zombie, [%pilot], [%groundVeh]): Identify the closest target, and the distance to that target
case "lookfortarget": case "lookfortarget":
@ -398,11 +399,11 @@ function TWM2Lib_Zombie_Core(%functionName, %arg1, %arg2, %arg3, %arg4) {
} }
// //
%vec = vectorNormalize(vectorSub(%tPos, %arg1.getWorldBoxCenter())); %vec = vectorNormalize(vectorSub(%tPos, %arg1.getWorldBoxCenter()));
%vx = getWord(%vector, 0) %vx = getWord(%vector, 0);
%vy = getWord(%vector, 1) %vy = getWord(%vector, 1);
%nvx = %vy %nvx = %vy;
%nvy = (%vx * -1) %nvy = (%vx * -1);
%lookVector = %nvx @ SPC @ %nvy @ SPC @ 0; %lookVector = %nvx @ " " @ %nvy @ " " @ 0;
%arg1.setRotation(fullRot("0 0 0", %lookVector)); %arg1.setRotation(fullRot("0 0 0", %lookVector));
return %vec; return %vec;

2
scripts/TWM2/Zombie/ZombieTypes/Lord.cs
View file

@ -426,7 +426,7 @@ function LordZombieArmor::makeShield(%datablock, %zombie) {
//Next, find the first object we hit below the point that can serve as the shield base. //Next, find the first object we hit below the point that can serve as the shield base.
%mask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::StaticShapeObjectType; %mask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::StaticShapeObjectType;
%tH = getTerrainHeight(%shieldPos); %tH = getTerrainHeight(%shieldPos);
%shieldSpawnPos = getWord(%shieldPos, 0) SPC getWord(%shieldPos, 1) spc %tH; %shieldSpawnPos = getWord(%shieldPos, 0) @ " " @ getWord(%shieldPos, 1) @ " " @ %tH;
%lookVector = vectorSub(%shieldSpawnPos, %eyePoint); %lookVector = vectorSub(%shieldSpawnPos, %eyePoint);
%searchResult = containerRayCast(%eyePoint, %lookVector, %mask, 0); %searchResult = containerRayCast(%eyePoint, %lookVector, %mask, 0);
if(getWord(%searchResult, 0) == 0) { if(getWord(%searchResult, 0) == 0) {

5
scripts/admin.cs
View file

@ -73,8 +73,8 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
// if not a valid vote, turn back. // if not a valid vote, turn back.
//Phantom139: Spring Cleaning... TWM2 3.9.2 //Phantom139: Spring Cleaning... TWM2 3.9.2
// Old format: if( $VoteMessage[ %typeName ] $= "" && %typeName !$= "VoteOnlyOwnerCascade" ) // Old format: if( $VoteMessage[ %typeName ] $= "" && %typeName !$= "VoteOnlyOwnerCascade" )
if($VoteMessage[%typeName $= "") { if($VoteMessage[%typeName] $= "") {
switch$(%typeName): switch$(%typeName) {
case "VoteTeamDamage" or "VoteHoardMode" or "VoteGreedMode" or "VotePurebuild" or "VoteLivingWorldMode" case "VoteTeamDamage" or "VoteHoardMode" or "VoteGreedMode" or "VotePurebuild" or "VoteLivingWorldMode"
or "VoteCascadeMode" or "VoteExpertMode" or "VoteVehicles" or "VoteSatchelCharge" or "VoteOnlyOwnerDeconstruct" or "VoteCascadeMode" or "VoteExpertMode" or "VoteVehicles" or "VoteSatchelCharge" or "VoteOnlyOwnerDeconstruct"
or "VoteOnlyOwnerCascade" or "VoteOnlyOwnerRotate" or "VoteOnlyOwnerCubicReplace" or "VoteRemoveDeployables" or "VoteOnlyOwnerCascade" or "VoteOnlyOwnerRotate" or "VoteOnlyOwnerCubicReplace" or "VoteRemoveDeployables"
@ -84,6 +84,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
// Looks like we missed a message, but the type is ok, allow pass. // Looks like we missed a message, but the type is ok, allow pass.
default: default:
%typePass = false; %typePass = false;
}
} }
// End JTL // End JTL

10
scripts/server.cs
View file

@ -57,11 +57,7 @@ function CreateServer(%mission, %missionType)
exec("scripts/camera.cs"); exec("scripts/camera.cs");
exec("scripts/particleEmitter.cs"); // Must exist before item.cs and explosion.cs exec("scripts/particleEmitter.cs"); // Must exist before item.cs and explosion.cs
exec("scripts/particleDummies.cs"); exec("scripts/particleDummies.cs");
exec("scripts/projectiles.cs"); // Must exits before item.cs exec("scripts/projectiles.cs"); // Must exits before item.cs
echo("*********************");
echo("* LOADING TWM2 DATABLOCKS");
exec("scripts/TWM2/MultiUseDatablocks.cs");
echo("*********************");
exec("scripts/player.cs"); exec("scripts/player.cs");
exec("scripts/gameBase.cs"); exec("scripts/gameBase.cs");
exec("scripts/staticShape.cs"); exec("scripts/staticShape.cs");
@ -95,6 +91,10 @@ function CreateServer(%mission, %missionType)
exec("scripts/vehicles/vehicle_Stormseige.cs"); exec("scripts/vehicles/vehicle_Stormseige.cs");
exec("scripts/vehicles/vehicle_strikeFighter.cs"); exec("scripts/vehicles/vehicle_strikeFighter.cs");
exec("scripts/vehicles/vehicle.cs"); // Must be added after all other vehicle files or EVIL BAD THINGS exec("scripts/vehicles/vehicle.cs"); // Must be added after all other vehicle files or EVIL BAD THINGS
echo("*********************");
echo("* LOADING TWM2 DATABLOCKS");
exec("scripts/TWM2/MultiUseDatablocks.cs");
echo("*********************");
exec("scripts/ai.cs"); exec("scripts/ai.cs");
exec("scripts/item.cs"); exec("scripts/item.cs");
exec("scripts/station.cs"); exec("scripts/station.cs");

2
scripts/weapons/Shotguns/Model1887.cs
View file

@ -161,7 +161,7 @@ datablock ShapeBaseImageData(Model1887Image) {
stateTransitionOnNotWet[8] = "Fire"; stateTransitionOnNotWet[8] = "Fire";
}; };
datablock ItemData(Model1887 { datablock ItemData(Model1887) {
className = Weapon; className = Weapon;
catagory = "Spawn Items"; catagory = "Spawn Items";
shapeFile = "weapon_plasma.dts"; shapeFile = "weapon_plasma.dts";