A couple of small bugfixes (#194)

* A couple of small bugfixes Enable JSON reports for NO v7 Fix a couple of places where the JSON->text report wasn't quite right. Fix a bug where the inactive turns handling was slightly wonky in the JSON report. * Add the json reports to the snapshots
Atlantis-PBEM · Jun 3, 2024 · 11f1ab2 · 11f1ab2
1 parent db60888
commit 11f1ab2
Show file tree

Hide file tree

Showing 31 changed files with 394,757 additions and 4 deletions.
diff --git a/faction.cpp b/faction.cpp
@@ -409,7 +409,7 @@ void Faction::build_json_report(json& j, Game *game, size_t **citems) {
 	j["administrative"]["show_unit_attitudes"] = (showunitattitudes != 0);
 
 	if(!password_unset) j["administrative"]["password"] = password->const_str();
-	if(Globals->MAX_INACTIVE_TURNS) {
+	if(Globals->MAX_INACTIVE_TURNS != -1) {
 		int cturn = game->TurnNumber() - lastorders;
 		if ((cturn >= (Globals->MAX_INACTIVE_TURNS - 3)) && !is_npc) {
 			cturn = Globals->MAX_INACTIVE_TURNS - cturn;

diff --git a/neworigins/rules.cpp b/neworigins/rules.cpp
@@ -258,7 +258,7 @@ static GameDefs g = {
 	200,	// MIN_DESTROY_POINTS,
 	34,	// MAX_DESTROY_PERCENT
 	1, // HALF_RIDING_BONUS
-	GameDefs::REPORT_FORMAT_TEXT, // REPORT_FORMAT
+	GameDefs::REPORT_FORMAT_TEXT | GameDefs::REPORT_FORMAT_JSON, // REPORT_FORMAT
 	5, // BATTLE_STOP_MOVE_PERCENT
 };
 

diff --git a/snapshot-tests/neworigins_turns/turn_0/report.1.json b/snapshot-tests/neworigins_turns/turn_0/report.1.json