c87deec60b
All checks were successful
Build / Build (push) Successful in 26s
This commit refactors how organization funds and reputation are handled, updates task completion logic to use the new organization functions, and modifies player saving to include organization data. Additionally, it introduces string serialization/deserialization and fixes a player save loop. * **Organization Funds and Reputation:** Replaces direct server calls for handling funds and reputation with calls to the new organization functions (`EFUNC(org,addFunds)` and `EFUNC(org,addReputation)`). This centralizes fund and reputation management within the organization store. * **Task Completion Logic:** Updates task completion functions (`fnc_destroy.sqf`, `fnc_attack.sqf`, `fnc_hostage.sqf`, `fnc_hvt.sqf`, `fnc_defuse.sqf`) to use the new organization functions for adding funds and reputation upon task success or failure. Also adds notifications to inform the player of reputation and fund changes. * **Player Saving:** Modifies the player saving function (`fnc_playerDBSave.sqf`) to include the player's organization ID in the saved data. * **String Serialization/Deserialization:** Adds `serializeString` and `deserializeString` PREP macros to `XEH_PREP.hpp` and uses them in `fnc_handleOrgLoad.sqf` and `fnc_create.sqf` to handle special characters in organization and member names. * **Player Save Loop Fix:** Removes unnecessary brackets from the `call FUNC(playerDBSave)` in `fnc_playerSaveLoop.sqf`. * **Organization Purchase Verification:** Adds organization ownership verification to `fnc_handlePurchase.sqf` to ensure only the owner can make purchases using organization funds. * **Player Initialization:** Updates `fnc_initPlayer.sqf` to retrieve and set the player's organization upon initialization.
89 lines
2.8 KiB
Plaintext
89 lines
2.8 KiB
Plaintext
#include "..\script_component.hpp"
|
|
|
|
/*
|
|
* Function: forge_client_init_fnc_initPlayer
|
|
* Author: Creedcoder, J.Schmidt
|
|
* Edit: 07.15.2024
|
|
* Copyright © 2024 Creedcoder, J.Schmidt, All rights reserved
|
|
*
|
|
* Do not edit without permission!
|
|
*
|
|
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivative 4.0 International License.
|
|
* To view a copy of this license, vist https://creativecommons.org/licenses/by-nc-nd/4.0/ or send a letter to Creative Commons,
|
|
* PO Box 1866, Mountain View, CA 94042
|
|
*
|
|
* [Description]
|
|
* Initialize player.
|
|
*
|
|
* Arguments:
|
|
* N/A
|
|
*
|
|
* Return Value:
|
|
* N/A
|
|
*
|
|
* Examples:
|
|
* [] call forge_client_init_fnc_initPlayer (Server or Singleplayer Only)
|
|
* [] remoteExecCall ["forge_client_init_fnc_initPlayer", 2, false] (Multiplayer Only)
|
|
*
|
|
* Public: Yes
|
|
*/
|
|
|
|
waitUntil { !isNull player };
|
|
waitUntil { player == player };
|
|
waitUntil { alive player };
|
|
|
|
removeAllWeapons player;
|
|
removeAllAssignedItems player;
|
|
removeUniform player;
|
|
removeVest player;
|
|
removeBackpack player;
|
|
removeGoggles player;
|
|
removeHeadgear player;
|
|
|
|
SETPVAR(player,value_loadDone,false);
|
|
cutText ["Loading In...", "BLACK", 1];
|
|
|
|
// ["hgetall", "", "", -1, [], "forge_client_init_fnc_handlePlayerLoad", true] spawn dragonfly_db_fnc_addTask;
|
|
["hgetallid", getPlayerUID player, "", -1, [], "forge_client_init_fnc_handlePlayerLoad", true, netId player] remoteExec ["dragonfly_db_fnc_addTask", 2, false];
|
|
|
|
[] spawn FUNC(playerSaveLoop);
|
|
[] spawn EFUNC(interaction,initInteraction);
|
|
|
|
waitUntil { GETVAR(player,value_loadDone,false) };
|
|
cutText ["", "PLAIN", 1];
|
|
|
|
waitUntil { !(isNull (findDisplay 46)) };
|
|
(findDisplay 46) displayAddEventHandler ["KeyDown", {
|
|
switch (_this select 1) do {
|
|
// Interaction Interface (default key TAB)
|
|
case ((configFile >> "CfgPatches" >> "forge_client_main" >> "interactionKey") call BFUNC(getCfgData)): {
|
|
[] call EFUNC(interaction,openInteraction);
|
|
false;
|
|
};
|
|
// Holster/Unholster (default key H)
|
|
case ((configFile >> "CfgPatches" >> "forge_client_main" >> "holsterKey") call BFUNC(getCfgData)): {
|
|
if ((currentWeapon player) != "" && !(GETVAR(player,FORGE_Holster_Weapon,true))) then {
|
|
player action ["SwitchWeapon", player, player, 299];
|
|
SETPVAR(player,FORGE_Holster_Weapon,true);
|
|
} else {
|
|
private _weapon = switch (true) do {
|
|
case ((primaryWeapon player) != ""): { primaryWeapon player };
|
|
case ((handgunWeapon player) != ""): { handgunWeapon player };
|
|
case ((secondaryWeapon player) != ""): { secondaryWeapon player };
|
|
default {""};
|
|
};
|
|
if (_weapon != "") then { player selectWeapon _weapon };
|
|
SETPVAR(player,FORGE_Holster_Weapon,false);
|
|
};
|
|
false;
|
|
};
|
|
// Open Phone (default key P)
|
|
case ((configFile >> "CfgPatches" >> "forge_client_main" >> "phoneKey") call BFUNC(getCfgData)): {
|
|
[] spawn EFUNC(phone,openPhone);
|
|
false;
|
|
};
|
|
default {
|
|
false;
|
|
};
|
|
};
|
|
}]; |