Commit Graph

4287 Commits

Author SHA1 Message Date
ebaydayz
2980d849bf Formatting cleanup
- Removed random spaces
- Added back comments so it is easier to compare
- Removed redundant } else {
2016-08-06 14:47:10 -04:00
ebaydayz
73bcb6b856 Update test build 2016-08-06 12:04:42 -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
875b34417e Add missing HangarSmall loot group 2016-08-05 19:17:16 -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
c47adbbdb0 Remove CZ_VestPouch_EP1 from traders
This backpack is pointless, since it is the same model as
DZ_Czech_Vest_Puch with half the slots. The traders already have
DZ_Czech_Vest_Puch.
2016-08-04 15:44:58 -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
1b685581e3 Add condition 2016-08-03 22:18:42 -04:00
icomrade
b10e73b1b8 Update SQL 2016-08-03 22:14:42 -04:00
icomrade
b8c3aec4e0 New DLL + Test Build 2016-08-03 20:12:46 -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
icomrade
ae78fde067 Add coin support to dayz_Server and login
New variables: DZE_groupManagement = false; //Enable or disable group
management. Enabled by default
DZE_MoneyStorageClasses = []; // If using a Single currency system
(Z_SingleCurrency = true;), this is an array of object classes players
can store coins in

if Z_SingleCurrency = true; the hive is now set up to handle coin
updates on players, characters, and objects.
if DZE_groupManagement = true; the hive is now set up to save groups

group and coin variables are set in player_monitor.fsm, for
vehicles/objects it's set in the server_monitor.sqf file for objects in
the DZE_MoneyStorageClasses array

Also, this commit includes a change to the way the hive spawns in
vehicles. vehicles are now created at [0,0,0] and moved using setPosATL
to their saved position. Thanks for the tip @ndavalos  @eraser1
2016-08-03 18:01:22 -04:00
ebaydayz
de9d3feb0f Updated Some loot Locations.
Vanilla development commit:

db96d1c8c5

Note: does not affect buildings with Epoch loot positions. Vanilla
positions are commented out on those buildings.
2016-08-03 14:28:23 -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
A Man
f3c80934b4 Small loot tweaks for balance (#1719)
* Small loot tweak

Lowered the spawn chance of duct tape a bit.

* Small loot tweaks

Smaller spawn chance of binoculars, Knife and maps
2016-08-01 18:13:05 -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
3bf9c4452e Update test build
Since some mission file paths changed
2016-08-01 10:10:00 -04:00
ebaydayz
d2bf8b30eb Update config trader from 34f9f97
Forgot to update m16a2_dz (supports GL now).

34f9f97aa3
2016-07-31 20:32:53 -04:00
ebaydayz
287a80c417 Add extra note about changed item classnames
Since a lot of people are missing this.
2016-07-31 20:17:08 -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
ebaydayz
d7cb2b446e Merge pull request #1717 from oiad/master
Backpack sound fix
2016-07-30 18:42:29 -04:00
oiad
6a5d03f143 Backpack sound fix
Fix backpack sound error, re: @ndavalos
2016-07-31 10:26:31 +12: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
fbffd8e9cb Fix hit_glass setVariable filter
@icomrade - In regex character classes only match each single character.
So a range with more than one character on one end (20) won't work:
http://www.regular-expressions.info/charclass.html

You can see that by running this code in-game with your old filter and
it will kick you:
player setVariable ["hit_glass3",1,true];

Adding the + on the end makes it match the character class one or more
times, so now it will match any integer >= 0.
2016-07-30 12:07:26 -04:00
ebaydayz
8589b9d46d Fix fn_collisions in wrong folder
My mistake from
657830291b
2016-07-30 11:07:04 -04:00
ebaydayz
1700224124 New Var added for antiWallHacks.
Vanilla development commit:

224be14533
2016-07-30 10:51:42 -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
811327de58 Fix typo
Shows "Only 0 backpacks fit in your backpack" until the translation is
updated.
2016-07-30 10:11:40 -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:

12a9e9f83e

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
icomrade
ac63a7d903 Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch 2016-07-29 15:20:36 -04:00
icomrade
c628ad8873 Fix hit_glass kick for some vehicles 2016-07-29 15:20:32 -04:00
ebaydayz
b1ae6c4a60 Fix unknown entity RPT error for Padlock and Frank&Beans
Vanilla development commit:

955c7a263c
2016-07-29 14:34:45 -04:00
icomrade
d0c09e7bac Copy paste typo 2016-07-29 12:06:14 -04:00
icomrade
c694545bce Update server for playerGroup column in HiveExt
Requires DLL Published in this commit as well as a database update.
Execute the added SQL in the 1.0.6_Updates.sql on your database.

Use Hive child 204 to update the new column
_key = format["CHILD:204:%1:%2:%3:", (getPlayerUID player),
dayZ_instance,  [Array of playerUIDs of group members]];
_key call server_hiveWrite;
2016-07-29 12:05:01 -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