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

revert side changes for male

Browse Source 
unlocked additional uniforms for side = 0,
Side =1 is still reserved for females
This commit is contained in:
vbawol 2017-10-10 21:28:47 -05:00
parent a971f5f7cc
commit cd4f557f66
5 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf
View File

@ -262,11 +262,4 @@ if (_dikCode in (actionKeys "NightVision")) then {
};
};
if !(player == vehicle player) then {
if (_dikCode in(actionKeys "Gear") && (isnull (finddisplay 602))) then {
(vehicle player) action ['Gear', (vehicle player)];
_handled = true;
};
};
_handled

4
Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf
View File

@ -76,10 +76,6 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then {
player removeEventHandler [_x, 0];
player addEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)];
} forEach (["CfgEpochClient", "addEventHandler", []] call EPOCH_fnc_returnConfigEntryV2);
// testing for civilan males
_playerObject addRating -2001;
};
} else {
deleteVehicle _playerObject;

3
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -5,9 +5,6 @@ waitUntil {!isNull (findDisplay 46) && (!isNil "EPOCH_loadingScreenDone")};
// load favBar
'load' spawn epoch_favBar_draw;
// set player rating
player addRating -2001;
// force update within 15 seconds
EPOCH_forceUpdate = false;
_forceUpdate = false;

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

@ -1121,9 +1121,6 @@ class CfgLootTable
{ { "U_O_SpecopsUniform_ocamo", "item" }, 1 },
{ { "U_O_CombatUniform_oucamo", "item" }, 1 },
{ { "U_Marshal", "item" }, 1 },
{ { "U_B_Protagonist_VR", "item" }, 1 },
{ { "U_O_Protagonist_VR", "item" }, 1 },
{ { "U_I_Protagonist_VR", "item" }, 1 },
{ { "U_I_FullGhillie_lsh", "item" }, 1 },
{ { "U_I_FullGhillie_sard", "item" }, 1 },
{ { "U_I_FullGhillie_ard", "item" }, 1 },
@ -1153,12 +1150,7 @@ class CfgLootTable
{ { "U_C_Man_casual_4_F", "item" }, 1 },
{ { "U_C_Man_casual_5_F", "item" }, 1 },
{ { "U_C_Man_casual_6_F", "item" }, 1 },
{ { "U_C_IDAP_Man_cargo_F", "item" }, 1 },
{ { "U_C_IDAP_Man_jeans_F", "item" }, 1 },
{ { "U_C_IDAP_Man_TeeShorts_F", "item" }, 1 },
{ { "U_C_IDAP_Man_Tee_F", "item" }, 1 },
{ { "U_C_IDAP_Man_casual_F", "item" }, 1 },
{ { "U_C_IDAP_Man_shorts_F", "item" }, 1 },
// LoW DLC
{ { "U_C_ConstructionCoverall_Red_F", "item" }, 1 },
{ { "U_C_ConstructionCoverall_vrana_F", "item" }, 1 },
{ { "U_C_ConstructionCoverall_Black_F", "item" }, 1 },

2
changelog.md
View File

@ -15,7 +15,6 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a
- Medical items: Adrenaline Shot (adrenaline_epoch), Caffeine Pills (caffeinepills_epoch). Orlistat Pills (orlistat_epoch) by @Helion4 and configs by @DirtySanchez
- Food items: ItemCereals, ItemPowderMilk_F, ItemRiceBox, ItemVitamins. @DirtySanchez
- 84 new Female outfits based on 20 top designs and 4 new pairs of jeans(Blue Patched, Arid Brown, Black/Brown, Black). @DirtySanchez, @ComatoseBadger
- Pricing and loot table additions for 75 additional male uniforms.
- Vehicle Ammo Reloading from Inventory and Vehicle Ammo. @DirtySanchez
- Radiation System with radioactive out of bounds, locations, and random crashed satellites. Model @Helion4
- Digital Geiger Counter - used to detect Radiation. (Sounds @vbawol, Model @Helion4, and UI + digital font @raymix)
@ -37,7 +36,6 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a
- Map support for Chernarus Redux. @xDrokZ and @morgoth0
### Changed
- Male players can wear civilian compatible uniforms. Note that West (side = 1) is still reserved for females. @Ignatz-Heman
- Crafting recipes can now have item requirements and Crafting metal bars now require Smelting Tools.
- Player save and login optimized to use get|setUnitLoadout.
- Karma now persists death and moved to community stats.