From 0f542ca9800ed219bc8e2af2619d00d1b2004b49 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 2 Jan 2014 09:53:25 +0000
Subject: [PATCH] Bugfix: Fixed crash when closing laptop and playing with
 vanilla settings ("Data" folder) - The Game looked for files (Helicopter
 feature repair, GameDir rev. 1897) in the "Data" folder, but those files were
 only in the "Data-1.13" folder - I moved the files in the "Data" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1911 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/NpcData/097.EDT                     | Bin 27840 -> 0 bytes
 Data/Helicopter_Settings.INI                  |  80 ++++++++++++++++++
 .../Interface/POS2_ALTERNATE.STI              | Bin
 Data/Ja2_Options.INI                          |  51 ++++++++++-
 Data/NPCData/097.EDT                          | Bin 68640 -> 27840 bytes
 {Data-1.13/NpcData => Data/NPCData}/138.EDT   | Bin
 {Data-1.13/NpcData => Data/NPCData}/138.NPC   | Bin
 .../NPC_Speech}/097_057.WAV                   | Bin
 .../NPC_Speech}/097_057.gap                   | Bin
 .../NPC_Speech}/138_022.gap                   | Bin
 .../NPC_Speech}/138_022.wav                   | Bin
 .../NPC_Speech}/138_023.gap                   | Bin
 .../NPC_Speech}/138_023.wav                   | Bin
 .../NPC_Speech}/138_024.wav                   | Bin
 .../NPC_Speech}/138_025.wav                   | Bin
 .../NPC_Speech}/138_026.wav                   | Bin
 .../NPC_Speech}/138_027.wav                   | Bin
 Data/TableData/RPCFacesSmall.xml              |   9 ++
 {Data-1.13 => Data}/faces/138.sti             | Bin
 19 files changed, 137 insertions(+), 3 deletions(-)
 delete mode 100644 Data-1.13/NpcData/097.EDT
 create mode 100644 Data/Helicopter_Settings.INI
 rename {Data-1.13 => Data}/Interface/POS2_ALTERNATE.STI (100%)
 rename {Data-1.13/NpcData => Data/NPCData}/138.EDT (100%)
 rename {Data-1.13/NpcData => Data/NPCData}/138.NPC (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/097_057.WAV (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/097_057.gap (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_022.gap (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_022.wav (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_023.gap (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_023.wav (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_024.wav (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_025.wav (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_026.wav (100%)
 rename {Data-1.13/Npc_Speech => Data/NPC_Speech}/138_027.wav (100%)
 rename {Data-1.13 => Data}/faces/138.sti (100%)

diff --git a/Data-1.13/NpcData/097.EDT b/Data-1.13/NpcData/097.EDT
deleted file mode 100644
index bc68fcf5bc576fffda0435e3414e00aa4a4181f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27840
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
D!+B<B

diff --git a/Data/Helicopter_Settings.INI b/Data/Helicopter_Settings.INI
new file mode 100644
index 000000000..75261ed12
--- /dev/null
+++ b/Data/Helicopter_Settings.INI
@@ -0,0 +1,80 @@
+[Helicopter Repair Settings]
+
+; How much repair will cost if helicopter is slightly (1 hit) damaged (0 - 100000).
+HELICOPTER_BASIC_REPAIR_COST = 2500
+
+; How much repair will cost if helicopter is seriously (2 hits) damaged (0 - 100000).
+HELICOPTER_SERIOUS_REPAIR_COST = 7500
+
+; How long repair will take if helicopter is seriously damaged (in hours, 1 - 255).
+HELICOPTER_BASIC_REPAIR_TIME = 8
+
+; HELICOPTER_REPAIR_TIME may randomly vary by this amount (in hours, 0 - 255).
+HELICOPTER_BASIC_REPAIR_TIME_VARIATION = 2
+
+; How long repair will take if helicopter is seriously damaged (in hours, 1 - 255).
+HELICOPTER_SERIOUS_REPAIR_TIME = 24
+
+; HELICOPTER_SERIOUS_REPAIR_TIME may randomly vary by this amount (in hours, 0 - 255).
+HELICOPTER_SERIOUS_REPAIR_TIME_VARIATION = 6
+
+; How much cost of repairs will increase after every repair - for balancing reasons, and simulating parts scarcity (0 - 100000).
+HELICOPTER_BASIC_COST_INCREASE_AFTER_BASIC_REPAIR = 500
+HELICOPTER_BASIC_COST_INCREASE_AFTER_SERIOUS_REPAIR = 1000
+HELICOPTER_SERIOUS_COST_INCREASE_AFTER_BASIC_REPAIR = 1500
+HELICOPTER_SERIOUS_COST_INCREASE_AFTER_SERIOUS_REPAIR = 3000
+
+; How much basic repair will cost at absolute maximum - to avoid immersion breaking ridiculous costs (0 - 1000000).
+HELICOPTER_BASIC_REPAIR_COST_MAX = 10000
+
+; How much serious repair will cost at absolute maximum - to avoid immersion breaking ridiculous costs (0 - 1000000).
+HELICOPTER_SERIOUS_REPAIR_COST_MAX = 25000
+
+[Helicopter Refuel Settings]
+
+; How far can helicopter go without refuel if its tank is full (in sectors, 1-255). Note: distance between Drassen airport and Estoni equals 14 sectors.
+; Only used if alternative fuel system is on.
+; Vanilla-ish (technically it's wasn't used) JA2 - 25.
+HELICOPTER_DISTANCE_WITHOUT_REFUEL = 25
+
+; How long can helicopter hover before using single fuel unit (in minutes, 1-255). 
+; Only used if alternative fuel system is on.
+HELICOPTER_HOVER_TIME_PER_FUEL_UNIT = 10
+
+; How long helicopter needs to fully refuel (in minutes, 1-255). 
+; Only used if alternative fuel system is on.
+; Vanilla-ish (technically it's wasn't used) JA2 - 30.
+HELICOPTER_REFUEL_TIME = 30
+
+; How long can helicopter hover before Skyrider whines (in minutes, 1-255). 
+; Only used if alternative fuel system is off.
+; Vanilla JA2 - 10.
+HELICOPTER_TIME_DELAY_FOR_HOVER_WAIT = 10
+
+; How long can helicopter hover before Skyrider returns to base (in minutes, 1-255). 
+; Only used if alternative fuel system is off.
+; Vanilla JA2 - 20.
+HELICOPTER_TIME_DELAY_FOR_HOVER_WAIT_TOO_LONG = 20
+
+; If TRUE, Skyrider won't automatically kick everyone out after running out of fuel, instead prompt will be shown.
+HELICOPTER_ASK_BEFORE_KICKING_PASSENGERS_OUT = TRUE
+
+[Helicopter SAM Settings]
+
+; Chance that helicopter gets hit by SAM attack when arriving at sector in hostile air zone (in percents). 
+; Vanilla JA2 - 33.
+HELICOPTER_SAM_SITE_ACCURACY = 33
+
+; Chance per passenger he will get hurt when helicopter is hit (in percents).
+HELICOPTER_PASSENGER_HIT_CHANCE = 30
+
+; Minimum damage passenger will take when hit in helicopter.
+HELICOPTER_PASSENGER_HIT_MIN_DAMAGE = 1
+
+; Maximum damage passenger will take when hit in helicopter.
+HELICOPTER_PASSENGER_HIT_MAX_DAMAGE = 10
+
+[Helicopter Other Settings]
+
+; If FALSE, Skyrider will always fly when other conditions are satisfied, ignoring his associated town loyalty check. Vanilla JA2 - TRUE
+HELICOPTER_TOWN_LOYALTY_CHECK = TRUE
\ No newline at end of file
diff --git a/Data-1.13/Interface/POS2_ALTERNATE.STI b/Data/Interface/POS2_ALTERNATE.STI
similarity index 100%
rename from Data-1.13/Interface/POS2_ALTERNATE.STI
rename to Data/Interface/POS2_ALTERNATE.STI
diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI
index a0a42ce4d..c8e360230 100644
--- a/Data/Ja2_Options.INI
+++ b/Data/Ja2_Options.INI
@@ -387,7 +387,6 @@ SHOW_SKILLS_IN_HIRING_PAGE = FALSE
 ; Exp = 8 will random between 7-9 due to 9 maximum limit
 ; Exp = 2 will random between 1-3 due to 1 minimum limit
 ; Exp = 1/9 will not random
-;
 ;------------------------------------------------------------------------------------------------------------------------------
 
 MERCS_RANDOM_STATS = 0
@@ -507,7 +506,21 @@ HELICOPTER_BASE_COST_PER_GREEN_TILE = 100
 ;Cost for moving through sectors that are being controlled by an enemy SAM Site.
 HELICOPTER_BASE_COST_PER_RED_TILE = 1000
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Change the cost of helicopter hovering in sector.
+;------------------------------------------------------------------------------------------------------------------------------
 
+;Cost for hovering in sectors that are free of enemy SAM Site control.
+HELICOPTER_HOVER_COST_ON_GREEN_TILE = 50
+
+;Cost for hovering in sectors that are being controlled by an enemy SAM Site.
+HELICOPTER_HOVER_COST_ON_RED_TILE = 500
+
+;If TRUE, player will have to pay Skyrider even if he returns to base automatically - no more hovering until he runs out of fuel to save money.
+HELICOPTER_RETURN_TO_BASE_IS_NOT_FREE = FALSE
+
+;If TRUE, Skyrider will demand money only after safely landing in base.
+HELICOPTER_PAY_SKYRIDER_IN_BASE = TRUE
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -1493,7 +1506,7 @@ FASTER_SHOT_FROM_ALTWEAPHOLD_PERC = 10
 ; The base (N)CtH penalty when firing from alternative weapon holding.
 CTH_PENALTY_FROM_ALTWEAPHOLD = 30
 
-; The base penalty when aiming from alternative weapon holding, if aiming from it is allowed. (This modifier is DOUBLED under NCTH,
+; The base penalty when aiming from alternative weapon holding, if aiming from it is allowed.
 AIMING_PENALY_FROM_ALTWEAPHOLD = 30
 
 ; Aiming levels of the gun are reduced percentually by this number on alternative weapon holding. So 50 here means only half aiming 
@@ -1524,7 +1537,7 @@ WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50
 ; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical)
 USE_SCOPE_MODES = FALSE
 
-; Allow display of scope modes on weapons in tactical
+; Allow display of scope modes on weapon
 DISPLAY_SCOPE_MODES = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
@@ -2822,6 +2835,32 @@ PRISONER_INTERROGATION_POINTS_REGULAR   = 100
 PRISONER_INTERROGATION_POINTS_ELITE     = 140
 PRISONER_INTERROGATION_POINTS_SPECIAL   = 250
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Helicopter Repair
+;------------------------------------------------------------------------------------------------------------------------------
+
+; If TRUE, Waldo can repair helicopter. You need to talk to him or give him money after damaged helicopter lands in his sector.
+WALDO_CAN_REPAIR_HELICOPTER	= FALSE
+
+; If TRUE, Waldo will offer repair in strategic view, as soon as damaged helicopter lands in his sector and player has enough money.
+WALDO_OFFERS_REPAIR_IN_STRATEGIC = FALSE
+
+; If TRUE, each helicopter repair will cost more - for balancing reasons and to simulate parts scarcity.
+WALDO_SUBSEQUENT_REPAIRS_COST_INCREASE = FALSE
+
+; If TRUE, Skyrider will refuse to fly if helicopter is seriously damaged (he already returns to base, so it makes sense).
+SERIOUSLY_DAMAGED_SKYRIDER_WONT_FLY = FALSE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Helicopter Refuel
+;------------------------------------------------------------------------------------------------------------------------------
+
+; If TRUE, Skyrider will have a limited amount of fuel, and will require refills in the base. Flying and hovering will burn fuel.
+ALTERNATIVE_HELICOPTER_FUEL_SYSTEM = FALSE
+
+; If TRUE, after helicopter gets hit by SAM, there's chance passengers will be wounded.
+HELICOPTER_PASSENGERS_CAN_GET_HIT = FALSE
+
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
@@ -2888,6 +2927,12 @@ FAST_WWW_SITES_LOADING = FALSE
 ; If set to TRUE, mouse boundary will be locked on the laptop, default behaviour. Ctrl + Z / Ctrl + Y to toggle current laptop session only
 LAPTOP_MOUSE_CAPTURED = FALSE
 
+; if true, campaign history site (Arulco Press Council) is accessible
+CAMPAIGN_HISTORY = FALSE
+
+; Only read the last ... battle reports, forget older ones. With -1 (default), read all of them. Reports lost this way cannot be recreated!
+CAMPAIGN_HISTORY_MAX_REPORTS = -1
+
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
diff --git a/Data/NPCData/097.EDT b/Data/NPCData/097.EDT
index 2ccdd27e6c2bca12a61a14d618c891497e2f5da8..bc68fcf5bc576fffda0435e3414e00aa4a4181f2 100644
GIT binary patch
delta 31
ncmZ25gXO?Y#tl}P><SEe3<?Ydo1HV~Gfr+u4BD&{)yD_`t~Uyt

delta 407
pcmX?blX1ZemJL>!ocat340=Euu-P$lKI2A%4WoE~!eFAoI{+ano%#R(

diff --git a/Data-1.13/NpcData/138.EDT b/Data/NPCData/138.EDT
similarity index 100%
rename from Data-1.13/NpcData/138.EDT
rename to Data/NPCData/138.EDT
diff --git a/Data-1.13/NpcData/138.NPC b/Data/NPCData/138.NPC
similarity index 100%
rename from Data-1.13/NpcData/138.NPC
rename to Data/NPCData/138.NPC
diff --git a/Data-1.13/Npc_Speech/097_057.WAV b/Data/NPC_Speech/097_057.WAV
similarity index 100%
rename from Data-1.13/Npc_Speech/097_057.WAV
rename to Data/NPC_Speech/097_057.WAV
diff --git a/Data-1.13/Npc_Speech/097_057.gap b/Data/NPC_Speech/097_057.gap
similarity index 100%
rename from Data-1.13/Npc_Speech/097_057.gap
rename to Data/NPC_Speech/097_057.gap
diff --git a/Data-1.13/Npc_Speech/138_022.gap b/Data/NPC_Speech/138_022.gap
similarity index 100%
rename from Data-1.13/Npc_Speech/138_022.gap
rename to Data/NPC_Speech/138_022.gap
diff --git a/Data-1.13/Npc_Speech/138_022.wav b/Data/NPC_Speech/138_022.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_022.wav
rename to Data/NPC_Speech/138_022.wav
diff --git a/Data-1.13/Npc_Speech/138_023.gap b/Data/NPC_Speech/138_023.gap
similarity index 100%
rename from Data-1.13/Npc_Speech/138_023.gap
rename to Data/NPC_Speech/138_023.gap
diff --git a/Data-1.13/Npc_Speech/138_023.wav b/Data/NPC_Speech/138_023.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_023.wav
rename to Data/NPC_Speech/138_023.wav
diff --git a/Data-1.13/Npc_Speech/138_024.wav b/Data/NPC_Speech/138_024.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_024.wav
rename to Data/NPC_Speech/138_024.wav
diff --git a/Data-1.13/Npc_Speech/138_025.wav b/Data/NPC_Speech/138_025.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_025.wav
rename to Data/NPC_Speech/138_025.wav
diff --git a/Data-1.13/Npc_Speech/138_026.wav b/Data/NPC_Speech/138_026.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_026.wav
rename to Data/NPC_Speech/138_026.wav
diff --git a/Data-1.13/Npc_Speech/138_027.wav b/Data/NPC_Speech/138_027.wav
similarity index 100%
rename from Data-1.13/Npc_Speech/138_027.wav
rename to Data/NPC_Speech/138_027.wav
diff --git a/Data/TableData/RPCFacesSmall.xml b/Data/TableData/RPCFacesSmall.xml
index 0870c37ef..e61c399e5 100644
--- a/Data/TableData/RPCFacesSmall.xml
+++ b/Data/TableData/RPCFacesSmall.xml
@@ -259,5 +259,14 @@ MouthY		 -  position of mouth Y (required)
 		<EyesY>7</EyesY>
 		<MouthX>8</MouthX>
 		<MouthY>22</MouthY>
+	</FACE>
+	<FACE>
+		<uiIndex>28</uiIndex>
+		<Name>Waldo</Name>
+		<FaceIndex>138</FaceIndex>
+		<EyesX>9</EyesX>
+		<EyesY>9</EyesY>
+		<MouthX>9</MouthX>
+		<MouthY>27</MouthY>
 	</FACE>	
 </SMALLFACE>
\ No newline at end of file
diff --git a/Data-1.13/faces/138.sti b/Data/faces/138.sti
similarity index 100%
rename from Data-1.13/faces/138.sti
rename to Data/faces/138.sti