From b14ecb17e544356cb9978700ee7c7a6500bc4c3f Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Sun, 11 Mar 2018 22:33:41 -0400
Subject: [PATCH] Enemy attacks now have conditions. Better description text
 handling.

---
 combat.js  | 16 ++++++++++++++++
 feast.html |  4 ++--
 feast.js   | 13 +++++++++++--
 vore.js    |  9 ++++++---
 world.js   |  3 ---
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/combat.js b/combat.js
index cd24424..6f44966 100644
--- a/combat.js
+++ b/combat.js
@@ -36,9 +36,25 @@ function devourPlayer(attacker) {
   return {
     name: "Devours YOU!",
     desc: "You won't see this",
+    conditions: [
+      function(prefs) { return prefs.player.prey; }
+    ],
     attackPlayer: function(defender) {
       changeMode("eaten");
       return "The voracious " + attacker.description() + " pins you down and devours you in seconds.";
     }
   }
 }
+
+function poke(attacker) {
+  return {
+    name: "Poke",
+    desc: "Poke a nerd",
+    attack: function(defender) {
+      return "You poke the " + defender.description() + " for " + attack(attacker, defender, 1e12) + " damage";
+    },
+    attackPlayer: function(defender) {
+      return "The " + attacker.description() + " pokes you on the snout for " + attack(attacker, defender, 1e12) + " damage";
+    }
+  };
+}
diff --git a/feast.html b/feast.html
index b7913b1..bd40e71 100644
--- a/feast.html
+++ b/feast.html
@@ -135,11 +135,11 @@
       <ul id="character-form-list">
         <li>
           <label for="character-name">Name</label>
-          <input type="text" id="character-name" name="name"/>
+          <input type="text" id="character-name" name="name" placeholder="Player"/>
         </li>
         <li>
           <label for="character-species">Species</label>
-          <input type="text" id="character-species" name="species"/>
+          <input type="text" id="character-species" name="species" placeholder="nerd"/>
         </li>
         <li>
           <label for="character-prefs-player-prey">Player can be eaten</label>
diff --git a/feast.js b/feast.js
index da75103..c157b29 100644
--- a/feast.js
+++ b/feast.js
@@ -83,6 +83,7 @@ function updateEaten() {
     button.innerHTML = currentFoe.struggles[i].name;
     button.addEventListener("click", function() { struggleClicked(i); } );
     button.addEventListener("mouseover", function() { struggleHovered(i); } );
+    button.addEventListener("mouseout", function() { document.getElementById("eaten-desc").innerHTML = ""; } );
     li.appendChild(button);
     list.appendChild(li);
   }
@@ -102,6 +103,7 @@ function updateCombat() {
     button.innerHTML = player.attacks[i].name;
     button.addEventListener("click", function() { attackClicked(i); } );
     button.addEventListener("mouseover", function() { attackHovered(i); } );
+    button.addEventListener("mouseout", function() { document.getElementById("combat-desc").innerHTML = ""; } );
     li.appendChild(button);
     list.appendChild(li);
   }
@@ -223,7 +225,10 @@ function generateSettings() {
   for (let i=0; i<form.length; i++) {
     let value = form[i].value == "" ? form[i].placeholder : form[i].value;
     if (form[i].type == "text")
-      settings[form[i].name] = value;
+      if (form[i].value == "")
+        settings[form[i].name] = form[i].placeholder;
+      else
+        settings[form[i].name] = value;
     else if (form[i].type == "number")
       settings[form[i].name] = parseFloat(value);
     else if (form[i].type == "checkbox") {
@@ -306,7 +311,11 @@ function attackClicked(index) {
     update(["The " + currentFoe.description() + " falls to the ground!"]);
     startDialog(new FallenFoe(currentFoe));
   } else {
-    let attack = pick(currentFoe.attacks);
+    let attack = pick(currentFoe.attacks.filter(attack => attack.conditions == undefined || attack.conditions.reduce((result, test) => result && test(prefs), true)));
+
+    if (attack == null) {
+      attack = currentFoe.backupAttack;
+    }
 
     update([attack.attackPlayer(player)]);
 
diff --git a/vore.js b/vore.js
index 6a624bd..7310c55 100644
--- a/vore.js
+++ b/vore.js
@@ -1,5 +1,8 @@
 function pick(list) {
-  return list[Math.floor(Math.random()*list.length)];
+  if (list.length == 0)
+    return null;
+  else
+    return list[Math.floor(Math.random()*list.length)];
 }
 
 function Creature(name = "Creature") {
@@ -67,11 +70,11 @@ function Fen() {
 
   this.attacks.push(new devourPlayer(this));
 
+  this.backupAttack = new poke(this);
+
   this.struggles = [];
 
   this.struggles.push(new rub(this));
-
-  this.conditions = [];
 }
 
 function Micro() {
diff --git a/world.js b/world.js
index 29e7a0a..c6de1a2 100644
--- a/world.js
+++ b/world.js
@@ -188,9 +188,6 @@ let locationsSrc = [
       function() {
         startCombat(new Fen());
       }
-    ],
-    "conditions": [
-      function(prefs) { return prefs.player.prey; }
     ]
   }
 ];