From 820c56bb64453842dba4950d458cc7fe8432c33f Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sun, 5 Aug 2018 23:02:04 +1000
Subject: [PATCH] more vecs

---
 src/lib.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 9b3c8cf4..6e6218cd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -46,16 +46,16 @@ fn assign_dmg(a: &Cryp, t: &Turn) -> Cryp {
   }
 }
 
-fn combat_phase(a: &Cryp, b: &Cryp) -> (Cryp, Cryp) {
+fn combat_phase(a: &Cryp, b: &Cryp) -> Vec<Cryp> {
     let a_turn = cryp_turn(&a);
     let b_turn = cryp_turn(&b);
-    return (
+    return vec![
       assign_dmg(&a, &b_turn),
       assign_dmg(&b, &a_turn),
-    );
+    ];
 }
 
-fn battle(a: Cryp, b: Cryp) -> (Cryp, Cryp) {
+fn battle(a: &Cryp, b: &Cryp) -> Vec<Cryp> {
     let mut cryps = vec![
       a.clone(),
       b.clone()
@@ -63,10 +63,10 @@ fn battle(a: Cryp, b: Cryp) -> (Cryp, Cryp) {
     loop {
         let combat = combat_phase(&cryps[0], &cryps[1]);
         println!("{:?}", combat);
-        if combat.0.stam == 0 || combat.1.stam == 0 {
+        if combat.iter().any(|c| c.stam == 0) {
           return combat;
         }
-        cryps = vec![combat.0, combat.1];
+        cryps = combat;
     }
 }
 
@@ -107,7 +107,7 @@ pub fn main() {
       stam: 25,
   };
 
-  battle(a, b);
+  battle(&a, &b);
   return;
 }