Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Team 1 Mobs Bug Fixes and New Mobs #245

Merged
merged 45 commits into from
Oct 12, 2023
Merged

Team 1 Mobs Bug Fixes and New Mobs #245

merged 45 commits into from
Oct 12, 2023

Conversation

MiniSoda17
Copy link
Contributor

Here are all the changes that will be included within this Pull Request from the Mobs Enhancement Team.

Bug Fixes

  • Splitting mobs will now stay within the bounds of the map, previously would spawn outside of the map
  • Mobs will now be visible when spawned, previously would only be seen when shooting.
  • Fixing collider sizes of mobs, no longer get stuck on towers when trying to get through. However important note, they may get stuck on weapon towers but that is because weapon towers are currently unkillable and aren't attacking the mob. The mobs will only attack what is shooting at them. Projectiles will also need to have their knockbacks removed as mobs are being displaced unevenly within the lane.

New Mobs

  • Night Borne mob: A fast-slashing mob that will split into 7 different more night bornes upon death (number subject to change)
  • Arcane Archer: Shoots arrows close range and has the ability to dodge projectiles
  • Cloak: He's just cold

gregchan550 and others added 30 commits October 5, 2023 21:12
@gregchan550
created a new npc for testing
43a26c8
@gregchan550
made new baseNPC method in NPCFactory
1bc7106
@gregchan550
created new mob melee and ranged tasks as well as enum for general mo…
19d1eaa 
…b types
@gregchan550
implemented animate method which calls every general mob animation
394c4cb
@gregchan550
deleted rangetask, just doing it in one task. created basic start fun…
e08fd81 
…ction
@gregchan550
states implemented and ai component added. commiting for push
0be049d
@gregchan550
implemeted melee functionality
dfe85f0
@gregchan550
implemented range functionality and mvoement stop/start and changed n…
2e74695 
…ames in mog animation controllers
@gregchan550
fixed melee attack bug where it wouldnt stop attacking when it first …
ffc9a28 
…detects an enemy
@gregchan550
MobTask should be fully functional. All general mobs now use this task
3c2b5e0
@gregchan550
restored forest game for push
ddd773d
@gregchan550
fixed failing tests
451bb27
@gregchan550
commiting to checkout
924d088
@gregchan550
added javadocs to MobTasks and did more testing
f3a208c
@MiniSoda17
Removed error logs
bfd6b21
@MiniSoda17
Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3
97f0c7e
@gregchan550
implemented slime spawn after shooting fireballs
eef36b9
@gregchan550
got rid of collider component for bosses
29347b0
@gregchan550
changed demon breath and land sound effects
aee3fd2
@gregchan550
added boundary checking for spawning demon slimes and added new sound…
f9f9790 
… for it
@MiniSoda17
Added general ice mob and removed error logs
d9d469b
@MiniSoda17
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
746734c 
…200/2023-studio-3 into Team-1--Mobs-Enhancement
@gregchan550
pushing
d1be527
@MiniSoda17
Added coat animation controller
a2c09e1
@MiniSoda17
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
5a4c93e 
…200/2023-studio-3 into Team-1--Mobs-Enhancement
@gregchan550
fixed bug where mobs werent dying properly
520e5eb
@gregchan550
removed print statements xd
02e8f17
@MiniSoda17
Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3
9ee068a
@MiniSoda17
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
c517bee 
…200/2023-studio-3 into Team-1--Mobs-Enhancement
@MiniSoda17
Added coat mob to mob task
61672e8
freshc0w and others added 10 commits October 11, 2023 01:01
@MiniSoda17 MiniSoda17 added this to the Sprint 4 milestone Oct 11, 2023
meganroxburgh
meganroxburgh approved these changes Oct 12, 2023
View reviewed changes
Copy link
Contributor

@meganroxburgh meganroxburgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@MiniSoda17 MiniSoda17 merged commit f48ed14 into main Oct 12, 2023
This was linked to issues Oct 12, 2023
[Team 1] New special feature mobs for waves #237
Closed
[Team 1] Mob components and task bug fixes #236
Closed
[Team 1] Implement demon and patrick boss spawning ability #235
Closed
[Team 1] Implement singular mob task that controls all mobs #231
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meganroxburgh meganroxburgh meganroxburgh approved these changes

@The-AhmadAA The-AhmadAA Awaiting requested review from The-AhmadAA

@Mohamad11Dab Mohamad11Dab Awaiting requested review from Mohamad11Dab

@samsully samsully Awaiting requested review from samsully

@BlairCannon97 BlairCannon97 Awaiting requested review from BlairCannon97

@ThivanW ThivanW Awaiting requested review from ThivanW

Assignees

@gregchan550 gregchan550

@MiniSoda17 MiniSoda17

@freshc0w freshc0w

Labels
enhancement New feature or request feature sprint 4 team 1
Projects
2023 Studio 3 Project
Status: Done
Milestone
Sprint 4
5 participants
@MiniSoda17 @meganroxburgh @gregchan550 @freshc0w @JSLLW