diff --git a/ReallifeGamemode.Client/Gui/infobox.ts b/ReallifeGamemode.Client/Gui/infobox.ts index ed02cf02..e1efc7fe 100644 --- a/ReallifeGamemode.Client/Gui/infobox.ts +++ b/ReallifeGamemode.Client/Gui/infobox.ts @@ -251,7 +251,7 @@ export default function (globalData: GlobalData): void { } if (att_score > 0 && def_score > 0) { - mp.game.graphics.drawText("~y~" + def + " " + def_score + " : " + att_score + " " + att, [0.92, 0.50], + mp.game.graphics.drawText("~y~" + def + " " + def_score + " : " + att_score + " " + att, [0.1, 0.416], { font: 4, color: [255, 255, 255, 255], diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index b2c01e2b..e9c9951f 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -168,6 +168,8 @@ mp.game.graphics.drawLine(bottom_left.x, bottom_left.y, i, top_left.x, top_left.y, i, 255, 0, 0, 255); } } else { + + /* let a = 0; for (var i = z; i < z + 1; i += 0.001) { mp.game.graphics.drawLine(top_left.x, top_left.y, i, top_right.x, top_right.y, i, self.colorZone_r, self.colorZone_g, self.colorZone_b, 60 - a * 100); @@ -176,7 +178,9 @@ mp.game.graphics.drawLine(bottom_left.x, bottom_left.y, i, top_left.x, top_left.y, i, self.colorZone_r, self.colorZone_g, self.colorZone_b, 60 - a * 100); a += 0.001 } - } + */ + } + } if (self.isInsideArea()) { mp.game.graphics.drawText(self.name, [self.x, self.y, mp.players.local.position.z + 20], { @@ -253,6 +257,7 @@ self._entered = true; if (self._status === "attack") { mp.game.audio.playSoundFrontend(1, "Enter_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true); + mp.game.graphics.startScreenEffect("MinigameTransitionIn", 500, false); } mp.events.callRemote("Gangarea:Enter", JSON.stringify(self.id)); @@ -262,6 +267,7 @@ self._entered = false; if (self._status === "attack") { mp.game.audio.playSoundFrontend(1, "Exit_Capture_Zone", "DLC_Apartments_Drop_Zone_Sounds", true); + mp.game.graphics.startScreenEffect("MinigameTransitionOut", 500, false); } mp.events.callRemote("Gangarea:Leave", JSON.stringify(self.id)); } @@ -272,6 +278,7 @@ leave() { var self = this; clearInterval(self._timerCheck); + self.check(); } isNearGround() {