From a2086feae8fb368a62d3d4e4a6a73542bb6f1d66 Mon Sep 17 00:00:00 2001 From: Robert Fritzen Date: Wed, 26 Feb 2014 14:27:38 -0600 Subject: [PATCH] Removed EditGun Pulse Replaced the EditGun pulse with a simple raycast call to save an extra datablock, not to mention this functioning is a little more advanced and provides some more control. --- scripts/weapons/Construction/EditGun.cs | 338 +++++++++++------------- 1 file changed, 155 insertions(+), 183 deletions(-) diff --git a/scripts/weapons/Construction/EditGun.cs b/scripts/weapons/Construction/EditGun.cs index 3c1996d..182b818 100644 --- a/scripts/weapons/Construction/EditGun.cs +++ b/scripts/weapons/Construction/EditGun.cs @@ -33,50 +33,7 @@ $EditTool::PadModes[18] = "DeployedCrate12"; $EditTool::PadModes[19] = "DeployedDecoration6"; $EditTool::PadModes[20] = "DeployedDecoration16"; - -datablock LinearFlareProjectileData(EditorBolt) -{ - emitterDelay = -1; - directDamage = 0; - directDamageType = $DamageType::Default; - kickBackStrength = 0.0; - bubbleEmitTime = 1.0; - - sound = PlasmaProjectileSound; - velInheritFactor = 0.5; - - explosion = "BlasterExplosion"; - splash = BlasterSplash; - - grenadeElasticity = 0.998; - grenadeFriction = 0.0; - armingDelayMS = 500; - - muzzleVelocity = 100.0; - - drag = 0.05; - - gravityMod = 0.0; - - dryVelocity = 100.0; - wetVelocity = 80.0; - - reflectOnWaterImpactAngle = 0.0; - explodeOnWaterImpact = false; - deflectionOnWaterImpact = 0.0; - fizzleUnderwaterMS = 6000; - - lifetimeMS = 6000; - - scale = "1 1 1"; - numFlares = 48; - flareColor = "1 0 0"; - flareModTexture = "special/shrikeBoltCross"; - flareBaseTexture = "special/shrikeBolt"; -}; - -datablock ItemData(EditTool) -{ +datablock ItemData(EditTool) { className = Weapon; catagory = "Spawn Items"; shapeFile = "weapon_disc.dts"; @@ -88,8 +45,7 @@ datablock ItemData(EditTool) pickUpName = "a Editing Tool"; }; -datablock ShapeBaseImageData(EditGunImage) -{ +datablock ShapeBaseImageData(EditGunImage) { className = WeaponImage; shapeFile = "weapon_disc.dts"; item = EditTool; @@ -98,9 +54,8 @@ datablock ShapeBaseImageData(EditGunImage) usesEnergy = true; minEnergy = 0.01; - projectile = EditorBolt; - projectileType = LinearFlareProjectile; - + //projectile = EditorBolt; + //projectileType = LinearFlareProjectile; stateName[0] = "Activate"; stateTransitionOnTimeout[0] = "ActivateReady"; @@ -145,6 +100,37 @@ datablock ShapeBaseImageData(EditGunImage) stateTransitionOnTimeout[6] = "Ready"; }; +//Phantom139: I'll take a datablock over a function any-day... +function EditGunImage::onFire(%data, %obj, %slot) { + //RAYCAST + %vector = %obj.getMuzzleVector(%slot); + %mp = %obj.getMuzzlePoint(%slot); + %targetpos = vectoradd(%mp,vectorscale(%vector, 2500)); + %targ = containerraycast(%mp, %targetpos, $typemasks::staticshapeobjecttype, %obj); + %targetObject = getword(%targ, 0); + if(%targetObject == 0) { + BottomPrint(%obj.client, "No Object Found", 2, 2); + return; + } + if (!Deployables.isMember(%targetObject)) { + messageclient(%obj.client, 'MsgClient', "\c2TextureTool: Error, Map Object Selected."); + return; + } + //APPLY EDITS + switch$(%obj.EditPMode) { + case 0: + EToolswaping(%targetObject, %obj, 0, %obj.EditSMode); + case 1: + EToolswaping(%targetObject, %obj, 1, %obj.EditSMode); + case 2: + EToolTurrets(%targetObject, %obj, %obj.EditSMode); + case 3: + EToolCloakandFade(%targetObject, %obj, %obj.EditSMode); + case 4: + EToolDeleting(%targetObject, %obj, %obj.EditSMode); + } +} + function EditGunImage::onMount(%this, %obj, %slot) { Parent::onMount(%this, %obj, %slot); DispEditorToolInfo(%obj); @@ -157,59 +143,58 @@ function EditGunImage::onMount(%this, %obj, %slot) { %obj.UsingEditTool = true; } -function EditGunImage::onunmount(%this,%obj,%slot) -{ -Parent::onUnmount(%this, %obj, %slot); -%obj.UsingEditTool = false; +function EditGunImage::onunmount(%this,%obj,%slot) { + Parent::onUnmount(%this, %obj, %slot); + %obj.UsingEditTool = false; } function DispEditorToolInfo(%obj) { -switch(%obj.EditPMode) { - case 0: - %primary = "Pad Swapping"; - switch(%obj.EditSMode) { - case 0: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Blue Pad - [LSB] - MSB", 5, 3); - case 1: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: LSB - [MSB] - Walkway", 5, 3); - case 2: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: MSB - [Walkway] - Medium Floor ", 5, 3); - case 3: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Walkway - [Medium Floor] - Dark Pad", 5, 3); - case 4: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Medium Floor - [Dark Pad] - V-Pad", 5, 3); - case 5: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Dark Pad - [V-Pad] - C.1 Backpack", 5, 3); - case 6: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: V-Pad - [C.1 Backpack] - C.2 Small Containment", 5, 3); - case 7: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.1 Backpack - [C.2 Small Containment] - C.3 Large Containment", 5, 3); - case 8: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.2 Small Containment - [C.3 Large Containment] - C.4 Compressor", 5, 3); - case 9: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.3 Large Containment - [C.4 Compressor] - C.5 Tubes", 5, 3); - case 10: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.4 Compressor - [C.5 Tubes] - C.6 Quantium Bat.", 5, 3); - case 11: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.5 Tubes - [C.6 Quantium Bat.] - C.7 Proton Acc.", 5, 3); - case 12: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.6 Quantium Bat. - [C.7 Proton Acc.] - C.8 Cargo Crate", 5, 3); - case 13: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.7 Proton Acc. - [C.8 Cargo Crate] - C.9 Mag Cooler", 5, 3); - case 14: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.8 Cargo Crate - [C.9 Mag Cooler] - C.10 Recycle Unit", 5, 3); - case 15: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.9 Mag Cooler - [C.10 Recycle Unit] - C.11 Fuel Canister", 5, 3); - case 16: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.10 Recycle Unit - [C.11 Fuel Canister] - C.12 Wooden Box", 5, 3); - case 17: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.11 Fuel Canister - [C.12 Wooden Box] - C.13 Plasma Router", 5, 3); - case 18: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.12 Wooden Box - [C.13 Plasma Router] - Statue Base", 5, 3); - case 19: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.13 Plasma Router - [Statue Base] - Blue Pad", 5, 3); - case 20: - commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Statue Base - [Blue Pad] - LSB", 5, 3); + switch(%obj.EditPMode) { + case 0: + %primary = "Pad Swapping"; + switch(%obj.EditSMode) { + case 0: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Blue Pad - [LSB] - MSB", 5, 3); + case 1: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: LSB - [MSB] - Walkway", 5, 3); + case 2: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: MSB - [Walkway] - Medium Floor ", 5, 3); + case 3: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Walkway - [Medium Floor] - Dark Pad", 5, 3); + case 4: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Medium Floor - [Dark Pad] - V-Pad", 5, 3); + case 5: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Dark Pad - [V-Pad] - C.1 Backpack", 5, 3); + case 6: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: V-Pad - [C.1 Backpack] - C.2 Small Containment", 5, 3); + case 7: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.1 Backpack - [C.2 Small Containment] - C.3 Large Containment", 5, 3); + case 8: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.2 Small Containment - [C.3 Large Containment] - C.4 Compressor", 5, 3); + case 9: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.3 Large Containment - [C.4 Compressor] - C.5 Tubes", 5, 3); + case 10: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.4 Compressor - [C.5 Tubes] - C.6 Quantium Bat.", 5, 3); + case 11: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.5 Tubes - [C.6 Quantium Bat.] - C.7 Proton Acc.", 5, 3); + case 12: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.6 Quantium Bat. - [C.7 Proton Acc.] - C.8 Cargo Crate", 5, 3); + case 13: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.7 Proton Acc. - [C.8 Cargo Crate] - C.9 Mag Cooler", 5, 3); + case 14: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.8 Cargo Crate - [C.9 Mag Cooler] - C.10 Recycle Unit", 5, 3); + case 15: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.9 Mag Cooler - [C.10 Recycle Unit] - C.11 Fuel Canister", 5, 3); + case 16: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.10 Recycle Unit - [C.11 Fuel Canister] - C.12 Wooden Box", 5, 3); + case 17: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.11 Fuel Canister - [C.12 Wooden Box] - C.13 Plasma Router", 5, 3); + case 18: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.12 Wooden Box - [C.13 Plasma Router] - Statue Base", 5, 3); + case 19: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: C.13 Plasma Router - [Statue Base] - Blue Pad", 5, 3); + case 20: + commandToClient( %obj.client, 'BottomPrint', "[{Manipulator Tool}] - Phantom139 \n Mine: [Pad Swap] - FF Swap - Barrel Swap - Cloak/Fade - Delete Objects \n Grenade: Statue Base - [Blue Pad] - LSB", 5, 3); } case 1: %primary = "Force-Field Swapping"; @@ -293,57 +278,44 @@ switch(%obj.EditPMode) { } function ChangeEditGunMode(%this, %data, %PriSec) { //This Is Easier To use -if(%PriSec == 1) { //Primary -if (!(getSimTime() > (%this.mineModeTime + 100))) -return; -%this.mineModeTime = getSimTime(); -%this.EditPMode++; -%this.EditSMode = 0; //Reset Secondary Mode TO Prevent Errors -if (%this.EditPMode > 4) { -%this.EditPMode = 0; -} -DispEditorToolInfo(%this); -return; -} -else { //Secondary -if (!(getSimTime() > (%this.grenadeModeTime + 100))) -return; -%this.grenadeModeTime = getSimTime(); -%this.EditSMode++; -//Check Primaries -if(%this.EditPMode == 0 && %this.EditSMode > 20) { -%this.EditSMode = 0; -} -else if(%this.EditPMode == 1 && %this.EditSMode > 20) { -%this.EditSMode = 0; -} -else if(%this.EditPMode == 2 && %this.EditSMode > 4) { -%this.EditSMode = 0; -} -else if(%this.EditPMode == 3 && %this.EditSMode > 3) { -%this.EditSMode = 0; -} -else if(%this.EditPMode == 4 && %this.EditSMode > 1) { -%this.EditSMode = 0; -} -DispEditorToolInfo(%this); -return; -} -} - -function EditorBolt::onCollision(%data,%projectile,%targetObject,%modifier,%position,%normal) { - switch$(%projectile.sourceObject.EditPMode) { - case 0: - EToolswaping(%targetObject,%projectile.sourceObject,0,%projectile.sourceObject.EditSMode); - case 1: - EToolswaping(%targetObject,%projectile.sourceObject,1,%projectile.sourceObject.EditSMode); - case 2: - EToolTurrets(%targetObject,%projectile.sourceObject,%projectile.sourceObject.EditSMode); - case 3: - EToolCloakandFade(%targetObject,%projectile.sourceObject,%projectile.sourceObject.EditSMode); - case 4: - EToolDeleting(%targetObject,%projectile.sourceObject,%projectile.sourceObject.EditSMode); + if(%PriSec == 1) { //Primary + if (!(getSimTime() > (%this.mineModeTime + 100))) { + return; } + %this.mineModeTime = getSimTime(); + %this.EditPMode++; + %this.EditSMode = 0; //Reset Secondary Mode TO Prevent Errors + if (%this.EditPMode > 4) { + %this.EditPMode = 0; + } + DispEditorToolInfo(%this); + return; + } + else { //Secondary + if (!(getSimTime() > (%this.grenadeModeTime + 100))) { + return; + } + %this.grenadeModeTime = getSimTime(); + %this.EditSMode++; + //Check Primaries + if(%this.EditPMode == 0 && %this.EditSMode > 20) { + %this.EditSMode = 0; + } + else if(%this.EditPMode == 1 && %this.EditSMode > 20) { + %this.EditSMode = 0; + } + else if(%this.EditPMode == 2 && %this.EditSMode > 4) { + %this.EditSMode = 0; + } + else if(%this.EditPMode == 3 && %this.EditSMode > 3) { + %this.EditSMode = 0; + } + else if(%this.EditPMode == 4 && %this.EditSMode > 1) { + %this.EditSMode = 0; + } + DispEditorToolInfo(%this); + return; + } } //Editor Tool Functioning @@ -351,42 +323,42 @@ function EditorBolt::onCollision(%data,%projectile,%targetObject,%modifier,%posi // // function EToolDeleting(%tobj,%plyr,%Mode) { - %cl=%plyr.client; - if ( %tobj.ownerGUID != %cl.guid){ - if (!%cl.isadmin && !%cl.issuperadmin){ - if (%tobj.ownerGUID !$=""){ - messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); - return; - } - } + %cl = %plyr.client; + if ( %tobj.ownerGUID != %cl.guid) { + if (!%cl.isadmin && !%cl.issuperadmin){ + if (%tobj.ownerGUID !$=""){ + messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); + return; + } + } } if (%tobj.squaresize !$="") { - messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Unknown Object Selected."); - return; + messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Unknown Object Selected."); + return; } if (!Deployables.isMember(%tobj)) { - messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Map Object Selected."); - return; + messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Map Object Selected."); + return; } switch(%Mode) { - case 0: - messageclient(%cl, 'MsgClient', "\c2TextureTool: Deleting Object."); - %tobj.getDataBlock().disassemble(%plyr, %tobj); //this found in constructionTool.cs - case 1: - messageclient(%cl, 'MsgClient', "\c2TextureTool: Cascade Deleting Object (All Conective Objects)."); - cascade(%tobj,true); + case 0: + messageclient(%cl, 'MsgClient', "\c2TextureTool: Deleting Object."); + %tobj.getDataBlock().disassemble(%plyr, %tobj); //this found in constructionTool.cs + case 1: + messageclient(%cl, 'MsgClient', "\c2TextureTool: Cascade Deleting Object (All Conective Objects)."); + cascade(%tobj,true); } } // function EToolCloakandFade(%tobj,%plyr,%Mode) { - %cl=%plyr.client; - if ( %tobj.ownerGUID != %cl.guid){ - if (!%cl.isadmin && !%cl.issuperadmin){ - if (%tobj.ownerGUID !$=""){ - messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); - return; - } - } + %cl = %plyr.client; + if ( %tobj.ownerGUID != %cl.guid) { + if (!%cl.isadmin && !%cl.issuperadmin){ + if (%tobj.ownerGUID !$=""){ + messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); + return; + } + } } if (%tobj.squaresize !$="") { messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Unknown Object Selected."); @@ -415,14 +387,14 @@ function EToolCloakandFade(%tobj,%plyr,%Mode) { } // function EToolTurrets(%tobj,%plyr,%Mode) { - %cl=%plyr.client; - if ( %tobj.ownerGUID != %cl.guid){ - if (!%cl.isadmin && !%cl.issuperadmin){ - if (%tobj.ownerGUID !$=""){ - messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); - return; - } - } + %cl = %plyr.client; + if ( %tobj.ownerGUID != %cl.guid) { + if (!%cl.isadmin && !%cl.issuperadmin){ + if (%tobj.ownerGUID !$=""){ + messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, You Do Not Own This Piece."); + return; + } + } } if (%tobj.squaresize !$="") { messageclient(%cl, 'MsgClient', "\c2TextureTool: Error, Unknown Object Selected.");