mirror of
https://github.com/tribes2/SkillSector.git
synced 2026-01-19 19:44:48 +00:00
functional .gitignore and teleporters
This commit is contained in:
loop
parent
1e73ba4697
commit
28d699e031
13
.gitignore
vendored
13
.gitignore
vendored
|
|
@ -1,6 +1,15 @@
|
|||
# Binary T2 filetypes that shouldn't be committed
|
||||
*.dso
|
||||
*.vl2
|
||||
|
||||
# Irrelevant Classic mod paths
|
||||
editor/
|
||||
lighting/
|
||||
prefs/
|
||||
gui/
|
||||
*.dso
|
||||
Classic*
|
||||
Classic*
|
||||
|
||||
# scripts folder need to be ignored and then exclusions have to be carved out
|
||||
# scripts/ ignores the path entirely, whereas scripts/* is treated as a pattern
|
||||
scripts/*
|
||||
!scripts/SkillSector*.cs
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
new SimGroup(MissionGroup) {
|
||||
|
||||
Team_Hunters_timeLimit = "25";
|
||||
powerCount = "0";
|
||||
cdTrack = "5";
|
||||
musicTrack = "ice";
|
||||
cdTrack = "5";
|
||||
powerCount = "0";
|
||||
Hunters_timeLimit = "25";
|
||||
|
||||
new MissionArea(MissionArea) {
|
||||
|
|
@ -54,8 +54,8 @@ new SimGroup(MissionGroup) {
|
|||
squareSize = "8";
|
||||
|
||||
position = "-1024 -1024 0";
|
||||
visibleDistance = "1200";
|
||||
hazeDistance = "250";
|
||||
visibleDistance = "1200";
|
||||
locked = "true";
|
||||
};
|
||||
new NavigationGraph(NavGraph) {
|
||||
|
|
@ -63,14 +63,14 @@ new SimGroup(MissionGroup) {
|
|||
cullDensity = "0.3";
|
||||
customArea = "0 0 0 0";
|
||||
|
||||
position = "0 0 0 1";
|
||||
YDimOverSize = "0";
|
||||
conjoinBowlDev = "20";
|
||||
rotation = "0 0 0 0";
|
||||
coverage = "0";
|
||||
scale = "1 1 1";
|
||||
GraphFile = "Scarabrae_nef.nav";
|
||||
XDimOverSize = "0";
|
||||
position = "0 0 0 1";
|
||||
GraphFile = "Scarabrae_nef.nav";
|
||||
rotation = "0 0 0 0";
|
||||
YDimOverSize = "0";
|
||||
scale = "1 1 1";
|
||||
conjoinBowlDev = "20";
|
||||
locked = "true";
|
||||
};
|
||||
new Sky(Sky) {
|
||||
|
|
@ -245,7 +245,6 @@ new SimGroup(MissionGroup) {
|
|||
homingCount = "0";
|
||||
|
||||
team = "0";
|
||||
Target = "33";
|
||||
locked = "false";
|
||||
};
|
||||
new InteriorInstance() {
|
||||
|
|
@ -267,8 +266,6 @@ new SimGroup(MissionGroup) {
|
|||
homingCount = "0";
|
||||
|
||||
team = "0";
|
||||
Trigger = "39503";
|
||||
Target = "34";
|
||||
locked = "false";
|
||||
};
|
||||
new StaticShape() {
|
||||
|
|
@ -280,8 +277,6 @@ new SimGroup(MissionGroup) {
|
|||
homingCount = "0";
|
||||
|
||||
team = "0";
|
||||
Trigger = "39505";
|
||||
Target = "35";
|
||||
locked = "false";
|
||||
};
|
||||
new InteriorInstance() {
|
||||
|
|
@ -303,141 +298,8 @@ new SimGroup(MissionGroup) {
|
|||
homingCount = "0";
|
||||
|
||||
team = "0";
|
||||
Trigger = "39508";
|
||||
Target = "36";
|
||||
locked = "false";
|
||||
};
|
||||
new ScriptObject(ObserverHUDWeaponList) {
|
||||
class = "ObserverHUDWeaponList";
|
||||
|
||||
DamageTypeName12 = "Explosion";
|
||||
DamageType87 = "Other";
|
||||
DamageTypeName3 = "Chaingun";
|
||||
DamageType72 = "Other";
|
||||
DamageType86 = "Other";
|
||||
DamageType96 = "Other";
|
||||
DamageType55 = "Other";
|
||||
DamageType7 = "ELF";
|
||||
DamageType66 = "Other";
|
||||
DamageType88 = "Other";
|
||||
DamageType48 = "Other";
|
||||
DamageTypeName16 = "DepTurret";
|
||||
DamageType3 = "Chaingun";
|
||||
DamageType5 = "Grenade";
|
||||
DamageType14 = "Ground";
|
||||
DamageType31 = "SatchelCharge";
|
||||
DamageTypeName13 = "Impact";
|
||||
DamageType70 = "Other";
|
||||
DamageType59 = "Other";
|
||||
DamageType85 = "Other";
|
||||
DamageType58 = "Other";
|
||||
team = "0";
|
||||
DamageTypeName14 = "Ground";
|
||||
DamageType64 = "Other";
|
||||
DamageType89 = "Other";
|
||||
DamageType44 = "Other";
|
||||
DamageType33 = "Other";
|
||||
DamageType18 = "Turret";
|
||||
DamageType22 = "DepTurret";
|
||||
DamageType77 = "Other";
|
||||
DamageType71 = "Other";
|
||||
DamageTypeName22 = "TankMortar";
|
||||
DamageTypeName6 = "Laser";
|
||||
DamageTypeName5 = "Grenade";
|
||||
DamageType39 = "Other";
|
||||
DamageType65 = "Other";
|
||||
DamageType23 = "Turret";
|
||||
DamageType1 = "Blaster";
|
||||
DamageType28 = "BomberBombs";
|
||||
DamageType16 = "Turret";
|
||||
DamageType62 = "Other";
|
||||
DamageType30 = "TankMortar";
|
||||
DamageType81 = "Other";
|
||||
DamageTypeName17 = "Ground";
|
||||
DamageType10 = "ShockLance";
|
||||
DamageType49 = "Other";
|
||||
DamageTypeName1 = "Blaster";
|
||||
DamageType68 = "Other";
|
||||
DamageType67 = "Other";
|
||||
DamageType41 = "Other";
|
||||
MaxDamageType = "24";
|
||||
DamageType63 = "Other";
|
||||
DamageType73 = "Other";
|
||||
DamageType29 = "TankChaingun";
|
||||
DamageType52 = "Other";
|
||||
DamageType2 = "Plasma";
|
||||
DamageTypeName21 = "TankChaingun";
|
||||
DamageType78 = "Other";
|
||||
DamageType21 = "DepTurret";
|
||||
DamageTypeName2 = "Plasma";
|
||||
DamageTypeName4 = "Disc";
|
||||
DamageType37 = "Other";
|
||||
DamageType24 = "Other";
|
||||
DamageType84 = "Other";
|
||||
DamageTypeName23 = "SatchelCharge";
|
||||
DamageType43 = "Other";
|
||||
DamageType79 = "Other";
|
||||
DamageType9 = "Missile";
|
||||
DamageType6 = "Laser";
|
||||
DamageType25 = "Ground";
|
||||
DamageType94 = "Other";
|
||||
DamageType97 = "Other";
|
||||
DamageType17 = "Turret";
|
||||
DamageType54 = "Other";
|
||||
DamageTypeName7 = "ELF";
|
||||
DamageType75 = "Other";
|
||||
DamageTypeName10 = "ShockLance";
|
||||
DamageType76 = "Other";
|
||||
mod = "base";
|
||||
DamageType99 = "Suicide";
|
||||
DamageType15 = "Turret";
|
||||
DamageType57 = "Other";
|
||||
DamageType40 = "Other";
|
||||
DamageTypeName19 = "BellyTurret";
|
||||
DamageType74 = "Other";
|
||||
DamageType35 = "Other";
|
||||
DamageType53 = "Other";
|
||||
DamageType11 = "Mine";
|
||||
DamageType92 = "Other";
|
||||
DamageTypeName18 = "ShrikeBlaster";
|
||||
DamageType13 = "Impact";
|
||||
DamageType83 = "Other";
|
||||
DamageType38 = "Other";
|
||||
DamageType51 = "Other";
|
||||
DamageTypeName20 = "BomberBombs";
|
||||
DamageType93 = "Other";
|
||||
DamageTypeName24 = "Other";
|
||||
DamageType12 = "Explosion";
|
||||
DamageTypeName11 = "Mine";
|
||||
DamageTypeName9 = "Missile";
|
||||
DamageType56 = "Other";
|
||||
DamageType61 = "Other";
|
||||
DamageType20 = "Turret";
|
||||
DamageType98 = "Other";
|
||||
DamageType27 = "BellyTurret";
|
||||
DamageType4 = "Disc";
|
||||
DamageType0 = "Other";
|
||||
DamageType69 = "Other";
|
||||
DamageType32 = "Turret";
|
||||
DamageType45 = "Other";
|
||||
DamageType60 = "Other";
|
||||
DamageType82 = "Other";
|
||||
DamageType26 = "ShrikeBlaster";
|
||||
DamageType46 = "Other";
|
||||
DamageTypeName15 = "Turret";
|
||||
DamageType8 = "Mortar";
|
||||
DamageType47 = "Other";
|
||||
DamageType95 = "Other";
|
||||
DamageType42 = "Other";
|
||||
DamageType34 = "Other";
|
||||
DamageType19 = "Turret";
|
||||
DamageTypeName8 = "Mortar";
|
||||
DamageType36 = "Other";
|
||||
DamageType80 = "Other";
|
||||
DamageType90 = "Other";
|
||||
DamageType91 = "Other";
|
||||
DamageType50 = "Other";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -531,12 +393,7 @@ new SimGroup(MissionGroup) {
|
|||
lockCount = "0";
|
||||
homingCount = "0";
|
||||
|
||||
damageTimeMS = "247515";
|
||||
inUse = "Down";
|
||||
Trigger = "39520";
|
||||
lastDamagedBy = "5025";
|
||||
Target = "39";
|
||||
lastDamagedByTeam = "1";
|
||||
notReady = "1";
|
||||
};
|
||||
new PhysicalZone(TractorBeamFront) {
|
||||
|
|
@ -548,6 +405,23 @@ new SimGroup(MissionGroup) {
|
|||
appliedForce = "0 0 0";
|
||||
polyhedron = "0.0000000 0.0000000 0.0000000 10.0000000 0.0000000 0.0000000 -0.0000000 -40.0000000 -0.0000000 -0.0000000 -0.0000000 160.0000000";
|
||||
};
|
||||
new Marker(BankSpawn) {
|
||||
position = "-155.307 126.636 243.233";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
seqNum = "0";
|
||||
msToNext = "1000";
|
||||
};
|
||||
new StaticShape() {
|
||||
position = "-179.634 134.044 242.142";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
dataBlock = "BankTeleporter";
|
||||
lockCount = "0";
|
||||
homingCount = "0";
|
||||
|
||||
destination = "ATLSpawn";
|
||||
};
|
||||
};
|
||||
new SimGroup(AimTrain) {
|
||||
|
||||
|
|
@ -601,18 +475,22 @@ new SimGroup(MissionGroup) {
|
|||
|
||||
placeholder = "1";
|
||||
};
|
||||
new StaticShape(BankTeleport) {
|
||||
new StaticShape(ATLBankTeleport) {
|
||||
position = "-539.94 114.928 212.877";
|
||||
rotation = "0 -1 0 9.99997";
|
||||
scale = "1 1 1";
|
||||
dataBlock = "MPBTeleporter";
|
||||
dataBlock = "BankTeleporter";
|
||||
lockCount = "0";
|
||||
homingCount = "0";
|
||||
|
||||
damageTimeMS = "9247167";
|
||||
lastDamagedBy = "39473";
|
||||
Target = "40";
|
||||
lastDamagedByTeam = "1";
|
||||
destination = "BankSpawn";
|
||||
};
|
||||
new Marker(ATLSpawn) {
|
||||
position = "-546.054 112.086 223.904";
|
||||
rotation = "1 0 0 0";
|
||||
scale = "1 1 1";
|
||||
seqNum = "0";
|
||||
msToNext = "1000";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
datablock StaticShapeData(BankTeleporter): StaticShapeDamageProfile {
|
||||
className = Station;
|
||||
catagory = "Stations";
|
||||
shapeFile = "station_teleport.dts";
|
||||
shapeFile = "nexusbase.dts";
|
||||
maxDamage = 1.20;
|
||||
destroyedLevel = 1.20;
|
||||
disabledLevel = 0.84;
|
||||
|
|
@ -32,12 +32,14 @@ datablock StaticShapeData(BankTeleporter): StaticShapeDamageProfile {
|
|||
function BankTeleporter::onCollision(%data, %obj, %collider) {
|
||||
// Teleporters are generally one way in Skill Sector
|
||||
// Teleporter entities are linked to 'spawn point' objects
|
||||
echo("BankTeleporter collision: " @ %obj @ " and collider: " @ %collider);
|
||||
if (%obj.disabled) {
|
||||
messageClient(%collider.client, 'MsgStationDenied', '\c2Teleporter is recharging please stand by. ~wfx/powered/nexus_deny.wav');
|
||||
return;
|
||||
}
|
||||
messageClient(%collider.client, 'MsgTeleportStart', '\c2Teleporter is calculating transport coherence... ~wfx/misc/nexus_idle.wav');
|
||||
%collider.setVelocity("0 0 0");
|
||||
%collider.disableMove = true;
|
||||
%collider.setMoveState(true);
|
||||
%collider.startFade(1000, 0, true);
|
||||
%collider.playAudio($ActivateThread, StationVehicleAcitvateSound);
|
||||
%obj.disabled = 1;
|
||||
|
|
@ -45,8 +47,18 @@ function BankTeleporter::onCollision(%data, %obj, %collider) {
|
|||
%obj.playThread($ActivateThread, "activate");
|
||||
|
||||
%data.sparkEmitter(%obj);
|
||||
%data.schedule(2000, "teleportout", %obj, %collider);
|
||||
%data.schedule(4000, "teleportingDone", %obj, %collider);
|
||||
%data.schedule(1500, "teleportout", %obj, %collider);
|
||||
%data.schedule(3000, "teleportingDone", %obj, %collider);
|
||||
}
|
||||
|
||||
function BankTeleporter::teleportOut(%data, %obj, %player) {
|
||||
if(isObject(%obj.destination)) {
|
||||
%player.setTransform(%obj.destination.getTransform());
|
||||
} else {
|
||||
messageClient(%player.client, 'MsgTeleFailed', 'No valid teleporting destination.');
|
||||
%player.teleporting = 0;
|
||||
}
|
||||
%data.schedule(1000, "teleportIn", %player);
|
||||
}
|
||||
|
||||
// function BankTeleporter::onCollision(%data, %obj, %col)
|
||||
|
|
@ -101,19 +113,8 @@ function BankTeleporter::onCollision(%data, %obj, %collider) {
|
|||
// return;
|
||||
// }
|
||||
|
||||
function BankTeleporter::teleportOut(%data, %obj, %player) {
|
||||
if(isObject(%obj.destination)) {
|
||||
%player.setTransform(%obj.MPB.spawnPos[%index] @ " " @ getWords(%obj.MPB.getTransform(), 3, 6));
|
||||
} else {
|
||||
%player.teleporting = 0;
|
||||
} else {
|
||||
messageClient(%player.client, 'MsgTeleFailed', 'No Valid teleporting positions.');
|
||||
%player.teleporting = 0;
|
||||
}
|
||||
%data.schedule(1000, "teleportIn", %player);
|
||||
}
|
||||
|
||||
function BankTeleporter::teleportIn(%data, %player) {
|
||||
messageClient(%collider.client, 'MsgTeleportStart', '\c2Teleport to '@ %data.destination @' complete! ~wfx/powered/nexus_idle.wav');
|
||||
%data.sparkEmitter(%player); // z0dd - ZOD, 4/24/02. teleport sparkles
|
||||
%player.startFade(1000, 0, false );
|
||||
%player.playAudio($PlaySound, StationVehicleDeactivateSound);
|
||||
|
|
|
|||
Loading…
Reference in a new issue