Merge branch 'noAnimate' into hasAnimate

project/plugins.js

@@ -3169,20 +3169,18 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 					gaodu = gaodu + 1;
 					if (gaodu == 12) {
 						switch (huanzi) {
-						case 0:
+						case 0: {
-							{
+							huanzi = 1;
-								huanzi = 1;
+							gaodu = 0;
-								gaodu = 0;
+							shangsheng = 1;
-								shangsheng = 1;
+						};
-							};
+						break;
-							break;
+						case 1: {
-						case 1:
+							huanzi = 2;
-							{
+							gaodu = 0;
-								huanzi = 2;
+							shangsheng = 1;
-								gaodu = 0;
+						};
-								shangsheng = 1;
+						break;
-							};
-							break;
 						case 2:
 							var tiaozizhong = 1;
 							break;
@@ -3215,7 +3213,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 	}
 	this.donghua = function () {
 		if (core.status.floorId == "MT0") {
-			if (core.isReplaying()) {setTimeout(core.plugin.donghua, 100); return;}
+			if (core.isReplaying()) { setTimeout(core.plugin.donghua, 100); return; }
 			core.setFlag("linshi", core.drawAnimate("jingu", 10, 10, false, function () {
 
 				core.plugin.donghua();
@@ -3240,7 +3238,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		} else core.stopAnimate(core.getFlag("linshi2", 0), false);
 	}
 	this.donghua3 = function () {
-		if (core.getFlag("poison")) {
+		var outMap;
+		if (core.getHeroLoc('x') <= 0 || core.getHeroLoc('y') <= 0)
+			outMap = true;
+		if (core.getFlag("poison") && !outMap) {
 			core.setFlag("linshi3", core.drawHeroAnimate("dufa",
 				function () {
 					core.plugin.donghua3();
@@ -4970,5 +4971,14 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 
 
 
+},
+    "等待动画结束过滤中毒": function () {
+	// 在此增加新插件
+	maps.prototype.getPlayingAnimates = function (name) {
+
+		return (core.status.animateObjs || []).filter(function (one) {
+			return one.id != flags.linshi3 && (name == null || one.name == name);
+		}).map(function (one) { return one.id });
+	}
 }
 }