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.

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

Merge branch 'main' into Team-7--Code-Smells #272

Closed
wants to merge 161 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
a08a11f
Merge branch 'main' into Team-2-sound
The-AhmadAA Oct 2, 2023
b2e84e2
Merge branch 'team-2-ui' into Team-2-sound
The-AhmadAA Oct 2, 2023
43a26c8
created a new npc for testing
gregchan550 Oct 5, 2023
1bc7106
made new baseNPC method in NPCFactory
gregchan550 Oct 5, 2023
19d1eaa
created new mob melee and ranged tasks as well as enum for general mo…
gregchan550 Oct 5, 2023
394c4cb
implemented animate method which calls every general mob animation
gregchan550 Oct 5, 2023
e08fd81
deleted rangetask, just doing it in one task. created basic start fun…
gregchan550 Oct 5, 2023
0be049d
states implemented and ai component added. commiting for push
gregchan550 Oct 5, 2023
dfe85f0
implemeted melee functionality
gregchan550 Oct 5, 2023
2e74695
implemented range functionality and mvoement stop/start and changed n…
gregchan550 Oct 5, 2023
ffc9a28
fixed melee attack bug where it wouldnt stop attacking when it first …
gregchan550 Oct 5, 2023
3c2b5e0
MobTask should be fully functional. All general mobs now use this task
gregchan550 Oct 5, 2023
ddd773d
restored forest game for push
gregchan550 Oct 5, 2023
451bb27
fixed failing tests
gregchan550 Oct 5, 2023
924d088
commiting to checkout
gregchan550 Oct 5, 2023
f3a208c
added javadocs to MobTasks and did more testing
gregchan550 Oct 5, 2023
bfd6b21
Removed error logs
MiniSoda17 Oct 6, 2023
97f0c7e
Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3
MiniSoda17 Oct 6, 2023
eef36b9
implemented slime spawn after shooting fireballs
gregchan550 Oct 6, 2023
29347b0
got rid of collider component for bosses
gregchan550 Oct 6, 2023
7c2c9b0
Merge branch 'main' into team-2-sound
The-AhmadAA Oct 8, 2023
aee3fd2
changed demon breath and land sound effects
gregchan550 Oct 9, 2023
f9f9790
added boundary checking for spawning demon slimes and added new sound…
gregchan550 Oct 9, 2023
d9d469b
Added general ice mob and removed error logs
MiniSoda17 Oct 9, 2023
746734c
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
MiniSoda17 Oct 9, 2023
d1be527
pushing
gregchan550 Oct 9, 2023
a2c09e1
Added coat animation controller
MiniSoda17 Oct 9, 2023
5a4c93e
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
MiniSoda17 Oct 9, 2023
520e5eb
fixed bug where mobs werent dying properly
gregchan550 Oct 9, 2023
02e8f17
removed print statements xd
gregchan550 Oct 9, 2023
8a75052
modified tower build to deselect after a tower placement
The-AhmadAA Oct 9, 2023
9ee068a
Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3
MiniSoda17 Oct 10, 2023
c517bee
Merge branch 'Team-1--Mobs-Enhancement' of https://github.com/UQcsse3…
MiniSoda17 Oct 10, 2023
c9ad35f
added shortcut key functionality for build menu
The-AhmadAA Oct 10, 2023
61672e8
Added coat mob to mob task
MiniSoda17 Oct 10, 2023
bc8c0e6
Fixed failing Mob Boss Junit Testing
MiniSoda17 Oct 10, 2023
1113a08
Fix split mobling on death event by changing event name and triggerin…
freshc0w Oct 10, 2023
070dec4
Fix SplitMoblings component tests
freshc0w Oct 10, 2023
5ebcfc0
Change scaled collider so dragon knight is able to get hit
freshc0w Oct 10, 2023
43539c5
Fix dodge dragon knight tasks not appearing in game
freshc0w Oct 10, 2023
0b9b8e1
Created PauseMenuButtonComponent, a consolidation of the pause menu e…
AlasdairS4698737 Oct 10, 2023
1df6c4b
Merge branch 'main' into team-2-ui-Alasdair
AlasdairS4698737 Oct 10, 2023
03c0905
updated buildInputComponent test
The-AhmadAA Oct 10, 2023
2d1d86a
Fix dodging component test case
freshc0w Oct 10, 2023
2426e41
Added Night Borne animations with splitting controller
MiniSoda17 Oct 11, 2023
1f73bd3
Added Arcane Archer animation with dodging component
MiniSoda17 Oct 11, 2023
75675be
Setting up for studio demo
MiniSoda17 Oct 11, 2023
16b587a
Fixed issue with income tower being invulnerable
ThivanW Oct 11, 2023
6215af1
fixed key shortcut bug that set towers to default
The-AhmadAA Oct 11, 2023
ec25e7e
updated buildInputComponent JUnit tests
The-AhmadAA Oct 11, 2023
02eacc0
Fix split moblings spawning out of bounds bug
freshc0w Oct 11, 2023
d1a27f4
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 11, 2023
cc84d3c
fixed FireworksTower projectile position and hitbox location
ThivanW Oct 11, 2023
d685387
fixed fireworks tower fire rate
ThivanW Oct 11, 2023
ae64a9d
Fixed pierce tower hitbox and projectile
ThivanW Oct 11, 2023
ccdf375
fixed ricochet hitbox and projectile position
ThivanW Oct 11, 2023
3839d77
changed position of bottom droid projectile so that it is within a lane
ThivanW Oct 11, 2023
6a21853
fixed weapon tower so it could die and projectile was in the lane
ThivanW Oct 11, 2023
ca6d3bb
Fixed projectile positions for all towers
ThivanW Oct 11, 2023
6039562
refactor: Code clean up in MobBossFactory.
JSLLW Oct 11, 2023
b4c66ad
Removed collisions with TNT tower
ThivanW Oct 11, 2023
ba147fa
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 11, 2023
286a953
Fixing Junit testing within split mobs and wavefactory
MiniSoda17 Oct 11, 2023
639b93c
Merge branch 'main' into Team-1-Mobs-Enhancement-variations
MiniSoda17 Oct 11, 2023
cd36c4e
Slowed down the fire rate of the towers
ThivanW Oct 12, 2023
7505bac
God rid of a useless state in StunTowerCombatTask
ThivanW Oct 12, 2023
e533bb4
When all the waves are completed, the screen transitions to the lose …
meganroxburgh Oct 12, 2023
7d2fe30
Pause menu buttons are now oriented from the center of the screen ins…
AlasdairS4698737 Oct 12, 2023
f48ed14
Merge pull request #245 from UQcsse3200/Team-1-Mobs-Enhancement-varia…
MiniSoda17 Oct 12, 2023
56e1267
removed try catch statements
The-AhmadAA Oct 12, 2023
18a7a6f
added multiple placement key functionality
The-AhmadAA Oct 12, 2023
85221d4
Merge branch 'main' into team-2-ahmad
The-AhmadAA Oct 12, 2023
20dee00
Merge branch 'main' into Team-4---Waves
BlairCannon97 Oct 13, 2023
eea4810
Merge pull request #246 from UQcsse3200/Team-7--Tower-Stat-Alterations
The-AhmadAA Oct 13, 2023
3e0ad2e
Merge pull request #248 from UQcsse3200/team-2-ahmad
The-AhmadAA Oct 13, 2023
81ef832
updated Window asset in glass Skin to remove background
The-AhmadAA Oct 13, 2023
de0dcbd
created effect component and added it to all factories
gregchan550 Oct 13, 2023
5d80561
added projectile effects component
gregchan550 Oct 13, 2023
033694d
Add various mobtypes with splitmoblings component
freshc0w Oct 13, 2023
06ccdf5
Added the CameraShaker which is responsible of triggering a shake scr…
Mohamad11Dab Oct 13, 2023
b926254
Created CameraShaker instances in MapService, One for Background Imag…
Mohamad11Dab Oct 13, 2023
8fdc526
Added CameraShakera functionalities to the MainGameScreen
Mohamad11Dab Oct 13, 2023
b89a3a5
Merge branch 'main' into Mohamad_Juice
Mohamad11Dab Oct 13, 2023
0d169fb
fixed comment
Mohamad11Dab Oct 13, 2023
3d08ddf
Merge pull request #249 from UQcsse3200/Team-4---Waves
BlairCannon97 Oct 13, 2023
67ecbce
Merge branch 'main' into Team-1-Mobs-Enhancement-variations
MiniSoda17 Oct 14, 2023
ad771f0
Fixed issue where mob count was not decreasing. Added in updateEnemyC…
meganroxburgh Oct 14, 2023
40f8661
Added fireWizard, splitRocky and necromanser to NPCFactory
cindyle1 Oct 14, 2023
300e240
Merge branch 'Team-1-Mobs-Enhancement-variations' of github.com:UQcss…
cindyle1 Oct 14, 2023
36d4413
Fixed merge conflict errors with split
cindyle1 Oct 14, 2023
2ec2a93
Changed the tables PauseMenuButtonComponent uses into a window, to ai…
AlasdairS4698737 Oct 14, 2023
1e2cead
ButtonFactory updated with current skin settings for universal use
The-AhmadAA Oct 14, 2023
e731e35
Updated PauseMenuFactoryTest junit test to match changed implementation
AlasdairS4698737 Oct 14, 2023
86be7b2
removed lose and quit buttons from main game
The-AhmadAA Oct 14, 2023
bd58023
updated button creation to use ButtonFactory (which is now configured…
The-AhmadAA Oct 14, 2023
fba3f30
updated glass Skin font
The-AhmadAA Oct 14, 2023
5b7dd16
updated to use ButtonFactory
The-AhmadAA Oct 14, 2023
ce40b81
fixed window positioning and sizing
The-AhmadAA Oct 14, 2023
77c9639
updated PauseMenuFactory and JUnit tests
The-AhmadAA Oct 14, 2023
f40a098
fixed merge conflicts
The-AhmadAA Oct 14, 2023
bbc58df
fixed JUnit test failures
The-AhmadAA Oct 14, 2023
32e8aac
Merge branch 'main' into team-2-ahmad
The-AhmadAA Oct 14, 2023
91bec80
removed box boy (again)
The-AhmadAA Oct 14, 2023
0e14689
revised the basic structure for timer button
shiv-0831 Oct 14, 2023
ae6a2df
Merging Mohamad_Juice to continue working on timer button
shiv-0831 Oct 14, 2023
3daaa4e
Merge branch 'main' into shivam-ui-elements
shiv-0831 Oct 14, 2023
b158bc5
updated font due to the previous font not having numbers
The-AhmadAA Oct 14, 2023
b616de7
Merge pull request #254 from UQcsse3200/team-2-ahmad
The-AhmadAA Oct 14, 2023
ba67a69
Merge branch 'team-2-ui' into team-2-ui-Alasdair
The-AhmadAA Oct 14, 2023
49551bc
Update PauseMenuButtonComponent.java
The-AhmadAA Oct 14, 2023
f843056
Merge pull request #255 from UQcsse3200/team-2-ui-Alasdair
The-AhmadAA Oct 14, 2023
06a6e19
Merge branch 'team-2-ui' into shivam-ui-elements
shiv-0831 Oct 14, 2023
de4b695
fixed the tile highlighting so that it only highlights once a tower h…
Mohamad11Dab Oct 14, 2023
45ba4a2
Merge branch 'team-2-ui' into Mohamad_Juice
Mohamad11Dab Oct 14, 2023
66719bf
Added bow and arrow sound
MiniSoda17 Oct 14, 2023
70685f9
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 14, 2023
27677df
Alter dodging functionality so other tasks can be run simultaneously
freshc0w Oct 14, 2023
1c3a72a
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
freshc0w Oct 14, 2023
862a287
Finalised the working of timer button
shiv-0831 Oct 14, 2023
e0b39e3
Merge pull request #256 from UQcsse3200/Mohamad_Juice
The-AhmadAA Oct 14, 2023
8e4bc89
Merge branch 'team-2-ui' into shivam-ui-elements
The-AhmadAA Oct 14, 2023
9952abc
Merge pull request #257 from UQcsse3200/shivam-ui-elements
The-AhmadAA Oct 14, 2023
364bfba
Fixed highlighting problem where placing a tower won't return the til…
Mohamad11Dab Oct 14, 2023
43649e1
Merge branch 'team-2-ui' into Mohamad_Juice
Mohamad11Dab Oct 14, 2023
919858f
Added Junit tests
Mohamad11Dab Oct 14, 2023
f4b9a7c
Added new fire mobs to waves
MiniSoda17 Oct 14, 2023
4589bac
condensed main game screen classes, updated fonts
The-AhmadAA Oct 14, 2023
1ea50bd
removed unused variables
The-AhmadAA Oct 14, 2023
ad3f8c3
Merge branch 'team-2-ui' of github.com:UQcsse3200/2023-studio-3 into …
The-AhmadAA Oct 14, 2023
58e8378
condensed Pause classes into one, updated button layout and fadeout
The-AhmadAA Oct 14, 2023
70da0f5
added currency warning flash for insufficient funds
The-AhmadAA Oct 14, 2023
264c5d6
Fix moblings boundaries
freshc0w Oct 15, 2023
7b0d4c5
Merge branch 'Team-1-Mobs-Enhancement-variations' of https://github.c…
MiniSoda17 Oct 15, 2023
59efe18
Fixed difficulty back to original values
meganroxburgh Oct 15, 2023
b5e2cc3
updated font by popular demand, added in-game tooltips
The-AhmadAA Oct 15, 2023
dc23cca
Merge pull request #258 from UQcsse3200/team-2-ui
The-AhmadAA Oct 15, 2023
7080221
Altered Tower Stats and fixed a bug with the towers' health
ThivanW Oct 15, 2023
27fe962
Merge branch 'main' into Team-7--Tower-Stat-Alterations
ThivanW Oct 15, 2023
5ce75c1
changed INCOME tower id to 6 in towertype.java to ensure unqiuness
ThivanW Oct 15, 2023
07ca336
Changed the income amount from 50 to 30
ThivanW Oct 15, 2023
5a4a62d
Merge pull request #263 from UQcsse3200/Team-7--Tower-Stat-Alterations
The-AhmadAA Oct 15, 2023
2899c21
Merge branch 'main' into Team4-LevelCompleted-Megan
meganroxburgh Oct 15, 2023
826800d
Fixed a bug where a winning condition was triggered after a lose cond…
BlairCannon97 Oct 15, 2023
96d3ac9
updated design for waves, removed tests, enemies not counting down error
samsully Oct 15, 2023
34335ce
Merge branch 'Team4-LevelCompleted-Megan' into feature/Team4/wave-adj…
samsully Oct 15, 2023
3f2e8b7
Cleared some code smells in WaveFactory
BlairCannon97 Oct 15, 2023
2978675
calculated appropriate boss health
samsully Oct 15, 2023
6a69021
clean up
samsully Oct 15, 2023
25ba43f
clean up
samsully Oct 15, 2023
ba6b98d
added a tracker of total mobs for enemy to to wave service
samsully Oct 15, 2023
4d22c14
Cleaned up merge conflicts
BlairCannon97 Oct 15, 2023
a46a0ea
Fixed up an additional conflict
BlairCannon97 Oct 15, 2023
f03a863
Merge pull request #265 from UQcsse3200/feature/Team4/wave-adjustments
The-AhmadAA Oct 15, 2023
aedd08a
Merge branch 'main' into Team-1-Mobs-Enhancement-variations
MiniSoda17 Oct 15, 2023
a35c44d
Fixing Junit testing for mobs
MiniSoda17 Oct 15, 2023
3143751
Added new mobs to new wave structure
MiniSoda17 Oct 15, 2023
23cf562
Removing accidental error logs previously added
MiniSoda17 Oct 15, 2023
2a4e2b4
refactor: Removed some code smells.
JSLLW Oct 15, 2023
1856c3c
refactor: Resolved code smells.
JSLLW Oct 15, 2023
b6a7afe
test: Resolved failing tests in EnemyTest.
JSLLW Oct 15, 2023
5d41139
Merge pull request #266 from UQcsse3200/Team-1-Mobs-Enhancement-varia…
The-AhmadAA Oct 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
created new mob melee and ranged tasks as well as enum for general mo…
…b types
  • Loading branch information
gregchan550 committed Oct 5, 2023
commit 19d1eaa0360e5f7cd7644f96d2731511071c4050
Original file line number Diff line number Diff line change
@@ -1,4 +1,48 @@
package com.csse3200.game.components.tasks.MobTask;

public class MobMeleeTask {
import com.badlogic.gdx.utils.Timer;
import com.csse3200.game.ai.tasks.DefaultTask;
import com.csse3200.game.ai.tasks.PriorityTask;
import com.csse3200.game.components.tasks.bosstask.PatrickTask;
import com.csse3200.game.physics.components.PhysicsMovementComponent;
import com.csse3200.game.rendering.AnimationRenderComponent;

public class MobMeleeTask extends DefaultTask implements PriorityTask {

// Constants
private static final int PRIORITY = 3;
MobType mobType;
State state;
private enum State {
RUN, ATTACK, DEATH, DEFAULT
}

public MobMeleeTask(MobType mobType) {
this.mobType = mobType;
}

@Override
public void start() {

}

@Override
public void update() {

}

private void animate() {
switch (mobType) {
case SKELETON -> {
switch (state) {

}
}
}
}

@Override
public int getPriority() {
return PRIORITY;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.csse3200.game.components.tasks.MobTask;

public enum MobType {
SKELETON,
WIZARD,
WATER_QUEEN,
WATER_SLIME,
FIRE_WORM,
DRAGON_KNIGHT
}