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

My development (#58)

Browse Source 
* Black Knights Fortress (not complete)

* another Black knight

* dialogue fix + added comment
This commit is contained in:
DPSCryptic
2019-10-13 20:12:32 +02:00
committed by Daniel Ginovker
parent ea50d4065a
commit 0d728d8af0
37 changed files with 6424 additions and 6205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/content/quests/QuestAssistant.java
+12
View File
@@ -100,6 +100,13 @@ public class QuestAssistant {
} else if (client.cookAss > 0 && client.cookAss < 3) {
client.getPlayerAssistant().sendFrame126("@yel@Cook's Assistant", 7333);
}
if (client.blackKnight == 0) {
client.getPlayerAssistant().sendFrame126("Black Knights' Fortress", 7344);
} else if (client.blackKnight == 3) {
client.getPlayerAssistant().sendFrame126("@gre@Black Knights' Fortress", 7344);
} else {
client.getPlayerAssistant().sendFrame126("@yel@Black Knights' Fortress", 7344);
}
}
public enum Quests {
@@ -235,6 +242,7 @@ public class QuestAssistant {
public static void questButtons(Client client, int buttonId) {
switch (buttonId) {
case 28165:
client.getCooksAssistant().showInformation();
break;
@@ -271,6 +279,10 @@ public class QuestAssistant {
case 28192:
client.getGertrudesCat().showInformation();
break;
case 28164:
client.getBlackKnightsFortress().showInformation();
break;
default:
if (Quests.forButton(buttonId) != null) {
client.getActionSender().sendMessage("The quest " + Quests.forButton(buttonId).getName() + " is currently disabled.");
2006Redone Server/src/redone/game/content/quests/QuestRewards.java
+9
View File
@@ -143,4 +143,13 @@ public class QuestRewards {
client.getPlayerAssistant().sendFrame126("@gre@" + QUEST_NAME + "", 7333);
client.cookAss = 3;
}
public static void blackKnightReward(Client client) {
QuestReward(client, "Black Knights' Fortress", "6 Quest Point", "5000 Coins", "10k Attack XP", "", "", "", 326);
QUEST_NAME = "Black Knights' Fortress";
client.getItemAssistant().addItem(995, 5000);
client.getPlayerAssistant().addNormalExperienceRate(10000, client.playerAttack);
client.questPoints++;
client.getPlayerAssistant().sendFrame126("@gre@" + QUEST_NAME + "", 7333);
client.blackKnight = 3;
}
}
2006Redone Server/src/redone/game/content/quests/impl/BlackKnightsFortress.java
+59
View File
@@ -0,0 +1,59 @@
package redone.game.content.quests.impl;
import redone.game.players.Client;
/**
* @author Andrew (I'm A Boss on Rune-Server, Mr Extremez on Moparscape & Runelocus)
* Cooks Assistant
*/
public class BlackKnightsFortress {
Client client;
public BlackKnightsFortress(Client client) {
this.client = client;
}
private static final int NOTES = 291;
public void showInformation() {
for (int i = 8144; i < 8195; i++) {
client.getPlayerAssistant().sendFrame126("", i);
}
client.getPlayerAssistant().sendFrame126("@dre@Black Knights' Fortress", 8144);
client.getPlayerAssistant().sendFrame126("", 8145);
if (client.blackKnight == 0) {
client.getPlayerAssistant().sendFrame126("Black Knights' Fortress", 8144);
client.getPlayerAssistant().sendFrame126("I can start this quest by speaking to Sir Amik Varze in", 8147);
client.getPlayerAssistant().sendFrame126("Falador Castle.", 8148);
client.getPlayerAssistant().sendFrame126("", 8149);
client.getPlayerAssistant().sendFrame126("QUEST REQUIREMENTS:", 8150);
client.getPlayerAssistant().sendFrame126("??12 Quest Points??", 8151);
} else if (client.blackKnight == 1) {
client.getPlayerAssistant().sendFrame126("Black Knights' Fortress", 8144);
client.getPlayerAssistant().sendFrame126("@str@I've Talked with Sir Amik Varze", 8147);
client.getPlayerAssistant().sendFrame126("He wants me to kill 30 Black Knights and", 8148);
client.getPlayerAssistant().sendFrame126("collect their notes.", 8149);
if (client.getItemAssistant().playerHasItem(NOTES, 30)) {
client.getPlayerAssistant().sendFrame126("@str@30 Black Knight notes", 8150);
} else {
client.getPlayerAssistant().sendFrame126("@red@30 Black Knight notes", 8150);
}
} else if (client.blackKnight == 2) {
client.getPlayerAssistant().sendFrame126("Black Knights' Fortress", 8144);
client.getPlayerAssistant().sendFrame126("@str@I talked to Sir Amik Varze.", 8147);
client.getPlayerAssistant().sendFrame126("@str@I gave Sir Amik Varze his items.", 8148);
client.getPlayerAssistant().sendFrame126("I should go speak to Sir Amik Varze.", 8149);
} else if (client.blackKnight == 3) {
client.getPlayerAssistant().sendFrame126("Black Knights' Fortress", 8144);
client.getPlayerAssistant().sendFrame126("@str@I talked to Sir Amik Varze.", 8147);
client.getPlayerAssistant().sendFrame126("@str@I gave him his items.", 8148);
client.getPlayerAssistant().sendFrame126("@red@ QUEST COMPLETE", 8150);
client.getPlayerAssistant().sendFrame126("As a reward, 10k attack xp and 5k coins.", 8151);
}
client.getPlayerAssistant().showInterface(8134);
}
}
2006Redone Server/src/redone/game/dialogues/DialogueHandler.java
+6268 -6185
View File
File diff suppressed because it is too large Load Diff
2006Redone Server/src/redone/game/npcs/NpcActions.java
+13
View File
@@ -624,6 +624,19 @@ public class NpcActions {
}
break;
case 608:
if (c.blackKnight == 0) {
c.getDialogueHandler().sendDialogues(3902, npcType);
} else if (c.blackKnight == 1) {
c.getDialogueHandler().sendDialogues(3510, npcType);
}else if (c.blackKnight == 2) {
c.getDialogueHandler().sendDialogues(3502, npcType);
}else if (c.blackKnight == 3) {
c.getActionSender().sendMessage(
"He has nothing to say to you.");
}
break;
case 758:
if (c.sheepShear == 0) {
c.getDialogueHandler().sendDialogues(164, npcType);
2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java
+1 -1
View File
@@ -972,7 +972,7 @@ public class NPCDrops extends NPCDropsHandler {
{ 213, 1, RARE }, { 215, 1, RARE }, { 217, 1, RARE },
{ 2485, 1, RARE } };
public static final int[][] blackknight = { { 526, 1, ALWAYS },
public static final int[][] blackknight = { { 526, 1, ALWAYS }, { 291, 1, ALWAYS },
{ i("iron sword"), 1, COMMON }, { i("iron full helm"), 1, COMMON },
{ i("steel mace"), 1, COMMON }, { i("black full helm"), 1, RARE },
{ i("mithril arrow"), 3, UNCOMMON },
2006Redone Server/src/redone/game/players/Client.java
+9 -13
View File
@@ -37,17 +37,7 @@ import redone.game.content.minigames.castlewars.CastleWars;
import redone.game.content.music.PlayList;
import redone.game.content.music.sound.SoundList;
import redone.game.content.quests.QuestAssistant;
import redone.game.content.quests.impl.CooksAssistant;
import redone.game.content.quests.impl.DoricsQuest;
import redone.game.content.quests.impl.GertrudesCat;
import redone.game.content.quests.impl.ImpCatcher;
import redone.game.content.quests.impl.PiratesTreasure;
import redone.game.content.quests.impl.RestlessGhost;
import redone.game.content.quests.impl.RomeoJuliet;
import redone.game.content.quests.impl.RuneMysteries;
import redone.game.content.quests.impl.SheepShearer;
import redone.game.content.quests.impl.VampyreSlayer;
import redone.game.content.quests.impl.WitchsPotion;
import redone.game.content.quests.impl.*;
import redone.game.content.skills.SkillInterfaces;
import redone.game.content.skills.agility.Agility;
import redone.game.content.skills.agility.ApeAtollAgility;
@@ -119,6 +109,7 @@ public class Client extends Player {
private final BankPin bankPin = new BankPin(this);
private final Slayer slayer = new Slayer(this);
private final ImpCatcher impCatcher = new ImpCatcher(this);
private final BlackKnightsFortress blackKnightF = new BlackKnightsFortress(this);
private final CooksAssistant cooksAssistant = new CooksAssistant(this);
private final RomeoJuliet romeoJuliet = new RomeoJuliet(this);
private final DoricsQuest doricsQuest = new DoricsQuest(this);
@@ -148,8 +139,9 @@ public class Client extends Player {
private Mining mining = new Mining();
private ChallengePlayer challengePlayer = new ChallengePlayer();
private DwarfCannon dwarfCannon = new DwarfCannon(this);
public DwarfCannon getCannon() {
return dwarfCannon;
}
@@ -286,6 +278,10 @@ public class Client extends Player {
return impCatcher;
}
public BlackKnightsFortress getBlackKnightsFortress() {
return blackKnightF;
}
public PiratesTreasure getPiratesTreasure() {
return piratesTreasure;
}
2006Redone Server/src/redone/game/players/Player.java
+3 -2
View File
@@ -42,7 +42,8 @@ public abstract class Player {
doorDelay, doubleDoorDelay, buySlayerTimer, lastIncrease,
boneDelay, botAttempts, leverDelay = 0, farmTime, searchObjectDelay = 0;
private Npc specialTarget = null;
private Npc specialTarget = null;
public void setSpecialTarget(Npc target) {
this.specialTarget = target;
}
@@ -84,7 +85,7 @@ public abstract class Player {
randomEventsEnabled = false, debugMode = false;
public int votePoints, thankedForDonation, saveDelay, playerKilled, gertCat, restGhost,
romeojuliet, runeMist, vampSlayer, cookAss, doricQuest,
romeojuliet, runeMist, vampSlayer, cookAss, doricQuest, blackKnight,
dragonSlayerQuestStage, sheepShear, impsC, randomActions, pkPoints,
totalPlayerDamageDealt, killedBy, lastChatId = 1, privateChat,
friendSlot = 0, dialogueId, randomCoffin, newLocation, specEffect,
2006Redone Server/src/redone/game/players/PlayerSave.java
+4
View File
@@ -825,6 +825,10 @@ public class PlayerSave {
characterfile.write(Integer.toString(player.runeMist), 0, Integer
.toString(player.runeMist).length());
characterfile.newLine();
characterfile.write("blackKnight = ", 0, 10);
characterfile.write(Integer.toString(player.blackKnight), 0, Integer
.toString(player.blackKnight).length());
characterfile.newLine();
characterfile.write("cookAss = ", 0, 10);
characterfile.write(Integer.toString(player.cookAss), 0, Integer
.toString(player.cookAss).length());
2006Redone Server/src/redone/integrations/discord/commands/Commands.java
+1 -1
View File
@@ -9,7 +9,7 @@ public class Commands implements MessageCreateListener {
public void onMessageCreate(MessageCreateEvent event) {
Message message = event.getMessage();
if (message.getContent().equalsIgnoreCase("::commands")) {
event.getChannel().sendMessage("```fix`
event.getChannel().sendMessage("```fix```"
+ System.lineSeparator() +
"::forum/::forums"
+ System.lineSeparator() +
2006Redone Server/src/redone/net/packets/impl/ClickingButtons.java
+12
View File
@@ -1750,6 +1750,9 @@ public class ClickingButtons implements PacketType {
if (player.dialogueAction == 52) {
player.getDialogueHandler().sendDialogues(52, player.npcType);
}
if (player.dialogueAction == 1000) {
player.getDialogueHandler().sendDialogues(3524,player.npcType);
}
if (player.dialogueAction == 69) {
player.getDialogueHandler().sendDialogues(1005, player.npcType);
}
@@ -1821,6 +1824,9 @@ public class ClickingButtons implements PacketType {
if (player.dialogueAction == 52) {
player.getDialogueHandler().sendDialogues(64, player.npcType);
}
if (player.dialogueAction == 1000) {
player.getDialogueHandler().sendDialogues(3523, player.npcType);
}
if (player.dialogueAction == 69) {
player.getDialogueHandler().sendDialogues(500002, player.npcType);
}
@@ -1891,6 +1897,9 @@ public class ClickingButtons implements PacketType {
if (player.dialogueAction == 52) {
player.getDialogueHandler().sendDialogues(65, player.npcType);
}
if (player.dialogueAction == 1000) {
player.getDialogueHandler().sendDialogues(3523,player.npcType);
}
if (player.dialogueAction == 700) {
player.getDialogueHandler().sendDialogues(30, player.npcType);
}
@@ -1944,6 +1953,9 @@ public class ClickingButtons implements PacketType {
if (player.dialogueAction == 52) {
player.getDialogueHandler().sendDialogues(63, player.npcType);
}
if (player.dialogueAction == 1000) {
player.getDialogueHandler().sendDialogues(3523, player.npcType);
}
if (player.dialogueAction == 700) {
player.getDialogueHandler().sendDialogues(31, player.npcType);
}