Code

Scrabble - Jackie & Leti (Ampers)#8

Code

Open

LetiTran wants to merge 49 commits intoAda-C9:masterAda-C9/Scrabble:masterfrom LetiTran:masterLetiTran/Scrabble:masterCopy head branch name to clipboard

+466-6

Commits

Commits on Feb 20, 2018

• Added scoring method and fixed typo on the 'game' files - First score test OK

  LetiTran

  committed
  27059d0

  Copy full SHA for 27059d0

• adds 50 pts to 7 letter word, returns nil for bad characters

  Jackiesan

  committed
  ad5a0be

  Copy full SHA for ad5a0be

• ..

  LetiTran

  committed
  24022ff

  Copy full SHA for 24022ff

• returns nil for words > 7 letters

  LetiTran

  committed
  71bdb93

  Copy full SHA for 71bdb93

• returns nil for empty words

  Jackiesan

  committed
  1b70781

  Copy full SHA for 1b70781

• added code for 'returns nil if no words were passed' - OK

  LetiTran

  committed
  f89b00a

  Copy full SHA for f89b00a

• returns the only word in a length-1 array

  Jackiesan

  committed
  e112d21

  Copy full SHA for e112d21

• returns the highest word if there are two words - OK

  LetiTran

  committed
  78c157b

  Copy full SHA for 78c157b

• if tied, prefer 7 letter word

  Jackiesan

  committed
  68481b7

  Copy full SHA for 68481b7

Commits on Feb 21, 2018

• if tied and no word has 7 letters, prefers the word with fewer letters

  LetiTran

  committed
  27b4827

  Copy full SHA for 27b4827

• returns the first word of a tie with same letter count

  Jackiesan

  committed
  5d1ddef

  Copy full SHA for 5d1ddef

• ..

  LetiTran

  committed
  f7dab82

  Copy full SHA for f7dab82

• Merge branch 'master' of https://github.com/LeticiaTran/Scrabble

  LetiTran

  committed
  5d4ef25

  Copy full SHA for 5d4ef25

• Initializes Player class and passes initialize test

  Jackiesan

  committed
  f3b149f

  Copy full SHA for f3b149f

• Merge branch 'master' of https://github.com/LeticiaTran/Scrabble

  LetiTran

  committed
  0f2a8d1

  Copy full SHA for 0f2a8d1

• 'Added a method 'plays' and passed the test 'Returns an array of words played'

  LetiTran

  committed
  fa5f61a

  Copy full SHA for fa5f61a

• Adds input word to @plays array.

  Jackiesan

  committed
  0a34fec

  Copy full SHA for 0a34fec

• added total_score method and passed test Returns the sum of scores of played words.

  LetiTran

  committed
  8263c3f

  Copy full SHA for 8263c3f

• won? returns true if player has over 100 pts

  Jackiesan

  committed
  6a082a8

  Copy full SHA for 6a082a8

• mmm needed this commit/dont understand why

  LetiTran

  committed
  27db390

  Copy full SHA for 27db390

Commits on Feb 22, 2018

• added method highest_scoring_word and passed test.

  LetiTran

  committed
  ecc16a8

  Copy full SHA for ecc16a8

• fixed indentention

  LetiTran

  committed
  bf0bc47

  Copy full SHA for bf0bc47

• returns score of highest scoring word

  Jackiesan

  committed
  4abaeba

  Copy full SHA for 4abaeba

• Created TileBag class and files, initialized the TileBag class and passed the initialize test for it.

  LetiTran

  committed
  b143409

  Copy full SHA for b143409

• draws tiles from the tile bag

  Jackiesan

  committed
  390cabe

  Copy full SHA for 390cabe

• removed wrong puts that was used for testing

  LetiTran

  committed
  e248d2c

  Copy full SHA for e248d2c

• Merge branch 'master' of https://github.com/LeticiaTran/Scrabble

  LetiTran

  committed
  25389fc

  Copy full SHA for 25389fc

Commits on Feb 23, 2018

• Fixed a typo on tile_bag.rb and passed test Removes tiles from the default set

  LetiTran

  committed
  e745716

  Copy full SHA for e745716

• Draw_tiles(tile_bag) not passing test

  Jackiesan

  committed
  e320ff2

  Copy full SHA for e320ff2

• Draws tiles with max of 7

  Jackiesan

  committed
  c4c3900

  Copy full SHA for c4c3900

• just running tests....

  LetiTran

  committed
  cc8d12e

  Copy full SHA for cc8d12e

• just running tests....

  LetiTran

  committed
  0c54c22

  Copy full SHA for 0c54c22

• fills tile array until it reaches 7

  Jackiesan

  committed
  4eb126f

  Copy full SHA for 4eb126f

• Merge branch 'master' of https://github.com/LeticiaTran/Scrabble

  Jackiesan

  committed
  7280a67

  Copy full SHA for 7280a67

• fills tile array until it reaches 7

  Jackiesan

  committed
  0fe3c6c

  Copy full SHA for 0fe3c6c

• git error...

  LetiTran

  committed
  64fec21

  Copy full SHA for 64fec21

• git error...

  LetiTran

  committed
  495dbc0

  Copy full SHA for 495dbc0

• Added descriptive comments on class files.

  LetiTran

  committed
  4e25418

  Copy full SHA for 4e25418

• changed how TileBag is initialized (not taking any arguments now), and fixed all tests related to it.

  LetiTran

  committed
  cd4c9f4

  Copy full SHA for cd4c9f4

• Changed the highest_scoring_word(player.rb) to call the highest_score_from(scoring.rb) method to score every word from the given array and find the 'winner word'.

  LetiTran

  committed
  3965a05

  Copy full SHA for 3965a05

• Deleted unecessary testing comments.

  LetiTran

  committed
  c21f74d

  Copy full SHA for c21f74d

• Refactor some iterations/conditional blocks into one line.

  LetiTran

  committed
  be94de4

  Copy full SHA for be94de4

• Removed unnecessary scoring table hash variable from player.rb, added assertion to draw_tiles player_spec.

  Jackiesan

  committed
  3ab27bf

  Copy full SHA for 3ab27bf

• Changed method score in score.rb to calculate points using 'case' instead of if statments.

  LetiTran

  committed
  eac411c

  Copy full SHA for eac411c

• Merge branch 'master' of https://github.com/LeticiaTran/Scrabble

  LetiTran

  committed
  2678435

  Copy full SHA for 2678435

• Merge after changing score method to use case instead of if to evaluate points

  LetiTran

  committed
  deeb039

  Copy full SHA for deeb039

Commits on Feb 25, 2018

• Changed how the highest_score_from is called on player.rb and deleted a unecessary require command at the top of file.

  LetiTran

  committed
  897a2c8

  Copy full SHA for 897a2c8

Commits on Feb 26, 2018

• Refactor the project to atend to the necessary changes on the first 4 comments from CheezItMan

  LetiTran

  committed
  0dfb93e

  Copy full SHA for 0dfb93e

Commits on Feb 27, 2018

• Added edge cases to scoring_spec and tile_bag

  Jackiesan

  committed
  2405cff

  Copy full SHA for 2405cff