diff --git a/ReallifeGamemode.Client/Gui/nametags.ts b/ReallifeGamemode.Client/Gui/nametags.ts index 47ff9933..87eb9815 100644 --- a/ReallifeGamemode.Client/Gui/nametags.ts +++ b/ReallifeGamemode.Client/Gui/nametags.ts @@ -30,7 +30,7 @@ export default function customNametags() { mp.game.graphics.drawText(player.name + " (" + player.remoteId + ")", [x, y], { font: 4, - color: [42, 137, 0, 255], //Grove //Ballas 171 0 207 //PD 0 173 255 //FIB 0 0 170 LSED 147 0 0 NR 0 166 133 Trucker 255 162 Support 0 255 255 Zivilist 255 255 255 + color: [171, 0, 207, 255], //Grove //Ballas 171 0 207 //PD 0 173 255 //FIB 0 0 170 LSED 147 0 0 NR 0 166 133 Trucker 255 162 Support 0 255 255 Zivilist 255 255 255 scale: [0.4, 0.4], outline: true, centre: false @@ -42,18 +42,18 @@ export default function customNametags() { if (armour > 0) { graphics.drawRect(x, y2, width + border * 2, height + border * 2, 0 , 0, 0, 200); graphics.drawRect(x, y2, width, height, 150, 150, 150, 255); - graphics.drawRect(x - width / 2 * (1 - health), y2, width * health, height, 200, 0, 0, 200); + graphics.drawRect(x - width / 2 * (1 - health), y2 + height, width * health, height, 200, 0, 0, 200); var x2 = x + width / 2 + border / 2; graphics.drawRect(x, y2 + height, width + border * 2, height + border * 2, 0, 0, 0, 200); - graphics.drawRect(x, y2 + height, width, height, 41, 66, 78, 255); - graphics.drawRect(x - width / 2 * (1 - armour), y2 + height, width * armour, height, 48, 108, 135, 200); + graphics.drawRect(x, y2 + height, width, height, 150, 150, 150, 255); + graphics.drawRect(x - width / 2 * (1 - armour), y2, width * armour, height, 255, 255, 255, 200); } else { graphics.drawRect(x, y2, width + border * 2, height + border * 2, 0, 0, 0, 200); graphics.drawRect(x, y2, width, height, 150, 150, 150, 255); - graphics.drawRect(x - width / 2 * (1 - health), y2, width * health, height, 200, 0, 0, 200); + graphics.drawRect(x - width / 2 * (1 - health), y2 + height, width * health, height, 200, 0, 0, 200); } } } diff --git a/ReallifeGamemode.Client/Voice/main.ts b/ReallifeGamemode.Client/Voice/main.ts index 803b1d44..97d902db 100644 --- a/ReallifeGamemode.Client/Voice/main.ts +++ b/ReallifeGamemode.Client/Voice/main.ts @@ -11,7 +11,7 @@ export default function voice(globalData: IGlobalData) { const UseAutoVolume = false; const MaxRange = 30.0; - mp.voiceChat.muted = false; // initialize muted + mp.voiceChat.muted = true; // initialize muted var listeners: Array = new Array(); diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 9f152c37..7198eec7 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -58,8 +58,8 @@ cityHall(globalData); import adminSpeed from './admin/aspeed'; adminSpeed(); -import voice from './Voice/main'; -voice(globalData); +//import voice from './Voice/main'; +//voice(globalData); import handMoney from './Gui/handmoney' handMoney(globalData);