diff --git a/state/files/stage/map01.txt b/state/files/stage/map01.txt index da1a402..5aa462e 100644 --- a/state/files/stage/map01.txt +++ b/state/files/stage/map01.txt @@ -1,15 +1,15 @@ +++++++++++++++++++++++++++++ -+ oooo o oooo + -+ oooo ooo oooo + -+ ooooH ooooooo oooo + -+ ooooooooooo + -+ oooooo!!!oooooo + -+ oooo!ooooooooo!oooo + -+ oooooo!ooooPoooo!oooooo + -+ oooo!ooooooooo!oooo + -+ oooooo!!!oooooo + -+ ooooooooooo + -+ oooo ooooooo Hoooo + -+ oooo ooo oooo + -+ oooo o oooo + -+++++++++++++++++++++++++++++ \ No newline at end of file ++ooooooo ooooooooo ooooo+ ++o o o o o o+ ++o H o o o o H o+ ++o o ooooooooo o o+ ++ooooooo ooooo+ ++ + ++ooooooooooo P ooooooooooo+ ++ + ++ooooooo ooooo+ ++o o ooooooooo o o+ ++o o o o o o+ ++o oHo o o o o+ ++ooooooo ooooooooo ooooo+ ++++++++++++++++++++++++++++++ diff --git a/state/files/stage/map02.txt b/state/files/stage/map02.txt index 96c9fdf..dc7ee1d 100644 --- a/state/files/stage/map02.txt +++ b/state/files/stage/map02.txt @@ -1,15 +1,15 @@ +++++++++++++++++++++++++++++ -+ o ! ooooo ooooo ! o + -+ooo !oooooo oooooo! ooo+ -+ o !!oooo oooo!! o + -+ooooHooo ooo oooo+ -+oo ooo !!!!! ooo oo+ -+oooo o! XoooX !o oooo+ -+!!!! !XoooPoooX! !!!!+ -+oooo o! XoooX !o oooo+ -+oo ooo !!!!! ooo oo+ -+ooooGooo oooHoooo+ -+ o !!oooo oooo!! o + -+ooo ! ooooo ooooo ! ooo+ -+ o ! ooooo ooooo ! o + -+++++++++++++++++++++++++++++ \ No newline at end of file ++ ooo ooooo ooo oooo + ++ ooo ooooo ooo oooo + ++ + ++ oooo ooo ooooo oooo + ++ oooo ooo ooooo oooo + ++H G+ ++ ooo P ooo + ++G H+ ++ oooo ooo ooooo oooo + ++ oooo ooo ooooo oooo + ++ + ++ ooo ooooo ooo oooo + ++ ooo ooooo ooo oooo + ++++++++++++++++++++++++++++++ diff --git a/state/files/stage/map03.txt b/state/files/stage/map03.txt index 23fc53d..0c91c54 100644 --- a/state/files/stage/map03.txt +++ b/state/files/stage/map03.txt @@ -1,15 +1,15 @@ +++++++++++++++++++++++++++++ -+XoooooooooooX!XoooooooooooX+ -+o H o!o G o+ -+X ooooXoooo o!o ooooXoooo X+ -+o ooooXoooo X!X ooooXoooo o+ -+o P o!o o+ -+XoooooooooooX!XoooooooooooX+ -+!!!!!!!!!!!!!!!!!!!!!!!!!!!+ -+XoooooooooooX!XoooooooooooX+ -+o o!o o+ -+o ooooXoooo X!X ooooXoooo o+ -+X ooooXoooo o!o ooooXoooo X+ -+o G o!o H o+ -+XoooooooooooX!XoooooooooooX+ -+++++++++++++++++++++++++++++ \ No newline at end of file ++ooooooooooooooooooooooooooo+ ++oooo oooo+ ++ooo H ooo+ ++oo oo+ ++o o+ ++o o+ ++o P o+ ++o o+ ++o o+ ++oo oo+ ++ooo G ooo+ ++oooo oooo+ ++ooooooooooooooooooooooooooo+ ++++++++++++++++++++++++++++++ diff --git a/state/gamestate_test.go b/state/gamestate_test.go index 91117e1..f44d58e 100644 --- a/state/gamestate_test.go +++ b/state/gamestate_test.go @@ -47,9 +47,9 @@ func TestNewGameStateEnemiesSpawned(t *testing.T) { if err != nil { t.Fatalf("NewGameState failed: %v", err) } - // map01.txt には2体のハンターがいる - if len(gs.Enemies) != 2 { - t.Errorf("want 2 enemies, got %d", len(gs.Enemies)) + // map01.txt には3体のハンターがいる + if len(gs.Enemies) != 3 { + t.Errorf("want 3 enemies, got %d", len(gs.Enemies)) } } diff --git a/state/map_test.go b/state/map_test.go index 139d97c..7c0a1a9 100644 --- a/state/map_test.go +++ b/state/map_test.go @@ -99,7 +99,7 @@ func TestLoadGrid_Map01(t *testing.T) { } } } - const wantApples = 170 + const wantApples = 139 if appleCount != wantApples { t.Errorf("apple count = %d, want %d", appleCount, wantApples) } @@ -115,9 +115,9 @@ func TestLoadGrid_Map01(t *testing.T) { t.Errorf("player spawn cell should be CellSpace") } - // ハンターが2体いることを確認 - if len(spawns.Hunters) != 2 { - t.Errorf("hunter count = %d, want 2", len(spawns.Hunters)) + // ハンターが3体いることを確認 + if len(spawns.Hunters) != 3 { + t.Errorf("hunter count = %d, want 3", len(spawns.Hunters)) } // ハンター座標のセルが CellSpace になっていることを確認 diff --git a/state/stage_test.go b/state/stage_test.go index 9b9464a..a9b5ec2 100644 --- a/state/stage_test.go +++ b/state/stage_test.go @@ -101,8 +101,8 @@ func TestStageLoad(t *testing.T) { } // map01.txt のハンター数 - if len(spawns.Hunters) != 2 { - t.Errorf("want 2 hunters, got %d", len(spawns.Hunters)) + if len(spawns.Hunters) != 3 { + t.Errorf("want 3 hunters, got %d", len(spawns.Hunters)) } }