+
-
- Close
-
Garage
diff --git a/addons/init/functions/fnc_handlePlayerLoad.sqf b/addons/init/functions/fnc_handlePlayerLoad.sqf
index 5f63cd0..ec05cf3 100644
--- a/addons/init/functions/fnc_handlePlayerLoad.sqf
+++ b/addons/init/functions/fnc_handlePlayerLoad.sqf
@@ -1,19 +1,16 @@
#include "..\script_component.hpp"
/*
- * Function: forge_client_init_fnc_handlePlayerLoad
* Author: IDSolutions
- *
- * [Description]
* Handle player load from DB.
*
* Arguments:
- * 0: Data from key [] (default: [])
+ * 0: Data from key (default: [])
*
* Return Value:
- * N/A
+ * None
*
- * Examples:
+ * Example:
* [[_data]] call forge_client_init_fnc_handlePlayerLoad (Server or Singleplayer Only)
* [[_data]] remoteExecCall ["forge_client_init_fnc_handlePlayerLoad", 2, false] (Multiplayer Only)
*
diff --git a/addons/locker/stringtable.xml b/addons/locker/stringtable.xml
index facaae3..ccba9a3 100644
--- a/addons/locker/stringtable.xml
+++ b/addons/locker/stringtable.xml
@@ -1,9 +1,6 @@
-
- Close
-
Equip
diff --git a/addons/store/stringtable.xml b/addons/store/stringtable.xml
index 3f5d96d..2c09f42 100644
--- a/addons/store/stringtable.xml
+++ b/addons/store/stringtable.xml
@@ -7,9 +7,6 @@
FILTER BY CATEGORY
-
- Close
-
Store
+
diff --git a/addons/bank/ui/_site/script.js b/addons/bank/ui/_site/script.js
index 21d9dcd..84d92e5 100644
--- a/addons/bank/ui/_site/script.js
+++ b/addons/bank/ui/_site/script.js
@@ -1,79 +1,212 @@
-// Simulated data - this would be replaced with actual game data
+/**
+ * Bank Management Script
+ * This script handles the bank interface functionality for the Arma 3 game interface.
+ * It provides wallet/account management, transfers, and transaction history.
+ */
+
+//=============================================================================
+// #region DATA STRUCTURES AND VARIABLES
+//=============================================================================
+
+/**
+ * Bank state - will be populated from game events
+ */
let bankState = {
- wallet: 1000,
- account: 5000,
- players: [
- { id: 1, name: "Player 1" },
- { id: 2, name: "Player 2" },
- { id: 3, name: "Player 3" }
- ],
+ wallet: 0,
+ account: 0,
+ players: [],
transactions: []
};
-// Initialize the interface
+//=============================================================================
+// #region INITIALIZATION AND DATA REQUESTS
+//=============================================================================
+
+/**
+ * Initialize the bank interface
+ * Sets up the UI and requests initial data from the game engine
+ */
function initializeBank() {
- updateBalanceDisplays();
+ // Request initial data from the game
+ requestPlayerFunds();
+ requestPlayerData();
+ requestTransactionHistory();
+}
+
+/**
+ * Request player funds data from the game engine
+ */
+function requestPlayerFunds() {
+ const message = {
+ event: "REQUEST::PLAYER::FUNDS",
+ data: {}
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+}
+
+/**
+ * Request player data from the game engine
+ */
+function requestPlayerData() {
+ const message = {
+ event: "REQUEST::PLAYER::DATA",
+ data: {}
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+}
+
+/**
+ * Request transaction history from the game engine
+ */
+function requestTransactionHistory() {
+ const message = {
+ event: "REQUEST::TRANSACTION::HISTORY",
+ data: {}
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+}
+
+//=============================================================================
+// #region DATA HANDLERS
+//=============================================================================
+
+/**
+ * Handle player data received from the game engine
+ * @param {Array} data - List of player objects
+ */
+function handlePlayerDataRequest(data) {
+ bankState.players = data;
populatePlayerList();
- setupEventListeners();
- loadTransactionHistory();
}
-// Update balance displays in the header
+/**
+ * Handle player funds data received from the game engine
+ * @param {Object} data - Object containing cash and balance
+ */
+function handlePlayerFundsRequest(data) {
+ console.log('Received funds data:', data);
+
+ // Parse the data if it's a string
+ if (typeof data === 'string') {
+ try {
+ data = JSON.parse(data);
+ } catch (e) {
+ console.error('Failed to parse data:', e);
+ return;
+ }
+ }
+
+ // Ensure we have valid numbers, default to 0 if null
+ bankState.wallet = data.cash !== null ? Number(data.cash) : 0;
+ bankState.account = data.balance !== null ? Number(data.balance) : 0;
+ updateBalanceDisplays();
+}
+
+/**
+ * Handle transaction history data received from the game engine
+ * @param {Object} data - Object containing transaction history
+ */
+function handleTransactionHistoryRequest(data) {
+ console.log('Received transaction history:', data);
+
+ // Parse the data if it's a string
+ if (typeof data === 'string') {
+ try {
+ data = JSON.parse(data);
+ } catch (e) {
+ console.error('Failed to parse transaction history:', e);
+ return;
+ }
+ }
+
+ // Initialize empty array if history is null
+ bankState.transactions = [];
+ updateTransactionHistory();
+}
+
+//=============================================================================
+// #region UI UPDATES AND DISPLAY
+//=============================================================================
+
+/**
+ * Update balance displays in the header
+ */
function updateBalanceDisplays() {
- document.getElementById('walletBalance').textContent = `$${bankState.wallet.toLocaleString()}`;
- document.getElementById('accountBalance').textContent = `$${bankState.account.toLocaleString()}`;
+ const walletElement = document.getElementById('walletBalance');
+ const accountElement = document.getElementById('accountBalance');
+
+ if (walletElement && accountElement) {
+ walletElement.textContent = `$${(bankState.wallet || 0).toLocaleString()}`;
+ accountElement.textContent = `$${(bankState.account || 0).toLocaleString()}`;
+ }
}
-// Populate the player selection dropdown
+/**
+ * Populate the player selection dropdown
+ */
function populatePlayerList() {
const playerSelect = document.getElementById('playerSelect');
playerSelect.innerHTML = '';
bankState.players.forEach(player => {
const option = document.createElement('option');
- option.value = player.id;
+ option.value = player.uid;
option.textContent = player.name;
playerSelect.appendChild(option);
});
}
-// Add a new transaction to history
-function addTransaction(type, amount, details = '') {
- const transaction = {
- type,
- amount,
- details,
- timestamp: new Date().toISOString()
- };
-
- bankState.transactions.unshift(transaction);
- updateTransactionHistory();
-}
-
-// Update the transaction history display
+/**
+ * Update the transaction history display
+ */
function updateTransactionHistory() {
const historyList = document.getElementById('transactionHistory');
+ if (!historyList) return;
+
historyList.innerHTML = '';
+ if (!Array.isArray(bankState.transactions)) {
+ console.error('Transaction history is not an array:', bankState.transactions);
+ return;
+ }
+
+ if (bankState.transactions.length === 0) {
+ const li = document.createElement('li');
+ li.className = 'history-item empty';
+ li.textContent = 'No transactions yet';
+ historyList.appendChild(li);
+ return;
+ }
+
bankState.transactions.forEach(transaction => {
+ if (!transaction) return;
+
const li = document.createElement('li');
li.className = 'history-item';
const isNegative = ['transfer_out', 'to_wallet'].includes(transaction.type);
const amountClass = isNegative ? 'amount-negative' : 'amount-positive';
const amountPrefix = isNegative ? '-' : '+';
+ const amount = Math.abs(Number(transaction.amount) || 0);
li.innerHTML = `
${formatTransactionType(transaction.type)}
- ${transaction.details}
- ${amountPrefix}$${Math.abs(transaction.amount).toLocaleString()}
+ ${transaction.details || ''}
+ ${amountPrefix}$${amount.toLocaleString()}
`;
historyList.appendChild(li);
});
}
-// Format transaction type for display
+/**
+ * Format transaction type for display
+ * @param {string} type - Transaction type code
+ * @returns {string} Formatted transaction type
+ */
function formatTransactionType(type) {
const types = {
'to_wallet': 'To Wallet',
@@ -85,63 +218,94 @@ function formatTransactionType(type) {
return types[type] || type;
}
-// Set up all form event listeners
-function setupEventListeners() { // Handle transfers between wallet and account
- document.getElementById('transferForm').addEventListener('submit', (e) => {
- e.preventDefault();
- const amount = parseInt(document.getElementById('transferAmount').value);
- const transferType = document.getElementById('transferType').value;
-
- if (transferType === 'to_wallet') {
- if (amount > bankState.account) {
- alert('Insufficient funds in account');
- return;
- }
- bankState.account -= amount;
- bankState.wallet += amount;
- } else {
- if (amount > bankState.wallet) {
- alert('Insufficient funds in wallet');
- return;
- }
- bankState.wallet -= amount;
- bankState.account += amount;
+//=============================================================================
+// #region ACTION HANDLERS
+//=============================================================================
+
+/**
+ * Handle transfer between wallet and account
+ */
+function handleTransfer() {
+ const amount = parseInt(document.getElementById('transferAmount').value);
+ const transferType = document.getElementById('transferType').value;
+
+ if (amount <= 0) {
+ alert('Amount must be greater than 0');
+ return;
+ }
+
+ const event = transferType === 'to_wallet' ? 'WITHDRAW::FUNDS' : 'DEPOSIT::FUNDS';
+
+ const message = {
+ event: event,
+ data: {
+ amount: amount
}
-
- addTransaction(transferType, amount);
- updateBalanceDisplays();
- e.target.reset();
- }); // Transfer to Player
- document.getElementById('transferPlayerForm').addEventListener('submit', (e) => {
- e.preventDefault();
- const amount = parseInt(document.getElementById('playerTransferAmount').value);
- const playerId = document.getElementById('playerSelect').value;
- const playerName = bankState.players.find(p => p.id.toString() === playerId)?.name;
-
- if (amount > bankState.account) {
- alert('Insufficient funds in account');
- return;
- }
-
- bankState.account -= amount;
- addTransaction('transfer_out', amount, `To ${playerName}`);
- updateBalanceDisplays();
- e.target.reset();
- });
-
- // Submit Timesheet
- document.getElementById('timesheetForm').addEventListener('submit', (e) => {
- e.preventDefault();
- const hours = parseFloat(document.getElementById('hoursWorked').value);
- const rate = parseInt(document.getElementById('hourlyRate').value);
- const amount = Math.floor(hours * rate);
-
- bankState.account += amount;
- addTransaction('timesheet', amount, `${hours} hours @ $${rate}/hr`);
- updateBalanceDisplays();
- e.target.reset();
- });
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+ document.getElementById('transferAmount').value = '';
}
-// Initialize when DOM is loaded
+/**
+ * Handle transfer to another player
+ */
+function handlePlayerTransfer() {
+ const amount = parseInt(document.getElementById('playerTransferAmount').value);
+ const playerUid = document.getElementById('playerSelect').value;
+
+ if (amount <= 0) {
+ alert('Amount must be greater than 0');
+ return;
+ }
+
+ if (!playerUid) {
+ alert('Please select a player');
+ return;
+ }
+
+ const message = {
+ event: 'TRANSFER::FUNDS',
+ data: {
+ amount: amount,
+ uid: playerUid
+ }
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+ document.getElementById('playerTransferAmount').value = '';
+}
+
+/**
+ * Handle timesheet submission
+ */
+function handleTimesheet() {
+ const hours = parseFloat(document.getElementById('hoursWorked').value);
+ const rate = parseInt(document.getElementById('hourlyRate').value);
+ const amount = Math.floor(hours * rate);
+
+ if (amount <= 0) {
+ alert('Invalid timesheet amount');
+ return;
+ }
+
+ const message = {
+ event: 'DEPOSIT::FUNDS',
+ data: {
+ amount: amount
+ }
+ };
+
+ A3API.SendAlert(JSON.stringify(message));
+ document.getElementById('hoursWorked').value = '';
+ document.getElementById('hourlyRate').value = '';
+}
+
+//=============================================================================
+// #region INITIALIZATION
+//=============================================================================
+
+/**
+ * Initialize when DOM is loaded
+ */
document.addEventListener('DOMContentLoaded', initializeBank);
diff --git a/addons/garage/XEH_postInit.sqf b/addons/garage/XEH_postInit.sqf
index 09242f7..84f2529 100644
--- a/addons/garage/XEH_postInit.sqf
+++ b/addons/garage/XEH_postInit.sqf
@@ -1,48 +1 @@
-#include "script_component.hpp"
-
-[QGVAR(handleEvents), {
- params ["_control", "_isConfirmDialog", "_message"];
-
- diag_log format ["[FORGE: Garage] Received event: %1", _message];
-
- _message = fromJSON _message;
- private _event = _message get "event";
- private _data = _message get "data";
-
- private _vehicles = GETVAR(player,FORGE_Garage,[]);
-
- switch (_event) do {
- case "REQUEST_GARAGE_DATA": {
- private _garageData = createHashMap;
- private _vehicleList = [];
-
- {
- private _vehicle = _x;
- if (isNull _vehicle || { !alive _vehicle }) exitWith {};
-
- private _vehicleInfo = createHashMapFromArray [
- ["classname", typeOf _vehicle],
- ["damage", damage _vehicle],
- ["fuel", fuel _vehicle],
- ["hitpoints", getAllHitPointsDamage _vehicle]
- ];
-
- _vehicleList pushBack _vehicleInfo;
- } forEach _vehicles;
-
- _garageData set ["vehicles", _vehicleList];
- _control ctrlWebBrowserAction ["ExecJS", format ["handleGarageDataRequest(%1)", (toJSON _vehicleList)]];
- };
- case "STORE_VEHICLE": {
- // Logic to store vehicle in garage
- // This would typically involve saving the vehicle's state to a database or similar
- };
- case "RETRIEVE_VEHICLE": {
- // Logic to retrieve vehicle from garage
- // This would typically involve loading the vehicle's state from a database or similar
- };
- default {
- diag_log format ["[FORGE: Garage] Unknown event: %1", _event];
- };
- };
-}] call CFUNC(addEventHandler);
\ No newline at end of file
+#include "script_component.hpp"
\ No newline at end of file
diff --git a/addons/garage/XEH_postInit_client.sqf b/addons/garage/XEH_postInit_client.sqf
index 84f2529..3b10687 100644
--- a/addons/garage/XEH_postInit_client.sqf
+++ b/addons/garage/XEH_postInit_client.sqf
@@ -1 +1,48 @@
-#include "script_component.hpp"
\ No newline at end of file
+#include "script_component.hpp"
+
+[QGVAR(handleEvents), {
+ params ["_control", "_isConfirmDialog", "_message"];
+
+ diag_log text format ["[FORGE::Client::Garage::XEH_postInit] Received event: '%1'", _message];
+
+ _message = fromJSON _message;
+ private _event = _message get "event";
+ private _data = _message get "data";
+
+ private _vehicles = GETVAR(player,FORGE_Garage,[]); //TODO: Implement garage from server
+
+ switch (_event) do {
+ case "REQUEST::GARAGE::DATA": {
+ private _garageData = createHashMap;
+ private _vehicleList = [];
+
+ {
+ private _vehicle = _x;
+ if (isNull _vehicle || { !alive _vehicle }) exitWith {};
+
+ private _vehicleInfo = createHashMapFromArray [
+ ["classname", typeOf _vehicle],
+ ["damage", damage _vehicle],
+ ["fuel", fuel _vehicle],
+ ["hitpoints", getAllHitPointsDamage _vehicle]
+ ];
+
+ _vehicleList pushBack _vehicleInfo;
+ } forEach _vehicles;
+
+ _garageData set ["vehicles", _vehicleList];
+ _control ctrlWebBrowserAction ["ExecJS", format ["handleGarageDataRequest(%1)", (toJSON _vehicleList)]];
+ };
+ case "STORE::VEHICLE": {
+ // Logic to store vehicle in garage
+ // This would typically involve saving the vehicle's state to a database or similar
+ };
+ case "RETRIEVE::VEHICLE": {
+ // Logic to retrieve vehicle from garage
+ // This would typically involve loading the vehicle's state from a database or similar
+ };
+ default {
+ diag_log text format ["[FORGE::Client::Garage::XEH_postInit] Unknown event: '%1'", _event];
+ };
+ };
+}] call CFUNC(addEventHandler);
\ No newline at end of file
diff --git a/addons/garage/stringtable.xml b/addons/garage/stringtable.xml
index 34a9773..3217e23 100644
--- a/addons/garage/stringtable.xml
+++ b/addons/garage/stringtable.xml
@@ -1,9 +1,6 @@
Transfer Money
- +
+
+
+
+
+
+
+
+
Transfer to Player
- +
+
+
+
+
+
+
+
+
Submit Timesheet
- +
+
+
+
+
+
+
+
+