Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate Clear Prox Code, Add Clear Prox to collisionWithEntity.

Browse source
This commit is contained in:
Midnight 2017-08-18 19:20:34 -07:00
parent 9ff68ce10c
commit 6892cdb57d
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
View file

@ -57,8 +57,6 @@
} }
function particleExplode() { function particleExplode() {
Entities.deleteEntity(particleTrailEntity);
particleTrailEntity = null;
var entPos = Entities.getEntityProperties(_entityID, 'position').position; var entPos = Entities.getEntityProperties(_entityID, 'position').position;
var props = { var props = {
type: 'ParticleEffect', type: 'ParticleEffect',
@ -110,7 +108,12 @@
function clearProxCheck() { function clearProxCheck() {
if (proxInterval) Script.clearInterval(proxInterval); if (proxInterval) {
Script.clearInterval(proxInterval);
Entities.deleteEntity(particleTrailEntity);
particleTrailEntity = null;
}
if (proxTimeout) Script.clearTimeout(proxTimeout); if (proxTimeout) Script.clearTimeout(proxTimeout);
} }
@ -118,8 +121,6 @@
var ballPos = Entities.getEntityProperties(_entityID, ['position']).position; var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1); var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
if (particleTrailEntity === null) particleTrail();
if (isAnyAvatarInRange) { if (isAnyAvatarInRange) {
clearProxCheck(); clearProxCheck();
particleExplode(); particleExplode();
@ -143,14 +144,19 @@
this.releaseGrab = function (thisEntityID) { this.releaseGrab = function (thisEntityID) {
if (particleTrailEntity === null) particleTrail();
Script.setTimeout(function () { Script.setTimeout(function () {
proxInterval = Script.setInterval(proxCheck, 50); proxInterval = Script.setInterval(proxCheck, 50);
}, 150); // Setting a delay to give it time to leave initial avatar without proc. }, 200); // Setting a delay to give it time to leave initial avatar without proc.
proxTimeout = Script.setTimeout(function () { proxTimeout = Script.setTimeout(function () {
Script.clearInterval(proxInterval); clearProxCheck();
Entities.deleteEntity(particleTrailEntity);
}, 10000) }, 10000)
} };
this.collisionWithEntity = function(thisEntityID, collisionEntityID, collisionInfo) {
clearProxCheck();
};
}); });