-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from urbanterror/master
merge community changes
- Loading branch information
Showing
74 changed files
with
7,876 additions
and
1,560 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| name: Build and deploy | ||
| on: [push] | ||
| jobs: | ||
| Build-and-deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| java-version: '11' | ||
| distribution: 'adopt' | ||
| - name: Build with Gradle | ||
| run: ./gradlew build | ||
| - name: Deploy jar to server | ||
| uses: garygrossgarten/github-action-scp@release | ||
| with: | ||
| local: PickupBot.jar | ||
| remote: /home/pug/PickupDiscord/PickupBot.jar | ||
| host: ${{ secrets.HOST }} | ||
| username: ${{ secrets.SSH_USER }} | ||
| password: ${{ secrets.SSH_PASSWORD }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,73 @@ | ||
| # PickupDiscord | ||
| [](https://discord.gg/An8hxdM) | ||
|
|
||
| # UrT-Pickup | ||
| [](https://discord.gg/An8hxdM) | ||
|
|
||
|
|
||
| ## About | ||
| This is a network of Urban Terror servers associating players through [Discord](https://discord.gg/An8hxdM) thanks to a simple java bot. | ||
|
|
||
| From this discord server you can: | ||
| - play competitive matchmaking in any team-based game type, | ||
| - challenge other users in individual modes such as GunGame, LMS or KnockOut matches :resurgence:, | ||
| - improve your skills with the SkeetShoot and AimTraining modes both with record tracking :resurgence:, | ||
| - request a game server for a few hours for your personal use. | ||
|
|
||
|
|
||
| ## Commands | ||
|
|
||
| ### User Commands | ||
| - !add <gametype> | ||
| - !remove <gametype> | ||
| - !maps displays the map list for each gametype. | ||
| - !map <gametype> <mapname> | ||
| - !status to get information on the queues. | ||
| - !help <command> | ||
| - !surrender to abandon your match. | ||
| - !live sends info on the live matches. | ||
| - !pick <1/2> | ||
| - !votes to get the current votes. | ||
| - !register <urtauth> | ||
| - !country <COUNTRY CODE> See:` <https://datahub.io/core/country-list/r/0.html> | ||
| - !elo </@DiscordUser|urtauth/> | ||
| - !stats </@DiscordUser|urtauth/> | ||
| - !top10 displays the top 10 players | ||
| - !topcountries ordered by average ELO | ||
| - !topwin: players with the best win ratio | ||
| - !topkdr: players with the best KDR | ||
| - !match <id> | ||
| - !last </@DiscordUser|urtauth/> | ||
|
|
||
|
|
||
| ### Admin Commands | ||
|
|
||
| - !lock to prevent commands from PUBLIC channel. | ||
| - !unlock | ||
| - !reset <all/cur/type/id> | ||
| - !reboot | ||
| - !getdata <match id> | ||
| - !enablemap <ut4_map> <gametype> | ||
| - !disablemap <ut4_map> <gametype> | ||
| - !rcon <serverid> <rconstring> | ||
| - !forceadd <gamemode> </@DiscordUser|urtauth/> | ||
| - !enablegametype <name> <teamsize> | ||
| - !disablegametype <name> | ||
| - !showgameconfig <gametype> | ||
| - !ban <urtauth> <reason> <duration> (duration=1y1M1w1d1h1m1s) | ||
| - !unban <urtauth> | ||
| - !baninfo </@DiscordUser|urtauth/> | ||
| - !showservers | ||
| - !addserver <ip:port> <rcon> <region> | ||
| - !enableserver <id> | ||
| - !disableserver <id> | ||
| - !updateserver <id> <rcon> | ||
| - !showmatches displays the queues AND live matches | ||
| - !unregister <urtauth> | ||
| - !country <urtauth> <COUNTRY CODE> | ||
| - !addchannel <#name> <public/admin> | ||
| - !removechannel <#name> <public/admin> | ||
| - !addrole <@role> <admin/superadmin> | ||
| - !removerole <@role> <admin/superadmin> | ||
|
|
||
|
|
||
| [](https://forthebadge.com) [](https://forthebadge.com) [](https://forthebadge.com) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| plugins { | ||
| id 'java' | ||
| } | ||
|
|
||
| group 'org.example' | ||
| version '1.0-SNAPSHOT' | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDirs = ['src'] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'io.sentry:sentry:1.7.23' | ||
| implementation 'commons-io:commons-io:2.6' | ||
| implementation 'org.apache.commons:commons-lang3:3.10' | ||
| implementation 'javax.websocket:javax.websocket-api:1.1' | ||
| implementation 'org.json:json:20190722' | ||
| implementation 'org.xerial:sqlite-jdbc:3.8.11.2' | ||
| implementation 'org.glassfish.tyrus.bundles:tyrus-standalone-client:1.9' | ||
| implementation 'org.slf4j:slf4j-simple:1.7.9' | ||
| implementation 'io.github.cdimascio:dotenv-java:2.2.0' | ||
| } | ||
|
|
||
| jar { | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
|
|
||
| manifest { | ||
| attributes 'Main-Class' : 'de.gost0r.pickupbot.PickupBotDiscordMain' | ||
| } | ||
| destinationDirectory.set(file("$rootDir/")) | ||
| archiveName 'PickupBot.jar' | ||
|
|
||
| from { | ||
| configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| set sv_dlURL "maps.pugbot.net" | ||
| set sv_floodprotect "8" | ||
| set sv_hostname "Pickup @ WWW.DISCORD.ME/URT" | ||
| set sv_pure "0" | ||
| set sv_sayprefix "^4MissTS^3: " | ||
| set sv_timeout "60" | ||
| sets " Discord" "www.discord.io/urbanterror" | ||
| set auth_enable "1" | ||
| set auth_notoriety "0" | ||
| set auth_owners "13 618 2797" | ||
|
|
||
| set fraglimit "15" | ||
| set timelimit "0" | ||
| set g_allowVote "31" | ||
| set g_friendlyFire "2" | ||
| set g_gametype "4" | ||
| set g_gear "" | ||
| set g_inactivity "40" | ||
| set g_inactivityAction "0" | ||
| set g_matchmode "1" | ||
| set g_maxrounds "0" | ||
| set g_roundtime "1" | ||
| set g_strattime "0" | ||
| set g_swaproles "0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| set sv_dlURL "maps.pugbot.net" | ||
| set sv_floodprotect "8" | ||
| set sv_hostname "Pickup @ WWW.DISCORD.ME/URT" | ||
| set sv_pure "0" | ||
| set sv_sayprefix "^4MissTS^3: " | ||
| set sv_timeout "60" | ||
| sets " Discord" "www.discord.io/urbanterror" | ||
| set auth_enable "1" | ||
| set auth_notoriety "0" | ||
| set auth_owners "13 618 2797" | ||
|
|
||
| set fraglimit "15" | ||
| set timelimit "0" | ||
| set g_allowVote "31" | ||
| set g_friendlyFire "2" | ||
| set g_gametype "4" | ||
| set g_gear "" | ||
| set g_inactivity "40" | ||
| set g_inactivityAction "0" | ||
| set g_matchmode "1" | ||
| set g_maxrounds "0" | ||
| set g_roundtime "1" | ||
| set g_strattime "0" | ||
| set g_swaproles "0" |
Oops, something went wrong.