From 9d48553b8920d84273f0707abf42d686a42ed044 Mon Sep 17 00:00:00 2001
From: Zye <1838979562@qq.com>
Date: Thu, 8 Sep 2022 21:41:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=A0=E4=B8=AA=E6=80=AA?=
 =?UTF-8?q?=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/Enemies.json  | 26 +++++++++++++-------------
 data/Items.json    |  4 ++--
 data/MapInfos.json |  2 +-
 data/Skills.json   | 42 +++++++++++++++++++++---------------------
 data/System.json   |  2 +-
 data/Troops.json   | 24 ++++++++++++------------
 data/Weapons.json  |  2 +-
 7 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/data/Enemies.json b/data/Enemies.json
index da72b13..8f00898 100644
--- a/data/Enemies.json
+++ b/data/Enemies.json
@@ -1,18 +1,18 @@
 [
 null,
-{"id":1,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412}],"battlerHue":64,"battlerName":"蝙蝠","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":6,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":0.95},{"code":11,"dataId":7,"value":1.1},{"code":11,"dataId":4,"value":1.1}],"gold":5,"name":"火山蝙蝠","note":"","params":[180,100,19,13,19,15,24,10]},
-{"id":2,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":414}],"battlerHue":36,"battlerName":"大耗子（兽形态）","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":7,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":0.95},{"code":11,"dataId":7,"value":1.1},{"code":11,"dataId":4,"value":1.1}],"gold":4,"name":"火山鼠","note":"","params":[190,0,20,16,20,19,20,10]},
-{"id":3,"actions":[{"conditionParam1":3,"conditionParam2":0,"conditionType":1,"rating":5,"skillId":434}],"battlerHue":320,"battlerName":"爆弹怪","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":4,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":10,"name":"爆弹怪","note":"","params":[250,0,15,12,15,25,18,10]},
-{"id":4,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":411},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":414}],"battlerHue":145,"battlerName":"史莱姆","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":8,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.01},{"code":31,"dataId":5,"value":0},{"code":11,"dataId":1,"value":0.5},{"code":11,"dataId":5,"value":0.2},{"code":11,"dataId":4,"value":2},{"code":11,"dataId":7,"value":2},{"code":11,"dataId":10,"value":2}],"gold":8,"name":"熔岩怪","note":"","params":[160,0,5,5,20,22,15,10]},
-{"id":5,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":421},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0.6,"conditionType":2,"rating":6,"skillId":422},{"conditionParam1":0,"conditionParam2":0.3,"conditionType":2,"rating":9,"skillId":431}],"battlerHue":0,"battlerName":"幽灵船","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":1,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":7,"value":0.95},{"code":22,"dataId":2,"value":0.05}],"gold":0,"name":"幽灵船","note":"","params":[600,200,40,40,60,55,45,10]},
-{"id":6,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":7,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":8,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":9,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":10,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":11,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":12,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
-{"id":13,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
+{"id":1,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412}],"battlerHue":64,"battlerName":"蝙蝠","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":6,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":0.95},{"code":11,"dataId":7,"value":1.1},{"code":11,"dataId":4,"value":1.1}],"gold":5,"name":"火山蝙蝠","note":"","params":[180,100,19,13,19,15,30,10]},
+{"id":2,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":416},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":414}],"battlerHue":36,"battlerName":"大耗子（兽形态）","dropItems":[{"kind":1,"dataId":58,"denominator":50},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":7,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":0.95},{"code":11,"dataId":7,"value":1.1},{"code":11,"dataId":4,"value":1.1}],"gold":4,"name":"火山鼠","note":"","params":[190,0,22,16,20,19,22,10]},
+{"id":3,"actions":[{"conditionParam1":3,"conditionParam2":0,"conditionType":1,"rating":5,"skillId":434}],"battlerHue":320,"battlerName":"爆弹怪","dropItems":[{"kind":1,"dataId":28,"denominator":30},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":4,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":4,"value":2},{"code":11,"dataId":7,"value":2}],"gold":10,"name":"爆弹怪","note":"","params":[250,0,1,12,15,25,18,10]},
+{"id":4,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":411},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":414}],"battlerHue":145,"battlerName":"史莱姆","dropItems":[{"kind":1,"dataId":28,"denominator":30},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":8,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.01},{"code":31,"dataId":5,"value":0},{"code":11,"dataId":1,"value":0.5},{"code":11,"dataId":5,"value":0.2},{"code":11,"dataId":4,"value":2},{"code":11,"dataId":7,"value":2},{"code":11,"dataId":10,"value":2},{"code":11,"dataId":14,"value":0.4},{"code":11,"dataId":15,"value":0.4}],"gold":8,"name":"熔岩怪","note":"","params":[160,0,20,10,30,22,15,10]},
+{"id":5,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":421},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0.6,"conditionType":2,"rating":6,"skillId":422},{"conditionParam1":0,"conditionParam2":0.3,"conditionType":2,"rating":9,"skillId":431}],"battlerHue":0,"battlerName":"幽灵船","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":1,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":7,"value":0.95},{"code":22,"dataId":2,"value":0.05}],"gold":0,"name":"幽灵船","note":"","params":[600,200,45,40,55,65,45,10]},
+{"id":6,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":435}],"battlerHue":230,"battlerName":"史莱姆","dropItems":[{"kind":1,"dataId":59,"denominator":5},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":5,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":14,"value":0},{"code":11,"dataId":14,"value":0.5},{"code":11,"dataId":1,"value":0.9},{"code":11,"dataId":4,"value":2},{"code":11,"dataId":5,"value":0.9},{"code":11,"dataId":10,"value":2}],"gold":5,"name":"硫酸史莱姆","note":"","params":[160,0,20,10,30,22,15,10]},
+{"id":7,"actions":[{"conditionParam1":0,"conditionParam2":0.4,"conditionType":2,"rating":5,"skillId":413},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":435},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410}],"battlerHue":188,"battlerName":"史莱姆2","dropItems":[{"kind":1,"dataId":59,"denominator":1},{"kind":1,"dataId":59,"denominator":1},{"dataId":1,"denominator":1,"kind":0}],"exp":50,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":14,"value":0},{"code":11,"dataId":14,"value":0.5},{"code":11,"dataId":1,"value":0.8},{"code":11,"dataId":4,"value":2},{"code":11,"dataId":5,"value":0.9},{"code":11,"dataId":10,"value":2}],"gold":50,"name":"硫酸史莱姆王","note":"","params":[320,0,35,20,45,40,30,10]},
+{"id":8,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":422}],"battlerHue":49,"battlerName":"海妖","dropItems":[{"kind":2,"dataId":1,"denominator":10},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":10,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":4,"value":0.4},{"code":11,"dataId":7,"value":0.8},{"code":11,"dataId":10,"value":1.1},{"code":11,"dataId":1,"value":0.9},{"code":11,"dataId":2,"value":1.5},{"code":11,"dataId":6,"value":2}],"gold":10,"name":"被控制的海妖","note":"","params":[220,0,10,10,25,30,20,10]},
+{"id":9,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":422}],"battlerHue":124,"battlerName":"海妖","dropItems":[{"kind":2,"dataId":1,"denominator":2},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":10,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":4,"value":0.4},{"code":11,"dataId":7,"value":0.8},{"code":11,"dataId":10,"value":1.1},{"code":11,"dataId":1,"value":0.9},{"code":11,"dataId":2,"value":1.5},{"code":11,"dataId":6,"value":2}],"gold":10,"name":"被控制的精锐海妖","note":"","params":[300,0,15,15,30,40,26,10]},
+{"id":10,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":416}],"battlerHue":194,"battlerName":"大耗子（兽形态）","dropItems":[{"kind":1,"dataId":58,"denominator":50},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":7,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.9},{"code":11,"dataId":4,"value":0.9}],"gold":4,"name":"深海怪鼠","note":"","params":[190,0,26,22,5,15,22,10]},
+{"id":11,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412}],"battlerHue":274,"battlerName":"海蜇","dropItems":[{"kind":1,"dataId":26,"denominator":30},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":6,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.95},{"code":11,"dataId":4,"value":0.95},{"code":11,"dataId":14,"value":0.9}],"gold":5,"name":"海蜇","note":"","params":[180,100,19,13,19,15,30,10]},
+{"id":12,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":412},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":3,"skillId":417}],"battlerHue":358,"battlerName":"海蜇2","dropItems":[{"kind":1,"dataId":26,"denominator":20},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":10,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":14,"value":0.8}],"gold":12,"name":"潜渊海蜇","note":"","params":[260,100,25,19,22,20,35,10]},
+{"id":13,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":410},{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":435}],"battlerHue":29,"battlerName":"蛇","dropItems":[{"kind":0,"dataId":0,"denominator":50},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":8,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0},{"code":11,"dataId":5,"value":1.1},{"code":11,"dataId":7,"value":0.9},{"code":11,"dataId":4,"value":0.9},{"code":11,"dataId":14,"value":0.95}],"gold":6,"name":"海蛇","note":"","params":[220,0,30,22,1,20,22,10]},
 {"id":14,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
 {"id":15,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
 {"id":16,"actions":[{"conditionParam1":0,"conditionParam2":0,"conditionType":0,"rating":5,"skillId":1}],"battlerHue":0,"battlerName":"","dropItems":[{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0},{"dataId":1,"denominator":1,"kind":0}],"exp":0,"traits":[{"code":22,"dataId":0,"value":0.95},{"code":22,"dataId":1,"value":0.05},{"code":31,"dataId":1,"value":0}],"gold":0,"name":"","note":"","params":[100,0,10,10,10,10,10,10]},
diff --git a/data/Items.json b/data/Items.json
index 4663f0e..39a5e6f 100644
--- a/data/Items.json
+++ b/data/Items.json
@@ -57,8 +57,8 @@ null,
 {"id":55,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":14,"formula":"1000","type":1,"variance":0},"description":"以《数码宝贝大冒险》中蘑菇兽的技能数据制造的蘑菇炸弹，造成2000点毒属性伤害，概率附加【中毒】","effects":[{"code":21,"dataId":67,"value1":1,"value2":0},{"code":21,"dataId":68,"value1":0.5,"value2":0},{"code":21,"dataId":74,"value1":0.05,"value2":0}],"hitType":0,"iconIndex":314,"itypeId":1,"name":"蘑菇炸弹","note":"","occasion":1,"price":0,"repeats":1,"scope":1,"speed":-5,"successRate":100,"tpGain":10},
 {"id":56,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"蘑菇怪留下的孢子，拥有很强的寄生能力，给敌人造成300点毒属性伤害并附加【孢子寄生】","effects":[{"code":21,"dataId":96,"value1":1,"value2":0}],"hitType":0,"iconIndex":235,"itypeId":1,"name":"寄生孢子","note":"","occasion":1,"price":0,"repeats":1,"scope":1,"speed":-10,"successRate":100,"tpGain":10},
 {"id":57,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"店里买的普通小鱼干，回血50点","effects":[{"code":11,"dataId":0,"value1":0,"value2":50}],"hitType":0,"iconIndex":260,"itypeId":1,"name":"小鱼干","note":"","occasion":0,"price":10,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
-{"id":58,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
-{"id":59,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
+{"id":58,"animationId":0,"consumable":false,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"各种奇怪老鼠的尾巴","effects":[],"hitType":0,"iconIndex":272,"itypeId":1,"name":"老鼠尾巴","note":"","occasion":3,"price":0,"repeats":1,"scope":0,"speed":0,"successRate":100,"tpGain":0},
+{"id":59,"animationId":50,"consumable":true,"damage":{"critical":false,"elementId":14,"formula":"80","type":1,"variance":20},"description":"硫酸史莱姆的凝聚物，造成毒属性伤害并欧几率施加【中毒】","effects":[{"code":21,"dataId":67,"value1":0.5,"value2":0},{"code":21,"dataId":68,"value1":0.01,"value2":0}],"hitType":1,"iconIndex":0,"itypeId":1,"name":"毒性酸弹","note":"","occasion":1,"price":20,"repeats":1,"scope":1,"speed":0,"successRate":100,"tpGain":0},
 {"id":60,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":61,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
 {"id":62,"animationId":0,"consumable":true,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"itypeId":1,"name":"","note":"","occasion":0,"price":0,"repeats":1,"scope":7,"speed":0,"successRate":100,"tpGain":0},
diff --git a/data/MapInfos.json b/data/MapInfos.json
index 4a8fa79..8dab6bf 100644
--- a/data/MapInfos.json
+++ b/data/MapInfos.json
@@ -23,7 +23,7 @@ null,
 null,
 {"id":22,"expanded":true,"name":"好人家一层","order":18,"parentId":20,"scrollX":1724,"scrollY":729},
 {"id":23,"expanded":true,"name":"大海","order":7,"parentId":5,"scrollX":772,"scrollY":481},
-{"id":24,"expanded":true,"name":"迷雾之岛","order":8,"parentId":23,"scrollX":1148,"scrollY":969},
+{"id":24,"expanded":true,"name":"迷雾之岛","order":8,"parentId":23,"scrollX":1141.6,"scrollY":962},
 {"id":25,"expanded":false,"name":"水塔2","order":21,"parentId":20,"scrollX":780,"scrollY":479},
 {"id":26,"expanded":true,"name":"皇宫","order":15,"parentId":9,"scrollX":1196,"scrollY":1449},
 {"id":27,"expanded":true,"name":"晶核研究站","order":28,"parentId":14,"scrollX":772,"scrollY":804},
diff --git a/data/Skills.json b/data/Skills.json
index 445660d..da67bac 100644
--- a/data/Skills.json
+++ b/data/Skills.json
@@ -353,7 +353,7 @@ null,
 {"id":351,"animationId":0,"damage":{"critical":true,"elementId":5,"formula":"10+(a.atk * 2+a.mat*1+a.agi*0.005 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"火属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（火）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":352,"animationId":0,"damage":{"critical":true,"elementId":7,"formula":"10+(a.atk * 2+a.mat*1+a.agi*0.005 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"冰属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（冰）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":353,"animationId":0,"damage":{"critical":true,"elementId":6,"formula":"10+(a.atk * 2+a.mat*1+a.agi*0.005 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"电属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（电）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
-{"id":354,"animationId":0,"damage":{"critical":true,"elementId":3,"formula":"10+(a.atk * 2+a.mat*1+a.agi*0.005 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"火属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（风）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
+{"id":354,"animationId":0,"damage":{"critical":true,"elementId":3,"formula":"10+0.52*(a.atk * 2+a.mat*1+a.agi*0.01 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"火属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（风）","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":355,"animationId":0,"damage":{"critical":true,"elementId":9,"formula":"10+(a.atk * 2+a.mat*1+a.agi*0.005 - b.def*1.2-b.mde*0.5)*(a.level*a.atk/2048+2)","type":1,"variance":20},"description":"暗属性附魔普通攻击","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击！","message2":"","mpCost":0,"name":"普通攻击（暗）","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":0,"successRate":100,"tpCost":0,"tpGain":5},
 {"id":356,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":357,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -393,7 +393,7 @@ null,
 {"id":391,"animationId":28,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":170,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"不详迷雾","mpCost":0,"name":"不详迷雾","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":392,"animationId":28,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":171,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"诅咒迷雾","mpCost":0,"name":"诅咒迷雾","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":8,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":393,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":135,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"专注反击","mpCost":0,"name":"专注反击","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":394,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":394,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":115,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"加速","mpCost":0,"name":"加速","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":395,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":396,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":397,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
@@ -409,32 +409,32 @@ null,
 {"id":407,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":408,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":409,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"怪物技能库","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":410,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.1*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击!","message2":"","mpCost":0,"name":"攻击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":411,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.1*(a.atk*4+a.mat*0.4-b.def-b.mde*0.1)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的附魔攻击！","message2":"","mpCost":0,"name":"附魔攻击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":412,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+0.9*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"二回攻击","mpCost":0,"name":"二回攻击","note":"","occasion":0,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":413,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.6*(a.atk*4-b.def)+(a.mhp-a.hp)*0.1","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"含恨一击","mpCost":0,"name":"含恨一击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":414,"animationId":25,"damage":{"critical":false,"elementId":5,"formula":"5+1.2*(4.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"喷火","mpCost":0,"name":"喷火","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":415,"animationId":36,"damage":{"critical":false,"elementId":-1,"formula":"1+1.2*(a.atk*4+a.hp*0.15-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":58,"value1":0.3,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"撞击","mpCost":0,"name":"撞击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":416,"animationId":82,"damage":{"critical":false,"elementId":-1,"formula":"1+1.3*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":97,"value1":1,"value2":0},{"code":21,"dataId":98,"value1":0.1,"value2":0},{"code":21,"dataId":99,"value1":0.01,"value2":0},{"code":21,"dataId":100,"value1":0.01,"value2":0},{"code":21,"dataId":101,"value1":0.01,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"老鼠利爪","mpCost":0,"name":"老鼠利爪","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":417,"animationId":13,"damage":{"critical":false,"elementId":14,"formula":"30+2*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":67,"value1":1,"value2":0},{"code":21,"dataId":68,"value1":0.5,"value2":0},{"code":21,"dataId":74,"value1":0.05,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"毒针刺杀","mpCost":0,"name":"毒针刺杀","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":418,"animationId":35,"damage":{"critical":false,"elementId":-1,"formula":"1+1.2*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":56,"value1":0.2,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"强力钳制","mpCost":0,"name":"蛮横扫荡","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":410,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.1*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的攻击!","message2":"","mpCost":0,"name":"攻击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":411,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.1*(a.atk*3+a.mat*0.4-b.def-b.mde*0.1)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"的附魔攻击！","message2":"","mpCost":0,"name":"附魔攻击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":412,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+0.9*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"二回攻击","mpCost":0,"name":"二回攻击","note":"","occasion":0,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":413,"animationId":-1,"damage":{"critical":true,"elementId":-1,"formula":"1+1.6*(a.atk*3-b.def)+(a.mhp-a.hp)*0.1","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"含恨一击","mpCost":0,"name":"含恨一击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":414,"animationId":25,"damage":{"critical":false,"elementId":5,"formula":"5+1.2*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"喷火","mpCost":0,"name":"喷火","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":415,"animationId":36,"damage":{"critical":false,"elementId":-1,"formula":"1+1.2*(a.atk*3+a.hp*0.15-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":58,"value1":0.3,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"撞击","mpCost":0,"name":"撞击","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":416,"animationId":82,"damage":{"critical":false,"elementId":-1,"formula":"1+1.3*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":97,"value1":1,"value2":0},{"code":21,"dataId":98,"value1":0.1,"value2":0},{"code":21,"dataId":99,"value1":0.01,"value2":0},{"code":21,"dataId":100,"value1":0.01,"value2":0},{"code":21,"dataId":101,"value1":0.01,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"老鼠利爪","mpCost":0,"name":"老鼠利爪","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":417,"animationId":13,"damage":{"critical":false,"elementId":14,"formula":"30+2*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":67,"value1":1,"value2":0},{"code":21,"dataId":68,"value1":0.5,"value2":0},{"code":21,"dataId":74,"value1":0.05,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"毒针刺杀","mpCost":0,"name":"毒针刺杀","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":418,"animationId":35,"damage":{"critical":false,"elementId":-1,"formula":"1+1.2*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":56,"value1":0.2,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"强力钳制","mpCost":0,"name":"蛮横扫荡","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":419,"animationId":43,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[{"code":21,"dataId":2,"value1":1,"value2":0},{"code":31,"dataId":3,"value1":3,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"熔岩防御","mpCost":0,"name":"熔岩防御","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":420,"animationId":13,"damage":{"critical":true,"elementId":-1,"formula":"1+1.5*(4*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":69,"value1":0.4,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"强力噬咬","mpCost":0,"name":"强力噬咬","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":421,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"10+1.2*(4.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":54,"value1":1,"value2":0},{"code":21,"dataId":55,"value1":0.1,"value2":0},{"code":21,"dataId":57,"value1":0.01,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"束缚涡流","mpCost":0,"name":"束缚涡流","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":5,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":422,"animationId":15,"damage":{"critical":false,"elementId":4,"formula":"10+1.3*(a.mat*4.5-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"无形水刺","mpCost":0,"name":"无形水刺","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":420,"animationId":13,"damage":{"critical":true,"elementId":-1,"formula":"1+1.5*(3*a.atk-b.def)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":69,"value1":0.4,"value2":0},{"code":21,"dataId":0,"value1":1,"value2":0}],"hitType":1,"iconIndex":0,"message1":"使用了%1！","message2":"强力噬咬","mpCost":0,"name":"强力噬咬","note":"","occasion":1,"repeats":2,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":421,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"10+1.2*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":54,"value1":1,"value2":0},{"code":21,"dataId":55,"value1":0.1,"value2":0},{"code":21,"dataId":57,"value1":0.01,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"束缚涡流","mpCost":0,"name":"束缚涡流","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":5,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":422,"animationId":15,"damage":{"critical":false,"elementId":4,"formula":"10+1.3*(a.mat*3.5-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"无形水刺","mpCost":0,"name":"无形水刺","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":423,"animationId":174,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"水流护盾","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":11,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":424,"animationId":173,"damage":{"critical":true,"elementId":10,"formula":"10+1.5*(4.5*a.mat-b.mat)","type":1,"variance":20},"description":"","effects":[{"code":22,"dataId":161,"value1":1,"value2":0},{"code":22,"dataId":162,"value1":0.5,"value2":0},{"code":22,"dataId":163,"value1":0.1,"value2":0}],"hitType":2,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"精神尖啸","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":424,"animationId":173,"damage":{"critical":true,"elementId":10,"formula":"10+1.5*(3.5*a.mat-b.mat)","type":1,"variance":20},"description":"","effects":[{"code":22,"dataId":161,"value1":1,"value2":0},{"code":22,"dataId":162,"value1":0.5,"value2":0},{"code":22,"dataId":163,"value1":0.1,"value2":0}],"hitType":2,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"精神尖啸","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":425,"animationId":69,"damage":{"critical":false,"elementId":0,"formula":"a.mat*5+(b.mhp-b.hp)*0.2","type":3,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"净水治愈","mpCost":0,"name":"净水治愈","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":7,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":426,"animationId":15,"damage":{"critical":false,"elementId":4,"formula":"1+0.8*(a.mat*4.5-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"无形水刺","mpCost":0,"name":"连发水刺","note":"","occasion":1,"repeats":3,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":427,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"1+1.3*(a.mat*4.5-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":56,"value1":0.6,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"强劲泉涌","mpCost":0,"name":"强劲泉涌","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":428,"animationId":61,"damage":{"critical":false,"elementId":7,"formula":"10+1.2*(4.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"施放了%1！","message2":"冰晶","mpCost":0,"name":"冰晶","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":426,"animationId":15,"damage":{"critical":false,"elementId":4,"formula":"1+0.8*(a.mat*3.5-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"无形水刺","mpCost":0,"name":"连发水刺","note":"","occasion":1,"repeats":3,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":427,"animationId":69,"damage":{"critical":false,"elementId":4,"formula":"1+1.3*(a.mat*3.5-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":56,"value1":0.6,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"强劲泉涌","mpCost":0,"name":"强劲泉涌","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":428,"animationId":61,"damage":{"critical":false,"elementId":7,"formula":"10+1.2*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":2,"iconIndex":0,"message1":"施放了%1！","message2":"冰晶","mpCost":0,"name":"冰晶","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":429,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":430,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":431,"animationId":70,"damage":{"critical":false,"elementId":4,"formula":"10+*(4.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":54,"value1":0.05,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"巨浪","mpCost":0,"name":"巨浪","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":432,"animationId":71,"damage":{"critical":false,"elementId":2,"formula":"10+1.2*(4.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"施放了%1！","message2":"崩石","mpCost":0,"name":"崩石","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":431,"animationId":70,"damage":{"critical":false,"elementId":4,"formula":"10+*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":54,"value1":0.05,"value2":0}],"hitType":2,"iconIndex":0,"message1":"吟唱了%1！","message2":"巨浪","mpCost":0,"name":"巨浪","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":2,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":432,"animationId":71,"damage":{"critical":false,"elementId":2,"formula":"10+1.2*(3.5*a.mat-b.mde)","type":1,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"施放了%1！","message2":"崩石","mpCost":0,"name":"崩石","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":433,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":434,"animationId":80,"damage":{"critical":false,"elementId":5,"formula":"a.hp","type":1,"variance":20},"description":"","effects":[{"code":44,"dataId":11,"value1":1,"value2":0}],"hitType":0,"iconIndex":0,"message1":"使用了%1！","message2":"自爆","mpCost":0,"name":"自爆","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":2,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
-{"id":435,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
+{"id":435,"animationId":50,"damage":{"critical":false,"elementId":14,"formula":"10+1.3*(a.mat*3.5-b.mde)","type":1,"variance":20},"description":"","effects":[{"code":21,"dataId":67,"value1":0.5,"value2":0},{"code":21,"dataId":68,"value1":0.01,"value2":0}],"hitType":2,"iconIndex":0,"message1":"使用了%1！","message2":"毒液喷射","mpCost":0,"name":"毒液喷射","note":"","occasion":1,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":3,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":436,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":437,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
 {"id":438,"animationId":0,"damage":{"critical":false,"elementId":0,"formula":"0","type":0,"variance":20},"description":"","effects":[],"hitType":0,"iconIndex":0,"message1":"","message2":"","mpCost":0,"name":"","note":"","occasion":0,"repeats":1,"requiredWtypeId1":0,"requiredWtypeId2":0,"scope":1,"speed":0,"stypeId":1,"successRate":100,"tpCost":0,"tpGain":0},
diff --git a/data/System.json b/data/System.json
index 2cf13f4..00384a6 100644
--- a/data/System.json
+++ b/data/System.json
@@ -1 +1 @@
-{"airship":{"bgm":{"name":"Ship3","pan":0,"pitch":100,"volume":90},"characterIndex":3,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"armorTypes":["","轻甲","重甲","魔法护甲","普通饰品","魔法饰品","魔法球"],"attackMotions":[{"type":0,"weaponImageId":0},{"type":1,"weaponImageId":2},{"type":1,"weaponImageId":9},{"type":1,"weaponImageId":1},{"type":1,"weaponImageId":4},{"type":1,"weaponImageId":10},{"type":1,"weaponImageId":7},{"type":2,"weaponImageId":21},{"type":1,"weaponImageId":14},{"type":1,"weaponImageId":11},{"type":0,"weaponImageId":10},{"type":0,"weaponImageId":11},{"type":0,"weaponImageId":12}],"battleBgm":{"name":"Battle1","pan":0,"pitch":100,"volume":90},"battleback1Name":"Grassland","battleback2Name":"Grassland","battlerHue":0,"battlerName":"Dragon","boat":{"bgm":{"name":"Ship1","pan":0,"pitch":100,"volume":90},"characterIndex":0,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"currencyUnit":"经费","defeatMe":{"name":"Defeat1","pan":0,"pitch":100,"volume":90},"editMapId":24,"elements":["","物理","地","风","水","火","电","冰","圣","暗","精神","力场","混沌","幽能","毒","生命吸取"],"equipTypes":["","武器","副手","帽子","甲衣","靴子","项链","戒指"],"gameTitle":"异常生物见闻录","gameoverMe":{"name":"Gameover1","pan":0,"pitch":100,"volume":90},"locale":"zh_CN","magicSkills":[2],"menuCommands":[true,true,true,true,true,true],"optDisplayTp":true,"optDrawTitle":true,"optExtraExp":false,"optFloorDeath":false,"optFollowers":true,"optSideView":false,"optSlipDeath":false,"optTransparent":false,"partyMembers":[1],"ship":{"bgm":{"name":"Ship2","pan":0,"pitch":100,"volume":90},"characterIndex":1,"characterName":"Vehicle","startMapId":31,"startX":174,"startY":58},"skillTypes":["","特技","魔法","神术或独有技能"],"sounds":[{"name":"Cursor2","pan":0,"pitch":100,"volume":90},{"name":"Decision1","pan":0,"pitch":100,"volume":90},{"name":"Cancel2","pan":0,"pitch":100,"volume":90},{"name":"Buzzer1","pan":0,"pitch":100,"volume":90},{"name":"Equip1","pan":0,"pitch":100,"volume":90},{"name":"Save","pan":0,"pitch":100,"volume":90},{"name":"Load","pan":0,"pitch":100,"volume":90},{"name":"Battle1","pan":0,"pitch":100,"volume":90},{"name":"Run","pan":0,"pitch":100,"volume":90},{"name":"Attack3","pan":0,"pitch":100,"volume":90},{"name":"Damage4","pan":0,"pitch":100,"volume":90},{"name":"Collapse1","pan":0,"pitch":100,"volume":90},{"name":"Collapse2","pan":0,"pitch":100,"volume":90},{"name":"Collapse3","pan":0,"pitch":100,"volume":90},{"name":"Damage5","pan":0,"pitch":100,"volume":90},{"name":"Collapse4","pan":0,"pitch":100,"volume":90},{"name":"Recovery","pan":0,"pitch":100,"volume":90},{"name":"Miss","pan":0,"pitch":100,"volume":90},{"name":"Evasion1","pan":0,"pitch":100,"volume":90},{"name":"Evasion2","pan":0,"pitch":100,"volume":90},{"name":"Reflection","pan":0,"pitch":100,"volume":90},{"name":"Shop1","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90}],"startMapId":1,"startX":10,"startY":7,"switches":["","吃完饭","水管爆了","薇薇安出现","蝙蝠出现","海妖现身","五月海妖形态","出现水泡","水塔剧情借宿","去地下室","治疗海妖","准备出发","苏哈白火出现","击败幽灵船","不明海妖出现","丧尸出现","发现丧尸","","","",""],"terms":{"basic":["等级","Lv","HP","HP","MP","MP","TP","TP","经验值","EXP"],"commands":["战斗","逃跑","攻击","防御","物品","技能","装备","状态","整队","保存","游戏结束","设置","武器","护甲","重要物品","装备","最强装备","清空","开始游戏","继续游戏",null,"回到标题","取消",null,"购买","出售"],"params":["最大 HP","最大 MP","攻击力","防御力","魔法攻击","魔法防御","敏捷","幸运","命中率","回避率"],"messages":{"actionFailure":"对%1没有效果！","actorDamage":"%1受到了 %2 点伤害！","actorDrain":"%1被吸收了 %3 点 %2！","actorGain":"%1的 %2 增加了 %3 点！","actorLoss":"%1的 %2 减少了 %3 点！","actorNoDamage":"%1没有受到伤害！","actorNoHit":"Miss！ %1没有受到伤害！","actorRecovery":"%1恢复了 %3 点 %2！","alwaysDash":"始终跑步","bgmVolume":"BGM 音量","bgsVolume":"BGS 音量","buffAdd":"%1的%2上升了！","buffRemove":"%1的%2恢复正常了！","commandRemember":"记住指令","counterAttack":"%1的反击！","criticalToActor":"痛恨一击！","criticalToEnemy":"会心一击！","debuffAdd":"%1的%2下降了！","defeat":"%1被击败了。","emerge":"%1出现了！","enemyDamage":"%1受到了 %2 点伤害！","enemyDrain":"%1被吸收了 %3 点 %2！","enemyGain":"%1的 %2 增加了 %3 点！","enemyLoss":"%1的 %2 减少了 %3 点！","enemyNoDamage":"没有对%1造成伤害！","enemyNoHit":"Miss！没有对%1造成伤害！","enemyRecovery":"%1恢复了 %3 点 %2！","escapeFailure":"但是没有逃跑成功！","escapeStart":"%1开始逃跑了！","evasion":"%1躲开了攻击！","expNext":"距离下一%1","expTotal":"现在的%1","file":"文件","levelUp":"%1升到了 %2 %3！","loadMessage":"读取哪个文件？","magicEvasion":"%1抵消了魔法！","magicReflection":"%1反射了魔法！","meVolume":"ME 音量","obtainExp":"获得了 %1 点%2！","obtainGold":"获得了 %1\\G！","obtainItem":"获得了%1！","obtainSkill":"学会了%1！","partyName":"%1的队伍","possession":"持有数","preemptive":"%1先发制人！","saveMessage":"保存到哪个文件？","seVolume":"SE 音量","substitute":"%1保护了%2！","surprise":"%1被偷袭了！","useItem":"%1使用了%2！","victory":"%1胜利了！"}},"testBattlers":[{"actorId":1,"equips":[1,1,2,3,0],"level":1},{"actorId":2,"equips":[2,1,2,3,0],"level":1},{"actorId":3,"equips":[3,0,2,3,4],"level":1},{"actorId":4,"equips":[4,0,2,3,4],"level":1}],"testTroopId":4,"title1Name":"Plain","title2Name":"","titleBgm":{"name":"Theme6","pan":0,"pitch":100,"volume":90},"variables":["","薇薇安的技能数值","数据判断","狗炮计数","狗炮能量余额","","时间推进","","","","","","","","","","","","","",""],"versionId":57795953,"victoryMe":{"name":"Victory1","pan":0,"pitch":100,"volume":90},"weaponTypes":["","剑","长枪","匕首","斧","爪","弓弩","枪炮","法杖","专属武器"],"windowTone":[0,0,0,0]}
\ No newline at end of file
+{"airship":{"bgm":{"name":"Ship3","pan":0,"pitch":100,"volume":90},"characterIndex":3,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"armorTypes":["","轻甲","重甲","魔法护甲","普通饰品","魔法饰品","魔法球"],"attackMotions":[{"type":0,"weaponImageId":0},{"type":1,"weaponImageId":2},{"type":1,"weaponImageId":9},{"type":1,"weaponImageId":1},{"type":1,"weaponImageId":4},{"type":1,"weaponImageId":10},{"type":1,"weaponImageId":7},{"type":2,"weaponImageId":21},{"type":1,"weaponImageId":14},{"type":1,"weaponImageId":11},{"type":0,"weaponImageId":10},{"type":0,"weaponImageId":11},{"type":0,"weaponImageId":12}],"battleBgm":{"name":"Battle1","pan":0,"pitch":100,"volume":90},"battleback1Name":"Grassland","battleback2Name":"Grassland","battlerHue":0,"battlerName":"Dragon","boat":{"bgm":{"name":"Ship1","pan":0,"pitch":100,"volume":90},"characterIndex":0,"characterName":"Vehicle","startMapId":0,"startX":0,"startY":0},"currencyUnit":"经费","defeatMe":{"name":"Defeat1","pan":0,"pitch":100,"volume":90},"editMapId":24,"elements":["","物理","地","风","水","火","电","冰","圣","暗","精神","力场","混沌","幽能","毒","生命吸取"],"equipTypes":["","武器","副手","帽子","甲衣","靴子","项链","戒指"],"gameTitle":"异常生物见闻录","gameoverMe":{"name":"Gameover1","pan":0,"pitch":100,"volume":90},"locale":"zh_CN","magicSkills":[2],"menuCommands":[true,true,true,true,true,true],"optDisplayTp":true,"optDrawTitle":true,"optExtraExp":false,"optFloorDeath":false,"optFollowers":true,"optSideView":false,"optSlipDeath":false,"optTransparent":false,"partyMembers":[1],"ship":{"bgm":{"name":"Ship2","pan":0,"pitch":100,"volume":90},"characterIndex":1,"characterName":"Vehicle","startMapId":31,"startX":174,"startY":58},"skillTypes":["","特技","魔法","神术或独有技能"],"sounds":[{"name":"Cursor2","pan":0,"pitch":100,"volume":90},{"name":"Decision1","pan":0,"pitch":100,"volume":90},{"name":"Cancel2","pan":0,"pitch":100,"volume":90},{"name":"Buzzer1","pan":0,"pitch":100,"volume":90},{"name":"Equip1","pan":0,"pitch":100,"volume":90},{"name":"Save","pan":0,"pitch":100,"volume":90},{"name":"Load","pan":0,"pitch":100,"volume":90},{"name":"Battle1","pan":0,"pitch":100,"volume":90},{"name":"Run","pan":0,"pitch":100,"volume":90},{"name":"Attack3","pan":0,"pitch":100,"volume":90},{"name":"Damage4","pan":0,"pitch":100,"volume":90},{"name":"Collapse1","pan":0,"pitch":100,"volume":90},{"name":"Collapse2","pan":0,"pitch":100,"volume":90},{"name":"Collapse3","pan":0,"pitch":100,"volume":90},{"name":"Damage5","pan":0,"pitch":100,"volume":90},{"name":"Collapse4","pan":0,"pitch":100,"volume":90},{"name":"Recovery","pan":0,"pitch":100,"volume":90},{"name":"Miss","pan":0,"pitch":100,"volume":90},{"name":"Evasion1","pan":0,"pitch":100,"volume":90},{"name":"Evasion2","pan":0,"pitch":100,"volume":90},{"name":"Reflection","pan":0,"pitch":100,"volume":90},{"name":"Shop1","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90},{"name":"Item3","pan":0,"pitch":100,"volume":90}],"startMapId":1,"startX":10,"startY":7,"switches":["","吃完饭","水管爆了","薇薇安出现","蝙蝠出现","海妖现身","五月海妖形态","出现水泡","水塔剧情借宿","去地下室","治疗海妖","准备出发","苏哈白火出现","击败幽灵船","不明海妖出现","丧尸出现","发现丧尸","","","",""],"terms":{"basic":["等级","Lv","HP","HP","MP","MP","TP","TP","经验值","EXP"],"commands":["战斗","逃跑","攻击","防御","物品","技能","装备","状态","整队","保存","游戏结束","设置","武器","护甲","重要物品","装备","最强装备","清空","开始游戏","继续游戏",null,"回到标题","取消",null,"购买","出售"],"params":["最大 HP","最大 MP","攻击力","防御力","魔法攻击","魔法防御","敏捷","幸运","命中率","回避率"],"messages":{"actionFailure":"对%1没有效果！","actorDamage":"%1受到了 %2 点伤害！","actorDrain":"%1被吸收了 %3 点 %2！","actorGain":"%1的 %2 增加了 %3 点！","actorLoss":"%1的 %2 减少了 %3 点！","actorNoDamage":"%1没有受到伤害！","actorNoHit":"Miss！ %1没有受到伤害！","actorRecovery":"%1恢复了 %3 点 %2！","alwaysDash":"始终跑步","bgmVolume":"BGM 音量","bgsVolume":"BGS 音量","buffAdd":"%1的%2上升了！","buffRemove":"%1的%2恢复正常了！","commandRemember":"记住指令","counterAttack":"%1的反击！","criticalToActor":"痛恨一击！","criticalToEnemy":"会心一击！","debuffAdd":"%1的%2下降了！","defeat":"%1被击败了。","emerge":"%1出现了！","enemyDamage":"%1受到了 %2 点伤害！","enemyDrain":"%1被吸收了 %3 点 %2！","enemyGain":"%1的 %2 增加了 %3 点！","enemyLoss":"%1的 %2 减少了 %3 点！","enemyNoDamage":"没有对%1造成伤害！","enemyNoHit":"Miss！没有对%1造成伤害！","enemyRecovery":"%1恢复了 %3 点 %2！","escapeFailure":"但是没有逃跑成功！","escapeStart":"%1开始逃跑了！","evasion":"%1躲开了攻击！","expNext":"距离下一%1","expTotal":"现在的%1","file":"文件","levelUp":"%1升到了 %2 %3！","loadMessage":"读取哪个文件？","magicEvasion":"%1抵消了魔法！","magicReflection":"%1反射了魔法！","meVolume":"ME 音量","obtainExp":"获得了 %1 点%2！","obtainGold":"获得了 %1\\G！","obtainItem":"获得了%1！","obtainSkill":"学会了%1！","partyName":"%1的队伍","possession":"持有数","preemptive":"%1先发制人！","saveMessage":"保存到哪个文件？","seVolume":"SE 音量","substitute":"%1保护了%2！","surprise":"%1被偷袭了！","useItem":"%1使用了%2！","victory":"%1胜利了！"}},"testBattlers":[{"actorId":1,"equips":[1,1,2,3,0],"level":1},{"actorId":2,"equips":[2,1,2,3,0],"level":1},{"actorId":3,"equips":[3,0,2,3,4],"level":1},{"actorId":4,"equips":[4,0,2,3,4],"level":1}],"testTroopId":4,"title1Name":"Plain","title2Name":"","titleBgm":{"name":"Theme6","pan":0,"pitch":100,"volume":90},"variables":["","薇薇安的技能数值","数据判断","狗炮计数","狗炮能量余额","","时间推进","","","","","","","","","","","","","",""],"versionId":54686117,"victoryMe":{"name":"Victory1","pan":0,"pitch":100,"volume":90},"weaponTypes":["","剑","长枪","匕首","斧","爪","弓弩","枪炮","法杖","专属武器"],"windowTone":[0,0,0,0]}
\ No newline at end of file
diff --git a/data/Troops.json b/data/Troops.json
index 2698dc9..5476b45 100644
--- a/data/Troops.json
+++ b/data/Troops.json
@@ -1,18 +1,18 @@
 [
 null,
 {"id":1,"members":[{"enemyId":5,"x":408,"y":436,"hidden":false}],"name":"幽灵船","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":101,"indent":0,"parameters":["主角团",4,0,2]},{"code":401,"indent":0,"parameters":["【伊扎克斯】"]},{"code":401,"indent":0,"parameters":["幽灵船？！这就是你们书上写的幽灵船？没想到真有这东西啊，这玩意儿怎么形成的？"]},{"code":101,"indent":0,"parameters":["主角团",5,0,2]},{"code":401,"indent":0,"parameters":["【伊丽莎白】"]},{"code":401,"indent":0,"parameters":["爸爸你把我扔上去！"]},{"code":101,"indent":0,"parameters":["主角团",0,0,2]},{"code":401,"indent":0,"parameters":["【郝仁】"]},{"code":401,"indent":0,"parameters":["别闹，提高警惕，可能是海妖搞出来的，莎琪拉，索玛，你们知道这是什么玩意儿么？"]},{"code":101,"indent":0,"parameters":["",3,0,2]},{"code":401,"indent":0,"parameters":["【莎琪拉】"]},{"code":401,"indent":0,"parameters":["她在警告我们不要靠近，说什么漩涡就要开启……她一直在重复这几句话，听上去不太清醒的样子。"]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【索玛】"]},{"code":401,"indent":0,"parameters":["#￥……&%&*￥*（海妖之歌）"]},{"code":339,"indent":0,"parameters":[0,0,431,-1]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":1,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【索玛】"]},{"code":401,"indent":0,"parameters":["攻击船的中段！第二桅杆下面！她疯了！"]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【数据终端】"]},{"code":401,"indent":0,"parameters":["一个超级巨大的气旋正在附近海域形成，一旦它合拢，这恐怕将是人类有史以来记载过的最大的风暴之一！！"]},{"code":124,"indent":0,"parameters":[0,480]},{"code":101,"indent":0,"parameters":["",0,0,2]},{"code":401,"indent":0,"parameters":["【莎琪拉】"]},{"code":401,"indent":0,"parameters":["到底招谁惹谁了！到底招谁惹谁了！"]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":true,"turnValid":false},"list":[{"code":122,"indent":0,"parameters":[2,2,0,0,0]},{"code":122,"indent":0,"parameters":[2,2,0,3,4,0,0]},{"code":122,"indent":0,"parameters":[2,2,4,3,4,0,2]},{"code":122,"indent":0,"parameters":[2,2,3,0,10]},{"code":111,"indent":0,"parameters":[1,2,0,2,2]},{"code":124,"indent":1,"parameters":[1]},{"code":101,"indent":1,"parameters":["主角团",0,0,2]},{"code":401,"indent":1,"parameters":["【郝仁】"]},{"code":401,"indent":1,"parameters":["呼，结束了"]},{"code":122,"indent":1,"parameters":[2,2,0,0,0]},{"code":340,"indent":1,"parameters":[]},{"code":0,"indent":1,"parameters":[]},{"code":412,"indent":0,"parameters":[]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":2,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":3,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":4,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":5,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":6,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":7,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":8,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":9,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":10,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":11,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":12,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
-{"id":13,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":2,"members":[{"enemyId":1,"x":223,"y":439,"hidden":false},{"enemyId":1,"x":611,"y":385,"hidden":false}],"name":"火山蝙蝠*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":3,"members":[{"enemyId":2,"x":267,"y":388,"hidden":false},{"enemyId":2,"x":583,"y":436,"hidden":false}],"name":"火山鼠*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":4,"members":[{"enemyId":4,"x":275,"y":337,"hidden":false},{"enemyId":4,"x":568,"y":388,"hidden":false}],"name":"熔岩怪*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":5,"members":[{"enemyId":3,"x":389,"y":292,"hidden":false},{"enemyId":2,"x":220,"y":424,"hidden":false},{"enemyId":4,"x":618,"y":427,"hidden":false}],"name":"火山鼠, 爆弹怪, 熔岩怪","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":339,"indent":0,"parameters":[0,1,394,0]},{"code":339,"indent":0,"parameters":[0,2,394,0]},{"code":0,"indent":0,"parameters":[]}],"span":0},{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":4,"turnB":0,"turnEnding":false,"turnValid":true},"list":[{"code":339,"indent":0,"parameters":[0,0,434,-1]},{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":6,"members":[{"enemyId":6,"x":269,"y":427,"hidden":false},{"enemyId":6,"x":580,"y":373,"hidden":false}],"name":"硫酸史莱姆*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":7,"members":[{"enemyId":7,"x":370,"y":358,"hidden":false},{"enemyId":6,"x":182,"y":412,"hidden":false},{"enemyId":6,"x":565,"y":424,"hidden":false}],"name":"硫酸史莱姆王, 硫酸史莱姆*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":8,"members":[{"enemyId":8,"x":216,"y":444,"hidden":false},{"enemyId":8,"x":615,"y":444,"hidden":false}],"name":"被控制的海妖*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":9,"members":[{"enemyId":9,"x":240,"y":444,"hidden":false},{"enemyId":8,"x":591,"y":442,"hidden":false}],"name":"被控制的精锐海妖, 被控制的海妖","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":10,"members":[{"enemyId":10,"x":266,"y":436,"hidden":false},{"enemyId":10,"x":429,"y":316,"hidden":false},{"enemyId":10,"x":580,"y":427,"hidden":false}],"name":"深海怪鼠*3","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":11,"members":[{"enemyId":11,"x":277,"y":301,"hidden":false},{"enemyId":11,"x":551,"y":433,"hidden":false}],"name":"海蜇*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":12,"members":[{"enemyId":12,"x":285,"y":292,"hidden":false},{"enemyId":11,"x":558,"y":421,"hidden":false}],"name":"潜渊海蜇, 海蜇","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
+{"id":13,"members":[{"enemyId":13,"x":258,"y":319,"hidden":false},{"enemyId":13,"x":621,"y":406,"hidden":false}],"name":"海蛇*2","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":14,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":15,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
 {"id":16,"members":[],"name":"","pages":[{"conditions":{"actorHp":50,"actorId":1,"actorValid":false,"enemyHp":50,"enemyIndex":0,"enemyValid":false,"switchId":1,"switchValid":false,"turnA":0,"turnB":0,"turnEnding":false,"turnValid":false},"list":[{"code":0,"indent":0,"parameters":[]}],"span":0}]},
diff --git a/data/Weapons.json b/data/Weapons.json
index 2afdbd7..a07422b 100644
--- a/data/Weapons.json
+++ b/data/Weapons.json
@@ -1,6 +1,6 @@
 [
 null,
-{"id":1,"animationId":6,"description":"","etypeId":1,"traits":[{"code":31,"dataId":1,"value":0},{"code":22,"dataId":0,"value":0},{"code":21,"dataId":0,"value":0.5}],"iconIndex":97,"name":"剑","note":"","params":[0,0,10,0,0,0,0,0],"price":500,"wtypeId":2},
+{"id":1,"animationId":7,"description":"海妖的制式长剑，坚固耐用但没什么特点","etypeId":1,"traits":[{"code":31,"dataId":1,"value":0},{"code":22,"dataId":0,"value":0.04}],"iconIndex":97,"name":"海妖制式长剑","note":"","params":[0,0,16,0,5,0,0,0],"price":10,"wtypeId":1},
 {"id":2,"animationId":6,"description":"","etypeId":1,"traits":[{"code":31,"dataId":1,"value":0},{"code":22,"dataId":0,"value":0}],"iconIndex":99,"name":"斧","note":"","params":[0,0,10,0,0,0,0,0],"price":500,"wtypeId":4},
 {"id":3,"animationId":1,"description":"","etypeId":1,"traits":[{"code":31,"dataId":1,"value":0},{"code":22,"dataId":0,"value":0}],"iconIndex":101,"name":"杖","note":"","params":[0,0,10,0,0,0,0,0],"price":500,"wtypeId":6},
 {"id":4,"animationId":11,"description":"","etypeId":1,"traits":[{"code":31,"dataId":1,"value":0},{"code":22,"dataId":0,"value":0}],"iconIndex":102,"name":"弓","note":"","params":[0,0,10,0,0,0,0,0],"price":500,"wtypeId":7}