Commit Graph

603 Commits

Author SHA1 Message Date
ebaydayz
fd90eda8ae Update vanilla player build
Vanilla development commits applied:

a2193626a0

deb7207672

2de1d90edd

8a914606cf
2016-08-21 11:58:32 -04:00
ebaydayz
f0e0f6d6e4 Temp Bypass for tents and stashes for collision checks.
Vanilla development commit:

143f8e4dcb
2016-08-21 11:39:19 -04:00
ebaydayz
f3370cbc4b Give vehUpgraded a default value #1745
@oiad No need to check _vehtrade in this case it will always be true if
_vehUpgraded != ""
2016-08-19 14:17:13 -04:00
oiad
d987fb290c Advanced trading selling upgraded vehicles.
These changes allow the player to sell upgraded vehicles with them not
being added to the trader (as to not polute the lists). This basically
refers to an upgraded vehicle as a child of the base vehicle so it will
get the same sell price as the base vehicle.

This still follows the original trading convention, the vehicle base
needs to be in the trader category, i.e you cant sell an armored SUV at
stary vehicle trader.
2016-08-19 22:15:47 +12:00
ebaydayz
509c2b17d6 Fix typo from 5d372d3
5d372d3
2016-08-18 13:30:19 -04:00
ebaydayz
0394c61183 Match Adv Trade blue color for compatible highlight
Matches blue used in advancedTrading.hpp, slightly lighter and easier to
see on dark grey background. @oiad 42ebfb5
2016-08-18 13:27:00 -04:00
oiad
42ebfb54d7 Advanced trading buyable list changes
Further changes Advanced trading buyable list to show the item as blue
if it's compatible attachment wise and ammo wise.

This will get overwritten if the player has the item in their inventory
by staying green.

Also fixes a small bug I put into my last commit by not showing up for
boats/bikes etc.
2016-08-18 22:02:51 +12:00
ebaydayz
3103195017 Fix switch weapon addAction with nothing in hands
The addAction click was doing an animation without switching when the
player had a primary or melee on back but nothing in hands.

Probably present in vanilla too, will check later.
2016-08-17 15:26:24 -04:00
oiad
fc2c03d0d3 Advanced trading change to buyables list
This changes Advanced trading to change the item color to green if it
matches with an item is in your inventory, in your weapon slots (main
slot and dayz_onBack) is the same backpack and is a vehicle you are
local to.

This brings it in line with default trader, except we're using local
here since that's all that matters.

Thanks to @ebaydayz for the suggestion.
2016-08-17 22:52:05 +12:00
ebaydayz
f04d581b4d Cleanup Adv Trade parseText formatting
Just added line breaks so it is easier to count the format order.
2016-08-16 17:07:33 -04:00
ebaydayz
e02f8ba8ff Use BIS_fnc_numberText for SC number displays again
Missed some @ndavalos
https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854
2016-08-16 16:44:56 -04:00
ebaydayz
3f3f1a32ed Use BIS_fnc_numberText for SC number displays
See:

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854

That should be all of them @ndavalos let me know if I missed any.
2016-08-16 16:28:06 -04:00
ebaydayz
ae8329e55b Further simplify maintain_area.sqf again 2016-08-15 18:05:42 -04:00
ebaydayz
72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz
b37445a4d5 Fix mistake from 15763f4
#1735

15763f4f2a
2016-08-15 17:21:13 -04:00
ebaydayz
15763f4f2a Consolidate maintain scripts
Thanks to @oiad for making this easy #1735
2016-08-15 16:33:00 -04:00
oiad
c738710b77 Plot management fixes (#1735)
* Plot management fixes

This hopefully adds a few more items to the maintain list (@icomrade)
Uses epoch_returnChange to accurately and tidily return change and
handle money.
Localize maintain_area.sqf for single currency servers

* Plot Management tidyness

Fixing tidy issues

* Plot management changes

Fix maintenance variables as per @ebaydayz

* Plot management

Missed one

* Plot management fixes and default maintain_area fixes.

Convert original maintain_area.sqf to epoch_returnChange, I used the
plot management localization strings since I liked them better, the
epoch ones don't make a lot of sense really. Makes no difference if plot
management is turned off anyway.
Change the single currency version to work a lot better than it did, I
put the cost per item to 100 to be more in line with what I would expect
on a server

Changed _range to use DZE_maintainRange (DZE_plotPole select 0 + 20)
2016-08-15 14:49:56 -04:00
ebaydayz
74579bcf2f Allow remove with Crowbar in hands or onBack
Now crowbar can be in your toolbelt, hands or onBack when removing
modular items, mining ore, opening supply crates, etc.
2016-08-12 19:38:23 -04:00
ebaydayz
36196661ea Update arrow and quiver classnames
Vanilla development commit:

1561c3cfd8
2016-08-12 14:00:32 -04:00
ebaydayz
b2394703f3 Update vanilla player build
Vanilla development commit:

20f992fcb7
2016-08-11 20:01:53 -04:00
ebaydayz
9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

707a591765

c453cdedd2

Set to double vanilla default value since Epoch has a lot more large
vehicles with 1000+ fuel capacity.
2016-08-11 18:08:21 -04:00
ebaydayz
f985c50382 Updated Nutrition Values for refueling vehicles. (per can)
Vanilla development commit:

fac691a614
2016-08-11 16:01:16 -04:00
ebaydayz
7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

3db0fe8e7a

73a63898f1

08e18d5b52

126da2dcd3

d5fa323865

d37526fcc6

5fcca134f0

c9c1fc934d
2016-08-11 15:16:53 -04:00
ebaydayz
c62e3147c8 Do not send purchased vehicle marker arrow over network
Only the player buying the vehicle needs to see the arrow.

Also fixed CfgMagazines error from:
2c4c75c67c (diff-fcf3df9a25b3d05402ab4e4809673194R6)
@icomrade
2016-08-09 14:52:15 -04:00
ebaydayz
bc7c1879a3 Store plot and door friends names as array
Avoids setVariable value restrictions for players with special
characters in their name.

Also avoids issues with storing non-ASCII characters from player names
in DB inventory field.
2016-08-09 10:48:31 -04:00
icomrade
2c4c75c67c Fix crafting issue 2016-08-07 14:36:40 -04:00
ebaydayz
950ef04855 Properly separate allowed toolbelt and binocular count
It should no longer be possible to overflow your toolbelt or binocular
slots now.
2016-08-06 11:08:01 -04:00
ebaydayz
7a4775beea Fix needing to click lock/unlock twice from inside vehicle to take effect
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
2016-08-05 14:38:12 -04:00
ebaydayz
c51fd11511 Use better method to find player's vehicle in Advanced Trading #1725 2016-08-05 13:43:58 -04:00
ebaydayz
f6e10dd71c Add gear icons to trader menu vehicle cargo space display
- Added gear icons to vehicle cargo space display instead of
Weps/Mags/Bags text

- Decreased info text to 0.7 all around. Can be reverted to 0.8 if
preferred, but 0.7 or smaller is needed for vehicle info class, display
name and weapons list to avoid cutting off the dialog on normal and
larger interface sizes.

#1724
2016-08-04 20:36:36 -04:00
ebaydayz
60e6b85c4d Don't show fuelCapactiy for bicycles in Advanced Trading 2016-08-04 17:37:53 -04:00
ebaydayz
c52187220c Fix message when buying multiple backpacks into empty gear 2016-08-04 16:16:13 -04:00
ebaydayz
d91bde9e53 Fix return change overflow check
Thanks @oiad

- Added compensation for money which will be removed from gear and
backpack
- Improved readability
2016-08-04 14:22:33 -04:00
icomrade
aacd3b78f7 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-08-03 19:58:53 -04:00
icomrade
657fe60f26 Better maintain
Intensive commands are processed on the client only, as opposed to
twice. an array of objects, their corresponding UID and ID are sent to
the server. Sending the objects as an array, despite the size the array
can reach, should be better than the way this was set up before.

Needs testing on a full server however.
2016-08-03 19:54:06 -04:00
ebaydayz
5a55bcb9b0 Forbid buying >1 of any tool into gear
Previous duplicate check only checked player's current tools and the
buying array types for >1 of the same tool (not buying array amounts).

Also added prevention of binocular slot overflow.
2016-08-03 18:56:42 -04:00
icomrade
b2eacfbe73 Fix private array 2016-08-03 18:34:49 -04:00
ebaydayz
47e6366985 Updated Vanilla Buildables collision Checks.
Vanilla development commit:

8e2953ab67
2016-08-03 13:55:43 -04:00
ebaydayz
376befd613 Minor Advanced Trading string semantics changes
#1724
2016-08-03 13:38:09 -04:00
ebaydayz
382f3bc451 Add buying to and selling from dayz_onBack
Also:
- Fixed typo Z_fill(e)TradeTitle
- Fixed "not enough slots to accept change" message shows when "not
enough money" should show instead
2016-08-02 14:19:59 -04:00
ebaydayz
a95925aac5 Make free slots display for gear more logical
- Don't show tool slots as available weapon slots in gear. Player is
informed of tool slots count in systemChat.
- Don't show pistol mag slots as available item slots in gear. Player is
informed of pistol mag slots count in systemChat. Only pistol ammo and
bandages can be purchased into them.
- Removed "Stand still to complete trade" message since the medic
animation loop is no longer used
- Added back backpack mags count message and avoided redundant "Backpack
space exceeded message" @oiad
ee3eb845a3 (commitcomment-18483149)
2016-08-02 11:55:50 -04:00
ebaydayz
ee3eb845a3 Remove selling backpacks from vehicles
I don't think we should allow selling backpacks from vehicles because we
can not get backpack contents.

We can only remove all backpacks with clearBackpackCargo and then add
back new empty backpacks for ones that weren't sold.

This means players may unintentionally wipe all contents of all other
backpacks in their vehicle when they only want to sell one.

Thanks @AirwavesMan for catching this.

Also made changes discussed in #1718 @oiad
2016-08-01 17:14:42 -04:00
ebaydayz
a5be49c546 Add handling of magazine overflow in AdvTrade and free slot icons
- Added proper handling of pistol mags and regular mags in gear to
prevent magazine overflow
- Added pre-check if return change will overflow gear + backpack free
space. If change will not fit in gear + backpack free space then buy is
prevented with a message notifying the player. In the case of a sale it
proceeds anyway, but notifies player if overflow occurs (see comments in
returnChange)
- Consolidated duplicate code for calculating free space and returning
cargo of an object into new calcFreeSpace
- Old calculateFreeSpace renamed to displayFreeSpace
- Added Weps/Mags/Bags icons to free slot numbers display
2016-07-31 18:38:53 -04:00
icomrade
24f6a0ab9a Correct build text 2016-07-30 17:06:46 -04:00
ebaydayz
cc129cf403 Fix buyItems error from #1716 @oiad 2016-07-30 12:28:33 -04:00
ebaydayz
8589b9d46d Fix fn_collisions in wrong folder
My mistake from
657830291b
2016-07-30 11:07:04 -04:00
icomrade
60c37e8b76 Fix duplicate action fix when crafting 2016-07-30 10:37:19 -04:00
ebaydayz
657830291b Updated vanilla Collision system
Vanilla development commit:

0a1db17343
2016-07-30 10:34:25 -04:00
ebaydayz
6b5fbe433c Fix errors from #1716
Careful @oiad
2016-07-30 10:08:02 -04:00
oiad
7c4d25ef1a Advanced trading tidying, spelling fixes, private fixes and string fixes (#1716)
* Advanced trading tidying, spelling fixes, private fixes and string fixes.

Fixes snap building issue with metal floors
Fixed spelling mistakes in various scripts
Fixed formatting uglyness in various scripts
Fixed invalid private lines in various scripts
Changed Advanced trading so buying worked more like selling, You can't
select backpack if you don't have a pack nor can you select a vehicle if
you don't have a vehicle.
Removed some redundant strings from Advanced trading and changed a few
of the strings to be more englishy
Removed the ability to buy a backpack into your backpack (You cant do
this anyway)
Fixed a bug where if you had nothing in your backpack it would break the
checkArrayInConfig script so the titlebar would not refresh correctly
Removed slot counts on no backpack and no vehicle (No need for it, just
clutter)
Moved backpack/vehicle checking to z_at_getContainer.sqf

* Last part of tidyness fixes

Last part of tidyness fixes

* Actual backpack fix

Lets actually fix the buying backpack into backpack or backpack when you
already have one.

* Missing from commit

Missing from commit
2016-07-30 10:03:00 -04:00