Commit Graph

155 Commits

Author SHA1 Message Date
A Man
3da345b865 Move craft strings, wood piles, planks to epoch crafting
There is no need to use the dayz mod craft if it can be done with the normal epoch craft.
Also allow crafting wood piles directly from wooden logs.
2019-11-02 14:45:54 +01:00
A Man
b0edf3cb75 Fill mixed gas into a chainsaw requires a chainsaw now 2019-11-02 09:57:05 +01:00
A Man
276615a8f1 Fuel container can be emptied now 2019-10-30 10:03:16 +01:00
A Man
d233346563 Updating strings for AK74, RPK74, MG36 magazines
This fixes the error message of duplicated stringtable entry from a commit before.
2019-10-30 10:01:14 +01: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
cc85067f1f Change M32 grenades inventory slots
All M32 grenades still used more as one inventory slot.
2019-10-19 17:56:41 +02:00
A Man
d4b46e4287 Fixing arrow crafting 2019-10-19 15:11:57 +02:00
A Man
47eb85f657 Remove bronze bar from configs
The bronze bar has no model under the wirtten path but it can be spawned in.
2019-10-19 07:44:45 +02:00
A Man
e36dbe0862 Changing picture of empty barrels, germany typo fix (#2016)
* Fix german typo

* Change item picture for the new empty barrels

Methylamin Barrel Empty and Oil Barrel Empty had the same item picture as a filled barrels. It is better to have on all empty barrels the same picture like the empty fuel barrel.
2018-05-09 06:57:04 +12:00
oiad
e1f655106e Add prelocked versions of cinder door/garage
This is as per the wooden versions, adds cinder_door_kit_locked and
cinder_garage_kit_locked.

The same could be done for the version with the door WITHOUT the door
lock, but I feel this is enough.
2018-03-30 23:49:45 +13:00
ebayShopper
efaf1f9399 Update ReadMes
@oiad please keep Epoch specific strings in the dayz_epoch package

The status icons translation was identical to English. @AirwavesMan the
second word is not capitalized for consistency with all other settings
in the game options menu. https://i.imgur.com/eIbPBlM.jpg
2017-12-18 17:53:27 -05:00
oiad
e0b444c3fd Update stringtables, fix translations 2017-12-17 14:50:32 +13:00
icomrade
84a868bbda add consume back to FoodPumpkin
https://epochmod.com/forum/topic/44747-cannot-eat-pumpkins-after-106/
2017-12-16 18:58:56 -05:00
oiad
edc6224bc3 Fix broken string table name
String STR_ITEM_DESC_tent_poles not found
2017-12-17 11:24:10 +13:00
oiad
373aeb2db7 Update stringtable.xml 2017-12-17 11:12:18 +13:00
A Man
d56f3a68f4 7 new items, missing localizations (#2004)
7 new items - server admins can add them if desired

Adding a better and some missing localizations

Adding a localization for the car bomb
2017-12-14 13:29:20 -05:00
ebayShopper
b39a15cdd7 Update vanilla building
Vanilla commit:

ad0d514118
2017-12-04 13:49:12 -05:00
ebayShopper
d6f88fbf8a Add new L85 and SVD variants
Vanilla commits:

8951508770

aad4569581

58e594553b

eaf9648253
2017-11-26 17:39:02 -05:00
A Man
a7f2c88c32 Fix Corepatch AS50 magazine spawn (#1955)
* Fix Corepatch AS50 magazine spawn

The Corepatch broke some of the AS50 magazine spawns. Im not sure why it happend sometimes and sometimes not.

This message showed up sometimes: No entry 'bin\config.bin/CfgMagazines-5Rnd_127x99_as50_CP'.

The CorePatch use that: 

e0d06f7086/CorePatch_CIT_14888/config.cpp

This commit should fix that error message and the AS50 name as well.

* Define 5Rnd_127x99_as50_CP class

* Update AS50 fix

* Revert AS50 ammo fix
2017-06-24 09:34:53 -04:00
ebayShopper
39e05ad0e4 Update vanilla building
Vanilla commits:

2ec04a7f8d

f333910f95

156b90ccb5
2017-06-10 10:45:14 -04:00
ebayShopper
fa18cbce51 Add ghost models for tents
Vanilla commits:

8c48716c43

67c031697b
2017-03-20 18:32:44 -04:00
ebayShopper
53158a11ed Remove rtitleText in fillBloodBag.sqf
Not necessary to inform recipient and prevents two messages on screen at
once for instigator.

Classic bloodbag system is now added in vanilla too.

Vanilla commits:

cb71d926ed

bee9bd1638
2017-03-19 16:35:17 -04:00
ebaydayz
f8047167d8 Fix wrong output on ItemKiloHemp for HempSeed
Reported by Epoch forums user Runewulv
2017-01-22 13:23:01 -05:00
ebaydayz
198ef269d4 Combine player_fillWater and player_drinkWater to one function 2017-01-16 16:35:15 -05:00
ebaydayz
f25f5e96a6 Fix light fire and build fireplace over water #1866
Fixes #1866
2017-01-11 15:25:29 -05:00
ebaydayz
5c8ae96887 Add military flashlight attachments
Vanilla commit:

b6ba294b70
2017-01-09 20:19:01 -05:00
icomrade
c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -05:00
ebaydayz
19e3947669 Fix empty snack bags giving drink option
Thanks @Helios27

https://github.com/EpochModTeam/DayZ-Epoch/issues/1766#issuecomment-263117080
2016-11-27 12:02:29 -05:00
ebaydayz
b6d88b1329 Update vanilla building
Vanilla commits:

9b2092c9f7

674624d122
2016-11-25 16:25:26 -05:00
ebaydayz
2d394c32da Move sharpen action to ItemKnifeBlunt
Avoids confusing message "Missing ItemKnifeBlunt to do this"
2016-11-21 13:55:09 -05:00
ebaydayz
ba43900036 Revert "Allow blunt knife for item actions"
This reverts commit 59a0548f5d.
2016-11-07 17:37:46 -05:00
icomrade
59a0548f5d Allow blunt knife for item actions 2016-11-07 17:14:30 -05:00
ebaydayz
01307f9a42 Remove some common and duplicate translations 2016-11-07 16:14:20 -05:00
ebaydayz
677abe62aa Remove vanilla camo net
Duplicate of Epoch one.

Also had sliding issues when building because it did not have the proper
Epoch offset.
2016-11-05 20:53:22 -04:00
ebaydayz
564144ee41 Revert vanilla work bench to player_buildVanilla
Partial revert of:

2d9097a6af

This workbench is currently not obtainable either by crafting or the
loot tables, so it is not used anyway. But with Epoch player_build
attempting to build it sends the player flying / sliding backwards at
high speed. Using the vanilla player_build that does not happen.

I tested building all the other items changed in the above commit and
none of them have this problem.
2016-11-05 16:34:00 -04:00
A Man
1223e08d79 Fixing string is not displayed correctly (#1791)
* Fixing not shown string

* Fixing not shown string
2016-11-04 20:42:24 -04:00
oiad
497b065663 Localization changes/additions. (#1787)
* Localization changes/additions.

Fixes a few localizations, extends range for removing camo nets from
toolbox by 10m, I have found that 5m is just not enough.

* Toolbox change

Update camonet removal to 10m instead of 5m

* Safe zone no building near/blacklisted buildings no building near

Adds a check in dze_buildChecks to disallow building within a certain
distance of a safezone or a blacklisted object name.

* typo

fix typo

* Safezone/blacklisted changes

As per requests.

* Rework

Rework

* Remove unused variables

as per subject

* Misc changes

Fix unprivated var in calcfreespace
Made single currency buy/sell reporting more englishery
Localization cleanup of extra spaces

* rework

rework
2016-11-04 12:08:47 -04:00
ebaydayz
866358e4d0 Add launcher handling to advanced trading 2016-10-31 13:07:07 -04:00
A Man
aa267bda2c Adding many new strings (#1781)
* More Stringtable updates

Ive added and corrected more german strings. Some german strings were too long. Lots of building items needed a localization. Adding after request the Winter Ghillie Suit localization for Namalsk compatibility.

* Update for new localization

* Update for localization

* Update for new localization

* Update again

* localization update

* Update stringtable.xml

* Update Doors.hpp

* Update ModularBuilding.hpp

* Update stringtable.xml

* Update stringtable.xml

* Update Doors.hpp

* Update Prop_Defs.hpp
2016-10-28 15:05:35 -04:00
oiad
5bc36166a7 Rename plot pole from "30m_plot_kit" to "plot_pole_kit"
Sanity change since the plot pole is not fixed at 30 meters and is
configurable.
2016-10-08 12:51:21 +13:00
A Man
e55b0b1ce5 GP25 wrong text
GP25 had the wrong description text.
2016-10-06 20:07:54 +02:00
ebaydayz
004a3bcde4 Fix wrong string used for Mountain Green soda
Mountain green was using the mountain dew strings too. These strings
were unused.
2016-10-02 20:31:52 -04:00
ebaydayz
341e734373 Change satchel and mines to single gear slot
For consistency with all other items in Epoch.
2016-09-30 21:47:48 -04:00
oiad
64348b1f84 Localization additions
Adds some more text to localization, Moves sandbags around so they are
all next to each other.
2016-09-11 15:21:43 +12:00
icomrade
413e86b521 Reconfigure pook and autogyro magazines
This allows players to carry the magazines, without modification to
ammo.sqf the side guns of the pook transport are supported to be
rearmed. Modification will be required to allow turrets assigned to the
pilot to be rearmed, such as the pook H13 gunship and mozzie grenades.
2016-09-02 12:24:39 -04:00
oiad
f838739975 Supply crate localization fixes
Extends the displayName RSC width to the same as the description (Not
sure why this was so small, it truncated longer display names)
Added localization strings for all the supply crates so they were easier
to distinguish in the gear menu.
2016-08-28 00:02:27 +12: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
ebaydayz
fd90eda8ae Update vanilla player build
Vanilla development commits applied:

a2193626a0

deb7207672

2de1d90edd

8a914606cf
2016-08-21 11:58:32 -04:00
ebaydayz
f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks.
Vanilla development commit:

143f8e4dcb
2016-08-21 11:39:19 -04:00
A Man
9cce8910c2 Adding many new weapons (#1743)
* Update stringtable.xml

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

Lowering DMR spawnrate
2016-08-17 20:05:46 -04:00