Commit Graph

82 Commits

Author SHA1 Message Date
A Man 52c20fd512 Move fix bottle to epoch crafting 2019-11-04 10:59:06 +01:00
A Man 12bb378ea5 Streamline water bottle strings by @seelenapparat
Water bottles are sorted by the object model in the gear now.

Remove old canteen configs since it is in under pet waterbottle now.
2019-11-04 10:01:46 +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 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 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
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 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 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:

https://github.com/DayZMod/DayZ/commit/cb71d926ed086bb5255a5ab420990931c693fb86

https://github.com/DayZMod/DayZ/commit/bee9bd16382f4c1ece397cd029bb61c775024144
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
icomrade c64c181f95 Handle boiled waterbottles < 10oz
should fix #1838 Translation fixes are probably necessary
2016-12-29 15:50:53 -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 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
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
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
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
icomrade 2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
oiad ad9694844d Snap point changes
This correctly fixes snap points for all cinder related to metal floors.

Anything cinder will now correctly snap to full cinder walls and vice
versa
Metal floors will not have gaps so you can correclty create a 1x1 cube
(as it should be)

Renamed cinder_wall_kit to half_cinder_wall_kit to be in line with
full_cinder_wall_kit since I felt it was confusing. cinder_wall_kit
seems like it would be full to me.

Fixed a string issue when building cancelling to make it more readable.
2016-07-26 13:22:10 +12:00
icomrade 3519297e2d Add drinking and emptying of < 10 oz wattter
Amount of water and infection chance are proportional to the amount of
water.
2016-07-21 15:36:55 -04:00
icomrade 88c7d7d28b Fix < 10 oz water bottle filling 2016-07-21 00:21:52 -04:00
A Man a7bd47054e Add crafting full cinder wall kit
Add crafting full cinder wall kit.
2016-06-21 23:12:14 +02:00
A Man 6f13f8a36e Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame.
2016-06-21 22:27:41 +02:00
A Man 8b6725f77d Fixed CopperBar Display Text (#1701)
The Display text to craft  1x 10oz copper bar was not visible
2016-06-20 21:43:34 -04:00
A Man ee6bf997b4 Increased weight of full_cinder_wall_kit (#1702)
The full_cinder_wall_kit had the same weight as the half. I just increased the weight by almost the double amout.
2016-06-20 21:41:12 -04:00
ebaydayz 3be1d4e6bf Update outhouse and plot pole descriptions
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
2016-05-12 15:10:20 -04:00
icomrade 2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
ebaydayz adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
Anton 2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz 51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
Anton 4e45b23f94 More work on localization support (#1687)
fix stringtable.xml

more fixes

added missing $
2016-04-30 15:54:31 -04:00
Adaptivity 4dc46705f9 More progress on localization support 2016-04-25 15:47:09 +03:00
ebaydayz 6522cca7ce Fix typo from pull #1679
See #1679
2016-04-24 18:58:22 -04:00
Adaptivity 52ee70394a More localization support 2016-04-24 14:11:14 +03:00
ebaydayz 1879fb8707 Fix siphon fuel
ItemJerrycanEmpty no longer inherits from ItemJerrycan
2016-04-22 17:39:52 -04:00
ebaydayz 7732481a8d Add new items to R3F weight config
I split CfgWeight into separate files to make it more readable.
2016-04-07 18:42:44 -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 eda82156be Move CfgServerTrader to dayz_code\configs folder
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
2016-04-04 13:10:01 -04:00
ebaydayz 8de50c4619 New variable for match stick counting 2016-03-31 16:23:09 -04:00
ebaydayz 01529e51bc Update shotgun ammo names
See:
https://github.com/DayZMod/DayZ/commit/634214570c2a6c3efe53e2b09bf01250fcc3d2e2
2016-03-11 14:10:45 -05:00
ebaydayz 09b656abc3 Use 1.8.7 fishing
The fishing models, pictures, etc. in 1.8.7 are identical to the ones in
dayz_epoch, so we should use them instead of having duplicate classes.
2016-03-10 22:30:19 -05:00
ebaydayz 02564a2d30 Move more stuff out of DZE\Misc.hpp
Better organization
2016-03-10 15:44:50 -05:00
ebaydayz 6ca57a099a Move tents to Tent.hpp
This is better organized than having everything in Misc.hpp
2016-03-10 15:02:53 -05:00
ebaydayz 2803847aa0 Remove more unused strings 2016-03-10 14:33:16 -05:00
ebaydayz 18c4c4a203 Misc.hpp formatting
No changes, just removed extra tab.
2016-03-10 13:54:07 -05:00