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

Missing configs / small fixes

Browse Source
This commit is contained in:
He-Man 2019-01-21 20:13:44 +01:00
parent feffbaa6f3
commit c20951eb03
12 changed files with 98 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/EPOCH_AutoRun_Check.sqf
View File

@ -22,9 +22,11 @@ _canAutoRun = true;
if !(alive player) exitwith { if !(alive player) exitwith {
false false
}; };
/*
if !(istouchingground player) exitwith { if !(istouchingground player) exitwith {
false false
}; };
*/
if !((vehicle player) == player) exitwith { if !((vehicle player) == player) exitwith {
false false
}; };

2
Sources/epoch_code/compile/building/EPOCH_upgradeBUILD.sqf
View File

@ -116,7 +116,7 @@ if (_object isKindOf "Constructions_static_F") then {
_canUpgradePartCount = _canUpgradePartCount + _req; _canUpgradePartCount = _canUpgradePartCount + _req;
} forEach _upgradeParts; } forEach _upgradeParts;
_doors = ["WoodLargeWallDoorL_EPOCH","WoodWall4_EPOCH","CinderWallDoorwHatch_EPOCH","WoodStairs3_EPOCH"]; _doors = ["WoodLargeWallDoorL_EPOCH","WoodWall4_EPOCH","CinderWallDoorwHatch_EPOCH","WoodStairs3_EPOCH","JailWallDoor_EPOCH"];
_gates = ["CinderWallGarage_EPOCH","WoodWallGarage_EPOCH","MetalWallGarage_EPOCH"]; _gates = ["CinderWallGarage_EPOCH","WoodWallGarage_EPOCH","MetalWallGarage_EPOCH"];
if (_canUpgrade) then { if (_canUpgrade) then {
_upgradeto = _upgrade select 0; _upgradeto = _upgrade select 0;

2
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -132,7 +132,7 @@ if (_forceBloodRise) then {
if (_allowBloodDrop || _forceBloodDrop) then { if (_allowBloodDrop || _forceBloodDrop) then {
// allow player to bleed out or die from hypothermia // allow player to bleed out or die from hypothermia
_lowerBPlimit = [100,0] select (isBleeding player || _forceBloodDrop); _lowerBPlimit = [100,0] select (isBleeding player || _forceBloodDrop);
_playerBloodP = [_playerBloodPKey, -1, _playerBloodPMax , _lowerBPlimit] call EPOCH_fnc_setVariableLimited; _playerBloodP = [_playerBloodPKey, -0.1, _playerBloodPMax , _lowerBPlimit] call EPOCH_fnc_setVariableLimited;
}; };
}; };

BIN
Sources/epoch_code/customs/Defuse.paa
View File

Binary file not shown.

2
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
View File

@ -597,7 +597,7 @@ class Defuse_Bomb
{ {
condition = "if (player != vehicle player) exitwith {false};if (player distance dyna_cursorTarget > 3.5) exitwith {false};!((gettext (configfile >> 'cfgammo' >> (typeof dyna_cursorTarget) >> 'defaultMagazine')) isEqualTo '')"; condition = "if (player != vehicle player) exitwith {false};if (player distance dyna_cursorTarget > 3.5) exitwith {false};!((gettext (configfile >> 'cfgammo' >> (typeof dyna_cursorTarget) >> 'defaultMagazine')) isEqualTo '')";
action = "dyna_cursorTarget spawn Epoch_DefuseBomb"; action = "dyna_cursorTarget spawn Epoch_DefuseBomb";
icon = "epoch_code\customs\Defuse.paa"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\Defuse.paa";
tooltip = "Defuse Bomb"; tooltip = "Defuse Bomb";
}; };

2
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -168,7 +168,7 @@ class CfgEpochClient
displayAddEventHandler[] = {"keyDown","keyUp"}; displayAddEventHandler[] = {"keyDown","keyUp"};
keyDown = "(_this call EPOCH_KeyDown)"; keyDown = "(_this call EPOCH_KeyDown)";
keyUp = "(_this call EPOCH_KeyUp)"; keyUp = "(_this call EPOCH_KeyUp)";
addEventHandler[] = {"Respawn","Put","Take","InventoryClosed","InventoryOpened","FiredMan","Killed","HandleRating","HandleScore","GetInMan","GetOutMan"}; addEventHandler[] = {"Respawn","Put","Take","InventoryClosed","InventoryOpened","FiredMan","Killed","HandleRating","HandleScore","GetInMan","GetOutMan","Hit","SeatSwitchedMan","FiredNear"};
Respawn = "(_this select 0) call EPOCH_clientRespawn"; Respawn = "(_this select 0) call EPOCH_clientRespawn";
Put = "(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler;_this call Epoch_custom_EH_Put"; Put = "(_this select 1) call EPOCH_interact;_this call EPOCH_PutHandler;_this call Epoch_custom_EH_Put";
Take = "(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck;_this call Epoch_custom_EH_Take"; Take = "(_this select 1) call EPOCH_interact;_this call EPOCH_UnisexCheck;_this call Epoch_custom_EH_Take";

1
Sources/epoch_config/Configs/CfgItemSort.hpp
View File

@ -1488,6 +1488,7 @@ class CfgItemSort
"uh1h_armed_EPOCH", "uh1h_armed_EPOCH",
"uh1h_armed_plus_EPOCH", "uh1h_armed_plus_EPOCH",
"a2_mi8_EPOCH", "a2_mi8_EPOCH",
"a2_ch47f_EPOCH",
"a2_ch47f_armed_EPOCH", "a2_ch47f_armed_EPOCH",
"a2_ch47f_armed_plus_EPOCH", "a2_ch47f_armed_plus_EPOCH",
"C_Heli_Light_01_armed_EPOCH", "C_Heli_Light_01_armed_EPOCH",

5
Sources/epoch_config/Configs/CfgPricing.hpp
View File

@ -4881,6 +4881,11 @@ class CfgPricing
price = 22500; price = 22500;
tax = 0.9; tax = 0.9;
}; };
class a2_ch47f_EPOCH
{
price = 22500;
tax = 0.9;
};
class a2_ch47f_armed_EPOCH class a2_ch47f_armed_EPOCH
{ {
price = 30000; price = 30000;

24
Sources/epoch_server_settings/configs/CfgLootTable.h
View File

@ -379,10 +379,30 @@ class CfgLootTable
{ { "SMG_01_F", "weapon" }, 9 }, { { "SMG_01_F", "weapon" }, 9 },
{ { "SMG_02_F", "weapon" }, 9 }, { { "SMG_02_F", "weapon" }, 9 },
{ { "Rifle_SMG_03", "CfgLootTable" }, 9 }, { { "Rifle_SMG_03", "CfgLootTable" }, 9 },
{ { "hgun_PDW2000_F", "weapon" }, 10 } { { "hgun_PDW2000_F", "weapon" }, 10 },
{ { "A2_Rifles", "CfgLootTable" }, 10 }
};
};
class A2_Rifles
{
items[] = {
{ { "a2_ak47s_gold_EPOCH", "weapon" }, 1 },
{ { "a2_AK107_EPOCH", "weapon" }, 1 },
{ { "a2_bizon_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch_scoped", "weapon" }, 1 },
{ { "a2_fnfal_epoch", "weapon" }, 1 },
{ { "a2_G36_C_epoch", "weapon" }, 1 },
{ { "a2_Mg36_epoch", "weapon" }, 1 },
{ { "a2_leeenfield_epoch", "weapon" }, 1 },
{ { "a2_m110_epoch", "weapon" }, 1 },
{ { "a2_mk16_epoch", "weapon" }, 1 },
{ { "a2_mk17_epoch", "weapon" }, 1 },
{ { "a2_svd_epoch", "weapon" }, 1 },
{ { "a2_VSS_vintorez_epoch", "weapon" }, 1 },
{ { "a2_aks74un_EPOCH", "weapon" }, 1 }
}; };
}; };
class Rifle_l85a2_epoch class Rifle_l85a2_epoch
{ {
items[] = { items[] = {

23
Sources/epoch_server_settings/configs/CfgLootTable_CUP.h
View File

@ -471,12 +471,31 @@ class CfgLootTable_CUP
{ { "SMG_02_F", "weapon" }, 9 }, { { "SMG_02_F", "weapon" }, 9 },
{ { "Rifle_SMG_03", "CfgLootTable" }, 9 }, { { "Rifle_SMG_03", "CfgLootTable" }, 9 },
{ { "hgun_PDW2000_F", "weapon" }, 10 }, { { "hgun_PDW2000_F", "weapon" }, 10 },
{ { "A2_Rifles", "CfgLootTable" }, 10 },
// CUP custom // CUP custom
{ { "CUP_arifles", "CfgLootTable" }, 5 }, { { "CUP_arifles", "CfgLootTable" }, 5 },
{ { "CUP_shotguns", "CfgLootTable" }, 5 }, { { "CUP_shotguns", "CfgLootTable" }, 5 },
{ { "CUP_smg", "CfgLootTable" }, 5 } { { "CUP_smg", "CfgLootTable" }, 5 }
};
};
class A2_Rifles
{
items[] = {
{ { "a2_ak47s_gold_EPOCH", "weapon" }, 1 },
{ { "a2_AK107_EPOCH", "weapon" }, 1 },
{ { "a2_bizon_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch_scoped", "weapon" }, 1 },
{ { "a2_fnfal_epoch", "weapon" }, 1 },
{ { "a2_G36_C_epoch", "weapon" }, 1 },
{ { "a2_Mg36_epoch", "weapon" }, 1 },
{ { "a2_leeenfield_epoch", "weapon" }, 1 },
{ { "a2_m110_epoch", "weapon" }, 1 },
{ { "a2_mk16_epoch", "weapon" }, 1 },
{ { "a2_mk17_epoch", "weapon" }, 1 },
{ { "a2_svd_epoch", "weapon" }, 1 },
{ { "a2_VSS_vintorez_epoch", "weapon" }, 1 },
{ { "a2_aks74un_EPOCH", "weapon" }, 1 }
}; };
}; };
class CUP_arifles class CUP_arifles

24
Sources/epoch_server_settings/configs/CfgLootTable_MAD.h
View File

@ -379,10 +379,30 @@ class CfgLootTable_MAD
{ { "SMG_01_F", "weapon" }, 9 }, { { "SMG_01_F", "weapon" }, 9 },
{ { "SMG_02_F", "weapon" }, 9 }, { { "SMG_02_F", "weapon" }, 9 },
{ { "Rifle_SMG_03", "CfgLootTable" }, 9 }, { { "Rifle_SMG_03", "CfgLootTable" }, 9 },
{ { "hgun_PDW2000_F", "weapon" }, 10 } { { "hgun_PDW2000_F", "weapon" }, 10 },
{ { "A2_Rifles", "CfgLootTable" }, 10 }
};
};
class A2_Rifles
{
items[] = {
{ { "a2_ak47s_gold_EPOCH", "weapon" }, 1 },
{ { "a2_AK107_EPOCH", "weapon" }, 1 },
{ { "a2_bizon_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch_scoped", "weapon" }, 1 },
{ { "a2_fnfal_epoch", "weapon" }, 1 },
{ { "a2_G36_C_epoch", "weapon" }, 1 },
{ { "a2_Mg36_epoch", "weapon" }, 1 },
{ { "a2_leeenfield_epoch", "weapon" }, 1 },
{ { "a2_m110_epoch", "weapon" }, 1 },
{ { "a2_mk16_epoch", "weapon" }, 1 },
{ { "a2_mk17_epoch", "weapon" }, 1 },
{ { "a2_svd_epoch", "weapon" }, 1 },
{ { "a2_VSS_vintorez_epoch", "weapon" }, 1 },
{ { "a2_aks74un_EPOCH", "weapon" }, 1 }
}; };
}; };
class Rifle_l85a2_epoch class Rifle_l85a2_epoch
{ {
items[] = { items[] = {

21
Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h
View File

@ -471,6 +471,7 @@ class CfgLootTable_MADCUP
{ { "SMG_02_F", "weapon" }, 9 }, { { "SMG_02_F", "weapon" }, 9 },
{ { "Rifle_SMG_03", "CfgLootTable" }, 9 }, { { "Rifle_SMG_03", "CfgLootTable" }, 9 },
{ { "hgun_PDW2000_F", "weapon" }, 10 }, { { "hgun_PDW2000_F", "weapon" }, 10 },
{ { "A2_Rifles", "CfgLootTable" }, 10 },
// CUP custom // CUP custom
{ { "CUP_arifles", "CfgLootTable" }, 5 }, { { "CUP_arifles", "CfgLootTable" }, 5 },
{ { "CUP_shotguns", "CfgLootTable" }, 5 }, { { "CUP_shotguns", "CfgLootTable" }, 5 },
@ -479,6 +480,26 @@ class CfgLootTable_MADCUP
}; };
}; };
class A2_Rifles
{
items[] = {
{ { "a2_ak47s_gold_EPOCH", "weapon" }, 1 },
{ { "a2_AK107_EPOCH", "weapon" }, 1 },
{ { "a2_bizon_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch", "weapon" }, 1 },
{ { "a2_dmr_epoch_scoped", "weapon" }, 1 },
{ { "a2_fnfal_epoch", "weapon" }, 1 },
{ { "a2_G36_C_epoch", "weapon" }, 1 },
{ { "a2_Mg36_epoch", "weapon" }, 1 },
{ { "a2_leeenfield_epoch", "weapon" }, 1 },
{ { "a2_m110_epoch", "weapon" }, 1 },
{ { "a2_mk16_epoch", "weapon" }, 1 },
{ { "a2_mk17_epoch", "weapon" }, 1 },
{ { "a2_svd_epoch", "weapon" }, 1 },
{ { "a2_VSS_vintorez_epoch", "weapon" }, 1 },
{ { "a2_aks74un_EPOCH", "weapon" }, 1 }
};
};
class CUP_arifles class CUP_arifles
{ {
items[] = { items[] = {