Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-03-11 08:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addtl. Fixes

Browse source
This commit is contained in:
Robert Fritzen 2014-08-02 17:59:47 -05:00
parent 9cfcf412db
commit 3536406329
5 changed files with 76 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,19 +102,18 @@ datablock ShapeBaseImageData(EditGunImage) {
function EditGunImage::onMount(%this, %obj, %slot) {
Parent::onMount(%this, %obj, %slot);
DispEditorToolInfo(%obj);
if(!isSet(%obj.client.EditPMode)) {
%obj.client.EditPMode = 0;
if(!isSet(%obj.EditPMode)) {
%obj.EditPMode = 0;
}
if(!isSet(%obj.client.EditSMode)) {
%obj.client.EditSMode = 0;
if(!isSet(%obj.EditSMode)) {
%obj.EditSMode = 0;
}
//Phantom139: Added
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;
//Phantom139: End
%obj.UsingEditTool = true;
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
}
function EditGunImage::onunmount(%this,%obj,%slot) {
@ -160,25 +159,25 @@ function EditGunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
%obj.client.EditPMode++;
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode >= 5)
%obj.client.EditPMode = 0;
%obj.EditPMode++;
%obj.EditSMode = 0;
if (%obj.EditPMode >= 5)
%obj.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;
%obj.EditSMode++;
if (%obj.EditPMode == 0 && %obj.EditSMode == 21)
%obj.EditSMode = 0;
if (%obj.EditPMode == 1 && %obj.EditSMode == 21)
%obj.EditSMode = 0;
if (%obj.EditPMode == 2 && %obj.EditSMode == 5)
%obj.EditSMode = 0;
if (%obj.EditPMode == 3 && %obj.EditSMode == 4)
%obj.EditSMode = 0;
if (%obj.EditPMode == 4 && %obj.EditSMode == 2)
%obj.EditSMode = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
}
//Editor Tool Functioning

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

@ -135,23 +135,23 @@ function ConstructionToolImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
%obj.client.constructionToolMode++;
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode >= 4)
%obj.client.constructionToolMode = 0;
%obj.constructionToolMode++;
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode >= 4)
%obj.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;
%obj.constructionToolMode2++;
if (%obj.constructionToolMode == 0 && %obj.constructionToolMode2 == 2)
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode == 1 && %obj.constructionToolMode2 == 2)
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode == 2 && %obj.constructionToolMode2 == 6)
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode == 3 && %obj.constructionToolMode2 == 4)
%obj.constructionToolMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.constructionToolMode, %obj.client.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
displayWeaponInfo(%this, %obj, %obj.constructionToolMode, %obj.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
}
//Phantom139: End

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

@ -210,13 +210,13 @@ function SuperChaingunImage::onFire(%data,%obj,%slot) {
function SuperChaingunImage::onMount(%this,%obj,%slot) {
%obj.usingSuperChaingun = true;
if (!%obj.client.superChaingunMode)
%obj.client.superChaingunMode = 0;
if (!%obj.client.superChaingunMode2)
%obj.client.superChaingunMode2 = 0;
if (!%obj.superChaingunMode)
%obj.superChaingunMode = 0;
if (!%obj.superChaingunMode2)
%obj.superChaingunMode2 = 0;
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
WeaponImage::onMount(%this,%obj,%slot);
}
@ -231,17 +231,17 @@ function SuperChaingunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
%obj.client.superChaingunMode++;
%obj.client.superChaingunMode2 = 0;
if (%obj.client.superChaingunMode > 6 - (5 * $host::nopulseSCG))
%obj.client.superChaingunMode = 0;
%obj.superChaingunMode++;
%obj.superChaingunMode2 = 0;
if (%obj.superChaingunMode > 6 - (5 * $host::nopulseSCG))
%obj.superChaingunMode = 0;
case 2:
//Grenade Modes
%obj.client.superChaingunMode2++;
if(%obj.client.superChaingunMode != 1)
%obj.client.superChaingunMode2 = 0;
if (%obj.client.superChaingunMode == 1 && %obj.client.superChaingunMode2 == 2)
%obj.client.superChaingunMode2 = 0;
%obj.superChaingunMode2++;
if(%obj.superChaingunMode != 1)
%obj.superChaingunMode2 = 0;
if (%obj.superChaingunMode == 1 && %obj.superChaingunMode2 == 2)
%obj.superChaingunMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
}