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

Merge pull request #143 from mlaga97/lidar-vault-fix

Browse Source 
Make LiDAR work in Vaults (fixes #140)
This commit is contained in:
Simon Fortier 2018-03-29 20:10:44 -04:00 committed by GitHub
commit f1b8f3dc6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ public class CubotLidar extends CpuHardware implements JSONSerialisable {
private static final int LIDAR_GET_PATH = 2; private static final int LIDAR_GET_PATH = 2;
private static final int LIDAR_GET_MAP = 3; private static final int LIDAR_GET_MAP = 3;
private static final int LIDAR_GET_WORLD_POS = 4; private static final int LIDAR_GET_WORLD_POS = 4;
private static final int LIDAR_GET_WORLD_SIZE = 5;
private static final int MEMORY_MAP_START = 0x0100; private static final int MEMORY_MAP_START = 0x0100;
private static final int MEMORY_PATH_START = 0x0000; private static final int MEMORY_PATH_START = 0x0000;
@ -113,7 +114,8 @@ public class CubotLidar extends CpuHardware implements JSONSerialisable {
if (cubot.spendEnergy(10)) { if (cubot.spendEnergy(10)) {
char[][] mapInfo = cubot.getWorld().getMapInfo(); char[][] mapInfo = cubot.getWorld().getMapInfo();
int i = MEMORY_MAP_START; //Write map data to the location specified by register X
int i = getCpu().getRegisterSet().getRegister("X").getValue();
for (int y = 0; y < cubot.getWorld().getWorldSize(); y++) { for (int y = 0; y < cubot.getWorld().getWorldSize(); y++) {
for (int x = 0; x < cubot.getWorld().getWorldSize(); x++) { for (int x = 0; x < cubot.getWorld().getWorldSize(); x++) {
getCpu().getMemory().set(i++, mapInfo[x][y]); getCpu().getMemory().set(i++, mapInfo[x][y]);
@ -122,6 +124,12 @@ public class CubotLidar extends CpuHardware implements JSONSerialisable {
} }
break; break;
case LIDAR_GET_WORLD_SIZE:
getCpu().getRegisterSet().getRegister("X").setValue(cubot.getWorld().getWorldSize());
getCpu().getRegisterSet().getRegister("Y").setValue(cubot.getWorld().getWorldSize());
break;
case LIDAR_GET_WORLD_POS: case LIDAR_GET_WORLD_POS:
getCpu().getRegisterSet().getRegister("X").setValue(cubot.getWorld().getX()); getCpu().getRegisterSet().getRegister("X").setValue(cubot.getWorld().getX());
getCpu().getRegisterSet().getRegister("Y").setValue(cubot.getWorld().getY()); getCpu().getRegisterSet().getRegister("Y").setValue(cubot.getWorld().getY());