From 912a08c42377ef89d2cdce2a4d482b54dba2c7e3 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Mon, 28 Oct 2019 00:25:30 +0000 Subject: [PATCH] Read Comment 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) --- .../game/dialogues/DialogueHandler.java | 17 ------------- .../src/redone/game/players/Client.java | 11 +++++---- .../redone/game/players/PlayerAssistant.java | 24 ++++++++++--------- 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/2006Redone Server/src/redone/game/dialogues/DialogueHandler.java b/2006Redone Server/src/redone/game/dialogues/DialogueHandler.java index 40e43df0..7d97e264 100644 --- a/2006Redone Server/src/redone/game/dialogues/DialogueHandler.java +++ b/2006Redone Server/src/redone/game/dialogues/DialogueHandler.java @@ -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", diff --git a/2006Redone Server/src/redone/game/players/Client.java b/2006Redone Server/src/redone/game/players/Client.java index b7b4131f..944310f7 100644 --- a/2006Redone Server/src/redone/game/players/Client.java +++ b/2006Redone Server/src/redone/game/players/Client.java @@ -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); diff --git a/2006Redone Server/src/redone/game/players/PlayerAssistant.java b/2006Redone Server/src/redone/game/players/PlayerAssistant.java index 691df141..535f59c6 100644 --- a/2006Redone Server/src/redone/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/redone/game/players/PlayerAssistant.java @@ -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."); } } }