diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png index 7cd9ffb..7397d63 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_0.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png index fd889a1..e598e99 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_1.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png index 98f687b..b95ddf5 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_10.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png index ae5f84c..b7d71d3 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_11.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png index 55f868d..b7d71d3 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_12.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png index 55f868d..896cd51 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_13.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png index bb22485..4f94a78 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_14.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png index 778acf3..9ecd760 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_15.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png index 9a975bc..0a6e084 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_2.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png index 8e1df14..c6e0d02 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_3.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png index e73920d..e0637cc 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_4.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png index 905594b..6c400e9 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_5.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png index b7cc8f2..6448b05 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_6.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png index 212d54d..f5e0925 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_7.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png index fbeb187..2d977b1 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_8.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png index 4416a84..98fa952 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png and b/resources/graphics/Plants/FumeShroom/FumeShroom/FumeShroom_9.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_0.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_0.png index 92604ca..18da94a 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_0.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_0.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_1.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_1.png index 18da94a..aa8093b 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_1.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_1.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_10.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_10.png index 884df47..1c9d9a9 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_10.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_10.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_11.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_11.png index 1c9d9a9..5262f2d 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_11.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_11.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_12.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_12.png index 5262f2d..25715b4 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_12.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_12.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_13.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_13.png index 25715b4..a93a447 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_13.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_13.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_14.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_14.png index a93a447..99ffb80 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_14.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_14.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_15.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_15.png index 99ffb80..db56b72 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_15.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_15.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_16.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_16.png index db56b72..874137c 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_16.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_16.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_17.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_17.png index 874137c..b500fdf 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_17.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_17.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_18.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_18.png index b500fdf..4023c49 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_18.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_18.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_19.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_19.png index 4023c49..62ff875 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_19.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_19.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_2.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_2.png index aa8093b..2eb6c3f 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_2.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_2.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_20.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_20.png index 62ff875..d1108c8 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_20.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_20.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_21.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_21.png index d1108c8..da84072 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_21.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_21.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_22.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_22.png index da84072..3bb0093 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_22.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_22.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_23.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_23.png deleted file mode 100644 index 3bb0093..0000000 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_23.png and /dev/null differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_24.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_24.png deleted file mode 100644 index 6d7c507..0000000 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_24.png and /dev/null differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_25.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_25.png deleted file mode 100644 index 79ebef3..0000000 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_25.png and /dev/null differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_26.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_26.png deleted file mode 100644 index b367978..0000000 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_26.png and /dev/null differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_27.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_27.png deleted file mode 100644 index 95ea0f6..0000000 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_27.png and /dev/null differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_3.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_3.png index 2eb6c3f..554b882 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_3.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_3.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_4.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_4.png index 554b882..1ffa5c5 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_4.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_4.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_5.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_5.png index 1ffa5c5..c13945b 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_5.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_5.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_6.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_6.png index c13945b..4d1f44e 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_6.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_6.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_7.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_7.png index 4d1f44e..2fa6191 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_7.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_7.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_8.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_8.png index 2fa6191..9c69bf3 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_8.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_8.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_9.png b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_9.png index 9c69bf3..884df47 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_9.png and b/resources/graphics/Plants/FumeShroom/FumeShroomAttack/FumeShroomAttack_9.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png index 5d8a021..fbcd4f2 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_0.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png index c570327..019d730 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_1.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png index 3857927..eaf1306 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_10.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png index 9dc13d6..eaf1306 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_11.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png index 9dc13d6..8f05e31 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_12.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png index 8ff7eca..112a8cf 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_13.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png index 74cb379..4a23beb 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_2.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png index 07cf9ff..5d62fe3 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_3.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png index 591e45b..2c4ed30 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_4.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png index ee271ab..640d139 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_5.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png index 1f03d2f..71fc582 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_6.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png index 7aedb46..30a8b9b 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_7.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png index 95ac834..1c30eb1 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_8.png differ diff --git a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png index b098a0d..25594c2 100644 Binary files a/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png and b/resources/graphics/Plants/FumeShroom/FumeShroomSleep/FumeShroomSleep_9.png differ diff --git a/resources/sound/fume.ogg b/resources/sound/fume.ogg new file mode 100644 index 0000000..fb3479a Binary files /dev/null and b/resources/sound/fume.ogg differ diff --git a/source/component/menubar.py b/source/component/menubar.py index 91f6f28..9ab3741 100755 --- a/source/component/menubar.py +++ b/source/component/menubar.py @@ -45,6 +45,10 @@ plantInfo = (# 元组 (植物名称, 卡片名称, 阳光, 冷却时间) c.CARD_SUNSHROOM, 25, 7500), + (c.FUMESHROOM, + c.CARD_FUMESHROOM, + 75, + 7500), (c.GRAVEBUSTER, c.CARD_GRAVEBUSTER, 75, diff --git a/source/component/plant.py b/source/component/plant.py index 083c693..542f065 100755 --- a/source/component/plant.py +++ b/source/component/plant.py @@ -122,6 +122,52 @@ class Bullet(pg.sprite.Sprite): def draw(self, surface): surface.blit(self.image, self.rect) +# 大喷菇的烟雾 +# 仅有动画效果，不参与攻击运算 +class Fume(pg.sprite.Sprite): + def __init__(self, x, y): + pg.sprite.Sprite.__init__(self) + self.name = c.FUME + self.timer = 0 + self.frame_index = 0 + self.load_images() + self.frame_num = len(self.frames) + self.image = self.frames[self.frame_index] + self.rect = self.image.get_rect() + self.rect.x = x + self.rect.y = y + + def load_images(self): + self.fly_frames = [] + + fly_name = self.name + + self.loadFrames(self.fly_frames, fly_name) + + self.frames = self.fly_frames + + def draw(self, surface): + surface.blit(self.image, self.rect) + + def update(self, game_info): + self.current_time = game_info[c.CURRENT_TIME] + if self.current_time - self.timer >= 140: + self.frame_index += 1 + if self.frame_index >= self.frame_num: + self.frame_index = self.frame_num - 1 + self.kill() + self.timer = self.current_time + self.image = self.frames[self.frame_index] + + def loadFrames(self, frames, name): + frame_list = tool.GFX[name] + x, y = 0, 0 + rect = frame_list[0].get_rect() + width, height = rect.w, rect.h + + for frame in frame_list: + frames.append(tool.get_image(frame, x, y, width, height)) + # 杨桃的子弹 class StarBullet(Bullet): def __init__(self, x, start_y, damage, direction, level): # direction指星星飞行方向 @@ -616,7 +662,7 @@ class PuffShroom(Plant): def canAttack(self, zombie): if (self.rect.x <= zombie.rect.right and - (self.rect.x + c.GRID_X_SIZE * 3.5 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): + (self.rect.x + c.GRID_X_SIZE * 4 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): return True return False @@ -1171,15 +1217,17 @@ class TorchWood(Plant): def idling(self): for i in self.bullet_group: - if i.passedTorchWood != self.rect.x: - if -10 <= i.rect.x - self.rect.x <= 20: - if i.name == c.BULLET_PEA: + if i.name == c.BULLET_PEA: + if i.passedTorchWood != self.rect.x: + if -10 <= i.rect.x - self.rect.x <= 20: self.bullet_group.add(Bullet(i.rect.x, i.rect.y, i.rect.y, - c.BULLET_FIREBALL, c.BULLET_DAMAGE_FIREBALL_BODY, effect=c.BULLET_EFFECT_UNICE, passedTorchWood=self.rect.x)) + c.BULLET_FIREBALL, c.BULLET_DAMAGE_FIREBALL_BODY, effect=c.BULLET_EFFECT_UNICE, passedTorchWood=self.rect.x)) i.kill() - elif i.name == c.BULLET_PEA_ICE: + elif i.name == c.BULLET_PEA_ICE: + if i.passedTorchWood != self.rect.x: + if -10 <= i.rect.x - self.rect.x <= 20: self.bullet_group.add(Bullet(i.rect.x, i.rect.y, i.rect.y, - c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False, passedTorchWood=self.rect.x)) + c.BULLET_PEA, c.BULLET_DAMAGE_NORMAL, effect=False, passedTorchWood=self.rect.x)) i.kill() class StarFruit(Plant): @@ -1298,7 +1346,7 @@ class SeaShroom(Plant): def canAttack(self, zombie): if (self.rect.x <= zombie.rect.right and - (self.rect.x + c.GRID_X_SIZE * 3.5 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): + (self.rect.x + c.GRID_X_SIZE * 4 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): return True return False @@ -1551,10 +1599,12 @@ class GraveBuster(Plant): self.image.set_alpha(255) class FumeShroom(Plant): - def __init__(self, x, y, bullet_group): + def __init__(self, x, y, bullet_group, zombie_group): Plant.__init__(self, x, y, c.FUMESHROOM, c.PLANT_HEALTH, bullet_group) self.can_sleep = True self.shoot_timer = 0 + self.showAttackFrames = True + self.zombie_group = zombie_group def loadImages(self, name, scale): self.idle_frames = [] @@ -1569,21 +1619,55 @@ class FumeShroom(Plant): name_list = [idle_name, sleep_name, attack_name] for i, name in enumerate(name_list): - self.loadFrames(frame_list[i], name, 1, c.WHITE) + self.loadFrames(frame_list[i], name, 1, c.BLACK) self.frames = self.idle_frames def canAttack(self, zombie): if (self.rect.x <= zombie.rect.right and - (self.rect.x + c.GRID_X_SIZE * 4.5 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): + (self.rect.x + c.GRID_X_SIZE * 5 >= zombie.rect.x) and (zombie.rect.left <= c.SCREEN_WIDTH + 10)): return True return False def setAttack(self): self.state = c.ATTACK - self.changeFrames(self.attack_frames) if self.shoot_timer != 0: self.shoot_timer = self.current_time - 700 def attacking(self): - '' \ No newline at end of file + if self.shoot_timer == 0: + self.shoot_timer = self.current_time - 700 + elif self.current_time - self.shoot_timer >= 1200: + if self.showAttackFrames: + self.showAttackFrames = False + self.changeFrames(self.attack_frames) + + if self.current_time - self.shoot_timer >= 1400: + self.bullet_group.add(Fume(self.rect.right - 35, self.rect.y)) + # 烟雾只是个动画，实际伤害由本身完成 + for targetZombie in self.zombie_group: + if self.canAttack(targetZombie): + targetZombie.setDamage(c.BULLET_DAMAGE_NORMAL, damageType=c.ZOMBIE_RANGE_DAMAGE) + self.shoot_timer = self.current_time + self.showAttackFrames = True + # 播放发射音效 + pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "fume.ogg")).play() + + def animation(self): + if (self.current_time - self.animate_timer) > self.animate_interval: + self.frame_index += 1 + if self.frame_index >= self.frame_num: + if self.frames == self.attack_frames: + self.changeFrames(self.idle_frames) + else: + self.frame_index = 0 + self.animate_timer = self.current_time + + self.image = self.frames[self.frame_index] + if (self.current_time - self.highlightTime < 200): + self.image.set_alpha(150) + elif ((self.current_time - self.hit_timer) < 200): + self.image.set_alpha(192) + else: + self.image.set_alpha(255) + diff --git a/source/component/zombie.py b/source/component/zombie.py index 77030a8..8c46850 100755 --- a/source/component/zombie.py +++ b/source/component/zombie.py @@ -360,6 +360,14 @@ class Zombie(pg.sprite.Sprite): self.health -= damage # 注意范围伤害中这里还有一个攻击 self.health += self.helmetType2Health self.helmetType2Health = 0 + else: + if self.helmet: + self.helmetHealth -= damage + if self.helmetHealth <= 0: + self.health += self.helmetHealth + self.helmetHealth = 0 # 注意合并后清零 + else: + self.health -= damage elif self.helmet: # 不存在二类防具，但是存在一类防具 self.helmetHealth -= damage if self.helmetHealth <= 0: diff --git a/source/constants.py b/source/constants.py index 09347b4..5f479c0 100755 --- a/source/constants.py +++ b/source/constants.py @@ -278,6 +278,7 @@ BULLET_PEA_ICE = 'PeaIce' BULLET_FIREBALL = 'Fireball' BULLET_MUSHROOM = 'BulletMushRoom' BULLET_SEASHROOM = 'BulletSeaShroom' +FUME = 'Fume' # 子弹伤害 BULLET_DAMAGE_NORMAL = 20 BULLET_DAMAGE_FIREBALL_BODY = 27 # 这是火球本体的伤害，注意不是40，本体(27) + 溅射(13)才是40 diff --git a/source/state/level.py b/source/state/level.py index 07151ce..b001d28 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -898,6 +898,8 @@ class Level(tool.State): new_plant = plant.GraveBuster(x, y, self.plant_groups[map_y], self.map, map_x) # 播放吞噬音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "gravebusterchomp.ogg")).play() + elif self.plant_name == c.FUMESHROOM: + new_plant = plant.FumeShroom(x, y, self.bullet_groups[map_y], self.zombie_groups[map_y]) if new_plant.can_sleep and self.background_type in {c.BACKGROUND_DAY, c.BACKGROUND_POOL, c.BACKGROUND_ROOF, c.BACKGROUND_WALLNUTBOWLING, c.BACKGROUND_SINGLE, c.BACKGROUND_TRIPLE}: @@ -986,7 +988,9 @@ class Level(tool.State): def checkBulletCollisions(self): for i in range(self.map_y_len): for bullet in self.bullet_groups[i]: - if bullet.name == c.BULLET_STAR: + if bullet.name == c.FUME: + continue + elif bullet.name == c.BULLET_STAR: collided_func = pg.sprite.collide_circle_ratio(1) else: collided_func = pg.sprite.collide_circle_ratio(0.7)