From bc09a3dbd0343128d7418017139ae545cf609ca5 Mon Sep 17 00:00:00 2001
From: ole <ole.k@web.de>
Date: Tue, 15 Aug 2017 22:32:02 +0200
Subject: [PATCH] Merged things together and made a version 1.4 of it

---
 .vscode/tasks.json                       |  18 +++--
 @ExileServer/addons/scratchie_server.pbo | Bin 20403 -> 20318 bytes
 CHANGELOG.txt                            |  32 +++++----
 README.md                                |  88 ++++++++++++-----------
 4 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a841529..a1867ce 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,17 +1,23 @@
 {
     "version": "0.1.0",
     "name": "PBO Task",
-    "command": "cmd",
-    "isShellCommand": true, 
-    "showOutput": "always",
-    "args": ["/C"],
+    "command": "powershell",
+    "echoCommand": true,
+    "args": [
+        "${workspaceRoot}\\setup.ps1"
+    ],
     "tasks": [
         {
-            "taskName": "Pack",
             "suppressTaskName": true,
+            "taskName": "Build",
             "isBuildCommand": true,
+            "args": [ "-Build"]
+        },
+        {
+            "suppressTaskName": true,
+            "taskName": "Patch Mission",
             "args": [
-                "cpbo -y -p \"${workspaceRoot}\\ExileServerMod\\scratchie_server\" \"${workspaceRoot}\\ExileServerMod\\scratchie_server.pbo\""
+                "-PatchMission"
             ]
         }
     ]
diff --git a/@ExileServer/addons/scratchie_server.pbo b/@ExileServer/addons/scratchie_server.pbo
index d04a0542c56a53cbc503bac44cab3a2fd765feff..cb4e5be46838ee1031cfe7e870a808b883b614f6 100644
GIT binary patch
delta 2342
zcmb6bU2IcTxOK2~cXXp&TiUH`w|DK@wOxPLt=nDKG3LTx%3x#AASt!IV^_M{a@zu<
zD>{7;)PUn7QDP!S6E%hh%t(xh35oGR1tCPEF-F0d_@aW-#29^;=bZk~vT5Q;ZqE1r
zcfRwTyL3_d-K)|U)uE)wP4mYksi+u9M`w60oZ`fzoG6hP$9F$GGP=(wDPPwYJX0GH
zVQ6$Byd@S(2&2Mu!ZDLfmJ3N%LJ%5WbahnC8oCxAv&tsNdZ$*ZB$9JAI=EZYpso<U
z^4f{1d+YK{y-c?Fv!d#Q7lP-c1G4k`AatY^a||$EQw_6Hg%Q&ZHb^AVgfPt?azxkg
zd=y@nT85+XNGe5F#3`q;a;i3xNzWw20K>2dN%ON@G7>$^#R81m=koZy-5#G0vvTNL
z`c(RUJ)CuU;pE`fYKpcxDH_%(K2}oUWMnR$h{Wgs9Zt{iDHiT1_M542sf>u>VyUpm
zr84m}LegS}W2v+_M^jliq;$c{N*~-%+TbsxcRfX;1-IPp0u*n2qX21Ck3dYd06(e>
zAX7V_M{TYr(m9rF{50HCY2jJ5RZ790P8vQ}hc=W80IO-%5CZlQjifl5ImD%zJ~|76
zW)FO%IVmr(Nf^5}6<lBpuPmI}G_R--!erQ_wJTRqv#_95!>^mG>!-LGJ{sr7Mg9cG
z^dYha7L3iXq#c7JZ935Dwv#=lqwy}y5^SSx9ek;CWB8#QOGsFFZ&RcMyYvn4cT<Ys
z7=Ed_y9{oGTD`o0Ysh|3A1v(tnoKelNpnTJ&EVL49><Ga<-=|yablMP#u{K-97Ht_
zH^7A!Qvt67yTy)5jwR<UX9$GN)xw?D(}<df&(MKN^VP6I%ZZBxqaFqg7GmIOLkN{d
z4}Tg|1lQ^6z|9O27(2jOUSX6Qh7!lak8YXV8Qz;r!M9915x`7)o3$W(knGr)41M`L
zhLG_o1lyp>w4FG5!lXbrj?n^FO=ob7Y@wm>$rjfdq>A&-(Oew$Qx=wejfLD5aI<})
zsZuK6sn{qgbI`0o#j><)feYpyxMdzdpB8SnxYlT}!<LIs*D;Ue?>jKTwT|HujtY#p
z-*;McHrjpP5An5DaNk(R|0}p{HU<vcobZax4WHSzm)zWG#d#@VuYE*anOo7xWv?1O
zv8&d)56ku`TwplRd6Mi|t9E@Sj+S6ot$KK`Lj`*rle!Ai6**viEP1nC4U{w3w_5Un
z<nN<}L(H)>QG(M>Gra3Gv=S^Fjq{w49>sGkaZKPuI-HD0<~Wgs-<>{+%284LDxi_o
z?b_CWW@2%oQBJG1I2h5WLW2?N-I)<8e2f>6nG~|O{{WKCTN~q3cm@i59Fc^~?BmE$
zfJPG-3E=Ti6fe$4GzrnMuJ^=2^n~ELhpwSWxLNqa(*kO5EBL&Q{2at(!Yd0YZ$Di2
zPLirNb(y>We~qvmnD6R@ce+l2*EbBueJot@wg1bRFZ;f3t8h|wU&=sO?ruWa)b}vx
z1tF38d&Xdge>Z&9Bi~#y;B?YrM2ID3X;Kn8J(uL5%I{m_UhMGihqwGAaM#~cTha$t
zZwu_~HG-ng1ef}nV5!&IP~u|8==R<1We|U8;{$XGexX|*LN(0m4z1E#>GP^eI_0^I
zveT=3o`SGR54TxGT}dZPLDHfEMZW+~^;=Lmk`~m_{h0^eo~;2Fqyqx{5O`))495ms
z@b<uyU<v9gU$}{2H#`@dDDT#vg1g#rx8hf~jTfTvOboqy6+Z*`r-hMIuqc0i>DJ(l
bdezz3{F{@}OR{SQZQHi4w&aJCzkTr!8Lx9h

delta 2155
zcmaJ?Yiv_>6sLQzwe0q>KDNHt-Cavx+qzP^N4K>b%sID8HU!)<NLRXsH7Q-~Lny2e
zLW~9y<97551eh94jG!d=L4pZlVuCRte9|CF7Ku^g0~a+We$jL8z3b|>ct4z;bAIQ4
zUjOqyeRxT7{j%g0t#OlObk7rmPmNnPm3~()+}N+2PddtxnLqE`O!7bF&@VAUs#>8g
zHQhwm;|d<TR9y{DiHc4^Koa1OZDA2=0(rFz-j^_yWPKBEOAI_W4oedI^-$RjIs6fv
zt8_CmmVwi%I~qn7PDS#G*~m28%Z9Tv@k}=ZleLr02xOw^NH#hXk0I37jf!+ElS^b#
z%BFKMRAke6mXV!c;G5bu2?LDUhjgdfh4hHpTZKXJW8jL%Q{*40->eq(GWb##LeqPi
z(@4j(jY!klR-}tsn^Z6=U^aKP4XFD?>nvkrFxtXGr*1+~gvA&ab;f!@M=_(3OpN6Y
z$FiKC#q{p#_MwNSx|8BDGNF%w_v&oQ)nlYX^G9`a>i;SQ<5YdKcD?=tX0=?e0j5hs
z2_jpDK9rmhs`XS}A7_DM`XF+@>Gg0=&+?o>kQek7U^93`&@oa2$xzjTL5hkglL6i~
zObHM#+u=!LM&$ZTYWUOGRFuf;l*uj13bO;2OjSjRZU>_a6qM{1m@}UfvxSwY`bv1G
zOI=a}We~P(hJuYQWmQtZ{jJubMg~3h=5j_R)OXhYa*<cEua-o-!}e|v(c~|UsN_uW
ze4}0T{bA!ca!QV}@8hNgUp!`q@3`8!P$W4Wema(oBzEC_hub{i%#lbU0p(5GM60nT
zXYmwuUtz6<TTL{jLN_R$!(!sCsn&kv7A^Y)9IX$)bVvm(R|79vRic)<_mTDLnp(g<
z!qDB7;ZQ9)wS-2@MliA}_}V9h$J>TC3!?*#BN}SCT$s^Axx6r=aobJ|@UE=`DQmCC
zrYk^duj8em4aYHWzl><TW3B?5zY@+0UpNL<qKhqm&|<H2u^xO%Ycl)RIl3k**yo}t
zNxEo~F1lzi@4ALp{H<0ag=d=w5fmMMtk=P3&9(pYI?7u5$;-S!3llAc753*AqmVp3
zASK%g`&#MAyxyuO3qffT8(6d84q~136zSvpXdO}3;)>vvg>KwMgfNhI+bB0TZIs(?
z+8#@8pPZ2u7+I7y8o#p|+J+cZt?o5g4xXyO&B(xVTW&Y5yQA@BGM3KZzMDKqW~oFZ
zA4`Yg8CrqKc!G4v+>t}EG|C*uo228%W5p9C8xnUQ|1KVS5}3~L_6c0Dlx#RUn@f^E
z;kP6Px)V%JU@Mlq`bs_`{IH$ssq(h2-&?!9JqVrh?p<l`kKSz?bc}!S7Y1dpdxr(>
z(>q>5`uC0jqyb+y(!7t}4_+<O4}AC6j0h^PwHx?iK5ys5WsV!~_jbBEN#`CpH%eXD
zn@`0!2M*n(4l@EbJA4~Xv7~bn(F2_{O>cB|!2F;_mpK~8TVn0u%xo?ljXBuqS=`GD
zU6iiJAB1R^voxu<x@cxSek(lcGM57NegQaKs=VfRLc@p-r~`lb58^){-9zbz{hqU$
z;MhQoDn*s7T40$MyU$=SwuhF~P|vw_|0qj6w62uBNu(!x&y+^i2WTw&0;iDP3YgaY
zhkYMtN5mX_X6>jR502q8DRjeD=?m9WeP78n&;9yo>ilb&V^<wBOJhH&q^?f_r~d^k
C+%EwD

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index caf139b..7a0ab2c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,43 +1,47 @@
-v1.3
+1.4
+- improved installation by using patch concept (mission files)
+- fixed counter when pressing "Buy" or "Use"
+
+1.3
 - "No Luck" notification fixed
 
-v1.2
+1.2
 - another bugfix in ExileServer_lottery_network_request.sqf, reported by user - thanks
 
-v1.1
+1.1
 - fixed "toast message" when player has won poptabs
 
-v1.0
+1.0
 - fixed issues for ExileMod version 0.9.8
 
-v0.9
+0.9
 - slightly improved the announcement of the winner
 
-v0.8
+0.8
 - implementation of xm8Apps updated
 
-v0.7
+0.7
 - new feature: Announce the winner to all players (configurable)
 - new feature: add items into crates when player has won a weapon (default 3 items - configurable)
 - improved: configurable PrizeType a player can win (default: "VehiclePrize", "PoptabPrize", "WeaponPrize" - all)
 
-v0.6
+0.6
 - improved the vehicle spawn (pbo update required)
 - keep the "old" exile.ini (v0.9.35) in this repository
 - updated the exile.ini from ExileMod version 0.9.4 "Lime"
 
-v0.5
+0.5
 - dynamically add correct magazines into crate
   So, no need to change ExileServer_lottery_crate_xtras when adding more weapons
 
-v0.4
+0.4
 - improved the number generation using its own ExileServer_lottery_generate.sqf
 - spawn the crates randomly inside trader zone when player has won
 
-v0.3a
+0.3a
 - fixed extra "," in config.cpp
 
-v0.3
+0.3
 - support for poptabs and weapon prizes
 - additional configuration settings
 - updated database table 'xtra_lottery_winner' to support prize clases
@@ -47,10 +51,10 @@ v0.3
 IMPORTANT: lottery.sql AND exile.ini HAS BEEN UPDATED.
 IMPORTANT: No need to update the MissionFile
 
-v0.2
+0.2
 - separated scratchie fron the exile_server.pbo
 - easier installation using scratchie_server.pbo
 - use config.cpp from its own pbo file
 
-v0.1
+0.1
 - initial version
diff --git a/README.md b/README.md
index 82d8d41..43f3800 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## Scratchies (*lottery like* minigame for Exile Mod)
-<sub>Version: 1.3 | Author: ole1986 | This extension is licensed under the Arma Public Licence</sub>
+<sub>Version: 1.4 | Author: ole1986 | This extension is licensed under the Arma Public Licence</sub>
 
 <p align="center">
     <img src="images/buyget.jpg" width="250" title="Buy a scratch, get the prize">
@@ -13,46 +13,63 @@
 
 Videos: [PART #1](https://www.youtube.com/watch?v=zVPXYhhYrbU) [PART #2](https://www.youtube.com/watch?v=2MC45ycnOkc) - thanks to Rythron
 
-## Installation
+## Requirements
 
-This README uses some placeholders
++ Arma 3 Tools (installed through Steam - https://community.bistudio.com/wiki/Arma_3_Tools_Installation)
 
-Placeholder            | Description
----------------------- | -------------
-&lt;MissionFile&gt;    | Exile.&lt;Mapname&gt;.pbo (E.g. Exile.Altis.pbo )
-&lt;ExileServerMod&gt; | @ExileServer Exile server mod folder located in game directory.
+## Build
 
-### Required Tools
+You can either use Visual Studio code or the powershell to build and patch all necessary files
 
-+ PBO Manager (I use cpbo from http://www.kegetys.fi/category/gaming/armamods/)
-+ Notepad++ or any other Text Editor (https://notepad-plus-plus.org/)
-+ Exile Mod version 0.9.8
+Use the below command to build server pbo
 
-### Database setup
+```
+PS> .\setup.ps1 -Build
+```
+
+Use the below command to patch your mission file (a dialog will be prompted to select the mission pbo)
+
+```
+PS> .\setup.ps1 -PatchMission
+```
+
+## Install
+
+After you have followed the steps from the **Build** chapter, the below files are being generated.
+Copy these files to your server into the **correct** destination directory
+
+Location                                 | Destination Folder
+---------------------------------------- | ----------------------
+@MissionFile\<Your.Mission.pbo>          | mpmission
+@ExileServer\addons\scratchie_server.pbo | @ExileServer\addons\
 
-+ Import the mysql file `mysql\lottery.sql` into your exile database (through mysql or phpmyadmin for example).
+## Database setup
+
++ Import the mysql file `mysql\lottery.sql` into your exile database (either through mysql or phpmyadmin).
 + Copy and repalce the `mysql\exile.ini` with the file located in `<ExileServerMod>\extDB\sql_custom_v2\exile.ini`
 
-### MissionFile
+## Battleye
 
-+ **Unpack** the `<MissionFile>`
+When you use Battleye, please amend the below BE files to allow remote calls
 
-+ Copy the folders `MissionFile\overrides` and `MissionFile\addons` into your `<MissionFile>` directory
-+ Modify the `<MissionFile>\config.cpp` and add the below line inside `class CfgExileCustomCode`
+**scripts.txt**
 
-```
-ExileClient_gui_xm8_slide_apps_onOpen = "overrides\ExileClient_gui_xm8_slide_apps_onOpen.sqf";
-```
++ add the below to the end of line `7 remoteexec`
 
-+ Modify the `<MissionFile>\description.ext` and add the below line inside  `class CfgRemoteExec -> class Functions`
+ `!="remoteExecCall [\"ExileServer_lottery_network_request\"," !="remoteExecCall ['ExileServer_lottery_network_request',"`
+ 
+**remoteexec.txt**
 
-```
-class ExileServer_lottery_network_request { allowedTargets=2; };
-```
++ add the below to the end of line `7 ""`
+
+ `!"ExileServer_lottery_network_request"`
+
+## Finish
 
-### Exile Server
+After all the below steps are properly done, please RESTART the Arma 3 server and log into the game.
+You should see three additional "apps" when opening XM8
 
-+ Copy the `ExileServerMod\scratchie_server.pbo` into your `<ExileServerMod>\addons` directory
+## Advanced Setup
 
 ### Buy Scratchies from Traders
 
@@ -80,20 +97,9 @@ _officeTrader addAction ["<t color='#FFFFFF'>Buy Scratchie(200,-)</t>", { ["buy"
 _officeTrader addAction ["<t color='#c72651'>Get Prize!</t>", { ["get",ExileClientSessionId, player, ""] remoteExecCall ["ExileServer_lottery_network_request", 2]; }];
 ```
 
-### Battleye
+### Developer Hints
 
-**scripts.txt**
-
-+ add the below to the end of line `7 addAction` (important for office trade action menu)
+This project was developed using Visual Studio Code and uses git to manage the source code.
+Feel free to Pull Request your changes.
 
- `!="officeTrader addAction"`
- 
-+ add the below to the end of line `7 remoteexec`
-
- `!="remoteExecCall [\"ExileServer_lottery_network_request\"," !="remoteExecCall ['ExileServer_lottery_network_request',"`
- 
-**remoteexec.txt**
-
-+ add the below to the end of line `7 ""`
-
- `!"ExileServer_lottery_network_request"`
+Thank you