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

Fight Command #2719

Draft
wants to merge 66 commits into
base: draftbot-v5
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
a79cbc8
moved interface & enum to type folder #2726
BastLast Jan 19, 2025
bce1299
first fight command commit #2276
BastLast Jan 7, 2025
4e9ae7b
Draft of core/front of fight command
Ntalcme Jan 12, 2025
f392bbb
Smalls improvements
Ntalcme Jan 13, 2025
eab050e
fix typo #2273
Ntalcme Jan 13, 2025
97fe7f2
updated blocking constant + add romain stupid but funny suggestion #2273
BastLast Jan 13, 2025
d0b0abe
remove solofight test command #2276
BastLast Jan 13, 2025
407b56b
split glorypoints in attack & defense #2276
BastLast Jan 13, 2025
86eba1d
first draft findOpponent function
BastLast Jan 13, 2025
27deea0
matchmaking first version #2276
BastLast Jan 14, 2025
1e6b7d0
eslint fix #2273
Ntalcme Jan 14, 2025
e145490
matchmaking grouped queries #2276
BastLast Jan 15, 2025
032225b
improvements matchmaking #2276
BastLast Jan 16, 2025
4775f53
final imrovements matchmaking #2276
BastLast Jan 16, 2025
1ed1a32
last matchmaking commit #2276
BastLast Jan 16, 2025
0e1ef22
wip start fight & end fight callback #2276
BastLast Jan 16, 2025
013513d
small fixes fight command WIP #2276
BastLast Jan 16, 2025
423790a
more fixes fight command WIP #2276
BastLast Jan 16, 2025
618a00e
WIP fight command #2276
BastLast Jan 19, 2025
8d4f02c
various fixes #2276
BastLast Jan 19, 2025
56a7a8e
fight end packet wip #2276
BastLast Jan 19, 2025
7e10b19
wip fight command intro #2276
BastLast Jan 25, 2025
a47c019
fightcommand intro first version #2276
BastLast Jan 26, 2025
dc070eb
fix rebase
BastLast Jan 26, 2025
20bc364
display error for packet crashes
BastLast Jan 26, 2025
3dfe0f2
various fixes for glory and database migration
BastLast Jan 26, 2025
f81cb2a
small eslint fixes
BastLast Jan 26, 2025
0b20af1
small fixes
BastLast Jan 26, 2025
048c00b
fixes fight command #2276
BastLast Jan 26, 2025
91f9e2b
packet do not support map, replaced with array + fixes #2276
BastLast Jan 26, 2025
be07520
fix issue where oponent is itself
BastLast Jan 29, 2025
7ea406a
deleted weather mechanic
BastLast Jan 30, 2025
1fec250
small fixes commentaires
BastLast Jan 31, 2025
603b620
Wip fight update status #2276
BastLast Feb 8, 2025
fdfc7e5
Wip first version of draftbotCachedMessage
BastLast Feb 9, 2025
628890c
Update status packet core + packet
BastLast Feb 9, 2025
6322ca1
Add embed for fight status #2276
BastLast Feb 9, 2025
a5df6ea
Moved fight handlers to dedicated handler file #2276
BastLast Feb 9, 2025
4c1c4da
small fix icons
BastLast Feb 9, 2025
ec1a87c
tryied to work with draftbot cached messages ? #2276
BastLast Feb 9, 2025
46e0ceb
tried to work more with draftbot cached messages ? #2276
BastLast Feb 9, 2025
e547918
upgrade of DCMs
romain22222 Feb 12, 2025
6ff6d8b
fix PHs & DCMs avec R22222 QALAALC
BastLast Feb 12, 2025
40f148c
workarround keycloak crash on mac os 15
BastLast Feb 13, 2025
445e257
small fixes fightSummary
BastLast Feb 13, 2025
0d4d185
wip add history
BastLast Feb 13, 2025
269a9ad
finished v1 fighthistory item #2276
BastLast Feb 23, 2025
45f43bf
wip history front #2276
BastLast Feb 23, 2025
12704a3
add backend support for alteration in fight history #2276
BastLast Feb 25, 2025
600882a
removed emojis from fightAction jsons #2276
BastLast Feb 25, 2025
54ba7ba
alteration display of status #2276
BastLast Feb 25, 2025
e191653
attack display status #2276
Ntalcme Feb 25, 2025
d2b4f33
WIP Draftbot cached message display #2276
BastLast Feb 26, 2025
d6e1925
Finished v1 of history display
BastLast Feb 26, 2025
fa90f7d
small fixes #2276
BastLast Feb 26, 2025
9747e19
update fightHistory when too long #2276
BastLast Feb 27, 2025
4711912
v1 fight action choose collector #2276
BastLast Feb 27, 2025
0732dda
small fixes history and action choose #2276
BastLast Feb 27, 2025
e663814
wip ai player fighter #2276
BastLast Feb 27, 2025
a4e49eb
small fixes fight history #2276
BastLast Feb 27, 2025
b3f3275
fix response not working #2276
romain22222 Feb 28, 2025
e3ac979
fix history bugs + small display issues #2276
BastLast Feb 28, 2025
49526ff
fix out of breath issues and alterations #2276
BastLast Feb 28, 2025
6e12a54
fix damage being displayed for alterations #2276
BastLast Feb 28, 2025
e99721e
fix resting display issues #2276
BastLast Mar 1, 2025
f003a2c
fight points -> energy #2777
BastLast Mar 1, 2025
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
3 changes: 1 addition & 2 deletions Core/resources/fightActions/benediction.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"emote": "\uD83D\uDC7C",
"breath": 8,
"missionVariant": 0,
"type": "stats",
"type": "magic",
"isAlteration": false
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/boomerangAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDE83",
"breath": 9,
"missionVariant": 30,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/boulderTossAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🪨",
"breath": 6,
"missionVariant": -1,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/breathTakingAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDCA8",
"breath": 1,
"missionVariant": 37,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/burned.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDD75",
"breath": 0,
"missionVariant": 36,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/canonAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDD2B",
"breath": 6,
"missionVariant": 1,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/chargeChargingAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDF2",
"breath": 7,
"missionVariant": 2,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/chargeClubSmashAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🏏",
"breath": 9,
"missionVariant": -1,
"type": "charge"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/chargeUltimateAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "☄️",
"breath": 10,
"missionVariant": 3,
"type": "charge"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/chargingAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDF2",
"breath": 0,
"missionVariant": 4,
"type": "charge"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/clubSmashAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🏏",
"breath": 0,
"missionVariant": -1,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/concentrated.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDE0",
"breath": 0,
"missionVariant": 5,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/concentration.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83C\uDFAF",
"breath": 1,
"missionVariant": 6,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/counterAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDD4A",
"breath": 5,
"missionVariant": 33,
"type": "other"
Expand Down
3 changes: 1 addition & 2 deletions Core/resources/fightActions/cursed.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"emote": "\uD83D\uDC7B",
"breath": 0,
"missionVariant": 38,
"type": "alteration"
"type": "magic"
}
2 changes: 1 addition & 1 deletion Core/resources/fightActions/cursedAttack.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"emote": "\uD83D\uDE08",
"breath": 6,
"missionVariant": 39,
"type": "other"
"type": "magic"
}
2 changes: 1 addition & 1 deletion Core/resources/fightActions/darkAttack.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"emote": "✴️",
"breath": 8,
"missionVariant": 7,
"type": "physical"
"type": "magic"
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/defenseBuff.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDD8\u200D♂️",
"breath": 1,
"missionVariant": 9,
"type": "stats"
Expand Down
3 changes: 1 addition & 2 deletions Core/resources/fightActions/divineAttack.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"emote": "\uD83D\uDE4F",
"breath": 9,
"missionVariant": 10,
"type": "distance"
"type": "magic"
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/energeticAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "⚡",
"breath": 8,
"missionVariant": 11,
"type": "physical"
Expand Down
3 changes: 1 addition & 2 deletions Core/resources/fightActions/eruptionAttack.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"emote": "🌋",
"breath": 8,
"missionVariant": -1,
"type": "weather"
"type": "distance"
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/familyMealAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🍽️",
"breath": 20,
"missionVariant": -1,
"type": "physical"
Expand Down
3 changes: 1 addition & 2 deletions Core/resources/fightActions/fireAttack.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"emote": "\uD83D\uDD25",
"breath": 8,
"missionVariant": 17,
"type": "distance"
"type": "magic"
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/frozen.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🥶",
"breath": 0,
"missionVariant": -1,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/full.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "😴",
"breath": 0,
"missionVariant": -1,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/grabAndThrowAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🥋",
"breath": 6,
"missionVariant": -1,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/guildAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🏟️",
"breath": 0,
"missionVariant": -1,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/heatDrainAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🌡",
"breath": 7,
"missionVariant": -1,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/heavyAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDD28",
"breath": 7,
"missionVariant": 12,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/intenseAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDE24",
"breath": 4,
"missionVariant": 13,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/lavaWaveAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "♨️",
"breath": 15,
"missionVariant": -1,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/magmaBathAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🛁",
"breath": 2,
"missionVariant": -1,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/mimicAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🖼️",
"breath": 0,
"missionVariant": -1,
"type": "other"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/monstrousCopyAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "📝",
"breath": 0,
"missionVariant": -1,
"type": "other"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/none.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDEAB",
"breath": 0,
"missionVariant": 14,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/outOfBreath.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDE2E\u200D\uD83D\uDCA8",
"breath": 0,
"missionVariant": 34,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/outrage.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "💢",
"breath": 0,
"missionVariant": -1,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/outrageAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "😡",
"breath": 1,
"missionVariant": -1,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/paralyzed.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDEB7",
"breath": 0,
"missionVariant": 32,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/petrificationAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🗿",
"breath": 8,
"missionVariant": -1,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/petrified.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🗿",
"breath": 0,
"missionVariant": -1,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/piercingAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDEA1",
"breath": 5,
"missionVariant": 15,
"type": "physical"
Expand Down
3 changes: 1 addition & 2 deletions Core/resources/fightActions/poisoned.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"emote": "\uD83E\uDD22",
"breath": 0,
"missionVariant": 35,
"type": "alteration"
"type": "magic"
}
1 change: 0 additions & 1 deletion Core/resources/fightActions/poisonousAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDEA",
"breath": 3,
"missionVariant": 8,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/powerfulAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDE93",
"breath": 6,
"missionVariant": 18,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/protected.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDC9E",
"breath": 0,
"missionVariant": 19,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/protection.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDE45\u200D♂️",
"breath": 1,
"missionVariant": 20,
"type": "other"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/quickAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDDE1️",
"breath": 3,
"missionVariant": 21,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/rageExplosion.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🤬",
"breath": 0,
"missionVariant": -1,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/ramAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDC0F",
"breath": 4,
"missionVariant": 22,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/resting.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDECF️",
"breath": 0,
"missionVariant": 23,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/roarAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🔊️",
"breath": 4,
"missionVariant": -1,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/rockShieldAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🛡️",
"breath": 2,
"missionVariant": -1,
"type": "status"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/sabotageAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDEE0️",
"breath": 2,
"missionVariant": 24,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/shieldAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDEE1️",
"breath": 5,
"missionVariant": 25,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/simpleAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "⚔️",
"breath": 2,
"missionVariant": 26,
"type": "physical"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/slamAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🦶",
"breath": 6,
"missionVariant": -1,
"type": "distance"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/slowed.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83E\uDDA5",
"breath": 0,
"missionVariant": 27,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/stealth.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "😶‍🌫️",
"breath": 6,
"missionVariant": -1,
"type": "stats"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/stoneSkinAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🧱",
"breath": 3,
"missionVariant": -1,
"type": "status"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/stunned.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "\uD83D\uDE16",
"breath": 0,
"missionVariant": 28,
"type": "alteration"
Expand Down
1 change: 0 additions & 1 deletion Core/resources/fightActions/summonAttack.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"emote": "🧑‍🤝‍🧑",
"breath": 10,
"missionVariant": -1,
"type": "physical"
Expand Down
Loading
Loading