Hanabi/hanabi.rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tweaks

Browse source
This commit is contained in:
Jeff Wu 2016-03-30 02:20:34 -07:00
parent ea2857a9cd
commit 79051b51fc
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -53,5 +53,5 @@ Currently, on seeds 0-9999, we have:
| 2p | 3p | 4p | 5p | | 2p | 3p | 4p | 5p |
----------|---------|---------|---------|---------| ----------|---------|---------|---------|---------|
cheating | 24.8600 | 24.9781 | 24.9715 | 24.9583 | cheating | 24.8600 | 24.9781 | 24.9715 | 24.9583 |
info | 15.15 | 22.79 | 24.604 | 24.778 | info | 17.136 | 23.181 | 24.63 | 24.805 |

26
src/strategies/information.rs
View file

@ -435,10 +435,12 @@ impl InformationPlayerStrategy {
} }
fn get_play_score(&self, view: &BorrowedGameView, card: &Card) -> i32 { fn get_play_score(&self, view: &BorrowedGameView, card: &Card) -> i32 {
for player in view.board.get_players() { if view.board.deck_size() > 0 {
if player != self.me { for player in view.board.get_players() {
if view.has_card(&player, card) { if player != self.me {
return 1; if view.has_card(&player, card) {
return 1;
}
} }
} }
} }
@ -574,9 +576,9 @@ impl InformationPlayerStrategy {
let player_amt = (hint_info.value - hint_type) / 3; let player_amt = (hint_info.value - hint_type) / 3;
let hint_player = (self.me + 1 + player_amt) % view.board.num_players; let hint_player = (self.me + 1 + player_amt) % view.board.num_players;
let card_index = 0;
let hand = view.get_hand(&hint_player); let hand = view.get_hand(&hint_player);
let card_index = hand.len() -1;
let hint_card = &hand[card_index]; let hint_card = &hand[card_index];
let hinted = match hint_type { let hinted = match hint_type {
@ -601,6 +603,7 @@ impl InformationPlayerStrategy {
if let Some(hinted) = hinted_opt { if let Some(hinted) = hinted_opt {
hinted hinted
} else { } else {
// Technically possible, but never happens
panic!("Found nothing to hint!") panic!("Found nothing to hint!")
} }
} }
@ -621,7 +624,8 @@ impl InformationPlayerStrategy {
let hinter = self.last_view.board.player; let hinter = self.last_view.board.player;
let player_amt = (view.board.num_players + hint.player - hinter - 1) % view.board.num_players; let player_amt = (view.board.num_players + hint.player - hinter - 1) % view.board.num_players;
let hint_type = if result[0] { let card_index = result.len() - 1;
let hint_type = if result[card_index] {
match hint.hinted { match hint.hinted {
Hinted::Value(_) => 0, Hinted::Value(_) => 0,
Hinted::Color(_) => 1, Hinted::Color(_) => 1,
@ -686,14 +690,8 @@ impl PlayerStrategy for InformationPlayerStrategy {
}); });
let maybe_play = risky_playable_cards[0]; let maybe_play = risky_playable_cards[0];
if view.board.lives_remaining > 2 { if maybe_play.2 > 0.7 {
if maybe_play.2 > 0.5 { return TurnChoice::Play(maybe_play.0);
return TurnChoice::Play(maybe_play.0);
}
} else {
if maybe_play.2 > 0.7 {
return TurnChoice::Play(maybe_play.0);
}
} }
} }
} }