Commit Graph

838 Commits

Author SHA1 Message Date
oiad
aa6dd4fa4d Cinder block text changes
This makes Block doorways and block garage door ways Cinder doorways and
Cinder garage door ways so they will be alphabetized properly.

It was always annoying having block doorways not near cinder stuff.
2016-08-07 11:28:26 +12:00
ebaydayz
875b34417e Add missing HangarSmall loot group 2016-08-05 19:17:16 -04:00
ebaydayz
c47adbbdb0 Remove CZ_VestPouch_EP1 from traders
This backpack is pointless, since it is the same model as
DZ_Czech_Vest_Puch with half the slots. The traders already have
DZ_Czech_Vest_Puch.
2016-08-04 15:44:58 -04:00
ebaydayz
de9d3feb0f Updated Some loot Locations.
Vanilla development commit:

db96d1c8c5

Note: does not affect buildings with Epoch loot positions. Vanilla
positions are commented out on those buildings.
2016-08-03 14:28:23 -04:00
A Man
f3c80934b4 Small loot tweaks for balance (#1719)
* Small loot tweak

Lowered the spawn chance of duct tape a bit.

* Small loot tweaks

Smaller spawn chance of binoculars, Knife and maps
2016-08-01 18:13:05 -04:00
ebaydayz
d2bf8b30eb Update config trader from 34f9f97
Forgot to update m16a2_dz (supports GL now).

34f9f97aa3
2016-07-31 20:32:53 -04:00
ebaydayz
a5be49c546 Add handling of magazine overflow in AdvTrade and free slot icons
- Added proper handling of pistol mags and regular mags in gear to
prevent magazine overflow
- Added pre-check if return change will overflow gear + backpack free
space. If change will not fit in gear + backpack free space then buy is
prevented with a message notifying the player. In the case of a sale it
proceeds anyway, but notifies player if overflow occurs (see comments in
returnChange)
- Consolidated duplicate code for calculating free space and returning
cargo of an object into new calcFreeSpace
- Old calculateFreeSpace renamed to displayFreeSpace
- Added Weps/Mags/Bags icons to free slot numbers display
2016-07-31 18:38:53 -04:00
oiad
7c4d25ef1a Advanced trading tidying, spelling fixes, private fixes and string fixes (#1716)
* Advanced trading tidying, spelling fixes, private fixes and string fixes.

Fixes snap building issue with metal floors
Fixed spelling mistakes in various scripts
Fixed formatting uglyness in various scripts
Fixed invalid private lines in various scripts
Changed Advanced trading so buying worked more like selling, You can't
select backpack if you don't have a pack nor can you select a vehicle if
you don't have a vehicle.
Removed some redundant strings from Advanced trading and changed a few
of the strings to be more englishy
Removed the ability to buy a backpack into your backpack (You cant do
this anyway)
Fixed a bug where if you had nothing in your backpack it would break the
checkArrayInConfig script so the titlebar would not refresh correctly
Removed slot counts on no backpack and no vehicle (No need for it, just
clutter)
Moved backpack/vehicle checking to z_at_getContainer.sqf

* Last part of tidyness fixes

Last part of tidyness fixes

* Actual backpack fix

Lets actually fix the buying backpack into backpack or backpack when you
already have one.

* Missing from commit

Missing from commit
2016-07-30 10:03:00 -04:00
ebaydayz
b1ae6c4a60 Fix unknown entity RPT error for Padlock and Frank&Beans
Vanilla development commit:

955c7a263c
2016-07-29 14:34:45 -04:00
ebaydayz
1bfc6b3c31 Fix combat status_bg not matching other icons' status_bg sizes
See
fbc7754750
for discussion
2016-07-28 15:37:26 -04:00
ebaydayz
cbbbe1bd8f Randomized tree directions
Vanilla development commit:

beac505eb4
2016-07-28 10:49:28 -04:00
ebaydayz
f84140c555 Don't clear buying list on category switch + AdvTrade fixes
The buying list now acts like a shopping cart. It is no longer cleared
when switching between categories or containers. Closing the dialog or
switching to sell mode still clears it.

Also fixed:
- Filter button in sell mode
- Bug where filtering sellable list readded items already moved to
selling list
- Visual price display not clearing when remove all button is used on
buying list
- Gear container picture showing rank instead of portrait in buy mode
- Dialog is no longer closed when trying to sell zero items
- LbCurSel is now reset when the buyable list is cleared
- Category is no longer opened onLbSelChanged. Instead you need to
double click or use the "View" button, so the arrow keys can be used for
selecting too.
2016-07-27 18:40:03 -04:00
icomrade
bd91044e7b Fix duplicate action check with vanilla objects
+ typo fix
2016-07-27 11:08:50 -04:00
icomrade
c847f8c756 Remove create stash option 2016-07-26 21:01:21 -04:00
icomrade
a72498671d Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 12:52:31 -04:00
icomrade
23a5584b52 Fix up combat icon + update changelog 2016-07-26 12:52:28 -04:00
oiad
744f162d71 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 13:25:19 +12: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
fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
icomrade
b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
icomrade
ff6e11708a Un-nerf DMR 2016-07-24 16:14:38 -04:00
icomrade
0563f621e2 Fix full cinder wall snap points 2016-07-24 15:28:18 -04:00
icomrade
90932d0061 Don't use weaponHolderBase here
it causes the items that are created to be invisible
2016-07-24 01:46:54 -04:00
ebaydayz
cc2aae59eb Change splint recipe
Vanilla development commit:

6ea5d8ebee
2016-07-23 15:12:08 -04:00
ebaydayz
8ed5a9c7a9 Antibiotics combining
Vanilla development commit:

0602d29530
2016-07-23 15:03:49 -04:00
ebaydayz
34f9f97aa3 Icons, 9mm silencer, m16a2
Vanilla development commit:

896825693d
2016-07-23 14:55:04 -04:00
icomrade
28f6260c16 Building offset adjustments
Most items are now adjusted so you cannot rotate them and slide
backwards even while laying down. Also fixes full cinderwall build
height offset
2016-07-22 23:07:53 -04:00
icomrade
19960f08e2 use player_makeFire to start a fire 2016-07-22 12:23:05 -04:00
icomrade
f808bda2a9 New Config Entry buildText
Allows a string to replace the vehicle display name that will be created
which is typically displayed when building.
2016-07-22 11:06:45 -04:00
icomrade
eeed1febad str_player_31_drink doesn't work for some reason... 2016-07-21 19:48:16 -04:00
icomrade
75a9ca6848 Fix scaffolding 2016-07-21 17:53:43 -04:00
icomrade
51a0640855 Remove right click to harvest wood
You must now actually use the hatchet to chop wood (i think it was like
this in 1.0.5)
2016-07-21 17:03:51 -04: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
ebaydayz
67f6d86440 Use smaller sound muted UI icon and better alignment
Vanilla development commit:

6aba95d251
2016-07-21 14:58:03 -04:00
ebaydayz
9ea9af3272 Change player list and lobby icons to grey instead of blufor
Vanilla development commits:

36337e3c08

3a2d3ac20d

Connecting and normal icons are the same so players can not tell when
someone is in the lobby.

Also removed:
- player name and rank text shown in the top right of diary
- "Current task:" text shown above player list
- "Pool:" text shown in lobby
2016-07-21 14:50:02 -04:00
ebaydayz
f2687345cd Testing Confirmed Kills System.
Vanilla development commit:
4881e00ecf

New - Journal Kills will only update during the session on confirmed
Kills (study dead body).
2016-07-21 11:31:47 -04:00
ebaydayz
9ae21dd4f5 Rifle flashlight fix, translations
Vanilla development commit:
a850f25e14

- Attachment_FL_Rfl -> Attachment_FL
- Sherbet desc
- Take blood translation
- weapons/mods translation fixes for better strings fitting
2016-07-21 11:12:55 -04:00
icomrade
e3fee60a8f Change water bottle image back to canteen image 2016-07-21 00:35:51 -04:00
icomrade
88c7d7d28b Fix < 10 oz water bottle filling 2016-07-21 00:21:52 -04:00
ebaydayz
f314a39e43 Add better sound muted status UI icon and background
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
2016-07-20 15:24:31 -04:00
ebaydayz
2911bffced Fix can't reload partial mag with flares in inventory
Vanilla development commits:

7f7d3e02e7

094f1f18d2

a078e84f11

805b9def10

Also reverted:
51be8aa8a5
since it was not the cause.

See https://github.com/DayZMod/DayZ/issues/641 for the details.
2016-07-18 21:43:08 -04:00
ebaydayz
f60262aff1 Consolidate duplicate Remove Suppressor translations
Vanilla development commit:
66af3465ac
2016-07-16 14:48:53 -04:00
oiad
41c9fde480 Plot for life fixes and typo fixes (#1707)
This fixes the issues I was having with APFL, Basically when downgrading
a locked door the ownerPUID was not getting transferred across so it was
getting a 0 PUID set on it once downgraded so you would then lose access
if there was no plot pole.

Now it correctly gets set and instead of doing 2 PVDZE_Obj_Swaps I am
using an if and else statement.

player_upgrade was also not sending the ownerID into the worldspace
field, this seems to differ from the original APFL script. I also added
in code so that if APFL was enabled and uid is 0 we claim the item with
players UID.

This fixes a typo @ebaydayz introduced to spam the .RPT on startup also
for the shotgun and a typo in the credits.
2016-07-16 13:25:14 -04:00
ebaydayz
c9960e1ec3 Fix MP5 and MP5SD mag displayNames reversed
Vanilla development commit:

cb464b1add
2016-07-10 16:59:04 -04:00
ebaydayz
da5c5bf6cc Credit updates for Sound Files.
Vanilla development commits:

e578c6cb39

c575f09c4b

Also synced spacing and tabs from:

73d557806e
2016-07-10 16:44:07 -04:00
ebaydayz
73d557806e Mag names, Attachments names, Translation fixes
Vanilla development commit:

af9e009bae

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)
2016-07-10 15:25:36 -04:00
ebaydayz
326fda70b1 Add missing SnapPro commit
Missing SnapPro update from
52d5bf8af4

Fix Wood Floor short side snap point
2016-07-09 12:33:53 -04:00
oiad
06c8fef001 Various changes (snappoints, dooraccess and fn_selfactions) (#1706)
* Changes to snappoints.hpp fixes issues with metal floors snapping to a cinder wall. Cinder to cinder will create small gaps and then metal floors won't properly line up unless you start with a metal floor then snap cinders. By making both the same snap size, this fixes this issue.

Changes to doorAccess.hpp makes it possible to unlock doors and downgrade them again. It was setting dze_lock_door to the players UID instead of the door code as it should so the conditions would not be met in fn_selfActions to give you additional access.

Changes to fn_selfActions refine access to certain points more accurately (the way they should be IMO)

1) Adds a check to see if the building item can be upgraded anymore before presenting the menu, this stops you receiving the "upgrade item" action even when the item is fully upgraded
2) Adds access checks to the maintain individual item menu action so only item owner, plot owner and plot friends will see it, same with the above upgrade item menu action, this will also stop you receiving this when you are on someone elses plot that you may not have access to (I.e it's useless)
3) Changes modular building access to be item owner, plot owner and plot friend to remove modular items.
4) Changes plot managment action menu so item owner, plot owner and plot friend can access it. I thought there could be a situation where item owner != plot owner. This can be reverted if that is never possible.
5) Changes downgrading so only item owner, plot owner and plot friends can access it. If someone has the door code that doesn't mean they should be able to remove the combo (IMO)

* typo.
2016-07-09 12:28:39 -04:00
ebaydayz
f7d765e669 Fix STR_ACTIONS_LIGHTFIRE listed twice
Vanilla development commit:

ca8434a9b9
2016-07-03 12:26:56 -04:00
ebaydayz
452ce57618 Temperature badges + heatpack changes + some translation fixes
Vanilla development commit:

e89176d565
2016-07-03 12:01:32 -04:00