diff --git a/R/sysdata.rda b/R/sysdata.rda index a0f0ca1..f462ba0 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/data-raw/data.r b/data-raw/data.r index 4361f26..a8a65e4 100644 --- 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 index 551fa7a..0017f85 100644 --- 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 index 0112e0d..a65ff44 100644 Binary files a/data/decks.rda and b/data/decks.rda differ diff --git a/data/entries.rda b/data/entries.rda index 8cae5cc..487cebf 100644 Binary files a/data/entries.rda and b/data/entries.rda differ diff --git a/data/matches.rda b/data/matches.rda index 088c2b4..e8e390a 100644 Binary files a/data/matches.rda and b/data/matches.rda differ diff --git a/data/nicknames.rda b/data/nicknames.rda index df2ea71..c252cd4 100644 Binary files a/data/nicknames.rda and b/data/nicknames.rda differ diff --git a/data/starters.rda b/data/starters.rda index bf3cc44..760bd97 100644 Binary files a/data/starters.rda and b/data/starters.rda differ