Fixed per turn kills

Shoes01 · Shoes01 · commit a360331c3097 · 2014-04-21T11:11:31.000-03:00
diff --git a/bin/data/Ruleset/Commendations.rul b/bin/data/Ruleset/Commendations.rul
@@ -271,7 +271,7 @@ commendations:
       kills_with_criteria_career: [3, 5, 10, 15, 20, 25, 30, 35, 40, 50]
     killCriteria:
       -
-        1: ["FACTION_HOSTILE", "STATUS_DEAD"]
+        1: ["STATUS_DEAD"]
   - type: STR_MEDAL_MILITARY_CROSS_NAME
     description: STR_MEDAL_MILITARY_CROSS_DESCRIPTION
     sprite: 1
diff --git a/src/Ruleset/RuleCommendations.cpp b/src/Ruleset/RuleCommendations.cpp
@@ -84,7 +84,7 @@ std::map<std::string, std::vector<int> > *RuleCommendations::getCriteria()
  * Get commendation award kill criteria
  * @return vecotr<string> Commendation kill criteria
  */
-std::vector<std::vector<std::vector<std::string> > > *RuleCommendations::getKillCriteria()
+std::vector<std::map< int, std::vector<std::string> > > *RuleCommendations::getKillCriteria()
 {
 	return &_killCriteria;
 }
diff --git a/src/Ruleset/RuleCommendations.h b/src/Ruleset/RuleCommendations.h
@@ -51,7 +51,7 @@ class RuleCommendations
 	/// Get commendation award criteria
 	std::map<std::string, std::vector<int> > *getCriteria();
 	/// Get commendation award kill related criteria
-	std::vector<std::vector<std::vector<std::string> > > *getKillCriteria();
+	std::vector<std::map< int, std::vector<std::string> > > *getKillCriteria();
 	/// Get sprite
 	int getSprite() const;
 
diff --git a/src/Savegame/SoldierDiary.cpp b/src/Savegame/SoldierDiary.cpp
@@ -449,11 +449,11 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
                         {
                             int count = 0; // Each AND vector has to match the award criteria
                             // Loop over the KILLS
-                            for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList->begin(); singleKill != _killList->end(); ++singleKill)
+                            for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList.begin(); singleKill != _killList.end(); ++singleKill)
                             {
                                 bool foundMatch = true;
                                 // Loop over the DETAILs of the AND vector
-                                for (std::vector<std::string>::const_iterator detail = (*andCriteria).second->begin(); detail != (*andCriteria).second->end(); ++detail)
+								for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)
                                 {
                                     // See if we find no matches with any criteria. If so, break and try the next kill.
                                     if ( (*singleKill)->getAlienRank() != (*detail) && (*singleKill)->getAlienRace() != (*detail) &&
@@ -482,15 +482,15 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
                         {
                             int count = 0; // Each AND vector has to match the award criteria
                             // Loop over MISSIONS
-                            for (std::vector<SoldierDiaryEntries*>::const_iterator singleMission = _diaryEntries->begin(); singleMission != _diaryEntries->end(); ++singleMission)
+                            for (std::vector<SoldierDiaryEntries*>::const_iterator singleMission = _diaryEntries.begin(); singleMission != _diaryEntries.end(); ++singleMission)
                             {
                                 // Loop over KILLS
                                 // These kills are confined to the mission; kills won't be borrowed from other missions for commendation purposes
-                                for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = (*singleMission)->getMissionKills()->begin(); singleKill != (*singleMission)->getMissionKills()->end(); ++singleKill)
+                                for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = (*singleMission)->getMissionKillsReference()->begin(); singleKill != (*singleMission)->getMissionKillsReference()->end(); ++singleKill)
                                 {
                                     bool foundMatch = true;
                                     // Loop over the DETAILs of the AND vector
-                                    for (std::vector<std::string>::const_iterator detail = (*andCriteria).second->begin(); detail != (*andCriteria).second->end(); ++detail)
+                                    for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)
                                     {
                                         // See if we find no matches with any criteria. If so, break and try the next kill.
                                         if ( (*singleKill)->getAlienRank() != (*detail) && (*singleKill)->getAlienRace() != (*detail) &&
@@ -524,32 +524,33 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)
                         // Loop over the AND vectors
                         for (std::map<int, std::vector<std::string> >::const_iterator andCriteria = orCriteria->begin(); andCriteria != orCriteria->end(); ++andCriteria)
                         {
-                            int count = 0; // How many AND vectors (list of DETAILs) have been successful
+                            int count = 1; // How many AND vectors (list of DETAILs) have been successful
                             int killThisTurn = 0;
                             int killLastTurn = -1;
                             bool goToNextTurn = false;
                             // Loop over the KILLS
-                            for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList->begin(); singleKill != _killList->end(); ++singleKill)
+                            for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList.begin(); singleKill != _killList.end(); ++singleKill)
                             {
                                 // Set kill turns
                                 killThisTurn = (*singleKill)->getTurn();
-                                if (singleKill != _killList->begin())
+                                if (singleKill != _killList.begin())
                                 {
                                     --singleKill;
                                     killLastTurn = (*singleKill)->getTurn();
                                     ++singleKill;
                                 }
                                 // Skip kill-groups that we already got an award for
                                 // Skip kills that are inbetween turns
-                                if ( killThisTurn == killLastTurn && goToNextKill) continue;
+                                if ( killThisTurn == killLastTurn && goToNextTurn) continue;
                                 else if ( killThisTurn != killLastTurn ) 
                                 {
+									count = 1; // Reset
                                     goToNextTurn = false;
                                     continue;
                                 }
                                 bool foundMatch = true;
                                 // Loop over the DETAILs of the AND vector
-                                for (std::vector<std::string>::const_iterator detail = (*andCriteria).second->begin(); detail != (*andCriteria).second->end(); ++detail)
+                                for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)
                                 {
                                     // See if we find no matches with any criteria. If so, break and try the next kill.
                                     if ( (*singleKill)->getAlienRank() != (*detail) && (*singleKill)->getAlienRace() != (*detail) &&
@@ -783,6 +784,14 @@ std::vector<SoldierDiaryKills*> SoldierDiaryEntries::getMissionKills() const
 	return _missionStatistics->kills;
 }
 
+/**
+ *
+ */
+std::vector<SoldierDiaryKills*> *SoldierDiaryEntries::getMissionKillsReference()
+{
+	return &_missionStatistics->kills;
+}
+
 /**
  *
  */
diff --git a/src/Savegame/SoldierDiary.h b/src/Savegame/SoldierDiary.h
@@ -157,6 +157,8 @@ class SoldierDiaryEntries
 	/// Get
 	std::vector<SoldierDiaryKills*> getMissionKills() const;
 	/// Get
+	std::vector<SoldierDiaryKills*> *getMissionKillsReference();
+	/// Get
 	bool getMissionSuccess() const;
 	/// Get
 	std::string getMissionRating() const;

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ commendations:`
`271`	`271`	`kills_with_criteria_career: [3, 5, 10, 15, 20, 25, 30, 35, 40, 50]`
`272`	`272`	`killCriteria:`
`273`	`273`	`-`
`274`		`- 1: ["FACTION_HOSTILE", "STATUS_DEAD"]`
	`274`	`+ 1: ["STATUS_DEAD"]`
`275`	`275`	`- type: STR_MEDAL_MILITARY_CROSS_NAME`
`276`	`276`	`description: STR_MEDAL_MILITARY_CROSS_DESCRIPTION`
`277`	`277`	`sprite: 1`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ std::map<std::string, std::vector<int> > *RuleCommendations::getCriteria()`
`84`	`84`	`* Get commendation award kill criteria`
`85`	`85`	`* @return vecotr<string> Commendation kill criteria`
`86`	`86`	`*/`
`87`		`-std::vector<std::vector<std::vector<std::string> > > *RuleCommendations::getKillCriteria()`
	`87`	`+std::vector<std::map< int, std::vector<std::string> > > *RuleCommendations::getKillCriteria()`
`88`	`88`	`{`
`89`	`89`	`return &_killCriteria;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,11 +449,11 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)`
`449`	`449`	`{`
`450`	`450`	`int count = 0; // Each AND vector has to match the award criteria`
`451`	`451`	`// Loop over the KILLS`
`452`		`- for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList->begin(); singleKill != _killList->end(); ++singleKill)`
	`452`	`+ for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList.begin(); singleKill != _killList.end(); ++singleKill)`
`453`	`453`	`{`
`454`	`454`	`bool foundMatch = true;`
`455`	`455`	`// Loop over the DETAILs of the AND vector`
`456`		`- for (std::vector<std::string>::const_iterator detail = (andCriteria).second->begin(); detail != (andCriteria).second->end(); ++detail)`
	`456`	`+ for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)`
`457`	`457`	`{`
`458`	`458`	`// See if we find no matches with any criteria. If so, break and try the next kill.`
`459`	`459`	`if ( (singleKill)->getAlienRank() != (detail) && (singleKill)->getAlienRace() != (detail) &&`
`@@ -482,15 +482,15 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)`
`482`	`482`	`{`
`483`	`483`	`int count = 0; // Each AND vector has to match the award criteria`
`484`	`484`	`// Loop over MISSIONS`
`485`		`- for (std::vector<SoldierDiaryEntries*>::const_iterator singleMission = _diaryEntries->begin(); singleMission != _diaryEntries->end(); ++singleMission)`
	`485`	`+ for (std::vector<SoldierDiaryEntries*>::const_iterator singleMission = _diaryEntries.begin(); singleMission != _diaryEntries.end(); ++singleMission)`
`486`	`486`	`{`
`487`	`487`	`// Loop over KILLS`
`488`	`488`	`// These kills are confined to the mission; kills won't be borrowed from other missions for commendation purposes`
`489`		`- for (std::vector<SoldierDiaryKills>::const_iterator singleKill = (singleMission)->getMissionKills()->begin(); singleKill != (*singleMission)->getMissionKills()->end(); ++singleKill)`
	`489`	`+ for (std::vector<SoldierDiaryKills>::const_iterator singleKill = (singleMission)->getMissionKillsReference()->begin(); singleKill != (*singleMission)->getMissionKillsReference()->end(); ++singleKill)`
`490`	`490`	`{`
`491`	`491`	`bool foundMatch = true;`
`492`	`492`	`// Loop over the DETAILs of the AND vector`
`493`		`- for (std::vector<std::string>::const_iterator detail = (andCriteria).second->begin(); detail != (andCriteria).second->end(); ++detail)`
	`493`	`+ for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)`
`494`	`494`	`{`
`495`	`495`	`// See if we find no matches with any criteria. If so, break and try the next kill.`
`496`	`496`	`if ( (singleKill)->getAlienRank() != (detail) && (singleKill)->getAlienRace() != (detail) &&`
`@@ -524,32 +524,33 @@ bool SoldierDiary::manageCommendations(Ruleset *rules)`
`524`	`524`	`// Loop over the AND vectors`
`525`	`525`	`for (std::map<int, std::vector<std::string> >::const_iterator andCriteria = orCriteria->begin(); andCriteria != orCriteria->end(); ++andCriteria)`
`526`	`526`	`{`
`527`		`- int count = 0; // How many AND vectors (list of DETAILs) have been successful`
	`527`	`+ int count = 1; // How many AND vectors (list of DETAILs) have been successful`
`528`	`528`	`int killThisTurn = 0;`
`529`	`529`	`int killLastTurn = -1;`
`530`	`530`	`bool goToNextTurn = false;`
`531`	`531`	`// Loop over the KILLS`
`532`		`- for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList->begin(); singleKill != _killList->end(); ++singleKill)`
	`532`	`+ for (std::vector<SoldierDiaryKills*>::const_iterator singleKill = _killList.begin(); singleKill != _killList.end(); ++singleKill)`
`533`	`533`	`{`
`534`	`534`	`// Set kill turns`
`535`	`535`	`killThisTurn = (*singleKill)->getTurn();`
`536`		`- if (singleKill != _killList->begin())`
	`536`	`+ if (singleKill != _killList.begin())`
`537`	`537`	`{`
`538`	`538`	`--singleKill;`
`539`	`539`	`killLastTurn = (*singleKill)->getTurn();`
`540`	`540`	`++singleKill;`
`541`	`541`	`}`
`542`	`542`	`// Skip kill-groups that we already got an award for`
`543`	`543`	`// Skip kills that are inbetween turns`
`544`		`- if ( killThisTurn == killLastTurn && goToNextKill) continue;`
	`544`	`+ if ( killThisTurn == killLastTurn && goToNextTurn) continue;`
`545`	`545`	`else if ( killThisTurn != killLastTurn )`
`546`	`546`	`{`
	`547`	`+ count = 1; // Reset`
`547`	`548`	`goToNextTurn = false;`
`548`	`549`	`continue;`
`549`	`550`	`}`
`550`	`551`	`bool foundMatch = true;`
`551`	`552`	`// Loop over the DETAILs of the AND vector`
`552`		`- for (std::vector<std::string>::const_iterator detail = (andCriteria).second->begin(); detail != (andCriteria).second->end(); ++detail)`
	`553`	`+ for (std::vector<std::string>::const_iterator detail = andCriteria->second.begin(); detail != andCriteria->second.end(); ++detail)`
`553`	`554`	`{`
`554`	`555`	`// See if we find no matches with any criteria. If so, break and try the next kill.`
`555`	`556`	`if ( (singleKill)->getAlienRank() != (detail) && (singleKill)->getAlienRace() != (detail) &&`
`@@ -783,6 +784,14 @@ std::vector<SoldierDiaryKills*> SoldierDiaryEntries::getMissionKills() const`
`783`	`784`	`return _missionStatistics->kills;`
`784`	`785`	`}`
`785`	`786`
	`787`	`+/**`
	`788`	`+ *`
	`789`	`+ */`
	`790`	`+std::vector<SoldierDiaryKills> SoldierDiaryEntries::getMissionKillsReference()`
	`791`	`+{`
	`792`	`+ return &_missionStatistics->kills;`
	`793`	`+}`
	`794`	`+`
`786`	`795`	`/**`
`787`	`796`	`*`
`788`	`797`	`*/`