Commit Graph

4985 Commits

Author SHA1 Message Date
A Man
3151c0df84 Update player_craftItem.sqf (#1830)
Adding the ability to craft with all Dayz_Ignators when dayz_matchboxCount = true; For example crafting a Firebarrel
2016-12-26 14:11:22 -05:00
ebaydayz
64f6a9daa3 Exit vanilla craft item when action is in progress
Fixes #1826
2016-12-25 20:01:55 -05:00
ebaydayz
b962bd50b9 Use faster switch in repair and salvage
7496ef5d5c (commitcomment-20292237)
2016-12-25 17:51:32 -05:00
ebaydayz
1d0a1bf9a2 Add comment about disabling GemWorthArray 2016-12-25 17:29:53 -05:00
oiad
75243933b4 Move more debug lines to #ifdef (#1829)
* Move more debug lines to #ifdef

Tidys up server RPT

Also make the combination rolling text overwrite the previous build
spam.

* Make additional changes
2016-12-25 17:20:30 -05:00
ebaydayz
7496ef5d5c Fix undefined color error in repair_vehicle.sqf
Same color error as f92b751 .

Also same issue in salvage_vehicle.sqf as described in #1828

Added setVariable exceptions for tank hit points.
2016-12-24 20:17:08 -05:00
Kobayashi
811e06ffe2 Detection of part doesn't work (#1828)
For tanks and other vehicles not explicitly defined in configs, _part will return with "" using gettext(), evaluating if it is nil doesn't do anything. With this change it will properly allow for repairing tracks on tanks with scrap metal.
2016-12-24 19:27:25 -05:00
ebaydayz
7e341739ee Readd hive shutdown code from 1051 #1822
Fixes hive connection error when child 302 call fails.
2016-12-24 18:09:01 -05:00
ebaydayz
d694130fdc Remove a duplicate localization 2016-12-23 15:37:42 -05:00
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:

64ea1eaa76
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:

1596a17b09
2016-12-07 15:20:17 -05:00
ebaydayz
5094e61723 Update zombie pathing
Vanilla commit:

f47d6fe5b9
2016-12-07 13:25:19 -05:00
ebaydayz
dab70963d6 Update POI spawning again
Vanilla commits:

d98cc5d700

e2afec6a21

5b85b311ed

55518ed792

4a5cb525ef
2016-12-07 12:57:06 -05:00
ebaydayz
2160437e79 Convert POI to compact array format
Vanilla commit:

c71d8cb23c
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:

39bcedb4b6
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