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

Issue 182: Leaderboard changes (#194)

Browse Source 
Implement new stats
This commit is contained in:
Woosle Park 2019-04-11 18:35:41 -04:00 committed by Simon Fortier
parent d71b3dc97c
commit f99f327480
13 changed files with 155 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package net.simon987.cubotplugin;
import net.simon987.cubotplugin.event.CubotWalkEvent;
import net.simon987.cubotplugin.event.DeathEvent;
import net.simon987.server.GameServer;
import net.simon987.server.IServerConfiguration;
import net.simon987.server.assembly.CPU;
@ -7,6 +9,7 @@ import net.simon987.server.assembly.HardwareModule;
import net.simon987.server.assembly.Memory;
import net.simon987.server.assembly.Status;
import net.simon987.server.assembly.exception.CancelledException;
import net.simon987.server.event.GameEvent;
import net.simon987.server.game.item.Item;
import net.simon987.server.game.item.ItemVoid;
import net.simon987.server.game.objects.*;
@ -152,17 +155,15 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
return MAP_INFO;
}
/**
* Called every tick
*/
@Override
public void update() {
if (currentAction == Action.WALKING) {
if (spendEnergy(100)) {
if (!incrementLocation()) {
//Couldn't walk
currentAction = Action.IDLE;
}else{
GameServer.INSTANCE.getEventDispatcher().dispatch(new CubotWalkEvent(this));
}
} else {
currentAction = Action.IDLE;
@ -272,6 +273,9 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
@Override
public boolean onDeadCallback() {
GameEvent event = new DeathEvent(this);
GameServer.INSTANCE.getEventDispatcher().dispatch(event);
reset();
//Teleport to spawn point

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

@ -18,6 +18,9 @@ public class CubotPlugin extends ServerPlugin {
listeners.add(new SetInventoryPosition());
listeners.add(new PutItemCommandListener());
listeners.add(new PopItemCommandListener());
//Leaderboard
listeners.add(new DeathListener());
listeners.add(new WalkListener());
GameRegistry registry = gameServer.getRegistry();

17
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CubotWalkEvent.java Normal file
View File

@ -0,0 +1,17 @@
package net.simon987.cubotplugin.event;
import net.simon987.cubotplugin.Cubot;
import net.simon987.server.event.GameEvent;
public class CubotWalkEvent extends GameEvent {
public CubotWalkEvent(Cubot cubot) {
setSource(cubot);
}
@Override
public Cubot getSource() {
return (Cubot) super.getSource();
}
}

16
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathEvent.java Normal file
View File

@ -0,0 +1,16 @@
package net.simon987.cubotplugin.event;
import net.simon987.server.event.GameEvent;
import net.simon987.server.game.objects.GameObject;
public class DeathEvent extends GameEvent {
public DeathEvent(GameObject object) {
setSource(object);
}
@Override
public GameObject getSource() {
return (GameObject) super.getSource();
}
}

23
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathListener.java Normal file
View File

@ -0,0 +1,23 @@
package net.simon987.cubotplugin.event;
import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventListener;
import net.simon987.server.game.objects.ControllableUnit;
import net.simon987.server.game.objects.GameObject;
public class DeathListener implements GameEventListener {
@Override
public Class getListenedEventType() {
return DeathEvent.class;
}
@Override
public void handle(GameEvent event) {
DeathEvent DeathEvent = (DeathEvent) event;
GameObject object = DeathEvent.getSource();
if (object instanceof ControllableUnit) {
((ControllableUnit) object).getParent().getStats().incrementStat("death", 1);
}
}
}

18
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkListener.java Normal file
View File

@ -0,0 +1,18 @@
package net.simon987.cubotplugin.event;
import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventListener;
public class WalkListener implements GameEventListener {
@Override
public Class getListenedEventType() {
return CubotWalkEvent.class;
}
@Override
public void handle(GameEvent event) {
CubotWalkEvent walkEvent = (CubotWalkEvent) event;
walkEvent.getSource().getParent().getStats().incrementStat("walkDistance", 1);
}
}

2
Server/src/main/java/net/simon987/server/GameServer.java
View File

@ -176,6 +176,8 @@ public class GameServer implements Runnable {
user.getControlledUnit().getCpu().reset();
int cost = user.getControlledUnit().getCpu().execute(timeout);
user.getControlledUnit().spendEnergy(cost);
user.addTime(cost);
} catch (Exception e) {
LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code");
e.printStackTrace();

4
Server/src/main/java/net/simon987/server/user/User.java
View File

@ -70,6 +70,10 @@ public class User implements MongoSerializable {
return user;
}
public void addTime(int time){
this.stats.incrementStat("executionTime", time);
}
public String getUserCode() {
return userCode;
}

23
Server/src/main/java/net/simon987/server/user/UserStats.java
View File

@ -58,7 +58,28 @@ public class UserStats implements MongoSerializable {
* @return The value of the stat. Returns 0 if not found
*/
public int getInt(String name) {
return stats.getInteger(name, 0);
return stats.getInteger(name, 0);
}
/**
* Set the value of a stat
*
* @param name Name of the stat
* @param value new value
*/
public void setDouble(String name, double value) {
stats.put(name, value);
}
/**
* Get the value of at stat
*
* @param name Name of the value
* @return The value of the stat. Returns 0 if not found
*/
public double getDouble(String name) {
return stats.getDouble(name);
}
/**

36
Server/src/main/java/net/simon987/server/user/UserStatsHelper.java
View File

@ -38,7 +38,35 @@ public class UserStatsHelper {
for (Document dbUser : users.find().sort(orderBy).limit(n)) {
User user = GameServer.INSTANCE.getGameUniverse().getUser((String) dbUser.get("username"));
rows.add(new AbstractMap.SimpleEntry<>(user, user.getStats().getInt(statName)));
int val = 0;
if (user.getStats().getInt(statName) > 0) {
val = user.getStats().getInt(statName);
}
rows.add(new AbstractMap.SimpleEntry<>(user, val));
}
return rows;
}
/**
* Get top n players along with all their stat values, in descending order of completed vaults
*
* @param n Maximum number of players
* @return Top n players, in User,value format, in descending order
*/
public ArrayList<Map.Entry<User, Map<String, Integer>>> getLeaderboardStats(int n) {
ArrayList<Map.Entry<User, Map<String, Integer>>> rows = new ArrayList<>(n);
List<User> users = getTopNSetSize("completedVaults", n);
for (User user : users) {
Map<String, Integer> allStats = new HashMap<>();
allStats.put("completedVaults", user.getStats().getSet("completedVaults").size());
allStats.put("death", user.getStats().getInt("death"));
allStats.put("executionTime", user.getStats().getInt("executionTime"));
allStats.put("walkDistance", user.getStats().getInt("walkDistance"));
rows.add(new AbstractMap.SimpleEntry<>(user, allStats));
}
return rows;
@ -51,9 +79,9 @@ public class UserStatsHelper {
* @param n Maximum number of players
* @return Top n players, in User,set format, in descending order
*/
public ArrayList<Map.Entry<User, ArrayList>> getTopNSetLength(String statName, int n) {
private List<User> getTopNSetSize(String statName, int n) {
ArrayList<Map.Entry<User, ArrayList>> rows = new ArrayList<>();
ArrayList<User> rows = new ArrayList<>();
List<Object> ifNullList = new ArrayList<>(2);
ifNullList.add("$stats." + statName);
@ -69,7 +97,7 @@ public class UserStatsHelper {
new Document("$limit", n))
)) {
User user = GameServer.INSTANCE.getGameUniverse().getUser((String) document.get("username"));
rows.add(new AbstractMap.SimpleEntry<>(user, user.getStats().getSet(statName)));
rows.add(user);
}
return rows;

3
Server/src/main/java/net/simon987/server/web/LeaderBoardPage.java
View File

@ -9,13 +9,14 @@ import spark.TemplateViewRoute;
import java.util.HashMap;
import java.util.Map;
public class LeaderBoardPage implements TemplateViewRoute {
@Override
public ModelAndView handle(Request request, Response response) {
Map<String, Object> model = new HashMap<>(2);
model.put("session", request.session());
model.put("stats", GameServer.INSTANCE.getUserStatsHelper().getTopNSetLength("completedVaults", 25));
model.put("stats", GameServer.INSTANCE.getUserStatsHelper().getLeaderboardStats(25));
return new ModelAndView(model, "leaderboard.vm");
}
}

2
Server/src/main/resources/config.properties
View File

@ -12,7 +12,7 @@ server_name=MAR dev
# ALLOW | BLOCK
guest_policy=ALLOW
# DEBUG
autologin=simon
#autologin=simon
#Database
mongo_dbname=mar_beta

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

@ -16,13 +16,19 @@
<tr>
<th>Player</th>
<th>Completed vaults</th>
<th>Death counts</th>
<th>Total execution time (ms)</th>
<th>Walk distance</th>
</tr>
</thead>
<tbody>
#foreach($row in $stats)
<tr>
<td>$row.getKey().getUsername()</td>
<td>$row.getValue().size()</td>
<td>$row.getValue().get("completedVaults")</td>
<td>$row.getValue().get("death")</td>
<td>$row.getValue().get("executionTime")</td>
<td>$row.getValue().get("walkDistance")</td>
</tr>
#end
</tbody>