diff --git a/fowl/game/models.py b/fowl/game/models.py index 06f0f13..e66dbf1 100644 --- a/fowl/game/models.py +++ b/fowl/game/models.py @@ -254,7 +254,7 @@ class Match(models.Model): if title == 'tag' and all(c == 2 for c in losers): points[w.id] += 2 # beat champ in non-handicap match w/o belt on line - elif all(c == 1 for c in losers): + elif title != 'tag' and all(c == 1 for c in losers): points[w.id] += 2 # if multiple people in this match and this person was credited diff --git a/setup_league2.py b/setup_league2.py index 8c09ff9..745aa7e 100644 --- a/setup_league2.py +++ b/setup_league2.py @@ -114,5 +114,29 @@ event.add_match('jimmyuso', 'antoniocesaro', winner='antoniocesaro', event.add_match('kane', 'sheamus', winner='sheamus', outcome='dq') league.score_event(event) -# give patrick Jericho +# give patrick Jericho instead of Regal +ruleyou.drop_star('williamregal') +ruleyou.add_star('chrisjericho') +# give james alicia fox instead of kellykelly +gm_punk.drop_star('kellykelly') +gm_punk.add_star('aliciafox') +if Star.objects.filter(pk='vader').count() == 0: + Star.objects.create(pk='vader', name='Vader', division='other') + +event = Event.objects.create(name='RAW', date='2012-06-11') +event.add_match('sheamus', 'tensai', winner='sheamus', outcome='normal') +event.add_match(['santinomarella', 'layla'], + ['bethphoenix', 'ricardorodriguez'], + winner='bethphoenix', outcome='normal') +event.add_match('dolphziggler', 'jackswagger', 'thegreatkhali', 'christian', + winner='dolphziggler', outcome='normal') +event.add_match('ryback', ['nobody1', 'nobody2'], winner='ryback', + outcome='normal', + notes="two ex-presidents can't defeat ryback") +event.add_match('bigshow', 'kofikingston', winner='bigshow', outcome='normal') +event.add_match('sin-cara', 'curthawkins', winner='sin-cara', outcome='normal') +event.add_match('vader', 'heathslater', winner='vader', outcome='normal') +event.add_match(['kane', 'danielbryan'], ['cmpunk', 'aj'], winner='cmpunk', + outcome='normal') +league.score_event(event)