Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing newline after assassination report #227

Merged
merged 1 commit into from
Oct 20, 2024
+22 −21
Merged

Fix missing newline after assassination report #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ enum StatsCategory {
void WriteStats(Battle &battle, Army &army, StatsCategory category) {
auto leaderName = std::string(army.leader->name->Str());
std::string header = std::string(army.leader->name->Str()) + " army:";

battle.AddLine(AString(header.c_str()));

auto stats = category == StatsCategory::ROUND
? army.stats.roundStats
: army.stats.battleStats;

int statLines = 0;
for (auto &uskv : stats) {
UnitStat us = uskv.second;
Expand Down Expand Up @@ -81,7 +81,7 @@ void WriteStats(Battle &battle, Army &army, StatsCategory category) {
case MAGIC_ENERGY: s += "magic"; break;
case MAGIC_SPIRIT: s += "magic"; break;
case MAGIC_WEATHER: s += "magic"; break;

default: s += "unknown"; break;
}

Expand All @@ -92,7 +92,7 @@ void WriteStats(Battle &battle, Army &army, StatsCategory category) {
case ATTACK_ENERGY: s += " energy"; break;
case ATTACK_SPIRIT: s += " spirit"; break;
case ATTACK_WEATHER: s += " weather"; break;

default: s += " unknown"; break;
}

Expand Down Expand Up @@ -278,10 +278,10 @@ void Battle::NormalRound(int round,Army * a,Army * b)
AddLine(AString("Round ") + round + ":");

if (a->tactics_bonus > b->tactics_bonus) {
AddLine(*(a->leader->name) + " tactics bonus " + a->tactics_bonus + ".");
AddLine(*(a->leader->name) + " tactics bonus " + a->tactics_bonus + ".");
}
if (b->tactics_bonus > a->tactics_bonus) {
AddLine(*(b->leader->name) + " tactics bonus " + b->tactics_bonus + ".");
AddLine(*(b->leader->name) + " tactics bonus " + b->tactics_bonus + ".");
}

/* Update both army's shields */
Expand Down Expand Up @@ -355,7 +355,7 @@ void Battle::NormalRound(int round,Army * a,Army * b)

a->Reset();
a->stats.ClearRound();

b->Reset();
b->stats.ClearRound();
}
Expand Down Expand Up @@ -415,7 +415,7 @@ void Battle::GetSpoils(AList *losers, ItemList *spoils, int ass)
}

void AddBattleFact(
Events* events,
Events* events,
ARegion* region,
Unit* attacker,
Unit* defender,
Expand All @@ -428,10 +428,10 @@ void AddBattleFact(
auto fact = new BattleFact();

fact->location = EventLocation::Create(region);

fact->attacker.AssignUnit(attacker);
fact->attacker.AssignArmy(attackerArmy);

fact->defender.AssignUnit(defender);
fact->defender.AssignArmy(defenderArmy);

Expand Down Expand Up @@ -470,13 +470,13 @@ void AddBattleFact(
fact->fortification = name;
fact->fortificationType = fortType;
}


events->AddFact(fact);
}

void AddAssassinationFact(
Events* events,
Events* events,
ARegion* region,
Unit* defender,
Army* defenderArmy,
Expand All @@ -487,16 +487,16 @@ void AddAssassinationFact(
auto fact = new AssassinationFact();

fact->location = EventLocation::Create(region);

// fact->victim.AssignUnit(defender);
// fact->victim.AssignArmy(defenderArmy);

fact->outcome = outcome;

events->AddFact(fact);
}

int Battle::Run(Events* events,
int Battle::Run(Events* events,
ARegion * region,
Unit * att,
AList * atts,
Expand Down Expand Up @@ -583,7 +583,7 @@ int Battle::Run(Events* events,
}

armies[1]->Win(this, spoils);

AddLine("");
AddLine(temp);
AddLine("");
Expand Down Expand Up @@ -672,7 +672,7 @@ int Battle::Run(Events* events,
}

AddLine("Total Casualties:");

armies[0]->Tie(this);
armies[1]->Tie(this);
temp = "Spoils: none.";
Expand Down Expand Up @@ -738,10 +738,11 @@ void Battle::build_json_report(json& j, Faction *fac) {
j["type"] = "assassination";
j["report"] = json::array();
j["report"].push_back(asstext);
j["report"].push_back(""); // All battle reports end with a new line. Pre-json code added the line here.
return;
}
j["type"] = "battle";
j["report"] = text;
j["report"] = text;
}

void Battle::AddLine(const AString & s) {
Expand All @@ -751,7 +752,7 @@ void Battle::AddLine(const AString & s) {
void Game::GetDFacs(ARegion * r,Unit * t,AList & facs)
{
int AlliesIncluded = 0;

// First, check whether allies should assist in this combat
if (Globals->ALLIES_NOAID == 0) {
AlliesIncluded = 1;
Expand All @@ -776,14 +777,14 @@ void Game::GetDFacs(ARegion * r,Unit * t,AList & facs)
//delete obj;
//delete u;
}

forlist((&r->objects)) {
Object * obj = (Object *) elem;
forlist((&obj->units)) {
Unit * u = (Unit *) elem;
if (u->IsAlive()) {
if (u->faction == t->faction ||
(AlliesIncluded == 1 &&
(AlliesIncluded == 1 &&
u->guard != GUARD_AVOID &&
u->GetAttitude(r,t) == A_ALLY) ) {

Expand Down