From 3183bf95af8c832b0ab6871331c10bd36405876b Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:06:14 +0800 Subject: [PATCH 01/18] Update Kamaz.hpp Change fuelCapacity to relaistic value of 10400 litres. --- SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp index 1d6d219d7..57e535e33 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp @@ -24,5 +24,5 @@ class KamazRefuel_DZ: KamazRefuel { class TransportMagazines{}; class TransportWeapons{}; transportFuel = 0; - fuelCapacity = 10000; -}; \ No newline at end of file + fuelCapacity = 10400; +}; From 291dc60454e1f955e91908c88367170cc2f0fbd9 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:08:35 +0800 Subject: [PATCH 02/18] Update AH6.hpp --- SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp index af690210a..4deafd0c6 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp @@ -25,6 +25,7 @@ class AH6X_DZ: AH6_Base_EP1 { transportMaxWeapons = 3; transportMaxMagazines = 10; transportmaxbackpacks = 2; + fuelCapacity = 242; class Turrets {}; }; class MH6J_DZ: AH6_Base_EP1 { @@ -53,4 +54,4 @@ class MH6J_DZ: AH6_Base_EP1 { transportMaxMagazines = 20; transportmaxbackpacks = 5; class Turrets {}; -}; \ No newline at end of file +}; From d914620a4cb0e257521b9c43cdc5583d1010b5dd Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:12:53 +0800 Subject: [PATCH 03/18] Update AN2.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp index 062dea1c3..6d5a3268c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp @@ -20,4 +20,5 @@ class AN2_DZ: An2_Base_EP1 transportMaxWeapons = 10; transportMaxMagazines = 80; transportmaxbackpacks = 15; -}; \ No newline at end of file + fuelCapacity = 757; +}; From 1528b1f1fdcb27056acb0b9897f2e5a5b4149203 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:13:36 +0800 Subject: [PATCH 04/18] Update BAF_Merlin.hpp Added realistic fuel capacity --- SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp index 8c01b5a9b..feefb48c5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp @@ -9,4 +9,5 @@ class BAF_Merlin_DZE : BAF_Merlin_HC3_D { transportMaxWeapons = 15; transportMaxMagazines = 150; transportmaxbackpacks = 5; -}; \ No newline at end of file + fuelCapacity = 3222; +}; From c2f86fa6fe503736adb0cbddfffc2f59a875d760 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:14:21 +0800 Subject: [PATCH 05/18] Update C130.hpp Added realistic fuel capacity --- SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp index 178c79795..4348ed7ef 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp @@ -3,4 +3,5 @@ class C130J_US_EP1_DZ: C130J_US_EP1 { transportMaxWeapons = 50; transportMaxMagazines = 400; transportmaxbackpacks = 20; -}; \ No newline at end of file + fuelCapacity = 34095; +}; From 27ad510457aec1843f3d8b7c3afc10f01da5c1f4 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:15:56 +0800 Subject: [PATCH 06/18] Update CH47.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp index fc339307d..f5e5224cc 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp @@ -117,6 +117,7 @@ class CH47_base_EP1: Helicopter irScanRangeMin = 100; irScanRangeMax = 1000; irScanToEyeFactor = 2; + fuelCapacity = 4043; }; class CH_47F_EP1; @@ -278,4 +279,4 @@ class CH_47F_EP1_DZE: CH47_base_EP1 weapon = "M134_2"; }; }; -}; \ No newline at end of file +}; From fdcc7e458fd105e0ed90b02ab329ebc216a29cf0 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:17:04 +0800 Subject: [PATCH 07/18] Update CH53.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 23d17c7fb..1713601ae 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -27,7 +27,8 @@ class CH53_DZ: CH53_base { transportMaxWeapons = 25; transportMaxMagazines = 80; transportmaxbackpacks = 15; - + fuelCapacity = 3849; + class Turrets : Turrets { class MainTurret : MainTurret { magazines[] = {"2000Rnd_762x51_M134"}; From b603fdfe588c85e56f938eafcad7877c9dec2c5c Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:18:00 +0800 Subject: [PATCH 08/18] Update MV22.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp index c83f5d468..664fa5516 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp @@ -11,4 +11,5 @@ class MV22_DZ : MV22 { transportMaxWeapons = 20; transportMaxMagazines = 400; transportmaxbackpacks = 10; -}; \ No newline at end of file + fuelCapacity = 6513; +}; From dbedcfa51c8cf3889f5c4c31e75ba6a65a8db043 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:18:55 +0800 Subject: [PATCH 09/18] Update Mi17.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp index 6dac4f67d..9183962b6 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp @@ -26,6 +26,7 @@ class Mi17_DZ: Mi17_base { transportMaxWeapons = 10; transportMaxMagazines = 50; transportmaxbackpacks = 10; + fuelCapacity = 1870; class Turrets : Turrets { class MainTurret : MainTurret { @@ -64,4 +65,4 @@ class Mi17_Civilian_DZ: Mi17_Civilian { transportMaxWeapons = 10; transportMaxMagazines = 50; transportmaxbackpacks = 10; -}; \ No newline at end of file +}; From fdc4a0aeff5632d512523a53dabcc4d836dc8ba6 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:20:46 +0800 Subject: [PATCH 10/18] Update UH1.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp index f1ac0ca14..d42a071af 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp @@ -28,6 +28,7 @@ class UH1Y_DZ: UH1_Base { transportmaxbackpacks = 4; weapons[] = {}; magazines[] = {}; + fuelCapacity = 1333; class Turrets : Turrets { class MainTurret : MainTurret { magazines[] = {"2000Rnd_762x51_M134"}; @@ -73,6 +74,7 @@ class UH1H_DZ: UH1H_base { transportMaxWeapons = 5; transportMaxMagazines = 25; transportmaxbackpacks = 4; + fuelCapacity = 1333; class Turrets : Turrets { class MainTurret : MainTurret { magazines[] = {"100Rnd_762x51_M240"}; @@ -91,4 +93,4 @@ class UH1H_DZE: UH1H_DZ { magazines[] = {}; }; }; -}; \ No newline at end of file +}; From aa8dac7b5062702ad71123bb99d3ba32431785b7 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:23:46 +0800 Subject: [PATCH 11/18] Update UH60.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp index e1b3f8693..419bad99b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp @@ -11,6 +11,7 @@ class UH60_Base: Helicopter { magazines[] = {"60Rnd_CMFlareMagazine"}; lockDetectionSystem = "8 + 4"; incommingMisslieDetectionSystem = 0; + fuelCapacity = 2760; }; class MH60S_DZ : UH60_Base { crew = ""; @@ -247,14 +248,13 @@ class UH60M_base_EP1: UH60_Base { icon = "\ca\air_e\data\UI\Icon_uh60m_CA.paa"; mapSize = 17; class Library { - libTextDesc = "The Blackhawk is the US Army’s front-line utility helicopter used for transport roles, medical evacuation and even air support.
It is capable of carrying 11 combat-equipped soldiers. Easy to maintain in the field, the Blackhawk performs well in a variety of roles including air assault and medical evacuation."; + libTextDesc = "The Blackhawk is the US Army�s front-line utility helicopter used for transport roles, medical evacuation and even air support.
It is capable of carrying 11 combat-equipped soldiers. Easy to maintain in the field, the Blackhawk performs well in a variety of roles including air assault and medical evacuation."; }; crew = "US_Soldier_Pilot_EP1"; typicalCargo[] = {"US_Soldier_Pilot_EP1","US_Soldier_Pilot_EP1"}; gunnerAction = "ManActTestDriver"; transportMaxBackpacks = 10; transportSoldier = 13; - fuelCapacity = 600; maxSpeed = 295; mainRotorSpeed = 1.2; backRotorSpeed = 6.1; @@ -549,4 +549,4 @@ class UH60M_EP1_DZE: UH60M_US_base_EP1 { weapon = "M134_2"; }; }; -}; \ No newline at end of file +}; From 47d7055fff995584255eeda5f76019972f37ffff Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:24:34 +0800 Subject: [PATCH 12/18] Update PBX.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp b/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp index effd26a1d..398640b59 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp @@ -26,4 +26,5 @@ class PBX: RubberBoat { transportMaxMagazines = 50; transportMaxWeapons = 5; transportMaxBackpacks = 1; -}; \ No newline at end of file + fuelCapacity = 23; +}; From d396babd30c03b17a1d0c48ae2f0d34ec32a166f Mon Sep 17 00:00:00 2001 From: RimBlock Date: Tue, 3 Jun 2014 22:25:24 +0800 Subject: [PATCH 13/18] Update RHIB.hpp Added realistic fuel capacity. --- SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp b/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp index 3d4870929..8524f99a1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp @@ -17,7 +17,7 @@ class Ship : AllVehicles maxSpeed = 30; simulation = "ship"; audible = 6; - fuelCapacity = 100; + fuelCapacity = 250; formationX = 50; formationZ = 100; brakeDistance = 50; @@ -569,4 +569,4 @@ class RHIB_DZ : Boat "ca\water\data\rhib_dash_destruct.rvmat" }; }; -}; \ No newline at end of file +}; From 4496e16e68c9e20afbbdfa2d723916762dc43dd2 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Sat, 19 Jul 2014 08:29:39 +0800 Subject: [PATCH 14/18] Added a basic DB backup batch file I have added a basic DB backup batch file inc instructions on its configuration. --- Server Files/Tools/Backup_DB_sample.bat | 18 ++++++++++++++++++ Server Files/Tools/Backup_DB_sample.txt | 20 ++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Server Files/Tools/Backup_DB_sample.bat create mode 100644 Server Files/Tools/Backup_DB_sample.txt diff --git a/Server Files/Tools/Backup_DB_sample.bat b/Server Files/Tools/Backup_DB_sample.bat new file mode 100644 index 000000000..fcc92c72c --- /dev/null +++ b/Server Files/Tools/Backup_DB_sample.bat @@ -0,0 +1,18 @@ +@REM *** PARAMETERS/VARIABLES *** +SET BackupDir="[Where you want to save the backups]" +SET mysqldir="C:\Program Files\MySQL\MySQL Server 5.6\bin" +SET mysqlschema=[Your DB schema name] +SET mysqlpassword=[your DB password] +SET mysqluser=[your DB user login] +SET housekeepafter=5 +SET datestamp=%date:~-10,2%-%date:~-7,2%-%date:~-4,4%_%time:~0,2%.%time:~3,2%.%time:~6,2% +@REM *** EXECUTION *** +@REM Change to mysqldir +c: +cd %mysqldir% + +@REM dump/backup ALL database, this is all in one line +mysqldump -u %mysqluser% -p%mysqlpassword% --databases %mysqlschema% >%BackupDir%\%mysqlschema%_backup.%datestamp%.sql + +@REM - Housekeeping +forfiles -p %BackupDir% -s -m *.sql -d -%housekeepafter% -c "cmd /c del @path" diff --git a/Server Files/Tools/Backup_DB_sample.txt b/Server Files/Tools/Backup_DB_sample.txt new file mode 100644 index 000000000..b1b810cef --- /dev/null +++ b/Server Files/Tools/Backup_DB_sample.txt @@ -0,0 +1,20 @@ +RimBlocks basic MySQL DB backup. + +How to use Backup_DB.bat + +Input your DB connection details and desired backup save location. All details that need changing are in []. Make the changes without the []. + +e.g. +SET mysqlschema=[Your DB schema name] +may change to +SET mysqlschema=EpochDB + +SET BackupDir="[Where you want to save the backups]" +May change to +SET BackupDir="c:\DB-Backups" + +Housekeeping will clear any .sql files that are over housekeepafter number of days old. + +You may need to confirm the MySQL path for the mysqldump exe as it may depend on your provider. + +Add "read" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. \ No newline at end of file From 8e640ef5b314e44463c4ca13354072014fd2ad89 Mon Sep 17 00:00:00 2001 From: RimBlock Date: Thu, 24 Jul 2014 20:20:23 +0800 Subject: [PATCH 15/18] Amended backup script datestamp to cope with missing 0 in 0x:xx times. --- Server Files/Tools/Backup_DB_sample.bat | 9 ++++++++- Server Files/Tools/Backup_DB_sample.txt | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Server Files/Tools/Backup_DB_sample.bat b/Server Files/Tools/Backup_DB_sample.bat index fcc92c72c..a25ff2252 100644 --- a/Server Files/Tools/Backup_DB_sample.bat +++ b/Server Files/Tools/Backup_DB_sample.bat @@ -5,7 +5,14 @@ SET mysqlschema=[Your DB schema name] SET mysqlpassword=[your DB password] SET mysqluser=[your DB user login] SET housekeepafter=5 -SET datestamp=%date:~-10,2%-%date:~-7,2%-%date:~-4,4%_%time:~0,2%.%time:~3,2%.%time:~6,2% + +For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) +For /f "tokens=1-2 delims=/:" %%a in ("%TIME%") do (set mytime=%%a.%%b) + +set hour=%time:~0,2% +if "%time:~0,1%"==" " set hour=0%time:~1,1% +set datestamp=%date:~10,4%-%date:~4,2%-%date:~7,2%_%hour%%time:~3,2% + @REM *** EXECUTION *** @REM Change to mysqldir c: diff --git a/Server Files/Tools/Backup_DB_sample.txt b/Server Files/Tools/Backup_DB_sample.txt index b1b810cef..2aeaec576 100644 --- a/Server Files/Tools/Backup_DB_sample.txt +++ b/Server Files/Tools/Backup_DB_sample.txt @@ -1,5 +1,7 @@ RimBlocks basic MySQL DB backup. +This batch (.bat) file will connect to your MySQL server and create a dump of the sql code required to recreate the DB you have selected. mysqldump.exe has other options you can supply so you could talior the basic script fairly easily to fit your individual need. + How to use Backup_DB.bat Input your DB connection details and desired backup save location. All details that need changing are in []. Make the changes without the []. @@ -17,4 +19,4 @@ Housekeeping will clear any .sql files that are over housekeepafter number of da You may need to confirm the MySQL path for the mysqldump exe as it may depend on your provider. -Add "read" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. \ No newline at end of file +Add "pause" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. \ No newline at end of file From 3214eda74ac787f659372459563eb19a1254f8fe Mon Sep 17 00:00:00 2001 From: RimBlock Date: Sat, 19 Jul 2014 08:29:39 +0800 Subject: [PATCH 16/18] no message --- Server Files/Tools/Backup_DB_sample.bat | 4 ++++ Server Files/Tools/Backup_DB_sample.txt | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Server Files/Tools/Backup_DB_sample.bat b/Server Files/Tools/Backup_DB_sample.bat index a25ff2252..fa5f75e91 100644 --- a/Server Files/Tools/Backup_DB_sample.bat +++ b/Server Files/Tools/Backup_DB_sample.bat @@ -5,6 +5,7 @@ SET mysqlschema=[Your DB schema name] SET mysqlpassword=[your DB password] SET mysqluser=[your DB user login] SET housekeepafter=5 +<<<<<<< HEAD For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) For /f "tokens=1-2 delims=/:" %%a in ("%TIME%") do (set mytime=%%a.%%b) @@ -13,6 +14,9 @@ set hour=%time:~0,2% if "%time:~0,1%"==" " set hour=0%time:~1,1% set datestamp=%date:~10,4%-%date:~4,2%-%date:~7,2%_%hour%%time:~3,2% +======= +SET datestamp=%date:~-10,2%-%date:~-7,2%-%date:~-4,4%_%time:~0,2%.%time:~3,2%.%time:~6,2% +>>>>>>> 4496e16... Added a basic DB backup batch file @REM *** EXECUTION *** @REM Change to mysqldir c: diff --git a/Server Files/Tools/Backup_DB_sample.txt b/Server Files/Tools/Backup_DB_sample.txt index 2aeaec576..fa4363148 100644 --- a/Server Files/Tools/Backup_DB_sample.txt +++ b/Server Files/Tools/Backup_DB_sample.txt @@ -1,7 +1,10 @@ RimBlocks basic MySQL DB backup. +<<<<<<< HEAD This batch (.bat) file will connect to your MySQL server and create a dump of the sql code required to recreate the DB you have selected. mysqldump.exe has other options you can supply so you could talior the basic script fairly easily to fit your individual need. +======= +>>>>>>> 4496e16... Added a basic DB backup batch file How to use Backup_DB.bat Input your DB connection details and desired backup save location. All details that need changing are in []. Make the changes without the []. @@ -19,4 +22,8 @@ Housekeeping will clear any .sql files that are over housekeepafter number of da You may need to confirm the MySQL path for the mysqldump exe as it may depend on your provider. -Add "pause" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. \ No newline at end of file +<<<<<<< HEAD +Add "pause" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. +======= +Add "read" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. +>>>>>>> 4496e16... Added a basic DB backup batch file From e497ae4a6501477fe7ae303c4812d0231255496f Mon Sep 17 00:00:00 2001 From: RimBlock Date: Thu, 24 Jul 2014 20:53:25 +0800 Subject: [PATCH 17/18] no message --- Server Files/Tools/Backup_DB_sample.bat | 4 ---- Server Files/Tools/Backup_DB_sample.txt | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Server Files/Tools/Backup_DB_sample.bat b/Server Files/Tools/Backup_DB_sample.bat index fa5f75e91..a25ff2252 100644 --- a/Server Files/Tools/Backup_DB_sample.bat +++ b/Server Files/Tools/Backup_DB_sample.bat @@ -5,7 +5,6 @@ SET mysqlschema=[Your DB schema name] SET mysqlpassword=[your DB password] SET mysqluser=[your DB user login] SET housekeepafter=5 -<<<<<<< HEAD For /f "tokens=2-4 delims=/ " %%a in ('date /t') do (set mydate=%%c-%%a-%%b) For /f "tokens=1-2 delims=/:" %%a in ("%TIME%") do (set mytime=%%a.%%b) @@ -14,9 +13,6 @@ set hour=%time:~0,2% if "%time:~0,1%"==" " set hour=0%time:~1,1% set datestamp=%date:~10,4%-%date:~4,2%-%date:~7,2%_%hour%%time:~3,2% -======= -SET datestamp=%date:~-10,2%-%date:~-7,2%-%date:~-4,4%_%time:~0,2%.%time:~3,2%.%time:~6,2% ->>>>>>> 4496e16... Added a basic DB backup batch file @REM *** EXECUTION *** @REM Change to mysqldir c: diff --git a/Server Files/Tools/Backup_DB_sample.txt b/Server Files/Tools/Backup_DB_sample.txt index fa4363148..2aeaec576 100644 --- a/Server Files/Tools/Backup_DB_sample.txt +++ b/Server Files/Tools/Backup_DB_sample.txt @@ -1,10 +1,7 @@ RimBlocks basic MySQL DB backup. -<<<<<<< HEAD This batch (.bat) file will connect to your MySQL server and create a dump of the sql code required to recreate the DB you have selected. mysqldump.exe has other options you can supply so you could talior the basic script fairly easily to fit your individual need. -======= ->>>>>>> 4496e16... Added a basic DB backup batch file How to use Backup_DB.bat Input your DB connection details and desired backup save location. All details that need changing are in []. Make the changes without the []. @@ -22,8 +19,4 @@ Housekeeping will clear any .sql files that are over housekeepafter number of da You may need to confirm the MySQL path for the mysqldump exe as it may depend on your provider. -<<<<<<< HEAD -Add "pause" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. -======= -Add "read" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. ->>>>>>> 4496e16... Added a basic DB backup batch file +Add "pause" (without "") at the end of the file to require an input for debugging. This allows you to check the test backup is ok and troubleshoot any issues. Remove it when automating or the .bat file will never close. Automation can be done via Windows task scheduler. Create a basic task and then edit the tasks parameters after creating if you want to backup more than once a day. The option is only available after the task is created. \ No newline at end of file From 613a08c770d3d044cd3c68241475a7bb55baf53b Mon Sep 17 00:00:00 2001 From: RimBlock Date: Thu, 24 Jul 2014 21:00:41 +0800 Subject: [PATCH 18/18] no message --- .../Configs/CfgVehicles/AIR/CH53.hpp | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index b969a75a9..b18f56d67 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -27,23 +27,5 @@ class CH53_DZE : USEC_ch53_E { transportMaxWeapons = 25; transportMaxMagazines = 80; transportmaxbackpacks = 15; -<<<<<<< HEAD fuelCapacity = 3849; - - class Turrets : Turrets { - class MainTurret : MainTurret { - magazines[] = {"2000Rnd_762x51_M134"}; - }; - }; -}; -class CH53_DZE: CH53_DZ { - displaynameshort = "CH53_DZE"; - class Turrets : Turrets { - class MainTurret : MainTurret { - magazines[] = {""}; - }; - }; -}; -======= -}; ->>>>>>> 41c658c0c8b8f580c5b137ea22830ac81c2123e6 +}; \ No newline at end of file