winiciuscota · yosh778 · May 16, 2017 · May 16, 2017 · May 17, 2017 · May 17, 2017
diff --git a/README.md b/README.md
@@ -21,8 +21,9 @@ The currently supported modes are: <br />
 - transport_resources_to_planet - transport resources from all of your planets to planet x(must be one of your planets) <br />
 - transport_resources_to_weaker_planet - transport resources from all of your planets to the planet that has less buldings <br />
 - auto_build_structure_to_weaker_planet - Build structure on the weaker planet
-- auto_build_structures - Build structures on planets
+- auto_build_structures - Build structures on planets / moons, auto repair & collect ships, auto-buy new day item, 
 - auto_research - Research on your homeplanet
+- check_hostile_activity : Check for hostile activities & attempt fleet escapes with most resources (slow hostile spy missions are considered as attacks too)
 
 e.g.: <br />
 

diff --git a/html/index.php b/html/index.php
@@ -0,0 +1,75 @@
+
+<html>
+<head>
+<meta http-equiv="refresh" content="20">
+</head>
+
+<body>
+<?php include('more.html') ?>
+
+<pre>
+<?php
+
+
+$check="ps -aux | grep OG";
+$escapes0="grep 'Current rank' ~/og_log_ur.txt | tail -1 && grep Incoming ~/og_log_ur.txt -A 3 | tail -n +0 | tail -n 30 | tac";
+$escapes1="grep 'Current rank' ~/og_log_libra.txt | tail -1 && grep Incoming ~/og_log_libra.txt -A 3 | tail -n +0 | tail -n 30 | tac";
+$escapes2="grep 'Current rank' ~/og_log_vi* | tail -1 && grep Incoming ~/og_log_vi* -A 3 | tail -n +0 | tail -n 30 | tac";
+$escapes3="grep 'Current rank' ~/og_log_rh* | tail -1 && grep Incoming ~/og_log_rh* -A 3 | tail -n +0 | tail -n 30 | tac";
+
+date_default_timezone_set('Europe/Paris');
+
+
+$now = new DateTime();
+echo $now->format('Y-m-d H:i:s');
+
+echo '  <a href="/log" target="_blank">logs</a>';
+
+echo "\n\n\nCurrently running : ";
+
+//passthru( $check, $out );
+exec( $check, $out );
+
+$vals = array('libra','uriel','rhea','virgo');
+
+foreach ($out as $line) {
+	foreach ($vals as $val) {
+
+		if ( strstr($line, $val) ) {
+			$$val = true;
+		}
+
+	}
+}
+
+
+foreach ($vals as $val) {
+	if ($$val) {
+		echo $val . " ";
+	}
+}
+
+
+echo "\n\n\nLatest escapes :\n\n";
+
+echo "Uriel\n\n";
+passthru( $escapes0 );
+
+echo "\n\nLibra\n\n";
+passthru( $escapes1 );
+
+echo "\n\nVirgo\n\n";
+passthru( $escapes2 );
+
+echo "\n\nRhea\n\n";
+passthru( $escapes3 );
+
+
+echo '</pre>';
+
+?>
+
+
+</body>
+</html>
+
diff --git a/html/log/index.html b/html/log/index.html
@@ -0,0 +1,11 @@
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
+
+
+<div style="height:20px;"></div>
+<div class="col-md-3">
+<a class="btn btn-warning btn-xs" target="_blank" href="/">back</a> <br><br>
+<a class="btn btn-primary btn-xs" target="_blank" href="/log/libra.php">libra</a>
+<a class="btn btn-primary btn-xs" target="_blank" href="/log/rhea.php">rhea</a>
+<a class="btn btn-primary btn-xs" target="_blank" href="/log/uriel.php">uriel</a>
+<a class="btn btn-primary btn-xs" target="_blank" href="/log/virgo.php">virgo</a>
+</div>
diff --git a/html/log/libra.php b/html/log/libra.php
@@ -0,0 +1,7 @@
+<pre>
+<?php
+passthru('tail -n 20000 ~/og_log_libra.txt | tac');
+
+?>
+</pre>
+
diff --git a/html/log/rhea.php b/html/log/rhea.php
@@ -0,0 +1,7 @@
+<pre>
+<?php
+passthru('tail -n 20000 ~/og_log_rhea.txt | tac');
+
+?>
+</pre>
+
diff --git a/html/log/uriel.php b/html/log/uriel.php
@@ -0,0 +1,7 @@
+<pre>
+<?php
+passthru('tail -n 20000 ~/og_log_ur.txt | tac');
+
+?>
+</pre>
+
diff --git a/html/log/virgo.php b/html/log/virgo.php
@@ -0,0 +1,7 @@
+<pre>
+<?php
+passthru('tail -n 20000 ~/og_log_vi.txt | tac');
+
+?>
+</pre>
+
diff --git a/html/more.html b/html/more.html
@@ -0,0 +1,155 @@
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
+
+<script
+  src="https://code.jquery.com/jquery-3.2.1.min.js"
+  integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4="
+  crossorigin="anonymous"></script>
+
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+
+
+<div class="well well-lg">
+
+<div class="col-md-3">
+<form class="pull-left" id="loginForm" name="loginForm" target="_blank" method="post" action="https://en.ogame.gameforge.com:443/main/login">
+<input type="hidden" name="kid" value="">
+<input type="hidden" name="login" value="">
+<input type="hidden" name="pass" value="">
+<input type="hidden" name="uni" value="s138-en.ogame.gameforge.com">
+<input type="submit" class="btn btn-info btn-xs" id="loginSubmit" value="Libra">
+&nbsp;
+</form>
+
+<form class="col-md-offset-0 pull-left" id="rhea" name="loginForm" target="_blank" method="post" action="https://fr.ogame.gameforge.com:443/main/login">
+<input type="hidden" name="kid" value="">
+<input type="hidden" name="login" value="">
+<input type="hidden" name="pass" value="">
+<input type="hidden" name="uni" value="s144-fr.ogame.gameforge.com">
+<input type="submit" class="btn btn-info btn-xs" id="loginSubmit" value="Rhea">
+<!--
+<a href="?target=rhea" class="btn btn-info btn-xs" onclick="document.getElementById('rhea').submit();">Rhea</a>
+-->
+&nbsp;
+</form>
+
+<form class="pull-left" id="Uriel" name="loginForm" target="_blank" method="post" action="https://fr.ogame.gameforge.com:443/main/login">
+<input type="hidden" name="kid" value="">
+<input type="hidden" name="login" value="">
+<input type="hidden" name="pass" value="">
+<input type="hidden" name="uni" value="s147-fr.ogame.gameforge.com">
+<input type="submit" class="btn btn-info btn-xs" id="loginSubmit" value="Uriel">
+&nbsp;
+</form>
+
+<form class="pull-left" id="loginForm" name="loginForm" target="_blank" method="post" action="https://fr.ogame.gameforge.com:443/main/login">
+<input type="hidden" name="kid" value="">
+<input type="hidden" name="login" value="">
+<input type="hidden" name="pass" value="">
+<input type="hidden" name="uni" value="s148-fr.ogame.gameforge.com">
+<input type="submit" class="btn btn-info btn-xs" id="loginSubmit" value="Virgo">
+</form>
+</div>
+
+<div class="col-md-offset-7">
+<form class="form-inline">
+  <div class="form-group">
+    <input type="password" class="form-control"
+           value="" onchange="save('login', this.value)"
+           name="login" id="name" placeholder="Login">
+  </div>
+  <div class="form-group">
+    <input type="password" class="form-control"
+           value="" onchange="save('pass', this.value)"
+           name="pass" id="password" placeholder="Password">
+  </div>
+</form>
+</div>
+
+</div>
+
+
+<script>
+/*
+var getUrlParameter = function getUrlParameter(sParam) {
+    var sPageURL = decodeURIComponent(window.location.search.substring(1)),
+        sURLVariables = sPageURL.split('&'),
+        sParameterName,
+        i;
+
+    for (i = 0; i < sURLVariables.length; i++) {
+        sParameterName = sURLVariables[i].split('=');
+
+        if (sParameterName[0] === sParam) {
+            return sParameterName[1] === undefined ? true : sParameterName[1];
+        }
+    }
+}
+
+var target = getUrlParameter('target');
+
+var form = $('#'+target);
+
+var data = JSON.stringify( form.serializeArray() );
+
+
+$.ajax({
+	url: form.attr('action'),
+	type: 'POST',
+	data: data,
+	crossDomain: true,
+	success: function() {
+
+		$log.log('yes')
+
+	}
+});
+*/
+
+function getLogin() {
+    return $('#name').val();
+}
+
+
+function getPass() {
+    return $('#password').val();
+}
+
+$('#name').val( load('login') );
+$('#password').val( load('pass') );
+
+
+$("form").each( function() {
+
+    var form = $(this);
+
+    form.submit(function(e) {
+        var self = this;
+
+        e.preventDefault();
+
+        var login = form.find('input[name=login]');
+        var pass = form.find('input[name=pass]');
+
+        login.val( getLogin() );
+        pass.val( getPass() );
+
+        self.submit();
+
+        return false;
+    });
+
+});
+
+
+
+function save(name, value) {
+    localStorage.setItem(name, value);
+}
+
+function load(name) {
+    return localStorage.getItem(name);
+}
+
+
+</script>
+
diff --git a/ogbot/bot.py b/ogbot/bot.py
@@ -12,9 +12,9 @@ def __init__(self, browser, config):
         self.config = config
         self.logger = logging.getLogger('OGBot')
 
-        # Get planets and remove excluded planets in the config file
-        planets = general.General(browser, config).get_planets()
-        planets = filter(lambda x: x.name.lower() not in config.excluded_planets, planets)
+        self.general_client = general.General(browser, config)
+        planets = self.general_client.get_planets()
+        self.planets = planets
 
         self.attacker_bot = attacker.AttackerBot(browser, config, planets)
         self.defender_bot = defender.DefenderBot(browser, config, planets)
@@ -28,6 +28,11 @@ def __init__(self, browser, config):
         self.movement_bot = movement.MovementBot(browser, config, planets)
         self.sms_sender = sms.SMSSender(config)
 
+    def print_resources(self):
+        for planet in self.planets:
+            res = self.general_client.get_resources(planet)
+            self.logger.info("%s : %s" % (planet, res))
+
     def explore(self):
         self.expeditionary_bot.auto_send_expeditions()
         self.attack_inactive_planets()
@@ -38,13 +43,17 @@ def attack_inactive_planets(self):
         if len(reports) == 0:
             self.logger.info("There isn't any valid spy reports from inactive targets")
             self.logger.info("Scanning for new targets")
-            self.spy_bot.auto_spy_inactive_planets(self.config.attack_range)
+            error = self.spy_bot.auto_spy_inactive_planets(self.config.attack_range)
+
+            if error:
+                return True
+
             self.logger.info("Waiting %f seconds for probes to return" % self.config.time_to_wait_for_probes)
             time.sleep(self.config.time_to_wait_for_probes)
             reports = self.messages_bot.get_valid_spy_reports_from_inactive_targets()
             self.attacker_bot.attack_inactive_planets_from_spy_reports(reports)
-        else:
 
+        else:
             self.attacker_bot.attack_inactive_planets_from_spy_reports(reports)
 
         self.messages_bot.clear_spy_reports()