mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-29 02:15:43 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe4259cfa7 |
+1
-1
@@ -331,7 +331,7 @@ object ChronicleEventGenerator {
|
||||
)
|
||||
}
|
||||
|
||||
case _ => Vector()
|
||||
case _ => Vector.empty
|
||||
}
|
||||
|
||||
def eventTextEntries(
|
||||
|
||||
+6
-6
@@ -191,12 +191,12 @@ case class EndPlayerCommandsPhaseAction(
|
||||
case _: DeferredChange.EpidemicStarted =>
|
||||
province.activeEvents :+ EpidemicEvent(startDate = currentDate)
|
||||
|
||||
case _: DeferredChange.PrisonerMoved => Vector()
|
||||
case _: DeferredChange.PrisonerReturned => Vector()
|
||||
case _: DeferredChange.CapturedHeroImprisoned => Vector()
|
||||
case _: DeferredChange.CapturedHeroExecuted => Vector()
|
||||
case _: DeferredChange.CapturedHeroExiled => Vector()
|
||||
case _: DeferredChange.CapturedHeroReturned => Vector()
|
||||
case _: DeferredChange.PrisonerMoved => Vector.empty
|
||||
case _: DeferredChange.PrisonerReturned => Vector.empty
|
||||
case _: DeferredChange.CapturedHeroImprisoned => Vector.empty
|
||||
case _: DeferredChange.CapturedHeroExecuted => Vector.empty
|
||||
case _: DeferredChange.CapturedHeroExiled => Vector.empty
|
||||
case _: DeferredChange.CapturedHeroReturned => Vector.empty
|
||||
}
|
||||
),
|
||||
removedDeferredChangeIndex = Some(0)
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ case class EndProvinceMoveResolutionPhaseAction(
|
||||
factions = factions,
|
||||
provinces = provinces,
|
||||
heroes = heroes,
|
||||
killedHeroIds = Vector()
|
||||
killedHeroIds = Vector.empty
|
||||
).randomResults(functionalRandom)
|
||||
.map(
|
||||
_ :+
|
||||
|
||||
@@ -140,7 +140,7 @@ case class NewRoundAction(
|
||||
chronicler_style = chroniclerStyle
|
||||
)
|
||||
)
|
||||
else Vector()
|
||||
else Vector.empty
|
||||
|
||||
private def dateBefore(a: Date, b: Date): Boolean =
|
||||
a.year < b.year || (a.year == b.year && a.month.value < b.month.value)
|
||||
|
||||
+5
-5
@@ -267,7 +267,7 @@ case class PerformUnaffiliatedHeroesAction(
|
||||
toCheck = gs.provinces.keys,
|
||||
nextHid = gs.heroes.values.map(_.id).max + 1,
|
||||
currentGenerator = heroGenerator,
|
||||
acc = RandomState(Vector(), fr)
|
||||
acc = RandomState(Vector.empty, fr)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -464,7 +464,7 @@ case class PerformUnaffiliatedHeroesAction(
|
||||
toCheck = gs.provinces.keys,
|
||||
nextHid = gs.heroes.values.map(_.id).max + 1,
|
||||
currentGenerator = heroGenerator,
|
||||
acc = RandomState(Vector(), fr)
|
||||
acc = RandomState(Vector.empty, fr)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -528,17 +528,17 @@ case class PerformUnaffiliatedHeroesAction(
|
||||
gs.heroes
|
||||
)
|
||||
|
||||
if spawnChance <= 0 then RandomState((Vector(), nextHid), fr)
|
||||
if spawnChance <= 0 then RandomState((Vector.empty, nextHid), fr)
|
||||
else
|
||||
fr.nextDouble.continue {
|
||||
case (roll, nextFr) =>
|
||||
if roll >= spawnChance then RandomState((Vector(), nextHid), nextFr)
|
||||
if roll >= spawnChance then RandomState((Vector.empty, nextHid), nextFr)
|
||||
else {
|
||||
// Find provinces containing faction leaders (faction head or sworn brothers)
|
||||
val faction = gs.factions(factionId)
|
||||
val leaderProvinces = FactionUtils.provincesWithLeaders(gs.provinces.values, faction)
|
||||
|
||||
if leaderProvinces.isEmpty then RandomState((Vector(), nextHid), nextFr)
|
||||
if leaderProvinces.isEmpty then RandomState((Vector.empty, nextHid), nextFr)
|
||||
else
|
||||
nextFr.nextRandomElement(leaderProvinces.map(_.id)).continue {
|
||||
case (targetPid, fr2) =>
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ object PrisonerExchangeAction {
|
||||
case _ => acc
|
||||
}
|
||||
|
||||
go(Vector(), sortedExchangeableLeaders)
|
||||
go(Vector.empty, sortedExchangeableLeaders)
|
||||
}
|
||||
|
||||
def exchangeResults(
|
||||
|
||||
+1
-1
@@ -60,7 +60,7 @@ case class TruceTurnBackPhaseAction(
|
||||
)
|
||||
}
|
||||
}
|
||||
.getOrElse(Vector())
|
||||
.getOrElse(Vector.empty)
|
||||
|
||||
override def randomResults(
|
||||
functionalRandom: FunctionalRandom
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ case class UnaffiliatedHeroAppearedAction(
|
||||
// set at all. Mirror the spawn policy: a newly appeared free hero's
|
||||
// backstory is visible to every faction.
|
||||
clientTextVisibilityExtensions =
|
||||
if hero.backstoryVersions.isEmpty then Vector()
|
||||
if hero.backstoryVersions.isEmpty then Vector.empty
|
||||
else
|
||||
Vector(
|
||||
ClientTextVisibilityExtensionC(
|
||||
@@ -87,6 +87,6 @@ case class UnaffiliatedHeroAppearedAction(
|
||||
personalityWords = hero.personalityWords
|
||||
)
|
||||
)
|
||||
else Vector()) ++ nameGenerationRequest
|
||||
else Vector.empty) ++ nameGenerationRequest
|
||||
)
|
||||
}
|
||||
|
||||
+1
-1
@@ -159,7 +159,7 @@ object InvitationResolutionHelpers {
|
||||
joinedBattalionIds = redirectedArmies
|
||||
.flatMap(_.army.units)
|
||||
.flatMap(_.battalionId),
|
||||
removedBattalionIds = Vector()
|
||||
removedBattalionIds = Vector.empty
|
||||
)
|
||||
) {
|
||||
case (acc, p) =>
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ object CapturedHeroPleaGenerator {
|
||||
s"((already handled ${executed.size} ${imprisoned.size} ${exiled.size}))"
|
||||
}
|
||||
|
||||
private val emptyHandled = AlreadyHandled(Vector(), Vector(), Vector())
|
||||
private val emptyHandled = AlreadyHandled(Vector.empty, Vector.empty, Vector.empty)
|
||||
|
||||
private def initialPlea(
|
||||
gameId: GameId,
|
||||
|
||||
Reference in New Issue
Block a user