W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-21 10:56:29 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,320 Commits 20 Branches 18 Tags
60b513065a60201f16539bd88b46a72713d76d9c
Commit Graph

66 Commits

Author SHA1 Message Date
seelenapparat
147b0fe5ce Added missing 1oz waterbottles 
Fixed:  Added missing 1oz waterbottles.
 2021-08-26 22:04:47 +02:00
AirwavesMan
9ad86a84a3 Group sounds and zombie calls 
dayz_zombieSpeak and player_alertZombies are called often together or should be. fnc_alertZombies groups them together and uses the given parameters. This streamlines and corrects the missing or incorrect calls from dayz_zombieSpeak or player_alertZombies.
 2020-09-12 01:30:45 +02:00
A Man
d15b1432f0 Add DZE_Workshops array 2020-05-27 14:10:18 +02:00
A Man
8315d8999b Remove DayZ Mod crafting and replace it with epoch crafting 
- All dayz mod recipe were moved to epoch crafting.
- This disables the craft dialog in the diary too.
- The player_craftitem got updated and can handle all dayz mod recipes now.
- A few wooden recipes got updated with an need nails now.
- player_craftitem shows all items that are needed for crafting now, no longer only one missing part.
- Add a systemchat text for missing tools, so it can be checked later in the chat.
 2020-05-11 19:55:28 +02:00
A Man
915cf72df3 Adding dayz mod waterbottles 
This commit adds the waterbottles from DayZ Mod. The icons were made by @DeVloek. The waterbottles are fully functional with all actions. To boil a plastic waterbottle you need an empty trash can.

Dogs could not be watered with other waterbottle than the ItemWaterbottle itself. This is fixed now. Also fix missing reset action from hide body.
 2019-10-29 15:23:30 +01:00
A Man
ba8ff32cd7 Localize player_craftItem near check 2019-10-20 20:18:41 +02:00
ebayShopper
48858b2e6c Add medic anim function with proper interrupt 
Closes #1386

Vanilla commits
applied:
f99a3deced
731b957e8e

Removed
two unused files and a few variables made redundant by actionInProgress
 2017-06-06 15:25:14 -04:00
ebayShopper
78fbd7ac53 Remove some unnecessary translations 
Using "Wait for the previous action to complete to perform another" is
more accurate in these cases, because dayz_actionInProgress could have
been set by any action, not necessarily the same one.
 2017-04-15 14:19:26 -04:00
ebaydayz
8c1caa9c1c Remove some redundant checks 
Vanilla commits:

da7061429a

da55eaa53e
 2017-01-29 19:36:48 -05:00
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866 
Fixes #1866
 2017-01-11 15:25:29 -05:00
ebaydayz
33672d99ee Lower or remove nutrition hit for some actions #1857 
Fixes #1857
 2017-01-06 13:27:22 -05:00
ebaydayz
0c15002109 Fix tool loss due to duplicate matchbox and knife issue #1849 2017-01-03 15:30:50 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz 
should fix #1838 Translation fixes are probably necessary
 2016-12-29 15:50:53 -05:00
A Man
3151c0df84 Update player_craftItem.sqf (#1830) 
Adding the ability to craft with all Dayz_Ignators when dayz_matchboxCount = true; For example crafting a Firebarrel
 2016-12-26 14:11:22 -05:00
ebaydayz
261dc4b373 Allow crafting with dull knife 
Output is still reduced for dull knife when gutting animals.
 2016-11-07 17:37:22 -05:00
ebaydayz
c2b16f0828 Consolidate DZE_ActionInProgress and r_action_count to one variable 
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
 2016-08-25 15:38:27 -04:00
icomrade
2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
icomrade
60c37e8b76 Fix duplicate action fix when crafting 2016-07-30 10:37:19 -04:00
ebaydayz
d46eb13267 Fix redirect to vanilla player_craftItem 2016-04-17 22:51:10 -04:00
ebaydayz
5157228e67 Update all cutText to dayz_rollingMessages 2016-04-16 15:47:49 -04:00
ebaydayz
666ace6d54 Cleanup duplicate and unused strings 
Cargo count is shown at the top of the gear menu now
 2016-04-04 16:58:59 -04:00
ebaydayz
3f6cd7de42 Fix some errors 2016-03-31 14:45:13 -04:00
ebaydayz
91f9b3e33b Make UI toggleable between three options 
Admin can choose vanilla, classic epoch or classic epoch dark.

dayz_hungerThirst was replaced with dayz_NutritionSystem
 2016-03-29 19:54:19 -04:00
ebaydayz
71b975b05e Actions cleanup 2016-03-29 14:47:28 -04:00
ebaydayz
e2e6e79394 Minor formatting cleanup 2016-03-21 17:58:23 -04:00
ebaydayz
fd78f27250 Fix copy key failing when player has no backpack 
Related to #1567, so I made this a function so it can be reused. People
should call this whenever they are adding a toolbelt item which the
player may already have. It has localized strings and handles spawning
the weapon holder on water, land and rooftop.

Tested both the sledgehammer and key copying. Confirmed all three
conditions are working.
 2016-02-18 22:12:13 -05:00
ebaydayz
65c2a7e6b4 Fix opening supply crate over water 
See #1558
 2016-02-18 19:38:23 -05:00
icomrade
7151e455c9 Should Fix #1559 2016-02-17 22:48:31 -05:00
icomrade
c3ed4e49e1 Replace sleep with uiSleep 
see the below links for more info. uiSleep is based off of a more
accurate method of tracking time, whereas sleep can fluctuate depending
on application performance since it is based on framerate.
https://community.bistudio.com/wiki/uiSleep
https://community.bistudio.com/wiki/sleep_vs_uiSleep
https://community.bistudio.com/wiki/sleep
 2016-02-17 13:03:17 -05:00
ebaydayz
1ade44eb35 Fix for crafting multiple SledgeHammers 
Revision of https://github.com/EpochModTeam/DayZ-Epoch/pull/1567

Thanks @Namindu
 2016-02-16 17:23:57 -05:00
icomrade
8af00ef284 Fix #1351 2014-06-30 18:54:12 -04:00
icomrade
0176e5efbb fix #1318 
Issue caused by f0e7622856
 2014-06-13 16:50:39 -04:00
[VB]AWOL
234b97f4b2 revert counts here should fix #1318 
This likely was causing issues with crafting also and (performance gain
is unknown)
 2014-06-11 16:49:24 -05:00
icomrade
6b9b176736 More #1288 2014-06-01 03:29:44 -04:00
icomrade
e54b9983dd Replace forEach with Count 
Use count where you do not need _forEachIndex variable, it's quicker
than forEach.
 2014-05-27 15:37:57 -04:00
[VB]AWOL
c0a9f28c07 comment out more debug 2014-02-27 09:34:57 -06:00
Florian Kinder
d48f11bb9f Merge pull request #1125 from vbawol/Feature/0 
Updated Craftitem & split config
 2014-02-15 02:08:39 +01:00
Florian Kinder
f0e7622856 Fixed Error in expression 
Error in expression <_ret = _this select _ret;
};
_ret
>
Error position: <_ret
>
Error Undefined variable in expression: _ret
File z\addons\dayz_code\compile\BIS_fnc\fn_selectRandom.sqf, line 23
Error in expression <BIS_fnc_selectRandom;
_outputWeapons =
[_selectedWeapon];
_selectedMag = _select>
Error position: <_selectedWeapon];
_selectedMag = _select>
Error Undefined variable in expression: _selectedweapon
File z\addons\dayz_code\actions\player_craftItem.sqf, line 193
Error in expression <t_doLoop = false;
};
{
player addWeapon _x;
}
forEach _outputWeapons;
{

_itemOu>
Error position: <_x;
} forEach _outputWeapons;
{

_itemOu>
Error Undefined variable in expression: _x
File z\addons\dayz_code\actions\player_craftItem.sqf, line 200
 2014-02-14 00:31:50 +01:00
Florian Kinder
cf8dd1180e Updated CraftItem 
Always the first/full waterbottle will be taken by melting ores to bars.
To prevent this the bottle with the lowest waterlevel will be taken
 2014-02-12 22:30:37 +01:00
[VB]AWOL
46812d8ded Trade counter was incorrectly returning number of output items 2014-02-10 11:09:51 -06:00
Florian Kinder
e870ea6ab8 Fixed CraftItem 2014-02-09 15:27:21 +01:00
Florian Kinder
e4c9e90442 Added Config Crafting inputstrict 2014-02-09 03:41:37 +01:00
[VB]AWOL
5ec3caac17 multi use water bottle for smelting ore 2014-01-26 20:14:23 -06:00
[VB]AWOL
b551a6f343 should allow crafting weapons only 2014-01-26 11:49:03 -06:00
[VB]AWOL
51c7d3fc87 use getposalt instead of position here fixes 
http://bmrf.me/vbforums/showthread.php?11562-Smelting-Tin-BUG&p=75405#post75405
 2013-12-11 08:17:12 -06:00
[VB]AWOL
7cae21fa06 header updated and send player instead of uid 2013-12-09 22:19:10 -06:00
Zac Surplice
6a58370670 small change 2013-11-27 15:42:38 +11:00
[VB]AWOL
84874daa18 added thirst and hunger loss to all medic animation 2013-11-26 16:08:10 -06:00
[VB]AWOL
c654ab316e incorrect missing tools stringtable 2013-11-17 00:24:58 -06:00
Zac Surplice
9a601182bb localization #3 2013-11-07 02:05:05 +11:00