0.3.9.0546

add server invoked looting text based feedback

Server_Install_Pack/sc/BattlEye/scripts.txt

@@ -13,7 +13,7 @@
 7 attachTo !="EP_light attachTo [player,[0,8.11,_nlZ]];" !="_bomb attachTo [_unit, [0,0,0],\"Pelvis\"];" !="_dogHolder attachTo [_dog, [-0.2,1.2,0.7]];" !="EPOCH_target attachTo[player];" !="_sapperSmoke attachTo [_sapper,[0,0,-0.4]];"" !="_cage attachTo [_cage2,[0,1.3,0]];"
 7 enableCollisionWith
 7 hideObject !="_dogHolder hideobject true;" !="_dogHolder hideobject false;" !="player hideobject true;" !="_ship hideobject true;\n_ship hideobjectglobal true;"
-7 setvelocity !="setVelocityTarget" !="_bolt setPosATL _pos;\n_bolt setVelocity [0, 0, -10];" !="EPOCH_target setvelocitytransformation" !="_currentTarget setVelocity [0,0,-0.01];" !="_head setVelocity [\n(sin _dir * _speed), \n(cos _dir * _speed)" !="_vel = velocity this; _dir = getDir player; this setVelocity[(_vel select 0)+(sin _dir * 2),(_vel select 1)+(cos _dir * 2),(_vel select 2)];" !="_head setVelocity [random 2,random 2,10];" !="_bobber setVelocity [0,-1,-1];" !="_bobber setVelocity [0,-1,-10];" !="_x setvelocity [0,0,0.1];" !="_veh setVelocity [0,0,0];" !="_this select 0 setvelocity (_this select 1)" !="_zombie setVelocityTransformation [_aslPos,_aslPos,_unitV,_unitV,_unitvDir,_vDir,_unitvUp,_unitvUp,2];"
+7 setvelocity !="setVelocityTarget" !="_bolt setPosATL _pos;\n_bolt setVelocity [0, 0, -10];" !="EPOCH_target setvelocitytransformation" !="_currentTarget setVelocity [0,0,-0.01];" !="_head setVelocity [\n(sin _dir * _speed), \n(cos _dir * _speed)" !="_vel = velocity this; _dir = getDir player; this setVelocity[(_vel select 0)+(sin _dir * 2),(_vel select 1)+(cos _dir * 2),(_vel select 2)];" !="_head setVelocity [random 2,random 2,10];" !="_bobber setVelocity [0,-1,-10];" !="_x setvelocity [0,0,0.1];" !="_veh setVelocity [0,0,0];" !="_this select 0 setvelocity (_this select 1)" !="_zombie setVelocityTransformation [_aslPos,_aslPos,_unitV,_unitV,_unitvDir,_vDir,_unitvUp,_unitvUp,2];"
 7 assignAs !="assignAsCargo" !="_unit assignAsGunner _axeCopter;" !="_driver assignAsDriver _axeCopter;" !="axeVIP assignAsDriver vehicle axeVIP;"
 7 assignAsCargo !="_x assignAsCargo axeGeneralsBoat;" !="axeVIP assignAsCargo vehicle player;" !="axeVIP assignAsCargo vehicle axeVIP;"
 7 allowDamage !="_unit allowDamage false;" !="_unit allowDamage true;" !="player allowDamage true;" !="vehicle player allowDamage true;" !="player allowDamage false;" !="_target allowDamage true;" !="_cargo allowDamage false;"

Sources/epoch_code/compile/EPOCH_lootTrash.sqf

@@ -76,15 +76,11 @@ if (diag_tickTime - EPOCH_lastTrash > 2)  then {
 		// send
 		[_lootAnimalObj, player, Epoch_personalToken] remoteExec ["EPOCH_server_lootAnimal",2];
 		_return = true;
-		["Object Looted", 5] call Epoch_message;
-
 	};
 	if (!isNull _destroyTrashObj) then {
 		[_destroyTrashObj, _trashType, player, Epoch_personalToken] remoteExec ["EPOCH_server_destroyTrash",2];
-		EPOCH_playerSoiled = (EPOCH_playerSoiled + 1) min 100;
+		_interactAttributes = [["Soiled",1]];
 		_return = true;
-		["Object Looted", 5] call Epoch_message;
-
 		// Snake Den
 		if (random 1 < 0.04) then {
 			_animalPos = getposATL _destroyTrashObj;

Sources/epoch_code/compile/setup/masterLoop/Event4.sqf

@@ -2,7 +2,7 @@ _nearByBobbersLocal = (player nearEntities[["Bobber_EPOCH"], 12]) select {local
 if !(_nearByBobbersLocal isEqualTo []) then {
 	if ((random 100) < 50) then {
 		_bobber = selectRandom _nearByBobbersLocal;
-		_bobber setVelocity [0,-1,-1];
+		_bobber setVelocity [0,-1,-10];
 		_bobber setVariable ["EPOCH_fishOnLine" , diag_tickTime];
 	};
 };

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=545;
+build=546;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=545;
+build=546;

Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf

@@ -12,7 +12,7 @@
     Github:
     https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf
 */
-private["_cfgBaseBuilding","_worldspace", "_class", "_newObj", "_objHiveKey", "_VAL", "_return", "_upgrade", "_objSlot", "_objType"];
+private ["_cfgBaseBuilding","_class","_newObj","_upgrade","_objSlot","_objType","_upgrades"];
 params ["_object","_player",["_index",0],["_token","",[""]]];
 
 if (isNull _object) exitWith{};
@@ -25,7 +25,6 @@ if (_objSlot != -1) then {
 	if !(_upgrades isEqualTo []) then {
 		_upgrade = _upgrades param [_index,[]];
 		_class = _upgrade select 0;
-
 		_newObj = [_class,_object] call EPOCH_swapBuilding;
 		_newObj setVariable ["BUILD_SLOT",_objSlot,true];
 		_newObj call EPOCH_server_buildingInit;

Sources/epoch_server/compile/epoch_looting/EPOCH_server_destroyTrash.sqf

@@ -35,6 +35,8 @@ if (!(_object isKindOf "All")) then {
 		if (isClass _config) then {
 			if (random 1 < getNumber(_config >> "chance")) then {
 				[_item, _payout] call EPOCH_serverLootObject;
+				_errorMsg = "You found something!";
+				[_errorMsg, 5] remoteExec ['Epoch_message',_player];
 			};
 		};
 

Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootAnimal.sqf

@@ -32,5 +32,8 @@ if !(isNull _object) then {
 		_class = _objectClass;
 	};
 	[_item, _class, true] call EPOCH_serverLootObject;
+
+	_errorMsg = "You found something!";
+	[_errorMsg, 5] remoteExec ['Epoch_message',_player];
 };
 true

Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf

@@ -45,8 +45,12 @@ if !(_object in EPOCH_cleanupQueue) then {
 		};
 
 		[_object, _type] call EPOCH_serverLootObject;
+		_errorMsg = "You found something!";
+		[_errorMsg, 5] remoteExec ['Epoch_message',_player];
 	} else {
 		[_object, "Food"] call EPOCH_serverLootObject;
+		_errorMsg = "You found Food!";
+		[_errorMsg, 5] remoteExec ['Epoch_message',_player];
 	};
 
 	if ((random 1) <= EPOCH_antagonistChanceLoot) then{

Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf

@@ -223,7 +223,10 @@ if (_slot != -1) then {
 									_current_crypto = _current_crypto - _itemWorth;
 									_tradeQtyTotal = _tradeQtyTotal + _itemQty;
 								} else {
-									diag_log "DEBUG: no slots found to spawn vehicle";
+									// diag_log "DEBUG: no slots found to spawn vehicle";
+									// [_errorMsg, 5] call Epoch_message;
+									_errorMsg = "Failed to purchase vehicle.";
+									[_errorMsg, 5] remoteExec ['Epoch_message',_player];
 								};
 							};
 						} else {

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=545;
+build=546;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=545;
+build=546;

build.txt

@@ -1 +1 @@
-545
+546