Skip to content

Commit c0ae291

Browse files
committed
feat: continue work on orders menu in the new UI
FossilOrigin-Name: a2441973f799bb848408648d80e4faea468cc323eee00a32da46ac62e3768546
1 parent aa78c78 commit c0ae291

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

src/newui/ordersmenu.nim

+18-7
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,19 @@ proc setAsHome(dialog: var GameDialog) {.raises: [], tags: [RootEffect],
226226
dialog = setQuestion(question = "Are you sure want to change your home base (it cost " &
227227
$price & " " & moneyName & ")?", qType = homeBase, data = $price)
228228

229+
proc askForEvents(dialog: var GameDialog) {.raises: [], tags: [RootEffect], contractual.} =
230+
## Ask for known events
231+
##
232+
## * dialog - the current in-game dialog displayed on the screen
233+
##
234+
## Returns the modified parameters dialog.
235+
try:
236+
askForEvents()
237+
dialog = none
238+
closePopup()
239+
except:
240+
dialog = setError(message = "Can't ask for events.")
241+
229242
proc showDockedCommands(baseIndex: ExtendedBasesRange;
230243
haveTrader: bool; dialog: var GameDialog) {.raises: [], tags: [RootEffect],
231244
contractual.} =
@@ -251,12 +264,8 @@ proc showDockedCommands(baseIndex: ExtendedBasesRange;
251264
discard
252265
if daysDifference(dateToCompare = skyBases[baseIndex].askedForEvents) > 6:
253266
labelButton(title = "Ask for events"):
254-
try:
255-
askForEvents()
256-
dialog = none
257-
closePopup()
258-
except:
259-
dialog = setError(message = "Can't ask for events.")
267+
askForEvents(dialog = dialog)
268+
if dialog != none:
260269
return
261270
if not skyBases[baseIndex].askedForBases:
262271
labelButton(title = "Ask for bases"):
@@ -732,7 +741,9 @@ proc showShipOrders*(dialog: var GameDialog; state: var GameState) {.raises: [],
732741
labelButton(title = "Trade"):
733742
discard
734743
labelButton(title = "Ask for events"):
735-
discard
744+
askForEvents(dialog = dialog)
745+
if dialog != none:
746+
return
736747
labelButton(title = "Ask for bases"):
737748
discard
738749
labelButton(title = "Attack"):

0 commit comments

Comments
 (0)