From e97770f86035630e3b211aa56a0f6bace82318e9 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 18:45:12 -0400 Subject: [PATCH 1/8] Skeleton setup + Tuple Impl --- .../RadiationDetector.java | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java new file mode 100644 index 0000000..a3ca753 --- /dev/null +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -0,0 +1,89 @@ +package net.simon987.pluginradioactivecloud; + +import java.util.HashSet; + +import org.bson.Document; +import net.simon987.server.assembly.HardwareModule; +import net.simon987.server.assembly.Status; +import net.simon987.server.game.objects.ControllableUnit; + +public class RadiationDetector extends HardwareModule { + + // Need to change to whatever the last unique address is + public static final int DEFAULT_ADDRESS = 0x010F; + + /** + * Hardware ID (Should be unique) -- NEEDS TO BE CHANGED + */ + public static final char HWID = 0x010F; + + /** + * Radiation detected by cubot + */ + private double currentRadiation = 0; + + /** + * Helper class for getTiles + */ + private class Tuple { + public final int x; + public final int y; + + public Tuple(int x, int y) { + this.x = x; + this.y = y; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + + if (!(o instanceof Tuple)) { + return false; + } + + Tuple t = (Tuple) o; + + return Integer.compare(x, t.x) == 0 && Integer.compare(y, t.y) == 0; + } + } + + /** + * Find tiles between two given tiles. + */ + private HashSet getTiles(int x0, int y0, int x1, int y1) { + + HashSet ret = new HashSet<>(); + double slope = (y1 - y0) / (double) (x1 - x0); + + return ret; + } + + public RadiationDetector(ControllableUnit unit) { + super(null, unit); + + // Set default values + currentRadiation = 0; + } + + public RadiationDetector(Document document, ControllableUnit cubot) { + super(document, cubot); + + // Set default values + currentRadiation = 0; + } + + @Override + public void handleInterrupt(Status status) { + + // Fill in + } + + @Override + public char getId() { + return HWID; + } + +} From f526f369c4c4c54bd3816403ef466747a1e0fb83 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 20:03:06 -0400 Subject: [PATCH 2/8] Add getTiles() to calculate tiles between two coords --- .../RadiationDetector.java | 74 ++++++++++++++----- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index a3ca753..e31301b 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -1,6 +1,6 @@ package net.simon987.pluginradioactivecloud; -import java.util.HashSet; +import java.util.ArrayList; import org.bson.Document; import net.simon987.server.assembly.HardwareModule; @@ -33,30 +33,64 @@ public Tuple(int x, int y) { this.x = x; this.y = y; } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - - if (!(o instanceof Tuple)) { - return false; - } - - Tuple t = (Tuple) o; - - return Integer.compare(x, t.x) == 0 && Integer.compare(y, t.y) == 0; - } } /** - * Find tiles between two given tiles. + * Find tiles between two given coordinates. + * + * @return List of tile coordinates. An empty list indicates tiles are next to + * each other. */ - private HashSet getTiles(int x0, int y0, int x1, int y1) { + public ArrayList getTiles(int x0, int y0, int x1, int y1) { + + ArrayList ret = new ArrayList<>(); + double slope; + if (x1 > x0) + slope = (y1 - y0) / (double) (x1 - x0); + else { + slope = (y0 - y1) / (double) (x0 - x1); + + // Swap values so that x0 < x1. This preps the following code where y is + // determined by adding a step value (1) to x0 till it reaches x1. + int tmp = x1; + x1 = x0; + x0 = tmp; + + tmp = y1; + y1 = y0; + y0 = tmp; + } - HashSet ret = new HashSet<>(); - double slope = (y1 - y0) / (double) (x1 - x0); + // If slope is zero or undefined, return tiles directly along the + // appropriate cardinal direction. + if (x0 == x1) { + int smaller = y0 < y1 ? y0 : y1; + int larger = y0 > y1 ? y0 : y1; + System.out.printf("%d %d", smaller, larger); + for (int i = smaller + 1; i < larger; i++) { + ret.add(new Tuple(x0, i)); + } + } else if (y0 == y1) { + int smaller = x0 < x1 ? x0 : x1; + int larger = x0 > x1 ? x0 : x1; + for (int i = smaller + 1; i < larger; i++) { + ret.add(new Tuple(i, y0)); + } + } else { + // Find all coordinates with 0.1 step + int lastX = x0; + int lastY = y0; + for (int i = x0 * 10; i < x1 * 10; i += 1) { + if (i / 10 != lastX || (int) (slope * i / 10) != lastY) { + // Update last values + lastX = i / 10; + lastY = (int) (slope * i / 10); + + // Add new values to array + ret.add(new Tuple(lastX, lastY)); + } + } + } return ret; } From 72ea92ffb3503adcff52c13fb55c341af741123a Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 20:13:33 -0400 Subject: [PATCH 3/8] Add Euclidean Distance calculation method from coords --- .../RadiationDetector.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index e31301b..9f40251 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -36,8 +36,13 @@ public Tuple(int x, int y) { } /** - * Find tiles between two given coordinates. + * Finds the tiles between the two tiles located at the given coordinates. The + * tiles located at the coordinates are not included in the list. * + * @param x0 x-coordinate of first point + * @param y0 y-coordinate of first point + * @param x1 x-coordinate of second point + * @param y1 y-coordinate of second point * @return List of tile coordinates. An empty list indicates tiles are next to * each other. */ @@ -95,6 +100,19 @@ public ArrayList getTiles(int x0, int y0, int x1, int y1) { return ret; } + /** + * Finds the Euclidean Distance between two coordinates. + * + * @param x0 x-coordinate of first point + * @param y0 y-coordinate of first point + * @param x1 x-coordinate of second point + * @param y1 y-coordinate of second point + * @return distance between two points + */ + public double getDistanceOfCoords(int x0, int y0, int x1, int y1) { + return Math.sqrt(Math.pow(x1 - x0, 2) + Math.pow(y1 - y0, 2)); + } + public RadiationDetector(ControllableUnit unit) { super(null, unit); From a3c4c333000539a3d85376f13dde07eae5585d33 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 20:37:18 -0400 Subject: [PATCH 4/8] Add getAlphaCounts() to Radioactive interface --- .../java/net/simon987/server/game/objects/Radioactive.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java index dc1fcf1..ba7b501 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java +++ b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java @@ -6,5 +6,7 @@ public interface Radioactive { - + public static int getAlphaCounts(double distance) { + return (int) (1000 * 1.0 / (distance * distance)); + } } From 3c16bd3f30a0beb969a16635c7baea81e659e355 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 21:10:39 -0400 Subject: [PATCH 5/8] Implement RadiationDetector's handleInterrupt --- .../RadiationDetector.java | 29 ++++++++++++++++++- .../server/game/objects/Radioactive.java | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index 9f40251..1dc57e1 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -2,10 +2,14 @@ import java.util.ArrayList; +import javax.lang.model.type.UnionType; + import org.bson.Document; import net.simon987.server.assembly.HardwareModule; import net.simon987.server.assembly.Status; import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.server.game.objects.GameObject; +import net.simon987.server.game.objects.Radioactive; public class RadiationDetector extends HardwareModule { @@ -130,7 +134,30 @@ public RadiationDetector(Document document, ControllableUnit cubot) { @Override public void handleInterrupt(Status status) { - // Fill in + // Find all game entities in world + ArrayList entities = new ArrayList<>(unit.getWorld().getGameObjects()); + + // Check for alpha particles by finding Radioactive entities + int alphaParticles = 0; + for (GameObject entity : entities) { + if (entity instanceof Radioactive) { + // Calculate distance between object and cubot + double pathLength = getDistanceOfCoords(unit.getX(), unit.getY(), entity.getX(), entity.getY()); + alphaParticles += ((Radioactive) entity).getAlphaCounts(pathLength); + + // Get all tiles in between cubot and Radioactive entity + ArrayList tiles = getTiles(unit.getX(), unit.getY(), entity.getX(), entity.getY()); + for (Tuple tup : tiles) { + // If intermediary tile is blocked, reduce alphaParticles by 5 + if (unit.getWorld().isTileBlocked(tup.x, tup.y)) { + alphaParticles -= 5; + } + } + } + } + + // Save Alpha Radioactive Particles to register B + getCpu().getRegisterSet().getRegister("B").setValue(alphaParticles); } @Override diff --git a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java index ba7b501..f0bd502 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java +++ b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java @@ -6,7 +6,7 @@ public interface Radioactive { - public static int getAlphaCounts(double distance) { + public default int getAlphaCounts(double distance) { return (int) (1000 * 1.0 / (distance * distance)); } } From 2aeca6c9cee0fc59bfb25976e9e76bd7271c1916 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Wed, 16 Sep 2020 21:13:08 -0400 Subject: [PATCH 6/8] Small cleanup --- .../pluginradioactivecloud/RadiationDetector.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index 1dc57e1..d7953ef 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -13,6 +13,7 @@ public class RadiationDetector extends HardwareModule { + // NEEDS TO BE CHANGED // Need to change to whatever the last unique address is public static final int DEFAULT_ADDRESS = 0x010F; @@ -21,11 +22,6 @@ public class RadiationDetector extends HardwareModule { */ public static final char HWID = 0x010F; - /** - * Radiation detected by cubot - */ - private double currentRadiation = 0; - /** * Helper class for getTiles */ @@ -119,16 +115,10 @@ public double getDistanceOfCoords(int x0, int y0, int x1, int y1) { public RadiationDetector(ControllableUnit unit) { super(null, unit); - - // Set default values - currentRadiation = 0; } public RadiationDetector(Document document, ControllableUnit cubot) { super(document, cubot); - - // Set default values - currentRadiation = 0; } @Override From 0c3a3f06f09f0288440e12881400ac346e995cb4 Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Thu, 17 Sep 2020 10:47:18 -0400 Subject: [PATCH 7/8] Add Beta and Gamma particles; added suggestions --- .../RadiationDetector.java | 37 ++++++++++++++----- .../server/game/objects/Radioactive.java | 8 ++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index d7953ef..2855bf0 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -22,6 +22,13 @@ public class RadiationDetector extends HardwareModule { */ public static final char HWID = 0x010F; + /** + * Radiation Constants + */ + private static final int ALPHA_BLOCKED_VALUE = 5; + private static final int BETA_BLOCKED_VALUE = 2; + private static final int GAMMA_BLOCKED_VALUE = 1; + /** * Helper class for getTiles */ @@ -50,9 +57,9 @@ public ArrayList getTiles(int x0, int y0, int x1, int y1) { ArrayList ret = new ArrayList<>(); double slope; - if (x1 > x0) + if (x1 > x0) { slope = (y1 - y0) / (double) (x1 - x0); - else { + } else { slope = (y0 - y1) / (double) (x0 - x1); // Swap values so that x0 < x1. This preps the following code where y is @@ -69,15 +76,15 @@ public ArrayList getTiles(int x0, int y0, int x1, int y1) { // If slope is zero or undefined, return tiles directly along the // appropriate cardinal direction. if (x0 == x1) { - int smaller = y0 < y1 ? y0 : y1; - int larger = y0 > y1 ? y0 : y1; + int smaller = Math.min(y0, y1); + int larger = Math.max(y0, y1); System.out.printf("%d %d", smaller, larger); for (int i = smaller + 1; i < larger; i++) { ret.add(new Tuple(x0, i)); } } else if (y0 == y1) { - int smaller = x0 < x1 ? x0 : x1; - int larger = x0 > x1 ? x0 : x1; + int smaller = Math.min(x0, x1); + int larger = Math.max(x0, x1); for (int i = smaller + 1; i < larger; i++) { ret.add(new Tuple(i, y0)); } @@ -129,25 +136,37 @@ public void handleInterrupt(Status status) { // Check for alpha particles by finding Radioactive entities int alphaParticles = 0; + int betaParticles = 0; + int gammaParticles = 0; for (GameObject entity : entities) { if (entity instanceof Radioactive) { // Calculate distance between object and cubot double pathLength = getDistanceOfCoords(unit.getX(), unit.getY(), entity.getX(), entity.getY()); alphaParticles += ((Radioactive) entity).getAlphaCounts(pathLength); + betaParticles += ((Radioactive) entity).getBetaCounts(pathLength); + gammaParticles += ((Radioactive) entity).getGammaCounts(pathLength); // Get all tiles in between cubot and Radioactive entity ArrayList tiles = getTiles(unit.getX(), unit.getY(), entity.getX(), entity.getY()); for (Tuple tup : tiles) { // If intermediary tile is blocked, reduce alphaParticles by 5 if (unit.getWorld().isTileBlocked(tup.x, tup.y)) { - alphaParticles -= 5; + alphaParticles -= ALPHA_BLOCKED_VALUE; + betaParticles -= BETA_BLOCKED_VALUE; + gammaParticles -= GAMMA_BLOCKED_VALUE; } } } } - // Save Alpha Radioactive Particles to register B - getCpu().getRegisterSet().getRegister("B").setValue(alphaParticles); + // Save Alpha Radioactive Particles to register A + getCpu().getRegisterSet().getRegister("A").setValue(alphaParticles); + + // Save Beta Radioactive Particles to register B + getCpu().getRegisterSet().getRegister("B").setValue(betaParticles); + + // Save Gamma Radioactive Particles to register C + getCpu().getRegisterSet().getRegister("C").setValue(gammaParticles); } @Override diff --git a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java index f0bd502..f113d80 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java +++ b/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java @@ -9,4 +9,12 @@ public interface Radioactive { public default int getAlphaCounts(double distance) { return (int) (1000 * 1.0 / (distance * distance)); } + + public default int getBetaCounts(double distance) { + return (int) (2000 * 1.0 / (distance * distance)); + } + + public default int getGammaCounts(double distance) { + return (int) (5000 * 1.0 / (distance * distance)); + } } From 3b12e2aeca394c1c6b182d09c746ea41aa40669e Mon Sep 17 00:00:00 2001 From: Khalid Ali Date: Thu, 17 Sep 2020 22:56:06 -0400 Subject: [PATCH 8/8] Set unique HWID --- .../pluginradioactivecloud/RadiationDetector.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java index 2855bf0..ee6ed92 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java +++ b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadiationDetector.java @@ -2,8 +2,6 @@ import java.util.ArrayList; -import javax.lang.model.type.UnionType; - import org.bson.Document; import net.simon987.server.assembly.HardwareModule; import net.simon987.server.assembly.Status; @@ -13,14 +11,15 @@ public class RadiationDetector extends HardwareModule { - // NEEDS TO BE CHANGED - // Need to change to whatever the last unique address is - public static final int DEFAULT_ADDRESS = 0x010F; + /** + * Should be unique and same as HWID + */ + public static final int DEFAULT_ADDRESS = 0x000E; /** - * Hardware ID (Should be unique) -- NEEDS TO BE CHANGED + * Hardware ID (Should be unique) */ - public static final char HWID = 0x010F; + public static final char HWID = 0x000E; /** * Radiation Constants