Commit Graph
56 Commits
Author SHA1 Message Date
Wanne 2b7d9a05a7 - UB Improvements / Cleanup (by Jazz)
o added the lacking items of UB to files "the "Data\TableData\Items\Items.xml". 
o Necessary "Hand Cannon" were moved to the task Raul, to files H11_0_ExtraItems_xxx.xml. 
o The instruction Morrisa will be generated after destruction of Morrisa automatically. 
o All scripts lua were modified for UB

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1743 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-29 11:56:11 +00:00
Flugente 56b971ce75 moved face icons for assignments and various states to a separate library to be independent of face gear icons
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1738 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-25 11:57:34 +00:00
Flugente 9ad650d9b7 new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1723 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-11 15:07:36 +00:00
Flugente 9e1ccfadef changed poison symbol position
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1688 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-30 02:54:43 +00:00
Wanne 9c02b9e270 - Fixed Mobile Militia graphical & transparency icon issues (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1609 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-02-26 13:59:47 +00:00
Wanne d821804721 SaveLoadScreen Useability Enhancement & Fix (by Buggler)
- Changed font color for better readability
- Enlarged highlight box
- Added LEFTARROW & RIGHTARROW hotkey for previous & next page
- Fixed minor graphical bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1605 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-02-23 09:48:25 +00:00
Flugente b140b8ff4f - added ap and bp costs for adding/removing fortifications and filling sandbags
- added face icon for multi-turn actions with regard to fortifications


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1589 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-06 03:40:35 +00:00
Flugente bc6e017af7 added missing icon for alternate weapon holding (by Sandro)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1585 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-04 23:34:28 +00:00
Flugente 82bb30e678 New Feature: scuba gear allows to dive, thereby staying invisible to the enemy as long as you are in deep water. If you where spotted however, the enemy remembers that, and can see still you in deep water
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1572 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-08 00:33:27 +00:00
Flugente 2158a06a8d - added missing sti files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1571 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-04 20:50:29 +00:00
Flugente 7ee9f31b82 added data and new STI's necessary for the new covert ops trait
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1529 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 23:48:48 +00:00
Flugente 83daa2d2ee - added new icons, xml data and settings for the advanced repair/dirt system
- more under http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1496 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:02:57 +00:00
Wanne 2a9080e2ff Sandro's feature pack (by Sandro)
- GameDir files for the features
- further infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/308884/A_Small_Compilation_of_New_Fea.html#Post308884

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1490 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 12:20:35 +00:00
Flugente 18307209ab New feature (by DepressivesBrot): Molle Items
- individual LBE gear can be created via MOLLE items. For each LBE item, there's a definition which pockets may be changed and how much space the new pockets may take up in total.
- If there's a free pocket slot and enough space -> attach item and enable pocket.
- for further description, see Doc/Design Document- MOLLE.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1486 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-02 22:31:20 +00:00
Flugente 842d6fec35 new icon for ammo belts and ammo vests
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1476 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-25 00:00:45 +00:00
Flugente f4079e586d New feature: guns can now be fed externally
- added necessary face icons
- added description in ini
- as an example, the MG§ and the FN mag can now be fed externally with any 100-rnd 7.62 NATO mag. Internal feeding is possible from the LRAK vest
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 19:33:37 +00:00
Flugente 71d7bea33b New feature: food system requires mercs to eat and drink in order to survive
- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1471 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-21 16:47:16 +00:00
MaddMugsy a443e8d8e9 1. Bugfix - Vince's medkits had their statuses reset to zero with the new version of the JA:DG mercs
2. Bugfix - Dr. Q's 4th trait was removed with the new version of the JA:DG mercs
3. 7.62x51mm ammo box sizes increased to 22.
4. P4-P9Item files removed.
5. USE_XML_TILESETS and NUM_P_ITEMS options added to Ja2Options.ini
6. USE_XML_TILESETS removed from ja2.ini 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1445 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 10:16:15 +00:00
Wanne 6a149dc4bc - New Feature: Zombie mod ingame option (by Flugente)
o The Zombie option can be enabled in the ingame option screen
o There are 2 new ini sections with a few ini properties ([Tactical Zombie Settings] and [Tactical Poison Settings])
wo ith the tag <PoisonPercentage>, you can now poison guns (Items.xml) or ammo (AmmoTypes.xml). This is the percentage of damage dealt that will be poisonous
-> New Tag in Items.xml: <PoisonPercentage>
-> New Tag in AmmoTypes.xml: <PoisonPercentage>
o see:  http://www.bears-pit.com/board/ubbthreads.php/topics/295746/Zombies_WH40K_and_more.html#Post295746



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1442 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 22:56:00 +00:00
Wanne e8079fccee - New Feature: Toggle scope modes (by Flugente)
o This allows you to toggle between a gun's different scopes via the '.' key. Y
o You get the boni for vison, tunnel vison, sight range, scope magnification etc. only for the scope you use. 
o 2 new ja2_options.ini properties: USE_SCOPE_MODES, DISPLAY_SCOPE_MODES: Allows the display of an icon on your gun, to tell what scope is currently in use. If it is a scope, the magnification factor also gets written. Both options can be found under the  [Tactical Gameplay Settings] section in the ja2_options.ini
o new tag in items.xml (<attachmentclass>) now enables to specifiy what an attachment can do. At the moment used by grenades/rockets/scopes/sights. Items.xml changed accordingly, modders need to add this tag for those items.
o More infos: First post in: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303038&#Post303038
- WARNING: This feature breaks savegame compatibility.

- New Feature: Tripwire-triggered mines (by Flugente)
o This allows creating complex networks of tripwire that can detonate multiple mines attached to them.
o 2 new Items.xml tags: tripwireactivation, tripwire
o More infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303205&#Post303205 

- Overheating addition (by Flugente)
o Severe overheating now temporarily reduces a gun's accuracy. This exact amount is displayed in the UDB.

- Bugfix (by Flugente)
o Removed foregrip as an attachment from the Saiga 12K

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1397 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 08:47:13 +00:00
MaddMugsy 41bd2a0802 1. AttachmentClass and Silhouette xml files moved from Lookup folder to main TableData folder
2. Added and updated some of the required files from HAM5.  Others will be added when the code is ready.  HAM5 XML changes have been included for use with the latest XML Editor code.  These changes will be ignored by the game.
3. AttachmentClass changes by Flugente applied to xml file.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1383 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-09 22:35:54 +00:00
MaddMugsy 72af0a6819 Added p4-p9items to Data folder to fix vanilla JA2
Updated comments in JA2.ini and Ja2_UB.ini.  XML Tilesets are now REQUIRED, unless someone changes the way they work in the exe somehow.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1379 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-31 08:35:44 +00:00
Wanne b2caea497a MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 20:30:23 +00:00
Wanne 84d990e7fb MERGED GameDir files from the development GameDir folder from revision 4545 up to 4882
Development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1353 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-18 11:58:16 +00:00
Wanne c478292797 - Bugfix: Chitzena Mine (B2-1) was missing
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1343 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-14 13:39:22 +00:00
Wanne 87bcbdebde - Heli ETA Box
o Graphical Fix on the Heli ETA Box for 1024x768 by correcting e coordinates due to larger font used


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1335 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-02 19:00:21 +00:00
Wanne 61a959a57b -Fixed missing transparent (MBS_800x600.sti) (by Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1314 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-19 09:49:50 +00:00
Wanne 17409d8026 Enlarging Strategy Map in 800x600 and 1024x768
o Added new/modified Game graphics
o The new game graphics only work together with a new executable which includes the enlarging strategy map feature!!
- You have to update the actual source trunk if you want to build your own executable or have to wait 2-3 days to get the official 2011 update

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1310 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-30 14:52:04 +00:00
Wanne 2eef2dbcac - Fixed missing NVG face graphic for Vince (ID = 69)
- Deleted old and unused face graphics. The current ones are in the Data\Faces\Facesgear

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1297 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-31 19:04:41 +00:00
Wanne 7e5ba8bd71 ****************************************************************************************
** Merged (English) GameDir files from Development trunk, for the Spring 2011 Release **
****************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1288 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-26 10:54:58 +00:00
Wanne 9105294d49 - Re-added the OPTIONSCREENADDONS2.sti that Inshy deleted, because this one is needed. This is needed for the reworked option screen with the next/previous pages
o The original OPTIONSCREENADDONS.sti has bigger buttons, so we need this one. I replaced the first index of the STI (which was from Ron's interface) with an empty one.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1275 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-13 22:00:23 +00:00
inshy 1e5a7b2456 -Deleted Credits.sti because this file exist in original Interface.slf
-Deleted modified OPTIONSCREENADDONS2.sti because this file from Rons Modified Interface. We have original STI in Interface.slf

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1273 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-10 06:51:33 +00:00
Wanne 70f040217f - Deleted 3 STI files, that are no longer in use, because ChrisL made changes to the development source code.
o The changes are in Revision 4202
o ChrisL updated the following STIs: ATTACHMENT_SLOT.sti, INFOBOX_INTERFACE.sti, ITEMINFOC.sti
o I just deleted the 3 STI files, cause otherwise we forget to do it later when merging the stuff back from the development trunk

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1272 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-23 09:29:35 +00:00
Wanne 47d20449e0 - Deleted unused STI files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1268 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-13 15:37:23 +00:00
Wanne 71cb695318 ************************************************************
* Merged GameDir from Development Trunk: Revision 4063 *
************************************************************
- Merged from SVN: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 10:24:49 +00:00
Wanne acc2745efa - Fixed wrong Y offset of "P90" and "First Aid Kit" which leaded to a CTD im Map Editor when you select those items for merc inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1240 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-22 10:27:04 +00:00
Wanne 988e5789bd New EXE Release (Build: 3329) incl. HAM 3.6
Bugfixes
--------
- Fixed NPC and PC movement errors
- Fixed boxers in San Mona do not leave the boxing ring after the fight
- Fixed Darren does not pay the cash after you won the boxing fight
- Removed a line of code which fiddled with chance to hit calculation.
- Cover Display now works correctly with multiple enemies.
- Cover Display has no problems with stance anymore.
- Enhanced IMP Creation: When choosing female, after leaving color choosing, the "email" button is removed. That's because the code tries to remove a button which do not exist (for big/small body) so it grabs the first one around (fixed by Sandro)
- Fixed CTD when throwing item (grenade, rock, throwing knife, ...) in tactical when item description box is open

New Features
------------
- HAM 3.6 (by Headrock)
o For more infos see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=243620&page=1&fpart=1



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1208 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-02-21 22:22:32 +00:00
Wanne fd7dd514bf - New MP Connect screen STI Image
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1165 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-02 17:16:21 +00:00
Wanne 87ad270b9d New EXE Release (Build: 2975)
Bugfixes
--------
o EDB: Autofire and Burst now have their own penalties (there are updated "Data-1.13\Interface" files)
o JA2 Game Intro is working again

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1137 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-06 17:27:37 +00:00
Wanne 89ffa5f5ec - Added new Files and Folders which are used for VFS and Multiplayer
- Updated XML files in Data\TableData
- Moved Document files to new folder named "Docs"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1134 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-04 21:09:26 +00:00
Wanne db3f215001 New GameDir files for Multiplayer UI Patch by Zathras
There is no "official" Release EXE yet in SVN, but there is one for multiplayer testing. Take a look in the Multiplayer's Bears Pit Forum.

http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=210587&page=1#Post210587



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1100 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-19 15:38:22 +00:00
Wanne 30beb66c56 New Release build (2620):
Bugfixes:
- CTD when enemies retreat (by Heinz)
- Open IMP page in laptop and then close laptop using key ESC. You will see button for closing window on strategic map... if you press this button you will have CTD.
- Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Merc are now a little more "talkactive"
- Fixed error creating new soldiers in DoReinforcementAsPendingEnemy
- Fixed some bugs in Shopkeeper interface.
- Fixed CTD when pressing Alt-Y not in cheat mode
- Save/load screen shouldn't appear during quickload
- Fix movement cost problems in 100AP.  Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.
- Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR.

New:
- AI Viewer: To use the AI Viewer build a Debug Version, go to the Strategy Screen and press F12
- Quest Debug System: Quest Debug System dialog is opened by switching to the Tactical screen and press F11.
- New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical. This forces the game to go in turn based mode when there are enemies in the sector.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1097 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 22:50:59 +00:00
Wanne 43efa398e7 1.13 Power Update
*** New ja2.exe build (2415) ***
- Enhanced Description Box (by Headrock)
	- Can be toggled on/off in the game settings
	- Can be customized in the ja2_options.ini (USE_ENHANCED_DESCRIPTION_BOX)
	- Further infos: http://www.bookgallery.co.il/JA2PublicPosts/DescBox.asp
- 100 AP System
	- Now the default system
	- Can be changed back to 25 AP System in the Data-1.13\APBPConstants.ini
        - Just change the property AP_MAXIMUM = 25 and you have the 25 AP System back

German and Russian EXE can be found here:
http://ja2.h758491.serverkompetenz.net/Wanne/Build_2415/


*** New XML Editor ***
- Supports the 100 AP system
- Minor adjustments


*** New INI Editor ***
- Also works as a MOD Loader.
- New entry in the ja2.ini (DEFAULT_JA2_EXECUTABLE). Used for starting JA2 v1.13 from the INI Editor
- Supports 100 AP System (APBPConstants.ini)
- Configure and start JA2 v1.13 from the INI Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1049 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-11-13 15:07:24 +00:00
Wanne 1e71466688 - added SIRTECHSPLASH.STI to the interface folder, so the english Map Editor.exe can also run with german and russian version
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1016 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-06-03 17:14:37 +00:00
Starwalker 2b1b129c1c added two new silhouettes
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1009 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 14:59:18 +00:00
Wanne 5a34a8440c - updated inventory bottom panel for 1024x768 resolution
- added speech fix for slay & fox (thx to scheinworld)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1007 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 13:09:26 +00:00
Wanne 198d650507 new build (2124)
bugfix: Minor adjustment to the NIV mode 800x600 thigh and combat pack pocket coordinates on the tactical panel so that the stealing menu doesn't inadvertantly "double hatch" our pockets and make them look solid black.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@997 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-10 09:06:13 +00:00
Wanne ad7036e5a3 - Moved the NIV interface files to the "Data" folder, so all further mods can use this files.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@952 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-12 18:21:29 +00:00
Wanne e8a8bfe1d9 - Reworked Data\TableData folder so it reflects the classic/ub items and weapons (uiIndex <= 335)
- Corrected xml files and added needed STIs to get the xml editor working with the "Data" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@867 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-28 17:56:51 +00:00
Wanne 8c5a12d9c8 Added missing files to the Data folder, so the xml editor will work when selecting the Data folder in the XMLEditorInit.xml.
The xml editor can only read from STI files and not from SLF-Archiv.
Some xml files in the Data\TableData folder are invalid for the xml editor, so they needs to be corrected first to use the xml editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@864 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-25 16:40:27 +00:00