Commit Graph

799 Commits

Author SHA1 Message Date
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
ebaydayz
cc2918989e Remove duplicate status UI icon files 2016-06-25 10:32:46 -04:00
ebaydayz
19285d677a Merge pull request #1704 from AirwavesMan/master
Some more Changes
2016-06-21 20:58:13 -04:00
oiad
801145d664 Advanced trading fixes/modifications (#1698)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -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
25fbaf5757 Small Loot Tweaks
Increased the chance for MortarBucket and CinderBlocks to spawm. Removed the flashlight from spawn in industrial loot.
2016-06-21 21:58:06 +02:00
A Man
4848c3ef5c Changed Prices for balance
Changed prices for balance.
2016-06-21 21:55:01 +02:00
A Man
6d3a76704c Items Added/ Combo Lock Price Changed
I've added a few vanilla items and changed the price of the Combo Lock.
2016-06-21 21:53:48 +02:00
A Man
f47c4e0f2a Reordered Attachments
Reordered the attachments. Similar items should be next to each other
2016-06-21 21:52:20 +02:00
A Man
220fe3696c Backpack prices changed (#1699)
Backpack prices were wrong. It does not make sense to buy a smaller backpack for a higher prices than a bigger backpack.
2016-06-20 21:56:18 -04:00
A Man
2f613226ea Changed more Zombies Typs (#1700)
It does not feel right, when you enter a military area and see only Worker Zombies. I changed the Zombie Typs of the buildings to look more like a military area.
2016-06-20 21:48:45 -04: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
bf3d03ba13 Only spawn small loot in lootPosSmall positions
I did not realize lootPosSmall positions can only fit small objects like
soda cans etc., so it is not okay to merge them with the main lootPos
arrays. This separates them back out.

This solution will work like 1.0.5.1 CfgLootSmall. <GroupName>Small is
used to spawn additional loot if the building type has lootPosSmall
positions available. It is not necessary to add a <GroupName>Small for
types that do not have lootPosSmall positions.

Some of these objects may still be too big or too small (knife,
binoculars, matchbox, etc.) for the positions and look out of place. If
that is the case please submit a pull with any problematic ones removed
from the <GroupName>Small groups (check if they aren't in 1051
CfgLootSmall first). Balance and rates may need adjustment as I just
took the normal groups and removed large objects from them while trying
to keep similar items to 1.0.5.1 CfgLootSmall.
2016-06-20 21:39:21 -04:00
ebaydayz
58d2443e77 Add back Epoch custom lootPos and lootPosSmall
Epoch has custom loot positions for many buildings. Most lootPos have
not changed in vanilla since pre 1.7.x.

The vanilla lootPos are now commented out and  custom Epoch ones are
added back. LootPosSmall positions are now included in lootPos and
marked with //DZE EXTRA

LootPosSmall are included and used by default in 1051, so it is simpler
to add them to the main lootPos lists instead of having a separate loop
in buildingSpawnLoot.sqf for them.
2016-06-18 19:58:58 -04:00
A Man
df6c34cfe9 Loot/Traders update (#1696)
* Update Weapons.hpp

* Update Military.hpp

* Update Industrial.hpp

* Update Industrial.hpp

* Update Military.hpp

* Update Residential.hpp

* Update Military.hpp

* Update Military.hpp

* Update BanditClothing.hpp

* Update BanditAmmunition.hpp

* Update BanditHelicopterArmed.hpp

* Update BanditMilitaryArmed.hpp

* Update BanditTrucksArmed.hpp

* Update BanditWeapons.hpp

* Update FriendlyAssaultRifle.hpp

* Update FriendlyBackpacks.hpp

* Update FriendlyBuildingSupplies.hpp

* Update FriendlyCargoTrucks.hpp

* Update FriendlyChemlitesFlares.hpp

* Update FriendlyFuelTrucks.hpp

* Update FriendlyLightMachineGunAmmo.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPackagedFood.hpp

* Update FriendlyMilitaryUnarmed.hpp

* Update FriendlyPistols.hpp

* Update FriendlyShotgunsandSingleshot.hpp

* Update FriendlyShotgunsandSingleshotAmmo.hpp

* Update FriendlySmokeGrenades.hpp

* Update FriendlySniperRifle.hpp

* Update FriendlySniperRifleAmmo.hpp

* Update FriendlySubmachineGunAmmo.hpp

* Update FriendlySubmachineGuns.hpp

* Update FriendlyToolbeltItems.hpp

* Update FriendlyVehicleParts.hpp

* Update HeroHelicopterArmed.hpp

* Update NeutralAirplanes.hpp

* Update NeutralBlackMarketAmmo.hpp

* Update NeutralBlackMarketWeapons.hpp

* Update NeutralExplosives.hpp

* Update NeutralHelicopterUnarmed.hpp

* Update FriendlyDrinks.hpp

* Update FriendlyLightMachineGun.hpp

* Update NeutralAirplanes.hpp

* Update BanditAmmunition.hpp

* Update FriendlyVehicleParts.hpp

* Update NeutralWholesale.hpp
2016-06-18 12:10:05 -04:00
A Man
72ea372acf Update Military.hpp (#1695)
I just changed the spawing zombie typ for the military special loot. I noticed that there are only "z_new_worker2-4" zombies in the baracks and got a bit confused. So now we have the military zombies back.
2016-06-16 16:22:12 -04:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
8028efbb69 Allow admin customization of player_onPause #1340
Also disable abort and respawn immediately in pause menu onLoad. New
function fn_pauseMenuChecks allows admins to run unscheduled code in
pause menu onLoad.
2016-05-22 12:26:57 -04:00
ebaydayz
301c4348e9 Remove vanilla generator fill actions 2016-05-19 18:35:11 -04:00
ebaydayz
62700f37e4 Add note about splint and broken legs
Since R4z0r doesn't want it changed in vanilla.
2016-05-19 16:29:35 -04:00
ebaydayz
d0c4ccca15 Fix wooden splint recipe output
It was outputting two when it should only be one.
2016-05-18 17:10:46 -04:00
icomrade
2889d8f010 Should fix building issues with player sliding
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
2016-05-18 11:01:38 -04:00
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
icomrade
113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -04:00
ebaydayz
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -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
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
icomrade
2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -04:00
ebaydayz
af14d673f5 Make LMG magazines only take up one slot
All ammo in Configs\CfgMagazines\Magazines\ is back to taking one gear
slot now, same as 1.0.5.1.
2016-05-05 11:14:08 -04:00
icomrade
51be8aa8a5 Fix reloading 2016-05-03 20:19:01 -04:00
icomrade
2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
icomrade
6936a5dd24 Fix packing storage giving no refund 2016-05-03 14:02:57 -04:00
icomrade
c2ce8aaf8b better fix for CH53 and add toggle for #1198 2016-05-03 11:14:26 -04:00
icomrade
ea8c14c5fb Fix #1187
keypadCancel returns false when a combo/keypad dialog is not open and
when reset by calling the code keyPadReset = {uiSleep 2; keypadCancel =
false;};

There is a 2 second delay which makes brute forcing very very time
consuming. Note there must be a delay when resetting the variable since
fn_selfactions will update so quickly it will display the
unlock/lock/remove option before onUnload is executed.
2016-05-03 01:19:36 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -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
icomrade
16fe17645f Don't redefine vehicle EH
doing so breaks the destruction fix
2016-05-01 22:10:38 -04:00