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

Merge pull request #125 from Dark98/master

Browse Source 
Read Comment
This commit is contained in:
Josh Shippam
2019-10-28 00:26:46 +00:00
committed by GitHub
parent 459e68773d 912a08c423
commit 52414ce985
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: case 3115:
player.tutorialProgress = 36; 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( sendStatement4(
"Welcome to Lumbridge! To get more help, simply click on the", "Welcome to Lumbridge! To get more help, simply click on the",
"Lumbridge Guide or one of the Tutors - these can be found by", "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; playerLevel[playerFarming] = 1;
getPlayerAssistant().refreshSkill(playerFarming); getPlayerAssistant().refreshSkill(playerFarming);
} }
getPlayerAssistant().firstTimeTutorial();
if (tutorialProgress > 0 && tutorialProgress < 36 && Constants.TUTORIAL_ISLAND) { if (tutorialProgress > 0 && tutorialProgress < 36 && Constants.TUTORIAL_ISLAND) {
getActionSender().sendMessage("@blu@Continue the tutorial from the last step you were on.@bla@"); getActionSender().sendMessage("@blu@Continue the tutorial from the last step you were on.@bla@");
} }
if (tutorialProgress > 35) { if (tutorialProgress > 35) {
getPlayerAssistant().sendSidebars(); 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("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("@red@Did you know?@bla@ We're open source! Pull requests are welcome");
getActionSender().sendMessage("Source code at github.com/dginovker/2006rebotted"); 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 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++) { for (int i = 0; i < 25; i++) {
getActionSender().setSkillLevel(i, playerLevel[i], playerXP[i]); getActionSender().setSkillLevel(i, playerLevel[i], playerXP[i]);
getPlayerAssistant().refreshSkill(i); getPlayerAssistant().refreshSkill(i);
@@ -691,7 +695,6 @@ public class Client extends Player {
getPlayerAssistant().sendConfig(504, 0); getPlayerAssistant().sendConfig(504, 0);
getPlayerAssistant().sendConfig(173, 0); getPlayerAssistant().sendConfig(173, 0);
} }
Weight.updateWeight(this);
getPlayList().fixAllColors(); getPlayList().fixAllColors();
getPlayerAction().setAction(false); 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); LightSources.saveBrightness(player);
} else if (player.tutorialProgress == 0 && !Constants.TUTORIAL_ISLAND) { } else if (player.tutorialProgress == 0 && !Constants.TUTORIAL_ISLAND) {
player.getPlayerAssistant().sendSidebars(); player.getPlayerAssistant().sendSidebars();
player.getItemAssistant(); PlayerAssistant.removeHintIcon(player);
player.getItemAssistant() player.getPlayerAssistant().walkableInterface(-1);
.sendWeapon( player.getActionSender().chatbox(-1);
player.playerEquipment[player.playerWeapon], player.getItemAssistant().deleteAllItems();
ItemAssistant player.getItemAssistant().clearBank();
.getItemName(player.playerEquipment[player.playerWeapon])); player.getPlayerAssistant().addStarter();
player.getActionSender().sendMessage( player.getPlayerAssistant().movePlayer(3233, 3229, 0);
"Welcome to @blu@" + Constants.SERVER_NAME player.getActionSender().sendMessage("Welcome to @blu@" + Constants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + Constants.TEST_VERSION + "@bla@.");
+ "@bla@ - currently in Server Stage v@blu@" player.getActionSender().sendMessage("@red@Did you know?@bla@ We're open source! Pull requests are welcome");
+ Constants.TEST_VERSION + "@bla@."); 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.getDialogueHandler().sendDialogues(3115, 2224);
player.isRunning2 = false; player.isRunning2 = false;
player.autoRet = 1; player.autoRet = 1;
@@ -2438,7 +2440,7 @@ public class PlayerAssistant {
if (!player.hasBankpin) { if (!player.hasBankpin) {
player.getActionSender() player.getActionSender()
.sendMessage( .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.");
} }
} }
} }