Merge pull request #480 from UQdeco2800/team4-sprint4

Team4 sprint4 - implementing Poison and Health increase animations
UQdeco2800 · Oct 19, 2021 · 58a9a50 · 58a9a50
2 parents 94f834b + 0e72657
commit 58a9a50
Show file tree

Hide file tree

Showing 196 changed files with 1,459 additions and 70 deletions.
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_attack_dizzy_1.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_attack_dizzy_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_attack_dizzy_2.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_attack_dizzy_2.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_burn_dizzy_1.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_burn_dizzy_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_crouch_dizzy_1.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_crouch_dizzy_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_crouch_dizzy_2.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_crouch_dizzy_2.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_hurt_dizzy_1.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_hurt_dizzy_1.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_1.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_1.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_2.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_2.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_3.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_jump_dizzy_3.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_1.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_2.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_2.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_3.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_3.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_4.png b/.../artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_pickup_dizzy_4.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_right_dizzy.png b/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_right_dizzy.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_run_dizzy_1.png b/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_run_dizzy_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_run_dizzy_2.png b/assets/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_run_dizzy_2.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_walk_dizzy_1.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_walk_dizzy_1.png
diff --git a/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_walk_dizzy_2.png b/...ts/artwork/main-character/Attire_Gold_2/buff/dizzy/main_player_walk_dizzy_2.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_attack_health-down_1.png b/...n-character/Attire_Gold_2/buff/health down/main_player_attack_health-down_1.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_attack_health-down_2.png b/...n-character/Attire_Gold_2/buff/health down/main_player_attack_health-down_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_burn_health-down_1.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_burn_health-down_1.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_crouch_health-down_1.png b/...n-character/Attire_Gold_2/buff/health down/main_player_crouch_health-down_1.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_crouch_health-down_2.png b/...n-character/Attire_Gold_2/buff/health down/main_player_crouch_health-down_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_hurt_health-down_1.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_hurt_health-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_1.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_2.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_3.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_jump_health-down_3.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_1.png b/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_1.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_2.png b/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_2.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_3.png b/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_3.png
diff --git a/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_4.png b/...n-character/Attire_Gold_2/buff/health down/main_player_pickup_health-down_4.png
diff --git a/...main-character/Attire_Gold_2/buff/health down/main_player_right_health-down.png b/...main-character/Attire_Gold_2/buff/health down/main_player_right_health-down.png
diff --git a/...main-character/Attire_Gold_2/buff/health down/main_player_run_health-down_1.png b/...main-character/Attire_Gold_2/buff/health down/main_player_run_health-down_1.png
diff --git a/...main-character/Attire_Gold_2/buff/health down/main_player_run_health-down_2.png b/...main-character/Attire_Gold_2/buff/health down/main_player_run_health-down_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_walk_health-down_1.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_walk_health-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/health down/main_player_walk_health-down_2.png b/...ain-character/Attire_Gold_2/buff/health down/main_player_walk_health-down_2.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_attack_health-limit-up_1.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_attack_health-limit-up_1.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_attack_health-limit-up_2.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_attack_health-limit-up_2.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_burn_health-limit-up_1.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_burn_health-limit-up_1.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_crouch_health-limit-up_1.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_crouch_health-limit-up_1.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_crouch_health-limit-up_2.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_crouch_health-limit-up_2.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_hurt_health-limit-up_1.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_hurt_health-limit-up_1.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_1.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_1.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_2.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_2.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_3.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_jump_health-limit-up_3.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_1.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_1.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_2.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_2.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_3.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_3.png
diff --git a/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_4.png b/...ter/Attire_Gold_2/buff/health_limit_up/main_player_pickup_health-limit-up_4.png
diff --git a/...racter/Attire_Gold_2/buff/health_limit_up/main_player_right_health-limit-up.png b/...racter/Attire_Gold_2/buff/health_limit_up/main_player_right_health-limit-up.png
diff --git a/...racter/Attire_Gold_2/buff/health_limit_up/main_player_run_health-limit-up_1.png b/...racter/Attire_Gold_2/buff/health_limit_up/main_player_run_health-limit-up_1.png
diff --git a/...racter/Attire_Gold_2/buff/health_limit_up/main_player_run_health-limit-up_2.png b/...racter/Attire_Gold_2/buff/health_limit_up/main_player_run_health-limit-up_2.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_walk_health-limit-up_1.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_walk_health-limit-up_1.png
diff --git a/...acter/Attire_Gold_2/buff/health_limit_up/main_player_walk_health-limit-up_2.png b/...acter/Attire_Gold_2/buff/health_limit_up/main_player_walk_health-limit-up_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_attack_health-up_1.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_attack_health-up_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_attack_health-up_2.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_attack_health-up_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_burn_health-up_1.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_burn_health-up_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_crouch_health-up_1.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_crouch_health-up_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_crouch_health-up_2.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_crouch_health-up_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_hurt_health-up_1.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_hurt_health-up_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_1.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_2.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_3.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_jump_health-up_3.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_1.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_2.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_3.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_3.png
diff --git a/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_4.png b/.../main-character/Attire_Gold_2/buff/health_up/main_player_pickup_health-up_4.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_right_health-up.png b/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_right_health-up.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_run_health-up_1.png b/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_run_health-up_1.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_run_health-up_2.png b/...ork/main-character/Attire_Gold_2/buff/health_up/main_player_run_health-up_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_walk_health-up_1.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_walk_health-up_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_walk_health-up_2.png b/...rk/main-character/Attire_Gold_2/buff/health_up/main_player_walk_health-up_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_attack_hungry_1.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_attack_hungry_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_attack_hungry_2.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_attack_hungry_2.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_burn_hungry_1.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_burn_hungry_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_crouch_hungry_1.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_crouch_hungry_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_crouch_hungry_2.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_crouch_hungry_2.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_hurt_hungry_1.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_hurt_hungry_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_1.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_2.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_2.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_3.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_jump_hungry_3.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_1.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_2.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_3.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_3.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_4.png b/...rtwork/main-character/Attire_Gold_2/buff/hungry/main_player_pickup_hungry_4.png
diff --git a/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_right_hungry.png b/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_right_hungry.png
diff --git a/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_run_hungry_1.png b/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_run_hungry_1.png
diff --git a/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_run_hungry_2.png b/...s/artwork/main-character/Attire_Gold_2/buff/hungry/main_player_run_hungry_2.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_walk_hungry_1.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_walk_hungry_1.png
diff --git a/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_walk_hungry_2.png b/.../artwork/main-character/Attire_Gold_2/buff/hungry/main_player_walk_hungry_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_attack_poisoned_1.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_attack_poisoned_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_attack_poisoned_2.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_attack_poisoned_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_burn_poisoned_1.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_burn_poisoned_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_crouch_poisoned_1.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_crouch_poisoned_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_crouch_poisoned_2.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_crouch_poisoned_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_hurt_poisoned_1.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_hurt_poisoned_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_1.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_2.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_3.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_jump_poisoned_3.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_1.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_2.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_3.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_3.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_4.png b/...rk/main-character/Attire_Gold_2/buff/poisoned/main_player_pickup_poisoned_4.png
diff --git a/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_right_poisoned.png b/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_right_poisoned.png
diff --git a/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_run_poisoned_1.png b/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_run_poisoned_1.png
diff --git a/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_run_poisoned_2.png b/...twork/main-character/Attire_Gold_2/buff/poisoned/main_player_run_poisoned_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_walk_poisoned_1.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_walk_poisoned_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_walk_poisoned_2.png b/...work/main-character/Attire_Gold_2/buff/poisoned/main_player_walk_poisoned_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_attack_recovered_1.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_attack_recovered_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_attack_recovered_2.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_attack_recovered_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_burn_recovered_1.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_burn_recovered_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_crouch_recovered_1.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_crouch_recovered_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_crouch_recovered_2.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_crouch_recovered_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_hurt_recovered_1.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_hurt_recovered_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_1.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_2.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_3.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_jump_recovered_3.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_1.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_2.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_3.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_3.png
diff --git a/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_4.png b/.../main-character/Attire_Gold_2/buff/recovered/main_player_pickup_recovered_4.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_right_recovered.png b/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_right_recovered.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_run_recovered_1.png b/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_run_recovered_1.png
diff --git a/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_run_recovered_2.png b/...ork/main-character/Attire_Gold_2/buff/recovered/main_player_run_recovered_2.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_walk_recovered_1.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_walk_recovered_1.png
diff --git a/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_walk_recovered_2.png b/...rk/main-character/Attire_Gold_2/buff/recovered/main_player_walk_recovered_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_attack_speed-down_1.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_attack_speed-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_attack_speed-down_2.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_attack_speed-down_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_burn_speed-down_1.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_burn_speed-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_crouch_speed-down_1.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_crouch_speed-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_crouch_speed-down_2.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_crouch_speed-down_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_hurt_speed-down_1.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_hurt_speed-down_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_1.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_2.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_3.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_jump_speed-down_3.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_1.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_1.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_2.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_2.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_3.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_3.png
diff --git a/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_4.png b/...ain-character/Attire_Gold_2/buff/speed_down/main_player_pickup_speed-down_4.png
diff --git a/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_right_speed-down.png b/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_right_speed-down.png
diff --git a/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_run_speed-down_1.png b/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_run_speed-down_1.png
diff --git a/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_run_speed-down_2.png b/...k/main-character/Attire_Gold_2/buff/speed_down/main_player_run_speed-down_2.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_walk_speed-down_1.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_walk_speed-down_1.png
diff --git a/.../main-character/Attire_Gold_2/buff/speed_down/main_player_walk_speed-down_2.png b/.../main-character/Attire_Gold_2/buff/speed_down/main_player_walk_speed-down_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_attack_thirsty_1.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_attack_thirsty_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_attack_thirsty_2.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_attack_thirsty_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_burn_thirsty_1.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_burn_thirsty_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_crouch_thirsty_1.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_crouch_thirsty_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_crouch_thirsty_2.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_crouch_thirsty_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_hurt_thirsty_1.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_hurt_thirsty_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_1.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_2.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_3.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_jump_thirsty_3.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_1.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_1.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_2.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_2.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_3.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_3.png
diff --git a/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_4.png b/...work/main-character/Attire_Gold_2/buff/thirsty/main_player_pickup_thirsty_4.png
diff --git a/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_right_thirsty.png b/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_right_thirsty.png
diff --git a/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_run_thirsty_1.png b/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_run_thirsty_1.png
diff --git a/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_run_thirsty_2.png b/...artwork/main-character/Attire_Gold_2/buff/thirsty/main_player_run_thirsty_2.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_walk_thirsty_1.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_walk_thirsty_1.png
diff --git a/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_walk_thirsty_2.png b/...rtwork/main-character/Attire_Gold_2/buff/thirsty/main_player_walk_thirsty_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_attack_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_attack_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_attack_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_attack_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_burn_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_burn_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_crouch_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_crouch_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_crouch_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_crouch_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_hurt_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_hurt_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_jump_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_jump_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_jump_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_jump_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_jump_3.png b/assets/artwork/main-character/Attire_Gold_2/main_player_jump_3.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_3.png b/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_3.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_4.png b/assets/artwork/main-character/Attire_Gold_2/main_player_pickup_4.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_right.png b/assets/artwork/main-character/Attire_Gold_2/main_player_right.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_run_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_run_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_run_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_run_2.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_walk_1.png b/assets/artwork/main-character/Attire_Gold_2/main_player_walk_1.png
diff --git a/assets/artwork/main-character/Attire_Gold_2/main_player_walk_2.png b/assets/artwork/main-character/Attire_Gold_2/main_player_walk_2.png
diff --git a/assets/wiki/mpc/ObstacleEventHandler_magmaCollision.png b/assets/wiki/mpc/ObstacleEventHandler_magmaCollision.png
diff --git a/assets/wiki/mpc/PlayerAnimationController_animateBurn.png b/assets/wiki/mpc/PlayerAnimationController_animateBurn.png
diff --git a/source/core/assets/images/mpc/finalAtlas/gold_2/mpcAnimation_2.atlas b/source/core/assets/images/mpc/finalAtlas/gold_2/mpcAnimation_2.atlas
diff --git a/source/core/assets/images/mpc/finalAtlas/gold_2/mpcAnimation_2.png b/source/core/assets/images/mpc/finalAtlas/gold_2/mpcAnimation_2.png
diff --git a/source/core/assets/images/mpc/finalAtlas/gold_2/mpc_right.png b/source/core/assets/images/mpc/finalAtlas/gold_2/mpc_right.png
diff --git a/...e/core/assets/images/mpc/mpc_atlas_workspace/source/OG/main_player_attack_3.png b/...e/core/assets/images/mpc/mpc_atlas_workspace/source/OG/main_player_attack_3.png
diff --git a/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_1.png b/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_1.png
diff --git a/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_2.png b/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_2.png
diff --git a/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_3.png b/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_attack_3.png
diff --git a/...core/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_burn_1.png b/...core/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_burn_1.png
diff --git a/...core/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_hurt_1.png b/...core/assets/images/mpc/mpc_atlas_workspace/source/gold_2/main_player_hurt_1.png
diff --git a/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_6/main_player_attack_3.png b/...re/assets/images/mpc/mpc_atlas_workspace/source/gold_6/main_player_attack_3.png
diff --git a/source/core/src/main/com/deco2800/game/components/buff/DeBuff.java b/source/core/src/main/com/deco2800/game/components/buff/DeBuff.java
@@ -52,6 +52,7 @@ public void decreaseHealth(){
      */
     public void poisoning() {
         PlayerStatsDisplay playerComponent = this.player.getComponent(PlayerStatsDisplay.class);
+        //triggering player poison status
         player.getEvents().trigger("poisoned");
         long lasthealthdeductiontime = 0;
         int counter=0;
@@ -84,7 +85,7 @@ public void slowSpeed()  {
         removeBuff_Debuff();
     }
 
-    //removing buff/debuff after 1s
+    //removing buff/debuff after 5s
 
     public void removeBuff_Debuff() {
         Timer timer=new Timer();
@@ -94,7 +95,7 @@ public void run() {
                 player.getEvents().trigger("stopBuffDebuff");
                 timer.stop();
             }
-        },10);
+        },5);
     }
     public void removeSlowSpeed()   {
         player.updateSpeed(new Vector2(4,8));

diff --git a/source/core/src/main/com/deco2800/game/components/obstacle/ObstacleEventHandler.java b/source/core/src/main/com/deco2800/game/components/obstacle/ObstacleEventHandler.java
@@ -66,7 +66,7 @@ public void create() {
         switch (obstacleType) {
             case PLANTS_OBSTACLE:
                 entity.getEvents().addListener(COLLISION_START, this::plantsDisappear);
-                entity.getEvents().trigger("poison");
+
                 break;
             case THORNS_OBSTACLE:
                 entity.getEvents().addListener(COLLISION_START, this::thornsDisappear);
@@ -124,7 +124,7 @@ void plantsDisappear(Fixture me, Fixture other) {
             // Doesn't match our target layer, ignore
             return;
         }
-
+        entity.getEvents().trigger("poison");
         if (count == 0) { // Avoid an entity from repeatedly triggering an attack
             count++;
 

diff --git a/source/core/src/main/com/deco2800/game/components/player/KeyboardPlayerInputComponent.java b/source/core/src/main/com/deco2800/game/components/player/KeyboardPlayerInputComponent.java
@@ -3,6 +3,7 @@
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Timer;
 import com.deco2800.game.areas.ForestGameArea;
 
 import com.deco2800.game.components.foodAndwater.RecycleDisplay;
@@ -77,7 +78,9 @@ public boolean keyDown(int keycode) {
       case Keys.J:
         if(entity.getComponent(CombatStatsComponent.class).getHealth() < 100){
           newItembar.usekit();
+          entity.getEvents().trigger("healthUp");
           entity.getComponent(CombatStatsComponent.class).addHealth(10);
+          removeBuff_Debuff();
           ForestGameArea.playitemMusic();
         }
         return true;
@@ -182,4 +185,18 @@ private void triggerWalkEvent() {
   public Vector2 getWalkDirection() {
     return walkDirection;
   }
+
+  //removing buff/debuff after 1s
+
+  public void removeBuff_Debuff() {
+    Timer timer=new Timer();
+    timer.scheduleTask(new Timer.Task() {
+      @Override
+      public void run() {
+        entity.getEvents().trigger("stopBuffDebuff");
+        timer.stop();
+      }
+    },1);
+  }
 }
+