Commit Graph

75 Commits

Author SHA1 Message Date
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
ebaydayz
8ed5a9c7a9 Antibiotics combining
Vanilla development commit:

0602d29530
2016-07-23 15:03:49 -04:00
oiad
9efc671abb Advanced trading changes
This changes a few things in Advanced trading, mainly cosmetically.

> Removes all the commented out lines that were the same in defines.sqf,
let me know if these are there for a reason?
> fixes the buying list to have localization support and has a total
item count that works properly.
> cosmetic change displaying backpack info on trader to bring it in line
with the other menus
> adds total item count to the selling list and added localization for
that
2016-07-23 23:30:05 +12:00
icomrade
19960f08e2 use player_makeFire to start a fire 2016-07-22 12:23:05 -04:00
ebaydayz
9ae21dd4f5 Rifle flashlight fix, translations
Vanilla development commit:
a850f25e14

- Attachment_FL_Rfl -> Attachment_FL
- Sherbet desc
- Take blood translation
- weapons/mods translation fixes for better strings fitting
2016-07-21 11:12:55 -04:00
ebaydayz
7751914428 Rename vanilla strings from #1708
When localizing vanilla strings please do not put "EPOCH" in their name
or include them in the dayz_epoch package of the stringtable. This
creates more work to backport common translation updates and vice versa.
2016-07-17 14:02:04 -04:00
oiad
3d75c67574 Localization updates
Some localization updates and some code optimization.
2016-07-17 22:23:25 +12:00
ebaydayz
f60262aff1 Consolidate duplicate Remove Suppressor translations
Vanilla development commit:
66af3465ac
2016-07-16 14:48:53 -04:00
ebaydayz
da5c5bf6cc Credit updates for Sound Files.
Vanilla development commits:

e578c6cb39

c575f09c4b

Also synced spacing and tabs from:

73d557806e
2016-07-10 16:44:07 -04:00
ebaydayz
73d557806e Mag names, Attachments names, Translation fixes
Vanilla development commit:

af9e009bae

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)
2016-07-10 15:25:36 -04:00
ebaydayz
f7d765e669 Fix STR_ACTIONS_LIGHTFIRE listed twice
Vanilla development commit:

ca8434a9b9
2016-07-03 12:26:56 -04:00
ebaydayz
452ce57618 Temperature badges + heatpack changes + some translation fixes
Vanilla development commit:

e89176d565
2016-07-03 12:01:32 -04:00
ebaydayz
680659babc Add AirwavesMan and oiad to contributors 2016-06-21 21:25:27 -04:00
ebaydayz
19285d677a Merge pull request #1704 from AirwavesMan/master
Some more Changes
2016-06-21 20:58:13 -04:00
oiad
801145d664 Advanced trading fixes/modifications (#1698)
* Advanced trading fixes/modifcations

This adds combine currency option to the Advanced trading screen since
@Airwaves man noticed it didn't have a way of doing it.

Updated stringtables with correct "paid" spelling and differing text for
buying/selling.

This also addds proper currency checking/reporting for the log system
that has been introduced, it's untidy but it works, instead of getting
"user bought x for 1000 currency" in a non coins server, it will convert
it to the proper 1 brief 5 10oz gold etc system (uses a new function
z_calcDefaultCurrencyNoImg)

This also adds a check to see if the buy list is empty (as per the
selling list) and returns text to the user informing them.

Re-arranged buy and sell so buy is on top of sell, it's a bit easier to
read then.

* Advanced trading logging change

This was missing from my previous commit, this changes the
server_tradeobject to check if it's being passed a number (single
currency) or text (my logging currency changes)

* Advanced trading rework

Fixes all problems @ebaydayz
2016-06-21 20:18:41 -04:00
A Man
999f5fd5c2 Added another string
Added another string for full cinder wall kit.
2016-06-21 23:09:32 +02:00
A Man
b8f95b7f75 Changed Cinder Wall Strings
The full cinder wall and the half cinder half kit had the same name ingame. I tried to correct it but I saw that the string was too long when you click right on a full cinder wall kit to build it. I renamed both kits so that both kits stand by each other.
2016-06-21 22:25:02 +02:00
Bruce-LXXVI
5e53a71e88 Pullrequest/door management (#1694)
* Added doorManagement

* Rename FNC_check_owner --> FNC_check_owner_friends

* Fixed typo

* Fixed bug in FNC_check_owner_friends which allowed every user to manage
every plot and door.

* Removed unused DZE_doorManagementHarderPenalty from configVariables.sqf

* Now checking if _playerUID is in _friendlies for both cases.

* DZE_plotforLife should be DZE_permanentPlot

* Fixed case where DZE_permanentPlot is false.

* Forgot to add STR_EPOCH_CANCEL

* Changed translations to suggested string by ebaydayz.

* Renamed EyeScanner to DoorAccess.

* Reworked access rights for door management.

* DZE_doorManagementMustBeClose = true; //Players must be within 10m of
door to be added as a door friend.

* Fixed copy-paste error.

* Replace count with if

* Remove redundant test.

* Also replaced count in door management admins check.

* Change plotManagement and doorManagement to be consistent to
DayZ_UseSteamID (get UID from FNC_GetPlayerUID).

* Use _playerUID and _characterID more consistent.

* Added german translation to
STR_EPOCH_PLOTMANAGEMENT_ADDFRIEND_ALREADYONTHELIST.
2016-06-15 18:22:01 -04:00
ebaydayz
0534e95ccc stringtable fixes
Vanilla development commit:

1452ef2537
2016-06-06 21:51:47 -04:00
ebaydayz
b7a104113f Various stringtable fixes & amendments
Vanilla development commit:

fb397c95ee
2016-06-04 15:23:31 -04:00
ebaydayz
3f96b70d80 Fix Unsupported language English in stringtable RPT error
Vanilla development commit:

b038a1762b

Fixes RPT error "Unsupported language English (or whatever language you
selected) in stringtable" on load.

We do not have <Original> tags on any other strings in the table, so
there is no reason to use them here. They are not needed. If the game is
set to use a language that does not have an entry it uses the first
available entry for that string (which is English for every string in
the table). Keys should not contain only <Original> tags with no other
languages, as it will cause this error.
2016-06-04 14:00:32 -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
dbe7bf0a17 Localize plot management dialog text 2016-05-17 19:14:05 -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
6ef59a0237 Add server RPT logging to Advanced Trading 2016-05-11 12:41:59 -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
41e653136f Add attachments compatibility list to trader
Also reduced item info size a bit to better fit normal and large
interface sizes.
2016-05-07 19:29:00 -04:00
ebaydayz
03e3293795 Add extra vehicle info in Adv. Trading
Translations are from Arma2OA languagecore.pbo
2016-05-06 18:57:53 -04:00
ebaydayz
2c6ef2ced3 Don't show selected vehicleX message on Adv Trade startup
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
2016-05-05 12:37:10 -04:00
ebaydayz
349e0a103d Fix trade title showing "Buying in vehicleX" when in sell mode
Tested and confirmed working as intended now.
2016-05-04 16:46:35 -04:00
icomrade
2f67a058ba Complete Cinderwall as Item #1172 2016-05-03 15:57:37 -04:00
Anton
75ae8ad3c0 a couple localization updates (#1690)
* a couple localization updates

* fix merge conflicts

* fix

* fixes
2016-05-03 15:15:44 -04:00
ebaydayz
d361abaec3 Fix Adv Trade localized string spacing 2016-05-02 19:51:48 -04:00
ebaydayz
8d82693c1b More Advanced Trading localization
Russian translations provided by Epoch forums user koms:
http://epochmod.com/forum/profile/33066-koms/
2016-05-02 17:32:27 -04:00
ebaydayz
4df9a1e00b Fix wrong translations from #1689 @Adaptivity
@Adaptivity
2016-05-02 14:15:06 -04:00
ebaydayz
adff6440ed Fix errors from #1689 localization
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
2016-05-02 14:03:41 -04:00
Anton
2a99cf8a63 more localization work (#1689) 2016-05-02 13:31:13 -04:00
ebaydayz
51308c5b32 Fix typo from #1688
Also remove a duplicate string
2016-05-01 21:14:38 -04:00
Bruce-LXXVI
72132aa28a Pullrequest/german translation (#1688)
* Added and reworked german translation.

* Translated AdvancedTrading german strings added by iComrade.

* Changed some german text to fit better.
2016-05-01 21:04:29 -04:00
ebaydayz
2806d6a00d Localize some Advanced Trading strings 2016-05-01 15:45:07 -04:00
Anton
4e45b23f94 More work on localization support (#1687)
fix stringtable.xml

more fixes

added missing $
2016-04-30 15:54:31 -04:00
ebaydayz
4b9d6df0bb Finish localization support
Vanilla development commit:

33c6cafbcb
2016-04-28 22:13:48 -04:00
Adaptivity
7b5535a25a fix stringtable 2016-04-25 21:52:49 +03:00
Adaptivity
4dc46705f9 More progress on localization support 2016-04-25 15:47:09 +03:00
icomrade
7db6f63935 Update string for gutting zombies 2016-04-24 21:15:26 -04:00
ebaydayz
6522cca7ce Fix typo from pull #1679
See #1679
2016-04-24 18:58:22 -04:00
Adaptivity
52ee70394a More localization support 2016-04-24 14:11:14 +03:00
ebaydayz
6bee7a17f0 Change R3F weight overburden to break legs
Also BAF_L110A1_Aim_DZE wasn't in 1051, so no need to swap it in DB.
2016-04-23 19:51:56 -04:00
ebaydayz
1879fb8707 Fix siphon fuel
ItemJerrycanEmpty no longer inherits from ItemJerrycan
2016-04-22 17:39:52 -04:00