2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Various Changes (#533)

Browse Source 
* Add Shield Blocking Emote For Two NPC's

* Fix KARAMBWAN HP Restore Amount

* Add Link Command To Discord Bot

* Github Actions Update
This commit is contained in:
Josh Shippam
2022-08-22 05:22:00 +01:00
committed by GitHub
parent 7514826803
commit 5dea59f903
6 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java
+3 -2
View File
@@ -11,8 +11,9 @@ import com.rs2.game.players.Player;
public enum NpcEmotes {
MAN(new int[] {1, 2, 3, 4, 5, 6}, 422, 1834, 836),
AL_KHARID_WARRIOR(new int[] {18}, 451, 404, 836),
GUARD(new int[] {9, 10}, 412, 404, 836),
AL_KHARID_WARRIOR(new int[] {18}, 451, 1156, 836),
GUARD(new int[] {9}, 412, 1156, 836),
GUARD_NO_SHIELD(new int[] {10}, 412, 404, 836),
GARGOYLE(new int[] {1610, 1611}, 1517, 1519, 1518),
SKELETAL_WYVERN(new int[] {3068}, 2989, 2988, 2987),
BAT(new int[] {412, 78}, 30, 31, 36),
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java
+1 -1
View File
@@ -24,7 +24,7 @@ public class Food {
MANTA(391, 22, "Manta Ray", 0, "Food", false),
SHARK(385, 20, "Shark", 0, "Food", false),
LOBSTER(379, 12, "Lobster", 0, "Food", false),
KARAMBWAN(3144, 2 + Misc.random(4), "Karambwan", 0, "Food", false),
KARAMBWAN(3144, 18, "Karambwan", 0, "Food", false),
TROUT(333, 7, "Trout", 0, "Food", false),
SALMON(329, 9, "Salmon", 0, "Food", false),
SWORDFISH(373, 14, "Swordfish", 0, "Food", false),
2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java
+1
View File
@@ -32,6 +32,7 @@ public class JavaCord {
api.addListener(new Forum());
api.addListener(new Hiscores());
api.addListener(new Issues());
api.addListener(new Link());
api.addListener(new Online());
api.addListener(new Players());
api.addListener(new Vote());
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java
+2
View File
@@ -11,6 +11,8 @@ public class Commands implements MessageCreateListener {
Message message = event.getMessage();
if (message.getContent().equalsIgnoreCase(JavaCord.commandPrefix + " commands")) {
event.getChannel().sendMessage("```fix"
+ System.lineSeparator() +
"::link"
+ System.lineSeparator() +
"::forum/::forums"
+ System.lineSeparator() +
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Link.java
+18
View File
@@ -0,0 +1,18 @@
package com.rs2.integrations.discord.commands;
import org.javacord.api.entity.message.Message;
import org.javacord.api.entity.user.User;
import org.javacord.api.event.message.MessageCreateEvent;
import org.javacord.api.listener.message.MessageCreateListener;
public class Link implements MessageCreateListener {
@Override
public void onMessageCreate(MessageCreateEvent event) {
Message message = event.getMessage();
User user = message.getAuthor().asUser().get();
if (message.getContent().equalsIgnoreCase("::link")) {
event.getChannel().sendMessage(user.getMentionTag() + ", Please check your DM's to continue.");
user.sendMessage("Please copy/paste the following in-game to link your Discord account: \n ```::link " + user.getIdAsString() + "```");
}
}
}