diff --git a/scripts/server/misc.js b/scripts/server/misc.js index cccdae41..01d38dba 100644 --- a/scripts/server/misc.js +++ b/scripts/server/misc.js @@ -378,7 +378,7 @@ function enterExitPropertyCommand(command, params, client) { } else { setPlayerScene(client, closestProperty.exitScene); } - }, 1000); + }, 2000); return false; } @@ -401,21 +401,22 @@ function enterExitPropertyCommand(command, params, client) { meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString)); - if (closestProperty.entranceScene != "" && isGameFeatureSupported("interiorScene")) { - getPlayerCurrentSubAccount(client).spawnPosition = closestProperty.entrancePosition; - if (isMainWorldScene(closestProperty.entranceScene)) { - destroyGameElement(client.player); - setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]); - } else { - destroyGameElement(client.player); - setPlayerScene(client, closestProperty.entranceScene); - } - - return false; + if (isFadeCameraSupported()) { + fadePlayerCamera(client, false, 2000); } - if (isFadeCameraSupported()) { - fadePlayerCamera(client, false, 1000); + if (closestProperty.entranceScene != "" && isGameFeatureSupported("interiorScene")) { + setTimeout(function () { + getPlayerCurrentSubAccount(client).spawnPosition = closestProperty.entrancePosition; + if (isMainWorldScene(closestProperty.entranceScene)) { + destroyGameElement(client.player); + setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]); + } else { + destroyGameElement(client.player); + setPlayerScene(client, closestProperty.entranceScene); + } + }, 2000); + return false; } setTimeout(function () { @@ -525,12 +526,12 @@ function checkPlayerSpawning() { // =========================================================================== function showPlayerPrompt(client, promptMessage, promptTitle, yesButtonText, noButtonText) { - if (doesPlayerUseGUI(client)) { - showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText, noButtonText); - } else { - messagePlayerNormal(client, `🛎️ ${promptMessage} `); - messagePlayerInfo(client, getLocaleString(client, "PromptResponseTip", `{ALTCOLOUR}/yes{MAINCOLOUR}`, `{ALTCOLOUR}/no{MAINCOLOUR}`)); - } + //if (doesPlayerUseGUI(client)) { + // showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText, noButtonText); + //} else { + messagePlayerNormal(client, `🛎️ ${promptMessage} `); + messagePlayerInfo(client, getLocaleString(client, "PromptResponseTip", `{ALTCOLOUR}/yes{MAINCOLOUR}`, `{ALTCOLOUR}/no{MAINCOLOUR}`)); + //} } // =========================================================================== diff --git a/scripts/server/prompt.js b/scripts/server/prompt.js index e98e6d13..10b124ac 100644 --- a/scripts/server/prompt.js +++ b/scripts/server/prompt.js @@ -17,6 +17,7 @@ const V_PROMPT_GIVEHOUSETOCLAN = 5; const V_PROMPT_BUYBIZ = 6; const V_PROMPT_BUYHOUSE = 7; const V_PROMPT_RESETKEYBINDS = 8; +const V_PROMPT_RESETACTIONTIPS = 9; // =========================================================================== @@ -43,16 +44,7 @@ function playerPromptAnswerNo(client) { break; case V_PROMPT_BIZORDER: - if (getPlayerData(client).businessOrderAmount > 0) { - if (doesPlayerUseGUI(client)) { - showPlayerErrorGUI(client, getLocaleString(client, "BusinessOrderCanceled"), getLocaleString(client, "GUIWarning")); - } else { - logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} canceled the order of ${getPlayerData(client).businessOrderAmount} ${getPlayerData(client).businessOrderItem} at ${getPlayerData(client).businessOrderCost / getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness)}`); - messagePlayerError(client, getLocaleString(client, "BusinessOrderCanceled")); - } - } else { - showPlayerErrorGUI(client, getLocaleString(client, "NotOrderingAnyBusinessItems"), getLocaleString(client, getLocaleString(client, "GUIWarningTitle"))); - } + showPlayerError(client, getLocaleString(client, "BusinessOrderCanceled"), getLocaleString(client, "GUIWarning")); break; default: @@ -83,19 +75,14 @@ function playerPromptAnswerYes(client) { if (getPlayerData(client).businessOrderAmount > 0) { if (getBusinessData(getPlayerData(client).businessOrderBusiness).till < getPlayerData(client).businessOrderCost) { logToConsole(LOG_DEBUG, `[V.RP.Prompt] ${getPlayerDisplayForConsole(client)} failed to order ${getPlayerData(client).businessOrderAmount} ${getItemTypeData(getPlayerData(client).businessOrderItem).name} at ${getPlayerData(client).businessOrderCost / getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness).name} (Reason: Not enough money in business till)`); - if (doesPlayerHaveGUIEnabled(client)) { - showPlayerErrorGUI(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`), getLocaleString(client, "BusinessOrderCanceled")); - } else { - messagePlayerError(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`)); - } + showPlayerError(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`), getLocaleString(client, "BusinessOrderCanceled")); getPlayerData(client).businessOrderAmount = 0; getPlayerData(client).businessOrderBusiness = false; getPlayerData(client).businessOrderItem = -1; getPlayerData(client).businessOrderValue = -1; } else { logToConsole(LOG_DEBUG, `[V.RP.Prompt] ${getPlayerDisplayForConsole(client)} successfully ordered ${getPlayerData(client).businessOrderAmount} ${getItemTypeData(getPlayerData(client).businessOrderItem).name} at ${getPlayerData(client).businessOrderCost / getPlayerData(client).businessOrderAmount} each for business ${getBusinessData(getPlayerData(client).businessOrderBusiness).name}`); - - showPlayerInfoGUI(client, getLocaleString(client, "BusinessOrderSuccessInfo", getPlayerData(client).businessOrderAmount, getItemTypeData(getPlayerData(client).businessOrderItem).name, getItemValueDisplay(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue), getPlayerData(client).businessOrderCost), getLocaleString(client, "GUIInfoTitle")); + showPlayerInfo(client, getLocaleString(client, "BusinessOrderSuccessInfo", getPlayerData(client).businessOrderAmount, getItemTypeData(getPlayerData(client).businessOrderItem).name, getItemValueDisplay(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue), getPlayerData(client).businessOrderCost), getLocaleString(client, "GUIInfoTitle")); createItem(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue, V_ITEM_OWNER_BIZFLOOR, getBusinessData(getPlayerData(client).businessOrderBusiness).databaseId, getPlayerData(client).businessOrderAmount); cacheBusinessItems(getPlayerData(client).businessOrderBusiness); getBusinessData(getPlayerData(client).businessOrderBusiness).till -= getPlayerData(client).businessOrderCost; @@ -106,7 +93,7 @@ function playerPromptAnswerYes(client) { getPlayerData(client).businessOrderValue = -1; } } else { - showPlayerErrorGUI(client, ``, `Business Order Canceled`); + showPlayerError(client, getLocaleString(client, "BusinessOrderCanceled"), getLocaleString(client, "GUIWarningTitle")); } break; } @@ -232,12 +219,13 @@ function playerPromptAnswerYes(client) { return false; } + takePlayerCash(client, getBusinessData(businessId).buyPrice); getBusinessData(businessId).ownerType = V_BIZ_OWNER_PLAYER; getBusinessData(businessId).ownerId = getPlayerCurrentSubAccount(client).databaseId; getBusinessData(businessId).buyPrice = 0; getBusinessData(businessId).needsSaved = true; + updateBusinessPickupLabelData(businessId); - takePlayerCash(client, getBusinessData(businessId).buyPrice); messageDiscordEventChannel(`🏢 ${getCharacterFullName(client)} is now the owner of *${getBusinessData(businessId).name}*!`); messagePlayerSuccess(client, getLocaleString(client, "BusinessPurchased", `{businessBlue}${getBusinessData(businessId).name}{MAINCOLOUR}`)); @@ -269,6 +257,12 @@ function playerPromptAnswerYes(client) { break; } + case V_PROMPT_RESETACTIONTIPS: { + getPlayerData(client).accountData.seenActionTips = 0; + messagePlayerSuccess(client, getLocaleString(client, "ActionTipsReset")); + break; + } + default: { messagePlayerError(client, getLocaleString(client, "NoPromptAccept")); submitBugReport(client, `[AUTOMATED REPORT] Tried to accept invalid prompt type: ${getPlayerData(client).promptType}`);