Added setCMoney to spawnStoreObject.sqf

A3Wasteland · Aug 3, 2018 · 199f532 · 199f532
1 parent 3753481
commit 199f532
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 52 deletions.
diff --git a/client/systems/generalStore/buyItems.sqf b/client/systems/generalStore/buyItems.sqf
@@ -440,26 +440,21 @@ storePurchaseHandle = _this spawn
 
 	if (!isNil "_price" && {_price > -1}) then
 	{
-		_playerMoney = player getVariable ["cmoney", 0];
-
 		// Re-check for money after purchase
-		if (_price > _playerMoney) then
+		if (isNil "_requestKey" && _price > player getVariable ["cmoney", 0]) exitWith
 		{
-			if (!isNil "_requestKey" && {!isNil _requestKey}) then
-			{
-				deleteVehicle objectFromNetId (missionNamespace getVariable _requestKey);
-			};
-
 			[_itemText] call _showInsufficientFundsError;
-		}
-		else
+		};
+
+		//player setVariable ["cmoney", _playerMoney - _price, true];
+		if (isNil "_requestKey") then // baseparts price now handled in spawnStoreObject.sqf
 		{
-			//player setVariable ["cmoney", _playerMoney - _price, true];
 			[player, -_price] call A3W_fnc_setCMoney;
-			_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
-			if (_successHint) then { hint "Purchase successful!" };
-			playSound "FD_Finish_F";
 		};
+
+		_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
+		if (_successHint) then { hint "Purchase successful!" };
+		playSound "FD_Finish_F";
 	};
 
 	if (!isNil "_requestKey" && {!isNil _requestKey}) then

diff --git a/client/systems/gunStore/buyGuns.sqf b/client/systems/gunStore/buyGuns.sqf
@@ -219,26 +219,21 @@ storePurchaseHandle = _this spawn
 
 	if (!isNil "_price" && {_price > -1}) then
 	{
-		_playerMoney = player getVariable ["cmoney", 0];
-
 		// Re-check for money after purchase
-		if (_price > _playerMoney) then
+		if (isNil "_requestKey" && _price > player getVariable ["cmoney", 0]) exitWith
 		{
-			if (!isNil "_requestKey" && {!isNil _requestKey}) then
-			{
-				deleteVehicle objectFromNetId (missionNamespace getVariable _requestKey);
-			};
-
 			[_itemText] call _showInsufficientFundsError;
-		}
-		else
+		};
+
+		//player setVariable ["cmoney", _playerMoney - _price, true];
+		if (isNil "_requestKey") then // static gun price now handled in spawnStoreObject.sqf
 		{
-			//player setVariable ["cmoney", _playerMoney - _price, true];
 			[player, -_price] call A3W_fnc_setCMoney;
-			_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
-			if (_successHint) then { hint "Purchase successful!" };
-			playSound "FD_Finish_F";
 		};
+
+		_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
+		if (_successHint) then { hint "Purchase successful!" };
+		playSound "FD_Finish_F";
 	};
 
 	if (!isNil "_requestKey" && {!isNil _requestKey}) then

diff --git a/client/systems/vehicleStore/buyVehicles.sqf b/client/systems/vehicleStore/buyVehicles.sqf
@@ -164,32 +164,17 @@ storePurchaseHandle = _this spawn
 		};
 	};
 
-	if (!isNil "_price" && {_price > -1}) then
+	if (!isNil "_price" && {_price > -1}) then // vehicle price now handled in spawnStoreObject.sqf
 	{
-		_playerMoney = player getVariable ["cmoney", 0];
+		vehicleStore_lastPurchaseTime = diag_tickTime;
 
-		// Re-check for money after purchase
-		if (_price > _playerMoney) then
-		{
-			if (!isNil "_requestKey" && {!isNil _requestKey}) then
-			{
-				deleteVehicle objectFromNetId (missionNamespace getVariable _requestKey);
-			};
+		//player setVariable ["cmoney", _playerMoney - _price, true];
+		//[player, -_price] call A3W_fnc_setCMoney;
+		_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
 
-			[_itemText] call _showInsufficientFundsError;
-		}
-		else
+		if (["A3W_playerSaving"] call isConfigOn) then
 		{
-			vehicleStore_lastPurchaseTime = diag_tickTime;
-
-			//player setVariable ["cmoney", _playerMoney - _price, true];
-			[player, -_price] call A3W_fnc_setCMoney;
-			_playerMoneyText ctrlSetText format ["Cash: $%1", [player getVariable ["cmoney", 0]] call fn_numbersText];
-
-			if (["A3W_playerSaving"] call isConfigOn) then
-			{
-				[] spawn fn_savePlayerData;
-			};
+			[] spawn fn_savePlayerData;
 		};
 	};
 

diff --git a/server/functions/spawnStoreObject.sqf b/server/functions/spawnStoreObject.sqf
@@ -23,7 +23,7 @@ _isVehStore = ["VehStore", _npcName] call fn_startsWith;
 private _storeNPC = missionNamespace getVariable [_npcName, objNull];
 private _marker = _npcName;
 
-if (_key != "" && isPlayer _player && {_isGenStore || _isGunStore || _isVehStore}) then
+if (_key != "" && _player isKindOf "Man" && {_isGenStore || _isGunStore || _isVehStore}) then
 {
 	_timeoutKey = _key + "_timeout";
 	_objectID = "";
@@ -203,8 +203,9 @@ if (_key != "" && isPlayer _player && {_isGenStore || _isGunStore || _isVehStore
 				};
 			};
 
-			if (isPlayer _player && !(_player getVariable [_timeoutKey, true])) then
+			if !(_player getVariable [_timeoutKey, true]) then
 			{
+				[_player, -_itemPrice] call A3W_fnc_setCMoney;
 				_player setVariable [_key, _objectID, true];
 			}
 			else // Timeout