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

Aubri test raiding #14

Merged
merged 48 commits into from
Apr 11, 2023
Merged

Aubri test raiding #14

merged 48 commits into from
Apr 11, 2023

Conversation

AubriTheHuman
Copy link
Collaborator

(: ✨✨✨

AubriTheHuman and others added 30 commits April 2, 2023 21:50
@AubriTheHuman
Raid Phase Framework
2cb609a
@AubriTheHuman
WarData separation pass 1 (INCOMPLETE)
388c600
@AubriTheHuman
Redo File Search and War ID
471a03b
@NinjaMandalorian @AubriTheHuman
Removed several Siege features not needed for Raids
dcad961 
(cherry picked from commit 81e0ca4)
@AubriTheHuman
Fix cherrypicked raid file
2716487
@AubriTheHuman
UUID used over integer, no generation
d1a46ba
@AubriTheHuman
Raid Commands Creation
e65bae6
@AubriTheHuman
Raid Death behavior
d6e5518
@AubriTheHuman
Raid leave and tp on death
aca1a68
@AubriTheHuman
Prevent Teleport commands during raid
8c413ba
@AubriTheHuman
Move damage gear to Helper
4a4bcc0
@AubriTheHuman
"Tag" raider on death
f260e28
@AubriTheHuman
Revert ""Tag" raider on death"
dbc7001 
This reverts commit f260e28.
@AubriTheHuman
Payouts pass 1
a81928e
@AubriTheHuman
Big issue
a0d44d1
@AubriTheHuman
Command changes & greater tp restrictions
c658158
@AubriTheHuman
commit before the reckoning
d754c5e
@NinjaMandalorian @AubriTheHuman
Cleaning and other stuff
c87e1e9 
(cherry picked from commit 6b5000e)

# Conflicts:
#	src/main/java/me/ShermansWorld/AlathraWar/Raid.java
#	src/main/java/me/ShermansWorld/AlathraWar/commands/RaidTabCompletion.java
#	src/main/java/me/ShermansWorld/AlathraWar/commands/WarCommands.java
#	src/main/java/me/ShermansWorld/AlathraWar/data/RaidData.java
#	src/main/java/me/ShermansWorld/AlathraWar/listeners/JoinListener.java
@NinjaMandalorian @AubriTheHuman
Added DataManager.java
55f96c4 
(cherry picked from commit 9d61967)
@NinjaMandalorian @AubriTheHuman
Reworked War Class
ae39252 
- Considers towns and nations instead of specific players
- Has surrendered list

(cherry picked from commit 7757e0f)
@NinjaMandalorian @AubriTheHuman
Update War.java
c16d3ee 
(cherry picked from commit 50738bb)
@NinjaMandalorian @AubriTheHuman
Updated WarData.java
2158233 
- Utilises DataManager.java, no direct file interaction.

(cherry picked from commit 4bf91d5)
@NinjaMandalorian @AubriTheHuman
Moved wars arrayList to WarData
8d8710c 
(cherry picked from commit 7f20a55)
@NinjaMandalorian @AubriTheHuman
Fixed setWars()
dadf7aa 
(cherry picked from commit 214ff29)
@NinjaMandalorian @AubriTheHuman
Added create, join and logging joins.
c46eb60 
(cherry picked from commit 4ed964e)
@NinjaMandalorian @AubriTheHuman
Implemented WarTabCompletion with new WarData.
297cb0a 
(cherry picked from commit c902f9e)
@NinjaMandalorian @AubriTheHuman
Added toString() for War class
f2d51bd 
(cherry picked from commit 3e99ec5)
@NinjaMandalorian @AubriTheHuman
Added console war command method.
91742bb 
(cherry picked from commit 8cdae79)
@NinjaMandalorian @AubriTheHuman
Added return to catching writer failure.
9e60eff 
(cherry picked from commit 861868e)
@NinjaMandalorian @AubriTheHuman
Several WarData changes
6d9e1ef 
- Fixed sides
- Reorganised fields
- Removed unused plugin field
- Added addWar()

(cherry picked from commit 9c62de5)
NinjaMandalorian and others added 18 commits April 9, 2023 21:12
@NinjaMandalorian @AubriTheHuman
War side checks
2e4285a 
(cherry picked from commit 26cd6d0)
@NinjaMandalorian @AubriTheHuman
War data
790ea96 
- Added deleted
- Fixed join
- Added surrender

(cherry picked from commit ef070be)
@NinjaMandalorian @AubriTheHuman
War info subcommand
a16b590 
(cherry picked from commit 3420e8c)
@NinjaMandalorian @AubriTheHuman
Reorganised WarCommands
25375ae 
- Each subcommand is split into a method.

(cherry picked from commit 5bcbb9d)
@NinjaMandalorian @AubriTheHuman
Removed .ymls
61e71cd 
(cherry picked from commit 48915e7)
@NinjaMandalorian @AubriTheHuman
Added siege capabilities
119a2f5 
(cherry picked from commit 65dc1c9)
@NinjaMandalorian @AubriTheHuman
Cleaning and other stuff
840ea44 
(cherry picked from commit 6b5000e)
@AubriTheHuman
Fixups after the reckoning (INCOMPLETE)
7eb677f
@AubriTheHuman
Repair Raid from data changes, commands, and data switch
b60a551
@AubriTheHuman
Further cleanup
2dec08d
@AubriTheHuman
Townblock Looting
77c458f
@AubriTheHuman
Saving looted chunks in data
4ce603f
@AubriTheHuman
payout update
1090876
@AubriTheHuman
raid cooldown
65e1624
@AubriTheHuman
raid resume? i think this works
575c002
@AubriTheHuman
Cleanup
9c80c5d
@AubriTheHuman
✨✨✨Finalize for Merge!!!
bbe5731
@NinjaMandalorian
Merge branch 'main' into aubri-test-raiding
7e13f99
@NinjaMandalorian NinjaMandalorian merged commit 6f171d4 into main Apr 11, 2023
@NinjaMandalorian NinjaMandalorian deleted the aubri-test-raiding branch April 11, 2023 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AubriTheHuman @NinjaMandalorian