Commit Graph

5473 Commits

Author SHA1 Message Date
ebayShopper
139b81d190 Fix RHIB2Turret bad vehicle type crew error
https://epochmod.com/forum/topic/44700-bad-vehicle-type/
2017-11-29 12:54:44 -05:00
ebayShopper
038da982b4 Update SQL for removed policecar
Vanilla commit:

b6252d75ec
2017-11-28 15:51:22 -05:00
ebayShopper
4727ba4e67 Update L85 config for Epoch
Allow default magazines
2017-11-27 18:02:42 -05:00
ebayShopper
cf74f12f6c Correct an L85 classname from #1996 2017-11-26 18:35:15 -05:00
ebayShopper
7fd8c750d2 Add Land_houseV_2T2 interior
Vanilla commits:

4607ceaff0

b1eba5c54b

7711839323

8f74d2bb24

Also applied corrections mentioned in #1996
2017-11-26 18:29:13 -05:00
worldwidesorrow
c2dd9016cb Update trader files for Streatman's new L85 and SVD models (#1996)
* Update FriendlyAssaultRifle.hpp

* Update FriendlySniperRifle.hpp

* Update BanditMilitaryArmed.hpp

* Update Rifles.hpp

* Update Snipers.hpp
2017-11-26 17:43:06 -05:00
ebayShopper
d6f88fbf8a Add new L85 and SVD variants
Vanilla commits:

8951508770

aad4569581

58e594553b

eaf9648253
2017-11-26 17:39:02 -05:00
ebayShopper
2e01a8d8eb Update stringtable.xml
Vanilla commit:

39927eaa47
2017-11-25 16:05:20 -05:00
ebayShopper
ac10daeb4d Update humanity morphing
Vanilla commits:

33d4165e64

6674be6d5f

f4d18a6fef
2017-11-25 14:52:06 -05:00
ebayShopper
1e65d5d324 Move server_getDiff to missionNameSpace
Vanilla commits:

dc984fd219

d82f430c28
2017-11-25 12:47:25 -05:00
ebayShopper
90487cde10 Update player_fired.sqf
Vanilla commits:

70fc007062

f327c99b02
2017-11-22 12:49:06 -05:00
ebayShopper
c671cf9661 Update player_death.sqf
Vanilla commit:

0e0ffa1d6e
2017-11-21 16:30:19 -05:00
ebayShopper
4ea3f36830 Update PVDZ_sec_atp logs
This reverts commit 7b287a2

Vanilla commit:

a81dd8164c
2017-11-21 15:05:07 -05:00
ebayShopper
61786244bc Update zombie_agent.fsm
The only changes were to apply these two commits:

91f94a5ab9

4bc07b71e7
2017-11-20 16:42:05 -05:00
ebayShopper
4b486559b9 Update shotgun configs
Vanilla commit:

cad0a6fd2d
2017-11-20 15:38:00 -05:00
ebayShopper
4b4bdbbc29 Update vanilla player_breakin.sqf
Vanilla commits:

63aaf07a30

b074e7d847

fb3f69a69a

416cc5dcf1

b6c0dd5849

39a3d45965
2017-11-20 13:57:19 -05:00
ebayShopper
633ea92c18 Update vanilla town generator
Vanilla commit:

bf47e028ee
2017-11-20 11:51:16 -05:00
ebayShopper
921eb6d935 Increase hospital loot chance
Vanilla commit:

47deb21f8f
2017-11-20 11:47:52 -05:00
ebayShopper
43d349c4f3 Increase coverage angle of LandVehicle headlights
Vanilla commits:

194479c98e

369bc6c5f3

5b591a25c1

78d65bd1ae
2017-11-19 16:36:48 -05:00
ebayShopper
89a43cad8a Update vanilla vehicle_getOut log
Vanilla commits:

403861fa1a

b4798403a8
2017-11-19 10:31:51 -05:00
ebayShopper
137f448793 Update vanilla fence damage
Vanilla commits:

b56d85eb99

2eb963dc3f

8b4a985cf6
2017-11-18 17:43:06 -05:00
oiad
9b96ddd2c3 Consolidate ItemKeyXXX/Colors to arrays.
Tidies up scripts inside epoch and for script creators.
Moved z_at_buyItems to epoch_generateKey.
2017-11-19 11:27:02 +13:00
oiad
2f178d8978 Consolidate weapon/magazine/backpack adding to function
This moves a lot of duplicated code from a server side only function
(server_addCargo) to a client/server function called fn_addCargo.
2017-11-19 11:06:00 +13:00
ebayShopper
63fe9f8e87 Revert Topolka dam fix
This reverts 5884ef6

Vanilla commit:

a71efab3d3
2017-11-18 14:20:08 -05:00
ebayShopper
1825fab321 Update vanilla POI
Vanilla commits:

d1c8ccb00f

6c70d01b2a
2017-11-18 14:13:02 -05:00
ebayShopper
9d64d318f6 Revert 83dd363, c4816c8
This reverts commits c4816c8 and 83dd363.

These were not errors, oiad did not properly update his dayz_server
before testing.

Renamed variables and added comments to clarify object or position can
be used
2017-11-18 11:39:41 -05:00
oiad
c4816c8d18 Fix error from c2d2ad2956 (diff-a36371a7b1009b3a95c359f8b1cfa)
Type name error, type Array expected Object
2017-11-18 23:11:18 +13:00
oiad
83dd363ff1 Fix error from c2d2ad2956 (diff-a36371a7b1009b3a95c359f8b1cfa)
Type name error, type Array expected Object
2017-11-18 23:02:00 +13:00
ebayShopper
4953f33fdb Add configurable loot refresh timer
Vanilla commits:

2eb963dc3f

657aaba83a
2017-11-17 17:47:28 -05:00
ebayShopper
01292cb036 Update equip_nails loot chance
Vanilla commits:

34b0d75aa3

874bc1c875
2017-11-17 14:40:27 -05:00
ebayShopper
895aa62369 Update vanilla antiwall glitch
Vanilla commits:

10f9cd2c1b

669b793354 (diff-768fdf583c42ac37d1163a8e6fe31244)
2017-11-17 14:19:17 -05:00
ebayShopper
231a9e5d92 Fix floating loot positions in hotel
These were slightly off https://imgur.com/a/CuSV9
2017-11-17 13:31:47 -05:00
ebayShopper
53e0e4cb5b Update mission.sqm addons list 2017-11-17 13:16:47 -05:00
ebayShopper
6acd3c30ef Fix a stringtable typo 2017-11-14 17:11:32 -05:00
ebayShopper
14a6252911 Fix DZE_BuildHeightLimit behavior
Corrections for #1988
@BigEgg17 abs(_objHDiff) only tells you how much you have raised the
ghost from where it was when you started building. To test the actual
height above ground or sea level you need to use _position select 2.

Say DZE_BuildHeightLimit was 60m and DZE_buildMaxMoveDistance was 20m.
If the player started building at 55m and then raised the object 20m,
they would be allowed to build at 75m with your check.

Also getPosATL should not be used here. For example, I am swimming on
the surface of the water on Napf and getPosATL returns a height of 29m.

@oiad you missed zombie_wildGenerate.sqf in #1987
2017-11-14 13:09:15 -05:00
ebayShopper
c1110fc61c Fix a rare error with keyboard_keys
Some combo binds will cause actionKeys to return a number greater than
six digits. See AgentRev's note:
https://community.bistudio.com/wiki/actionKeys

An example is NumLock + P [1.15763e+009]. Using a number this large as
an index errors out. Example:
test_array = [];
test_array set [9999991,true];

But six digits or less will not error:
test_array = [];
test_array set [999999,true];
2017-11-13 17:34:43 -05:00
ebayShopper
eefcdf2610 Add basic security checks to object_killed
PVDZ_veh_Save = [_obj,"killed"]; could be abused in the same way as
server_deleteObj (42e0047)
2017-11-13 16:14:22 -05:00
ebayShopper
9fd8293246 Update server_publishVehicle3.sqf
This partially reverts f2360a9

Moved cargo fill after setPos because holding vehicle at [0,0,0] (water
location) too long may cause it to explode.
2017-11-12 11:49:59 -05:00
oiad
a1c14a2fd3 Fix broken DZE_SafeZonePosCheck for built items near safezones.
This was forgotten from my original commits
2017-11-12 12:40:34 +13:00
ebayShopper
9574aca91e Change publishVeh2 and 3 to call instead of spawn
Following 95b3174 it is now possible to use call to avoid suspension mid
execution as described in:

https://epochmod.com/forum/topic/43805-epoch-shed_safetyvehiclesqf-issue/?tab=comments#comment-292696
2017-11-11 15:59:23 -05:00
ebayShopper
67f89ceb53 Fix pricing mistake from #1982
Sell price of AKS74U_SD_DZ and AKS74U_Kobra_SD_DZ were wrong, since they
use 545 silencer (3 Goldbar). Sell price of Mosin PU variants was wrong
since it uses SCOPED not PSO attachment. @worldwidesorrow

Also corrected comment, extra Sa58 are camo variants while _DZ variants
are non-camo, so not entirely redundant

Lowered sell price of hemp, since these plants are pretty common. They
are guaranteed spawns In their spawn locations, and you can easily get 5
or more per server restart.
2017-11-10 15:38:31 -05:00
ebayShopper
0fadd1e5fc Slightly speed up a switch model check
Check once instead of twice
2017-11-10 12:03:05 -05:00
ebayShopper
ac32a8b2cd Configure DZE_SafeZonePosArray by default
Zeds and loot should not spawn in trader cities by default, regardless
of whether the server uses safe zones.

For servers that do not use safezones, the only other things affected
are salvage and instant kill for vehicle explosions in trader cities.
Neither is a significant issue. Most servers use safezones anyway.

Following d750f57, changed to exitWith so the check is only called once
instead of multiple times. Also no need to call again in
zombie_generate, since that function is only called by
building_spawnZombies which already checks it.
2017-11-09 13:52:32 -05:00
ebayShopper
89d10fc973 Revert "Only allow lock removal if door is unlocked"
This reverts commit b8dba25

As discussed with oiad on Discord, this serves no purpose now, since
DZE_lockDoor == charID means the player either just unlocked, built,
upgraded or downgraded the door, so they want to see the action.
Logically a combo lock can be removed while a door is open. In case of
it being locked, you already know the code, so it is assumed you put it
in before removing it. Completing two-three steps at once is more
convenient for the player.

Also removed _isDestructable because there are no classes which inherit
from "BuiltItems" and have a lock
2017-11-08 14:15:25 -05:00
ebayShopper
a7959c26de Fix build checks mistake in bbb7da7
@oiad when exitWith is inside an if () then it only exits that control
structure, not the whole script, so _canBuild could be overwritten by
_toolCheck below.
2017-11-08 10:59:22 -05:00
ebayShopper
441110d05b Fix wrong bleeding icon on Epoch legacy status UI
Thanks to Epoch forums user Angelone for reporting
2017-11-07 17:24:09 -05:00
ebayShopper
e1b6125761 Fix Javelin selling and _HasKey check again
@oiad Add the Javelin magazine as trade_items to a trader which only
sells magazines (like FriendlyAssaultRifleAmmo) and the Javelin weapon
as trade_weapons to a trader which only sells weapons (like
FriendlyAssaultRifle), then test your changes from f8a230e with both in
your gear. You will see it allows you to sell all the magazines and the
weapon at both traders. This is because the only condition to add the
item to the sellable array is that it exists as an entry in the
category. It never checks the entry type. This commit will check to make
sure the type matches in the config and the player's inventory.

I changed your static "trade_any_vehicle" to find the type in the
config, because it could also be "trade_any_boat/bicycle/vehicle_free".
Boats are handled differently for the hitpoints check in sellItems.sqf.

Also I noticed that both the _HasKey check and your new _y == _myVehType
check were not working for upgraded vehicles _DZE[1-4] because they had
been swapped out to  _baseVehicle. I forgot to account for that when I
added that feature.

This should resolve both problems. I tested both and everything looks
good. It can do with some more thorough testing though. Note
DZE_SaleRequiresKey is false by default.
2017-11-07 16:53:33 -05:00
ebayShopper
f2360a9cd8 Do not use localize on server machine
These were resulting in sloppy mixed language sentences.

The server language never changes, so localize should not be used server
side, unless complete translations are added for all logs, which is not
worth the effort. Only admins see them, unlike client side strings which
are seen by everyone.
2017-11-05 15:05:59 -05:00
ebayShopper
5a5323bdd7 Move large format strings to str formatText
These may exceed 2048 in some cases, so best to be safe and use str
formatText.

Partial revert of fbfb124 to more readable form
2017-11-05 12:12:26 -05:00
ebayShopper
ff397773b1 Update version numbers 2017-11-04 16:14:16 -04:00