From 16ad921d34aec6bc3e304c87f06c1f39606e7250 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 3 May 2022 11:55:06 -0500 Subject: [PATCH] Fix house and business labels --- scripts/client/label.js | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/scripts/client/label.js b/scripts/client/label.js index 3afa875d..1efef8de 100644 --- a/scripts/client/label.js +++ b/scripts/client/label.js @@ -131,41 +131,27 @@ function renderPropertyEntranceLabel(name, position, locked, isBusiness, price, if(!locked && labelInfoType != VRR_PROPLABEL_INFO_NONE) { let infoText = ""; switch(labelInfoType) { - case VRR_PROPLABEL_INFO_ENTER: - if(enterPropertyKey) { - infoText = getLocaleString("PropertyEnterCommandLabel", "/enter"); - } else { - infoText = getLocaleString("PropertyEnterKeyPressLabel", getKeyNameFromId(enterPropertyKey)); - } - break; + case VRR_PROPLABEL_INFO_BUY: infoText = getLocaleString("BusinessBuyItemsLabel", "/buy"); break; - case VRR_PROPLABEL_INFO_BUYBIZ: - infoText = getLocaleString("PropertyForSaleLabel", price); - break; - - //case VRR_PROPLABEL_INFO_RENTBIZ: - // infoText = `Use /bizrent to buy this business`; - // break; - - case VRR_PROPLABEL_INFO_BUYHOUSE: - infoText = getLocaleString("PropertyForSaleLabel", price); - break; - - case VRR_PROPLABEL_INFO_RENTHOUSE: - infoText = getLocaleString("PropertyForRentLabel", rentPrice); - break; - case VRR_PROPLABEL_INFO_ENTERVEH: infoText = getLocaleString("VehicleDealershipLabel"); break; case VRR_PROPLABEL_INFO_NONE: + case VRR_PROPLABEL_INFO_ENTER: + case VRR_PROPLABEL_INFO_BUYBIZ: + case VRR_PROPLABEL_INFO_BUYHOUSE: + case VRR_PROPLABEL_INFO_RENTHOUSE: default: - infoText = ""; + if(enterPropertyKey) { + infoText = getLocaleString("PropertyEnterKeyPressLabel", toUpperCase(getKeyNameFromId(enterPropertyKey))); + } else { + infoText = getLocaleString("PropertyEnterCommandLabel", "/enter"); + } break; } if(getDistance(localPlayer.position, position) <= renderLabelDistance-2) {