From 82c3d54141b31dfb2f7a0e2115e35f4336829d97 Mon Sep 17 00:00:00 2001
From: bdf1 <baodongfang@yeah.net>
Date: Thu, 16 Mar 2023 21:29:46 +1300
Subject: [PATCH] fix: fix special values for poison tail. Fix poison values in
 MT20. Fix some scaling bugs

---
 _server/config.json       |  1 -
 project/data.js           |  2 +-
 project/enemys.js         |  2 +-
 project/floors/MT20.js    | 10 ++++++++++
 project/floors/huxiao1.js |  2 +-
 project/floors/nandu.js   |  2 +-
 project/functions.js      |  2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 _server/config.json

diff --git a/_server/config.json b/_server/config.json
deleted file mode 100644
index a77e904..0000000
--- a/_server/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"viewportLoc":[0,0],"editorLastFloorId":"MT9","lastUsed":[{"idnum":554,"id":"N554","images":"npcs","y":42,"recent":1668243635497,"frequent":2},{"idnum":551,"id":"N551","images":"npcs","y":41,"recent":1668243645267,"frequent":2},{"idnum":46,"id":"fly","images":"items","y":12,"recent":1668239925419,"frequent":1},{"idnum":45,"id":"book","images":"items","y":9,"recent":1668238365160,"frequent":1}]}
\ No newline at end of file
diff --git a/project/data.js b/project/data.js
index e785825..70cfb71 100644
--- a/project/data.js
+++ b/project/data.js
@@ -1132,7 +1132,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"choices": [
 					{
 						"text": "魔防+${flag:mdefShop}",
-						"need": "ture",
+						"need": "true",
 						"action": [
 							{
 								"type": "if",
diff --git a/project/enemys.js b/project/enemys.js
index a2c7533..6bbdac0 100644
--- a/project/enemys.js
+++ b/project/enemys.js
@@ -67,7 +67,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"M300": {"name":"墙妖","hp":50,"atk":420,"def":300,"money":100,"exp":10,"point":0,"special":3},
 	"M301": {"name":"汪洋","hp":10000,"atk":300,"def":0,"money":1000,"exp":100,"point":0,"special":0,"beforeBattle":[{"type":"animate","name":"hainazhijian","loc":[6,5]}],"afterBattle":[{"type":"setValue","name":"flag:255","value":"1"},{"type":"setValue","name":"flag:bofang","value":"0"},{"type":"trigger","loc":[0,1]}]},
 	"M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":0.34,"add":false},
-	"M303": {"name":"血尾雕像","hp":5000,"atk":100,"def":0,"money":200,"exp":10,"point":0,"special":[15,11],"value":100.34,"add":false},
+	"M303": {"name":"血尾雕像","hp":5000,"atk":100,"def":0,"money":200,"exp":10,"point":0,"special":[15,11],"value":null,"add":false,"zone":100,"vampire":0.34},
 	"E340": {"name":"戾鬼","hp":49999,"atk":18973,"def":1800,"money":5000,"exp":500,"point":0,"special":0},
 	"E341": {"name":"媚儿","hp":25000,"atk":250,"def":180,"money":2500,"exp":250,"point":0,"special":0},
 	"E342": {"name":"圣狱","hp":30000,"atk":250,"def":180,"money":3000,"exp":300,"point":0,"special":0},
diff --git a/project/floors/MT20.js b/project/floors/MT20.js
index 501da10..76366fd 100644
--- a/project/floors/MT20.js
+++ b/project/floors/MT20.js
@@ -690,6 +690,11 @@ main.floors.MT20=
                             ]
                         }
                     ]
+                },
+                {
+                    "type": "setGlobalValue",
+                    "name": "poisonDamage",
+                    "value": 15
                 }
             ]
         },
@@ -1078,6 +1083,11 @@ main.floors.MT20=
                             "function": "function(){\ncore.Confirmskip_Off();\n}"
                         }
                     ]
+                },
+                {
+                    "type": "setGlobalValue",
+                    "name": "poisonDamage",
+                    "value": 75
                 }
             ]
         },
diff --git a/project/floors/huxiao1.js b/project/floors/huxiao1.js
index 457212f..ddf33c0 100644
--- a/project/floors/huxiao1.js
+++ b/project/floors/huxiao1.js
@@ -50,7 +50,7 @@ main.floors.huxiao1=
             {
                 "type": "setValue",
                 "name": "flag:Memories_grayscale",
-                "value": "ture"
+                "value": "true"
             },
             {
                 "type": "comment",
diff --git a/project/floors/nandu.js b/project/floors/nandu.js
index d0863c2..7729b32 100644
--- a/project/floors/nandu.js
+++ b/project/floors/nandu.js
@@ -73,7 +73,7 @@ main.floors.nandu=
             },
             {
                 "type": "sleep",
-                "time": 500,
+                "time": 550,
                 "noSkip": true
             },
             {
diff --git a/project/functions.js b/project/functions.js
index 1a7bc28..44405ec 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -1750,7 +1750,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 				setTimeout(function () { core.ui.drawStatusBar(); }, 100);
 			}
 			if (core.status.floorId == "nandu") {
-				core.dom.statusCanvas.width *= 1;
+				core.ui.clearMap(ctx = core.dom.statusCanvasCtx);
 				core.dom.statusCanvas.style.zIndex=80;
 			}
 			else core.dom.statusCanvas.style.zIndex=50;