Adding shooting of new weapons

1 files changed, 9 insertions, 10 deletions

diff --git a/src/shooting.rs b/src/shooting.rs
index bcdf783..e0358ee 100644
--- a/src/shooting.rs
+++ b/src/shooting.rs
@@ -7,33 +7,32 @@ use knowledge::*;
 use ships::*;
 
 pub fn shoot_smartly(knowledge: &Knowledge) -> Action {
-    let shot = if knowledge.has_unknown_hits() {
+    let (weapon, target) = if knowledge.has_unknown_hits() {
         destroy_shoot(&knowledge)
     }
     else {
         seek_shoot(&knowledge)
     };
-
-    //TODO shoot other weapons
-    Action::Shoot(Weapon::SingleShot, shot)
+    
+    Action::Shoot(weapon, target)
 }
 
-fn seek_shoot(knowledge: &Knowledge) -> Point {
-    let possibilities = knowledge.get_most_possibility_shots_on_lattice();
+fn seek_shoot(knowledge: &Knowledge) -> (Weapon, Point) {
+    let (weapon, possibilities) = knowledge.get_best_seek_shots();
     if possibilities.is_empty() {
         println!("All possible shots on the current lattice have been tried!");
-        Point::new(0,0)
+        (Weapon::SingleShot, Point::new(0,0))
     }
     else {
         let mut rng = rand::thread_rng();
         let between = Range::new(0, possibilities.len());
         let i = between.ind_sample(&mut rng);
         
-        possibilities[i as usize]
+        (weapon, possibilities[i as usize])
     }
 }
 
-fn destroy_shoot(knowledge: &Knowledge) -> Point {
+fn destroy_shoot(knowledge: &Knowledge) -> (Weapon, Point) {
     let possibilities = knowledge.get_best_adjacent_shots();
     if possibilities.is_empty() {
         seek_shoot(&knowledge)
@@ -43,6 +42,6 @@ fn destroy_shoot(knowledge: &Knowledge) -> Point {
         let between = Range::new(0, possibilities.len());
         let i = between.ind_sample(&mut rng);
         
-        possibilities[i as usize]
+        (Weapon::SingleShot, possibilities[i as usize])
     }
 }