Compare commits
No commits in common. "2716d9172fe7c8e349f5c003d2e859287aa253cf" and "d9ed7bd50123c43327b7d5c4de55dbb6def6bc26" have entirely different histories.
2716d9172f
...
d9ed7bd501
13
src/main.rs
13
src/main.rs
@ -248,8 +248,8 @@ async fn main() -> std::io::Result<()> {
|
|||||||
.await
|
.await
|
||||||
.add_event_system(IrcCommand::RPL_ENDOFWHO, endofwho)
|
.add_event_system(IrcCommand::RPL_ENDOFWHO, endofwho)
|
||||||
.await
|
.await
|
||||||
//.add_system("f", new_fight)
|
.add_system("f", new_fight)
|
||||||
//.await
|
.await
|
||||||
.add_system("royalrumble", royal_rumble)
|
.add_system("royalrumble", royal_rumble)
|
||||||
.await
|
.await
|
||||||
.add_system("challenge", challenge)
|
.add_system("challenge", challenge)
|
||||||
@ -631,9 +631,9 @@ fn show_help() -> impl IntoResponse {
|
|||||||
(
|
(
|
||||||
false,
|
false,
|
||||||
vec![
|
vec![
|
||||||
//",f <nick> <nick> | duel fight",
|
",f <nick> <nick> | duel fight",
|
||||||
//",f <nick> ... vs <nick> ... | team battle",
|
",f <nick> ... vs <nick> ... | team battle",
|
||||||
//",f <nick> <nick> <nick> ... | free for all",
|
",f <nick> <nick> <nick> ... | free for all",
|
||||||
",royalrumble | chan wide free for all",
|
",royalrumble | chan wide free for all",
|
||||||
",challenge <nick> | challenge someone to a deathmatch",
|
",challenge <nick> | challenge someone to a deathmatch",
|
||||||
",accept | accept a challenge",
|
",accept | accept a challenge",
|
||||||
@ -773,9 +773,6 @@ fn challenge(
|
|||||||
if let Err(e) = check_idle(&fight.status) {
|
if let Err(e) = check_idle(&fight.status) {
|
||||||
return Err(e);
|
return Err(e);
|
||||||
}
|
}
|
||||||
if arguments[0] == prefix.nick {
|
|
||||||
return Err("you can't challenge yourself nigga.".to_owned())
|
|
||||||
}
|
|
||||||
|
|
||||||
fight.status = FightStatus::WaitingWho;
|
fight.status = FightStatus::WaitingWho;
|
||||||
fight.channel = channel.to_owned();
|
fight.channel = channel.to_owned();
|
||||||
|
Loading…
Reference in New Issue
Block a user