Skip to content
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

Fight club mode added #144

Merged
merged 14 commits into from
Jan 4, 2018
Merged

Fight club mode added #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
46fdaff
Rename commander.py to games/commander.py
Robotopera Nov 2, 2017
1651a5b
Rename speed_bomb.py to games/speed_bomb.py
Robotopera Nov 2, 2017
f1235f7
Rename zombie.py to games/zombie.py
Robotopera Nov 2, 2017
736e81b
Rename tournament.py to games/tournament.py
Robotopera Nov 2, 2017
a89714f
Rename swapper.py to games/swapper.py
Robotopera Nov 2, 2017
213fa4f
Update piparty.py
Robotopera Nov 2, 2017
12c4974
Create fight_club
Robotopera Nov 4, 2017
ff6d49b
Update fight_club
Robotopera Nov 4, 2017
6e7da7b
Merge remote-tracking branch 'Robotopera/master' into fight_club
adangert Dec 29, 2017
8248ed2
added fightclub WIP
adangert Jan 2, 2018
e125f45
fixed timer/sound bug
adangert Jan 2, 2018
400720b
added wip changes
adangert Jan 2, 2018
9399ca8
added faceoff for fight_club
adangert Jan 2, 2018
8e042d4
added more bug fixes for fight club
adangert Jan 4, 2018
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
Binary file added audio/Joust/sounds/beep_loud.wav
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ class Games(enum.Enum):
Zombies = (5, 'Zombies', 4)
Commander = (6, 'Commander', 4)
Swapper = (7, 'Swapper', 3)
Tournament = (8, 'Tournament', 3)
Ninja = (9, 'Ninja Bomb', 2)
Random = (10, 'Random', 2)
FightClub = (8, 'Fight Club', 3)
Tournament = (9, 'Tournament', 3)
Ninja = (10, 'Ninja Bomb', 2)
Random = (11, 'Random', 2)


def __new__(cls, value, pretty_name, min_players):
Expand Down
Loading