hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable GUI prompts for now

Browse Source
This commit is contained in:
Vortrex
2023-03-05 20:45:47 -06:00
parent 7bb7775898
commit 0a9866ac9e
2 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scripts/server/misc.js
View File

@@ -378,7 +378,7 @@ function enterExitPropertyCommand(command, params, client) {
} else { } else {
setPlayerScene(client, closestProperty.exitScene); setPlayerScene(client, closestProperty.exitScene);
} }
}, 1000); }, 2000);
return false; return false;
} }
@@ -401,21 +401,22 @@ function enterExitPropertyCommand(command, params, client) {
meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString)); meActionToNearbyPlayers(client, getLanguageLocaleString(englishId, "ExitsProperty", typeString, nameString));
if (closestProperty.entranceScene != "" && isGameFeatureSupported("interiorScene")) { if (isFadeCameraSupported()) {
getPlayerCurrentSubAccount(client).spawnPosition = closestProperty.entrancePosition; fadePlayerCamera(client, false, 2000);
if (isMainWorldScene(closestProperty.entranceScene)) {
destroyGameElement(client.player);
setPlayerScene(client, getGameConfig().mainWorldScene[getGame()]);
} else {
destroyGameElement(client.player);
setPlayerScene(client, closestProperty.entranceScene);
}
return false;
} }
if (isFadeCameraSupported()) { if (closestProperty.entranceScene != "" && isGameFeatureSupported("interiorScene")) {
fadePlayerCamera(client, false, 1000); 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 () { setTimeout(function () {
@@ -525,12 +526,12 @@ function checkPlayerSpawning() {
// =========================================================================== // ===========================================================================
function showPlayerPrompt(client, promptMessage, promptTitle, yesButtonText, noButtonText) { function showPlayerPrompt(client, promptMessage, promptTitle, yesButtonText, noButtonText) {
if (doesPlayerUseGUI(client)) { //if (doesPlayerUseGUI(client)) {
showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText, noButtonText); // showPlayerPromptGUI(client, promptMessage, promptTitle, yesButtonText, noButtonText);
} else { //} else {
messagePlayerNormal(client, `🛎️ ${promptMessage} `); messagePlayerNormal(client, `🛎️ ${promptMessage} `);
messagePlayerInfo(client, getLocaleString(client, "PromptResponseTip", `{ALTCOLOUR}/yes{MAINCOLOUR}`, `{ALTCOLOUR}/no{MAINCOLOUR}`)); messagePlayerInfo(client, getLocaleString(client, "PromptResponseTip", `{ALTCOLOUR}/yes{MAINCOLOUR}`, `{ALTCOLOUR}/no{MAINCOLOUR}`));
} //}
} }
// =========================================================================== // ===========================================================================

32
scripts/server/prompt.js
View File

@@ -17,6 +17,7 @@ const V_PROMPT_GIVEHOUSETOCLAN = 5;
const V_PROMPT_BUYBIZ = 6; const V_PROMPT_BUYBIZ = 6;
const V_PROMPT_BUYHOUSE = 7; const V_PROMPT_BUYHOUSE = 7;
const V_PROMPT_RESETKEYBINDS = 8; const V_PROMPT_RESETKEYBINDS = 8;
const V_PROMPT_RESETACTIONTIPS = 9;
// =========================================================================== // ===========================================================================
@@ -43,16 +44,7 @@ function playerPromptAnswerNo(client) {
break; break;
case V_PROMPT_BIZORDER: case V_PROMPT_BIZORDER:
if (getPlayerData(client).businessOrderAmount > 0) { showPlayerError(client, getLocaleString(client, "BusinessOrderCanceled"), getLocaleString(client, "GUIWarning"));
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")));
}
break; break;
default: default:
@@ -83,19 +75,14 @@ function playerPromptAnswerYes(client) {
if (getPlayerData(client).businessOrderAmount > 0) { if (getPlayerData(client).businessOrderAmount > 0) {
if (getBusinessData(getPlayerData(client).businessOrderBusiness).till < getPlayerData(client).businessOrderCost) { 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)`); 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)) { showPlayerError(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`), getLocaleString(client, "BusinessOrderCanceled"));
showPlayerErrorGUI(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`), getLocaleString(client, "BusinessOrderCanceled"));
} else {
messagePlayerError(client, getLocaleString(client, "BusinessOrderNotEnoughMoney", `{ALTCOLOUR}/bizdeposit{MAINCOLOUR}`));
}
getPlayerData(client).businessOrderAmount = 0; getPlayerData(client).businessOrderAmount = 0;
getPlayerData(client).businessOrderBusiness = false; getPlayerData(client).businessOrderBusiness = false;
getPlayerData(client).businessOrderItem = -1; getPlayerData(client).businessOrderItem = -1;
getPlayerData(client).businessOrderValue = -1; getPlayerData(client).businessOrderValue = -1;
} else { } 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}`); 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}`);
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"));
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"));
createItem(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue, V_ITEM_OWNER_BIZFLOOR, getBusinessData(getPlayerData(client).businessOrderBusiness).databaseId, getPlayerData(client).businessOrderAmount); createItem(getPlayerData(client).businessOrderItem, getPlayerData(client).businessOrderValue, V_ITEM_OWNER_BIZFLOOR, getBusinessData(getPlayerData(client).businessOrderBusiness).databaseId, getPlayerData(client).businessOrderAmount);
cacheBusinessItems(getPlayerData(client).businessOrderBusiness); cacheBusinessItems(getPlayerData(client).businessOrderBusiness);
getBusinessData(getPlayerData(client).businessOrderBusiness).till -= getPlayerData(client).businessOrderCost; getBusinessData(getPlayerData(client).businessOrderBusiness).till -= getPlayerData(client).businessOrderCost;
@@ -106,7 +93,7 @@ function playerPromptAnswerYes(client) {
getPlayerData(client).businessOrderValue = -1; getPlayerData(client).businessOrderValue = -1;
} }
} else { } else {
showPlayerErrorGUI(client, ``, `Business Order Canceled`); showPlayerError(client, getLocaleString(client, "BusinessOrderCanceled"), getLocaleString(client, "GUIWarningTitle"));
} }
break; break;
} }
@@ -232,12 +219,13 @@ function playerPromptAnswerYes(client) {
return false; return false;
} }
takePlayerCash(client, getBusinessData(businessId).buyPrice);
getBusinessData(businessId).ownerType = V_BIZ_OWNER_PLAYER; getBusinessData(businessId).ownerType = V_BIZ_OWNER_PLAYER;
getBusinessData(businessId).ownerId = getPlayerCurrentSubAccount(client).databaseId; getBusinessData(businessId).ownerId = getPlayerCurrentSubAccount(client).databaseId;
getBusinessData(businessId).buyPrice = 0; getBusinessData(businessId).buyPrice = 0;
getBusinessData(businessId).needsSaved = true; getBusinessData(businessId).needsSaved = true;
updateBusinessPickupLabelData(businessId); updateBusinessPickupLabelData(businessId);
takePlayerCash(client, getBusinessData(businessId).buyPrice);
messageDiscordEventChannel(`🏢 ${getCharacterFullName(client)} is now the owner of *${getBusinessData(businessId).name}*!`); messageDiscordEventChannel(`🏢 ${getCharacterFullName(client)} is now the owner of *${getBusinessData(businessId).name}*!`);
messagePlayerSuccess(client, getLocaleString(client, "BusinessPurchased", `{businessBlue}${getBusinessData(businessId).name}{MAINCOLOUR}`)); messagePlayerSuccess(client, getLocaleString(client, "BusinessPurchased", `{businessBlue}${getBusinessData(businessId).name}{MAINCOLOUR}`));
@@ -269,6 +257,12 @@ function playerPromptAnswerYes(client) {
break; break;
} }
case V_PROMPT_RESETACTIONTIPS: {
getPlayerData(client).accountData.seenActionTips = 0;
messagePlayerSuccess(client, getLocaleString(client, "ActionTipsReset"));
break;
}
default: { default: {
messagePlayerError(client, getLocaleString(client, "NoPromptAccept")); messagePlayerError(client, getLocaleString(client, "NoPromptAccept"));
submitBugReport(client, `[AUTOMATED REPORT] Tried to accept invalid prompt type: ${getPlayerData(client).promptType}`); submitBugReport(client, `[AUTOMATED REPORT] Tried to accept invalid prompt type: ${getPlayerData(client).promptType}`);