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

Read Comment

Browse Source 
Made firstTimeTutorial handle the inital login stuff instead of it being ran with the dialogue
made the warning about the bank pin send for all players
fixed weight calculation on first login(closes #109)
This commit is contained in:
Dark98
2019-10-28 00:25:30 +00:00
parent 459e68773d
commit 912a08c423
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/dialogues/DialogueHandler.java
-17
View File
@@ -6100,23 +6100,6 @@ public class DialogueHandler {
case 3115:
player.tutorialProgress = 36;
PlayerAssistant.removeHintIcon(player);
player.getItemAssistant().deleteAllItems();
player.getItemAssistant().clearBank();
player.getPlayerAssistant().sendSidebars();
player.getPlayerAssistant().walkableInterface(-1);
player.getActionSender().chatbox(-1);
player.getItemAssistant()
.sendWeapon(
player.playerEquipment[player.playerWeapon],
ItemAssistant
.getItemName(player.playerEquipment[player.playerWeapon]));
player.getPlayerAssistant().addStarter();
player.getPlayerAssistant().movePlayer(3233, 3229, 0);
player.getActionSender().sendMessage(
"Welcome to @blu@" + Constants.SERVER_NAME
+ "@bla@ - currently in Server Stage v@blu@"
+ Constants.TEST_VERSION + "@bla@.");
sendStatement4(
"Welcome to Lumbridge! To get more help, simply click on the",
"Lumbridge Guide or one of the Tutors - these can be found by",
2006Redone Server/src/redone/game/players/Client.java
+7 -4
View File
@@ -648,19 +648,23 @@ public class Client extends Player {
playerLevel[playerFarming] = 1;
getPlayerAssistant().refreshSkill(playerFarming);
}
getPlayerAssistant().firstTimeTutorial();
if (tutorialProgress > 0 && tutorialProgress < 36 && Constants.TUTORIAL_ISLAND) {
getActionSender().sendMessage("@blu@Continue the tutorial from the last step you were on.@bla@");
}
if (tutorialProgress > 35) {
getPlayerAssistant().sendSidebars();
getItemAssistant().sendWeapon(playerEquipment[playerWeapon], ItemAssistant.getItemName(playerEquipment[playerWeapon]));
Weight.updateWeight(this);
getActionSender().sendMessage("Welcome to @blu@" + Constants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + Constants.TEST_VERSION + "@bla@.");
getActionSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome");
getActionSender().sendMessage("Source code at github.com/dginovker/2006rebotted");
getActionSender().sendMessage("Welcome to the Beta! A reset will occur before main release -");
getActionSender().sendMessage("Welcome to the 2006rebotted beta! Join our Discord: discord.gg/4zrA2Wy");
getActionSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy");
if (!hasBankpin) {
getActionSender().sendMessage("You do not, have a bank pin it is highly recommened you set one.");
}
}
getPlayerAssistant().firstTimeTutorial();
getItemAssistant().sendWeapon(playerEquipment[playerWeapon], ItemAssistant.getItemName(playerEquipment[playerWeapon]));
for (int i = 0; i < 25; i++) {
getActionSender().setSkillLevel(i, playerLevel[i], playerXP[i]);
getPlayerAssistant().refreshSkill(i);
@@ -691,7 +695,6 @@ public class Client extends Player {
getPlayerAssistant().sendConfig(504, 0);
getPlayerAssistant().sendConfig(173, 0);
}
Weight.updateWeight(this);
getPlayList().fixAllColors();
getPlayerAction().setAction(false);
2006Redone Server/src/redone/game/players/PlayerAssistant.java
+13 -11
View File
@@ -2420,16 +2420,18 @@ public class PlayerAssistant {
LightSources.saveBrightness(player);
} else if (player.tutorialProgress == 0 && !Constants.TUTORIAL_ISLAND) {
player.getPlayerAssistant().sendSidebars();
player.getItemAssistant();
player.getItemAssistant()
.sendWeapon(
player.playerEquipment[player.playerWeapon],
ItemAssistant
.getItemName(player.playerEquipment[player.playerWeapon]));
player.getActionSender().sendMessage(
"Welcome to @blu@" + Constants.SERVER_NAME
+ "@bla@ - currently in Server Stage v@blu@"
+ Constants.TEST_VERSION + "@bla@.");
PlayerAssistant.removeHintIcon(player);
player.getPlayerAssistant().walkableInterface(-1);
player.getActionSender().chatbox(-1);
player.getItemAssistant().deleteAllItems();
player.getItemAssistant().clearBank();
player.getPlayerAssistant().addStarter();
player.getPlayerAssistant().movePlayer(3233, 3229, 0);
player.getActionSender().sendMessage("Welcome to @blu@" + Constants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + Constants.TEST_VERSION + "@bla@.");
player.getActionSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome");
player.getActionSender().sendMessage("Source code at github.com/dginovker/2006rebotted");
player.getActionSender().sendMessage("Welcome to the Beta! A reset will occur before main release -");
player.getActionSender().sendMessage("Join our Discord: discord.gg/4zrA2Wy");
player.getDialogueHandler().sendDialogues(3115, 2224);
player.isRunning2 = false;
player.autoRet = 1;
@@ -2438,7 +2440,7 @@ public class PlayerAssistant {
if (!player.hasBankpin) {
player.getActionSender()
.sendMessage(
"You do not, have a bank pin it is highly recommened you get one.");
"You do not, have a bank pin it is highly recommened you set one.");
}
}
}