My development (#58)

* 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
@@ -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;
}
@@ -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,
@@ -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());