diff --git a/resources/data/map/level_0.json b/resources/data/map/level_0.json index 4067036..77b1ded 100644 --- a/resources/data/map/level_0.json +++ b/resources/data/map/level_0.json @@ -3,7 +3,7 @@ "init_sun_value":5000, "shovel":1, "zombie_list":[ - {"time":1000, "map_y":2, "name":"BucketheadZombie"}, + {"time":1000, "map_y":2, "name":"FootballZombie"}, {"time":60000, "map_y":2, "name":"Zombie"} ] } \ No newline at end of file diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_0.png new file mode 100644 index 0000000..542b3f2 Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_10.png index 713268c..4b9b194 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_10.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_10.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_12.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_12.png index 4b9b194..fabc0b9 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_12.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_12.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_14.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_14.png index fabc0b9..3f55877 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_14.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_14.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_16.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_16.png index 3f55877..bd1f12c 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_16.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_16.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_18.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_18.png index bd1f12c..5d56e57 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_18.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_18.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_2.png index 542b3f2..6b14b11 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_20.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_20.png index 5d56e57..d74a5f0 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_20.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_20.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_22.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_22.png deleted file mode 100644 index d74a5f0..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_22.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_4.png index 6b14b11..f3712eb 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_6.png index f3712eb..411f2cb 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_8.png index 411f2cb..713268c 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombie/FootballZombie_8.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_0.png new file mode 100644 index 0000000..71ec38d Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_10.png index 43f067c..e362fb4 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_10.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_10.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_12.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_12.png index e362fb4..47be1bd 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_12.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_12.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_14.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_14.png index 47be1bd..261926c 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_14.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_14.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_16.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_16.png index 261926c..e1320e8 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_16.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_16.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_18.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_18.png index e1320e8..1d92780 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_18.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_18.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_2.png index 71ec38d..57ea648 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_20.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_20.png deleted file mode 100644 index 1d92780..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_20.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_4.png index 57ea648..f5f041b 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_6.png index f5f041b..e663ade 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_8.png index e663ade..43f067c 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieAttack/FootballZombieAttack_8.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_0.png new file mode 100644 index 0000000..8c3436b Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_1.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_1.png index 8c3436b..38c19a6 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_1.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_1.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_16.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_16.png deleted file mode 100644 index eb224f6..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_16.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_2.png index 38c19a6..f9418e2 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_3.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_3.png index f9418e2..92d16da 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_3.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_3.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_4.png index 92d16da..ed82f5b 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_6.png index ed82f5b..eb224f6 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieDie/FootballZombieDie_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_0.png new file mode 100644 index 0000000..5d7ee57 Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_1.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_1.png index 5d7ee57..2b92299 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_1.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_1.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_10.png deleted file mode 100644 index 7de745d..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_10.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_2.png index 2b92299..feb311e 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_3.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_3.png index feb311e..5da73e5 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_3.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_3.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_4.png index 5da73e5..3468430 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_5.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_5.png index 3468430..f827793 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_5.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_5.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_6.png index f827793..e61d094 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_7.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_7.png index e61d094..6f93807 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_7.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_7.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_8.png index 6f93807..67ba101 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_8.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_9.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_9.png index 67ba101..7de745d 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_9.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHead/FootballZombieLostHead_9.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_0.png new file mode 100644 index 0000000..2d78989 Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_1.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_1.png index 2d78989..da9e4a1 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_1.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_1.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_10.png deleted file mode 100644 index a4787d1..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_10.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_2.png index da9e4a1..54b52d9 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_3.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_3.png index 54b52d9..970c805 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_3.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_3.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_4.png index 970c805..e921ac5 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_5.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_5.png index e921ac5..ac5abe6 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_5.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_5.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_6.png index ac5abe6..34fd6fe 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_7.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_7.png index 34fd6fe..a8733e3 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_7.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_7.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_8.png index a8733e3..8e8e8df 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_8.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_9.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_9.png index 8e8e8df..a4787d1 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_9.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHeadAttack/FootballZombieLostHeadAttack_9.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_0.png new file mode 100644 index 0000000..a84a3e6 Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_10.png index 2e2eb55..daee8e4 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_10.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_10.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_12.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_12.png index daee8e4..54fc1eb 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_12.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_12.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_14.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_14.png index 54fc1eb..156e8e0 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_14.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_14.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_16.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_16.png index 156e8e0..8cbbef2 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_16.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_16.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_18.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_18.png index 8cbbef2..d94fd4e 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_18.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_18.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_2.png index a84a3e6..663dc2d 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_20.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_20.png index d94fd4e..d7a7110 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_20.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_20.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_22.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_22.png deleted file mode 100644 index d7a7110..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_22.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_4.png index 663dc2d..37daf79 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_6.png index 37daf79..0580a87 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_8.png index 0580a87..2e2eb55 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmet/FootballZombieLostHelmet_8.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_0.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_0.png new file mode 100644 index 0000000..d6983cf Binary files /dev/null and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_0.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_10.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_10.png index 36d5859..7cc6b8b 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_10.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_10.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_12.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_12.png index 7cc6b8b..e9eea97 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_12.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_12.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_14.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_14.png index e9eea97..7c89b72 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_14.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_14.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_16.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_16.png index 7c89b72..41606c6 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_16.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_16.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_18.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_18.png index 41606c6..cd9f8ac 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_18.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_18.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_2.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_2.png index d6983cf..4570472 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_2.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_2.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_20.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_20.png index cd9f8ac..5b38bf0 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_20.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_20.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_22.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_22.png deleted file mode 100644 index 5b38bf0..0000000 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_22.png and /dev/null differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_4.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_4.png index 4570472..d65565e 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_4.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_4.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_6.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_6.png index d65565e..b583657 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_6.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_6.png differ diff --git a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_8.png b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_8.png index b583657..36d5859 100644 Binary files a/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_8.png and b/resources/graphics/Zombies/FootballZombie/FootballZombieLostHelmetAttack/FootballZombieLostHelmetAttack_8.png differ diff --git a/source/component/zombie.py b/source/component/zombie.py index f7b1f29..c310a02 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -33,6 +33,11 @@ class Zombie(pg.sprite.Sprite): self.attack_timer = 0 self.state = c.WALK self.animate_interval = 150 + self.walk_animate_interval = 180 + self.attack_animate_interval = 100 + self.lostHead_animate_interval = 180 + self.die_animate_interval = 80 + self.boomDie_animate_interval = 100 self.ice_slow_ratio = 1 self.ice_slow_timer = 0 self.hit_timer = 0 @@ -41,14 +46,18 @@ class Zombie(pg.sprite.Sprite): self.losthead_timer = 0 self.is_hypno = False # the zombie is hypo and attack other zombies when it ate a HypnoShroom - def loadFrames(self, frames, name, image_x, colorkey=c.BLACK): + def loadFrames(self, frames, name, colorkey=c.BLACK): frame_list = tool.GFX[name] rect = frame_list[0].get_rect() width, height = rect.w, rect.h - width -= image_x - + if name in tool.ZOMBIE_RECT: + data = tool.ZOMBIE_RECT[name] + x, width = data['x'], data['width'] + width -= x + else: + x = 0 for frame in frame_list: - frames.append(tool.get_image(frame, image_x, 0, width, height, colorkey)) + frames.append(tool.get_image(frame, x, 0, width, height, colorkey)) def update(self, game_info): self.current_time = game_info[c.CURRENT_TIME] @@ -145,7 +154,7 @@ class Zombie(pg.sprite.Sprite): self.losthead_timer = self.current_time self.lostHead = True self.speed = 0.5 - self.animate_interval = 180 + self.animate_interval = self.lostHead_animate_interval if self.head_group is not None: self.head_group.add(ZombieHead(self.rect.centerx, self.rect.bottom)) @@ -288,7 +297,7 @@ class Zombie(pg.sprite.Sprite): def setWalk(self): self.state = c.WALK - self.animate_interval = 180 + self.animate_interval = self.walk_animate_interval if self.helmet or self.helmetType2: # 这里暂时没有考虑同时有两种防具的僵尸 self.changeFrames(self.helmet_walk_frames) @@ -302,7 +311,7 @@ class Zombie(pg.sprite.Sprite): self.prey_is_plant = is_plant self.state = c.ATTACK self.attack_timer = self.current_time - self.animate_interval = 100 + self.animate_interval = self.attack_animate_interval if self.helmet or self.helmetType2: # 这里暂时没有考虑同时有两种防具的僵尸 self.changeFrames(self.helmet_attack_frames) @@ -313,13 +322,13 @@ class Zombie(pg.sprite.Sprite): def setDie(self): self.state = c.DIE - self.animate_interval = 80 + self.animate_interval = self.die_animate_interval self.changeFrames(self.die_frames) def setBoomDie(self): self.health = 0 self.state = c.DIE - self.animate_interval = 100 + self.animate_interval = self.boomDie_animate_interval self.changeFrames(self.boomdie_frames) def setFreeze(self, ice_trap_image): @@ -348,7 +357,7 @@ class ZombieHead(Zombie): def loadImages(self): self.die_frames = [] die_name = self.name - self.loadFrames(self.die_frames, die_name, 0) + self.loadFrames(self.die_frames, die_name) self.frames = self.die_frames def setWalk(self): @@ -380,7 +389,7 @@ class NormalZombie(Zombie): losthead_attack_name, die_name, boomdie_name] for i, name in enumerate(name_list): - self.loadFrames(frame_list[i], name, tool.ZOMBIE_RECT[name]['x']) + self.loadFrames(frame_list[i], name) self.frames = self.walk_frames @@ -416,7 +425,7 @@ class ConeHeadZombie(Zombie): losthead_attack_name, die_name, boomdie_name] for i, name in enumerate(name_list): - self.loadFrames(frame_list[i], name, tool.ZOMBIE_RECT[name]['x']) + self.loadFrames(frame_list[i], name) self.frames = self.helmet_walk_frames @@ -452,7 +461,7 @@ class BucketHeadZombie(Zombie): losthead_attack_name, die_name, boomdie_name] for i, name in enumerate(name_list): - self.loadFrames(frame_list[i], name, tool.ZOMBIE_RECT[name]['x']) + self.loadFrames(frame_list[i], name) self.frames = self.helmet_walk_frames @@ -483,7 +492,7 @@ class FlagZombie(Zombie): losthead_attack_name, die_name, boomdie_name] for i, name in enumerate(name_list): - self.loadFrames(frame_list[i], name, tool.ZOMBIE_RECT[name]['x']) + self.loadFrames(frame_list[i], name) self.frames = self.walk_frames @@ -523,6 +532,47 @@ class NewspaperZombie(Zombie): color = c.BLACK else: color = c.WHITE - self.loadFrames(frame_list[i], name, tool.ZOMBIE_RECT[name]['x'], color) + self.loadFrames(frame_list[i], name, color) + + self.frames = self.helmet_walk_frames + +class FootballZombie(Zombie): + def __init__(self, x, y, head_group): + Zombie.__init__(self, x, y, c.FOOTBALL_ZOMBIE, head_group, helmetHealth=c.FOOTBALL_HELMET_HEALTH) + self.speed = 1.88 + self.animate_interval = 50 + self.walk_animate_interval = 50 + self.attack_animate_interval = 50 + self.lostHead_animate_interval = 50 + self.die_animate_interval = 50 + + def loadImages(self): + self.helmet_walk_frames = [] + self.helmet_attack_frames = [] + self.walk_frames = [] + self.attack_frames = [] + self.losthead_walk_frames = [] + self.losthead_attack_frames = [] + self.die_frames = [] + self.boomdie_frames = [] + + helmet_walk_name = self.name + helmet_attack_name = self.name + 'Attack' + walk_name = self.name + 'LostHelmet' + attack_name = self.name + 'LostHelmetAttack' + losthead_walk_name = self.name + 'LostHead' + losthead_attack_name = self.name + 'LostHeadAttack' + die_name = self.name + 'Die' + boomdie_name = c.BOOMDIE + + frame_list = [self.helmet_walk_frames, self.helmet_attack_frames, + self.walk_frames, self.attack_frames, self.losthead_walk_frames, + self.losthead_attack_frames, self.die_frames, self.boomdie_frames] + name_list = [helmet_walk_name, helmet_attack_name, + walk_name, attack_name, losthead_walk_name, + losthead_attack_name, die_name, boomdie_name] + + for i, name in enumerate(name_list): + self.loadFrames(frame_list[i], name) self.frames = self.helmet_walk_frames \ No newline at end of file diff --git a/source/constants.py b/source/constants.py index 98e973e..f2822d5 100755 --- a/source/constants.py +++ b/source/constants.py @@ -258,6 +258,7 @@ CONEHEAD_ZOMBIE = 'ConeheadZombie' BUCKETHEAD_ZOMBIE = 'BucketheadZombie' FLAG_ZOMBIE = 'FlagZombie' NEWSPAPER_ZOMBIE = 'NewspaperZombie' +FOOTBALL_ZOMBIE = 'FootballZombie' BOOMDIE = 'BoomDie' # 对僵尸的攻击类型设置 @@ -275,6 +276,7 @@ NORMAL_HEALTH = 200 # 普通僵尸生命值 # 有关一类防具 CONEHEAD_HEALTH = 370 BUCKETHEAD_HEALTH = 1100 +FOOTBALL_HELMET_HEALTH = 1400 # 有关二类防具 NEWSPAPER_HEALTH = 150 diff --git a/source/state/level.py b/source/state/level.py index 5a4d09b..e5264a3 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -472,6 +472,8 @@ class Level(tool.State): self.zombie_groups[map_y].add(zombie.FlagZombie(c.ZOMBIE_START_X, y, self.head_group)) elif name == c.NEWSPAPER_ZOMBIE: self.zombie_groups[map_y].add(zombie.NewspaperZombie(c.ZOMBIE_START_X, y, self.head_group)) + elif name == c.FOOTBALL_ZOMBIE: + self.zombie_groups[map_y].add(zombie.FootballZombie(c.ZOMBIE_START_X, y, self.head_group)) # 能否种植物的判断： # 先判断位置是否合法 isValid(map_x, map_y)