Commit Graph

6376 Commits

Author SHA1 Message Date
ebaydayz 6f0c70989b Remove unnecessary check in player_spawn_2
This doesn't run on the server.
2016-12-23 14:59:55 -05:00
ebaydayz bf00c3f8bb Correct comment from 4d3f707 again 2016-12-22 22:20:47 -05:00
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
oiad ce75f87e1d server_updateObject force update for single currency (#1821)
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)
2016-12-13 13:06:57 -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 a60c1931ee Update default steam ports and disable mission voting
These default ports tend to work best for both A2 and A3 as recommended
here:

https://community.bistudio.com/wiki/Arma_3_Dedicated_Server#Port_Forwarding

Most Epoch servers only run one mission, so players should not be able
to vote for a mission change.
2016-12-07 16:31:49 -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
icomrade ef8f838238 Update Readme.md 2016-12-06 16:33:53 -05:00
icomrade 90f967c38c Update Readme.md 2016-12-06 16:33:37 -05:00
ebaydayz 638c7dd8b8 Remove some unused variables 2016-12-06 15:02:18 -05:00
ebaydayz 9234244c72 Clarify diag_log 2016-12-06 14:31:30 -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 86d16131bc Update change log 2016-12-06 13:10:07 -05:00
ebaydayz dd721ec572 Fix issue with tag friendlies #1807 2016-12-06 12:12:38 -05:00
ebaydayz c3af66b23a Fix ServerMagArray count error
(select 2) selects 3rd element

From 252843d @icomrade
2016-12-05 15:45:42 -05:00
ebaydayz 1bb76d2d22 Resolve merge conflict for #1807 2016-12-05 14:40:21 -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 4dc667ac7e Remove unnecessary quotes in scripts.txt
They are only needed if the keyword contains spaces.
2016-12-04 21:51:05 -05:00
ebaydayz 44e585343f Update for servers that had single currency 3.0 installed
Makes life easier for people upgrading 1051 databases. Otherwise their
client will error out on loop in fn_selfActions because dayz_onBack will
be a number when it should be a string.

https://epochmod.com/forum/topic/28493-alpha-release-single-currency-30-storage-default-hive-no-global-banking/
2016-12-04 19:00:46 -05:00
ebaydayz eb150a8289 Fix typo from 9ae0e7e 2016-12-04 14:52:57 -05:00
ebaydayz 9ae0e7eb11 Fix conversion of medical array for old characters
Fixes some converted characters having a <null> value in the "rh_factor"
slot of their medical array causing them to fail to save.
2016-12-04 14:38:47 -05:00
ebaydayz 7ab09b9a9f Fix error with converted characters medical array
Select 12 actually selects the 13th item in an array, so the rh_factor
line will error if the array is equal to twelve.

This was responsible for some converted characters having a <null> value
in the "rh_factor" slot of their medical array causing them to fail to
save.
2016-12-04 14:18:37 -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