diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb
index 162c7a0..e37d1d0 100644
--- a/app/models/wrestler.rb
+++ b/app/models/wrestler.rb
@@ -27,7 +27,7 @@ class Wrestler < ActiveRecord::Base
def teamPointsEarned
points = 0.0
- points = points + (poolWins.size * 1) + (pinWins.size * 2) + (techWins.size * 1.5) + (majorWins.size * 1) + placementPoints
+ points = points + (poolWins.size * 2) + (pinWins.size * 2) + (techWins.size * 1.5) + (majorWins.size * 1) + placementPoints
end
def placementPoints
diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb
index fd76fe1..bd4b70b 100644
--- a/app/views/static_pages/about.html.erb
+++ b/app/views/static_pages/about.html.erb
@@ -20,7 +20,7 @@
If three wrestlers are tied, they will be put through this sequence until two wrestlers are left. Once two wrestlers are left, the pool runner up will be decided by head to head.
For pool to bracket tournaments, team points will be calculated as follows:
- - Pool win: 1pt
+ - Pool win: 2pt
- Win by major: 1pt extra
- Win by tech fall: 1.5pt extra
- Win by fall, default, dq: 2pt extra
diff --git a/test/integration/pool_advancement_test.rb b/test/integration/pool_advancement_test.rb
index 1f2556d..d7a02ae 100644
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -424,9 +424,9 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
wrestler1 = Wrestler.where("name = ?", "Guy2").first
wrestler2 = Wrestler.where("name = ?", "Guy3").first
#Won four in pool
- assert_equal 16, wrestler1.totalTeamPoints
+ assert_equal 20, wrestler1.totalTeamPoints
#Won two in pool but was deducted a point
- assert_equal 13, wrestler2.totalTeamPoints
+ assert_equal 15, wrestler2.totalTeamPoints
end
test "advancement points 1/2" do
@@ -488,25 +488,25 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
test "bonus points major" do
endMatchWithMajor(2002,"Guy2",@matches)
wrestler1 = Wrestler.where("name = ?", "Guy2").first
- assert_equal 2, wrestler1.teamPointsEarned
+ assert_equal 3, wrestler1.teamPointsEarned
end
test "bonus points pin" do
endMatchWithPin(2002,"Guy2",@matches)
wrestler1 = Wrestler.where("name = ?", "Guy2").first
- assert_equal 3, wrestler1.teamPointsEarned
+ assert_equal 4, wrestler1.teamPointsEarned
end
test "bonus points tech fall" do
endMatchWithTech(2002,"Guy2",@matches)
wrestler1 = Wrestler.where("name = ?", "Guy2").first
- assert_equal 2.5, wrestler1.teamPointsEarned
+ assert_equal 3.5, wrestler1.teamPointsEarned
end
test "pool team points win" do
endMatch(2002,"Guy2",@matches)
wrestler1 = Wrestler.where("name = ?", "Guy2").first
- assert_equal 1, wrestler1.teamPointsEarned
+ assert_equal 2, wrestler1.teamPointsEarned
end
test "advancement points fourPoolsToQuarter Quarter" do
@@ -552,7 +552,7 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
wrestler = Wrestler.where("name = ?", "Guy22").first
assert_equal 0, wrestler.totalTeamPoints
- assert_equal 1, wrestler.teamPointsEarned
+ assert_equal 2, wrestler.teamPointsEarned
end