Skip to content

Add Force Vote (Veto) Button back to map selector #162

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

Open
MoonPadUSer wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Force Vote (Veto) Button back to map selector #162

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e77792
Add Force vote Button
MoonPadUSer Jul 26, 2020
3d0d47d
Add missing )
MoonPadUSer Jul 28, 2020
99f04f1
Add more documentation
MoonPadUSer Jul 28, 2020
0385245
Merge branch 'master' into add-force-vote-button
metalune Jan 1, 2021
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
52 changes: 51 additions & 1 deletion config/menus/maps.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,13 +776,63 @@ newgui maps [ ui_stay_open [ octapaks [
ui_strut 0.5
ui_font super [
ui_center [
show_force_button = 0
if (&& (getclientpriv $getclientnum $vetolock) (=s (getmastermode 1) "veto")) [
show_force_button = 1
]
Comment on lines +779 to +782
Copy link
Contributor

@shacknetisp shacknetisp Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are showing the force button, then you probably shouldn't have the normal vote button which also forces. Perhaps have a button to force a new vote on the selection screen and a button to force your current vote on the votes screen, or a similar arrangement.

Copy link
Contributor Author

@MoonPadUSer MoonPadUSer Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but... the normal Vote button doesn't force?

Copy link
Contributor

@shacknetisp shacknetisp Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does, if mastermode is set to veto and you have veto privs.

Copy link
Contributor Author

@MoonPadUSer MoonPadUSer Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh... well that smth we could change, Imo you should still be able to normally vote, right?

Copy link
Member

@TheAssassin TheAssassin Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, why should you? veto mode is something rarely used anyway.

Copy link
Contributor Author

@MoonPadUSer MoonPadUSer Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the question is: why should we NOT do it



if (&& (>= $chosenmode 0) (stringlen $chosenmap)) [
ui_button (? (isonline) "^fgVote" "^fgPlay") [if (isonline) [showgui maps 2]; (? (= (gamemode) 1) (savewarnchk [start $chosenmap $chosenmode (chosenmuts)]) (start $chosenmap $chosenmode (chosenmuts))); mapsearch = ""]
// "Vote" button, allows to vote for a new game
ui_button (? (isonline) "^fgVote" "^fgPlay") [
if (isonline) [
showgui maps 2
]
if (= (gamemode) 1) [
savewarnchk [ start $chosenmap $chosenmode (chosenmuts)]
] [
start $chosenmap $chosenmode (chosenmuts)
]
mapsearch = ""
]

if $show_force_button [
ui_strut 1.5
// "Force" button, allows for forcing a new game
ui_button "^fzwyForce" [
if (isonline) [
showgui maps 2
]
if (= (gamemode 1)) [
savewarnchk [ mapsexec $chosenmap $chosenmode (chosenmuts) ]
] [
mapsexec $chosenmap $chosenmode (chosenmuts)
]
mapsearch = ""
]
]
] [
ui_text (? (isonline) "^fdVote" "^fdPlay")

if $show_force_button [
ui_strut 1.5
ui_text "^fdForce"
]
]
]
]

ui_font "little" [ ui_center [
if (&& (isonline) (getclientpriv $getclientnum $masterlock) (!=s (getmastermode 1) "veto")) [
// Change mastermode from xx to yy button, only shown if "Force" button is not already shown
// and player has required privs to change mastermode
ui_button (format "Change mastermode from ^fg%1 ^fwto ^fzwyveto" (getmastermode 1)) [
mastermode (! (getmastermode))
]

]
] ]

ui_visible [
cases (at $guirolloveraction 0
) "chosenmode" [
Expand Down