Compare commits
No commits in common. "master" and "1.0.0.4" have entirely different histories.
405
.gitignore
vendored
405
.gitignore
vendored
@ -1,410 +1,5 @@
|
|||||||
## Ignore Visual Studio temporary files, build results, and
|
|
||||||
## files generated by popular Visual Studio add-ons.
|
|
||||||
##
|
|
||||||
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
|
|
||||||
|
|
||||||
# User-specific files
|
|
||||||
*.rsuser
|
|
||||||
*.suo
|
|
||||||
*.user
|
|
||||||
*.userosscache
|
|
||||||
*.sln.docstates
|
|
||||||
|
|
||||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
|
||||||
*.userprefs
|
|
||||||
|
|
||||||
# Mono auto generated files
|
|
||||||
mono_crash.*
|
|
||||||
|
|
||||||
# Build results
|
|
||||||
[Dd]ebug/
|
|
||||||
[Dd]ebugPublic/
|
|
||||||
[Rr]elease/
|
|
||||||
[Rr]eleases/
|
|
||||||
x64/
|
|
||||||
x86/
|
|
||||||
[Ww][Ii][Nn]32/
|
|
||||||
[Aa][Rr][Mm]/
|
|
||||||
[Aa][Rr][Mm]64/
|
|
||||||
bld/
|
|
||||||
[Bb]in/
|
|
||||||
[Oo]bj/
|
|
||||||
[Ll]og/
|
|
||||||
[Ll]ogs/
|
|
||||||
|
|
||||||
# Visual Studio 2015/2017 cache/options directory
|
|
||||||
.vs/
|
|
||||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
|
||||||
#wwwroot/
|
|
||||||
|
|
||||||
# Visual Studio 2017 auto generated files
|
|
||||||
Generated\ Files/
|
|
||||||
|
|
||||||
# MSTest test Results
|
|
||||||
[Tt]est[Rr]esult*/
|
|
||||||
[Bb]uild[Ll]og.*
|
|
||||||
|
|
||||||
# NUnit
|
|
||||||
*.VisualState.xml
|
|
||||||
TestResult.xml
|
|
||||||
nunit-*.xml
|
|
||||||
|
|
||||||
# Build Results of an ATL Project
|
|
||||||
[Dd]ebugPS/
|
|
||||||
[Rr]eleasePS/
|
|
||||||
dlldata.c
|
|
||||||
|
|
||||||
# Benchmark Results
|
|
||||||
BenchmarkDotNet.Artifacts/
|
|
||||||
|
|
||||||
# .NET Core
|
|
||||||
project.lock.json
|
|
||||||
project.fragment.lock.json
|
|
||||||
artifacts/
|
|
||||||
|
|
||||||
# ASP.NET Scaffolding
|
|
||||||
ScaffoldingReadMe.txt
|
|
||||||
|
|
||||||
# StyleCop
|
|
||||||
StyleCopReport.xml
|
|
||||||
|
|
||||||
# Files built by Visual Studio
|
|
||||||
*_i.c
|
|
||||||
*_p.c
|
|
||||||
*_h.h
|
|
||||||
*.ilk
|
|
||||||
*.meta
|
|
||||||
*.obj
|
|
||||||
*.iobj
|
|
||||||
*.pch
|
|
||||||
*.pdb
|
|
||||||
*.ipdb
|
|
||||||
*.pgc
|
|
||||||
*.pgd
|
|
||||||
*.rsp
|
|
||||||
*.sbr
|
|
||||||
*.tlb
|
|
||||||
*.tli
|
|
||||||
*.tlh
|
|
||||||
*.tmp
|
|
||||||
*.tmp_proj
|
|
||||||
*_wpftmp.csproj
|
|
||||||
*.log
|
|
||||||
*.tlog
|
|
||||||
*.vspscc
|
|
||||||
*.vssscc
|
|
||||||
.builds
|
|
||||||
*.pidb
|
|
||||||
*.svclog
|
|
||||||
*.scc
|
|
||||||
|
|
||||||
# Chutzpah Test files
|
|
||||||
_Chutzpah*
|
|
||||||
|
|
||||||
# Visual C++ cache files
|
|
||||||
ipch/
|
|
||||||
*.aps
|
|
||||||
*.ncb
|
|
||||||
*.opendb
|
|
||||||
*.opensdf
|
|
||||||
*.sdf
|
|
||||||
*.cachefile
|
|
||||||
*.VC.db
|
|
||||||
*.VC.VC.opendb
|
|
||||||
|
|
||||||
# Visual Studio profiler
|
|
||||||
*.psess
|
|
||||||
*.vsp
|
|
||||||
*.vspx
|
|
||||||
*.sap
|
|
||||||
|
|
||||||
# Visual Studio Trace Files
|
|
||||||
*.e2e
|
|
||||||
|
|
||||||
# TFS 2012 Local Workspace
|
|
||||||
$tf/
|
|
||||||
|
|
||||||
# Guidance Automation Toolkit
|
|
||||||
*.gpState
|
|
||||||
|
|
||||||
# ReSharper is a .NET coding add-in
|
|
||||||
_ReSharper*/
|
|
||||||
*.[Rr]e[Ss]harper
|
|
||||||
*.DotSettings.user
|
|
||||||
|
|
||||||
# TeamCity is a build add-in
|
|
||||||
_TeamCity*
|
|
||||||
|
|
||||||
# DotCover is a Code Coverage Tool
|
|
||||||
*.dotCover
|
|
||||||
|
|
||||||
# AxoCover is a Code Coverage Tool
|
|
||||||
.axoCover/*
|
|
||||||
!.axoCover/settings.json
|
|
||||||
|
|
||||||
# Coverlet is a free, cross platform Code Coverage Tool
|
|
||||||
coverage*.json
|
|
||||||
coverage*.xml
|
|
||||||
coverage*.info
|
|
||||||
|
|
||||||
# Visual Studio code coverage results
|
|
||||||
*.coverage
|
|
||||||
*.coveragexml
|
|
||||||
|
|
||||||
# NCrunch
|
|
||||||
_NCrunch_*
|
|
||||||
.*crunch*.local.xml
|
|
||||||
nCrunchTemp_*
|
|
||||||
|
|
||||||
# MightyMoose
|
|
||||||
*.mm.*
|
|
||||||
AutoTest.Net/
|
|
||||||
|
|
||||||
# Web workbench (sass)
|
|
||||||
.sass-cache/
|
|
||||||
|
|
||||||
# Installshield output folder
|
|
||||||
[Ee]xpress/
|
|
||||||
|
|
||||||
# DocProject is a documentation generator add-in
|
|
||||||
DocProject/buildhelp/
|
|
||||||
DocProject/Help/*.HxT
|
|
||||||
DocProject/Help/*.HxC
|
|
||||||
DocProject/Help/*.hhc
|
|
||||||
DocProject/Help/*.hhk
|
|
||||||
DocProject/Help/*.hhp
|
|
||||||
DocProject/Help/Html2
|
|
||||||
DocProject/Help/html
|
|
||||||
|
|
||||||
# Click-Once directory
|
|
||||||
publish/
|
|
||||||
|
|
||||||
# Publish Web Output
|
|
||||||
*.[Pp]ublish.xml
|
|
||||||
*.azurePubxml
|
|
||||||
# Note: Comment the next line if you want to checkin your web deploy settings,
|
|
||||||
# but database connection strings (with potential passwords) will be unencrypted
|
|
||||||
*.pubxml
|
|
||||||
*.publishproj
|
|
||||||
|
|
||||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
|
||||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
|
||||||
# in these scripts will be unencrypted
|
|
||||||
PublishScripts/
|
|
||||||
|
|
||||||
# NuGet Packages
|
|
||||||
*.nupkg
|
|
||||||
# NuGet Symbol Packages
|
|
||||||
*.snupkg
|
|
||||||
# The packages folder can be ignored because of Package Restore
|
|
||||||
**/[Pp]ackages/*
|
|
||||||
# except build/, which is used as an MSBuild target.
|
|
||||||
!**/[Pp]ackages/build/
|
|
||||||
# Uncomment if necessary however generally it will be regenerated when needed
|
|
||||||
#!**/[Pp]ackages/repositories.config
|
|
||||||
# NuGet v3's project.json files produces more ignorable files
|
|
||||||
*.nuget.props
|
|
||||||
*.nuget.targets
|
|
||||||
|
|
||||||
# Microsoft Azure Build Output
|
|
||||||
csx/
|
|
||||||
*.build.csdef
|
|
||||||
|
|
||||||
# Microsoft Azure Emulator
|
|
||||||
ecf/
|
|
||||||
rcf/
|
|
||||||
|
|
||||||
# Windows Store app package directories and files
|
|
||||||
AppPackages/
|
|
||||||
BundleArtifacts/
|
|
||||||
Package.StoreAssociation.xml
|
|
||||||
_pkginfo.txt
|
|
||||||
*.appx
|
|
||||||
*.appxbundle
|
|
||||||
*.appxupload
|
|
||||||
|
|
||||||
# Visual Studio cache files
|
|
||||||
# files ending in .cache can be ignored
|
|
||||||
*.[Cc]ache
|
|
||||||
# but keep track of directories ending in .cache
|
|
||||||
!?*.[Cc]ache/
|
|
||||||
|
|
||||||
# Others
|
|
||||||
ClientBin/
|
|
||||||
~$*
|
|
||||||
*~
|
|
||||||
*.dbmdl
|
|
||||||
*.dbproj.schemaview
|
|
||||||
*.jfm
|
|
||||||
*.pfx
|
|
||||||
*.publishsettings
|
|
||||||
orleans.codegen.cs
|
|
||||||
|
|
||||||
# Including strong name files can present a security risk
|
|
||||||
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
|
||||||
#*.snk
|
|
||||||
|
|
||||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
|
||||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
|
||||||
#bower_components/
|
|
||||||
|
|
||||||
# RIA/Silverlight projects
|
|
||||||
Generated_Code/
|
|
||||||
|
|
||||||
# Backup & report files from converting an old project file
|
|
||||||
# to a newer Visual Studio version. Backup files are not needed,
|
|
||||||
# because we have git ;-)
|
|
||||||
_UpgradeReport_Files/
|
|
||||||
Backup*/
|
|
||||||
UpgradeLog*.XML
|
|
||||||
UpgradeLog*.htm
|
|
||||||
ServiceFabricBackup/
|
|
||||||
*.rptproj.bak
|
|
||||||
|
|
||||||
# SQL Server files
|
|
||||||
*.mdf
|
|
||||||
*.ldf
|
|
||||||
*.ndf
|
|
||||||
|
|
||||||
# Business Intelligence projects
|
|
||||||
*.rdl.data
|
|
||||||
*.bim.layout
|
|
||||||
*.bim_*.settings
|
|
||||||
*.rptproj.rsuser
|
|
||||||
*- [Bb]ackup.rdl
|
|
||||||
*- [Bb]ackup ([0-9]).rdl
|
|
||||||
*- [Bb]ackup ([0-9][0-9]).rdl
|
|
||||||
|
|
||||||
# Microsoft Fakes
|
|
||||||
FakesAssemblies/
|
|
||||||
|
|
||||||
# GhostDoc plugin setting file
|
|
||||||
*.GhostDoc.xml
|
|
||||||
|
|
||||||
# Node.js Tools for Visual Studio
|
|
||||||
.ntvs_analysis.dat
|
|
||||||
node_modules/
|
|
||||||
|
|
||||||
# Visual Studio 6 build log
|
|
||||||
*.plg
|
|
||||||
|
|
||||||
# Visual Studio 6 workspace options file
|
|
||||||
*.opt
|
|
||||||
|
|
||||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
|
||||||
*.vbw
|
|
||||||
|
|
||||||
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
|
|
||||||
*.vbp
|
|
||||||
|
|
||||||
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
|
|
||||||
*.dsw
|
|
||||||
*.dsp
|
|
||||||
|
|
||||||
# Visual Studio 6 technical files
|
|
||||||
*.ncb
|
|
||||||
*.aps
|
|
||||||
|
|
||||||
# Visual Studio LightSwitch build output
|
|
||||||
**/*.HTMLClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/ModelManifest.xml
|
|
||||||
**/*.Server/GeneratedArtifacts
|
|
||||||
**/*.Server/ModelManifest.xml
|
|
||||||
_Pvt_Extensions
|
|
||||||
|
|
||||||
# Paket dependency manager
|
|
||||||
.paket/paket.exe
|
|
||||||
paket-files/
|
|
||||||
|
|
||||||
# FAKE - F# Make
|
|
||||||
.fake/
|
|
||||||
|
|
||||||
# CodeRush personal settings
|
|
||||||
.cr/personal
|
|
||||||
|
|
||||||
# Python Tools for Visual Studio (PTVS)
|
|
||||||
__pycache__/
|
|
||||||
*.pyc
|
|
||||||
|
|
||||||
# Cake - Uncomment if you are using it
|
|
||||||
# tools/**
|
|
||||||
# !tools/packages.config
|
|
||||||
|
|
||||||
# Tabs Studio
|
|
||||||
*.tss
|
|
||||||
|
|
||||||
# Telerik's JustMock configuration file
|
|
||||||
*.jmconfig
|
|
||||||
|
|
||||||
# BizTalk build output
|
|
||||||
*.btp.cs
|
|
||||||
*.btm.cs
|
|
||||||
*.odx.cs
|
|
||||||
*.xsd.cs
|
|
||||||
|
|
||||||
# OpenCover UI analysis results
|
|
||||||
OpenCover/
|
|
||||||
|
|
||||||
# Azure Stream Analytics local run output
|
|
||||||
ASALocalRun/
|
|
||||||
|
|
||||||
# MSBuild Binary and Structured Log
|
|
||||||
*.binlog
|
|
||||||
|
|
||||||
# NVidia Nsight GPU debugger configuration file
|
|
||||||
*.nvuser
|
|
||||||
|
|
||||||
# MFractors (Xamarin productivity tool) working folder
|
|
||||||
.mfractor/
|
|
||||||
|
|
||||||
# Local History for Visual Studio
|
|
||||||
.localhistory/
|
|
||||||
|
|
||||||
# Visual Studio History (VSHistory) files
|
|
||||||
.vshistory/
|
|
||||||
|
|
||||||
# BeatPulse healthcheck temp database
|
|
||||||
healthchecksdb
|
|
||||||
|
|
||||||
# Backup folder for Package Reference Convert tool in Visual Studio 2017
|
|
||||||
MigrationBackup/
|
|
||||||
|
|
||||||
# Ionide (cross platform F# VS Code tools) working folder
|
|
||||||
.ionide/
|
|
||||||
|
|
||||||
# Fody - auto-generated XML schema
|
|
||||||
FodyWeavers.xsd
|
|
||||||
|
|
||||||
# VS Code files for those working on multiple tools
|
|
||||||
.vscode/*
|
|
||||||
!.vscode/settings.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/extensions.json
|
|
||||||
*.code-workspace
|
|
||||||
|
|
||||||
# Local History for Visual Studio Code
|
|
||||||
.history/
|
|
||||||
|
|
||||||
# Windows Installer files from build outputs
|
|
||||||
*.cab
|
|
||||||
*.msi
|
|
||||||
*.msix
|
|
||||||
*.msm
|
|
||||||
*.msp
|
|
||||||
|
|
||||||
# JetBrains Rider
|
|
||||||
*.sln.iml
|
|
||||||
|
|
||||||
# Hemtt
|
|
||||||
*.pbo
|
*.pbo
|
||||||
.hemttout
|
.hemttout
|
||||||
hemtt
|
hemtt
|
||||||
hemtt.exe
|
hemtt.exe
|
||||||
*.biprivatekey
|
*.biprivatekey
|
||||||
|
|
||||||
|
|
||||||
# Added by cargo
|
|
||||||
|
|
||||||
/target
|
|
||||||
@ -1,3 +1 @@
|
|||||||
PREP(initAdmin);
|
PREP(initAdmin);
|
||||||
PREP(initAdminStore);
|
|
||||||
PREP(verifyAdminStore);
|
|
||||||
@ -1,56 +1,3 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
call FUNC(initAdmin);
|
call FUNC(initAdmin);
|
||||||
call FUNC(initAdminStore);
|
|
||||||
|
|
||||||
[QGVAR(handleEvents), {
|
|
||||||
params ["_event", "_data"];
|
|
||||||
|
|
||||||
diag_log format ["[FORGE::Server::Admin::XEH_preInit] Received event: %1 with data: %2", _event, _data];
|
|
||||||
|
|
||||||
switch (_event) do {
|
|
||||||
case "ADMIN::ADVANCE::ALL": {
|
|
||||||
private _adminStore = call FUNC(verifyAdminStore);
|
|
||||||
_data params [["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_amount isEqualTo 0) exitWith { diag_log "[FORGE::Server::Admin::XEH_preInit::advanceAll] Invalid amount!"; };
|
|
||||||
|
|
||||||
_adminStore call ["handleTransfer", ["advanceAll", _amount]];
|
|
||||||
};
|
|
||||||
case "ADMIN::PAYDAY": {
|
|
||||||
private _adminStore = call FUNC(verifyAdminStore);
|
|
||||||
|
|
||||||
_adminStore call ["handleTransfer", ["payday"]];
|
|
||||||
};
|
|
||||||
case "ADMIN::TRANSFER": {
|
|
||||||
private _adminStore = call FUNC(verifyAdminStore);
|
|
||||||
_data params [["_condition", "", [""]], ["_amount", 0, [0]], ["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_condition isEqualTo "" || _amount isEqualTo 0 || _uid isEqualTo "") exitWith { diag_log "[FORGE::Server::Admin::XEH_preInit::handleTransfer] Invalid condition, amount, or UID!"; };
|
|
||||||
|
|
||||||
_adminStore call ["handleTransfer", [_condition, _amount, _uid]];
|
|
||||||
};
|
|
||||||
case "ADMIN::SEND::MESSAGE": {
|
|
||||||
private _adminStore = call FUNC(verifyAdminStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_message", "", [""]]];
|
|
||||||
|
|
||||||
if (_message isEqualTo "") exitWith { diag_log "[FORGE::Server::Admin::XEH_preInit::sendMessage] Invalid message!"; };
|
|
||||||
if (_uid isEqualTo "") then {
|
|
||||||
_adminStore call ["broadcastMessage", [_message]];
|
|
||||||
} else {
|
|
||||||
_adminStore call ["sendMessage", [_uid, _message]];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
case "ADMIN::UPDATE::PAYGRADE": {
|
|
||||||
private _adminStore = call FUNC(verifyAdminStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_paygrade", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _paygrade isEqualTo "") exitWith { diag_log "[FORGE::Server::Admin::XEH_preInit::updatePaygrade] Invalid UID or paygrade!"; };
|
|
||||||
|
|
||||||
_adminStore call ["updatePaygrade", [_uid, _paygrade]];
|
|
||||||
};
|
|
||||||
default {
|
|
||||||
diag_log format ["[FORGE::Server::Admin::XEH_preInit] Unknown event: %1 with data: %2", _event, _data];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}] call CFUNC(addEventHandler);
|
|
||||||
@ -13,6 +13,6 @@
|
|||||||
_cpof allowDamage false;
|
_cpof allowDamage false;
|
||||||
_cpof setVariable ["isCPOF", true, true];
|
_cpof setVariable ["isCPOF", true, true];
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Server::Admin::initAdmin] ClassName: '%1' Pos: '%2' Dir: '%3'", _className, _pos, _dir];
|
diag_log text format ["[FORGE Admin] ClassName: '%1' Pos: '%2' Dir: '%3'", _className, _pos, _dir];
|
||||||
|
|
||||||
} forEach ("true" configClasses (missionConfigFile >> "CfgCpofs" >> "cpofs"));
|
} forEach ("true" configClasses (missionConfigFile >> "CfgCpofs" >> "cpofs"));
|
||||||
@ -1,119 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: forge_server_admin_fnc_initAdminStore
|
|
||||||
* Author: IDSolutions
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Initializes a server-side admin store interface for managing admin operations
|
|
||||||
* Provides CRUD operations for admin data, including database persistence through ArmaDragonflyClient
|
|
||||||
*
|
|
||||||
* Creates a hashMap object with methods for:
|
|
||||||
* - Sending messages to players
|
|
||||||
* - Managing player data
|
|
||||||
* - Performing administrative tasks
|
|
||||||
*
|
|
||||||
* Returns: <HASHMAP>
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* private _adminStore = call forge_server_admin_fnc_initAdminStore;
|
|
||||||
* _adminStore call ["sendMessage", [getPlayerUID player, "Hello, this is a test message"]];
|
|
||||||
*/
|
|
||||||
|
|
||||||
private _adminStore = createHashMapObject [[
|
|
||||||
["#type", "IAdminStore"],
|
|
||||||
["broadcastMessage", {
|
|
||||||
params ["_message"];
|
|
||||||
|
|
||||||
[format ["Incoming Message from Field Commander: <br/>%1", _message], "warning", 5] remoteExec ["forge_client_misc_fnc_notify", 0];
|
|
||||||
}],
|
|
||||||
["sendMessage", {
|
|
||||||
params ["_uid", "_message"];
|
|
||||||
private _target = objNull;
|
|
||||||
|
|
||||||
{
|
|
||||||
if (getPlayerUID _x == _uid) exitWith { _target = _x; };
|
|
||||||
} forEach allPlayers;
|
|
||||||
|
|
||||||
if (!isNull _target) then {
|
|
||||||
[format ["Incoming Message from Field Commander: <br/>%1", _message], "warning", 5] remoteExec ["forge_client_misc_fnc_notify", _target];
|
|
||||||
};
|
|
||||||
}],
|
|
||||||
["updatePaygrade", {
|
|
||||||
params ["_uid", "_paygrade"];
|
|
||||||
private _target = objNull;
|
|
||||||
|
|
||||||
{
|
|
||||||
if (getPlayerUID _x == _uid) exitWith { _target = _x; };
|
|
||||||
} forEach allPlayers;
|
|
||||||
|
|
||||||
if (!isNull _target) then { SETPVAR(_target,FORGE_PayGrade,_paygrade); };
|
|
||||||
}],
|
|
||||||
["handleTransfer", {
|
|
||||||
params ["_condition", "_amount", "_uid"];
|
|
||||||
|
|
||||||
switch (_condition) do {
|
|
||||||
case ("advance"): {
|
|
||||||
private _target = objNull;
|
|
||||||
|
|
||||||
{
|
|
||||||
if (getPlayerUID _x == _uid) exitWith { _target = _x; };
|
|
||||||
} forEach allPlayers;
|
|
||||||
|
|
||||||
if (isNull _target) exitWith {};
|
|
||||||
|
|
||||||
private _bank = GETVAR(_target,FORGE_Bank,0);
|
|
||||||
private _newBalance = _bank + _amount;
|
|
||||||
|
|
||||||
SETPVAR(_target,FORGE_Bank,_newBalance);
|
|
||||||
};
|
|
||||||
case ("advanceAll"): {
|
|
||||||
{
|
|
||||||
private _player = _x;
|
|
||||||
private _bank = GETVAR(_player,FORGE_Bank,0);
|
|
||||||
private _newBalance = _bank + _amount;
|
|
||||||
|
|
||||||
SETPVAR(_player,FORGE_Bank,_newBalance);
|
|
||||||
} forEach allPlayers;
|
|
||||||
};
|
|
||||||
case ("deduct"): {
|
|
||||||
private _target = objNull;
|
|
||||||
|
|
||||||
{
|
|
||||||
if (getPlayerUID _x == _uid) exitWith { _target = _x; };
|
|
||||||
} forEach allPlayers;
|
|
||||||
|
|
||||||
if (isNull _target) exitWith {};
|
|
||||||
|
|
||||||
private _bank = GETVAR(_target,FORGE_Bank,0);
|
|
||||||
private _newBalance = _bank - _amount;
|
|
||||||
|
|
||||||
if (_newBalance < 0) then { _newBalance = 0; };
|
|
||||||
|
|
||||||
SETPVAR(_target,FORGE_Bank,_newBalance);
|
|
||||||
};
|
|
||||||
case ("payday"): {
|
|
||||||
private _payGrades = (missionConfigFile >> "CfgPaygrades" >> "payGrades") call BIS_fnc_getCfgData;
|
|
||||||
|
|
||||||
{
|
|
||||||
private _player = _x;
|
|
||||||
private _payGrade = GETVAR(_player,FORGE_PayGrade,nil);
|
|
||||||
|
|
||||||
{
|
|
||||||
_x params ["_payGradeIndex", "_payGradeBonus"];
|
|
||||||
|
|
||||||
if (_payGradeIndex == _payGrade) then {
|
|
||||||
private _bank = GETVAR(_player,FORGE_Bank,0);
|
|
||||||
private _newBalance = _bank + _payGradeBonus;
|
|
||||||
|
|
||||||
SETPVAR(_player,FORGE_Bank,_newBalance);
|
|
||||||
};
|
|
||||||
} forEach _payGrades;
|
|
||||||
} forEach allPlayers;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}]
|
|
||||||
]];
|
|
||||||
|
|
||||||
SETMVAR(FORGE_ADMIN_STORE_REG,_adminStore);
|
|
||||||
GETMVAR(FORGE_ADMIN_STORE_REG,_adminStore);
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: forge_server_admin_fnc_verifyAdminStore
|
|
||||||
* Author: IDSolutions
|
|
||||||
*
|
|
||||||
* [Description]
|
|
||||||
* Ensures the admin store is initialized and returns the store object.
|
|
||||||
* Acts as a singleton accessor for the admin store interface.
|
|
||||||
* If the store doesn't exist yet, it initializes it first.
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* None
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* Admin Store <OBJECT> - The admin store interface object
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* private _adminStore = call forge_server_admin_fnc_verifyAdminStore
|
|
||||||
*
|
|
||||||
* Public: No
|
|
||||||
*/
|
|
||||||
|
|
||||||
private _store = GETMVAR(FORGE_ADMIN_STORE_REG,nil);
|
|
||||||
|
|
||||||
if (isNil "_store") then {
|
|
||||||
_store = call FUNC(initAdminStore);
|
|
||||||
|
|
||||||
diag_log text "[FORGE::Server::Admin::verifyAdminStore] Admin store initialized";
|
|
||||||
};
|
|
||||||
|
|
||||||
_store
|
|
||||||
@ -1,3 +1 @@
|
|||||||
PREP(initBank);
|
PREP(initBank);
|
||||||
PREP(initBankStore);
|
|
||||||
PREP(verifyBankStore);
|
|
||||||
@ -1,78 +1,3 @@
|
|||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
call FUNC(initBank);
|
call FUNC(initBank);
|
||||||
call FUNC(initBankStore);
|
|
||||||
|
|
||||||
[QGVAR(handleEvents), {
|
|
||||||
params ["_event", "_data"];
|
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Server::Bank::XEH_preInit] Received event: '%1' with data: '%2'", _event, _data];
|
|
||||||
|
|
||||||
switch (_event) do {
|
|
||||||
case "BANK::DEPOSIT": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _amount isEqualTo 0) exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleDeposit] Invalid UID and amount, UID cannot be empty and amount must be greater than 0!"; };
|
|
||||||
|
|
||||||
_bankStore call ["deposit", [_uid, _amount]];
|
|
||||||
};
|
|
||||||
case "BANK::SUBMIT::TIMESHEET": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_rating", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _rating <= 0) exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleSubmitTimesheet] Invalid UID, UID cannot be empty!"; };
|
|
||||||
|
|
||||||
_bankStore call ["submitTimesheet", [_uid, _rating]];
|
|
||||||
};
|
|
||||||
case "BANK::TRANSFER": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_fromUid", "", [""]], ["_toUid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_fromUid isEqualTo "" || _toUid isEqualTo "" || _amount isEqualTo 0) exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleTransfer] Invalid UIDs and amount, UID cannot be empty and amount must be greater than 0!"; };
|
|
||||||
|
|
||||||
_bankStore call ["transfer", [_fromUid, _toUid, _amount]];
|
|
||||||
};
|
|
||||||
case "BANK::WITHDRAW": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _amount isEqualTo 0) exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleWithdraw] Invalid UID and amount!"; };
|
|
||||||
|
|
||||||
_bankStore call ["withdraw", [_uid, _amount]];
|
|
||||||
};
|
|
||||||
case "BANK::GET::BALANCE": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleGetBalance] Invalid UID, UID cannot be empty!"; };
|
|
||||||
|
|
||||||
_bankStore call ["getBalance", [_uid]];
|
|
||||||
};
|
|
||||||
case "BANK::GET::CASH": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handleGetCash] Invalid UID, UID cannot be empty!"; };
|
|
||||||
|
|
||||||
_bankStore call ["getCash", [_uid]];
|
|
||||||
};
|
|
||||||
case "BANK::HANDLE::PLAYER::LOAD": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_bankValue", 0, [0]], ["_cashValue", 0, [0]], ["_ratingValue", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { diag_log "[FORGE::Server::Bank::XEH_preInit::handlePlayerLoad] Invalid UID, UID cannot be empty!"; };
|
|
||||||
|
|
||||||
_bankStore call ["handlePlayerLoad", [_uid, _bankValue, _cashValue, _ratingValue]];
|
|
||||||
};
|
|
||||||
case "BANK::GET::TRANSACTION::HISTORY": {
|
|
||||||
private _bankStore = call FUNC(verifyBankStore);
|
|
||||||
_data params [["_uid", "", [""]], ["_limit", 10, [0]]];
|
|
||||||
|
|
||||||
_bankStore call ["getTransactionHistory", [_uid, _limit]];
|
|
||||||
};
|
|
||||||
default {
|
|
||||||
diag_log format ["[FORGE::Server::Bank::XEH_preInit] Unknown event: %1 with data: %2", _event, _data];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}] call CFUNC(addEventHandler);
|
|
||||||
@ -26,5 +26,5 @@
|
|||||||
_bank setVariable ["BIS_enableRandomization", false];
|
_bank setVariable ["BIS_enableRandomization", false];
|
||||||
};
|
};
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Server::Bank::initBank] ClassName: '%1' Pos: '%2' Dir: '%3'", _className, _pos, _dir];
|
diag_log text format ["[FORGE Bank] ClassName: '%1' Pos: '%2' Dir: '%3'", _className, _pos, _dir];
|
||||||
} forEach ("true" configClasses (missionConfigFile >> "CfgBanks" >> "banks"));
|
} forEach ("true" configClasses (missionConfigFile >> "CfgBanks" >> "banks"));
|
||||||
@ -1,227 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Author: IDSolutions
|
|
||||||
* Initializes a server-side bank store interface for managing banking operations.
|
|
||||||
* Provides CRUD operations for bank data, including database persistence.
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* None
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* <HASHMAP> Bank store object
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* private _bankStore = call forge_server_bank_fnc_initBank;
|
|
||||||
* _bankStore call ["deposit", [getPlayerUID player, 1000]];
|
|
||||||
*
|
|
||||||
* Public: Yes
|
|
||||||
*/
|
|
||||||
|
|
||||||
private _bankStore = createHashMapObject [[
|
|
||||||
["#type", "IBankStore"],
|
|
||||||
["#create", {
|
|
||||||
_self set ["accounts", createHashMap];
|
|
||||||
_self set ["transactions", []];
|
|
||||||
_self set ["isLoaded", true];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["handlePlayerLoad", {
|
|
||||||
params [["_uid", "", [""]], ["_bankValue", 0, [0]], ["_cashValue", 0, [0]], ["_ratingValue", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { false };
|
|
||||||
|
|
||||||
_self call ["updateAccount", [_uid, _bankValue, _cashValue, _ratingValue]];
|
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Server::Bank::Store::handlePlayerLoad] Loaded player data for '%1' - Bank: '%2', Cash: '%3', Rating: '%4'", _uid, _bankValue, _cashValue, _ratingValue];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["updateAccount", {
|
|
||||||
params [["_uid", "", [""]], ["_bankValue", 0, [0]], ["_cashValue", 0, [0]], ["_ratingValue", 0, [0]], ["_isSave", false, [false]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { false };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
private _player = [_uid] call EFUNC(misc,getPlayer);
|
|
||||||
|
|
||||||
_account set ["bank", _bankValue];
|
|
||||||
_account set ["cash", _cashValue];
|
|
||||||
_account set ["rating", _ratingValue];
|
|
||||||
|
|
||||||
_accounts set [_uid, _account];
|
|
||||||
_self set ["accounts", _accounts];
|
|
||||||
|
|
||||||
private _balance = _account getOrDefault ["bank", 0];
|
|
||||||
private _cash = _account getOrDefault ["cash", 0];
|
|
||||||
|
|
||||||
SETPVAR(_player,FORGE_Bank,_balance);
|
|
||||||
SETPVAR(_player,FORGE_Cash,_cash);
|
|
||||||
SETPVAR(_player,FORGE_Rating,_ratingValue);
|
|
||||||
|
|
||||||
if (_isSave) then {
|
|
||||||
["hsetid", _uid, "bank", -1, [_bankValue]] call dragonfly_db_fnc_addTask;
|
|
||||||
["hsetid", _uid, "cash", -1, [_cashValue]] call dragonfly_db_fnc_addTask;
|
|
||||||
["hsetid", _uid, "reputation", -1, [_ratingValue]] call dragonfly_db_fnc_addTask;
|
|
||||||
};
|
|
||||||
|
|
||||||
diag_log text format ["[FORGE::Server::Bank::Store::updateAccount] Updated player data for '%1' - Bank: '%2', Cash: '%3', Rating: '%4'", _uid, _bankValue, _cashValue, _ratingValue];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["getBalance", {
|
|
||||||
params [["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { 0 };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
|
|
||||||
_account getOrDefault ["bank", 0]
|
|
||||||
}],
|
|
||||||
["getCash", {
|
|
||||||
params [["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { 0 };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
|
|
||||||
_account getOrDefault ["cash", 0]
|
|
||||||
}],
|
|
||||||
["getRating", {
|
|
||||||
params [["_uid", "", [""]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") exitWith { 0 };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
|
|
||||||
_account getOrDefault ["rating", 0]
|
|
||||||
}],
|
|
||||||
["deposit", {
|
|
||||||
params [["_uid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _amount <= 0) exitWith { false };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
private _currentCash = _account getOrDefault ["cash", 0];
|
|
||||||
private _currentBalance = _account getOrDefault ["bank", 0];
|
|
||||||
private _currentRating = _account getOrDefault ["rating", 0];
|
|
||||||
|
|
||||||
if (_currentCash < _amount) exitWith { false };
|
|
||||||
|
|
||||||
private _newBalance = _currentBalance + _amount;
|
|
||||||
private _newCash = _currentCash - _amount;
|
|
||||||
|
|
||||||
_self call ["updateAccount", [_uid, _newBalance, _newCash, _currentRating, true]];
|
|
||||||
|
|
||||||
private _transactions = _self get "transactions";
|
|
||||||
|
|
||||||
_transactions pushBack [_uid, "deposit", _amount, time];
|
|
||||||
_self set ["transactions", _transactions];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["submitTimesheet", {
|
|
||||||
params [["_uid", "", [""]], ["_rating", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _rating <= 0) exitWith { false };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
private _currentBalance = _account getOrDefault ["bank", 0];
|
|
||||||
private _currentCash = _account getOrDefault ["cash", 0];
|
|
||||||
|
|
||||||
private _payMultiplyer = "MULTIPLYR" call BFUNC(getParamValue);
|
|
||||||
private _multiplyer = _rating * _payMultiplyer;
|
|
||||||
private _newBalance = _currentBalance + _multiplyer;
|
|
||||||
|
|
||||||
_self call ["updateAccount", [_uid, _newBalance, _currentCash, 0, true]];
|
|
||||||
|
|
||||||
private _transactions = _self get "transactions";
|
|
||||||
|
|
||||||
_transactions pushBack [_uid, "timesheet", _multiplyer, time];
|
|
||||||
_self set ["transactions", _transactions];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["transfer", {
|
|
||||||
params [["_fromUid", "", [""]], ["_toUid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_fromUid isEqualTo "" || _toUid isEqualTo "" || _amount <= 0) exitWith { false };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _fromAccount = _accounts getOrDefault [_fromUid, createHashMap];
|
|
||||||
private _toAccount = _accounts getOrDefault [_toUid, createHashMap];
|
|
||||||
private _fromBalance = _fromAccount getOrDefault ["bank", 0];
|
|
||||||
private _toBalance = _toAccount getOrDefault ["bank", 0];
|
|
||||||
private _fromCash = _fromAccount getOrDefault ["cash", 0];
|
|
||||||
private _toCash = _toAccount getOrDefault ["cash", 0];
|
|
||||||
private _fromRating = _fromAccount getOrDefault ["rating", 0];
|
|
||||||
private _toRating = _toAccount getOrDefault ["rating", 0];
|
|
||||||
|
|
||||||
if (_fromBalance < _amount) exitWith { false };
|
|
||||||
|
|
||||||
_self call ["updateAccount", [_fromUid, _fromBalance - _amount, _fromCash, _fromRating, true]];
|
|
||||||
_self call ["updateAccount", [_toUid, _toBalance + _amount, _toCash, _toRating, true]];
|
|
||||||
|
|
||||||
private _transactions = _self get "transactions";
|
|
||||||
|
|
||||||
_transactions pushBack [_fromUid, "transfer_out", _amount, time, _toUid];
|
|
||||||
_transactions pushBack [_toUid, "transfer_in", _amount, time, _fromUid];
|
|
||||||
_self set ["transactions", _transactions];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["withdraw", {
|
|
||||||
params [["_uid", "", [""]], ["_amount", 0, [0]]];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "" || _amount <= 0) exitWith { false };
|
|
||||||
|
|
||||||
private _accounts = _self get "accounts";
|
|
||||||
private _account = _accounts getOrDefault [_uid, createHashMap];
|
|
||||||
private _currentBalance = _account getOrDefault ["bank", 0];
|
|
||||||
private _currentCash = _account getOrDefault ["cash", 0];
|
|
||||||
private _currentRating = _account getOrDefault ["rating", 0];
|
|
||||||
|
|
||||||
if (_currentBalance < _amount) exitWith { false };
|
|
||||||
|
|
||||||
private _newBalance = _currentBalance - _amount;
|
|
||||||
private _newCash = _currentCash + _amount;
|
|
||||||
|
|
||||||
_self call ["updateAccount", [_uid, _newBalance, _newCash, _currentRating, true]];
|
|
||||||
|
|
||||||
private _transactions = _self get "transactions";
|
|
||||||
|
|
||||||
_transactions pushBack [_uid, "withdraw", _amount, time];
|
|
||||||
_self set ["transactions", _transactions];
|
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
|
||||||
["getTransactionHistory", {
|
|
||||||
params [["_uid", "", [""]], ["_limit", 10, [0]]];
|
|
||||||
|
|
||||||
private _transactions = _self get "transactions";
|
|
||||||
private _filteredTransactions = [];
|
|
||||||
|
|
||||||
if (_uid isEqualTo "") then {
|
|
||||||
_filteredTransactions = _transactions;
|
|
||||||
} else {
|
|
||||||
{
|
|
||||||
if ((_x select 0) == _uid) then { _filteredTransactions pushBack _x; };
|
|
||||||
} forEach _transactions;
|
|
||||||
};
|
|
||||||
|
|
||||||
_filteredTransactions sort false;
|
|
||||||
_filteredTransactions resize (_limit min (count _filteredTransactions));
|
|
||||||
|
|
||||||
_filteredTransactions
|
|
||||||
}]
|
|
||||||
]];
|
|
||||||
|
|
||||||
SETMVAR(FORGE_BANK_STORE_REG,_bankStore);
|
|
||||||
GETMVAR(FORGE_BANK_STORE_REG,_bankStore);
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: forge_server_bank_fnc_verifyBankStore
|
|
||||||
* Author: IDSolutions
|
|
||||||
*
|
|
||||||
* [Description]
|
|
||||||
* Ensures the bank store is initialized and returns the store object.
|
|
||||||
* Acts as a singleton accessor for the bank store interface.
|
|
||||||
* If the store doesn't exist yet, it initializes it first.
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* None
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* Bank Store <OBJECT> - The bank store interface object
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* private _bankStore = call forge_server_bank_fnc_verifyBankStore
|
|
||||||
*
|
|
||||||
* Public: No
|
|
||||||
*/
|
|
||||||
|
|
||||||
private _store = GETMVAR(FORGE_BANK_STORE_REG,nil);
|
|
||||||
|
|
||||||
if (isNil "_store") then {
|
|
||||||
_store = call FUNC(initBankStore);
|
|
||||||
|
|
||||||
diag_log text "[FORGE::Server::Bank::verifyBankStore] Bank store initialized";
|
|
||||||
};
|
|
||||||
|
|
||||||
_store
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
|
PREP(createStore);
|
||||||
|
PREP(getFromStore);
|
||||||
|
PREP(getStore);
|
||||||
PREP(initDB);
|
PREP(initDB);
|
||||||
PREP(loadFromMission);
|
PREP(loadFromMission);
|
||||||
PREP(loadFromProfile);
|
PREP(loadFromProfile);
|
||||||
PREP(loadFromTemp);
|
|
||||||
PREP(loadGameState);
|
PREP(loadGameState);
|
||||||
PREP(loadPlayerState);
|
|
||||||
PREP(processDBRequest);
|
|
||||||
PREP(saveGameState);
|
PREP(saveGameState);
|
||||||
PREP(saveToMission);
|
PREP(saveToMission);
|
||||||
PREP(saveToProfile);
|
PREP(saveToProfile);
|
||||||
|
PREP(saveToStore);
|
||||||
PREP(saveToTemp);
|
PREP(saveToTemp);
|
||||||
PREP(verifyDB);
|
PREP(verifyDB);
|
||||||
@ -5,15 +5,29 @@ PREP_RECOMPILE_START;
|
|||||||
#include "XEH_PREP.hpp"
|
#include "XEH_PREP.hpp"
|
||||||
PREP_RECOMPILE_END;
|
PREP_RECOMPILE_END;
|
||||||
|
|
||||||
SETMVAR(FORGE_STORE_REG,createHashMap);
|
GVAR(playerOwners) = createHashMap;
|
||||||
|
GVAR(tempStores) = createHashMap;
|
||||||
|
|
||||||
// Process database requests
|
// Process database requests
|
||||||
["forge_db_request", {
|
["forge_db_request", {
|
||||||
params ["_playerUID", "_type", "_name", "_key", "_keyField", "_data", "_requestID"];
|
params ["_playerUID", "_requestType", "_data", "_requestID"];
|
||||||
|
|
||||||
private _result = [_type, _name, _key, _keyField, _data] call FUNC(processDBRequest);
|
TRACE_4("DB Request",_playerUID,_requestType,_data,_requestID);
|
||||||
|
|
||||||
["forge_db_response", [_playerUID, _type, _result, _requestID]] call CBA_fnc_globalEvent;
|
private _result = [_requestType, _data] call FUNC(processDBRequest);
|
||||||
|
["forge_db_response", [_playerUID, _requestType, _result, _requestID]] call CBA_fnc_globalEvent;
|
||||||
}] call CBA_fnc_addEventHandler;
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
|
// Register clients for direct messaging
|
||||||
|
["forge_db_registerClient", {
|
||||||
|
params ["_playerUID", "_ownerID"];
|
||||||
|
GVAR(playerOwners) set [_playerUID, _ownerID];
|
||||||
|
}] call CBA_fnc_addEventHandler;
|
||||||
|
|
||||||
|
// Clean up on disconnect
|
||||||
|
addMissionEventHandler ["PlayerDisconnected", {
|
||||||
|
params ["_id", "_uid", "_name", "_jip", "_owner"];
|
||||||
|
GVAR(playerOwners) deleteAt _uid;
|
||||||
|
}];
|
||||||
|
|
||||||
ADDON = true;
|
ADDON = true;
|
||||||
26
addons/db/functions/fnc_createStore.sqf
Normal file
26
addons/db/functions/fnc_createStore.sqf
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#include "..\script_component.hpp"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function: forge_server_db_fnc_createStore
|
||||||
|
* Author: J. Schmidt
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Creates a new collection in the database
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: _name - Store name <STRING>
|
||||||
|
* 1: _schema - Store schema <ARRAY>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* Store object or nil if failed
|
||||||
|
*/
|
||||||
|
|
||||||
|
params [["_name", "", [""]], ["_schema", [], [[]]]];
|
||||||
|
|
||||||
|
if (_name isEqualTo "") exitWith {
|
||||||
|
ERROR_MSG("Store name cannot be empty");
|
||||||
|
nil
|
||||||
|
};
|
||||||
|
|
||||||
|
private _database = call FUNC(verifyDB);
|
||||||
|
_database call ["createStore", [_name, _schema]]
|
||||||
39
addons/db/functions/fnc_getFromStore.sqf
Normal file
39
addons/db/functions/fnc_getFromStore.sqf
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
#include "..\script_component.hpp"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function: forge_server_db_fnc_getFromStore
|
||||||
|
* Author: J. Schmidt
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Retrieves data from a store
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: _name - Store name <STRING>
|
||||||
|
* 1: _key - Key to retrieve (Optional, get entire store if empty) <STRING>
|
||||||
|
* 2: _default - Default value if key not found <ANY>
|
||||||
|
* 3: _namespace - Namespace to use (Optional, default: missionNamespace) <NAMESPACE>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* Retrieved data or default value
|
||||||
|
*/
|
||||||
|
|
||||||
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
|
["_key", "", [""]],
|
||||||
|
["_default", nil],
|
||||||
|
["_namespace", missionNamespace, [missionNamespace]]
|
||||||
|
];
|
||||||
|
|
||||||
|
if (_name isEqualTo "") exitWith {
|
||||||
|
ERROR_MSG_1("Invalid store name: %1",_name);
|
||||||
|
_default
|
||||||
|
};
|
||||||
|
|
||||||
|
private _stores = _namespace getVariable [QGVAR(stores), createHashMap];
|
||||||
|
private _store = _stores getOrDefault [_name, createHashMap];
|
||||||
|
|
||||||
|
if (_key isEqualTo "") then {
|
||||||
|
_store
|
||||||
|
} else {
|
||||||
|
_store getOrDefault [_key, _default]
|
||||||
|
}
|
||||||
25
addons/db/functions/fnc_getStore.sqf
Normal file
25
addons/db/functions/fnc_getStore.sqf
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
#include "..\script_component.hpp"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function: forge_server_db_fnc_getStore
|
||||||
|
* Author: J. Schmidt
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Retrieves a store from the database
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: _name - Store name <STRING>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* Store object or nil if not found
|
||||||
|
*/
|
||||||
|
|
||||||
|
params [["_name", "", [""]]];
|
||||||
|
|
||||||
|
if (_name isEqualTo "") exitWith {
|
||||||
|
ERROR_MSG("Store name cannot be empty");
|
||||||
|
nil
|
||||||
|
};
|
||||||
|
|
||||||
|
private _database = GETMVAR(GVAR(store),nil);
|
||||||
|
_database call ["getStore", [_name]]
|
||||||
@ -19,208 +19,80 @@ private _storeInterface = createHashMapObject [[
|
|||||||
["#create", {
|
["#create", {
|
||||||
private _storeRegistry = GETVAR(profileNamespace,FORGE_STORE_REG,createHashMap);
|
private _storeRegistry = GETVAR(profileNamespace,FORGE_STORE_REG,createHashMap);
|
||||||
_self set ["stores", _storeRegistry];
|
_self set ["stores", _storeRegistry];
|
||||||
|
|
||||||
true
|
|
||||||
}],
|
}],
|
||||||
["_create", {
|
["createStore", {
|
||||||
params [["_name", "", [""]]];
|
params [["_name", "", [""]]];
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
if (_name == "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
||||||
|
|
||||||
private _stores = _self get "stores";
|
private _stores = _self get "stores";
|
||||||
|
private _store = _stores getOrDefault [_name, nil];
|
||||||
|
|
||||||
|
if !(isNil "_store") exitWith { _store };
|
||||||
|
|
||||||
private _store = createHashMap;
|
private _store = createHashMap;
|
||||||
|
|
||||||
_stores set [_name, _store];
|
_stores set [_name, _store];
|
||||||
_store
|
_store
|
||||||
}],
|
}],
|
||||||
["_read", {
|
["getStore", {
|
||||||
params [["_name", "", [""]], ["_key", "", [""]]];
|
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
|
||||||
|
|
||||||
private _stores = _self get "stores";
|
|
||||||
private _store = _stores get _name;
|
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
|
||||||
if (_key isEqualTo "") then { _store } else { _store get _key };
|
|
||||||
}],
|
|
||||||
["_write", {
|
|
||||||
params [["_name", "", [""]], ["_data", nil, ["", [], 0, true, createHashMap]]];
|
|
||||||
|
|
||||||
if (_name isEqualTo "" || isNil "_data") exitWith { ERROR_MSG("Store name and, or data cannot be empty"); nil };
|
|
||||||
|
|
||||||
private _stores = _self get "stores";
|
|
||||||
private _store = _self call ["_read", [_name]];
|
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
|
||||||
|
|
||||||
_stores set [_name, _data];
|
|
||||||
SETVAR(profileNamespace,FORGE_STORE_REG,_stores);
|
|
||||||
saveMissionProfileNamespace;
|
|
||||||
|
|
||||||
_store
|
|
||||||
}],
|
|
||||||
["_update", {
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]], ["_data", nil, ["", [], 0, true, createHashMap]]];
|
|
||||||
|
|
||||||
if (_name isEqualTo "" || _key isEqualTo "" || _keyField isEqualTo "" || isNil "_data") exitWith { ERROR_MSG("Store name, key, key field and, or data cannot be empty"); nil };
|
|
||||||
|
|
||||||
private _stores = _self get "stores";
|
|
||||||
private _store = _self call ["_read", [_name]];
|
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
|
||||||
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
if (isNil "_keyData") exitWith { ERROR_MSG_2("Key %1 not found in store %2",_key,_name); nil };
|
|
||||||
|
|
||||||
_keyData set [_keyField, _data];
|
|
||||||
_store set [_key, _keyData];
|
|
||||||
_stores set [_name, _store];
|
|
||||||
|
|
||||||
_store
|
|
||||||
}],
|
|
||||||
["_delete", {
|
|
||||||
params [["_name", "", [""]]];
|
params [["_name", "", [""]]];
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); false };
|
if (_name == "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
||||||
|
|
||||||
private _stores = _self get "stores";
|
private _stores = _self get "stores";
|
||||||
private _store = _self call ["get", [_name]];
|
_stores getOrDefault [_name, nil]
|
||||||
|
}],
|
||||||
|
["deleteStore", {
|
||||||
|
params [["_name", "", [""]]];
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); false };
|
if (_name == "") exitWith { ERROR_MSG("Store name cannot be empty"); false };
|
||||||
|
|
||||||
|
private _stores = _self get "stores";
|
||||||
|
private _store = _stores getOrDefault [_name, nil];
|
||||||
|
|
||||||
|
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found", _name); false };
|
||||||
|
|
||||||
_stores deleteAt _name;
|
_stores deleteAt _name;
|
||||||
true
|
true
|
||||||
}],
|
}],
|
||||||
["set", {
|
["set", {
|
||||||
params [["_key", "", [""]], ["_value", nil, [[]]]];
|
params [["_name", "", [""]], ["_key", "", [""]], ["_value", nil]];
|
||||||
|
|
||||||
if (_key isEqualTo "" || isNil "_value") exitWith { ERROR_MSG("Key and, or value cannot be empty") };
|
if (_name == "" || _key == "") exitWith { ERROR_MSG("Store name and, or key cannot be empty"); false };
|
||||||
|
|
||||||
["set", _key, "", -1, _value] call dragonfly_db_fnc_addTask;
|
private _stores = _self get "stores";
|
||||||
|
private _store = _stores getOrDefault [_name, nil];
|
||||||
|
|
||||||
|
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found", _name); false };
|
||||||
|
|
||||||
|
_store set [_key, _value];
|
||||||
|
true
|
||||||
}],
|
}],
|
||||||
["get", {
|
["get", {
|
||||||
params [["_key", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
params [["_name", "", [""]], ["_key", "", [""]], ["_default", nil]];
|
||||||
|
|
||||||
if (_key isEqualTo "" || _function isEqualTo "") exitWith { ERROR_MSG("Key and, or function cannot be empty") };
|
if (_name == "" || _key == "") exitWith { ERROR_MSG("Store name and, or key cannot be empty"); _default };
|
||||||
|
|
||||||
["get", _key, "", -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
private _store = _self call ["getStore", [_name]];
|
||||||
|
|
||||||
|
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found", _name); _default };
|
||||||
|
|
||||||
|
_store getOrDefault [_key, _default]
|
||||||
}],
|
}],
|
||||||
["delete", {
|
["delete", {
|
||||||
params [["_key", "", [""]]];
|
params [["_name", "", [""]], ["_key", "", [""]]];
|
||||||
|
|
||||||
if (_key isEqualTo "") exitWith { ERROR_MSG("Key cannot be empty") };
|
if (_name == "" || _key == "") exitWith { ERROR_MSG("Store name and, or key cannot be empty"); false };
|
||||||
|
|
||||||
["del", _key] call dragonfly_db_fnc_addTask;
|
private _store = _self call ["getStore", [_name]];
|
||||||
}],
|
|
||||||
["hashGet", {
|
|
||||||
params [["_keyField", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_keyField isEqualTo "" || _function isEqualTo "") exitWith { ERROR_MSG("Key field and, or function cannot be empty") };
|
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found", _name); false };
|
||||||
|
|
||||||
["hget", "", _keyField, -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
_store deleteAt _key;
|
||||||
}],
|
true
|
||||||
["hashGetId", {
|
|
||||||
params [["_key", "", [""]], ["_keyField", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _keyField isEqualTo "" || _function isEqualTo "") exitWith { ERROR_MSG("Key, key field and, or function cannot be empty") };
|
|
||||||
|
|
||||||
["hgetid", _key, _keyField, -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashGetAll", {
|
|
||||||
params [["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_function isEqualTo "") exitWith { ERROR_MSG("Function cannot be empty") };
|
|
||||||
|
|
||||||
["hgetall", "", "", -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashGetAllId", {
|
|
||||||
params [["_key", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _function isEqualTo "") exitWith { ERROR_MSG("Key and, or function cannot be empty") };
|
|
||||||
|
|
||||||
["hgetallid", _key, "", -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashSet", {
|
|
||||||
params [["_keyField", "", [""]], ["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (_keyField isEqualTo "" || isNil "_value") exitWith { ERROR_MSG("Key field and, or value cannot be empty") };
|
|
||||||
|
|
||||||
["hset", "", _keyField, -1, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashSetId", {
|
|
||||||
params [["_key", "", [""]], ["_keyField", "", [""]], ["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _keyField isEqualTo "" || isNil "_value") exitWith { ERROR_MSG("Key, keyField and, or value cannot be empty") };
|
|
||||||
|
|
||||||
["hsetid", _key, _keyField, -1, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashSetBulk", {
|
|
||||||
params [["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (isNil "_value") exitWith { ERROR_MSG("Value cannot be empty") };
|
|
||||||
|
|
||||||
["hsetbulk", "", "", -1, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashSetIdBulk", {
|
|
||||||
params [["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (isNil "_value") exitWith { ERROR_MSG("Value cannot be empty") };
|
|
||||||
|
|
||||||
["hsetidbulk", "", "", -1, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashDelete", {
|
|
||||||
params [["_keyField", "", [""]]];
|
|
||||||
|
|
||||||
if (_keyField isEqualTo "") exitWith { ERROR_MSG("Key field cannot be empty") };
|
|
||||||
|
|
||||||
["hdel", "", _keyField] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["hashDeleteId", {
|
|
||||||
params [["_key", "", [""]], ["_keyField", "", [""]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _keyField isEqualTo "") exitWith { ERROR_MSG("Key and, or key field cannot be empty") };
|
|
||||||
|
|
||||||
["hdelid", _key, _keyField] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["listAdd", {
|
|
||||||
params [["_key", "", [""]], ["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || isNil "_value") exitWith { ERROR_MSG("Key and, or value cannot be empty") };
|
|
||||||
|
|
||||||
["listadd", _key, "", -1, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["listGet", {
|
|
||||||
params [["_key", "", [""]], ["_index", -1, [0]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _index isEqualTo -1 || _function isEqualTo "") exitWith { ERROR_MSG("Key, index and, or function cannot be empty or -1") };
|
|
||||||
|
|
||||||
["listidx", _key, "", _index, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["listLoad", {
|
|
||||||
params [["_key", "", [""]], ["_function", "", [""]], ["_call", false, [false]], ["_netId", "", [""]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _function isEqualTo "") exitWith { ERROR_MSG("Key and, or function cannot be empty") };
|
|
||||||
|
|
||||||
["listrng", _key, "", -1, [], _function, _call, _netId] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["listRemove", {
|
|
||||||
params [["_key", "", [""]], ["_index", -1, [0]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _index isEqualTo -1) exitWith { ERROR_MSG("Key and, or index cannot be empty or -1") };
|
|
||||||
|
|
||||||
["listrem", _key, "", _index] call dragonfly_db_fnc_addTask;
|
|
||||||
}],
|
|
||||||
["listSet", {
|
|
||||||
params [["_key", "", [""]], ["_index", -1, [0]], ["_value", nil, [[]]]];
|
|
||||||
|
|
||||||
if (_key isEqualTo "" || _index isEqualTo -1 || isNil "_value") exitWith { ERROR_MSG("Key, index and, or value cannot be empty or -1") };
|
|
||||||
|
|
||||||
["listset", _key, "", _index, _value] call dragonfly_db_fnc_addTask;
|
|
||||||
}]
|
}]
|
||||||
]];
|
]];
|
||||||
|
|
||||||
SETMVAR(FORGE_STORE_REG,_storeInterface);
|
|
||||||
SETPVAR(missionNamespace,FORGE_STORE_REG,_storeInterface);
|
SETPVAR(missionNamespace,FORGE_STORE_REG,_storeInterface);
|
||||||
GETMVAR(FORGE_STORE_REG,_storeInterface)
|
GETMVAR(FORGE_STORE_REG,nil)
|
||||||
@ -5,29 +5,28 @@
|
|||||||
* Author: J. Schmidt
|
* Author: J. Schmidt
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Loads data from mission profile namespace
|
* Loads data from mission namespace using the database interface
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _name - Store name <STRING>
|
* 0: _name - Store name <STRING>
|
||||||
* 1: _key - Key to retrieve <STRING>
|
* 1: _key - Key to retrieve <STRING>
|
||||||
* 2: _keyField - Field of the key to retrieve <STRING>
|
* 2: _default - Default value if not found <ANY>
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Retrieved data
|
* Retrieved data or default value
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]]];
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
|
["_key", "", [""]],
|
||||||
|
["_default", nil]
|
||||||
|
];
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
private _database = call FUNC(verifyDB);
|
||||||
|
private _store = _database call ["getStore", [_name]];
|
||||||
|
|
||||||
private _store = missionProfileNamespace getVariable _name;
|
if (isNil "_store") exitWith {
|
||||||
|
_default
|
||||||
|
};
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
[_name, _key, _default, missionNamespace] call FUNC(getFromStore)
|
||||||
if (_key isEqualTo "") then { _store } else { _store get _key };
|
|
||||||
if (_keyField isNotEqualTo "") then {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
if (isNil "_keyData") exitWith { ERROR_MSG_3("KeyField %1 not found in key %2 of store %3",_keyField,_key,_name); nil };
|
|
||||||
|
|
||||||
_keyData get _keyField
|
|
||||||
};
|
|
||||||
@ -9,25 +9,24 @@
|
|||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _name - Store name <STRING>
|
* 0: _name - Store name <STRING>
|
||||||
* 1: _key - Key to retrieve <STRING>
|
* 1: _key - Key to retrieve (Optional, get entire collection if empty) <STRING>
|
||||||
* 2: _keyField - Field of the key to retrieve <STRING>
|
* 2: _default - Default value if key not found <ANY>
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Retrieved data
|
* Retrieved data or default value
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]]];
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
|
["_key", "", [""]],
|
||||||
|
["_default", nil]
|
||||||
|
];
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
private _database = call FUNC(verifyDB);
|
||||||
|
private _store = _database call ["getStore", [_name]];
|
||||||
|
|
||||||
private _store = profileNamespace getVariable _name;
|
if (isNil "_store") exitWith {
|
||||||
|
_default
|
||||||
|
};
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
[_name, _key, _default, profileNamespace] call FUNC(getFromStore);
|
||||||
if (_key isEqualTo "") then { _store } else { _store get _key };
|
|
||||||
if (_keyField isNotEqualTo "") then {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
if (isNil "_keyData") exitWith { ERROR_MSG_3("KeyField %1 not found in key %2 of store %3",_keyField,_key,_name); nil };
|
|
||||||
|
|
||||||
_keyData get _keyField
|
|
||||||
};
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: forge_server_db_fnc_loadFromTemp
|
|
||||||
* Author: J. Schmidt
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Loads data from temporary mission store (not persisted between sessions)
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* 0: _name - Store name <STRING>
|
|
||||||
* 1: _key - Key to load from <STRING>
|
|
||||||
* 2: _keyField - Field of the key to load from <STRING>
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* Data <STRING, ARRAY, NUMBER, BOOLEAN, HASHMAP>
|
|
||||||
*/
|
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]]];
|
|
||||||
|
|
||||||
if (_name isEqualTo "") exitWith { ERROR_MSG("Store name cannot be empty"); nil };
|
|
||||||
|
|
||||||
private _store = missionNamespace getVariable _name;
|
|
||||||
|
|
||||||
if (isNil "_store") exitWith { ERROR_MSG_1("Store %1 not found",_name); nil };
|
|
||||||
if (_key isEqualTo "") then { _store } else { _store get _key };
|
|
||||||
if (_keyField isNotEqualTo "") then {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
if (isNil "_keyData") exitWith { ERROR_MSG_3("KeyField %1 not found in key %2 of store %3",_keyField,_key,_name); nil };
|
|
||||||
|
|
||||||
_keyData get _keyField
|
|
||||||
};
|
|
||||||
@ -5,29 +5,60 @@
|
|||||||
* Author: J. Schmidt
|
* Author: J. Schmidt
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Loads game state from mission or profile namespace and sets appropriate variables
|
* Loads game state from mission namespace and sets appropriate variables
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _nameSpace - Namespace to load from (mission, profile) <STRING> (default: mission)
|
* None
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Success <BOOL>
|
* Success <BOOL>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_nameSpace", "mission", [""]]];
|
private _companyState = ["companyStore", "CompanyState", nil] call FUNC(loadFromMission);
|
||||||
|
|
||||||
private _companyState = createHashMap;
|
|
||||||
|
|
||||||
if (_nameSpace == "mission") then {
|
|
||||||
_companyState = ["companyStore", "CompanyState"] call FUNC(loadFromMission);
|
|
||||||
} else {
|
|
||||||
_companyState = ["companyStore", "CompanyState"] call FUNC(loadFromProfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!isNil "_companyState") then {
|
if (!isNil "_companyState") then {
|
||||||
companyFunds = _companyState getOrDefault ["funds", 0];
|
companyFunds = _companyState getOrDefault ["funds", 0];
|
||||||
companyRating = _companyState getOrDefault ["rating", 0];
|
companyRating = _companyState getOrDefault ["rating", 0];
|
||||||
companyShareholders = _companyState getOrDefault ["operations", []];
|
companyGenerals = _companyState getOrDefault ["operations", []];
|
||||||
|
companyGarageUnlocks = _companyState getOrDefault ["garage_unlocks", []];
|
||||||
|
};
|
||||||
|
|
||||||
|
private _playerUID = getPlayerUID player;
|
||||||
|
private _playerState = ["playerStore", _playerUID, nil] call FUNC(loadFromMission);
|
||||||
|
if (!isNil "_playerState") then {
|
||||||
|
private _armory_unlocks = _playerState getOrDefault ["armory_unlocks", [[],[],[],[]]];
|
||||||
|
private _garage_unlocks = _playerState getOrDefault ["garage_unlocks", [[],[],[],[],[],[]]];
|
||||||
|
private _locker = _playerState getOrDefault ["locker", []];
|
||||||
|
private _garage = _playerState getOrDefault ["garage", []];
|
||||||
|
private _cash = _playerState getOrDefault ["cash", 0];
|
||||||
|
private _bank = _playerState getOrDefault ["bank", 0];
|
||||||
|
private _number = _playerState getOrDefault ["number", "unknown"];
|
||||||
|
private _email = _playerState getOrDefault ["email", "unknown@spearnet.mil"];
|
||||||
|
private _paygrade = _playerState getOrDefault ["paygrade", "E1"];
|
||||||
|
private _holster = _playerState getOrDefault ["holster", true];
|
||||||
|
|
||||||
|
EGVAR(arsenal,armory_unlocks) = _armory_unlocks;
|
||||||
|
EGVAR(arsenal,garage_unlocks) = _garage_unlocks;
|
||||||
|
SETPVAR(player,FORGE_Locker,_locker);
|
||||||
|
SETPVAR(player,FORGE_Garage,_garage);
|
||||||
|
SETPVAR(player,FORGE_Cash,_cash);
|
||||||
|
SETPVAR(player,FORGE_Bank,_bank);
|
||||||
|
SETPVAR(player,FORGE_Phone_Number,_number);
|
||||||
|
SETPVAR(player,FORGE_Email,_email);
|
||||||
|
SETPVAR(player,FORGE_Paygrade,_paygrade);
|
||||||
|
SETPVAR(player,FORGE_Holster_Weapon,_holster);
|
||||||
|
|
||||||
|
if (isNull objectParent player) then {
|
||||||
|
player setUnitLoadout (_playerState getOrDefault ["loadout", []]);
|
||||||
|
if (_playerState getOrDefault ["currentWeapon", ""] != "") then {
|
||||||
|
player selectWeapon (_playerState get "currentWeapon");
|
||||||
|
};
|
||||||
|
player setPosASL (_playerState getOrDefault ["position", getPosASL player]);
|
||||||
|
player setDir (_playerState getOrDefault ["direction", 0]);
|
||||||
|
|
||||||
|
if (_playerState getOrDefault ["stance", ""] != "") then {
|
||||||
|
[player, _playerState get "stance"] call ace_common_fnc_setStance;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
true
|
true
|
||||||
@ -1,85 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Function: forge_server_db_fnc_loadPlayerState
|
|
||||||
* Author: J. Schmidt
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Loads player state from mission or profile namespace and sets appropriate variables
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* 0: _player - Player object <OBJECT>
|
|
||||||
* 1: _nameSpace - Namespace to load from (mission, profile) <STRING> (default: mission)
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* Success <BOOL>
|
|
||||||
*/
|
|
||||||
|
|
||||||
params [["_player", objNull, [objNull]], ["_nameSpace", "mission", [""]]];
|
|
||||||
|
|
||||||
if (isNull _player) exitWith { ERROR_MSG("Player object cannot be null"); false };
|
|
||||||
|
|
||||||
private _playerUID = getPlayerUID _player;
|
|
||||||
private _playerState = createHashMap;
|
|
||||||
|
|
||||||
if (_nameSpace == "mission") then {
|
|
||||||
_playerState = ["playerStore", _playerUID] call FUNC(loadFromMission);
|
|
||||||
} else {
|
|
||||||
_playerState = ["playerStore", _playerUID] call FUNC(loadFromProfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (isNil "_playerState") exitWith { ERROR_MSG_1("Player state for %1 not found",_playerUID); false };
|
|
||||||
|
|
||||||
private _reputation = _playerState getOrDefault ["reputation", 0];
|
|
||||||
private _loadout = _playerState getOrDefault ["loadout", []];
|
|
||||||
private _direction = _playerState getOrDefault ["direction", 0];
|
|
||||||
private _cash = _playerState getOrDefault ["cash", 0];
|
|
||||||
private _bank = _playerState getOrDefault ["bank", 0];
|
|
||||||
private _armory_unlocks = _playerState getOrDefault ["armory_unlocks", [[],[],[],[]]];
|
|
||||||
private _garage_unlocks = _playerState getOrDefault ["garage_unlocks", [[],[],[],[],[],[]]];
|
|
||||||
private _locker = _playerState getOrDefault ["locker", []];
|
|
||||||
private _garage = _playerState getOrDefault ["garage", []];
|
|
||||||
private _email = _playerState getOrDefault ["email", "unknown@spearnet.mil"];
|
|
||||||
private _number = _playerState getOrDefault ["number", "unknown"];
|
|
||||||
private _paygrade = _playerState getOrDefault ["paygrade", "E1"];
|
|
||||||
private _stance = _playerState getOrDefault ["stance", ""];
|
|
||||||
private _holster = _playerState getOrDefault ["holster", true];
|
|
||||||
private _position = _playerState getOrDefault ["position", getPosASL _player];
|
|
||||||
|
|
||||||
SETPVAR(_player,Reputation,_reputation);
|
|
||||||
SETPVAR(_player,Loadout,_loadout);
|
|
||||||
SETPVAR(_player,Direction,_direction);
|
|
||||||
SETPVAR(_player,FORGE_Cash,_cash);
|
|
||||||
SETPVAR(_player,FORGE_Bank,_bank);
|
|
||||||
SETPVAR(_player,FORGE_Armory_Unlocks,_armory_unlocks);
|
|
||||||
SETPVAR(_player,FORGE_Garage_Unlocks,_garage_unlocks);
|
|
||||||
SETPVAR(_player,FORGE_Locker,_locker);
|
|
||||||
SETPVAR(_player,FORGE_Garage,_garage);
|
|
||||||
SETPVAR(_player,FORGE_Email,_email);
|
|
||||||
SETPVAR(_player,FORGE_Phone_Number,_number);
|
|
||||||
SETPVAR(_player,FORGE_Paygrade,_paygrade);
|
|
||||||
SETPVAR(_player,Stance,_stance);
|
|
||||||
SETPVAR(_player,FORGE_Holster_Weapon,_holster);
|
|
||||||
SETPVAR(_player,Position,_position);
|
|
||||||
|
|
||||||
_player playAction _stance;
|
|
||||||
|
|
||||||
if (_holster) then {
|
|
||||||
[player] call AFUNC(weaponselect,putWeaponAway);
|
|
||||||
};
|
|
||||||
|
|
||||||
_player setPosASL _position;
|
|
||||||
|
|
||||||
private _pAlt = ((getPosATLVisual _player) select 2);
|
|
||||||
private _pVelZ = ((velocity _player) select 2);
|
|
||||||
if (_pAlt > 5 && _pVelZ < 0) then {
|
|
||||||
_player setVelocity [0, 0, 0];
|
|
||||||
_player setPosATL [((getPosATLVisual _player) select 0), ((getPosATLVisual _player) select 1), 1];
|
|
||||||
hint "You logged off mid air. You were moved to a safe position on the ground.";
|
|
||||||
};
|
|
||||||
|
|
||||||
if (needReload _player == 1) then { reload _player };
|
|
||||||
|
|
||||||
SETPVAR(_player,value_loadDone,true);
|
|
||||||
|
|
||||||
true
|
|
||||||
@ -5,75 +5,39 @@
|
|||||||
* Author: J. Schmidt
|
* Author: J. Schmidt
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Processes database requests
|
* Processes database requests from clients
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _type - Type of database operation <STRING>
|
* 0: _type - Type of database operation <STRING>
|
||||||
* 1: _name - Name of the store <STRING>
|
* 1: _data - Data for the operation <ANY>
|
||||||
* 2: _key - Key of the store <STRING>
|
|
||||||
* 3: _keyField - Field of the key to update <STRING>
|
|
||||||
* 4: _data - Data for the operation <STRING, ARRAY, NUMBER, BOOLEAN, HASHMAP>
|
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* None
|
* Operation result <ANY>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_type", "", [""]], ["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]], ["_data", "", ["", [], 0, true, createHashMap]]];
|
params [["_type", "", [""]], ["_data", nil, []]];
|
||||||
|
|
||||||
private _store = call FUNC(verifyDB);
|
|
||||||
|
|
||||||
switch (_type) do {
|
switch (_type) do {
|
||||||
case "createStore": {
|
|
||||||
params ["_name"];
|
|
||||||
_store call ["_create", [_name]];
|
|
||||||
};
|
|
||||||
case "getStore": {
|
case "getStore": {
|
||||||
params ["_name"];
|
params ["_name"];
|
||||||
_store call ["_read", [_name]];
|
[_name] call FUNC(getStore);
|
||||||
};
|
};
|
||||||
case "saveToMission": {
|
case "saveTostore": {
|
||||||
params ["_name", "_key", "_data"];
|
_data params ["_name", "_data", "_key"];
|
||||||
[_name, _key, _data] call FUNC(saveToMission);
|
[_name, _data, _key] call FUNC(saveToStore);
|
||||||
};
|
};
|
||||||
case "saveToProfile": {
|
case "getFromstore": {
|
||||||
params ["_name", "_key", "_data"];
|
_data params ["_name", "_key"];
|
||||||
[_name, _key, _data] call FUNC(saveToProfile);
|
[_name, _key] call FUNC(getFromStore);
|
||||||
};
|
|
||||||
case "saveToStore": {
|
|
||||||
params ["_name", "_data"];
|
|
||||||
_store call ["_write", [_name, _data]];
|
|
||||||
};
|
|
||||||
case "saveToTemp": {
|
|
||||||
params ["_name", "_key", "_data"];
|
|
||||||
[_name, _key, _data] call FUNC(saveToTemp);
|
|
||||||
};
|
|
||||||
case "getFromMission": {
|
|
||||||
params ["_name", "_key", "_keyField"];
|
|
||||||
[_name, _key, _keyField] call FUNC(loadFromMission);
|
|
||||||
};
|
|
||||||
case "getFromProfile": {
|
|
||||||
params ["_name", "_key", "_keyField"];
|
|
||||||
[_name, _key, _keyField] call FUNC(loadFromProfile);
|
|
||||||
};
|
|
||||||
case "getFromStore": {
|
|
||||||
params ["_name", "_key"];
|
|
||||||
_store call ["_read", [_name, _key]];
|
|
||||||
};
|
|
||||||
case "getFromTemp": {
|
|
||||||
params ["_name", "_key", "_keyField"];
|
|
||||||
[_name, _key, _keyField] call FUNC(loadFromTemp);
|
|
||||||
};
|
|
||||||
case "updateStore": {
|
|
||||||
params ["_name", "_key", "_keyField", "_data"];
|
|
||||||
_store call ["_update", [_name, _key, _keyField, _data]];
|
|
||||||
};
|
};
|
||||||
case "loadGameState": {
|
case "loadGameState": {
|
||||||
[] call FUNC(loadGameState);
|
[] call FUNC(loadGameState);
|
||||||
};
|
};
|
||||||
case "saveGameState": {
|
case "saveGameState": {
|
||||||
[] call FUNC(saveGameState);
|
[_data] call FUNC(saveGameState);
|
||||||
};
|
};
|
||||||
default {
|
default {
|
||||||
WARNING_1("Unknown database request type: %1",_type)
|
WARNING_1("Unknown database request type: %1", _type);
|
||||||
|
nil
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@ -5,41 +5,38 @@
|
|||||||
* Author: J. Schmidt
|
* Author: J. Schmidt
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
* Collects and saves the current game state to mission or profile namespace
|
* Collects and saves the current game state to mission namespace
|
||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _nameSpace - Namespace to save to (mission, profile) <STRING> (default: mission)
|
* None
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Success <BOOL>
|
* Success <BOOL>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_nameSpace", "mission", [""]]];
|
|
||||||
|
|
||||||
if (isNil "companyFunds") then { companyFunds = 0 };
|
if (isNil "companyFunds") then { companyFunds = 0 };
|
||||||
if (isNil "companyRating") then { companyRating = 0 };
|
if (isNil "companyRating") then { companyRating = 0 };
|
||||||
if (isNil "companyShareholders") then { companyShareholders = [] };
|
if (isNil "companyGenerals") then { companyGenerals = [] };
|
||||||
if (isNil "companyGarageUnlocks") then { companyGarageUnlocks = [] };
|
if (isNil "companyGarageUnlocks") then { companyGarageUnlocks = [] };
|
||||||
|
if (isNil EGVAR(arsenal,armory_unlocks)) then { EGVAR(arsenal,armory_unlocks) = [[],[],[],[]] };
|
||||||
|
if (isNil EGVAR(arsenal,garage_unlocks)) then { EGVAR(arsenal,garage_unlocks) = [[],[],[],[],[],[]] };
|
||||||
|
|
||||||
private _companyState = createHashMapFromArray [
|
private _companyState = createHashMapFromArray [
|
||||||
["key", "CompanyState"],
|
["key", "CompanyState"],
|
||||||
["funds", companyFunds],
|
["funds", companyFunds],
|
||||||
["rating", companyRating],
|
["rating", companyRating],
|
||||||
["operations", companyShareholders]
|
["operations", companyGenerals],
|
||||||
|
["garage_unlocks", companyGarageUnlocks]
|
||||||
];
|
];
|
||||||
|
|
||||||
if (_nameSpace == "mission") then {
|
["companyStore", _companyState, "CompanyState"] call FUNC(saveToMission);
|
||||||
["companyStore", "CompanyState", _companyState] call FUNC(saveToMission);
|
|
||||||
} else {
|
|
||||||
["companyStore", "CompanyState", _companyState] call FUNC(saveToProfile);
|
|
||||||
};
|
|
||||||
|
|
||||||
{
|
{
|
||||||
if (alive _x) then {
|
if (alive _x) then {
|
||||||
private _playerState = createHashMapFromArray [
|
private _playerState = createHashMapFromArray [
|
||||||
["key", getPlayerUID _x],
|
["key", getPlayerUID _x],
|
||||||
["armory_unlocks", GETVAR(_x,FORGE_Armory_Unlocks,_default_armory_unlocks)],
|
["armory_unlocks", EGVAR(arsenal,armory_unlocks)],
|
||||||
["garage_unlocks", GETVAR(_x,FORGE_Garage_Unlocks,_default_garage_unlocks)],
|
["garage_unlocks", EGVAR(arsenal,garage_unlocks)],
|
||||||
["locker", GETVAR(_x,FORGE_Locker,[])],
|
["locker", GETVAR(_x,FORGE_Locker,[])],
|
||||||
["garage", GETVAR(_x,FORGE_Garage,[])],
|
["garage", GETVAR(_x,FORGE_Garage,[])],
|
||||||
["cash", GETVAR(_x,FORGE_Cash,0)],
|
["cash", GETVAR(_x,FORGE_Cash,0)],
|
||||||
@ -59,12 +56,23 @@ if (_nameSpace == "mission") then {
|
|||||||
_playerState set ["stance", stance _x];
|
_playerState set ["stance", stance _x];
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_nameSpace == "mission") then {
|
["playerStore", _playerState, getPlayerUID _x] call FUNC(saveToMission);
|
||||||
["playerStore", getPlayerUID _x, _playerState] call FUNC(saveToMission);
|
|
||||||
} else {
|
|
||||||
["playerStore", getPlayerUID _x, _playerState] call FUNC(saveToProfile);
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
} forEach playableUnits;
|
} forEach playableUnits;
|
||||||
|
|
||||||
|
private _vehicles = nearestObjects [player, ["LandVehicle"], 50];
|
||||||
|
{
|
||||||
|
if (alive _x) then {
|
||||||
|
private _vehicleState = createHashMapFromArray [
|
||||||
|
["key", netId _x],
|
||||||
|
["class", typeOf _x],
|
||||||
|
["position", getPosATL _x],
|
||||||
|
["direction", getDir _x],
|
||||||
|
["health", damage _x]
|
||||||
|
];
|
||||||
|
|
||||||
|
["vehicleStore", _vehicleState, netId _x] call FUNC(saveToMission);
|
||||||
|
};
|
||||||
|
} forEach _vehicles;
|
||||||
|
|
||||||
true
|
true
|
||||||
@ -9,33 +9,26 @@
|
|||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _name - Store name <STRING>
|
* 0: _name - Store name <STRING>
|
||||||
* 1: _key - Key to save under <STRING>
|
* 1: _data - Data to save <HASHMAP, ARRAY, ANY>
|
||||||
* 2: _keyField - Field of the key to update <STRING>
|
* 2: _key - Key to save under <STRING>
|
||||||
* 3: _data - Data to save <STRING, ARRAY, NUMBER, BOOLEAN, HASHMAP>
|
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Success <BOOL>
|
* Success <BOOL>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]], ["_data", nil, ["", [], 0, true, createHashMap]]];
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
if (_name isEqualTo "" || _key isEqualTo "" || isNil "_data") exitWith { ERROR_MSG("Store name, key and, or data cannot be empty"); false };
|
["_data", nil, [createHashMap, [], "", 0, true]],
|
||||||
|
["_key", "", [""]]
|
||||||
|
];
|
||||||
|
|
||||||
private _database = call FUNC(verifyDB);
|
private _database = call FUNC(verifyDB);
|
||||||
private _store = _database call ["_read", [_name]];
|
private _store = _database call ["getStore", [_name]];
|
||||||
|
|
||||||
if (isNil "_store") then { _store = _database call ["_create", [_name, createHashMap]]; };
|
if (isNil "_store") then {
|
||||||
if (_keyField isEqualTo "") then {
|
_store = _database call ["createStore", [_name, []]];
|
||||||
_store set [_key, _data];
|
|
||||||
} else {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
_keyData set [_keyField, _data];
|
|
||||||
_store set [_key, _keyData];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_database call ["_write", [_name, _store]];
|
[_name, _data, _key, missionNamespace] call FUNC(saveToStore);
|
||||||
missionNamespace setVariable [_name, _store];
|
|
||||||
saveMissionProfileNamespace;
|
|
||||||
|
|
||||||
true
|
true
|
||||||
@ -9,33 +9,26 @@
|
|||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _name - Store name <STRING>
|
* 0: _name - Store name <STRING>
|
||||||
* 1: _key - Key to save under <STRING>
|
* 1: _data - Data to save <HASHMAP, ARRAY, ANY>
|
||||||
* 2: _keyField - Field of the key to update <STRING>
|
* 2: _key - Key to save under <STRING>
|
||||||
* 3: _data - Data to save <STRING, ARRAY, NUMBER, BOOLEAN, HASHMAP>
|
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Success <BOOL>
|
* Success <BOOL>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]], ["_data", nil, ["", [], 0, true, createHashMap]]];
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
if (_name isEqualTo "" || _key isEqualTo "" || isNil "_data") exitWith { ERROR_MSG("Store name, key and, or data cannot be empty"); false };
|
["_data", nil, [createHashMap, [], "", 0, true]],
|
||||||
|
["_key", "", [""]]
|
||||||
|
];
|
||||||
|
|
||||||
private _database = call FUNC(verifyDB);
|
private _database = call FUNC(verifyDB);
|
||||||
private _store = _database call ["_read", [_name]];
|
private _store = _database call ["getStore", [_name]];
|
||||||
|
|
||||||
if (isNil "_store") then { _store = _database call ["_create", [_name, createHashMap]]; };
|
if (isNil "_store") then {
|
||||||
if (_keyField isEqualTo "") then {
|
_store = _database call ["createStore", [_name, []]];
|
||||||
_store set [_key, _data];
|
|
||||||
} else {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
_keyData set [_keyField, _data];
|
|
||||||
_store set [_key, _keyData];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_database call ["_write", [_name, _store]];
|
[_name, _data, _key, profileNamespace] call FUNC(saveToStore);
|
||||||
profileNamespace setVariable [_name, _store];
|
|
||||||
saveProfileNamespace;
|
|
||||||
|
|
||||||
true
|
true
|
||||||
44
addons/db/functions/fnc_saveToStore.sqf
Normal file
44
addons/db/functions/fnc_saveToStore.sqf
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
#include "..\script_component.hpp"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function: forge_server_db_fnc_saveToStore
|
||||||
|
* Author: J. Schmidt
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* Saves data to a store in the specified namespace
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: _name - Store name <STRING>
|
||||||
|
* 1: _data - Data to save <HASHMAP, ARRAY, ANY>
|
||||||
|
* 2: _key - Key to save under <STRING>
|
||||||
|
* 3: _namespace - Namespace to use (Optional, default: missionNamespace) <NAMESPACE>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* Success <BOOL>
|
||||||
|
*/
|
||||||
|
|
||||||
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
|
["_data", nil, [createHashMap, [], "", 0, true]],
|
||||||
|
["_key", "", [""]],
|
||||||
|
["_namespace", missionNamespace, [missionNamespace]]
|
||||||
|
];
|
||||||
|
|
||||||
|
if (_name isEqualTo "" || _key isEqualTo "") exitWith {
|
||||||
|
ERROR_MSG_2("Invalid store name or key: %1, %2", _name, _key);
|
||||||
|
false
|
||||||
|
};
|
||||||
|
|
||||||
|
private _stores = _namespace getVariable [QGVAR(stores), createHashMap];
|
||||||
|
private _store = _stores getOrDefault [_name, createHashMap];
|
||||||
|
|
||||||
|
_store set [_key, _data];
|
||||||
|
_stores set [_name, _store];
|
||||||
|
_namespace setVariable [QGVAR(stores), _stores];
|
||||||
|
|
||||||
|
switch (_namespace) do {
|
||||||
|
case (missionNamespace): { saveMissionProfileNamespace; };
|
||||||
|
case (profileNamespace): { saveProfileNamespace; };
|
||||||
|
};
|
||||||
|
|
||||||
|
true
|
||||||
@ -9,29 +9,31 @@
|
|||||||
*
|
*
|
||||||
* Arguments:
|
* Arguments:
|
||||||
* 0: _name - Store name <STRING>
|
* 0: _name - Store name <STRING>
|
||||||
* 1: _key - Key to save under <STRING>
|
* 1: _data - Data to save <HASHMAP, ARRAY, ANY>
|
||||||
* 2: _keyField - Field of the key to update <STRING>
|
* 2: _key - Key to save under <STRING>
|
||||||
* 3: _data - Data to save <STRING, ARRAY, NUMBER, BOOLEAN, HASHMAP>
|
|
||||||
*
|
*
|
||||||
* Return Value:
|
* Return Value:
|
||||||
* Success <BOOL>
|
* Success <BOOL>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
params [["_name", "", [""]], ["_key", "", [""]], ["_keyField", "", [""]], ["_data", nil, ["", [], 0, true, createHashMap]]];
|
params [
|
||||||
|
["_name", "", [""]],
|
||||||
|
["_data", nil, [createHashMap, [], "", 0, true]],
|
||||||
|
["_key", "", [""]]
|
||||||
|
];
|
||||||
|
|
||||||
if (_name isEqualTo "" || _key isEqualTo "" || isNil "_data") exitWith { ERROR_MSG("Store name, key and, or data cannot be empty"); false };
|
private _database = call FUNC(verifyDB);
|
||||||
|
private _store = _database call ["getStore", [_name]];
|
||||||
|
|
||||||
private _store = missionNamespace getVariable [_name, createHashMap];
|
if (isNil "_store") then {
|
||||||
|
_store = _database call ["createStore", [_name, []]];
|
||||||
if (_keyField isEqualTo "") then {
|
|
||||||
_store set [_key, _data];
|
|
||||||
} else {
|
|
||||||
private _keyData = _store get _key;
|
|
||||||
|
|
||||||
_keyData set [_keyField, _data];
|
|
||||||
_store set [_key, _keyData];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
missionNamespace setVariable [_name, _store];
|
private _tempStores = missionNamespace getVariable [QGVAR(tempStores), createHashMap];
|
||||||
|
private _tempStore = _tempStores getOrDefault [_name, createHashMap];
|
||||||
|
|
||||||
true
|
_tempStore set [_key, _data];
|
||||||
|
_tempStores set [_name, _tempStore];
|
||||||
|
missionNamespace setVariable [QGVAR(tempStores), _tempStores];
|
||||||
|
|
||||||
|
true
|
||||||
|
|||||||
@ -14,7 +14,9 @@
|
|||||||
* Database object <HASHMAP>
|
* Database object <HASHMAP>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private _store = GETMVAR(FORGE_STORE_REG,createHashMap);
|
private _store = GETMVAR(GVAR(store),nil);
|
||||||
|
if (isNil "_store") then {
|
||||||
|
_store = [] call FUNC(initDB);
|
||||||
|
};
|
||||||
|
|
||||||
if (isNil "_store") then { _store = [] call FUNC(initDB) };
|
|
||||||
_store
|
_store
|
||||||
@ -8,7 +8,7 @@ switch (_condition) do {
|
|||||||
"CompanyState",
|
"CompanyState",
|
||||||
"funds", [companyFunds],
|
"funds", [companyFunds],
|
||||||
"rating", [companyRating],
|
"rating", [companyRating],
|
||||||
"operations", [companyShareholders],
|
"operations", [companyGenerals],
|
||||||
"garage_unlocks", [companyGarageUnlocks]
|
"garage_unlocks", [companyGarageUnlocks]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
_data = _this;
|
_data = _this;
|
||||||
|
|
||||||
if (_data isEqualTo [""]) then {
|
if (_data isEqualTo [""]) then {
|
||||||
companyShareholders = (configFile >> "CfgPatches" >> "forge_server_main" >> "companyShareholders") call BFUNC(getCfgData);
|
companyGenerals = (configFile >> "CfgPatches" >> "forge_server_main" >> "companyGenerals") call BFUNC(getCfgData);
|
||||||
publicVariable "companyShareholders";
|
publicVariable "companyGenerals";
|
||||||
|
|
||||||
companyFunds = "OP_BUDGET" call BFUNC(getParamValue);
|
companyFunds = "OP_BUDGET" call BFUNC(getParamValue);
|
||||||
publicVariable "companyFunds";
|
publicVariable "companyFunds";
|
||||||
@ -12,6 +12,9 @@ if (_data isEqualTo [""]) then {
|
|||||||
companyRating = "OP_RATING" call BFUNC(getParamValue);
|
companyRating = "OP_RATING" call BFUNC(getParamValue);
|
||||||
publicVariable "companyRating";
|
publicVariable "companyRating";
|
||||||
|
|
||||||
|
companyGarageUnlocks = [[],[],[],[],[],[]];
|
||||||
|
publicVariable "companyGarageUnlocks";
|
||||||
|
|
||||||
diag_log "No Server Entry Found!";
|
diag_log "No Server Entry Found!";
|
||||||
["save"] call FUNC(handleServerState);
|
["save"] call FUNC(handleServerState);
|
||||||
|
|
||||||
@ -29,7 +32,8 @@ if (_data isEqualTo [""]) then {
|
|||||||
switch (_key) do {
|
switch (_key) do {
|
||||||
case "funds": { companyFunds = _value; publicVariable "companyFunds" };
|
case "funds": { companyFunds = _value; publicVariable "companyFunds" };
|
||||||
case "rating": { companyRating = _value; publicVariable "companyRating" };
|
case "rating": { companyRating = _value; publicVariable "companyRating" };
|
||||||
case "operations": { companyShareholders = _value; publicVariable "companyShareholders" };
|
case "operations": { companyGenerals = _value; publicVariable "companyGenerals" };
|
||||||
|
case "garage_unlocks": { companyGarageUnlocks = _value; publicVariable "companyGarageUnlocks" };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@ class CfgPatches {
|
|||||||
|
|
||||||
serverSaveLoop = 0;
|
serverSaveLoop = 0;
|
||||||
serverSaveLoopTime = 30;
|
serverSaveLoopTime = 30;
|
||||||
companyShareholders[] = {"76561198027566824"};
|
companyGenerals[] = {"76561198027566824"};
|
||||||
AISkill = 0.8;
|
AISkill = 0.8;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
#define MAJOR 1
|
#define MAJOR 1
|
||||||
#define MINOR 0
|
#define MINOR 0
|
||||||
#define PATCH 0
|
#define PATCH 0
|
||||||
#define BUILD 11
|
#define BUILD 4
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
PREP(cargoToPairs);
|
PREP(cargoToPairs);
|
||||||
PREP(getPlayer);
|
|
||||||
PREP(playSound);
|
PREP(playSound);
|
||||||
PREP(playerGroup2Server);
|
PREP(playerGroup2Server);
|
||||||
PREP(redirectClient2Server);
|
PREP(redirectClient2Server);
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
#include "..\script_component.hpp"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Author: IDSolutions
|
|
||||||
* Gets a player object by UID.
|
|
||||||
*
|
|
||||||
* Arguments:
|
|
||||||
* 0: Player UID <STRING>
|
|
||||||
*
|
|
||||||
* Return Value:
|
|
||||||
* Player object or objNull if not found <OBJECT>
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* ["76561198012345678"] call forge_crate_common_fnc_getPlayer
|
|
||||||
*
|
|
||||||
* Public: Yes
|
|
||||||
*/
|
|
||||||
|
|
||||||
params ["_uid"];
|
|
||||||
|
|
||||||
private _player = objNull;
|
|
||||||
|
|
||||||
{
|
|
||||||
if ((getPlayerUID _x) isEqualTo _uid) exitWith { _player = _x; };
|
|
||||||
} forEach allPlayers;
|
|
||||||
|
|
||||||
_player
|
|
||||||
@ -27,22 +27,38 @@ addMissionEventHandler ["HandleDisconnect", {
|
|||||||
|
|
||||||
private _data = [
|
private _data = [
|
||||||
_uid,
|
_uid,
|
||||||
|
// "armory_unlocks", [_unit getVariable ["Armory_Unlocks", _default_armory_unlocks]],
|
||||||
|
// "garage_unlocks", [_unit getVariable ["Garage_Unlocks", _default_garage_unlocks]],
|
||||||
"armory_unlocks", [GETVAR(_unit,Armory_Unlocks,_default_armory_unlocks)],
|
"armory_unlocks", [GETVAR(_unit,Armory_Unlocks,_default_armory_unlocks)],
|
||||||
"garage_unlocks", [GETVAR(_unit,Garage_Unlocks,_default_garage_unlocks)],
|
"garage_unlocks", [GETVAR(_unit,Garage_Unlocks,_default_garage_unlocks)],
|
||||||
|
// "locker", [_unit getVariable ["FORGE_Locker", []]],
|
||||||
|
// "garage", [_unit getVariable ["FORGE_Garage", []]],
|
||||||
"locker", [GETVAR(_unit,FORGE_Locker,[])],
|
"locker", [GETVAR(_unit,FORGE_Locker,[])],
|
||||||
"garage", [GETVAR(_unit,FORGE_Garage,[])],
|
"garage", [GETVAR(_unit,FORGE_Garage,[])],
|
||||||
|
// "cash", [_unit getVariable ["FORGE_Cash", 0]],
|
||||||
|
// "bank", [_unit getVariable ["FORGE_Bank", 0]],
|
||||||
"cash", [GETVAR(_unit,FORGE_Cash,0)],
|
"cash", [GETVAR(_unit,FORGE_Cash,0)],
|
||||||
"bank", [GETVAR(_unit,FORGE_Bank,0)],
|
"bank", [GETVAR(_unit,FORGE_Bank,0)],
|
||||||
"number", [GETVAR(_unit,FORGE_Phone_Number,QUOTE(unknown))],
|
// "number", [_unit getVariable ["FORGE_Phone_Number", "unknown"]],
|
||||||
"email", [GETVAR(_unit,FORGE_Email,QUOTE(unknown@spearnet.mil))],
|
// "email", [_unit getVariable ["FORGE_Email", "unknown@spearnet.mil"]],
|
||||||
"paygrade", [GETVAR(_unit,FORGE_PayGrade,QUOTE(E1))],
|
"number", [GETVAR(_unit,FORGE_Phone_Number,"unknown")],
|
||||||
|
"email", [GETVAR(_unit,FORGE_Email,"unknown@spearnet.mil")],
|
||||||
|
// "paygrade", [_unit getVariable ["Paygrade", "E1"]],
|
||||||
|
"paygrade", [GETVAR(_unit,Paygrade,"E1")],
|
||||||
"reputation", [rating _unit],
|
"reputation", [rating _unit],
|
||||||
"loadout", [getUnitLoadout _unit],
|
"loadout", [getUnitLoadout _unit],
|
||||||
|
// "holster", [_unit getVariable ["FORGE_Holster_Weapon", true]],
|
||||||
"holster", [GETVAR(_unit,FORGE_Holster_Weapon,true)],
|
"holster", [GETVAR(_unit,FORGE_Holster_Weapon,true)],
|
||||||
"position", [getPosASLVisual _unit],
|
"position", [getPosASLVisual _unit],
|
||||||
"direction", [getDirVisual _unit]
|
"direction", [getDirVisual _unit]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// if (vehicle _unit == _unit) then {
|
||||||
|
// _data pushBack "currentWeapon";
|
||||||
|
// _data pushBack [currentMuzzle _unit];
|
||||||
|
// _data pushBack "stance";
|
||||||
|
// _data pushBack [stance _unit];
|
||||||
|
// };
|
||||||
if (isNull objectParent _unit) then {
|
if (isNull objectParent _unit) then {
|
||||||
_data pushBack "currentWeapon";
|
_data pushBack "currentWeapon";
|
||||||
_data pushBack [currentMuzzle _unit];
|
_data pushBack [currentMuzzle _unit];
|
||||||
|
|||||||
BIN
icon_128_ca.paa
BIN
icon_128_ca.paa
Binary file not shown.
Binary file not shown.
BIN
icon_64_ca.paa
BIN
icon_64_ca.paa
Binary file not shown.
6
mod.cpp
6
mod.cpp
@ -1,7 +1,6 @@
|
|||||||
dir = "@forge_server";
|
|
||||||
name = "FORGE Server";
|
name = "FORGE Server";
|
||||||
author = "IDSolutions";
|
author = "IDSolutions";
|
||||||
picture = "title_ca.paa";
|
picture = "title_co.paa";
|
||||||
logoSmall = "icon_64_ca.paa";
|
logoSmall = "icon_64_ca.paa";
|
||||||
logo = "icon_128_ca.paa";
|
logo = "icon_128_ca.paa";
|
||||||
logoOver = "icon_128_highlight_ca.paa";
|
logoOver = "icon_128_highlight_ca.paa";
|
||||||
@ -10,5 +9,4 @@ tooltipOwned = "IDS Owned";
|
|||||||
overview = "FORGE Server - Official Modification";
|
overview = "FORGE Server - Official Modification";
|
||||||
description = "FORGE Server - Version 1.0.0";
|
description = "FORGE Server - Version 1.0.0";
|
||||||
action = "https://innovativedevsolutions.org";
|
action = "https://innovativedevsolutions.org";
|
||||||
actionName = "Website";
|
actionName = "Website";
|
||||||
dlcColor[] = {0.45, 0.47, 0.41, 1};
|
|
||||||
BIN
title_ca.paa
BIN
title_ca.paa
Binary file not shown.
BIN
title_co.paa
Normal file
BIN
title_co.paa
Normal file
Binary file not shown.
187
tools/sqf_validator.py
Normal file
187
tools/sqf_validator.py
Normal file
@ -0,0 +1,187 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
import fnmatch
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
|
||||||
|
def valid_keyword_after_code(content, index):
|
||||||
|
for word in ["for", "do", "count", "each", "forEach", "else", "and", "not", "isEqualTo", "isNotEqualTo", "in", "call", "spawn", "execVM", "catch", "param", "select", "apply", "findIf", "remoteExec"]:
|
||||||
|
if content.find(word, index, index + len(word)) != -1:
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
def check_sqf(filepath):
|
||||||
|
errors = []
|
||||||
|
|
||||||
|
with open(filepath, "r", encoding = "utf-8", errors = "ignore") as file:
|
||||||
|
content = file.read()
|
||||||
|
|
||||||
|
# Store all brackets we find in this file, so we can validate everything on the end
|
||||||
|
brackets = []
|
||||||
|
|
||||||
|
# Used in case we are in a line comment (//)
|
||||||
|
ignore_till_eol = False
|
||||||
|
|
||||||
|
# To check if we are in a comment block
|
||||||
|
in_comment_block = False
|
||||||
|
check_if_comment = False
|
||||||
|
|
||||||
|
# Used in case we are in a comment block (/* */)
|
||||||
|
# This is true if we detect a * inside a comment block
|
||||||
|
# If the next character is a /, it means we end our comment block
|
||||||
|
check_if_closing = False
|
||||||
|
|
||||||
|
# We ignore everything inside a string
|
||||||
|
in_string = False
|
||||||
|
|
||||||
|
# Used to store the starting type of a string, so we can match that to the end of a string
|
||||||
|
string_type = ""
|
||||||
|
|
||||||
|
# Used to check for semicolon after code blocks
|
||||||
|
last_is_curly_brace = False
|
||||||
|
check_for_semicolon = False
|
||||||
|
|
||||||
|
# Extra information so we know what line we find errors at
|
||||||
|
line_number = 1
|
||||||
|
|
||||||
|
char_index = 0
|
||||||
|
|
||||||
|
for c in content:
|
||||||
|
if last_is_curly_brace:
|
||||||
|
last_is_curly_brace = False
|
||||||
|
|
||||||
|
# Test generates false positives with binary commands that take CODE as 2nd arg (e.g. findIf)
|
||||||
|
check_for_semicolon = not re.search("findIf", content, re.IGNORECASE)
|
||||||
|
|
||||||
|
# Keep track of current line number
|
||||||
|
if c == "\n":
|
||||||
|
line_number += 1
|
||||||
|
|
||||||
|
# While we are in a string, we can ignore everything else, except the end of the string
|
||||||
|
if in_string:
|
||||||
|
if c == string_type:
|
||||||
|
in_string = False
|
||||||
|
|
||||||
|
# Look for the end of this comment block
|
||||||
|
elif in_comment_block:
|
||||||
|
if c == "*":
|
||||||
|
check_if_closing = True
|
||||||
|
elif check_if_closing:
|
||||||
|
if c == "/":
|
||||||
|
in_comment_block = False
|
||||||
|
elif c != "*":
|
||||||
|
check_if_closing = False
|
||||||
|
|
||||||
|
# If we are not in a comment block, we will check if we are at the start of one or count the () {} and []
|
||||||
|
else:
|
||||||
|
# This means we have encountered a /, so we are now checking if this is an inline comment or a comment block
|
||||||
|
if check_if_comment:
|
||||||
|
check_if_comment = False
|
||||||
|
|
||||||
|
# If the next character after / is a *, we are at the start of a comment block
|
||||||
|
if c == "*":
|
||||||
|
in_comment_block = True
|
||||||
|
|
||||||
|
# Otherwise, check if we are in an line comment, / followed by another / (//)
|
||||||
|
elif c == "/":
|
||||||
|
ignore_till_eol = True
|
||||||
|
|
||||||
|
if not in_comment_block:
|
||||||
|
if ignore_till_eol:
|
||||||
|
# We are in a line comment, just continue going through the characters until we find an end of line
|
||||||
|
if c == "\n":
|
||||||
|
ignore_till_eol = False
|
||||||
|
else:
|
||||||
|
if c == '"' or c == "'":
|
||||||
|
in_string = True
|
||||||
|
string_type = c
|
||||||
|
elif c == "/":
|
||||||
|
check_if_comment = True
|
||||||
|
elif c == "\t":
|
||||||
|
errors.append(" ERROR: Found a tab on line {}.".format(line_number))
|
||||||
|
elif c in ["(", "[", "{"]:
|
||||||
|
brackets.append(c)
|
||||||
|
elif c == ")":
|
||||||
|
if not brackets or brackets[-1] in ["[", "{"]:
|
||||||
|
errors.append(" ERROR: Missing parenthesis '(' on line {}.".format(line_number))
|
||||||
|
brackets.append(c)
|
||||||
|
elif c == "]":
|
||||||
|
if not brackets or brackets[-1] in ["(", "{"]:
|
||||||
|
errors.append(" ERROR: Missing square bracket '[' on line {}.".format(line_number))
|
||||||
|
brackets.append(c)
|
||||||
|
elif c == "}":
|
||||||
|
last_is_curly_brace = True
|
||||||
|
|
||||||
|
if not brackets or brackets[-1] in ["(", "["]:
|
||||||
|
errors.append(" ERROR: Missing curly brace '{{' on line {}.".format(line_number))
|
||||||
|
brackets.append(c)
|
||||||
|
|
||||||
|
if check_for_semicolon:
|
||||||
|
# Keep reading until no white space or comments
|
||||||
|
if c not in [" ", "\t", "\n", "/"]:
|
||||||
|
check_for_semicolon = False
|
||||||
|
if c not in ["]", ")", "}", ";", ",", "&", "!", "|", "="] and not valid_keyword_after_code(content, char_index):
|
||||||
|
errors.append(" ERROR: Possible missing semicolon ';' on line {}.".format(line_number))
|
||||||
|
|
||||||
|
char_index += 1
|
||||||
|
|
||||||
|
# Compare opening and closing bracket counts
|
||||||
|
if brackets.count("(") != brackets.count(")"):
|
||||||
|
errors.append(" ERROR: Unequal number of parentheses, '(' = {}, ')' = {}.".format(brackets.count("("), brackets.count(")")))
|
||||||
|
|
||||||
|
if brackets.count("[") != brackets.count("]"):
|
||||||
|
errors.append(" ERROR: Unequal number of square brackets, '[' = {}, ']' = {}.".format(brackets.count("["), brackets.count("]")))
|
||||||
|
|
||||||
|
if brackets.count("{") != brackets.count("}"):
|
||||||
|
errors.append(" ERROR: Unequal number of curly braces, '{{' = {}, '}}' = {}.".format(brackets.count("{"), brackets.count("}")))
|
||||||
|
|
||||||
|
# Ensure includes are before block comments
|
||||||
|
if re.compile('\s*(/\*[\s\S]+?\*/)\s*#include').match(content):
|
||||||
|
errors.append(" ERROR: Found an #include after a block comment.")
|
||||||
|
|
||||||
|
return errors
|
||||||
|
|
||||||
|
def main():
|
||||||
|
print("Validating SQF")
|
||||||
|
print("--------------")
|
||||||
|
|
||||||
|
# Allow running from root directory and tools directory
|
||||||
|
root_dir = ".."
|
||||||
|
if os.path.exists("addons"):
|
||||||
|
root_dir = "."
|
||||||
|
|
||||||
|
# Check all SQF files in the project directory
|
||||||
|
sqf_files = []
|
||||||
|
|
||||||
|
for root, _, files in os.walk(root_dir):
|
||||||
|
for file in fnmatch.filter(files, "*.sqf"):
|
||||||
|
sqf_files.append(os.path.join(root, file))
|
||||||
|
|
||||||
|
sqf_files.sort()
|
||||||
|
|
||||||
|
bad_count = 0
|
||||||
|
|
||||||
|
for filepath in sqf_files:
|
||||||
|
errors = check_sqf(filepath)
|
||||||
|
|
||||||
|
if errors:
|
||||||
|
print("\nFound {} error(s) in {}:".format(len(errors), os.path.relpath(filepath, root_dir)))
|
||||||
|
|
||||||
|
for error in errors:
|
||||||
|
print(error)
|
||||||
|
|
||||||
|
bad_count += 1
|
||||||
|
|
||||||
|
print("\nChecked {} files, found errors in {}.".format(len(sqf_files), bad_count))
|
||||||
|
|
||||||
|
if bad_count == 0:
|
||||||
|
print("SQF Validation PASSED")
|
||||||
|
else:
|
||||||
|
print("SQF Validation FAILED")
|
||||||
|
|
||||||
|
return bad_count
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sys.exit(main())
|
||||||
Loading…
x
Reference in New Issue
Block a user