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

move isTemporary var to cfgBaseBuilding

Browse Source
This commit is contained in:
vbawol 2016-05-02 18:21:16 -05:00
parent 6c18851850
commit 28cfe61d37
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/epoch_code/compile/building/EPOCH_countdown.sqf
View File

@ -21,7 +21,7 @@
Returns: Returns:
NOTHING NOTHING
*/ */
private ["_posObj","_savedBuildPos","_previousBuildPos","_saveCheck","_endTime","_worldspace","_class","_newObj","_startTime","_objClass"]; private ["_config","_posObj","_savedBuildPos","_previousBuildPos","_saveCheck","_endTime","_worldspace","_class","_newObj","_startTime","_objClass"];
if (!isNull _this) then { if (!isNull _this) then {
@ -63,7 +63,8 @@ if (!isNull _this) then {
_objClass = typeOf _this; _objClass = typeOf _this;
// Spawn temporary static item insead of saving. // Spawn temporary static item insead of saving.
if (getNumber(configfile >> "CfgVehicles" >> _objClass >> "isTemporary") == 1) then { _config = 'CfgBaseBuilding' call EPOCH_returnConfig;
if (getNumber(_config >> _objClass >> "isTemporary") == 1) then {
_worldspace = [getposATL _this, vectordir _this, vectorup _this]; _worldspace = [getposATL _this, vectordir _this, vectorup _this];
deleteVehicle _this; deleteVehicle _this;
_class = getText(configfile >> "CfgVehicles" >> _objClass >> "staticClass"); _class = getText(configfile >> "CfgVehicles" >> _objClass >> "staticClass");

16
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -22,10 +22,22 @@ class CfgBaseBuilding {
{ {
upgradeBuilding[] = { { "FirePlaceOn_EPOCH", { { "WoodLog_EPOCH", 1 } } } }; upgradeBuilding[] = { { "FirePlaceOn_EPOCH", { { "WoodLog_EPOCH", 1 } } } };
removeParts[] = { { "ItemRock", 2 } }; removeParts[] = { { "ItemRock", 2 } };
staticClass = "FirePlace_EPOCH";
simulClass = "Fireplace_SIM_EPOCH";
GhostPreview = "FirePlace_EPOCH";
limitNearby = 2;
bypassJammer = 1;
isTemporary = 1;
}; };
class FirePlaceOn_EPOCH : Default class Fireplace_SIM_EPOCH : FirePlace_EPOCH
{ {
removeParts[] = { { "ItemRock", 2 } }; upgradeBuilding[] = {};
removeParts[] = {};
};
class FirePlaceOn_EPOCH : FirePlace_EPOCH {
upgradeBuilding[] = {};
}; };
class Foundation_EPOCH : Default class Foundation_EPOCH : Default
{ {

6
Sources/epoch_server/compile/epoch_bases/EPOCH_server_removeBUILD.sqf
View File

@ -12,7 +12,7 @@
Github: Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_removeBUILD.sqf https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_removeBUILD.sqf
*/ */
private["_vehSlot", "_gwh", "_wepsItemsCargo", "_magsAmmoCargo", "_objTypes", "_objQty", "_magazine", "_weapon", "_suppressor", "_laser", "_optics", "_arrCount", "_magazineName", "_magazineSize", "_qty", "_objType", "_inventory", "_posWH", "_nearbyWH", "_removeParts", "_isTemporary", "_storageSlot"]; private["_config","_vehSlot", "_gwh", "_wepsItemsCargo", "_magsAmmoCargo", "_objTypes", "_objQty", "_magazine", "_weapon", "_suppressor", "_laser", "_optics", "_arrCount", "_magazineName", "_magazineSize", "_qty", "_objType", "_inventory", "_posWH", "_nearbyWH", "_removeParts", "_isTemporary", "_storageSlot"];
params ["_building","_player",["_token","",[""]]]; params ["_building","_player",["_token","",[""]]];
if !([_player, _token] call EPOCH_server_getPToken) exitWith{}; if !([_player, _token] call EPOCH_server_getPToken) exitWith{};
@ -21,8 +21,8 @@ if (_player distance _building > 20) exitWith{};
// TODO add group check here since this should only be removed by group or owner of pole // TODO add group check here since this should only be removed by group or owner of pole
_objType = typeOf _building; _objType = typeOf _building;
_config = 'CfgBaseBuilding' call EPOCH_returnConfig;
_isTemporary = getNumber(configFile >> "CfgVehicles" >> _objType >> "isTemporary"); _isTemporary = getNumber(_config >> _objType >> "isTemporary");
// check that object has building or storage slot // check that object has building or storage slot
_vehSlot = _building getVariable["BUILD_SLOT", -1]; _vehSlot = _building getVariable["BUILD_SLOT", -1];

17
Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf
View File

@ -12,49 +12,38 @@
Github: Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf
*/ */
private["_worldspace", "_class", "_newObj", "_objHiveKey", "_VAL", "_return", "_upgrade", "_objSlot", "_objType"]; private["_config","_worldspace", "_class", "_newObj", "_objHiveKey", "_VAL", "_return", "_upgrade", "_objSlot", "_objType"];
params ["_object","_player",["_index",0],["_token","",[""]]]; params ["_object","_player",["_index",0],["_token","",[""]]];
if (isNull _object) exitWith{}; if (isNull _object) exitWith{};
if !([_player, _token] call EPOCH_server_getPToken) exitWith{}; if !([_player, _token] call EPOCH_server_getPToken) exitWith{};
_objSlot = _object getVariable["BUILD_SLOT", -1]; _objSlot = _object getVariable["BUILD_SLOT", -1];
_config = 'CfgBaseBuilding' call EPOCH_returnConfig;
if (_objSlot != -1) then { if (_objSlot != -1) then {
_config = 'CfgBaseBuilding' call EPOCH_returnConfig;
_upgrades = getArray(_config >> (typeOf _object) >> "upgradeBuilding"); _upgrades = getArray(_config >> (typeOf _object) >> "upgradeBuilding");
if !(_upgrades isEqualTo []) then { if !(_upgrades isEqualTo []) then {
_upgrade = _upgrades param [_index,[]]; _upgrade = _upgrades param [_index,[]];
_objectPos = getposATL _object; _objectPos = getposATL _object;
_worldspace = [(_objectPos call EPOCH_precisionPos), vectordir _object, vectorup _object]; _worldspace = [(_objectPos call EPOCH_precisionPos), vectordir _object, vectorup _object];
deleteVehicle _object; deleteVehicle _object;
_class = _upgrade select 0; _class = _upgrade select 0;
_newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"]; _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj setVariable ["BUILD_SLOT",_objSlot,true];
_newObj call EPOCH_server_buildingInit; _newObj call EPOCH_server_buildingInit;
_newObj setposATL _objectPos; _newObj setposATL _objectPos;
_newObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; _newObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)];
_newObj call EPOCH_saveBuilding; _newObj call EPOCH_saveBuilding;
}; };
} else { } else {
_objType = typeOf _object; _objType = typeOf _object;
if (getNumber(configFile >> "CfgVehicles" >> _objType >> "isTemporary") == 1) then{ if (getNumber(_config >> _objType >> "isTemporary") == 1) then{
_config = 'CfgBaseBuilding' call EPOCH_returnConfig;
_upgrades = getArray(_config >> (typeOf _object) >> "upgradeBuilding"); _upgrades = getArray(_config >> (typeOf _object) >> "upgradeBuilding");
if !(_upgrades isEqualTo []) then { if !(_upgrades isEqualTo []) then {
_upgrade = _upgrades param [_index,[]]; _upgrade = _upgrades param [_index,[]];
_worldspace = [getposATL _object, vectordir _object, vectorup _object]; _worldspace = [getposATL _object, vectordir _object, vectorup _object];
deleteVehicle _object; deleteVehicle _object;
_class = _upgrade select 0; _class = _upgrade select 0;
_newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"]; _newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setposATL(_worldspace select 0); _newObj setposATL(_worldspace select 0);
_newObj setVectorDirAndUp[(_worldspace select 1), (_worldspace select 2)]; _newObj setVectorDirAndUp[(_worldspace select 1), (_worldspace select 2)];