From da9fc39103fd2c7e172984bd2fde1b155a7107a2 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Sun, 8 Feb 2015 17:35:21 -0600
Subject: [PATCH] Headers and Finish Notice

---
 addons/magazinerepack/XEH_preInit.sqf         |  1 +
 .../functions/fnc_magazineRepackFinish.sqf    | 52 +++++++++++++++++++
 .../functions/fnc_startRepackingMagazine.sqf  |  9 +++-
 addons/magazinerepack/stringtable.xml         | 11 +++-
 4 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf

diff --git a/addons/magazinerepack/XEH_preInit.sqf b/addons/magazinerepack/XEH_preInit.sqf
index e2dfd721f3..7cd7107f54 100644
--- a/addons/magazinerepack/XEH_preInit.sqf
+++ b/addons/magazinerepack/XEH_preInit.sqf
@@ -2,6 +2,7 @@
 
 ADDON = false;
 
+PREP(magazineRepackFinish);
 PREP(magazineRepackProgress);
 PREP(openSelectMagazineUI);
 PREP(simulateRepackEvents);
diff --git a/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
new file mode 100644
index 0000000000..50817bcfe7
--- /dev/null
+++ b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
@@ -0,0 +1,52 @@
+/*
+ * Author: PabstMirror
+ * Simulates repacking a set of magazines.
+ * Returns the timing and magazines counts at every stage.
+ *
+ * Arguments:
+ * 0: Arguments [classname,lastAmmoStatus,events] <ARRAY>
+ * 1: Elapsed Time <NUMBER>
+ * 2: Total Time Repacking Will Take <NUMBER>
+ * 3: Error Code <NUMBER>
+ *
+ * Return Value:
+ * Nothing
+ *
+ * Example:
+ * (args from progressBar) call ace_magazinerepack_fnc_magazineRepackFinish
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+PARAMS_4(_args,_elapsedTime,_totalTime,_errorCode);
+EXPLODE_2_PVT(_args,_magazineClassname,_lastAmmoCount);
+_fullMagazineCount = getNumber (configfile >> "CfgMagazines" >> _magazineClassname >> "count");
+
+_structuredOutputText = 
+
+if (_errorCode == 0) then {
+    format ["<t align='center'>%1</t><br/>", (localize "STR_ACE_MagazineRepack_RepackComplete")];
+} else {
+    format ["<t align='center'>%1</t><br/>", (localize "STR_ACE_MagazineRepack_RepackInterrupted")];
+};
+
+_picture = getText (configFile >> "CfgMagazines" >> _magazineClassname >> "picture");
+_structuredOutputText = _structuredOutputText + format ["<img align='center' size='1.8' color='#ffffff' image='%1'/> <br/>", _picture];
+
+_fullMags = 0;
+_partialMags = 0;
+{
+    EXPLODE_2_PVT(_x,_xClassname,_xCount);
+    if ((_xClassname == _magazineClassname) && {_xCount > 0}) then {
+        if (_xCount == _fullMagazineCount) then {
+            _fullMags = _fullMags + 1;
+        } else {
+            _partialMags = _partialMags + 1;
+        };
+    };
+} forEach (magazinesAmmoFull ACE_player);
+
+_structuredOutputText = _structuredOutputText + format [("<t align='center'>" + (localize "STR_ACE_MagazineRepack_RepackedMagazinesCount") + "</t>"), _fullMags, _partialMags];
+
+[parseText _structuredOutputText] call EFUNC(common,displayTextStructured);
diff --git a/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf b/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf
index c93a1bad59..d83cc649b0 100644
--- a/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf
+++ b/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf
@@ -56,4 +56,11 @@ if ((count _startingAmmoCounts) < 2) exitwith {ERROR("Not Enough Mags to Repack"
 _simEvents = [_fullMagazineCount, _startingAmmoCounts] call FUNC(simulateRepackEvents);
 _totalTime = (_simEvents select ((count _simEvents) - 1) select 0);
 
-[_totalTime, [_magazineClassname, _startingAmmoCounts, _simEvents], {hint "done"}, {hint "fail"}, (localize "STR_ACE_MagazineRepack_RepackingMagazine"), {_this call FUNC(magazineRepackProgress)}] call EFUNC(common,progressBar);
+[
+_totalTime,
+[_magazineClassname, _startingAmmoCounts, _simEvents],
+{_this call FUNC(magazineRepackFinish)},
+{_this call FUNC(magazineRepackFinish)},
+(localize "STR_ACE_MagazineRepack_RepackingMagazine"),
+{_this call FUNC(magazineRepackProgress)}
+] call EFUNC(common,progressBar);
diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml
index 5ea62e3a18..2e3d9500e0 100644
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Edited with tabler - 2014-12-17 -->
+<!-- Edited with tabler - 2015-02-08 -->
 <Project name="ACE">
   <Package name="MagazineRepack">
     <Key ID="STR_ACE_MagazineRepack_RepackMagazines">
@@ -74,5 +74,14 @@
       <Hungarian>%1 tejles tár és %2 extra lőszer.</Hungarian>
       <Russian>%1 полных магазина(ов) и %2 патрона(ов)</Russian>
     </Key>
+    <Key ID="STR_ACE_MagazineRepack_RepackComplete">
+      <English>Repacking Finished</English>
+    </Key>
+    <Key ID="STR_ACE_MagazineRepack_RepackInterrupted">
+      <English>Repacking Interrupted</English>
+    </Key>
+    <Key ID="STR_ACE_MagazineRepack_RepackedMagazinesCount">
+      <English>%1 Full and %2 Partial</English>
+    </Key>
   </Package>
 </Project>
\ No newline at end of file