Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trader Snowman changed to Trader with Hat

Browse Source
This commit is contained in:
He-Man 2018-12-28 21:30:04 +01:00
parent 220fce033f
commit 1976a7b839
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf
View File

@ -47,16 +47,20 @@ _TraderInit = {
_this setVariable ["AI_ITEMS", _arr, true]; _this setVariable ["AI_ITEMS", _arr, true];
_this addEventHandler ["Killed", { _this call EPOCH_server_traderKilled; }]; _this addEventHandler ["Killed", { _this call EPOCH_server_traderKilled; }];
EPOCH_Traders pushback _this; EPOCH_Traders pushback _this;
if (_this iskindof "MAN") then { addToRemainsCollector[_this];
addToRemainsCollector[_this]; _this addUniform _randomAIUniform;
_this addUniform _randomAIUniform; _this disableAI "FSM";
_this disableAI "FSM"; _this setBehaviour "CARELESS";
_this setBehaviour "CARELESS"; _this setCombatMode "RED";
_this setCombatMode "RED"; _this setSkill 0;
_this setSkill 0; if (_HelloweenDeco) then {
if (_HelloweenDeco) then { removeHeadgear _this;
_this addHeadgear (selectrandom ["thor_mask_epoch","iron_mask_epoch","wolf_mask_epoch","pkin_mask_epoch","clown_mask_epoch","hockey_mask_epoch","plague_mask_epoch","ghostface_mask_epoch","skull_mask_epoch","witch_mask_epoch"]);
}
else {
if (_WinterDeco) then {
removeHeadgear _this; removeHeadgear _this;
_this addHeadgear (selectrandom ["thor_mask_epoch","iron_mask_epoch","wolf_mask_epoch","pkin_mask_epoch","clown_mask_epoch","hockey_mask_epoch","plague_mask_epoch","ghostface_mask_epoch","skull_mask_epoch","witch_mask_epoch"]); _this addHeadgear "santa_hat_epoch";
}; };
}; };
}; };
@ -166,13 +170,7 @@ for "_i" from 0 to (_maxTraderLimit-1) do {
}; };
}; };
EPOCH_TraderSlots deleteAt _traderSlotIndex; EPOCH_TraderSlots deleteAt _traderSlotIndex;
_agent = objnull; _agent = createAgent [_class, _pos, [], 0, "CAN_COLLIDE"];
if (_WinterDeco) then {
_agent = createvehicle ["snowmanDeco_EPOCH", _pos, [], 0, "NONE"];
}
else {
_agent = createAgent [_class, _pos, [], 0, "CAN_COLLIDE"];
};
_agent call _TraderInit; _agent call _TraderInit;
_agent setPosATL _pos; _agent setPosATL _pos;
if (_arrchanged) then { if (_arrchanged) then {
@ -204,15 +202,9 @@ for "_i" from 0 to (_maxTraderLimit-1) do {
}; };
if (!(count (_arr select 0) >= _DynamicTraderRespawnCount) && (nearestobjects [_pos,["Plotpole_EPOCH"],_buildingJammerRange]) isequalto []) then { if (!(count (_arr select 0) >= _DynamicTraderRespawnCount) && (nearestobjects [_pos,["Plotpole_EPOCH"],_buildingJammerRange]) isequalto []) then {
EPOCH_TraderSlots deleteAt _traderSlotIndex; EPOCH_TraderSlots deleteAt _traderSlotIndex;
_agent = objnull; _agent = createAgent [_class, _pos, [], 0, "NONE"];
if (_WinterDeco) then { if !(EPOCH_forceStaticTraders) then {
_agent = createvehicle ["snowmanDeco_EPOCH", _pos, [], 0, "NONE"]; [_agent, _home, _work] execFSM "\epoch_server\system\Trader_brain.fsm";
}
else {
_agent = createAgent [_class, _pos, [], 0, "NONE"];
if !(EPOCH_forceStaticTraders) then {
[_agent, _home, _work] execFSM "\epoch_server\system\Trader_brain.fsm";
};
}; };
_dir = random 360; _dir = random 360;
_agent call _TraderInit; _agent call _TraderInit;

22
Sources/epoch_server/compile/epoch_traders/EPOCH_server_spawnTraders.sqf
View File

@ -65,20 +65,20 @@ for "_i" from 1 to _spawnCount do {
if (daytime > _startTime && daytime < _endTime) then { if (daytime > _startTime && daytime < _endTime) then {
_pos = _work; _pos = _work;
}; };
_agent = objnull; _agent = createAgent [_aiClass, _pos, [], 0, "CAN_COLLIDE"];
if (_WinterDeco) then { addToRemainsCollector[_agent];
_agent = createvehicle ["snowmanDeco_EPOCH", _pos, [], 0, "NONE"]; _agent addUniform _randomAIUniform;
if !(EPOCH_forceStaticTraders) then {
[_agent, _home, [_work, _schedule]] execFSM "\epoch_server\system\Trader_brain.fsm";
};
if (_HelloweenDeco) then {
removeHeadgear _agent;
_agent addHeadgear (selectrandom ["thor_mask_epoch","iron_mask_epoch","wolf_mask_epoch","pkin_mask_epoch","clown_mask_epoch","hockey_mask_epoch","plague_mask_epoch","ghostface_mask_epoch","skull_mask_epoch","witch_mask_epoch"]);
} }
else { else {
_agent = createAgent [_aiClass, _pos, [], 0, "CAN_COLLIDE"]; if (_WinterDeco) then {
addToRemainsCollector[_agent];
_agent addUniform _randomAIUniform;
if !(EPOCH_forceStaticTraders) then {
[_agent, _home, [_work, _schedule]] execFSM "\epoch_server\system\Trader_brain.fsm";
};
if (_HelloweenDeco) then {
removeHeadgear _agent; removeHeadgear _agent;
_agent addHeadgear (selectrandom ["thor_mask_epoch","iron_mask_epoch","wolf_mask_epoch","pkin_mask_epoch","clown_mask_epoch","hockey_mask_epoch","plague_mask_epoch","ghostface_mask_epoch","skull_mask_epoch","witch_mask_epoch"]); _agent addHeadgear "santa_hat_epoch";
}; };
}; };
_agent allowdamage !_TraderGodMode; _agent allowdamage !_TraderGodMode;