This commit is contained in:
Lukas Moungos
2019-12-04 20:44:50 +01:00
parent 4fa3a312f9
commit c173278f65

View File

@@ -218,12 +218,10 @@
setAttackBlip(bool) { setAttackBlip(bool) {
var self = this; var self = this;
if (bool) { if (bool) {
self.attackBlip = mp.game.ui.addBlipForRadius(self.x, self.y, 1, 3); self.attackBlip = mp.game.ui.addBlipForRadius(self.x, self.y, 1, 20);
mp.game.invoke(Natives.SET_BLIP_SPRITE, self.attackBlip, 378); mp.game.invoke(Natives.SET_BLIP_SPRITE, self.attackBlip, 378);
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.attackBlip, true);
} else if (!bool) { } else if (!bool) {
mp.game.invoke(Natives.SET_BLIP_ALPHA, self.blip, 0); mp.game.invoke(Natives.SET_BLIP_SPRITE, self.attackBlip, 5);
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.attackBlip, false);
} }
} }
@@ -251,13 +249,15 @@
if ((!self._entered)) { if ((!self._entered)) {
if (self.isInsideArea() && (self.isNearGround() == true)) { if (self.isInsideArea() && (self.isNearGround() == true)) {
self._entered = true; self._entered = true;
mp.game.audio.playSoundFrontend(1, "Enter_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true); if (this.status == "attack")
mp.game.audio.playSoundFrontend(1, "Enter_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true);
mp.events.callRemote("Gangarea:Enter", JSON.stringify(self.id)); mp.events.callRemote("Gangarea:Enter", JSON.stringify(self.id));
} }
} else if (self._entered == true) { } else if (self._entered == true) {
if (!self.isInsideArea() || (self.isNearGround() == false)) { if (!self.isInsideArea() || (self.isNearGround() == false)) {
self._entered = false; self._entered = false;
mp.game.audio.playSoundFrontend(1, "Exit_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true); if (this.status == "attack")
mp.game.audio.playSoundFrontend(1, "Exit_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true);
mp.events.callRemote("Gangarea:Leave", JSON.stringify(self.id)); mp.events.callRemote("Gangarea:Leave", JSON.stringify(self.id));
} }
} }
@@ -363,6 +363,8 @@
mp.game.ui.removeBlip(last_blip); mp.game.ui.removeBlip(last_blip);
last_blip = mp.game.invoke(Natives.GET_NEXT_BLIP_INFO_ID, 5); last_blip = mp.game.invoke(Natives.GET_NEXT_BLIP_INFO_ID, 5);
} }
} }
mp.events.add('GangAreas:Create', (turfsJSON) => { mp.events.add('GangAreas:Create', (turfsJSON) => {