Commit Graph

896 Commits

Author SHA1 Message Date
icomrade
e8006a40af Non-blocked messages
Displays at the bottom center of the screen. This now accepts formated
(structured) text, see https://community.bistudio.com/wiki/parseText for
more info
2016-09-23 14:02:31 -04:00
A Man
7b22d9dd14 New loot tables for zombies
Adding 3 new  loot tables
2016-09-20 01:28:42 +02:00
A Man
7ea6e9c7a4 Zombie loot update
Adding 3 more options for zombie loot to give admins better possibilities to customize the zombie loot.
2016-09-20 01:27:31 +02:00
A Man
5e3d4c7890 Zombie loot update 2016-09-20 01:25:20 +02:00
A Man
b751ffb278 Small loot position update
Adding Land_stan to loot positions. It is the same like the Camp. Increasing the high of loot positions to prevent loot from spawning in the ground.
2016-09-19 21:45:19 +02:00
icomrade
37a717fe3f Fix generator gear display and Offroad hud
using generator as a tent should have no adverse effects.

Thanks @SmokeyBR
2016-09-19 12:08:25 -04:00
ebaydayz
61f38fc259 Use number instead of string for weapon slot type in configs
This is consistent with the rest of the weapon configs.

It also avoids issues with using isNumber or getNumber to check slot
type in scripts.
2016-09-18 14:58:35 -04:00
icomrade
0802ecc0ed Do not require plot to build traps 2016-09-14 17:48:23 -04:00
ebaydayz
815b54ec44 Fix gut dog
Body was disappearing because it had no meat on it (yield = 0). Thanks
@AirwavesMan
2016-09-14 16:42:25 -04:00
icomrade
26f9102a00 These are used
I didn't save all before commiting :(
2016-09-12 12:57:08 -04:00
icomrade
06202e753f Minor loot/crafting cleanup
removed DayZ fences and unused item, added some crafting supplies to
trader (marginal savings if you craft bandages as opposed to buying
them)
2016-09-12 12:55:47 -04:00
icomrade
caddfafc78 oops 2016-09-11 14:24:20 -04:00
icomrade
b806043a4a Save player and vehicle after trade
Also forgot to commit a change yesterday
2016-09-11 12:52:38 -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
ebaydayz
bbe6be6c31 Rename Multiplayer Setup to Lobby
Vanilla commit:

fd90a380a7
2016-09-10 13:19:31 -04:00
oiad
fed89a0ed2 Advanced trading and safe GUI changes (#1762)
* Advanced trading and safe GUI changes

This adds displaying of item/backpack/weapon/vehicle descriptions
Moves Weapons display on vehicles to a modular type, so if the vehicle
has no weapons it wont display, same with Description

Fixes an issue with safes not sounding keyclicks, at present they are
only active if you have music turned on, since I don't play with music
on (and many others) you will never hear them and when you do, the DTMF
signals they use are really obnoxious.

Replaced the sound with the one from the lockboxes, it's still audible
but very reasonable.

* Advanced trading fixes

Rework for my previous commit @ebaydayz

* Localization additions

Missing from previous commit
2016-09-10 12:09:27 -04:00
ebaydayz
cb09377d26 Add GPS, Rangefinder and NVG back as sell only
Partially reverts
7435548582
@AirwavesMan now that buy or sell only is available via:

ffef031863
2016-09-09 14:05:06 -04:00
ebaydayz
771284a297 Auto select main weapon after throwing
Also added to gear unload so player will auto select pistol if picking
one up with flares in their hands.

Vanilla commit:

08449fdfda
2016-09-06 16:36:45 -04:00
ebaydayz
c8b3053496 Remove unused keyboard_keys function
I moved the compile up in compiles.sqf since vanilla is now updated with
the change:

f5780256ee
2016-09-05 14:16:38 -04:00
icomrade
d1d5fe54f3 Fix cheat handling
This adds keydown handler for chat, map, and diary displays.
Additionally, this can be used to handle malicious chat input without a
delay by modifying the associated compile
2016-09-02 19:14:21 -04: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
icomrade
678acff706 cleanup comment 2016-08-31 18:08:58 -04:00
icomrade
04b6707191 Fix Mozzies/gyrocopters
Fixes wrecks bouncing 500m into the sky, players not dying when crashing
these vehicles, and sound falloff (someone verify in a multiplayer game,
I teleported away from a flying mozzie and it appeared fixed).

I made a new startup and stop sound for the mozzie which is acceptable I
think, but I'm using the MV22 Osprey noise startup and stop noises for
the gyrocopter. The osprey startup is fairly well fitting, but the stop
noice is out of place, if anyone can come up with a better noise please
change it otherwise if it's out of place enough I'll just remove it
altogether.
2016-08-31 18:04:40 -04:00
ebaydayz
16f17aafee Revert "Don't call player_forceSave when gear menu is aborted"
This reverts commit 91e312fdc7.
2016-08-29 12:05:50 -04:00
ebaydayz
cc9ba66888 Add Anzio_20_DZ
https://github.com/EpochModTeam/DayZ-Epoch/pull/1680#issuecomment-243150947
2016-08-29 12:01:06 -04:00
ebaydayz
91e312fdc7 Don't call player_forceSave when gear menu is aborted
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242992472
2016-08-28 16:18:53 -04:00
oiad
d6324723e9 Plot management force maintain option
This replaces the "refresh" menu option with a "force maintain" option.
Allows you to maintain the base even if it doesn't need it to either get
all your items in sync or if you are going away or similar.

Tested with:
dze_permanent plot true/false
z_singlecurrency true/false

Also fixes an undefined variable error in system_monitor that was
introduced
8f58baf3f2
2016-08-28 20:13:25 +12:00
ebaydayz
3f27bef1e3 Add version define in config.cpp
Vanilla commit:

75ff017b53
2016-08-27 10:09:55 -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
icomrade
95310b9000 Re-add observer to UH1Y and AH6X
This fixes config errors for unknown animation sources for both
vehicles. The turrets do not have thermal capabilities and this restores
the missing co-pilot/observer seat in the UH1Y. Also I can't seem to get
the turret on the AH6X to rotate, but if someone knows how please leave
a comment or commit the changes. there's currently no overlay for the
observer of the AH6X since it can't move I feel it's limited enough
without an overlay like the UH1Y.
2016-08-26 15:21:03 -04: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
A Man
454583a461 Better Cessna display names 2016-08-24 00:11:22 +02:00
ebaydayz
6783ef9b1d Merge pull request #1751 from oiad/master
Plot/Door management userlist fix
2016-08-23 13:51:42 -04:00
ebaydayz
29acecc2f2 Retire DZE_MissionLootTable variable
AFAIK there is no performance difference between configFile and
missionConfigFile.

Using missionConfigFile by default simplifies loot scripts and makes the
extra config variable unnecessary. It's one less step for admins to
customize their tables.
2016-08-23 12:57:12 -04:00
oiad
4da8e07cb0 Plot/Door management userlist fix
This fixes the userlist from overflowing onto the Add button when
there's too many users in the userlist.
2016-08-23 23:25:46 +12:00
oiad
6bdc3956fb Plot / door management userlist sorting (#1747)
* Plot / door management userlist sorting

This correctly sorts the nearby humans list in both mods, I have this
running on my 1051 server with no issues, @ebaydayz please advise if
this is not right, I've tested it pretty well and it is indeed selecting
the right person/UID

* Door/plot management fixes

As per @ebaydayz
2016-08-21 17:19:52 -04:00
ebaydayz
df67a35bc7 Add new AN2 skins to trader 2016-08-21 13:48:23 -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
49c6e0c318 Adding many new vehicles to configs (#1746)
* Adding display name for UH60M_MEV_EP1_DZ

* Adding 6 new Mi17 variants to config

Armed:
Mi17_TK_EP1
Mi17_UN_CDF_EP1
Mi17_CDF

Unarmed:
Mi17_medevac_CDF
Mi17_medevac_Ins
Mi17_medevac_RU

* Adding new line for Cessna.hpp

* Adding Cessna to the configs

That removes the radar function from the cessans.

* Adding 1 new An2 version to the config

* Adding 2 more HMMWVs to the config

Ive lowered the maxspeed from the HMMVW_DZ because all HMMWVs have a maxspeed of 100.

New classes:

HMMWV_Armored
HMMWV_M2

* Adding BRDM2 to configs

* Adding line for BRDM2_DZ.hpp

* Update after comments

* Update again

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update HMMWV.hpp

80 is the same as the other high tier armored HMMWV above. 40 is the same as the low tier ones.

* Update HMMWV.hpp

* Update HMMWV.hpp

* Update BRDM2_DZ.hpp

* Update HMMWV.hpp

* Update CHANGE LOG 1.0.6.txt

* Update UH60.hpp

* Update Cessna_DZ.hpp

* Update Cessna_DZ.hpp

* Update NeutralAirplanes.hpp

* Update MI17.hpp

* Update AN2_DZ.hpp
2016-08-21 09:19:34 -04:00
oiad
d987fb290c Advanced trading selling upgraded vehicles.
These changes allow the player to sell upgraded vehicles with them not
being added to the trader (as to not polute the lists). This basically
refers to an upgraded vehicle as a child of the base vehicle so it will
get the same sell price as the base vehicle.

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12:00
ebaydayz
5d372d3351 Add UH60M_MEV #1743
Added to traders in #1743
2016-08-18 13:01:08 -04:00
ebaydayz
73a5f54f05 Slightly adjust some assault rifle loot chances 2016-08-17 20:46:58 -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
ebaydayz
a345b69a77 Swap vanilla ItemPadLock for Epoch ItemComboLock
This greatly simplifies things over having two separate combo lock
classes.
2016-08-17 13:27:08 -04:00
ebaydayz
d62a69b9f5 ArmoredSUV transportMaxMagazines change #1588
Fixes #1588
2016-08-17 10:18:11 -04:00
A Man
4e65c4b473 Add missing re-combine actions for magazines (#1741)
* Updating strings for missing magazins

Adding new magazine names to make it similar to the dayz 1.8.7. names.

Adding 
Mk17
M17 SD
M107
KSVK
L115
VSS

* Adding missing magazines and re-combine option

Mk17
Mk17 SD

* Adding missing magazines and re-combine option

M107
KSVK
L115
VSS

* Update stringtable.xml

Moved new strings to epoch package

* Update 762x51.hpp

Adding the SD indicator. I think the SB instead of SD is too confusing. So everyone knows it is SD ammo.
2016-08-17 09:45:15 -04:00
A Man
7435548582 Small trader changes (#1740)
* Update FriendlyVehicleParts.hpp

Moving Mixed Oil to building supplies.

* Update FriendlyBuildingSupplies.hpp

Adding Mixed Oil.

* Update FriendlyToolbeltItems.hpp

Removing GPS, Range Finder and Night Vision from buylist. These items should be rare items and harder to find than other items.
2016-08-16 13:41:17 -04:00
A Man
14e4e0ac5a Updating for old magazines 2016-08-16 00:35:13 +02:00
ebaydayz
15763f4f2a Consolidate maintain scripts
Thanks to @oiad for making this easy #1735
2016-08-15 16:33:00 -04:00