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

Cleanup part 1 (#213)

Browse Source 
* Clean up part 1

- Removed lots of dead code
- Removed unncessary files not in use
- Cleaned up small bits of code
- Removed a few warnings
- Server.java ---> GameEngine.java
- Constants.java ---> GameConstants.java

* Cape Dye

Rewrote cape dying

* Packaging

- redone ----> com.rebotted

* PacketSender/clean up

- ActionSender ---> PacketSender
- Moved many more packets to packetsender
- Cleaned up more dead code

* Merge Client/Player

- Merged Client.java with Player.java (both were doing same thing so redundant to have both)
- Removed some more dead code
- Tidy a few small things up

* Quests/more clean up

- Removed more dead code
- Made quests static in order to clean them up a bit

* More cleanup

- Removed some more of the dead quest code
- Correcting naming of some of the shop variables
This commit is contained in:
Mr Extremez
2019-11-25 11:08:56 -06:00
committed by Daniel Ginovker
parent 3d1ae1b288
commit d876a923b9
379 changed files with 80684 additions and 83170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java
+150
View File
@@ -0,0 +1,150 @@
package com.rebotted.game.objects.impl;
import com.rebotted.event.CycleEvent;
import com.rebotted.event.CycleEventContainer;
import com.rebotted.event.CycleEventHandler;
import com.rebotted.game.objects.ObjectDefaults;
import com.rebotted.game.players.Player;
import com.rebotted.util.Misc;
import com.rebotted.world.clip.ObjectDef;
public class OtherObjects {
private final static int[] SPECIAL_OBJECTS = {160, 155, 156, 298, 299, 300, 304, 1181, 5253, 5254, 5255, 5256, 5257, 5258};
public static void searchSpecialObject(Player player, int objectType) {
for (int i = 0; i < SPECIAL_OBJECTS.length; i++) {
if (objectType == SPECIAL_OBJECTS[i]) {
if (System.currentTimeMillis() - player.searchObjectDelay < 1200 || objectType == 160 && player.absX != 3096 || objectType > 154 && objectType < 157 && player.absX != 3098 || player.absY == 3301) {
return;
}
player.stopPlayerPacket = true;
player.searchObjectDelay = System.currentTimeMillis();
handleSpecialObject(player, objectType);
}
}
}
private static void object(Player player, int id, int x, int y) {
player.getPacketSender().object(id, x, y, 0, ObjectDefaults.getObjectFace(player, id), 10);
}
private static void handleSpecialObject(final Player player, final int objectType) {
String objectName = ObjectDef.getObjectDef(objectType).name;
if (objectType == 160 && player.absX == 3096) {
player.getPlayerAssistant().walkTo(0, 1);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
player.getPlayerAssistant().movePlayer(3098, player.absY, 0);
container.stop();
}
@Override
public void stop() {
}
}, 2);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
object(player, -1, 3097, 3358);
object(player, -1, 3097, 3359);
container.stop();
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
object(player, -1, 3097, 3357);
object(player, -1, 3097, 3360);
container.stop();
}
@Override
public void stop() {
object(player, 155, 3097, 3358);
object(player, 156, 3097, 3359);
player.stopPlayerPacket = false;
}
}, 2);
}
@Override
public void stop() {
object(player, 155, 3097, 3357);
object(player, 156, 3097, 3360);
}
}, 1);
} else if (objectType > 154 && objectType < 157 && player.absX == 3098) {
player.getPlayerAssistant().walkTo(-2, 0);
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
object(player, -1, 3097, 3358);
object(player, -1, 3097, 3359);
container.stop();
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
object(player, -1, 3097, 3357);
object(player, -1, 3097, 3360);
container.stop();
}
@Override
public void stop() {
object(player, 155, 3097, 3358);
object(player, 156, 3097, 3359);
player.stopPlayerPacket = false;
}
}, 2);
}
@Override
public void stop() {
object(player, 155, 3097, 3357);
object(player, 156, 3097, 3360);
}
}, 1);
} else if (objectName.contains("Nettles")) {
int nettlesDamage = 1 + Misc.random(1);
if (player.playerEquipment[player.playerHands] > 0) {
player.startAnimation(827);
player.getItemAssistant().addItem(4241, 1);
player.stopPlayerPacket = false;
} else {
player.setHitUpdateRequired2(true);
player.setHitDiff2(nettlesDamage);
player.updateRequired = true;
player.poisonMask = 2;
player.dealDamage(nettlesDamage);
player.getPlayerAssistant().refreshSkill(3);
player.getPacketSender().sendMessage("You have been stung by the nettles.");
player.stopPlayerPacket = false;
}
} else if (objectName.startsWith("Hay") || objectName.startsWith("hay")) {
final int damage = 1, random = Misc.random(15);
player.startAnimation(832);
player.getPacketSender().sendMessage("You search the " + objectName.toLowerCase() + "...");
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (random == 1) {
player.getDialogueHandler().sendStatement2("Wow! A needle!", "Now what are the chances of finding that?");
player.nextChat = 0;
player.getItemAssistant().addItem(1733, 1);
container.stop();
} else if (random == 9) {
player.handleHitMask(damage);
player.dealDamage(damage);
player.getPlayerAssistant().refreshSkill(3);
container.stop();
} else {
player.getPacketSender().sendMessage("You find nothing of interest.");
container.stop();
}
}
@Override
public void stop() {
player.stopPlayerPacket = false;
}
}, 2);
}
}
}