mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-04 16:49:04 +00:00
Cleanup part 1 (#213)
* 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:
committed by
Daniel Ginovker
parent
3d1ae1b288
commit
d876a923b9
@@ -0,0 +1,80 @@
|
||||
package com.rebotted.game.content.randomevents;
|
||||
|
||||
import com.rebotted.game.players.Client;
|
||||
import com.rebotted.game.players.Player;
|
||||
import com.rebotted.util.Misc;
|
||||
|
||||
/**
|
||||
* Eventhandler class
|
||||
* @author Andrew (Mr Extremez)
|
||||
*/
|
||||
|
||||
public class RandomEventHandler {
|
||||
|
||||
public static int CALL_RANDOM = 350 + Misc.random(100);
|
||||
|
||||
public static void resetEvent(Player c) {
|
||||
c.randomActions = 0;
|
||||
}
|
||||
|
||||
private static int[][] FAIL_COORDS = { { 3333, 3333 }, { 3196, 3193 },
|
||||
{ 3084, 3549 }, { 2974, 3346 }, { 2781, 3506 }, { 2810, 3508 }, };
|
||||
|
||||
public static void failEvent(Player client) {
|
||||
int loc = Misc.random(FAIL_COORDS.length - 1);
|
||||
client.teleportToX = FAIL_COORDS[loc][0];
|
||||
client.teleportToY = FAIL_COORDS[loc][1];
|
||||
client.heightLevel = 0;
|
||||
client.getPacketSender().sendMessage("You wake up in a strange location...");
|
||||
resetEvent(client);
|
||||
client.getPacketSender().closeAllWindows();
|
||||
}
|
||||
|
||||
public static void callRandom(Player c) { // add all random events here
|
||||
if (c.inFightCaves() || c.playerEquipment[c.playerWeapon] == 4024 || c.tutorialProgress < 36) {
|
||||
return;
|
||||
}
|
||||
int randomEvent = Misc.random(3);
|
||||
switch (randomEvent) {
|
||||
case 0:
|
||||
SandwhichLady.openSandwhichLady(c);
|
||||
resetEvent(c);
|
||||
break;
|
||||
case 1:
|
||||
if (c.chickenSpawned == false) {
|
||||
EvilChicken.spawnChicken(c);
|
||||
resetEvent(c);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
FreakyForester.teleportToLocation(c);
|
||||
resetEvent(c);
|
||||
break;
|
||||
case 3:
|
||||
Swarm.spawnSwarm(c);
|
||||
resetEvent(c);
|
||||
break;
|
||||
default:
|
||||
System.out.println("Error no random event called for " + c.playerName + ".");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public static void addRandom(Player c) {
|
||||
if (c.randomEventsEnabled)
|
||||
{
|
||||
if (c.randomActions >= CALL_RANDOM) {
|
||||
callRandom(c);
|
||||
if (c.playerIsBusy() && !c.hasSandwhichLady) {
|
||||
c.getPacketSender().closeAllWindows();
|
||||
}
|
||||
} else {
|
||||
int nextRandom = CALL_RANDOM - c.randomActions;
|
||||
if (c.playerRights == 3) {
|
||||
c.getPacketSender().sendMessage("Next random will be in " + nextRandom + " more random actions.");
|
||||
}
|
||||
c.randomActions += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user