Feat/portals weight

src/main/java/com/github/manolo8/darkbot/core/entities/Portal.java

@@ -15,25 +15,35 @@ public class Portal extends Entity implements eu.darkbot.api.game.entities.Porta
 
     public final Map target;
     public final int factionId;
+    public final double weight;
     private final PortalMatcher matcher;
     public boolean isJumping;
     public int type;
 
     public Portal(int id, int type, int x, int y) {
-        this(id, type, x, y, null, -1);
+        this(id, type, x, y, null, -1, 1.0);
     }
 
     public Portal(int searchType, int searchX, int searchY, Map target, int factionId) {
-        this(-1, searchType, searchX, searchY, target, factionId);
+        this(searchType, searchX, searchY, target, factionId, 1.0);
+    }
+
+    public Portal(int searchType, int searchX, int searchY, Map target, int factionId, double weight) {
+        this(-1, searchType, searchX, searchY, target, factionId, weight);
     }
 
     public Portal(int id, int searchType, int searchX, int searchY, Map target, int factionId) {
+        this(id, searchType, searchX, searchY, target, factionId, 1.0);
+    }
+
+    public Portal(int id, int searchType, int searchX, int searchY, Map target, int factionId, double weight) {
         super(id);
         this.matcher = new PortalMatcher(searchType, searchX, searchY, target != null && target.id == 71);
 
-        super.removed  = true;
-        this.target    = target;
+        super.removed = true;
+        this.target = target;
         this.factionId = factionId;
+        this.weight = weight;
     }
 
     public boolean matches(int x, int y, int type) {

src/main/java/com/github/manolo8/darkbot/core/manager/StarBuilder.java

@@ -31,13 +31,19 @@ private static class TempMap {
     private static class TempPort {
         private final int x, y, type, factionId;
         private final String targetMap;
+        private final double weight;
 
         TempPort(int x, int y, int type, int factionId, String targetMap) {
+            this(x, y, type, factionId, targetMap, 1.0);
+        }
+
+        TempPort(int x, int y, int type, int factionId, String targetMap, double weight) {
             this.x = x;
             this.y = y;
             this.type = type;
             this.factionId = factionId;
             this.targetMap = targetMap;
+            this.weight = weight;
         }
     }
 
@@ -98,6 +104,11 @@ protected StarBuilder addPortal(int x, int y, String targetMap) {
         return this;
     }
 
+    protected StarBuilder addPortal(int x, int y, String targetMap, double weight) {
+        current.ports.add(new TempPort(x, y, -1, -1, targetMap, weight));
+        return this;
+    }
+
     @SuppressWarnings("SameParameterValue")
     protected StarBuilder addPortal(int x, int y, String targetMap, int factionId) {
         current.ports.add(new TempPort(x, y, -1, factionId, targetMap));
@@ -155,16 +166,24 @@ public Graph<Map, Portal> build() {
         for (TempMap map : maps) {
             for (TempPort port : map.ports) {
                 Map target = mapsByName.get(port.targetMap);
-                graph.addEdge(mapsByName.get(map.name), target, new Portal(port.type, port.x, port.y, target, port.factionId));
+                Portal portal = new Portal(port.type, port.x, port.y, target, port.factionId, port.weight);
+                graph.addEdge(mapsByName.get(map.name), target, portal);
+                graph.setEdgeWeight(portal, portal.weight);
             }
         }
 
         for (GGPort ggPort : ggPorts) {
             Map gg = mapsByName.get(ggPort.targetMap);
-            if (ggPort.looped) graph.addEdge(gg, gg, new Portal(ggPort.type, -1, -1, gg, -1));
+            if (ggPort.looped) {
+                Portal portal = new Portal(ggPort.type, -1, -1, gg, -1);
+                graph.addEdge(gg, gg, portal);
+                graph.setEdgeWeight(portal, portal.weight);
+            }
             for (String mapName : ggPort.maps) {
                 Map from = mapsByName.get(mapName);
-                graph.addEdge(from, gg, new Portal(ggPort.type, ggPort.x, ggPort.y, gg, -1));
+                Portal portal = new Portal(ggPort.type, ggPort.x, ggPort.y, gg, -1);
+                graph.addEdge(from, gg, portal);
+                graph.setEdgeWeight(portal, portal.weight);
             }
         }
         return graph;

src/main/java/com/github/manolo8/darkbot/core/manager/StarManager.java

@@ -48,7 +48,7 @@ private StarManager() {
                 .addMap(17, "1-5").addPortal(19000, 6000, "4-4").addPortal(10000, 12000, "4-5").addPortal(2000, 2000, "1-6").addPortal(2000, 11500, "1-7").addPortal(10500, 6750, "Experiment Zone 2-1")
                 .addMap(18, "1-6").addPortal(18500, 11500, "1-5").addPortal(2000, 11500, "1-8")
                 .addMap(19, "1-7").addPortal(2000, 2000, "1-8").addPortal(18500, 2000, "1-5")
-                .addMap(20, "1-8").addPortal(18500, 2000, "1-6").addPortal(18500, 11500, "1-7").addPortal(11084, 11084, "1BL");
+                .addMap(20, "1-8").addPortal(18500, 2000, "1-6").addPortal(18500, 11500, "1-7").addPortal(10500, 1000, "1BL", 10.0);
                 // EIC
         mapBuild.addMap(5, "2-1").addPortal(2000, 11500, "2-2").addPortal(10500, 6750, "Experiment Zone 1")
                 .addMap(6, "2-2").addPortal(2000, 11500, "2-3").addPortal(18500, 11500, "2-4").addPortal(18500, 2000, "2-1")
@@ -57,7 +57,7 @@ private StarManager() {
                 .addMap(21, "2-5").addPortal(2000, 11500, "4-4").addPortal(18500, 11500, "4-5").addPortal(2000, 2000, "2-6").addPortal(18500, 2000, "2-7").addPortal(10500, 6750, "Experiment Zone 2-2")
                 .addMap(22, "2-6").addPortal(2000, 11500, "2-5").addPortal(18500, 2000, "2-8")
                 .addMap(23, "2-7").addPortal(2000, 11500, "2-5").addPortal(18500, 2000, "2-8")
-                .addMap(24, "2-8").addPortal(2000, 11500, "2-6").addPortal(18500, 11500, "2-7").addPortal(11084, 11084, "2BL");
+                .addMap(24, "2-8").addPortal(2000, 11500, "2-6").addPortal(18500, 11500, "2-7").addPortal(10500, 12500, "2BL", 10.0);
                 // VRU
         mapBuild.addMap(9, "3-1").addPortal(2000, 2000, "3-2").addPortal(10500, 6750, "Experiment Zone 1")
                 .addMap(10, "3-2").addPortal(18500, 2000, "3-3").addPortal(2000, 2000, "3-4").addPortal(18500, 11500, "3-1")
@@ -66,7 +66,7 @@ private StarManager() {
                 .addMap(25, "3-5").addPortal(2000, 2000, "4-4").addPortal(16500, 1500, "4-5").addPortal(2000, 11500, "3-6").addPortal(18500, 11500, "3-7").addPortal(10500, 6750, "Experiment Zone 2-3")
                 .addMap(26, "3-6").addPortal(2000, 2000, "3-5").addPortal(18500, 11500, "3-8")
                 .addMap(27, "3-7").addPortal(2000, 11500, "3-5").addPortal(18500, 11500, "3-8")
-                .addMap(28, "3-8").addPortal(2000, 2000, "3-7").addPortal(2000, 11500, "3-6").addPortal(11084, 11084, "3BL");
+                .addMap(28, "3-8").addPortal(2000, 2000, "3-7").addPortal(2000, 11500, "3-6").addPortal(10500, 1000, "3BL", 10.0);
                 // B-MAPS
         mapBuild.addMap(13, "4-1").addPortal(1500, 6000, "1-4").addPortal(18500, 2000, "4-2").addPortal(18500, 11500, "4-3").addPortal(10500, 6750, "4-4")
                 .addMap(14, "4-2").addPortal(10000, 1500, "2-4").addPortal(2000, 11500, "4-1").addPortal(18500, 11500, "4-3").addPortal(10500, 6750, "4-4")

src/main/java/com/github/manolo8/darkbot/modules/DisconnectModule.java

@@ -7,6 +7,12 @@
 import com.github.manolo8.darkbot.utils.I18n;
 import com.github.manolo8.darkbot.utils.Time;
 
+import javax.swing.JButton;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+import eu.darkbot.util.Popups;
+
 @SuppressWarnings("removal")
 public class DisconnectModule extends TemporalModule {
 
@@ -23,15 +29,27 @@ public class DisconnectModule extends TemporalModule {
 
     private Long pauseUntil = null;
     private boolean refreshing = false;
+    private boolean closeBot = false;
+    private boolean popupOpened = false;
 
     /**
-     * @param pauseTime null for infinite pause, otherwise pause for that amount of MS.
+     * @param pauseTime null for infinite pause, otherwise pause for that amount of
+     *                  MS.
      */
     public DisconnectModule(Long pauseTime, String reason) {
         this.reason = reason;
         this.pauseTime = pauseTime;
     }
 
+    /**
+     * @param pauseTime null for infinite pause, otherwise pause for that amount of
+     *                  MS.
+     */
+    public DisconnectModule(Long pauseTime, String reason, boolean closeBot) {
+        this(pauseTime, reason);
+        this.closeBot = closeBot;
+    }
+
     @Override
     public void install(Main main) {
         super.install(main);
@@ -55,6 +73,7 @@ public boolean canRefresh() {
 
     @Override
     public void tick() {
+        showClosePopup();
         // Just in case refresh was super quick, don't go back to normal tick.
         if (refreshing) {
             tickStopped();
@@ -63,8 +82,10 @@ public void tick() {
         main.guiManager.pet.setEnabled(false);
         safety.setRefreshing(true);
         safety.tick();
-        if (hero.locationInfo.isMoving() || safety.state() != SafetyFinder.Escaping.WAITING) return;
-        if (!logout.visible) logoutStart = System.currentTimeMillis();
+        if (hero.locationInfo.isMoving() || safety.state() != SafetyFinder.Escaping.WAITING)
+            return;
+        if (!logout.visible)
+            logoutStart = System.currentTimeMillis();
         logout.show(true);
         // Prevent bug where logout gets to 0 and doesn't log out, just force a reload
         if (System.currentTimeMillis() - logoutStart > 25_000) {
@@ -76,14 +97,23 @@ public void tick() {
 
     @Override
     public void tickStopped() {
+        showClosePopup();
         if (main.isRunning()) {
-            if (!lostConnection.visible) return;
+            if (!lostConnection.visible)
+                return;
             // Bot done. Pause "forever" (unless a behaviour restarts it).
-            if (pauseTime == null) main.setRunning(false);
-            else if (pauseTime == 0) goBack();
+            if (pauseTime == null)
+                main.setRunning(false);
+            else if (pauseTime == 0)
+                goBack();
             else {
                 pauseUntil = System.currentTimeMillis() + pauseTime;
                 main.setRunning(false);
+
+                if (closeBot) {
+                    System.out.println("Exit by the Disconnect module, exiting");
+                    System.exit(0);
+                }
             }
         } else if (pauseUntil != null && System.currentTimeMillis() > pauseUntil - 10_000) {
             if (!refreshing) {
@@ -104,7 +134,32 @@ public String status() {
 
     @Override
     public String stoppedStatus() {
-        if (pauseUntil == null) return I18n.get("module.disconnect.status_stopped", reason);
-        else return I18n.get("module.disconnect.status_paused", reason, Time.toString(Math.max(0, pauseUntil - System.currentTimeMillis())));
+        if (pauseUntil == null)
+            return I18n.get("module.disconnect.status_stopped", reason);
+        else
+            return I18n.get("module.disconnect.status_paused", reason,
+                    Time.toString(Math.max(0, pauseUntil - System.currentTimeMillis())));
+    }
+
+    private void showClosePopup() {
+        if (!closeBot || popupOpened) {
+            return;
+        }
+
+        this.popupOpened = true;
+        JButton okBtn = new JButton(I18n.get("module.disconnect.popup.ok_btn"));
+        JButton cancelBtn = new JButton(I18n.get("module.disconnect.popup.cancel_btn"));
+        okBtn.addActionListener(e -> {
+            SwingUtilities.getWindowAncestor(okBtn).setVisible(false);
+        });
+        cancelBtn.addActionListener(e -> {
+            closeBot = false;
+            SwingUtilities.getWindowAncestor(cancelBtn).setVisible(false);
+        });
+
+        Popups.of(I18n.get("module.disconnect.popup.title"),
+                new JOptionPane(I18n.get("module.disconnect.popup.message"), JOptionPane.INFORMATION_MESSAGE,
+                        JOptionPane.DEFAULT_OPTION, null, new Object[] { okBtn, cancelBtn }))
+                .showAsync();
     }
 }

src/main/resources/lang/strings_en.properties

@@ -531,6 +531,10 @@ module.disconnect.reason.break=taking a break
 module.disconnect.reason.death_pause=Killed by {0} {1} times
 module.disconnect.reason.honor=lost honor
 module.disconnect.reason.draw_fire=Enemy used draw fire
+module.disconnect.popup.cancel_btn=Cancel
+module.disconnect.popup.ok_btn=Ok
+module.disconnect.popup.title=The bot will be closed
+module.disconnect.popup.message=The bot will close completely when it disconnects, you can cancel it.
 
 module.portal_jumper.status=Jumping to {0}