Commit Graph

590 Commits

Author SHA1 Message Date
ebaydayz 72c9c9eb38 Further simplify maintain_area.sqf 2016-08-15 17:54:16 -04:00
ebaydayz b37445a4d5 Fix mistake from 15763f4
#1735

https://github.com/EpochModTeam/DayZ-Epoch/commit/15763f4f2a5bbadc22fc137deae5fcff5844bc60
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:

https://github.com/DayZMod/DayZ/commit/1561c3cfd85db4eee2688d76a6e5a6fdb8faddda
2016-08-12 14:00:32 -04:00
ebaydayz b2394703f3 Update vanilla player build
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/20f992fcb74f9a8b6823ea466ea3aadb5eafd1b0
2016-08-11 20:01:53 -04:00
ebaydayz 9aab4ddd03 Added WIP Limited fuel in Refuel points.
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/707a591765c8a568429fd243a0f3d6f38793d8dc

https://github.com/DayZMod/DayZ/commit/c453cdedd2568ab365788415e6dcfbecc5c6cfd4

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:

https://github.com/DayZMod/DayZ/commit/fac691a6145c0efb1406cca51d5523d74b691b55
2016-08-11 16:01:16 -04:00
ebaydayz 7439b87779 Update damage handler and improve study body
Vanilla development commits applied:

https://github.com/DayZMod/DayZ/commit/3db0fe8e7a3df0c2ab9e0f6bb220acf84e450da3

https://github.com/DayZMod/DayZ/commit/73a63898f11501c4aad83ead106c90b3e49461ac

https://github.com/DayZMod/DayZ/commit/08e18d5b526f8f8ee570fed1a3640d217f7fa83b

https://github.com/DayZMod/DayZ/commit/126da2dcd38a03d5583627607a78d37ad7f64091

https://github.com/DayZMod/DayZ/commit/d5fa3238656c06f8a8c1996d748130002ab2a7f6

https://github.com/DayZMod/DayZ/commit/d37526fcc62a3291fe3b7135bacb4fb172184989

https://github.com/DayZMod/DayZ/commit/5fcca134f05ddf3e4b9458cf9fe54154a9575616

https://github.com/DayZMod/DayZ/commit/c9c1fc934d449b33a9ef3bf14a82b5a40d93874b
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:
https://github.com/EpochModTeam/DayZ-Epoch/commit/2c4c75c67c7b0230d5850b2a304a5b83020d3a3b#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:

https://github.com/DayZMod/DayZ/commit/8e2953ab672cec20731543267e6a6fbab6cac8cb
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
https://github.com/EpochModTeam/DayZ-Epoch/commit/ee3eb845a36ddaca45635d1bf6a1eed2d76622e1#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
https://github.com/EpochModTeam/DayZ-Epoch/commit/657830291b893028a285767039736a482f2378e4
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:

https://github.com/DayZMod/DayZ/commit/0a1db17343f0eb828c60f08c28c06e571ee366cf
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
ebaydayz 1d2fc3b266 Fix item count being overwritten in AdvTrade right list title
When switching back to category view the item count was overwritten
from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/12a9e9f83edc78c4ec147d86e6b1d77f91323250

It is no longer needed to set it in changeBuySell since calcPrice runs
every time changeBuySell does. The one exception is when switching back
to category view, but in that case it stays in buy mode anyway.

You forgot to add it for single currency as well @oiad
2016-07-29 16:36:36 -04:00
ebaydayz fd2eb14c5e Give inTraderCity a default value
There is no point in setting inTraderCity = "Any"; since you can use the
isInTraderCity variable to check if a player is in any trader city. Also
"Any" will return false for isNil, so the only time "Unknown Trader
City" was being used was when the player had not entered any city yet.
If they left a known trader and went to an unknown one the RPT message
would say "bought x at Any". Now it will correctly say "Unknown Trader"
anytime a purchase is made without inTraderCity being set.
2016-07-29 15:48:51 -04:00
ebaydayz b1ae6c4a60 Fix unknown entity RPT error for Padlock and Frank&Beans
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/955c7a263ca4d1069c340c074c76181aade24ce4
2016-07-29 14:34:45 -04:00
ebaydayz c9efb9e9df Fix some undefined variables in Adv Trade systemChat messages
Fixes "Cannot sell any, tires are too damaged." and empty string in
success message.
2016-07-29 11:41:44 -04:00
ebaydayz b408e76c55 Fix extra spaces in Advanced Trading RPT log
Also fixed missing space in systemChat message.
2016-07-29 11:09:42 -04:00
ebaydayz ba3677f13d Remove redundant "Gear" text next to portrait in Adv Trade
The menu already says "Buying in" or "Selling from" Gear in the top left
so having it again in the top right is redundant. It was my mistake
adding it there originally.
2016-07-29 10:22:13 -04:00
icomrade bdf0870f3e Fix keys not deleting
Should work fine, but more validation is always good, I tested selling
from all inventories with DZE_SaleRequiresKey true and false.
2016-07-29 00:55:20 -04:00
icomrade 9552ceea9e Require part to be damaged to be removed
see comments @ 3292d84b85
2016-07-28 12:54:30 -04:00
ebaydayz 82cf8e76f0 Updated Breaking to support Metal Gates.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/bf16f402f68feeb6c530c00f151741f5707c1e04
2016-07-28 11:17:11 -04:00
oiad 12a9e9f83e Advanced trading tidyness
Optimizes the code for the buyitems item listing (What was I thinking!)
Adds item count to buy/sell list (Useful for checking against
backpack/vehicle storage space constraints when buying multiple items)
Small logging fix.
2016-07-28 23:08:11 +12:00
ebaydayz f84140c555 Don't clear buying list on category switch + AdvTrade fixes
The buying list now acts like a shopping cart. It is no longer cleared
when switching between categories or containers. Closing the dialog or
switching to sell mode still clears it.

Also fixed:
- Filter button in sell mode
- Bug where filtering sellable list readded items already moved to
selling list
- Visual price display not clearing when remove all button is used on
buying list
- Gear container picture showing rank instead of portrait in buy mode
- Dialog is no longer closed when trying to sell zero items
- LbCurSel is now reset when the buyable list is cleared
- Category is no longer opened onLbSelChanged. Instead you need to
double click or use the "View" button, so the arrow keys can be used for
selecting too.
2016-07-27 18:40:03 -04:00
icomrade bd91044e7b Fix duplicate action check with vanilla objects
+ typo fix
2016-07-27 11:08:50 -04:00
icomrade 49222ac415 Part 2 of salvage change 2016-07-27 11:05:26 -04:00