Commit Graph

2146 Commits

Author SHA1 Message Date
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 d31df4f1fc Typos 2016-07-28 21:12:51 -04:00
ebaydayz f9ca43c795 Don't diag_log player name as array
Forgot to update this diag_log. My mistake from:

https://github.com/EpochModTeam/DayZ-Epoch/commit/28a522ba6442e0d6af54cd0794e6e25df6029673
2016-07-28 16:38:55 -04:00
ebaydayz 1bfc6b3c31 Fix combat status_bg not matching other icons' status_bg sizes
See
https://github.com/EpochModTeam/DayZ-Epoch/commit/fbc77547507dcc063ab56c9620e95d7e1e5a5151
for discussion
2016-07-28 15:37:26 -04:00
icomrade 2cdf9b5806 Small fix, revert 1 frame uisleep to regular sleep
I wasn't getting errors without if (gear_done) then {}; surrounding the
uiSleeps, so I don't quite trust the engine was executing them, I also
question the ability of uisleep to handle single frame precision (but I
haven't tested anything regarding this yet).
2016-07-28 14:54:50 -04:00
icomrade 82e2500cac Re-add magazine refill fix when changing clothes
This is the code from 1.0.5.2 before it became 1.0.6, it contains the
fix for backpack wipes in 1.0.5.1. I lightly tested it with 1.0.6 but it
will need more testing before release.
2016-07-28 13:27:30 -04:00
icomrade 21019056c3 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-28 12:54:33 -04:00
icomrade 9552ceea9e Require part to be damaged to be removed
see comments @ 3292d84b85
2016-07-28 12:54:30 -04:00
ebaydayz 0fbf55da06 Move server_traders to dayz_code
This reduces the mission size for servers using default traders. Admins
can easily copy paste over the include to customize.
2016-07-28 12:05:31 -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
ebaydayz e399556af2 Fix wrong handler for PVDZ_Server_processCode
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/afbedde9fa595bc6de38d850752d140ade7ef71a
2016-07-28 11:02:28 -04:00
ebaydayz cbbbe1bd8f Randomized tree directions
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/beac505eb4ec3706550230d70c2fee10e056e1a8
2016-07-28 10:49:28 -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
icomrade 3292d84b85 Allow salvage any part < 100% damage
thanks for pointing this out @LunaCB
2016-07-27 11:02:06 -04:00
icomrade c847f8c756 Remove create stash option 2016-07-26 21:01:21 -04:00
icomrade e446603ea2 Fix combat logging
In the initialize section of the fsm r_player_unconscious and
r_player_timeout return their default values (false and 0). Also, the
Vanilla server-side combat check doesn't appear to work, or it doesn't
work with the antihack disabled (I haven't tested with it enabled).

New variable inCombat is set more quickly than the combatTimeout
variable
2016-07-26 20:51:10 -04:00
icomrade a72498671d Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 12:52:31 -04:00
icomrade 23a5584b52 Fix up combat icon + update changelog 2016-07-26 12:52:28 -04:00
icomrade 5b23e9f7af Merge pull request #1711 from oiad/master
Snap point changes
2016-07-25 23:49:23 -04:00
icomrade 705057bedb Sync combattimeout on change clothes 2016-07-25 23:22:50 -04:00
icomrade 8542385142 Update building to also use r_action_count
This is the vanilla variable to prevent duplicate actions
2016-07-25 21:59:11 -04:00
oiad 744f162d71 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-26 13:25:19 +12:00
oiad ad9694844d Snap point changes
This correctly fixes snap points for all cinder related to metal floors.

Anything cinder will now correctly snap to full cinder walls and vice
versa
Metal floors will not have gaps so you can correclty create a 1x1 cube
(as it should be)

Renamed cinder_wall_kit to half_cinder_wall_kit to be in line with
full_cinder_wall_kit since I felt it was confusing. cinder_wall_kit
seems like it would be full to me.

Fixed a string issue when building cancelling to make it more readable.
2016-07-26 13:22:10 +12:00
icomrade fbc7754750 Add combat icon + toggle for Vanilla UI 2016-07-25 20:55:36 -04:00
icomrade b2289e35c5 Fix ear and eye not displaying in Epoch UI 2016-07-25 14:26:43 -04:00
ebaydayz 28a522ba64 Fix PV value kick for player names with special characters
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/6b7a55b1ea0a8aacfc476599a6da10e75aa3c726
2016-07-25 13:37:33 -04:00
icomrade 97a03c84d0 More Permissive Combat Checks
This commit puts the conditions in which a player is put into combat
more in line with 1.0.5.1. Putting the player in combat for having
another player nearby will ruin building for players that are part of a
group. Putting the player into combat if zombies are nearby would make
building way too frustrating (especially if building on an elevated or
enclosed area where zombies are not a threat) and will attack the player
if not dealt with anyway.
2016-07-25 13:00:34 -04:00
ebaydayz 3a203b2720 Cover map bug at Polana factory pond
Vanilla development commits:

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

https://github.com/DayZMod/DayZ/commit/028490e21b431fdec6b746920e3dceebd20b9687
2016-07-25 12:31:39 -04:00
ebaydayz 03c57f3b77 Fix for Confirmed Kills system on change clothes.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/d499246e2e711ff1efda9fed38ca589bcb7908f7
2016-07-25 12:19:45 -04:00
ebaydayz 33538520d0 Removed Achievements from network send on login.
Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/0079818570b115cb9def88db6014c5306560eb15
2016-07-25 12:16:22 -04:00
ebaydayz 55df36741b Diag_log Cleanup.
Vanilla development commits:

https://github.com/DayZMod/DayZ/commit/1dbef192bb413526503aca89bb636e277ac59985

https://github.com/DayZMod/DayZ/commit/10cb0249f0dcfa80b5e4cfd89660bc6c33d6700a
2016-07-25 12:06:53 -04:00
icomrade ff6e11708a Un-nerf DMR 2016-07-24 16:14:38 -04:00
icomrade 0563f621e2 Fix full cinder wall snap points 2016-07-24 15:28:18 -04:00
icomrade 51287651f2 Add logging for non-existent loot group small
This can probably be removed for release but for now I noticed
HangarSmall doesn't exist, perhaps others as well.
2016-07-24 13:15:37 -04:00
icomrade 90932d0061 Don't use weaponHolderBase here
it causes the items that are created to be invisible
2016-07-24 01:46:54 -04:00
oiad 2ca7bf59c7 Tidyness changes
This changes a few functions that were being used to use the already
defined variables instead

Fixed a few string issues with Advanced trading and plot managment.
2016-07-24 16:20:39 +12:00
icomrade b03afef460 A little neater 2016-07-23 19:55:24 -04:00
icomrade efaad30c32 Remove unneeded waitUntil 2016-07-23 18:11:37 -04:00
icomrade 72c529f94e Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-23 17:19:46 -04:00