diff --git a/gamedir/Data-1.13/Helicopter_Settings.INI b/gamedir/Data-1.13/Helicopter_Settings.INI new file mode 100644 index 000000000..0f6596819 --- /dev/null +++ b/gamedir/Data-1.13/Helicopter_Settings.INI @@ -0,0 +1,74 @@ +[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 \ No newline at end of file diff --git a/gamedir/Data-1.13/Interface/POS2_ALTERNATE.STI b/gamedir/Data-1.13/Interface/POS2_ALTERNATE.STI new file mode 100644 index 000000000..75bfab149 Binary files /dev/null and b/gamedir/Data-1.13/Interface/POS2_ALTERNATE.STI differ diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 0b089d4c7..2f00f704c 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -508,7 +508,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 ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -1527,29 +1541,6 @@ USE_SCOPE_MODES = TRUE ; Allow display of scope modes on weapon DISPLAY_SCOPE_MODES = TRUE -;------------------------------------------------------------------------------------------------------------------------------ -; Spotter skill -;------------------------------------------------------------------------------------------------------------------------------ - -; You can assign a merc to spot for fellow snipers via calling the Skill Menu ($) -> various -> Spotter. -; You need an item the usSpotting-tag in your hands. -; The bonus applies to anyone of your team using a sniper weapon on a location your spotter can see. -; Effectiveness depends on: -; - spotters spotter item effectiveness (40%), experience (30%), marksmanship (20%) and leadership (10%) -; - lowered by being wounded or fatigues -; - altered by relation between spotter and sniper (base opinion, sexism, racism etc.) and spotter background - -; The bonus will be this many turns after activating the skill. Spending any AP with your spotter forfeits the bonus. -SPOTTER_PREPARATIONTURNS = 3 - -; This variable intentionally has two meanings. -; - A sniper will benefit from a spotter only if he is at maximum SPOTTER_RANGE tiles away from him. -; - The bonus only works on those locations the spotter can see and that are AT LEAST 2 * SPOTTER_RANGE tiles away. -SPOTTER_RANGE = 10 - -; Maximum bonus that can be reached once spoter has waited 2 * SPOTTER_PREPARATIONTURNS turns -SPOTTER_MAX_CTHBOOST = 50 - ;------------------------------------------------------------------------------------------------------------------------------ ; external feeding ;------------------------------------------------------------------------------------------------------------------------------ @@ -2835,6 +2826,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 = TRUE + +; 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 = TRUE + +; If TRUE, each helicopter repair will cost more - for balancing reasons and to simulate parts scarcity. +WALDO_SUBSEQUENT_REPAIRS_COST_INCREASE = TRUE + +; 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 = TRUE + +;------------------------------------------------------------------------------------------------------------------------------ +; 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 = TRUE + +; If TRUE, after helicopter gets hit by SAM, there's chance passengers will be wounded. +HELICOPTER_PASSENGERS_CAN_GET_HIT = TRUE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/NpcData/097.EDT b/gamedir/Data-1.13/NpcData/097.EDT new file mode 100644 index 000000000..bc68fcf5b Binary files /dev/null and b/gamedir/Data-1.13/NpcData/097.EDT differ diff --git a/gamedir/Data-1.13/NpcData/138.EDT b/gamedir/Data-1.13/NpcData/138.EDT new file mode 100644 index 000000000..4610a1711 Binary files /dev/null and b/gamedir/Data-1.13/NpcData/138.EDT differ diff --git a/gamedir/Data-1.13/NpcData/138.NPC b/gamedir/Data-1.13/NpcData/138.NPC new file mode 100644 index 000000000..704807ecb Binary files /dev/null and b/gamedir/Data-1.13/NpcData/138.NPC differ diff --git a/gamedir/Data-1.13/Npc_Speech/097_057.WAV b/gamedir/Data-1.13/Npc_Speech/097_057.WAV new file mode 100644 index 000000000..178616505 Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/097_057.WAV differ diff --git a/gamedir/Data-1.13/Npc_Speech/097_057.gap b/gamedir/Data-1.13/Npc_Speech/097_057.gap new file mode 100644 index 000000000..e2851857f Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/097_057.gap differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_022.gap b/gamedir/Data-1.13/Npc_Speech/138_022.gap new file mode 100644 index 000000000..3c8fd946f Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_022.gap differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_022.wav b/gamedir/Data-1.13/Npc_Speech/138_022.wav new file mode 100644 index 000000000..71fe2d504 Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_022.wav differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_023.gap b/gamedir/Data-1.13/Npc_Speech/138_023.gap new file mode 100644 index 000000000..17f3e4c28 Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_023.gap differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_023.wav b/gamedir/Data-1.13/Npc_Speech/138_023.wav new file mode 100644 index 000000000..026ec01fe Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_023.wav differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_024.wav b/gamedir/Data-1.13/Npc_Speech/138_024.wav new file mode 100644 index 000000000..acda7904d Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_024.wav differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_025.wav b/gamedir/Data-1.13/Npc_Speech/138_025.wav new file mode 100644 index 000000000..7b930c598 Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_025.wav differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_026.wav b/gamedir/Data-1.13/Npc_Speech/138_026.wav new file mode 100644 index 000000000..996363c31 Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_026.wav differ diff --git a/gamedir/Data-1.13/Npc_Speech/138_027.wav b/gamedir/Data-1.13/Npc_Speech/138_027.wav new file mode 100644 index 000000000..6c579c76e Binary files /dev/null and b/gamedir/Data-1.13/Npc_Speech/138_027.wav differ diff --git a/gamedir/Data-1.13/TableData/RPCFacesSmall.xml b/gamedir/Data-1.13/TableData/RPCFacesSmall.xml index 68fda9f37..4b190ac3f 100644 --- a/gamedir/Data-1.13/TableData/RPCFacesSmall.xml +++ b/gamedir/Data-1.13/TableData/RPCFacesSmall.xml @@ -269,4 +269,13 @@ 6 23 + + 30 + Waldo + 138 + 9 + 9 + 9 + 27 + diff --git a/gamedir/Data-1.13/faces/138.sti b/gamedir/Data-1.13/faces/138.sti new file mode 100644 index 000000000..c410fa70b Binary files /dev/null and b/gamedir/Data-1.13/faces/138.sti differ