From 29a132a2dd1c6d5a7874947bcc4b161cd4d77e14 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 22 Jan 2015 21:17:45 +0000
Subject: [PATCH] Added xml explanations

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2199 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Morale_Settings.INI         | 16 ++++++++--------
 gamedir/Data-1.13/TableData/CivGroupNames.xml |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gamedir/Data-1.13/Morale_Settings.INI b/gamedir/Data-1.13/Morale_Settings.INI
index 9cb5b86d7..d94d951d8 100644
--- a/gamedir/Data-1.13/Morale_Settings.INI
+++ b/gamedir/Data-1.13/Morale_Settings.INI
@@ -174,10 +174,10 @@ MORALE_MODIFIER_MALICIOUS_HOURLY_DECAY = -1
 ; friendly fire
 OPINIONEVENT_FRIENDLYFIRE                     = -10
 
-; a sntich told the player about our complaining
+; a snitch told the player about our complaining
 OPINIONEVENT_SNITCHSOLDMEOUT                  = -3
 
-; a snitch stopped u from stealing/taking drugs
+; a snitch stopped us from stealing/taking drugs
 OPINIONEVENT_SNITCHINTERFERENCE               = -5
 
 ; someone else is friends with someone we really don't like
@@ -195,7 +195,7 @@ OPINIONEVENT_CIVKILLER                        = -8
 ; someone carries too much and slows down the squad
 OPINIONEVENT_SLOWSUSDOWN                      = -2
 
-; we are hungry and someone else has food an obviously does not share
+; we are hungry and someone else has food and obviously does not share
 OPINIONEVENT_NOSHARINGFOOD                    = -1
 
 ; someone else's disability kicked in
@@ -204,10 +204,10 @@ OPINIONEVENT_ANNOYINGDISABILITY               = -2
 ; other merc is an addict and consumes drugs
 OPINIONEVENT_ADDICT                           = -6
 
-; othe merc is stealing
+; other merc is stealing
 OPINIONEVENT_THIEF                            = -5
 
-; we blame an IMP else for huge battle losses
+; we blame an IMP for huge battle losses
 OPINIONEVENT_WORSTCOMMANDEREVER               = -7
 
 ; someone else earns a lot more, we feel it's unfair. See also WAGE_ACCEPTANCE_FACTOR in JA2_Options.ini
@@ -230,13 +230,13 @@ OPINIONEVENT_DRINKBUDDIES_BAD                 = -1
 OPINIONEVENT_DRINKBUDDIES_WORSE               = -4
 
 ; sometimes another mercs can interject in an ongoing argument. If it is an IMP, the player can choose what to say
-; There is a chance that parties in the argument alter their opinion torwards the 'interjector' depending on the statement
+; There is a chance that parties in the argument alter their opinion towards the 'interjector' depending on the statement
 
 ; someone argued against/for us
 OPINIONEVENT_AGAINST_US                       = -2
 OPINIONEVENT_FOR_US                           =  2
 
-; someone argued against/for the othe side of the argument
+; someone argued against/for the other side of the argument
 OPINIONEVENT_AGAINST_ENEMY                    =  1
 OPINIONEVENT_FOR_ENEMY                        = -1
 
@@ -248,7 +248,7 @@ OPINIONEVENT_SOLVECONFLICT_REASON_BAD         = -2
 OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_GOOD    =  3
 OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_BAD     = -3
 
-; someone is sick, and we find that disgusting (wether disease is disgusting can be set in Disease.xml)
+; someone is sick, and we find that disgusting (whether disease is disgusting can be set in Disease.xml)
 OPINIONEVENT_DISEASE_DISGUSTING               = -3
 
 ; someone treated our disease
diff --git a/gamedir/Data-1.13/TableData/CivGroupNames.xml b/gamedir/Data-1.13/TableData/CivGroupNames.xml
index 6fb00dad1..c11322de9 100644
--- a/gamedir/Data-1.13/TableData/CivGroupNames.xml
+++ b/gamedir/Data-1.13/TableData/CivGroupNames.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Enabled: if set to 1, civilians of that group will use szGroup as their name in tactical
+     AddToBattle: If a battle with that group occurs, all members are counted (no, this doesn't make a lot of sense)
+	 Loyalty: if set to 0, no loyalty/morale penalty if a civilian of that group is killed
+-->
 <CIV_GROUP_NAMES>
 	<NAME>
 		<uiIndex>0</uiIndex>