Skip to content

[PR] tbrpg => main #20

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

Merged
YetAnotherMechanicusEnjoyer merged 4 commits into from
Aug 31, 2025
Merged

[PR] tbrpg => main #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3371fb
[ADD] discord/src/events/discord/interaction_create/accept_duel.rs
YetAnotherMechanicusEnjoyer Aug 31, 2025
d1a85e1
[ADD] discord/src/events/discord/interaction_create/attack_action.rs
YetAnotherMechanicusEnjoyer Aug 31, 2025
682e8dd
[ADD] discord/src/events/discord/interaction_create/cancel_duel.rs
YetAnotherMechanicusEnjoyer Aug 31, 2025
14b6339
[UPDATE] interaction_create.rs
YetAnotherMechanicusEnjoyer Aug 31, 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
202 changes: 10 additions & 192 deletions discord/src/events/discord/interaction_create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
use poise::serenity_prelude::{
self as serenity, ButtonStyle, Colour, CreateActionRow, CreateButton, CreateEmbed,
CreateInteractionResponse, CreateInteractionResponseMessage, EmojiId, Interaction,
self as serenity, ButtonStyle, CreateActionRow, CreateButton, EmojiId, Interaction,
ReactionType, User,
};

use crate::{Data, Error};

mod accept_duel;
mod attack_action;
mod cancel_duel;

fn create_combat_ui(turn_user: &User) -> Vec<CreateActionRow> {
let attack_button = CreateButton::new("attack_action")
.style(ButtonStyle::Primary)
Expand Down Expand Up @@ -35,201 +38,16 @@ pub async fn interaction_create(
_data: &Data,
) -> Result<(), Error> {
if let serenity::Interaction::Component(component) = interaction {
let mut data = framework.user_data().await.active_duels.lock().await;
let data = framework.user_data().await.active_duels.lock().await;

let game_state_option = data.get(&component.message.id).cloned();

if let Some(mut game_state) = game_state_option {
if let Some(game_state) = game_state_option {
match component.data.custom_id.as_str() {
"accept_duel" => {
if component.user.id != game_state.player2_id {
component
.create_response(
&ctx,
CreateInteractionResponse::Message(
CreateInteractionResponseMessage::new()
.content("This duel challenge is not for you!")
.ephemeral(true),
),
)
.await
.ok();
return Ok(());
}

let p1_user = game_state.player1_id.to_user(&ctx).await.unwrap();
let p2_user = game_state.player2_id.to_user(&ctx).await.unwrap();
let new_embed = CreateEmbed::new()
.title("Duel Started!")
.description(format!(
"{p1_user} vs {p2_user}\n\nIt is {p1_user}'s turn to attack!",
))
.field(
format!("{}`s HP", p1_user.name),
game_state.player1_hp.to_string(),
true,
)
.field(
format!("{}`s HP", p2_user.name),
game_state.player2_hp.to_string(),
true,
);

let components = create_combat_ui(&p1_user);

component
.create_response(
&ctx,
CreateInteractionResponse::UpdateMessage(
CreateInteractionResponseMessage::new()
.embeds(vec![new_embed])
.components(components),
),
)
.await
.ok();
}
"cancel_duel" => {
if component.user.id != game_state.player1_id
&& component.user.id != game_state.player2_id
{
component
.create_response(
&ctx,
CreateInteractionResponse::Message(
CreateInteractionResponseMessage::new()
.content("This duel challenge is not for you!")
.ephemeral(true),
),
)
.await
.ok();
return Ok(());
}

data.remove(&component.message.id);
let new_embed = CreateEmbed::new()
.title("Duel Cancelled")
.description("The duel has been cancelled.");

component
.create_response(
&ctx,
CreateInteractionResponse::UpdateMessage(
CreateInteractionResponseMessage::new()
.embeds(vec![new_embed])
.components(vec![]),
),
)
.await
.ok();
}
"accept_duel" => accept_duel::accept_duel(ctx, component, game_state).await?,
"cancel_duel" => cancel_duel::cancel_duel(ctx, data, component, game_state).await?,
"attack_action" => {
if component.user.id != game_state.turn {
component
.create_response(
&ctx,
CreateInteractionResponse::Message(
CreateInteractionResponseMessage::new()
.content("It's not your turn!")
.ephemeral(true),
),
)
.await
.ok();
return Ok(());
}

let (_attacker_id, defender_id) = if component.user.id == game_state.player1_id
{
(game_state.player1_id, game_state.player2_id)
} else {
(game_state.player2_id, game_state.player1_id)
};

let damage = 10;

if defender_id == game_state.player1_id {
game_state.player1_hp = game_state.player1_hp.saturating_sub(damage);
} else {
game_state.player2_hp = game_state.player2_hp.saturating_sub(damage);
}

let winner = if game_state.player1_hp == 0 {
Some(game_state.player2_id)
} else if game_state.player2_hp == 0 {
Some(game_state.player1_id)
} else {
None
};

let next_turn = if game_state.turn == game_state.player1_id {
game_state.player2_id
} else {
game_state.player1_id
};
game_state.turn = next_turn;

let p1_user = game_state.player1_id.to_user(&ctx).await.unwrap();
let p2_user = game_state.player2_id.to_user(&ctx).await.unwrap();

let description = if let Some(winner_id) = winner {
let winner_user = winner_id.to_user(&ctx).await.unwrap();
format!(
"{} defeated {}!",
winner_user,
if winner_id == p1_user.id {
p2_user.clone()
} else {
p1_user.clone()
}
)
} else {
format!(
"{} attacked {} for {} damage! It is now {}'s turn.",
component.user,
next_turn.to_user(&ctx).await.unwrap(),
damage,
next_turn.to_user(&ctx).await.unwrap()
)
};

let new_embed = CreateEmbed::new()
.title("Duel in Progress")
.description(description)
.field(
format!("{}`s HP", p1_user.name),
game_state.player1_hp.to_string(),
true,
)
.field(
format!("{}`s HP", p2_user.name),
game_state.player2_hp.to_string(),
true,
)
.color(Colour::from_rgb(0, 100, 255));

let components = if winner.is_some() {
data.remove(&component.message.id);
vec![]
} else {
let next_user = next_turn.to_user(&ctx).await.unwrap();
create_combat_ui(&next_user)
};

data.insert(component.message.id, game_state);

component
.create_response(
&ctx,
CreateInteractionResponse::UpdateMessage(
CreateInteractionResponseMessage::new()
.embeds(vec![new_embed])
.components(components),
),
)
.await
.ok();
attack_action::attack_action(ctx, data, component, game_state).await?
}
_ => {}
}
Expand Down
61 changes: 61 additions & 0 deletions discord/src/events/discord/interaction_create/accept_duel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
use poise::serenity_prelude::{
self as serenity, ComponentInteraction, CreateEmbed, CreateInteractionResponse,
CreateInteractionResponseMessage,
};

use super::create_combat_ui;
use crate::{Error, GameState};

pub async fn accept_duel(
ctx: &serenity::Context,
component: ComponentInteraction,
game_state: GameState,
) -> Result<(), Error> {
if component.user.id != game_state.player2_id {
component
.create_response(
&ctx,
CreateInteractionResponse::Message(
CreateInteractionResponseMessage::new()
.content("This duel challenge is not for you!")
.ephemeral(true),
),
)
.await
.ok();
return Ok(());
}

let p1_user = game_state.player1_id.to_user(&ctx).await.unwrap();
let p2_user = game_state.player2_id.to_user(&ctx).await.unwrap();
let new_embed = CreateEmbed::new()
.title("Duel Started!")
.description(format!(
"{p1_user} vs {p2_user}\n\nIt is {p1_user}'s turn to attack!",
))
.field(
format!("{}`s HP", p1_user.name),
game_state.player1_hp.to_string(),
true,
)
.field(
format!("{}`s HP", p2_user.name),
game_state.player2_hp.to_string(),
true,
);

let components = create_combat_ui(&p1_user);

component
.create_response(
&ctx,
CreateInteractionResponse::UpdateMessage(
CreateInteractionResponseMessage::new()
.embeds(vec![new_embed])
.components(components),
),
)
.await
.ok();
Ok(())
}
Loading