Commit Graph

4061 Commits

Author SHA1 Message Date
ebaydayz
8beb6e9666 Allow filling generator and destroying tent with barrel and 5L 2016-05-19 20:44:34 -04:00
ebaydayz
d01446414c Move Zupa dialog includes to config.cpp
@icomrade - configFile and missionConfigFile are in different scopes.
Admins can overwrite any dialog in RscDisplay with their own version
included in the mission without getting "class already defined" errors.
I tested to make sure it is possible. So there is no benefit to having
these includes in description.ext.
2016-05-19 18:43:23 -04:00
ebaydayz
301c4348e9 Remove vanilla generator fill actions 2016-05-19 18:35:11 -04:00
ebaydayz
62700f37e4 Add note about splint and broken legs
Since R4z0r doesn't want it changed in vanilla.
2016-05-19 16:29:35 -04:00
ebaydayz
a54e58c60c Localize remaining player_build text
Also added config variables for MaxMove and MaxHeight distance when
building.

_reason was defined twice at the top of player_build.sqf.
2016-05-19 16:15:27 -04:00
ebaydayz
cbca23ddce Remove duplicate ZSCdefines.hpp include
@Bruce-LXXVI it was already included from the mission description.ext
2016-05-19 13:39:38 -04:00
ebaydayz
914b37a413 Pass cursorTarget to maintain_area.sqf
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
2016-05-19 13:10:20 -04:00
ebaydayz
1a238d1719 Fix wrong buildables count displayed in plot management 2016-05-18 20:20:20 -04:00
ebaydayz
d0c4ccca15 Fix wooden splint recipe output
It was outputting two when it should only be one.
2016-05-18 17:10:46 -04:00
ebaydayz
0544ac37fa Fix broken legs icon flashing indefinitely
This keeps the icon solid when your legs are broken instead of flashing
it constantly.
2016-05-18 17:04:44 -04:00
icomrade
2889d8f010 Should fix building issues with player sliding
The change in module_build will only fix items that d ono have an offset
set in the config.

BoundingBox can be a bit generous but the player should be able to work
with any overestimation in size.
2016-05-18 11:01:38 -04:00
icomrade
8fd4c8eb8b Re-add plot check
Accidentally removed this when merging plot for life
2016-05-18 10:13:29 -04:00
ebaydayz
9d51fb2736 Fix plot management buttons color and text alignment
Fixes unintended black on black buttons and left aligned button text.

Plot management uses Zupa's older defines. The only changes for this
button type are the background color and text alignment.

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L568

https://github.com/DevZupa/PlotManagement/blob/master/MaintainVersion/plotManagement/defines.hpp#L588
2016-05-17 22:02:21 -04:00
icomrade
113dd0618a Add Little Bird killed EH 2016-05-17 20:45:54 -04:00
ebaydayz
f61c6d8dac Add plotManagementMustBeClose config option
Setting false allows adding any online player to plot friends regardless
of their distance from the pole.
2016-05-17 20:09:37 -04:00
ebaydayz
edb64c4e05 Fix plot manage array add errors from 1e65f7a
@icomrade - when you use set to add an element to an array you do not
need to wrap it in brackets [ ] like you do with +.

This was making it a nested array which was not intended in the
original.
2016-05-17 19:30:21 -04:00
ebaydayz
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -04:00
ebaydayz
a466e43645 Move plotManagement compiles to compiles.sqf
This was needlessly recompiling every time the addAction was clicked.

DisableSerialization is only needed if a display element is stored in a
variable within the current script. The called functions already have
it.
2016-05-17 16:54:58 -04:00
icomrade
ef1d323ef0 Should Fix Issue #1569
Varchar(512) was truncating certain vehicle hitpoints and preventing
vehicle loading. The HiveExt dll handles hitpoints as a string which has
a char limit far greater than 512,  so simply updating the column should
fix the issue.

Also update the ChracterID column for #1371 - new Hive dll will be
required
2016-05-16 13:32:22 -04:00
ebaydayz
65233757e8 Correct duplicate object UID check
I forgot numbers greater than 1 million are truncated when converted to
string:

http://killzonekid.com/arma-scripting-tutorials-float-to-string-position-to-string/

KeyStartNumber exceeded 6 digits which is why it was being truncated to
"1e+011" and getting stuck on loop (as that string was already in
currentObjectUIDs) as mentioned in 2df7279.

Starting at 10, there should never be more than a couple duplicates
generated, so keyStartNumber will never exceed about 100 max.  Added an
exit just for a fail safe.
2016-05-16 11:52:45 -04:00
icomrade
116caaa788 Revert "Remove dayz_objectUID2 from object loading"
This reverts commit 2df7279f1a.
2016-05-15 21:48:24 -04:00
icomrade
71875647e7 Update test build 2016-05-15 19:17:10 -04:00
icomrade
08c16788ae update changelog + fix god exclusion check 2016-05-15 18:57:14 -04:00
icomrade
dc2b97beb6 Revert setPos change from a previous commit 2016-05-15 18:53:40 -04:00
icomrade
2df7279f1a Remove dayz_objectUID2 from object loading
DB with ~4000 vehicles fails to load since this code runs on nearly
every vehicle for some reason. The code should only be called upon
vehicle purchase to increase load time and simply calling
dayz_objectUID2 has no effect.
2016-05-15 18:53:40 -04:00
icomrade
eda3e1c202 Fix vector objects loading in with angle compensation
With the code removed from line 266-271 the server would reset the slope
of the placed object to match the slope of the ground. Do not re-add the
code unless configs are updated with corresponding canbevertical option.
2016-05-15 18:53:40 -04:00
icomrade
e2a14de977 Add exclusions for god mode built objects 2016-05-15 18:53:40 -04:00
icomrade
396d085672 Fix Hive error when saving vector building objects 2016-05-15 18:53:40 -04:00
ebaydayz
7e1fe6fca1 Update test build 2016-05-15 11:32:53 -04:00
icomrade
d442592e55 Fix #1691 2016-05-13 17:40:34 -04:00
icomrade
c118ecbb15 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-13 17:06:46 -04:00
icomrade
6d69ca92e3 Fix undefined player uid in modular build 2016-05-13 17:06:43 -04:00
ebaydayz
914162c698 Update messing variable in pz_feed.sqf
Messing now has a third parameter for dayz_nutrition.
2016-05-13 17:02:44 -04:00
icomrade
33c3c7601f Fix Private Arrays 2016-05-13 16:57:50 -04:00
icomrade
00e2f34734 Forgot variables 2016-05-12 23:47:53 -04:00
icomrade
6c24aaeb3b Add Vector Building 2016-05-12 22:52:04 -04:00
ebaydayz
8b0e03545f Remove legacy config trader menu
Advanced trading now does everything the legacy config menu did and
more.
2016-05-12 16:41:40 -04:00
ebaydayz
3be1d4e6bf Update outhouse and plot pole descriptions
Outhouse no longer includes toilet paper.

Plot pole may cover an arbitrary radius and ownership may not be lost
after death depending on server settings.
2016-05-12 15:10:20 -04:00
ebaydayz
bd85693af7 Add categories view to Advanced Trading buy mode 2016-05-12 14:09:05 -04:00
ebaydayz
e60175b30c Fix wrong price when adding multiples of same item to buy list
Modifying _temp was also modifying Z_BuyableArray. An independent copy
of the array was needed.
2016-05-11 15:07:58 -04:00
ebaydayz
5ad1697308 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-05-11 12:42:51 -04:00
ebaydayz
6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -04:00
icomrade
2d9097a6af Switch all buildables to Epoch building system
Didn't bother switching the stash over since it doesn't appear to be
implemented yet
2016-05-10 11:21:04 -04:00
ebaydayz
5ca182dffe Fix can't sell satchels with Adv. Trade
Some items (like PipeBomb) are a class in both CfgMagazines and
CfgWeapons. BIS_fnc_invRemove uses weapon first, so that is why the
magazine was not being removed. Using config instead of string avoids
this problem.
2016-05-09 14:10:20 -04:00
icomrade
72f3779edb Fix death when changing clothes + minor changes
removing the Respawn EH fixes this, I haven't noticed any adverse
effects from removing it yet.

Also changing groups now deletes the old group. The machine which the
group is local to must execute the deleteGroup command, the server
previously had to wait until the player disconnects to delete their
empty groups.
2016-05-09 00:27:34 -04:00
icomrade
875b63027a Fix plot friends return 2016-05-08 19:13:18 -04:00
ebaydayz
c0cb702534 Add swap for classicBloodBagSystem in Adv. Trade 2016-05-08 17:31:23 -04:00
ebaydayz
5120d8a488 Fix incorrect backpack space calculation
Fixes not being able to purchase into a half full backpack and free slot
counts text incorrect when buying into backpack.
2016-05-08 16:21:24 -04:00
ebaydayz
84e64be47e Don't show debug message when paying with exact amount 2016-05-08 13:30:26 -04:00
ebaydayz
c477304571 Forbid buying duplicate tools into gear 2016-05-08 11:59:25 -04:00