.hemtt/project.toml

@@ -2,20 +2,3 @@ name = "FORGE Server"
 author = "IDSolutions"
 prefix = "forge_server"
 mainprefix = "z"
-
-[files]
-include = [
-    "*.dll",
-    "*.so",
-    "*.json",
-    "mod.cpp",
-    "README.md",
-    "LICENSE",
-    "icon_64_ca.paa",
-    "icon_128_ca.paa",
-    "icon_128_highlight_ca.paa",
-    "title_co.paa"
-]
-
-[version]
-git_hash = 0

addons/init/functions/fnc_serverSetup.sqf

@@ -3,7 +3,7 @@
 value_serverDone = false;
 publicVariable "value_serverDone";
 
-diag_log "Executing FORGE Server Side Functions...";
+diag_log "Executing SOF Server Side Functions...";
 
 [] call EFUNC(save,handleDisconnect);
 diag_log "Server Handle Disconnect Initialized.";

addons/main/config.cpp

@@ -10,11 +10,6 @@ class CfgPatches {
         authors[] = {"J. Schmidt", "Creedcoder"};
         author = "IDSolutions";
         VERSION_CONFIG;
-
-        serverSaveLoop = 0;
-        serverSaveLoopTime = 30;
-        companyGenerals[] = {"76561198027566824"};
-        AISkill = 0.8;
     };
 };
 

addons/main/functions/fnc_writeRPT.sqf

@@ -20,7 +20,7 @@
 
 params ["_msg", "_syschatEnabled"];
 
-private _text = format ["[FORGE] %1", _msg];
+private _text = format ["[SOF] %1", _msg];
 
 [_text] call CFUNC(log);
 

addons/save/functions/fnc_handleDisconnect.sqf

@@ -22,52 +22,31 @@ addMissionEventHandler ["HandleDisconnect", {
 
 	private _unit = _this select 0;
 	private _uid = _this select 2;
-	private _default_armory_unlocks = [[],[],[],[]];
-	private _default_garage_unlocks = [[],[],[],[],[],[]];
-
 	private _data = [
 	_uid,
-	// "armory_unlocks", [_unit getVariable ["Armory_Unlocks", _default_armory_unlocks]],
+	"armory_unlocks", [_unit getVariable ["Armory_Unlocks", [[],[],[],[]]]],
-	// "garage_unlocks", [_unit getVariable ["Garage_Unlocks", _default_garage_unlocks]],
+	"garage_unlocks", [_unit getVariable ["Garage_Unlocks", [[],[],[],[],[],[]]]],
-	"armory_unlocks", [GETVAR(_unit,Armory_Unlocks,_default_armory_unlocks)],
+	"locker", [_unit getVariable ["FORGE_Locker", []]],
-	"garage_unlocks", [GETVAR(_unit,Garage_Unlocks,_default_garage_unlocks)],
+	"garage", [_unit getVariable ["FORGE_Garage", []]],
-	// "locker", [_unit getVariable ["FORGE_Locker", []]],
+	"cash", [_unit getVariable ["FORGE_Cash", 0]],
-	// "garage", [_unit getVariable ["FORGE_Garage", []]],
+	"bank", [_unit getVariable ["FORGE_Bank", 0]],
-	"locker", [GETVAR(_unit,FORGE_Locker,[])],
+	"number", [_unit getVariable ["FORGE_Phone_Number", "unknown"]],
-	"garage", [GETVAR(_unit,FORGE_Garage,[])],
+	"email", [_unit getVariable ["FORGE_Email", "unknown@spearnet.mil"]],
-	// "cash", [_unit getVariable ["FORGE_Cash", 0]],
+	"paygrade", [_unit getVariable ["Paygrade", "E1"]],
-	// "bank", [_unit getVariable ["FORGE_Bank", 0]],
-	"cash", [GETVAR(_unit,FORGE_Cash,0)],
-	"bank", [GETVAR(_unit,FORGE_Bank,0)],
-	// "number", [_unit getVariable ["FORGE_Phone_Number", "unknown"]],
-	// "email", [_unit getVariable ["FORGE_Email", "unknown@spearnet.mil"]],
-	"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],
 	"loadout", [getUnitLoadout _unit],
-	// "holster", [_unit getVariable ["FORGE_Holster_Weapon", true]],
+	"holster", [_unit getVariable ["FORGE_Holster_Weapon", true]],
-	"holster", [GETVAR(_unit,FORGE_Holster_Weapon,true)],
 	"position", [getPosASLVisual _unit],
 	"direction", [getDirVisual _unit]
 	];
 
-	// if (vehicle _unit == _unit) then {
+	if (vehicle _unit == _unit) then {
-	// 	_data pushBack "currentWeapon";
-	// 	_data pushBack [currentMuzzle _unit];
-	// 	_data pushBack "stance";
-	// 	_data pushBack [stance _unit];
-	// };
-	if (isNull objectParent _unit) then {
 		_data pushBack "currentWeapon";
 		_data pushBack [currentMuzzle _unit];
 		_data pushBack "stance";
 		_data pushBack [stance _unit];
 	};
 
-	diag_log format ["Saving Player: %1", _data];
-
 	// ["hsetidbulk", "", "", -1, _data, "", false] call dragonfly_db_fnc_addTask;
 	["hsetidbulk", "", "", -1, _data, "", false] remoteExecCall ["dragonfly_db_fnc_addTask", 2, false];
 

include/a3/ui_f/hpp/defineResincl.inc

@@ -2683,7 +2683,7 @@ enum
 #define IDC_MP_SCORE_TABLE_ORDER          106
 #define IDC_MP_SCORE_TABLE_PLAYERSNAME    107
 #define IDC_MP_SCORE_TABLE_KILLS_INF      108
-#define IDC_MP_SCORE_TABLE_KILLS_FORGET     109
+#define IDC_MP_SCORE_TABLE_KILLS_SOFT     109
 #define IDC_MP_SCORE_TABLE_KILLS_ARMOR    110
 #define IDC_MP_SCORE_TABLE_KILLS_AIR      111
 #define IDC_MP_SCORE_TABLE_KILLED         112