From 74e0be1cce1ccaed40ece1569f730fd36c43dc48 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 19 Dec 2013 19:54:34 +0000
Subject: [PATCH] New Feature: Spotter skill (available to every merc) allows a
 merc to be spotter for other snipers. Spotter items have to be in hands,
 spending APs cancels action.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1896 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/APBPConstants.ini         |  5 +++++
 gamedir/Data-1.13/Ja2_Options.INI           | 23 +++++++++++++++++++++
 gamedir/Data-1.13/TableData/Backgrounds.xml | 20 +++++++++++++++++-
 gamedir/Data-1.13/TableData/Items/Items.xml |  3 +++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/gamedir/Data-1.13/APBPConstants.ini b/gamedir/Data-1.13/APBPConstants.ini
index a0a864300..1cf511605 100644
--- a/gamedir/Data-1.13/APBPConstants.ini
+++ b/gamedir/Data-1.13/APBPConstants.ini
@@ -431,6 +431,11 @@ AP_APPLYITEM = 50
 ;***********************************************************************
 AP_INVENTORY_ARM  = 20
 
+;***********************************************************************
+;* The APs for activating the spotter skill                            *
+;***********************************************************************
+AP_SPOTTER  = 20
+
 [BPConstants]
 BP_RATIO_RED_PTS_TO_NORMAL = 100
 ;***********************************************************************
diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 69ab1d7d3..0b089d4c7 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1527,6 +1527,29 @@ 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
 ;------------------------------------------------------------------------------------------------------------------------------
diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml
index 112d44c02..751869a7a 100644
--- a/gamedir/Data-1.13/TableData/Backgrounds.xml
+++ b/gamedir/Data-1.13/TableData/Backgrounds.xml
@@ -79,6 +79,7 @@
     <breachingcharge>0</breachingcharge>              <!-- +- success chance with door braching charges, -100 to 100 -->
     <cth_vs_creatures>0</cth_vs_creatures>            <!-- +- cth with firearms when aiming at creatures, -10 to 10 -->
     <insurance>0</insurance>                          <!-- +- % insurance cost, -50 to 200 -->
+    <spotter>0</spotter>                              <!-- +- % spotter skill effectiveness, -30 to 30 -->
     
     <!-- on/off properties: 1 for on, 0 for off -->      
     <druguse>0</druguse>                              <!-- might use drugs from inventory (the 'Larry'-behaviour) -->
@@ -435,6 +436,7 @@
     <szDescription>Some people display a knack for shooting, and a disturbing &#10;aggression against innocent paper bull's eyes.</szDescription>
     <marksmanship>3</marksmanship>
     <increased_maxcth>1</increased_maxcth>
+    <spotter>5</spotter>
   </BACKGROUND>
   <BACKGROUND>
     <uiIndex>38</uiIndex>
@@ -789,7 +791,7 @@
    <uiIndex>71</uiIndex>
    <szName>Big Game Hunter</szName>
    <szShortName>Big Game Hunter</szShortName>
-   <szDescription>Travel to pristine nature, seek fascinating species, and &#10;KILL THEM ALL.</szDescription>
+   <szDescription>Travel to virgin soil, seek fascinating species, and &#10;KILL THEM ALL.</szDescription>
    <ap_desert>1</ap_desert>
    <ap_swamp>2</ap_swamp>
    <ap_urban>-3</ap_urban>
@@ -812,4 +814,20 @@
    <breachingcharge>20</breachingcharge>
    <scrounging>1</scrounging>
   </BACKGROUND>
+  <BACKGROUND>
+   <uiIndex>73</uiIndex>
+   <szName>Peeper</szName>
+   <szShortName>Peeper</szShortName>
+   <szDescription>Why is this still necessary? Dude, visit the internet...</szDescription>
+   <stealth>4</stealth>
+   <spotter>15</spotter>
+   <no_female>1</no_female>
+  </BACKGROUND>
+  <BACKGROUND>
+   <uiIndex>74</uiIndex>
+   <szName>Spotter</szName>
+   <szShortName>Spotter</szShortName>
+   <szDescription>Paired with a sniper, it is your job to make out targets and help in shot calculations</szDescription>
+   <spotter>30</spotter>
+  </BACKGROUND>
 </BACKGROUNDS>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 3fe345c18..725c688e9 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -183,6 +183,7 @@
 		<ItemChoiceTimeSetting>0</ItemChoiceTimeSetting>
 		<buddyitem>0</buddyitem>
 		<SleepModifier>0</SleepModifier>
+		<usSpotting>0</usSpotting>
 		<STAND_MODIFIERS>
 			<FlatBase>0</FlatBase>
 			<PercentBase>0</PercentBase>
@@ -6131,6 +6132,7 @@
 		<BrightLightVisionRangeBonus>80</BrightLightVisionRangeBonus>
 		<PercentTunnelVision>70</PercentTunnelVision>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<usSpotting>50</usSpotting>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -6167,6 +6169,7 @@
 		<BrightLightVisionRangeBonus>50</BrightLightVisionRangeBonus>
 		<PercentTunnelVision>40</PercentTunnelVision>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<usSpotting>70</usSpotting>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />