Update to 2022-01-19

CharnelMouse · Jan 20, 2022 · ae01e57 · ae01e57
1 parent 133f85d
commit ae01e57
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 4 deletions.
diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data-raw/data.r b/data-raw/data.r
@@ -99,6 +99,9 @@ stopifnot(nrow(fsetdiff(entries[, c("tournament", "entry_type")], entry_rules[,
 standardised_nicknames <- nicknames[, .(nickname,
                                         name = standardise_deck_name(paste(spec1, spec2, spec3, starter, sep = "/"),
                                                                      specs))]
+decks$deck <- standardise_deck_name(decks$deck, specs, standardised_nicknames)
+matches$deck1 <- standardise_deck_name(matches$deck1, specs, standardised_nicknames)
+matches$deck2 <- standardise_deck_name(matches$deck2, specs, standardised_nicknames)
 if (nrow(check_player_stats_agree(get_player_win_stats(matches), entries, include_nas = FALSE)) > 0L)
   stop("Player stats do not agree")
 if (nrow(check_player_sticks_to_tournament_deck(matches, decks, entry_rules)) > 0L)

diff --git a/data-raw/matches.csv b/data-raw/matches.csv
@@ -1058,8 +1058,8 @@ start,end,tournament,round,round_match_number,player1,player2,deck1,deck2,map,vi
 2022-01-10,2022-01-15,CAWS21,2,3,charnel_mouse,zhavier,[Law]/Fire/Growth,Miracle Grow,,zhavier,normal,forum,,charnel_mouse,
 2022-01-08,2022-01-10,CAWS21,2,4,OffKilter,bansa,[Finesse]/Feral/Truth,[Blood/Fire]/Feral,,bansa,normal,forum,,charnel_mouse,
 2022-01-07,2022-01-10,CAWS21,2,5,Nekoatl,Bomber678,[Balance/Growth]/Strength,Miracle Grow,,Bomber678,normal,forum,,charnel_mouse,
-2022-01-15,,CAWS21,3,1,zango,Dreamfire,[Balance]/Anarchy/Peace,[Necromancy]/Discipline/Present,,,,forum,,charnel_mouse,
+2022-01-15,2022-01-17,CAWS21,3,1,zango,Dreamfire,[Balance]/Anarchy/Peace,[Necromancy]/Discipline/Present,,Dreamfire,normal,forum,,charnel_mouse,
 2022-01-15,,CAWS21,3,2,zhavier,Bomber678,Miracle Grow,Miracle Grow,,,,forum,,charnel_mouse,
-2022-01-15,,CAWS21,3,3,bansa,Moby_Dick,[Blood/Fire]/Feral,[Demonology]/Finesse/Peace,,,,forum,,charnel_mouse,
-2022-01-15,,CAWS21,3,4,FrozenStorm,OffKilter,[Necromancy]/Balance/Truth,[Finesse]/Feral/Truth,,,,forum,,charnel_mouse,
-2022-01-17,,CAWS21,3,5,charnel_mouse,Nekoatl,[Law]/Fire/Growth,[Balance/Growth]/Strength,,,,forum,,charnel_mouse,
+2022-01-15,2022-01-18,CAWS21,3,3,bansa,Moby_Dick,[Blood/Fire]/Feral,[Demonology]/Finesse/Peace,,bansa,normal,forum,,charnel_mouse,
+2022-01-15,2022-01-19,CAWS21,3,4,FrozenStorm,OffKilter,[Necromancy]/Balance/Truth,[Finesse]/Feral/Truth,,FrozenStorm,normal,forum,,charnel_mouse,
+2022-01-17,2022-01-17,CAWS21,3,5,charnel_mouse,Nekoatl,[Law]/Fire/Growth,[Balance/Growth]/Strength,,charnel_mouse,normal,forum,,charnel_mouse,
diff --git a/data/decks.rda b/data/decks.rda
diff --git a/data/entries.rda b/data/entries.rda
diff --git a/data/matches.rda b/data/matches.rda
diff --git a/data/nicknames.rda b/data/nicknames.rda
diff --git a/data/starters.rda b/data/starters.rda