Skip to content
Permalink
Browse files

cleaned up old commented code

  • Loading branch information...
adangert committed Oct 20, 2019
1 parent 24fab28 commit 4922ac537a405f57871281234158e192df0199aa
Showing with 0 additions and 24 deletions.
  1. +0 −24 joust.py
@@ -29,19 +29,6 @@
END_MIN_MUSIC_SLOW_TIME = 8
END_MAX_MUSIC_SLOW_TIME = 12

#Default Sensitivity of the contollers
#These are changed from the options in common
#SLOW_MAX = 1
#SLOW_WARNING = 0.28
#FAST_MAX = 1.8
#FAST_WARNING = 0.8

#Sensitivity of the werewolf contollers
#WERE_SLOW_MAX = 1.4
#WERE_SLOW_WARNING = 0.5
#WERE_FAST_MAX = 2.3
#WERE_FAST_WARNING = 1.2

#How long the speed change takes
INTERVAL_CHANGE = 1.5

@@ -244,12 +231,6 @@ def __init__(self, moves, command_queue, ns, music, teams, game_mode,controller_
self.num_teams = len(moves)
if game_mode == common.Games.JoustRandomTeams:
self.num_teams=num_teams
#if len(moves) <= 5:
# self.num_teams = 2
#elif len(moves) in [6,7]:
# self.num_teams = 3
#else: #8 or more
# self.num_teams = 4
if game_mode == common.Games.Traitor:

if len(moves) <= 8:
@@ -271,7 +252,6 @@ def __init__(self, moves, command_queue, ns, music, teams, game_mode,controller_

if self.game_mode == common.Games.WereJoust:

#were_num = int((len(moves)+2)/4)
were_num = int((len(moves)*7)/16)
if were_num <= 0:
were_num = 1
@@ -282,13 +262,9 @@ def __init__(self, moves, command_queue, ns, music, teams, game_mode,controller_
self.explosion = Audio('audio/Joust/sounds/Explosion34.wav')
self.revive = Audio('audio/Commander/sounds/revive.wav')
end = False
#self.audio = Audio(music, end)
self.audio = music
fast_resample = False


#self.change_time = self.get_change_time(speed_up = True)

self.speed_up = False
self.currently_changing = False
self.game_end = False

0 comments on commit 4922ac5

Please sign in to comment.
You can’t perform that action at this time.