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

wip

Browse Source
This commit is contained in:
simon987 2019-04-01 19:00:36 -04:00 committed by simon
parent ea1ec1b1b3
commit 6a8d2bd0d6
22 changed files with 580 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Plugin Cubot/Plugin Cubot.iml
View File

@ -17,6 +17,35 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="module" module-name="Server" /> <orderEntry type="module" module-name="Server" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />

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

@ -11,7 +11,6 @@ import net.simon987.server.assembly.Status;
import net.simon987.server.assembly.exception.CancelledException; import net.simon987.server.assembly.exception.CancelledException;
import net.simon987.server.event.GameEvent; import net.simon987.server.event.GameEvent;
import net.simon987.server.game.item.Item; import net.simon987.server.game.item.Item;
import net.simon987.server.game.item.ItemVoid;
import net.simon987.server.game.objects.*; import net.simon987.server.game.objects.*;
import net.simon987.server.user.User; import net.simon987.server.user.User;
import org.bson.Document; import org.bson.Document;
@ -201,7 +200,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
JSONObject json = super.jsonSerialise(); JSONObject json = super.jsonSerialise();
json.put("direction", getDirection().ordinal()); json.put("direction", getDirection().ordinal());
CubotInventory inv = (CubotInventory) getHardware(CubotInventory.class); CubotInventory inv = (CubotInventory) getHardware(CubotInventory.class);
int heldItem = inv.getInventory().getOrDefault(inv.getPosition(), new ItemVoid()).getId(); int heldItem = inv.getCurrentItem().getId();
json.put("heldItem", heldItem); json.put("heldItem", heldItem);
json.put("hp", hp); json.put("hp", hp);
json.put("shield", shield); json.put("shield", shield);

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

@ -4,6 +4,7 @@ import net.simon987.server.GameServer;
import net.simon987.server.assembly.HardwareModule; import net.simon987.server.assembly.HardwareModule;
import net.simon987.server.assembly.Status; import net.simon987.server.assembly.Status;
import net.simon987.server.game.item.Item; import net.simon987.server.game.item.Item;
import net.simon987.server.game.item.ItemVoid;
import net.simon987.server.game.objects.ControllableUnit; import net.simon987.server.game.objects.ControllableUnit;
import org.bson.Document; import org.bson.Document;
@ -55,11 +56,30 @@ public class CubotInventory extends HardwareModule {
private void scanItem() { private void scanItem() {
int x = getCpu().getRegisterSet().getRegister("X").getValue(); int x = getCpu().getRegisterSet().getRegister("X").getValue();
Item item = inventory.get(position); Item item = inventory.get(position);
if (item == null) {
return;
}
item.digitize(unit.getCpu().getMemory(), x); item.digitize(unit.getCpu().getMemory(), x);
} }
public Item getCurrentItem() {
return inventory.getOrDefault(position, new ItemVoid());
}
public Item removeItem() {
Item item = inventory.get(position);
if (item == null) {
return new ItemVoid();
}
inventory.remove(position);
return item;
}
public Item clearItem() { public Item clearItem() {
Item item = inventory.get(position); Item item = inventory.get(position);
if (item == null) {
return new ItemVoid();
}
item.clear(unit); item.clear(unit);
inventory.remove(position); inventory.remove(position);

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

@ -3,7 +3,11 @@ package net.simon987.cubotplugin;
import net.simon987.server.GameServer; import net.simon987.server.GameServer;
import net.simon987.server.assembly.HardwareModule; import net.simon987.server.assembly.HardwareModule;
import net.simon987.server.assembly.Status; import net.simon987.server.assembly.Status;
import net.simon987.server.game.objects.*; import net.simon987.server.game.item.Item;
import net.simon987.server.game.objects.Action;
import net.simon987.server.game.objects.Attackable;
import net.simon987.server.game.objects.GameObject;
import net.simon987.server.game.objects.InventoryHolder;
import org.bson.Document; import org.bson.Document;
import java.awt.*; import java.awt.*;
@ -24,34 +28,36 @@ public class CubotLaser extends HardwareModule {
private static final int LASER_DAMAGE = 25; private static final int LASER_DAMAGE = 25;
public CubotLaser(ControllableUnit unit) { public CubotLaser(Cubot unit) {
super(null, unit); super(null, unit);
} }
public CubotLaser(Document document, ControllableUnit cubot) { public CubotLaser(Document document, Cubot cubot) {
super(document, cubot); super(document, cubot);
} }
private Cubot getCubot() {
return (Cubot) unit;
}
@Override @Override
public char getId() { public char getId() {
return HWID; return HWID;
} }
@Override @Override
//TODO: Refactor this method..
public void handleInterrupt(Status status) { public void handleInterrupt(Status status) {
int a = getCpu().getRegisterSet().getRegister("A").getValue(); int a = getCpu().getRegisterSet().getRegister("A").getValue();
int b = getCpu().getRegisterSet().getRegister("B").getValue(); int b = getCpu().getRegisterSet().getRegister("B").getValue();
if (a == LASER_WITHDRAW) { if (a == LASER_WITHDRAW) {
Point frontTile = unit.getFrontTile(); Point frontTile = unit.getFrontTile();
ArrayList<GameObject> objects = unit.getWorld().getGameObjectsBlockingAt(frontTile.x, frontTile.y); ArrayList<GameObject> objects = unit.getWorld().getGameObjectsBlockingAt(frontTile.x, frontTile.y);
if (unit.getCurrentAction() == Action.IDLE && objects.size() > 0) { if (unit.getCurrentAction() == Action.IDLE && objects.size() > 0) {
//FIXME: Problem here if more than 1 object
if (objects.get(0) instanceof InventoryHolder) { if (objects.get(0) instanceof InventoryHolder) {
if (((InventoryHolder) objects.get(0)).canTakeItem(b)) { if (((InventoryHolder) objects.get(0)).canTakeItem(b)) {
@ -65,9 +71,24 @@ public class CubotLaser extends HardwareModule {
} }
} }
} else if (a == LASER_DEPOSIT) { } else if (a == LASER_DEPOSIT) {
// TODO Point frontTile = unit.getFrontTile();
ArrayList<GameObject> objects = unit.getWorld().getGameObjectsBlockingAt(frontTile.x, frontTile.y);
CubotInventory inv = ((CubotInventory) getCubot().getHardware(CubotInventory.class));
Item item = inv.getCurrentItem();
if (unit.getCurrentAction() == Action.IDLE && objects.size() > 0) {
if (objects.get(0) instanceof InventoryHolder) {
if (((InventoryHolder) objects.get(0)).canPlaceItem(item.getId())) {
if (unit.spendEnergy(30)) {
//Place the item
((InventoryHolder) objects.get(0)).placeItem(inv.removeItem());
unit.setCurrentAction(Action.DEPOSITING);
}
}
}
}
} else if (a == LASER_ATTACK) { } else if (a == LASER_ATTACK) {
if (unit.getCurrentAction() == Action.IDLE) { if (unit.getCurrentAction() == Action.IDLE) {
@ -81,12 +102,10 @@ public class CubotLaser extends HardwareModule {
if (objects.size() > 0 && objects.get(0) instanceof Attackable && !(objects.get(0) instanceof Cubot)) { if (objects.size() > 0 && objects.get(0) instanceof Attackable && !(objects.get(0) instanceof Cubot)) {
((Attackable) objects.get(0)).damage(LASER_DAMAGE); ((Attackable) objects.get(0)).damage(LASER_DAMAGE);
} }
} }
unit.setCurrentAction(Action.ATTACKING); unit.setCurrentAction(Action.ATTACKING);
} }
} }
} }
} }

29
Plugin Misc HW/Plugin Misc HW.iml
View File

@ -16,6 +16,35 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="module" module-name="Server" /> <orderEntry type="module" module-name="Server" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />

29
Plugin NPC/Plugin NPC.iml
View File

@ -16,6 +16,35 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

29
Plugin Plant/Plugin Plant.iml
View File

@ -16,6 +16,35 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.10" level="project" /> <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

17
Server/src/main/java/net/simon987/server/assembly/Memory.java
View File

@ -94,6 +94,23 @@ public class Memory implements Target, MongoSerializable {
return true; return true;
} }
/**
* Read count words from the memory
*
* @return null if out of bounds
*/
public char[] read(int offset, int count) {
if (offset + count > this.words.length || count < 0 || offset < 0) {
return null;
}
char[] chars = new char[count];
System.arraycopy(words, offset, chars, 0, count);
return chars;
}
/** /**
* Set the value at an address * Set the value at an address
* *

5
Server/src/main/java/net/simon987/server/game/objects/InventoryHolder.java
View File

@ -20,4 +20,9 @@ public interface InventoryHolder {
* @return true if the InventoryHolder can provide this item * @return true if the InventoryHolder can provide this item
*/ */
boolean canTakeItem(int itemId); boolean canTakeItem(int itemId);
/**
* @return true if the InventoryHolder can receive this item
*/
boolean canPlaceItem(int itemId);
} }

7
Server/src/main/java/net/simon987/server/game/objects/ItemsContainer.java
View File

@ -32,7 +32,7 @@ public class ItemsContainer extends GameObject implements InventoryHolder {
@Override @Override
public boolean placeItem(Item item) { public boolean placeItem(Item item) {
if (items.size() < containerCapacity) { if (canPlaceItem(item.getId())) {
items.add(item); items.add(item);
return true; return true;
} else { } else {
@ -40,6 +40,11 @@ public class ItemsContainer extends GameObject implements InventoryHolder {
} }
} }
@Override
public boolean canPlaceItem(int itemId) {
return (items.size() < containerCapacity);
}
@Override @Override
public void takeItem(int itemId) { public void takeItem(int itemId) {
Optional<Item> first = items.stream() Optional<Item> first = items.stream()

166
Server/src/main/resources/static/images/sprites.json
View File

@ -11376,120 +11376,24 @@
"y": 0.5 "y": 0.5
} }
}, },
"objects/GOURD_PLANT": { "objects/obstacle": {
"frame": { "frame": {
"x": 768, "x": 768,
"y": 1050, "y": 1050,
"w": 32, "w": 128,
"h": 32 "h": 114
}, },
"rotated": false, "rotated": false,
"trimmed": false, "trimmed": false,
"spriteSourceSize": { "spriteSourceSize": {
"x": 0, "x": 0,
"y": 0, "y": 0,
"w": 32, "w": 128,
"h": 32 "h": 114
}, },
"sourceSize": { "sourceSize": {
"w": 32, "w": 128,
"h": 32 "h": 114
},
"pivot": {
"x": 0.5,
"y": 0.5
}
},
"objects/kiln": {
"frame": {
"x": 800,
"y": 1050,
"w": 116,
"h": 117
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 116,
"h": 117
},
"sourceSize": {
"w": 116,
"h": 117
},
"pivot": {
"x": 0.5,
"y": 0.5
}
},
"objects/kiln_s": {
"frame": {
"x": 916,
"y": 1050,
"w": 116,
"h": 117
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 116,
"h": 117
},
"sourceSize": {
"w": 116,
"h": 117
},
"pivot": {
"x": 0.5,
"y": 0.5
}
},
"objects/plant1": {
"frame": {
"x": 1032,
"y": 1050,
"w": 64,
"h": 64
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 64,
"h": 64
},
"sourceSize": {
"w": 64,
"h": 64
},
"pivot": {
"x": 0.5,
"y": 0.5
}
},
"objects/plant1_s": {
"frame": {
"x": 1096,
"y": 1050,
"w": 64,
"h": 64
},
"rotated": false,
"trimmed": false,
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 64,
"h": 64
},
"sourceSize": {
"w": 64,
"h": 64
}, },
"pivot": { "pivot": {
"x": 0.5, "x": 0.5,
@ -11498,7 +11402,7 @@
}, },
"objects/portal": { "objects/portal": {
"frame": { "frame": {
"x": 1160, "x": 896,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 110 "h": 110
@ -11522,7 +11426,7 @@
}, },
"objects/RadioTower": { "objects/RadioTower": {
"frame": { "frame": {
"x": 1288, "x": 1024,
"y": 1050, "y": 1050,
"w": 168, "w": 168,
"h": 237 "h": 237
@ -11546,7 +11450,7 @@
}, },
"objects/rocket": { "objects/rocket": {
"frame": { "frame": {
"x": 1456, "x": 1192,
"y": 1050, "y": 1050,
"w": 135, "w": 135,
"h": 189 "h": 189
@ -11570,7 +11474,7 @@
}, },
"objects/shieldBack": { "objects/shieldBack": {
"frame": { "frame": {
"x": 1591, "x": 1327,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 70 "h": 70
@ -11594,7 +11498,7 @@
}, },
"objects/shieldFront": { "objects/shieldFront": {
"frame": { "frame": {
"x": 1719, "x": 1455,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 70 "h": 70
@ -11618,7 +11522,7 @@
}, },
"objects/VaultDoor": { "objects/VaultDoor": {
"frame": { "frame": {
"x": 1847, "x": 1583,
"y": 1050, "y": 1050,
"w": 213, "w": 213,
"h": 170 "h": 170
@ -11642,7 +11546,7 @@
}, },
"objects/VaultDoor1": { "objects/VaultDoor1": {
"frame": { "frame": {
"x": 2060, "x": 1796,
"y": 1050, "y": 1050,
"w": 139, "w": 139,
"h": 150 "h": 150
@ -11666,7 +11570,7 @@
}, },
"objects/VaultDoorCrop": { "objects/VaultDoorCrop": {
"frame": { "frame": {
"x": 2199, "x": 1935,
"y": 1050, "y": 1050,
"w": 137, "w": 137,
"h": 150 "h": 150
@ -11690,7 +11594,7 @@
}, },
"objects/VaultDoorScreen/1": { "objects/VaultDoorScreen/1": {
"frame": { "frame": {
"x": 2336, "x": 2072,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11714,7 +11618,7 @@
}, },
"objects/VaultDoorScreen/2": { "objects/VaultDoorScreen/2": {
"frame": { "frame": {
"x": 2356, "x": 2092,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11738,7 +11642,7 @@
}, },
"objects/VaultDoorScreen/3": { "objects/VaultDoorScreen/3": {
"frame": { "frame": {
"x": 2376, "x": 2112,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11762,7 +11666,7 @@
}, },
"objects/VaultDoorScreen/4": { "objects/VaultDoorScreen/4": {
"frame": { "frame": {
"x": 2396, "x": 2132,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11786,7 +11690,7 @@
}, },
"objects/VaultDoorScreen/5": { "objects/VaultDoorScreen/5": {
"frame": { "frame": {
"x": 2416, "x": 2152,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11810,7 +11714,7 @@
}, },
"objects/VaultDoorScreen/6": { "objects/VaultDoorScreen/6": {
"frame": { "frame": {
"x": 2436, "x": 2172,
"y": 1050, "y": 1050,
"w": 20, "w": 20,
"h": 18 "h": 18
@ -11834,7 +11738,7 @@
}, },
"tiles/bigTile": { "tiles/bigTile": {
"frame": { "frame": {
"x": 2456, "x": 2192,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 140 "h": 140
@ -11858,7 +11762,7 @@
}, },
"tiles/bigTile2": { "tiles/bigTile2": {
"frame": { "frame": {
"x": 2584, "x": 2320,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 153 "h": 153
@ -11882,7 +11786,7 @@
}, },
"tiles/magneticTile": { "tiles/magneticTile": {
"frame": { "frame": {
"x": 2712, "x": 2448,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 114 "h": 114
@ -11906,7 +11810,7 @@
}, },
"tiles/tile": { "tiles/tile": {
"frame": { "frame": {
"x": 2840, "x": 2576,
"y": 1050, "y": 1050,
"w": 128, "w": 128,
"h": 114 "h": 114
@ -11930,7 +11834,7 @@
}, },
"ui/arrow_east": { "ui/arrow_east": {
"frame": { "frame": {
"x": 2968, "x": 2704,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -11954,7 +11858,7 @@
}, },
"ui/arrow_east_s": { "ui/arrow_east_s": {
"frame": { "frame": {
"x": 3070, "x": 2806,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -11978,7 +11882,7 @@
}, },
"ui/arrow_north": { "ui/arrow_north": {
"frame": { "frame": {
"x": 3172, "x": 2908,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12002,7 +11906,7 @@
}, },
"ui/arrow_north_s": { "ui/arrow_north_s": {
"frame": { "frame": {
"x": 3274, "x": 3010,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12026,7 +11930,7 @@
}, },
"ui/arrow_south": { "ui/arrow_south": {
"frame": { "frame": {
"x": 3376, "x": 3112,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12050,7 +11954,7 @@
}, },
"ui/arrow_south_s": { "ui/arrow_south_s": {
"frame": { "frame": {
"x": 3478, "x": 3214,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12074,7 +11978,7 @@
}, },
"ui/arrow_west": { "ui/arrow_west": {
"frame": { "frame": {
"x": 3580, "x": 3316,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12098,7 +12002,7 @@
}, },
"ui/arrow_west_s": { "ui/arrow_west_s": {
"frame": { "frame": {
"x": 3682, "x": 3418,
"y": 1050, "y": 1050,
"w": 102, "w": 102,
"h": 51 "h": 51
@ -12122,7 +12026,7 @@
}, },
"ui/compass": { "ui/compass": {
"frame": { "frame": {
"x": 3784, "x": 3520,
"y": 1050, "y": 1050,
"w": 162, "w": 162,
"h": 147 "h": 147
@ -12155,6 +12059,6 @@
"h": 1287 "h": 1287
}, },
"scale": "1", "scale": "1",
"smartupdate": "$TexturePacker:SmartUpdate:73c963294f55ee095af7f9f7c60b9d3d:93610d7ee804aa39ff18e2974a508abb:1eabdf11f75e3a4fe3147baf7b5be24b$" "smartupdate": "$TexturePacker:SmartUpdate:cabd9bbebff623bfa01a63c764edf16e:8b226981e250398faa4378b63606c23e:1eabdf11f75e3a4fe3147baf7b5be24b$"
} }
} }

BIN
Server/src/main/resources/static/images/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 KiB

After

Width:  |  Height:  |  Size: 573 KiB

95
Server/src/main/resources/static/js/mar.js vendored
View File

@ -8,7 +8,7 @@ var __extends = (this && this.__extends) || (function () {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
}; };
return extendStatics(d, b); return extendStatics(d, b);
} };
return function (d, b) { return function (d, b) {
extendStatics(d, b); extendStatics(d, b);
function __() { this.constructor = d; } function __() { this.constructor = d; }
@ -336,6 +336,12 @@ var config = {
}, },
world: { world: {
defaultSize: 16 defaultSize: 16
},
obstacle: {
tint: 0x0aced6,
},
constructionSite: {
tint: 0x0aced6,
} }
}; };
var Util = (function () { var Util = (function () {
@ -822,6 +828,7 @@ var GameClient = (function () {
}; };
return GameClient; return GameClient;
}()); }());
var game = PIXI.game;
var ObjectType; var ObjectType;
(function (ObjectType) { (function (ObjectType) {
ObjectType["CUBOT"] = "net.simon987.cubotplugin.Cubot"; ObjectType["CUBOT"] = "net.simon987.cubotplugin.Cubot";
@ -830,10 +837,11 @@ var ObjectType;
ObjectType["FACTORY"] = "net.simon987.npcplugin.Factory"; ObjectType["FACTORY"] = "net.simon987.npcplugin.Factory";
ObjectType["RADIO_TOWER"] = "net.simon987.npcplugin.RadioTower"; ObjectType["RADIO_TOWER"] = "net.simon987.npcplugin.RadioTower";
ObjectType["VAULT_DOOR"] = "net.simon987.npcplugin.VaultDoor"; ObjectType["VAULT_DOOR"] = "net.simon987.npcplugin.VaultDoor";
ObjectType["OBSTACLE"] = "net.simon987.npcplugin.Obstacle"; ObjectType["OBSTACLE"] = "net.simon987.constructionplugin.Obstacle";
ObjectType["ELECTRIC_BOX"] = "net.simon987.npcplugin.ElectricBox"; ObjectType["ELECTRIC_BOX"] = "net.simon987.npcplugin.ElectricBox";
ObjectType["PORTAL"] = "net.simon987.npcplugin.Portal"; ObjectType["PORTAL"] = "net.simon987.npcplugin.Portal";
ObjectType["HACKED_NPC"] = "net.simon987.npcplugin.HackedNPC"; ObjectType["HACKED_NPC"] = "net.simon987.npcplugin.HackedNPC";
ObjectType["CONSTRUCTION_SITE"] = "net.simon987.constructionplugin.ConstructionSite";
})(ObjectType || (ObjectType = {})); })(ObjectType || (ObjectType = {}));
var ItemType; var ItemType;
(function (ItemType) { (function (ItemType) {
@ -872,13 +880,15 @@ var GameObject = (function (_super) {
case ObjectType.VAULT_DOOR: case ObjectType.VAULT_DOOR:
return new VaultDoor(json); return new VaultDoor(json);
case ObjectType.OBSTACLE: case ObjectType.OBSTACLE:
return null; return new Obstacle(json);
case ObjectType.ELECTRIC_BOX: case ObjectType.ELECTRIC_BOX:
return new ElectricBox(json); return new ElectricBox(json);
case ObjectType.PORTAL: case ObjectType.PORTAL:
return new Portal(json); return new Portal(json);
case ObjectType.HACKED_NPC: case ObjectType.HACKED_NPC:
return new HackedNPC(json); return new HackedNPC(json);
case ObjectType.CONSTRUCTION_SITE:
return new ConstructionSite(json);
default: default:
return null; return null;
} }
@ -1287,7 +1297,7 @@ var BiomassBlob = (function (_super) {
mar.game.tweens.removeFrom(this); mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true);
this.tint = config.biomass.tintHover; this.tint = config.biomass.tint;
this.text.visible = false; this.text.visible = false;
}; };
BiomassBlob.prototype.updateObject = function (json) { BiomassBlob.prototype.updateObject = function (json) {
@ -1446,6 +1456,83 @@ var ElectricBox = (function (_super) {
}; };
return ElectricBox; return ElectricBox;
}(GameObject)); }(GameObject));
var Obstacle = (function (_super) {
__extends(Obstacle, _super);
function Obstacle(json) {
var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/obstacle") || this;
_this.anchor.set(0.5, 0.3);
_this.tint = config.obstacle.tint;
_this.setText("Obstacle");
_this.text.visible = false;
_this.id = json.i;
_this.tileX = json.x;
_this.tileY = json.y;
return _this;
}
Obstacle.prototype.updateObject = function (json) {
};
Obstacle.prototype.onTileHover = function () {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 25}, 200, Phaser.Easing.Quadratic.InOut, true);
mar.game.add.tween(this.scale).to({x: 1.1, y: 1.1}, 200, Phaser.Easing.Linear.None, true);
this.tint = config.cubot.hoverTint;
this.text.visible = true;
};
Obstacle.prototype.onTileExit = function () {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({x: 1, y: 1}, 200, Phaser.Easing.Linear.None, true);
this.tint = config.portal.tint;
this.text.visible = false;
};
return Obstacle;
}(GameObject));
var ConstructionSite = (function (_super) {
__extends(ConstructionSite, _super);
function ConstructionSite(json) {
var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", ConstructionSite.getTargetSprite(json.blueprint.target)) || this;
_this.anchor.set(0.5, 0.31);
_this.tint = config.constructionSite.tint;
_this.setText("Construction site");
_this.text.visible = false;
_this.setUpAlphaTween();
_this.id = json.i;
_this.tileX = json.x;
_this.tileY = json.y;
return _this;
}
ConstructionSite.getTargetSprite = function (targetType) {
switch (targetType) {
case ObjectType.OBSTACLE:
return "objects/obstacle";
}
};
ConstructionSite.prototype.updateObject = function (json) {
};
ConstructionSite.prototype.setUpAlphaTween = function () {
var alphaTween = mar.game.add.tween(this).to({alpha: 0.5}, 2000, Phaser.Easing.Linear.None, true, 0, -1);
alphaTween.yoyo(true, 3000);
};
ConstructionSite.prototype.onTileHover = function () {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 19}, 200, Phaser.Easing.Quadratic.InOut, true);
mar.game.add.tween(this.scale).to({x: 1.03, y: 1.03}, 200, Phaser.Easing.Linear.None, true);
this.setUpAlphaTween();
this.text.visible = true;
};
ConstructionSite.prototype.onTileExit = function () {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({x: 1.03, y: 1.03}, 200, Phaser.Easing.Linear.None, true);
this.setUpAlphaTween();
this.text.visible = false;
};
return ConstructionSite;
}(GameObject));
var Portal = (function (_super) { var Portal = (function (_super) {
__extends(Portal, _super); __extends(Portal, _super);
function Portal(json) { function Portal(json) {

102
Server/src/main/typescript/GameObject.ts
View File

@ -5,10 +5,11 @@ enum ObjectType {
FACTORY = "net.simon987.npcplugin.Factory", FACTORY = "net.simon987.npcplugin.Factory",
RADIO_TOWER = "net.simon987.npcplugin.RadioTower", RADIO_TOWER = "net.simon987.npcplugin.RadioTower",
VAULT_DOOR = "net.simon987.npcplugin.VaultDoor", VAULT_DOOR = "net.simon987.npcplugin.VaultDoor",
OBSTACLE = "net.simon987.npcplugin.Obstacle", OBSTACLE = "net.simon987.constructionplugin.Obstacle",
ELECTRIC_BOX = "net.simon987.npcplugin.ElectricBox", ELECTRIC_BOX = "net.simon987.npcplugin.ElectricBox",
PORTAL = "net.simon987.npcplugin.Portal", PORTAL = "net.simon987.npcplugin.Portal",
HACKED_NPC = "net.simon987.npcplugin.HackedNPC" HACKED_NPC = "net.simon987.npcplugin.HackedNPC",
CONSTRUCTION_SITE = "net.simon987.constructionplugin.ConstructionSite"
} }
enum ItemType { enum ItemType {
@ -71,13 +72,15 @@ abstract class GameObject extends Phaser.Plugin.Isometric.IsoSprite {
case ObjectType.VAULT_DOOR: case ObjectType.VAULT_DOOR:
return new VaultDoor(json); return new VaultDoor(json);
case ObjectType.OBSTACLE: case ObjectType.OBSTACLE:
return null; return new Obstacle(json);
case ObjectType.ELECTRIC_BOX: case ObjectType.ELECTRIC_BOX:
return new ElectricBox(json); return new ElectricBox(json);
case ObjectType.PORTAL: case ObjectType.PORTAL:
return new Portal(json); return new Portal(json);
case ObjectType.HACKED_NPC: case ObjectType.HACKED_NPC:
return new HackedNPC(json); return new HackedNPC(json);
case ObjectType.CONSTRUCTION_SITE:
return new ConstructionSite(json);
default: default:
return null; return null;
@ -622,7 +625,7 @@ class BiomassBlob extends GameObject {
mar.game.tweens.removeFrom(this); mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true); mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({x: 1, y: 1}, 200, Phaser.Easing.Linear.None, true); mar.game.add.tween(this.scale).to({x: 1, y: 1}, 200, Phaser.Easing.Linear.None, true);
this.tint = config.biomass.tintHover; this.tint = config.biomass.tint;
this.text.visible = false; this.text.visible = false;
} }
@ -848,6 +851,97 @@ class ElectricBox extends GameObject {
} }
} }
class Obstacle extends GameObject {
constructor(json) {
super(Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/obstacle");
this.anchor.set(0.5, 0.3);
this.tint = config.obstacle.tint;
this.setText("Obstacle");
this.text.visible = false;
this.id = json.i;
this.tileX = json.x;
this.tileY = json.y;
}
updateObject(json): void {
//noop
}
public onTileHover() {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 25}, 200, Phaser.Easing.Quadratic.InOut, true);
mar.game.add.tween(this.scale).to({x: 1.1, y: 1.1}, 200, Phaser.Easing.Linear.None, true);
this.tint = config.cubot.hoverTint;
this.text.visible = true;
}
public onTileExit() {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({x: 1, y: 1}, 200, Phaser.Easing.Linear.None, true);
this.tint = config.portal.tint;
this.text.visible = false;
}
}
class ConstructionSite extends GameObject {
private static getTargetSprite(targetType: string): string {
switch (targetType) {
case ObjectType.OBSTACLE:
return "objects/obstacle";
}
}
constructor(json) {
super(Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", ConstructionSite.getTargetSprite(json.blueprint.target));
this.anchor.set(0.5, 0.31);
this.tint = config.constructionSite.tint;
this.setText("Construction site");
this.text.visible = false;
this.setUpAlphaTween();
this.id = json.i;
this.tileX = json.x;
this.tileY = json.y;
}
updateObject(json): void {
//noop
}
private setUpAlphaTween() {
let alphaTween = mar.game.add.tween(this).to({alpha: 0.5},
2000, Phaser.Easing.Linear.None, true, 0, -1);
alphaTween.yoyo(true, 3000);
}
public onTileHover() {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 19}, 200, Phaser.Easing.Quadratic.InOut, true);
mar.game.add.tween(this.scale).to({x: 1.03, y: 1.03}, 200, Phaser.Easing.Linear.None, true);
this.setUpAlphaTween();
this.text.visible = true;
}
public onTileExit() {
mar.game.tweens.removeFrom(this);
mar.game.add.tween(this).to({isoZ: 15}, 400, Phaser.Easing.Bounce.Out, true);
mar.game.add.tween(this.scale).to({x: 1.03, y: 1.03}, 200, Phaser.Easing.Linear.None, true);
this.setUpAlphaTween();
this.text.visible = false;
}
}
class Portal extends GameObject { class Portal extends GameObject {
public onTileHover() { public onTileHover() {

6
Server/src/main/typescript/mar.ts
View File

@ -78,6 +78,12 @@ let config = {
}, },
world: { world: {
defaultSize: 16 //Will fallback to this when server does not provide world width defaultSize: 16 //Will fallback to this when server does not provide world width
},
obstacle: {
tint: 0x0aced6, //todo
},
constructionSite: {
tint: 0x0aced6, //todo
} }
}; };

32
plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java
View File

@ -24,17 +24,25 @@ public abstract class BluePrint implements InventoryHolder, JSONSerializable, Mo
*/ */
protected Class<? extends GameObject> targetObject; protected Class<? extends GameObject> targetObject;
static final int DATA_LENGTH = 1024;
/** /**
* Set to true when all the requirements are met * Set to true when all the requirements are met
*/ */
private boolean completed; private boolean completed;
public BluePrint() { BluePrint() {
requiredItems = new HashMap<>(); requiredItems = new HashMap<>();
} }
public BluePrint(Document document) { public BluePrint(Document document) {
requiredItems = (Map<Integer, Integer>) document.get("required_items"); Map<String, Integer> bsonCompatibleRequiredItems = (Map<String, Integer>) document.get("required_items");
requiredItems = new HashMap<>(bsonCompatibleRequiredItems.size());
for (String key : bsonCompatibleRequiredItems.keySet()) {
requiredItems.put(Integer.valueOf(key), bsonCompatibleRequiredItems.get(key));
}
completed = document.getBoolean("completed"); completed = document.getBoolean("completed");
try { try {
targetObject = Class.forName(document.getString("target")).asSubclass(GameObject.class); targetObject = Class.forName(document.getString("target")).asSubclass(GameObject.class);
@ -57,7 +65,7 @@ public abstract class BluePrint implements InventoryHolder, JSONSerializable, Mo
@Override @Override
public boolean placeItem(Item item) { public boolean placeItem(Item item) {
if (requiredItems.containsKey(item.getId()) && requiredItems.get(item.getId()) > 0) { if (canPlaceItem(item.getId())) {
requiredItems.put(item.getId(), requiredItems.get(item.getId()) - 1); requiredItems.put(item.getId(), requiredItems.get(item.getId()) - 1);
checkCompleted(); checkCompleted();
return true; return true;
@ -65,6 +73,11 @@ public abstract class BluePrint implements InventoryHolder, JSONSerializable, Mo
return false; return false;
} }
@Override
public boolean canPlaceItem(int itemId) {
return requiredItems.containsKey(itemId) && requiredItems.get(itemId) > 0;
}
@Override @Override
public void takeItem(int itemId) { public void takeItem(int itemId) {
@ -92,7 +105,7 @@ public abstract class BluePrint implements InventoryHolder, JSONSerializable, Mo
public JSONObject jsonSerialise() { public JSONObject jsonSerialise() {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("target", targetObject); json.put("target", targetObject.getName());
json.put("required_items", requiredItems); json.put("required_items", requiredItems);
return json; return json;
@ -103,8 +116,15 @@ public abstract class BluePrint implements InventoryHolder, JSONSerializable, Mo
Document document = new Document(); Document document = new Document();
document.put("completed", completed); document.put("completed", completed);
document.put("target", targetObject); document.put("target", targetObject.getName());
document.put("required_items", requiredItems); document.put("type", this.getClass().getName());
Map<String, Integer> bsonCompatibleRequiredItems = new HashMap<>();
for (Integer key : requiredItems.keySet()) {
bsonCompatibleRequiredItems.put(String.valueOf(key), requiredItems.get(key));
}
document.put("required_items", bsonCompatibleRequiredItems);
return document; return document;
} }

8
plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java
View File

@ -9,7 +9,7 @@ import java.util.Map;
public class BluePrintRegistry { public class BluePrintRegistry {
public static final BluePrintRegistry INSTANCE = new BluePrintRegistry(); static final BluePrintRegistry INSTANCE = new BluePrintRegistry();
private Map<String, Class<? extends BluePrint>> blueprints; private Map<String, Class<? extends BluePrint>> blueprints;
private Map<String, String> digitizedBlueprints; private Map<String, String> digitizedBlueprints;
@ -19,13 +19,13 @@ public class BluePrintRegistry {
digitizedBlueprints = new HashMap<>(); digitizedBlueprints = new HashMap<>();
} }
public void registerBluePrint(Class<? extends BluePrint> clazz) { void registerBluePrint(Class<? extends BluePrint> clazz) {
blueprints.put(clazz.getCanonicalName(), clazz); blueprints.put(clazz.getCanonicalName(), clazz);
String bpData = new String(BluePrintUtil.bluePrintData(clazz)); String bpData = new String(BluePrintUtil.bluePrintData(clazz));
digitizedBlueprints.put(bpData, clazz.getCanonicalName()); digitizedBlueprints.put(bpData, clazz.getCanonicalName());
} }
public BluePrint deserializeBlueprint(Document document) { BluePrint deserializeBlueprint(Document document) {
String type = document.getString("type"); String type = document.getString("type");
@ -48,7 +48,7 @@ public class BluePrintRegistry {
} }
} }
public BluePrint deserializeBluePrint(char[] chars) { BluePrint deserializeBluePrint(char[] chars) {
String bpData = new String(chars); String bpData = new String(chars);

2
plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java
View File

@ -52,7 +52,7 @@ class BluePrintUtil {
char[] result = new char[ARBITRARY_STRING.length * 32]; char[] result = new char[ARBITRARY_STRING.length * 32];
for (int i = ARBITRARY_STRING.length - 1; i > 0; --i) { for (int i = ARBITRARY_STRING.length - 1; i >= 0; --i) {
char[] hashedBlueprint = hashMessage(ARBITRARY_STRING[i] + blueprint.getName()); char[] hashedBlueprint = hashMessage(ARBITRARY_STRING[i] + blueprint.getName());
if (hashedBlueprint != null) { if (hashedBlueprint != null) {
System.arraycopy(hashedBlueprint, 0, result, System.arraycopy(hashedBlueprint, 0, result,

88
plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionArmHardware.java Normal file
View File

@ -0,0 +1,88 @@
package net.simon987.constructionplugin;
import net.simon987.server.assembly.HardwareModule;
import net.simon987.server.assembly.Register;
import net.simon987.server.assembly.Status;
import net.simon987.server.game.objects.ControllableUnit;
import net.simon987.server.game.objects.GameObject;
import org.bson.Document;
import org.bson.types.ObjectId;
import java.awt.*;
public class ConstructionArmHardware extends HardwareModule {
public static final char HWID = 0x0010;
public static final int DEFAULT_ADDRESS = 0x0010;
private static final int ERR_TILE_BLOCKED = 1;
private static final int ERR_NOT_ENOUGH_ENERGY = 2;
private static final int ERR_MEM_READ = 3;
private static final int ERR_INVALID_BLUEPRINT = 4;
private static final int PLACE_CONSTRUCTION_SITE = 1;
private static final int PLACE_CONSTRUCTION_SITE_COST = 10;
public ConstructionArmHardware(ControllableUnit unit) {
super(null, unit);
}
public ConstructionArmHardware(Document document, ControllableUnit unit) {
super(document, unit);
}
@Override
public void handleInterrupt(Status status) {
int a = getCpu().getRegisterSet().getRegister("A").getValue();
int x = getCpu().getRegisterSet().getRegister("X").getValue();
Register regB = getCpu().getRegisterSet().getRegister("B");
if (a == PLACE_CONSTRUCTION_SITE) {
System.out.println("DEBUG PLACE CONTRUCTION SITE");
char[] bluePrintData = getCpu().getMemory().read(x, BluePrint.DATA_LENGTH);
if (bluePrintData == null) {
regB.setValue(ERR_MEM_READ);
return;
}
BluePrint bluePrint = BluePrintRegistry.INSTANCE.deserializeBluePrint(bluePrintData);
if (bluePrint == null) {
regB.setValue(ERR_INVALID_BLUEPRINT);
return;
}
Point frontTile = unit.getFrontTile();
if (unit.getWorld().isTileBlocked(frontTile.x, frontTile.y)) {
regB.setValue(ERR_TILE_BLOCKED);
return;
}
if (!unit.spendEnergy(PLACE_CONSTRUCTION_SITE_COST)) {
regB.setValue(ERR_NOT_ENOUGH_ENERGY);
return;
}
GameObject constructionSite = new ConstructionSite(bluePrint);
constructionSite.setX(frontTile.x);
constructionSite.setY(frontTile.y);
constructionSite.setObjectId(new ObjectId());
unit.getWorld().addObject(constructionSite);
regB.setValue(0);
System.out.println("OK");
}
}
@Override
public char getId() {
return HWID;
}
}

5
plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java
View File

@ -1,5 +1,6 @@
package net.simon987.constructionplugin; package net.simon987.constructionplugin;
import net.simon987.constructionplugin.event.CpuInitialisationListener;
import net.simon987.server.GameServer; import net.simon987.server.GameServer;
import net.simon987.server.game.objects.GameRegistry; import net.simon987.server.game.objects.GameRegistry;
import net.simon987.server.logging.LogManager; import net.simon987.server.logging.LogManager;
@ -17,8 +18,12 @@ public class ConstructionPlugin extends ServerPlugin {
gameRegistry.registerGameObject(Obstacle.class); gameRegistry.registerGameObject(Obstacle.class);
gameRegistry.registerGameObject(ConstructionSite.class); gameRegistry.registerGameObject(ConstructionSite.class);
gameRegistry.registerHardware(ConstructionArmHardware.class);
BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class); BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class);
listeners.add(new CpuInitialisationListener());
LogManager.LOGGER.info("(Construction Plugin) Initialized construction plugin"); LogManager.LOGGER.info("(Construction Plugin) Initialized construction plugin");
} }
} }

5
plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java
View File

@ -50,6 +50,11 @@ public class ConstructionSite extends Structure implements Updatable, InventoryH
return bluePrint.placeItem(item); return bluePrint.placeItem(item);
} }
@Override
public boolean canPlaceItem(int itemId) {
return bluePrint.canPlaceItem(itemId);
}
@Override @Override
public void takeItem(int itemId) { public void takeItem(int itemId) {
//NOOP //NOOP

27
plugin-contruction/src/main/java/net/simon987/constructionplugin/event/CpuInitialisationListener.java Normal file
View File

@ -0,0 +1,27 @@
package net.simon987.constructionplugin.event;
import net.simon987.constructionplugin.ConstructionArmHardware;
import net.simon987.server.assembly.CPU;
import net.simon987.server.event.CpuInitialisationEvent;
import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventListener;
import net.simon987.server.game.objects.ControllableUnit;
public class CpuInitialisationListener implements GameEventListener {
@Override
public Class getListenedEventType() {
return CpuInitialisationEvent.class;
}
@Override
public void handle(GameEvent event) {
CPU cpu = (CPU) event.getSource();
ControllableUnit unit = ((CpuInitialisationEvent) event).getUnit();
ConstructionArmHardware constructionArmHardware = new ConstructionArmHardware(unit);
constructionArmHardware.setCpu(cpu);
unit.attachHardware(constructionArmHardware, ConstructionArmHardware.DEFAULT_ADDRESS);
}
}