Commit Graph

2692 Commits

Author SHA1 Message Date
ebaydayz 0ffbdde2e8 Correct comment from 4d3f707 2016-12-22 22:17:27 -05:00
ebaydayz 4d3f707417 Stop autoRun and remove drink from hands at ponds #1827
Fixes #1827
2016-12-22 21:52:22 -05:00
ebaydayz f1b991acd2 Add M4SPR_DZE which spawns with 30Rnd Stanag default 2016-12-22 15:42:00 -05:00
oiad 9889c8cd76 Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg (#1824)
* server_updateObject force update for single currency

This modifies server_updateObject to force update/save to the hive if
the item being saved is in the DZE_MoneyStorageClasses array.

Previously if you force saved the object multiple times, the coins would
not get updated until the inventory changed, which if this was for a
bank object it would never update.

(This applies if you are using PVDZ_veh_Save to save the object)

* z_at_calcDefaultCurrencyNoImg prettyfication

This fixes a long standing issue in my brain about how this text was
always displayed, to me it seemed very untidy and just thrown together
(since I borrowed it from the IMG version)

Changes the output from this example: 7 Ruby 1 Amethyst 3 Gold 4 10oz
Silver 5 Silver
To this prettier and more logical example: 7 Ruby, 1 Amethyst, 3 Gold, 4
10oz Silver and 5 Silver

Make texts great again!

* z_at_logtrade fixes

Removes hard coded "Coins" text and replaces it with configVariables
version.

Also removes duplicate code and simplifies it.

* Merge z_calcDefaultCurrency and z_calcDefaultCurrencyNoImg

This merges these two files together since they are largely the same,
this also adds an optional argument to change the font size which is
useful for custom scripts that use this function.

Examples of use:

[_number,true] call z_calcCurrency; // Return a string of text with no
images
[_number,false] call z_calcCurrency; // Return a string of text with
images
[_number,false,0.7] call z_calcCurrency; // Return a string of text with
the currency in it and sets the font size to 0.7
2016-12-22 14:16:38 -05:00
ebaydayz 5b7b1d69bd Add HALO spawn height config var
Height can be changed without overwriting player_monitor.fsm now.

Also
fixed my mistake from 3257d0f, need to HALO directly from debug pos for
antiTP compatibility.
2016-12-13 19:50:22 -05:00
ebaydayz c9c31c1a32 Fix wrong bleeding icon on vanilla status UI
Now using the correct updated icon from vanilla. All other icons are up
to date.
2016-12-13 12:14:53 -05:00
ebaydayz b62569932d Fix missing return variable in sched_antiTeleport
My mistake from 5058308
2016-12-12 16:22:43 -05:00
ebaydayz b4c239729c Fix self actions duplicating when changing clothes and looking at a safe
This was also a bug in 1051. Thanks to Epoch forums user jOoPs for
reporting.
2016-12-12 15:23:31 -05:00
ebaydayz bff2a3091d Remove two unused files
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/64ea1eaa76f6d3dce9b3be3685a8642de9390f43
2016-12-11 15:25:57 -05:00
ebaydayz 3257d0fd88 Move HALO spawn below enableSimulation in player_monitor.fsm #1809
Fixes stuck floating in air on Napf when dayz_paraspawn = true; Should
also fix #1809.

Fixes #1809
2016-12-11 13:44:01 -05:00
ebaydayz 46355aed38 Add back missing Epoch player_antiWall call #1817 2016-12-10 21:20:04 -05:00
ebaydayz 2a1bd74eca Fix no damage from hitting ground after HALO if autoOpenChute=-1
My mistake when adding this.
2016-12-10 20:25:36 -05:00
ebaydayz 6ecdabc92d Fix swimming in ground glitch at certain spots on Napf 2016-12-10 16:36:51 -05:00
ebaydayz d0e8291159 Fix floating arrows
Fixes #1815
2016-12-10 15:06:48 -05:00
icomrade f18451ab48 Fix black crush in areas of shadows 2016-12-09 14:14:10 -05:00
ebaydayz c3bf1d29d6 Fix arrow and other WeaponHolderBase inherited destrType #1815
Prevents catching on fire when destroyed.
2016-12-09 13:28:31 -05:00
ebaydayz 4e92255749 Remove equip_Crossbow_Kit from loot tables for now #1814 2016-12-09 12:33:54 -05:00
icomrade 67e0dfee81 Remove Turbo and HoldBreath key blocks 2016-12-08 17:11:45 -05:00
icomrade f34d1820bb Fix full cinder wall vector building #1813 2016-12-08 16:46:23 -05:00
ebaydayz 2c8f236f95 Fix death message in potential case of suicide 2016-12-08 14:37:04 -05:00
ebaydayz 0d4d288d81 Fix DMR and M24 ammo price 2016-12-08 13:37:16 -05:00
ebaydayz f92b751ae3 Fix undefined color error in salvage_vehicle.sqf
Color was undefined if part damage was in any of these ranges:
0.2501 - 0.2599
0.5001 - 0.5999
0.7501 - 0.7599

Fixes related RPT errors:
Unknown attribute any>Remove
Unknown attribute -
Unknown attribute LFWheel
Unknown attribute (76%
Unknown attribute Damage)</t>
2016-12-07 18:50:01 -05:00
ebaydayz 90977e4a31 Update painkillers
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/1596a17b09cfa9c31b38cf1e4f25ef149ff4f4aa
2016-12-07 15:20:17 -05:00
ebaydayz 5094e61723 Update zombie pathing
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/f47d6fe5b94b96e11c26e9bf847455e0722dfc57
2016-12-07 13:25:19 -05:00
ebaydayz dab70963d6 Update POI spawning again
Vanilla commits:

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

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

https://github.com/DayZMod/DayZ/commit/5b85b311ed7702b46c784672ba3e518bffa4a575

https://github.com/DayZMod/DayZ/commit/55518ed792fdc29e3eb04c93e1f11756f6af17c1

https://github.com/DayZMod/DayZ/commit/4a5cb525ef9b0ca28a9b5297a29e571e08d85161
2016-12-07 12:57:06 -05:00
ebaydayz 2160437e79 Convert POI to compact array format
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/c71d8cb23c42407978328418959cb258bd59228f
2016-12-06 19:26:00 -05:00
ebaydayz 66f87fac46 Move two localizations to epoch package in stringtable
Vanilla doesn't refund modulars when deconstructing, Epoch does. Also
upgrade was moved to UserActions of dayz_buildings in vanilla.
2016-12-06 13:59:25 -05:00
ebaydayz dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz 5058308f00 Prevent issues caused by respawn_west marker being moved
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/39bcedb4b6e6c1d61f8e8e837b35f28d3502e231
2016-12-05 14:37:28 -05:00
ebaydayz 2db6692643 Fix undefined var dayz_clientPreload during intro.sqs 2016-12-05 11:14:06 -05:00
ebaydayz 7af0cb2910 Lower numpad minus keydown timer for block cheats
Fewer false positives
2016-12-04 11:37:03 -05:00
ebaydayz f03f116dfc Fix Arma cheats still enterable under certain circumstances
Thanks to Epoch forums user Golgofinyanin for reporting.
https://epochmod.com/forum/profile/13156-golgofinyanin/
2016-12-03 16:50:55 -05:00
ebaydayz 45159d81c2 Update pain sound effect
Vanilla commit:

https://github.com/DayZMod/DayZ/commit/7cdb2e67fde01bb1cff9be98eb76af199c7c065b
2016-12-03 13:25:31 -05:00
ebaydayz 43d14dbdba Avoid potential issues with double private vars
_message is a commonly used var name
2016-12-02 14:39:04 -05:00
ebaydayz 5d1a6939e6 Fix refuel at gas station with generator #1806
Fixed mistake from: e398250

The refuel code was only running if a fuel truck was passed to the
script.

Also removed fuel truck classes that do not exist from the
dze_fueltruckarray.
2016-12-02 12:34:51 -05:00
ebaydayz eacc362e38 Fix z_hunter texture #1805 2016-12-02 10:51:13 -05:00
ebaydayz 119470809f Disable moving of group dialog 2016-12-01 20:31:04 -05:00
ebaydayz baae92f9d8 Remove unused file 2016-12-01 16:28:19 -05:00
ebaydayz 40ea519fd3 Temp fix for vault_pitch.sqf error in 1.0.6 release 2016-12-01 15:31:09 -05:00
ebaydayz c0d5fcf17c Fix vault_pitch PVDZ_obj_Publish array
106 server_publishObject expects inventory as 4th element.
2016-12-01 15:15:04 -05:00
A Man 90453641d4 adding 3 missing german strings (#1804) 2016-12-01 12:46:09 -05:00
ebaydayz 1cd069e2d8 Uncomment PVDZ_dayzCarBomb
Not sure if functional atm, but still in use if ItemCarBomb is script
spawned and right clicked (not obtainable by default). My mistake from
b6d88b1
2016-12-01 10:32:25 -05:00
ebaydayz 74cc99ddad Remove identical lootPos comment
There was no difference between the lootpos except spacing after the
commas.
2016-11-30 12:17:06 -05:00
icomrade c56e0d722c oops, these were already defined 2016-11-30 11:58:35 -05:00
ebaydayz 4ffa25adf2 Improve rejoined group message grammar 2016-11-30 11:58:29 -05:00
icomrade fc98864db9 LootPos for @MGTDB 2016-11-30 11:55:20 -05:00
ebaydayz bee00e9a57 EnableRadio if globalChat death messages are on 2016-11-30 00:36:51 -05:00
ebaydayz 27ee69695c Update my username in readmes 2016-11-30 00:08:52 -05:00
ebaydayz 416fdbc4ab Improve filterCheats and VON block
Filter cheats is now added to the main options menus that needed it.

It is not needed on the map (display 12) because KeyDown for display 46
also fires when it is open. So filterCheats was firing twice (once on
each display) in that case.

KeyDown does not fire on display 63 at all
regardless of whether PTT or VON is held down, toggled or chat open.
Keydown does fire on 55, but only after the mic icon is locked on, so it
is of limited use. MouseButtonDown does not fire on 55 or 63. So it is
useless to add to those displays. You can confirm this with:
(findDisplay 63) displayAddEventHandler ["KeyDown","systemchat
'fired';"];

Filter cheats is now only checked on display 46 when a
voice, channel, or cheat key is pressed instead of on every key press.
This still works 100% of the time for blocking cheat input. For
performance reasons it's probably not worth checking all the conditions
in filterCheats with every key press on display46 just for the VON
block. Doing so covers some edge combination bind cases better, so it
may be worth considering again if no better alternative is found. For
now this solution is good enough to cover the majority of cases without
slowing down the keyhandler during normal usage.

The VON message now
tells you exactly which channel block you triggered instead of listing
all of them.

Fixed issue mentioned in 52c9c7c with VON getting stuck on when using a
double tap keybind.

Tested:
1. Talk in side with regular/combo/mouse bind
2. Change channels
while mic is locked on with regular/combo/mouse bind
3. Change channels
with Up/Down arrows while chat is open.
4. Trying all cases in steps 1-3
with a dialog open.

It is possible to bypass the VON block with some different control
settings and combinations of the above, but for default controls and
common usage it works the majority of the time.
2016-11-29 23:44:28 -05:00
ebayShopper 429a6aec9b Disable moving group dialog 2016-11-29 12:14:08 -05:00