From f2038f44d3591b7862b0ee81e621db7b220f5779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Sat, 18 Oct 2014 13:58:46 +0200
Subject: [PATCH] Only Elements with battle info show the UI

---
 TODO               |  2 +-
 assets/style.css   |  2 +-
 index.html         |  3 ++-
 src/jsds.js        | 55 +++++++++++++++++++++++++++++++++++++---------
 src/jsds_crafty.js | 12 +++++++++-
 5 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index 24ecf60..85171a5 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
 ToDo for JSDSH:
  - Implement FrontEnd (Add Player, etc) ?
  - Background and Wall Editing/Importing
- - Basic Modifiers
+ * Basic Modifiers
  - on-the-fly-adding of characters
  - traps etc.
  - JSON instead of JavaScript importing
diff --git a/assets/style.css b/assets/style.css
index 72d3070..5c49eca 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -22,7 +22,7 @@ h1 {
     position:relative;
 }
 
-#ui {
+#uibon, #uiatt {
     right: 30px;
 }
 
diff --git a/index.html b/index.html
index 3881e76..bccd338 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,8 @@
       <h1>JSDSH - Javascript Dungeonslayers Helper</h1>
       <div id="game"></div>
       
-      <div id="ui"></div>
+      <div id="uibon"></div>
+      <div id="uiatt"></div>
       <div id="clear"></div>
       
       <div id="output"></div>
diff --git a/src/jsds.js b/src/jsds.js
index 2a85bdb..251a8db 100644
--- a/src/jsds.js
+++ b/src/jsds.js
@@ -232,11 +232,6 @@
 	// Write out the UI for attack-selection, including binding.
 	sel_att: function() {
 	    var outstr="<p>";
-	    outstr += "Boni?<br>";
-	    outstr += "Waffenbonus Nahkampf: <input id='wbn' type=numer step=1 min=0></input><br />";
-	    outstr += "Waffenbonus Fernkampf: <input id='wbf' type=numer step=1 min=0></input><br>";
-	    outstr += "Panzerungsbonus: <input id='pb' type=numer step=1 min=0></input><br>";
-	    outstr += "Zauberbonus: <input id='zb' type=numer step=1 min=0></input><br>";
 	    outstr += "Angriffstyp?<br>";
 	    outstr += "<select id='att'>";
 	    outstr += "<option value='melee' id='melee'>Melee (" + this.battle["melee"] + ")</option>";
@@ -244,16 +239,18 @@
 	    outstr += "<option value='shoot_chant' id='shoot_chant'>Zielzauber (" +this.battle["shoot_chant"]
 		+")</option>";
 	    outstr += "</select><br>";
-
+	    
 	    outstr += "Abwehrbar? ";
 	    outstr += "<select id='defendible'>";
 	    outstr += "<option value=true selected=true>Ja</option>";
 	    outstr += "<option value=false>Nein</option>";
 	    outstr += "</p>";
-
-	    $('#ui').html(outstr);
+	    
+	    $('#uiatt').html(outstr);
+	    
 	    $('#att').bind("change", function() {cur_sel.att=this.value;});
-	    $('#defendible').bind("change", function() { cur_sel.defendible = (this.value === "true" ? true : false);});
+	    $('#defendible').bind("change",
+				  function() { cur_sel.defendible = (this.value === "true" ? true : false);});
 	    $("#"+this.att).get(0).selected="true";
 	}
     });
@@ -282,12 +279,50 @@
 	    this.battle.chant = this.battle_base.chant + this.extern.chant - this.extern.armor;
 	    this.battle.shoot_chant = this.battle_base.chant + this.extern.chant - this.extern.armor;
 	},
+	// Write out the UI for bonus-selection.
+	sel_bon: function() {
+	    var outstr="<p>";
+	    outstr += "Boni?<br>";
+	    outstr += "Waffenbonus Nahkampf: <input id='wbn' type=numer step=1 min=0></input><br />";
+	    outstr += "Waffenbonus Fernkampf: <input id='wbf' type=numer step=1 min=0></input><br>";
+	    outstr += "Panzerungsbonus: <input id='pb' type=numer step=1 min=0></input><br>";
+	    outstr += "Zauberbonus: <input id='zb' type=numer step=1 min=0></input><br>";
 
+	    $('#uibon').html(outstr);
+	    $('#wbn').attr("value", cur_sel.extern.weapon_near+"")
+		.bind("change", 
+		      function() {cur_sel.extern.weapon_near = this.value*1;
+				  cur_sel.recalc_battle();
+				  cur_sel.printoutput();
+				 }
+		     );
+	    $('#wbf').attr("value", cur_sel.extern.weapon_far)
+		.bind("change", 
+		      function() {cur_sel.extern.weapon_far = this.value*1;
+				  cur_sel.recalc_battle();
+				  cur_sel.printoutput();
+				 }
+		     );
+	    $('#pb').attr("value",cur_sel.extern.armor)
+		.bind("change", 
+		      function() {cur_sel.extern.armor = this.value*1;
+				  cur_sel.recalc_battle();
+				  cur_sel.printoutput();
+				 }
+		     );
+	    $('#zb').attr("value",cur_sel.extern.chant)
+		.bind("change", 
+		      function() {cur_sel.extern.chant = this.value*1; 
+				  cur_sel.recalc_battle();
+				  cur_sel.printoutput();
+				 }
+		     );
+	},
 	printoutput: function() {
 	    outstr = "<p>";
 	    outstr += this.info.cname + " (gespielt von "+this.info.pname +")<br>";
 	    outstr += "Greift derzeit durch " + this.att + " mit einer Stärke von "
-		+ this.battle[this.att] + " an. (WB: "+ this.extern.defense +"<br>";
+		+ this.battle[this.att] + " an.<br>";
 	    outstr += "Verteidigungsstärke: " + this.battle.defense + "<br>";
 	    outstr += "Kraftpunkte: " + this.life;
 	    outstr += "</p>";
diff --git a/src/jsds_crafty.js b/src/jsds_crafty.js
index 36edf97..c94888d 100644
--- a/src/jsds_crafty.js
+++ b/src/jsds_crafty.js
@@ -88,13 +88,23 @@
 		 */
 		this.bind('MouseDown', function(e) {
 		    if(e.mouseButton === Crafty.mouseButtons.LEFT) {
-			this.calc_center();
+			if( cur_sel != player[this.id] ) {
+			    this.calc_center();
+			};
 			this.old_pos["x"]=this.x;
 			this.old_pos["y"]=this.y;
 		    	Crafty("Creature").each( function() {
 			    this.disableControl();
 			});
 			cur_sel=player[this.id];
+			if (! cur_sel.enem) {
+			    $('#uibon').show();
+			    cur_sel.sel_bon();
+			}
+			else {
+			    console.log("Hide UIBON");
+			    $('#uibon').hide();
+			}
 			cur_sel.printoutput();
 			cur_sel.sel_att();
 			this.enableControl();