Opened 9 years ago

Closed 9 years ago

Last modified 9 years ago

#3413 closed defect (fixed)

[PATCH] Ceasefire time GUI improvements

Reported by: leper Owned by: Stan
Priority: Should Have Milestone: Alpha 19
Component: UI & Simulation Keywords: patch
Cc: Patch:

Description

Currently the remaining ceasefire time in the diplomacy screen is only displayed if the setting for the diplomacy overlay (top right corner) is active. The diplomacy screen should always display the remaining time. (See gui/common/functions_global_object.js)

Once ceasefire is over the remaining time display in the diplomacy screen should be removed. The message is either slightly wrong (ceasefire has already ended) or just plain wrong (ceasefire certainly doesn't end in 00:01 (which is probably a slight timing issue)). The hiding can possibly be done by having the simulation send a notification to the gui (which is then handled in gui/session/messages.js).

Currently we also display diplomacy notifications when ceasefire ends (which is unnecessary). We should just send a notification to the gui (as noted above) and not send the diplomacy notifications. (See simulation/components/CeasefireManager.js)

Attachments (4)

3413.diff (1.6 KB ) - added by Stan 9 years ago.
Should assess 1) and 3) untested.
3413.2.diff (2.4 KB ) - added by Stan 9 years ago.
That fixes it for me.
t3413_hide_diplomacy_ceasefire_counter_and_dont_spam.patch (2.4 KB ) - added by elexis 9 years ago.
t3413_hide_diplomacy_ceasefire_counter_and_dont_spam_v2.patch (2.7 KB ) - added by elexis 9 years ago.
The previous patch showed the ceasefire overlay counter even if the setting was disabled.

Download all attachments as: .zip

Change History (10)

comment:1 by Itms, 9 years ago

Milestone: Alpha 19Backlog

by Stan, 9 years ago

Attachment: 3413.diff added

Should assess 1) and 3) untested.

comment:2 by elexis, 9 years ago

Keywords: patch added
Summary: Ceasefire time GUI improvements[PATCH] Ceasefire time GUI improvements

Getting eight "Player X has declared war on you" messages after the ceasefire ended becomes a bit annoying. I know the change in CeasefireManager.jsis sufficient to remove the chat messages. Didn't test, but I think a call to UpdateDiplomacies or something might be needed to update the screen.

by Stan, 9 years ago

Attachment: 3413.2.diff added

That fixes it for me.

comment:3 by elexis, 9 years ago

Keywords: review added; simple removed
Milestone: BacklogAlpha 19
  • 1. (showing the ceasefire counter in the diplomacy menu regardless of the boolean option) and 3. (spamming the chat with up to 14 "player X has declared war on you" messages) are fixed correctly by Stan.
  • 2. (hiding the ceasefire counter in the diplomacy manager after the timer ran out) was not done correctly and is fixed by the patch above.

comment:4 by Stan, 9 years ago

Owner: set to Stan
Status: newassigned

by elexis, 9 years ago

The previous patch showed the ceasefire overlay counter even if the setting was disabled.

comment:5 by mimo, 9 years ago

Resolution: fixed
Status: assignedclosed

In 17118:

fix the ceaseFire gui, patch by elexis, fixes #3413

comment:6 by mimo, 9 years ago

Keywords: review removed

Thanks for the patch

Note: See TracTickets for help on using tickets.