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

Various Fixes (#570)

Browse Source 
* Grammatical fixes

* Fixed longsword combat styles
This commit is contained in:
halogod35
2023-01-31 21:44:02 -05:00
committed by GitHub
parent ec77731ff5
commit d7a70fdfdc
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/content/traveling/Sailing.java
+4 -4
View File
@@ -42,7 +42,7 @@ public class Sailing {
return false;
}
c.getItemAssistant().deleteItem(995, 1000);
c.getPacketSender().sendMessage("Your free to go and pay the 1000 coins.");
c.getPacketSender().sendMessage("You're free to go and pay the 1000 coins.");
return true;
}
@@ -53,7 +53,7 @@ public class Sailing {
return false;
}
c.getItemAssistant().deleteItem(995, 30);
c.getPacketSender().sendMessage("Your free to go and pay the 30 coins.");
c.getPacketSender().sendMessage("You're free to go and pay the 30 coins.");
return true;
}
@@ -66,7 +66,7 @@ public class Sailing {
}
}
c.getPacketSender().sendMessage(
"Your clean of any possible alchohol.");
"You're clean of any possible alcohol.");
return true;
}
@@ -78,7 +78,7 @@ public class Sailing {
return false;
}
}
c.getPacketSender().sendMessage("Your clean of any possible weapons.");
c.getPacketSender().sendMessage("You're clean of any possible weapons.");
return true;
}
2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java
+8 -4
View File
@@ -619,10 +619,14 @@ public class ItemAssistant {
player.getPacketSender().sendFrame246(4447, 200, weapon);
player.getPacketSender().sendString(weaponName, 4449);
} else if (newWeapon.startsWith("dagger")
|| newWeapon.contains("sword")) {
|| newWeapon.startsWith("sword")) {
player.getPacketSender().setSidebarInterface(0, 2276); // stab, lunge, slash, block
player.getPacketSender().sendFrame246(2277, 200, weapon);
player.getPacketSender().sendString(weaponName, 2279);
} else if (newWeapon.startsWith("longsword")) {
player.getPacketSender().setSidebarInterface(0, 2423); // chop, slash, lunge, block
player.getPacketSender().sendFrame246(2424, 200, weapon);
player.getPacketSender().sendString(weaponName, 2426);
} else if (newWeapon.startsWith("pickaxe")) {
player.getPacketSender().setSidebarInterface(0, 5570); // spike, impale, smash, block
player.getPacketSender().sendFrame246(5571, 200, weapon);
@@ -645,15 +649,15 @@ public class ItemAssistant {
player.getPacketSender().sendFrame246(4680, 200, weapon);
player.getPacketSender().sendString(weaponName, 4682);
} else if (newWeapon.toLowerCase().contains("mace")) {
player.getPacketSender().setSidebarInterface(0, 3796);
player.getPacketSender().setSidebarInterface(0, 3796); // pound, pummel, spike, block
player.getPacketSender().sendFrame246(3797, 200, weapon);
player.getPacketSender().sendString(weaponName, 3799);
} else if (player.playerEquipment[player.playerWeapon] == 4153) {
player.getPacketSender().setSidebarInterface(0, 425); // war hamer equip
player.getPacketSender().setSidebarInterface(0, 425); // war hammer equip
player.getPacketSender().sendFrame246(426, 200, weapon);
player.getPacketSender().sendString(weaponName, 428);
} else {
player.getPacketSender().setSidebarInterface(0, 2423); // chop, slash, lung, block
player.getPacketSender().setSidebarInterface(0, 2423); // chop, slash, lunge, block
player.getPacketSender().sendFrame246(2424, 200, weapon);
player.getPacketSender().sendString(weaponName, 2426);
}