simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-20 02:56:44 +00:00
Code Issues Projects Releases Wiki Activity

changes 1

Browse Source
This commit is contained in:
Woosle Park 2019-03-26 14:01:03 -04:00
parent 5b019b3e63
commit f2c11cc7f8
9 changed files with 33 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
View File

@ -24,14 +24,6 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
private static final char MAP_INFO = 0x0200;
/**
* Walk Distance
*/
private int walkDistance;
/**
* Death Count
*/
private int deathCount;
/**
* Hit points
*/
@ -136,8 +128,6 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
hp = document.getInteger("hp");
shield = document.getInteger("shield");
deathCount = 0;
walkDistance = 0;
setDirection(Direction.getDirection(document.getInteger("direction")));
IServerConfiguration config = GameServer.INSTANCE.getConfig();
@ -175,10 +165,10 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
if (!incrementLocation()) {
//Couldn't walk
currentAction = Action.IDLE;
}else{
GameEvent event = new WalkDistanceEvent(this);
GameServer.INSTANCE.getEventDispatcher().dispatch(event);
}
walkDistance++;
GameEvent event = new WalkDistanceEvent(this,walkDistance);
GameServer.INSTANCE.getEventDispatcher().dispatch(event);
} else {
currentAction = Action.IDLE;
}
@ -278,7 +268,6 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
lastConsoleMessagesBuffer.clear();
currentStatus = 0;
lastStatus = 0;
walkDistance = 0;
addStatus(CubotStatus.FACTORY_NEW);
for (HardwareModule module : hardwareAddresses.values()) {
@ -288,8 +277,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
@Override
public boolean onDeadCallback() {
deathCount++;
GameEvent event = new DeathCountEvent(this,deathCount);
GameEvent event = new DeathCountEvent(this);
GameServer.INSTANCE.getEventDispatcher().dispatch(event);
reset();

16
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathCountEvent.java
View File

@ -5,25 +5,13 @@ import net.simon987.server.game.objects.GameObject;
public class DeathCountEvent extends GameEvent {
public DeathCountEvent(){
}
public DeathCountEvent(GameObject object, int c) {
public DeathCountEvent(GameObject object) {
setSource(object);
if(c>=0){
object.setCounter(c);
}else{
object.setCounter(0);
}
}
@Override
public GameObject getSource() {
return (GameObject) super.getSource();
}
public int getCounter() {
return (int) getSource().getCounter();
}
}

9
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathCountListener.java
View File

@ -7,6 +7,9 @@ import net.simon987.server.game.objects.GameObject;
import net.simon987.server.logging.LogManager;
public class DeathCountListener implements GameEventListener {
private int count;
@Override
public Class getListenedEventType() {
return DeathCountEvent.class;
@ -17,11 +20,13 @@ public class DeathCountListener implements GameEventListener {
DeathCountEvent DeathCountEvent = (DeathCountEvent) event;
GameObject object = DeathCountEvent.getSource();
if (object instanceof ControllableUnit) {
count = ((ControllableUnit) object).getParent().getStats().getInt("deathCount");
count++;
LogManager.LOGGER.info(((ControllableUnit) object).getParent().getUsername() + " Death Count " +
Integer.toString(object.getCounter()));
Integer.toString(count));
((ControllableUnit) object).getParent().getStats().setInt("deathCount",
DeathCountEvent.getCounter());
count);
}
}
}

15
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/TotalExecutionTimeEvent.java
View File

@ -5,25 +5,12 @@ import net.simon987.server.game.objects.GameObject;
public class TotalExecutionTimeEvent extends GameEvent {
public TotalExecutionTimeEvent(){
}
public TotalExecutionTimeEvent(GameObject object, double c) {
public TotalExecutionTimeEvent(GameObject object) {
setSource(object);
if(c>=0){
object.setTime(c);
}else{
object.setTime(0);
}
}
@Override
public GameObject getSource() {
return (GameObject) super.getSource();
}
public double getTime() {
return (int) getSource().getTime();
}
}

11
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/TotalExecutionTimeListener.java
View File

@ -7,6 +7,9 @@ import net.simon987.server.game.objects.GameObject;
import net.simon987.server.logging.LogManager;
public class TotalExecutionTimeListener implements GameEventListener {
private int count;
@Override
public Class getListenedEventType() {
return TotalExecutionTimeEvent.class;
@ -17,11 +20,13 @@ public class TotalExecutionTimeListener implements GameEventListener {
TotalExecutionTimeEvent TotalExecutionTimeEvent = (TotalExecutionTimeEvent) event;
GameObject object = TotalExecutionTimeEvent.getSource();
if (object instanceof ControllableUnit) {
count = ((ControllableUnit) object).getParent().getStats().getInt("totalExecutionTime");
count++;
LogManager.LOGGER.info(((ControllableUnit) object).getParent().getUsername() + " Death Count " +
Double.toString(object.getTime()));
Integer.toString(count));
((ControllableUnit) object).getParent().getStats().setDouble("totalExecutionTime",
TotalExecutionTimeEvent.getTime());
((ControllableUnit) object).getParent().getStats().setInt("totalExecutionTime",
count);
}
}
}

16
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkDistanceEvent.java
View File

@ -5,19 +5,8 @@ import net.simon987.server.game.objects.GameObject;
public class WalkDistanceEvent extends GameEvent {
private int count;
public WalkDistanceEvent(){
}
public WalkDistanceEvent(GameObject object, int c) {
public WalkDistanceEvent(GameObject object) {
setSource(object);
if(c>=0){
object.setCounter(c);
}else{
object.setCounter(0);
}
}
@Override
@ -25,7 +14,4 @@ public class WalkDistanceEvent extends GameEvent {
return (GameObject) super.getSource();
}
public int getCounter() {
return (int) getSource().getCounter();
}
}

9
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkDistanceListener.java
View File

@ -7,6 +7,9 @@ import net.simon987.server.game.objects.GameObject;
import net.simon987.server.logging.LogManager;
public class WalkDistanceListener implements GameEventListener {
private int count;
@Override
public Class getListenedEventType() {
return WalkDistanceEvent.class;
@ -17,11 +20,13 @@ public class WalkDistanceListener implements GameEventListener {
WalkDistanceEvent WalkDistanceEvent = (WalkDistanceEvent) event;
GameObject object = WalkDistanceEvent.getSource();
if (object instanceof ControllableUnit) {
count = ((ControllableUnit) object).getParent().getStats().getInt("walkDistance");
count++;
LogManager.LOGGER.info(((ControllableUnit) object).getParent().getUsername() + " Death Count " +
Integer.toString(object.getCounter()));
count);
((ControllableUnit) object).getParent().getStats().setInt("walkDistance",
WalkDistanceEvent.getCounter());
count);
}
}
}

27
Server/src/main/java/net/simon987/server/game/objects/GameObject.java
View File

@ -43,14 +43,6 @@ public abstract class GameObject implements JSONSerializable, MongoSerializable
* Current World of the object
*/
private World world;
/**
* Counter for user stats
*/
private int counter;
/**
* Execution Time
*/
private double time;
public GameObject() {
@ -71,9 +63,6 @@ public abstract class GameObject implements JSONSerializable, MongoSerializable
int newX = getX() + direction.dX;
int newY = getY() + direction.dY;
counter = 0;
time = 0;
if (newX < 0 || newY < 0 || newX >= world.getWorldSize() || newY >= world.getWorldSize()) {
//Next tile is out of world bounds, move to next world
World nextWorld = GameServer.INSTANCE.getGameUniverse().getWorld(
@ -241,22 +230,6 @@ public abstract class GameObject implements JSONSerializable, MongoSerializable
this.world = world;
}
public void setCounter(int c){
counter=c;
}
public int getCounter(){
return counter;
}
public void setTime(double t){
time=t;
}
public double getTime(){
return time;
}
@Override
public JSONObject jsonSerialise() {
JSONObject json = new JSONObject();

6
Server/src/main/resources/templates/leaderboard.vm
View File

@ -26,9 +26,9 @@
<tr>
<td>$row.getKey().getUsername()</td>
<td>$row.getValue().size()</td>
<td>$row.getValue().size()</td>
<td>$row.getValue().size()</td>
<td>$row.getValue().size()</td>
<td>$row.getValue()</td>
<td>$row.getValue()</td>
<td>$row.getValue()</td>
</tr>
#end
</tbody>