Commit Graph
853 Commits
Author SHA1 Message Date
Starwalker 776ee3352b changed pics for 20mm and 25mm grenade magazines to new pics made by Briareos
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@855 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-17 06:45:12 +00:00
Wanne 240a332b19 new exe build (1202)
- Fix for freeze when AI killed by mines or other self-inflicted wounds
- Added Breath APs fix
- Fix for mouse movement when clicking on mercs.  In windowed mode would move the cursor to odd places on screen
- Enemy group invasion tactics fixed.  Now reinforcements come from all directions, same as from surrounding stationary reinforcements
- Fix for mercs turing lame
- allowed militia to wear camo
- Fix for uninitialized group in reinforcements
- Fix AI deadlock when multiple soldiers occupy the same tile
- Fix to reset Pablo so that future thefts can also be punished
- Fix for missing enemies in mobile group when player invades
- bugfix: Sometimes if you press with the right mouse button on the radarmap, the overhead map view was not displayed
- Fix for enemy invasions and reinforcements
- bugfix: HE Ammo Bug
- Fix for the "CONT" that won't go away
- Fix points calculation in BaseAPsToShootOrStab
- Tweaks to inventory, soldier, and merc profile structs
- Fix for divide by 0 in CalcBestShot

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@854 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-14 18:20:22 +00:00
Starwalker 34cc9da34c changed MercStartingGear.xml and Pockets.xml to correct some mistakes, which is only useful to New Inventory testers at the moment.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@853 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-14 11:10:04 +00:00
Sergeant_Kolja 9c47a1b5ee Corrected a lot of spelling and grammar.
No content changed, nothing added.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@852 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-13 19:38:09 +00:00
Overhaul 03f908cbbe Fixed sector load screens. E4 was described twice, C6 was overwritten by C7, and A10 was set to allow an alternate random but had no alternate random defined.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@851 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-13 06:21:23 +00:00
Wanne 7c3db76f3d Changed: I noticed from Data\sound.log, that the filename "DOORCR_B.wav" in TableData\Sounds\Sounds.xml is used, but does not exist in the JA2 folder. So I replaced "DOORCR_B.wav" with the existing filename "DOORCR.wav".
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@850 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-11 19:07:15 +00:00
Starwalker 161cb44b38 made NVGs incompatible to each other, so that they cannot be put on a helmet together
added/changed Sniper Suppressor on M21, M24, and M40A1
lowered stacking of Shuriken to 4
lowered Burst Penalty of HK G11 to 3
added three new XML-files for the inventory project. They are not needed yet, but do not do any harm either, they are here for the alpha and beta testers (and they'd later end up here anyway). They are also considered work-in-progress and will change. For example, Doreen is loaded down with LBE items just for testing purposes (item drops), some RPCs do not have the LBE items they'd need.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@849 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-08 07:10:53 +00:00
Wanne 0944a13679 new exe build (1147)
- new shortcut: Ctrl+Del in sector inventory deletes all items in sector
- Fix squad oversizing based on user prefs
- Fix militia issue in auto-resolve:  Militia were not always being promoted even when it said they were.  Since first X slots are for militia already in the sector, militia from other sectors are not sorted by rank.  This actually affects battle outcome!
- Added fix to editor to skip cached tiles in RaiseWorldLand.  Otherwise it can crash when invoked within the game.
- fixed some variables not being initialized
- Efficiency improvements for soldier->soldier sighting
- fixed memory leak in new inventory
- fixed some variables not being initialized
- fixed swapped parameter in LOS.cpp
- added variable range check in lighting.cpp, the cause of wrong index value still not fixed
- Fix for slow bullets and other anims
- Fix problem with items with default attachments not comparing to base items correctly
- Removed an inconsistency between quickload and regular load
- Turned on heap checking for debug builds.  *Could cause memory to run low if game runs for extended periods
- Fixed assertion message for case where soldier groups try to cross impassible terrain
- Fixed inventory memory leak
- Fix sticky keys due to loading screens
- Fix infinite loop/hang after an assertion failure
- Fix problems with missing tile effect in places such as Alma and Tixa underground
- Also fixes potential problem with buffer overruns
- Don't have monster spit cause fiery explosions
- More detailed error messages for failed saves
- Yet another phantom militia fix
- Fix for incorrect, sometimes negative, values of items sold to locals
- Editor:  Disable light sprites that are not in bounds.  Actually happens in some sectors (ie Drassen)
- Editor:  Fix for use of uninitialized variable in undo
- Editor:  Fix for clipping bounds that are offscreen (causes crash)
- Fix for AP bonus reading from INI
- Fix mine indexes when looking for creature infestation of mines
- Final (?) fix for militia reinforcements.  Also a change:  If you refuse reinforcements, none will come for the entirety of the battle
- Increase size of cover and LOS grids to fit max radius
- Fix for uninitialized light level in DistanceVisible
- Move CheckForEndOfBattle to end of ReduceAttackBusy, to remove a possible militia invalidate upon promotion
- Change the way Alt-L handles reloading
- added range check for light sprites

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@848 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-01 22:34:29 +00:00
Wanne 6d9d88aa57 Made small "cosmetic" changes to the Data-1.13/Ja2_Options.INI
Updated Data/Ja2_Options.INI so it has the same new structure like Data-1.13/Ja2_Options.INI, but with JA2 vanilla settings

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@847 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-01 21:29:59 +00:00
Overhaul 07f84aa081 Fixed a couple of misspellings
Reordered sections and settings to match order read in, for easier Xrefing
Everything should now be in the correct section

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@846 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-01 08:41:22 +00:00
Wanne 32dbf2e81d Added PLAYER_AP_BONUS to [JA2 Tactical Settings] which was missing from the INI. It is already implemented in the source code.
This option gives a flat AP Bonus to all player's mercenaries, it also pushes the AP 
Cap. Works almost exactly like the enemy AP bonus.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@845 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-26 17:34:34 +00:00
Wanne c7e50a8ad6 New Release build (1080)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@844 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-20 10:38:08 +00:00
Wanne de2796d031 Updated Initial garrison percentages to values that Will from the Bears Pit suggested. The old values could lead to unexpected CTDs. So now we should be on the save side.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@843 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-19 09:22:16 +00:00
Wanne 1f0b75a786 Updated the game starting time, because now we have a check in the source code, that the game will always start at Day 1
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@842 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-19 07:47:33 +00:00
Wanne ca3904c1a5 Updated the GAME_STARTING_TIME, so the game start at Day 1 and not at Day 0
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@841 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-14 17:57:10 +00:00
Overhaul bf15d58d70 Increased default deadlock delay to account for reduction of deadlock problems as well as the time it takes to do some things (throw multiple gas grenades, spin the turret wildly, etc)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@840 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-14 08:07:29 +00:00
Wanne c6632a20ff Added empty CREDITS_MOD.EDT. This file can be altered for mod makers in their own data folder\BinaryData to display the mod credits.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@839 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-12 08:04:51 +00:00
Starwalker c5b7399ad6 update of the German language files by Farmer Toby
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@838 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-04 14:29:38 +00:00
Starwalker 5a0ff39d90 replaced Milkor pic with a new one made by Tbird
replaced Pistol Suppressor pic with a new one made by Tbird
replaced Rifle Suppressor pic with a new one (you guessed it: Tbird) and renamed it AR Suppressor, as it will no longer be available for sniper rifles
added a Sniper Suppressor (a sound suppressor for sniperrifles, not something that suppresses Snipers themselves), pic by Tbird.
change several sniper rifles to attach Sniper Suppressor instead of Rifle Suppressor
changed all sound suppressor to sink, they are made of metal, after all
added Ares M4 Shrike and HK 417 12", pics by Tbird
added OTs 39, pic by Coolberg
added missing built-in folding stock on Type 85
changed HK MG36E from assault rifle to LMG
changed 5.45x18mm standard ammo to AP/FMJ, because the round has a reputation for piercing soft body armor at shorter ranges (not enough to warrant XAP, though).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@837 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-02 07:54:04 +00:00
Wanne b028cd93ad Updated German.AmmoStrings.xml and German.Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@836 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 18:16:57 +00:00
Starwalker 6f9c859e5e removed built-in Foregrip from FAL OSW, but allowed attachable Foregrip and Bipod instead
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@835 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 14:19:17 +00:00
Starwalker 68a307d294 forgot to remove the built-in foregrip from the M60E3 :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@834 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 12:38:02 +00:00
Starwalker 32d0a8a840 replaced pics of PP-93, Contender Encore, and Wildey with new ones made by Tbird
changed damage of about 65% of the guns, to have a more realistic relation between all the different calibers.
MG43 has now a default bipod instead of a built-in one
M60E3 has now a default foregrip instead of a built-in one
Ultimax has both bipod and foregrip built-in now

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@833 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 12:24:32 +00:00
Wanne 806e41798c Deleted unused "lua51.dll"
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@832 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-23 04:42:52 +00:00
Starwalker 78cbd83b82 forgot a BigItem pic (being of old age, and such...)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@831 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:47:12 +00:00
Starwalker 6f71e2697c Steyr Scout got built-in bipod and thus lost the ability to mount one as an attachment
Larger XM-8 guns got the ISM-V-IR as a defaut attachment
replaced pics of folding/retractable stock with new ones by Tbird
added last missing LBE item for inventory project (pics by Marlboro Man)
replaced a few LBE tileset pics (also by Marlboro Man)
corrected a few grammar/spelling mistakes in gun descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@830 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:45:59 +00:00
Starwalker b71d05787d added more LBE items for the inventory guys (pics by Marlboro Man)
changed HEZI from assault rifle to rifle
replaced Metalstorm Surf Zone pic with a new one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@829 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-19 06:16:43 +00:00
Starwalker 97b8e5b43d added Grippod and ISM-V sight (pics by Marlboro Man)
added 5 deactivated LBE-thingies for the inventory guys (pics by Marlboro Man)
replaced Makarov PM pic (Tbird again)
corrected NVG and Sungoggles boni and penalties (somehow they had become multiples of 8 instead multiples of 10)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@828 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-15 09:34:48 +00:00
Wanne 26a1df4800 - new exe build (911)
Replaced buggy exe build (933) with the new one (911)
Yes, it is exe build 911, but it has the same features like exe build 933 ;-)

lua51.dll is not used anymore for this exe build.

Features:

- New attack busy system
- Added LUA scripting and console
- Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain
- Fixed signedness of many grid variables used in GetMouseMapPos calls
- Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure
- Added checks so enemies don't try to chuck RPG grenades with their hands
- Now possible to shoot a someone in the head if he's in water
- Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.
- Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have
- Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.
- Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock
- Change to greatly speed up closing the sector inventory window in an unloaded sector
- Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting
- Added missing #includes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@827 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 20:08:55 +00:00
Starwalker a7b2119932 added some pics for later use (LBE)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@826 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 12:39:37 +00:00
Starwalker f63a36dc16 replaced pics of Makarov PM and PMM, and Vis-35 with new pics by Tbird
added other pics for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@825 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 12:39:04 +00:00
Starwalker 43424f3e34 replaced pics of Makarov PM and PMM, and Vis-35 with new pics by Tbird
added other pics for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@824 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 12:38:35 +00:00
lalien 1f089f95ef - new exe and dll for lua
exe changes:

- New attack busy system
- Added LUA scripting and console
- Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain
- Fixed signedness of many grid variables used in GetMouseMapPos calls
- Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure
- Added checks so enemies don't try to chuck RPG grenades with their hands
- Now possible to shoot a someone in the head if he's in water
- Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.
- Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have
- Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.
- Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock
- Change to greatly speed up closing the sector inventory window in an unloaded sector
- Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting
- Added missing #includes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@823 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-10 15:04:28 +00:00
Starwalker 63974b7eeb delete and replaced wrong LAR pics I
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@822 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-07 08:26:04 +00:00
Starwalker 75127674ee replaced pics of SAR 21, RPK, LAR .45, and LAR .50 with new pics by Tbird
added HK 416 20", HK UCP, HEZI SM-1, and Rheinmetall MG3 (pics by Coolberg and Tbird)
added ammo for UCP and HEZI (pics by Coolberg)
added HK 417 pic for later use (Tbird)
changed Coolness on some ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@821 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-07 06:44:28 +00:00
lalien f403658de1 - Externalized game starting time
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@820 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-04 17:52:48 +00:00
Starwalker 8f32b78746 deleted faulty entry from GermanItems.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@819 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-04 07:39:57 +00:00
Starwalker 3a543df142 Stupid me had marked the wrong folder for commitment on revision 817, so the INSAS and Minimi pics were missing. So again:
replaced pics of INSAS and Minimi with new ones made by Tbird!
replaced SMP1ITEMS.STI with one that ChrisL repaired, because there was one armor pic too much
allowed Rifle Suppressor on Galil Sniper
uploaded new GermanItems.xml from a new translator, had to correct and add a few things, though

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-02 15:28:29 +00:00
Starwalker 493a830e9c added HK 416 16" (more to follow), Owen SMG, and Galil Sniper
replaced pics of INSAS and Minimi with new ones made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@817 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-01 06:41:19 +00:00
Wanne f4f503cdf7 new build (911)
- new: Throwing item animation (grenades, items, ...) in crouched stance for the player, AI was not changed yet
- new: allowed helicopter to land in enemy controlled sector
- new: SHIFT+N now can use goggles attached to the helmet
- bugfix: If merc is in crouched stance and passes an item to another merc, merces did not turn to face each other

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@816 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-31 08:24:15 +00:00
Starwalker 8950f62c84 changed M1 Garand to .30-06 caliber
added Beretta M12, HK 416 10" (more to follow), and Steyr AUG-A3
added a lot of other gun pics for later use
replaced pics of Grach, M60E3, HK 416 14", Pecheneg, and Sterling L2A3
added a 40mm Grenade Panel
deleted wrong German descriptions of Thor's martial arts items

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@815 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-31 06:33:51 +00:00
Starwalker 21b928bed9 Somehow this pic got deleted during the last upload :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@814 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:53:59 +00:00
Starwalker a8df0862e8 Coolberg improved his SIG pistol pics
added Tbird's SIG SAS pistols and his Luger pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:49:13 +00:00
Wanne 6f63c840c6 - added the new item throwing animations in crouched stance
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@812 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 18:06:55 +00:00
Wanne 7168c18b66 new build (888)
- new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
- bugfix: Automated scrolling if you talk to someone in small maps (e.g: Rebel Basement) in high resolution (1024x768)
- bugfix: Scrolling problem in radar map in small maps (e.g: Rebel Basement) in high resolution (1024x768)
- bugfix: Russian version

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@811 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 14:44:31 +00:00
Wanne 610d02e2cc - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (Ja2_Options.INI Setting: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@810 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 14:32:11 +00:00
Starwalker 2d9d004507 corrected the non-transparent background of gun08.sti
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@809 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 15:48:50 +00:00
Starwalker e8cdc8329e added a ton of armors: Thanks to ChrisL's work (both XML-work and graphics), we now can treat/coat the advanced armor items.
added a point of accuracy to hi-cap Colt pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:47:43 +00:00
Starwalker 7aeda9eb74 added new armor graphics
added Galil Sniper pic (Coolberg)
added Luger and Steyr IWS 2000 pics (Tbird)
replaced Colt pistol pics with those made by Tbird
replaced AICW pic with one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:40:52 +00:00
Starwalker ed3e46ed30 added new armor graphics
added Galil Sniper pic (Coolberg)
added Luger and Steyr IWS 2000 pics (Tbird)
replaced Colt pistol pics with those made by Tbird
replaced AICW pic with one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@806 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:38:02 +00:00