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

Fixed the merge issues

Browse source
This commit is contained in:
Robert Fritzen 2015-02-12 19:56:24 -06:00
parent 26ff02fd38
commit 9add24b42e
9 changed files with 0 additions and 1375 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/weapons/Construction/EditGun.cs
View file

@ -113,11 +113,7 @@ function EditGunImage::onMount(%this, %obj, %slot) {
%obj.hasGrenadeModes = 1;
//Phantom139: End
%obj.UsingEditTool = true;
<<<<<<< HEAD
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
=======
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
>>>>>>> origin/development
}
function EditGunImage::onunmount(%this,%obj,%slot) {
@ -163,27 +159,6 @@ function EditGunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.EditPMode++;
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode >= 5)
%obj.client.EditPMode = 0;
case 2:
//Grenade Modes
%obj.client.EditSMode++;
if (%obj.client.EditPMode == 0 && %obj.client.EditSMode == 21)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 1 && %obj.client.EditSMode == 21)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 2 && %obj.client.EditSMode == 5)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 3 && %obj.client.EditSMode == 4)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 4 && %obj.client.EditSMode == 2)
%obj.client.EditSMode = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
=======
%obj.EditPMode++;
%obj.EditSMode = 0;
if (%obj.EditPMode >= 5)
@ -203,7 +178,6 @@ function EditGunImage::changeMode(%this, %obj, %key) {
%obj.EditSMode = 0;
}
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
>>>>>>> origin/development
}
//Editor Tool Functioning

27
scripts/weapons/Construction/constructionTool.cs
View file

@ -135,25 +135,6 @@ function ConstructionToolImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.constructionToolMode++;
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode >= 4)
%obj.client.constructionToolMode = 0;
case 2:
//Grenade Modes
%obj.client.constructionToolMode2++;
if (%obj.client.constructionToolMode == 0 && %obj.client.constructionToolMode2 == 2)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 1 && %obj.client.constructionToolMode2 == 2)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 2 && %obj.client.constructionToolMode2 == 6)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 3 && %obj.client.constructionToolMode2 == 4)
%obj.client.constructionToolMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.constructionToolMode, %obj.client.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
=======
%obj.constructionToolMode++;
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode >= 4)
@ -171,7 +152,6 @@ function ConstructionToolImage::changeMode(%this, %obj, %key) {
%obj.constructionToolMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.constructionToolMode, %obj.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
>>>>>>> origin/development
}
//Phantom139: End
@ -241,17 +221,10 @@ function ConstructionToolImage::onMount(%this,%obj,%slot) {
%obj.errMsgSent = false;
%obj.client.setWeaponsHudActive(%this.item);
%obj.usingConstructionTool = true;
<<<<<<< HEAD
if (!%obj.constructionToolMode)
%obj.constructionToolMode = 0;
if (!%obj.constructionToolMode2)
%obj.constructionToolMode2 = 0;
=======
if (!isSet(%obj.client.constructionToolMode))
%obj.client.constructionToolMode = 0;
if (!isSet(%obj.client.constructionToolMode2))
%obj.client.constructionToolMode2 = 0;
>>>>>>> origin/development
//Phantom139: Added
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;

7
scripts/weapons/Construction/modifiertool.cs
View file

@ -545,17 +545,10 @@ function MergeToolImage::onFire(%data,%obj,%slot)
function MergeToolImage::onMount(%this,%obj,%slot)
{
<<<<<<< HEAD
if(%obj.MTMode $= "")
%obj.MTMode = 0;
if(%obj.MTSubMode $= "")
%obj.MTSubMode = 0;
=======
if(%obj.client.MTMode $= "")
%obj.client.MTMode = 0;
if(%obj.client.MTSubMode $= "")
%obj.client.MTSubMode = 0;
>>>>>>> origin/development
%obj.usingMTelec = 1;
//Phantom139: Added
%obj.hasMineModes = 1;

18
scripts/weapons/Construction/superChaingun.cs
View file

@ -216,11 +216,7 @@ function SuperChaingunImage::onMount(%this,%obj,%slot) {
%obj.superChaingunMode2 = 0;
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;
<<<<<<< HEAD
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
=======
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
>>>>>>> origin/development
WeaponImage::onMount(%this,%obj,%slot);
}
@ -235,19 +231,6 @@ function SuperChaingunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.superChaingunMode++;
%obj.client.superChaingunMode2 = 0;
if (%obj.client.superChaingunMode > 6 - (5 * $host::nopulseSCG))
%obj.client.superChaingunMode = 0;
case 2:
//Grenade Modes
%obj.client.superChaingunMode2++;
if (%obj.client.superChaingunMode == 1 && %obj.client.superChaingunMode2 == 2)
%obj.client.superChaingunMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
=======
%obj.superChaingunMode++;
%obj.superChaingunMode2 = 0;
if (%obj.superChaingunMode > 6 - (5 * $host::nopulseSCG))
@ -261,5 +244,4 @@ function SuperChaingunImage::changeMode(%this, %obj, %key) {
%obj.superChaingunMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
>>>>>>> origin/development
}