From 53309d72b59c007391bbebd3743f080a9d5fcca2 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sun, 28 Oct 2018 20:47:44 +0800
Subject: [PATCH] key 4 & drawStatistics & equip value

---
 libs/actions.js | 12 +++++++
 libs/ui.js      | 88 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index ea8e84cc..2b17376d 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -409,6 +409,18 @@ actions.prototype.keyUp = function(keyCode) {
                 core.events.useItem('centerFly');
             }
             break;
+        case 52: // 快捷键4：破冰/冰冻/地震/上下楼器/...
+            if (core.status.heroStop) {
+                var list = ["icePickaxe", "snow", "earthquake", "upFly", "downFly", "jumpShoes", "lifeWand", "poisonWine", "weakWine", "curseWine", "superWine"];
+                for (var i=0;i<list.length;i++) {
+                    var itemId = list[i];
+                    if (core.canUseItem(itemId)) {
+                        core.useItem(itemId);
+                        break;
+                    }
+                }
+            }
+            break;
 
     }
 
diff --git a/libs/ui.js b/libs/ui.js
index 05e16959..ea7a305b 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -2232,9 +2232,24 @@ ui.prototype.drawStatistics = function () {
     // 5. 当前已走的步数；瞬间移动的步数，瞬间移动的次数（和少走的步数）；游戏时长
     // 6. 当前已恢复的生命值；当前总伤害、战斗伤害、阻激夹域血网伤害、中毒伤害。
 
-    var ids = this.uidata.drawStatistics();
+    var ori = this.uidata.drawStatistics();
+    var ids = ori.filter(function (e) {
+        return e.endsWith("Door") || core.isset(core.material.items[e]);
+    });
     var obj = {};
-    ids.forEach(function (e) {obj[e] = 0;})
+    var cls = {};
+    ids.forEach(function (e) {
+        if (e.endsWith("Door")) cls[e] = "doors";
+        else cls[e] = core.material.items[e].cls;
+        obj[e] = 0;
+    })
+    var order = ["doors", "keys", "items", "tools", "constants", "equips"];
+    ids.sort(function (a, b) {
+        var c1 = order.indexOf(cls[a]), c2 = order.indexOf(cls[b]);
+        if (c1==c2) return ori.indexOf(a)-ori.indexOf(b);
+        return c1-c2;
+    });
+    var ext = {};
 
     var total = {
         'monster': {
@@ -2278,7 +2293,7 @@ ui.prototype.drawStatistics = function () {
                 if (core.isset(total.count[id])) {
                     var hp=0, atk=0, def=0, mdef=0;
 
-                    if (core.isset(core.material.items[id]) && core.material.items[id].cls=='items' && id!='superPotion') {
+                    if (cls[id]=='items' && id!='superPotion') {
                         var ratio = floor.item_ratio||1;
                         if (core.isset(core.items.itemEffect[id])) {
                             eval(core.items.itemEffect[id]);
@@ -2289,21 +2304,23 @@ ui.prototype.drawStatistics = function () {
                         mdef = core.status.hero.mdef - temp.mdef;
                     }
                     else {
-                        if (id.indexOf('sword')==0 && core.isset(core.values[id])) {
-                            var x = core.values[id];
-                            if (typeof x == 'number') x = {'atk': x};
-                            atk += x.atk||0;
-                            def += x.def||0;
-                            mdef += x.mdef||0;
-                        }
-                        if (id.indexOf('shield')==0 && core.isset(core.values[id])) {
-                            var x = core.values[id];
-                            if (typeof x == 'number') x = {'def': x};
-                            atk += x.atk||0;
-                            def += x.def||0;
-                            mdef += x.mdef||0;
+                        // 装备
+                        if (id.indexOf('sword')==0 || id.indexOf('shield')==0) {
+                            var values = core.material.items[id].equip||{};
+                            atk = values.atk||0;
+                            def = values.def||0;
+                            mdef = values.mdef||0;
                         }
                     }
+
+                    if (id.indexOf('sword')==0 || id.indexOf('shield')==0) {
+                        var t = "";
+                        if (atk>0) t+=atk+"攻";
+                        if (def>0) t+=def+"防";
+                        if (mdef>0) t+=mdef+"魔防";
+                        if (t!="") ext[id]=t;
+                    }
+
                     core.status.hero = core.clone(temp);
                     total.count[id]++;
                     total.add.hp+=hp;
@@ -2328,22 +2345,33 @@ ui.prototype.drawStatistics = function () {
         if (core.flags.enableMoney) text+="，总金币数"+data.monster.money;
         if (core.flags.enableExperience) text+="，总经验数"+data.monster.experience;
         if (core.flags.enableAddPoint) text+="，总加点数"+data.monster.point;
-        text+="。\n\n";
-        Object.keys(data.count).forEach(function (key) {
-            var value=data.count[key];
-            if (value>0) {
-                var name=null;
-                if (key=='yellowDoor') name="黄门";
-                else if (key=='blueDoor') name="蓝门";
-                else if (key=='redDoor') name="红门";
-                else if (key=='greenDoor') name="绿门";
-                else if (key=='steelDoor') name="铁门";
-                else name=(core.material.items[key]||{}).name;
-                if (core.isset(name)) {
-                    text+=name+value+"个；";
-                }
+        text+="。\n";
+
+        var prev = "";
+        ids.forEach(function (key) {
+            var value = data.count[key];
+            if (value==0) return;
+            var c = cls[key];
+            if (c!=prev) {
+                if (prev != "") text += "。";
+                text += "\n";
             }
+            else
+                text += "，";
+            prev = c;
+            var name = null;
+            if (key=='yellowDoor') name="黄门";
+            else if (key=='blueDoor') name="蓝门";
+            else if (key=='redDoor') name="红门";
+            else if (key=='greenDoor') name="绿门";
+            else if (key=='steelDoor') name="铁门";
+            else name=core.material.items[key].name;
+            text+=name+value+"个";
+            if (core.isset(ext[key]))
+                text+="("+ext[key]+")";
         })
+
+        if (prev!="") text+="。";
         text+="\n\n";
         text+="共加生命值"+core.formatBigNumber(data.add.hp)+"点，攻击"
             +core.formatBigNumber(data.add.atk)+"点，防御"