admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-28 23:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use province ruling faction helper for command availability (#7736)

Browse Source
This commit is contained in:
admin
2026-06-22 16:32:33 -07:00
committed by GitHub
parent 4bab97ec62
commit 0ca2685bf3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/scala/net/eagle0/eagle/library/actions/availability/AvailableCommandsFactory.scala
+5 -4
View File
@@ -207,7 +207,7 @@ class AvailableCommandsFactory(
pid: ProvinceId
): Option[OneProvinceAvailableCommands] = {
val province = gs.provinces(pid)
val fid = province.rulingFactionId.get
val fid = province.getRulingFactionId
optionalOneProvinceAvailableCommands(
province = province,
commands =
@@ -221,8 +221,9 @@ class AvailableCommandsFactory(
pid: ProvinceId
): Boolean = {
val province = gameState.provinces(pid)
if province.rulerIsTraveling then hasCommand(travelingFactories, gameState, province.rulingFactionId.get, pid)
else hasCommand(commandPhaseFactories, gameState, province.rulingFactionId.get, pid)
val fid = province.getRulingFactionId
if province.rulerIsTraveling then hasCommand(travelingFactories, gameState, fid, pid)
else hasCommand(commandPhaseFactories, gameState, fid, pid)
}
def defensePhaseCommandsForProvince(
@@ -232,7 +233,7 @@ class AvailableCommandsFactory(
val province = gs.provinces(pid)
optionalOneProvinceAvailableCommands(
province = province,
commands = allCommands(defensePhaseFactories, gs, province.rulingFactionId.get, pid)
commands = allCommands(defensePhaseFactories, gs, province.getRulingFactionId, pid)
)
}