Merge branch 'status-itcfangye' into story-laodeng

_server/MotaAction.g4

@@ -567,7 +567,7 @@ doorInfo_m
 
 /* doorInfo_m
 tooltip : 开门信息
-default : [160, 'door.mp3', 'door.mp3']
+default : [160, 'door.opus', 'door.opus']
 helpUrl : /_docs/#/instruction
 EvalString_0 = EvalString_0 && (', "openSound": "' + EvalString_0 + '"');
 EvalString_1 = EvalString_1 && (', "closeSound": "' + EvalString_1 + '"');
@@ -1138,7 +1138,7 @@ return code;
 
 cgtext_s
     :    '背景' EvalString? '回忆滤镜' Bool? '移除对话框' Bool? '剧情库序列' Int '头像' EvalString?'坐标PX' Number'打字间隔' Int? BGNL? Newline
-     '自动等待时长' Int '音频文件(需在全塔属性——使用音效注册)'EvalString? BGNL? Newline
+     '自动等待时长' Int  BGNL? Newline
       textcgDrawingList+? Newline
     
 
@@ -1146,11 +1146,10 @@ cgtext_s
 tooltip : cgtext：显示一段包含cg的文字（剧情）
 helpUrl : /_docs/#/instruction
 allImages : ['EvalString_0','EvalString_1']
-allSounds : ['EvalString_2']
 default : ["bg_5043.webp",false,false,0,"face_050445.webp",-300,0,2000,"","这句话显示在对话框内",[{ "name":"tati_050145a.webp" , "px": 100,"filter":false }]]
 var head ='{ "name": "'+EvalString_1+'", "px": '+Number_0+' }'
 var list=',"bodyList": [\n'+textcgDrawingList_0.slice(0,-1)+'\n]'
-var code = '{"type": "cgtext", "bg":"'+EvalString_0+'","memory":'+Bool_0+',"WindowSkin":'+Bool_1+',"head":'+head+' ,"index":"'+Int_0+'","time":'+Int_1+',"wait":'+Int_2+',"sound":"'+EvalString_2+'"'+list+' },\n';
+var code = '{"type": "cgtext", "bg":"'+EvalString_0+'","memory":'+Bool_0+',"WindowSkin":'+Bool_1+',"head":'+head+' ,"index":"'+Int_0+'","time":'+Int_1+',"wait":'+Int_2+list+' },\n';
 return code;
 */;
 textcgDrawingList
@@ -4625,8 +4624,8 @@ IdString
     ;
 
 FixedId_List
-    :   '生命'|'生命上限'|'攻击'|'防御'|'护盾'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'当前横坐标'|'当前纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'护盾增益'
+    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'|'魔力'|'魔力上限'|'当前横坐标'|'当前纵坐标'|'当前朝向'|'攻击增益'|'防御增益'|'护盾增益'
-    /*FixedId_List ['status:hp','status:hpmax','status:atk','status:def','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:exp','status:mana','status:manamax','status:x','status:y','status:direction','buff:atk','buff:def','buff:mdef']*/;
+    /*FixedId_List ['status:hp','status:hpmax','status:atk','status:def','status:spell','status:matk','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:exp','status:mana','status:manamax','status:x','status:y','status:direction','buff:atk','buff:def','buff:mdef']*/;
 
 Id_List
     :   '变量' | '状态' | '物品' | '增益' | '独立开关' | '临时变量' |'全局存储'
@@ -4641,8 +4640,8 @@ EnemyPoint_List
     /*EnemyPoint_List ['hp','atk','def','money','exp','point','name']*/;
 
 Equip_List
-    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔力'|'魔力上限'|'速度'
+    :   '生命'|'生命上限'|'攻击'|'防御'|'法强'|'魔攻比例'|'护盾比例'|'魔力'|'魔力上限'|'速度'
-    /*Equip_List ['hp','hpmax','atk','def','mdef','mana','manamax','speed']*/;
+    /*Equip_List ['hp','hpmax','atk','def','spell','matk','mdef','mana','manamax','speed']*/;
 
 Key_List
     :   '黄钥匙'|'蓝钥匙'|'红钥匙'|'绿钥匙'|'铁门钥匙'

_server/MotaActionParser.js

@@ -574,7 +574,6 @@ MotaActionParser = function () {
           data.head.px || -300,
           data.time,
           data.wait,
-          data.sound,
           buildcgDrawing(data.bodyList),
           this.next,
         ]);

_server/editor_blocklyconfig.js

@@ -132,8 +132,8 @@ editor_blocklyconfig = function () {
         MotaActionFunctions.actionParser.parse(
           {
             time: 160,
-            openSound: "door.mp3",
+            openSound: "door.opus",
-            closeSound: "door.mp3",
+            closeSound: "door.opus",
             keys: { yellowKey: 1, orangeKey: 1 },
           },
           "doorInfo"
@@ -142,9 +142,9 @@ editor_blocklyconfig = function () {
         MotaActionBlocks["mainStyle_m"].xmlText(),
         MotaActionFunctions.actionParser.parse(
           {
-            背景音乐: "bgm.mp3",
+            背景音乐: "bgm.opus",
-            确定: "confirm.mp3",
+            确定: "confirm.opus",
-            攻击: "attack.mp3",
+            攻击: "attack.opus",
             背景图: "bg.jpg",
             领域: "zone",
             文件名: "file.jpg",

_server/table/comment.js

@@ -192,7 +192,9 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 				"mdef": {
 					"_leaf": true,
 					"_type": "textarea",
-					"_data": "法抗(写为小数)"
+					"_docs": "法抗",
+					"_data": "百分数，如10为10%法抗，怪物受到勇士的法术伤害减免比例"
+
 				},
 				"speed": {
 					"_leaf": true,

_server/table/data.comment.js

@@ -264,10 +264,27 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
 							"_type": "textarea",
 							"_data": "防御"
 						},
+						"spell": {
+							"_leaf": true,
+							"_type": "textarea",
+							"_data": "法强",
+						},
 						"mdef": {
 							"_leaf": true,
 							"_type": "textarea",
-							"_data": "法强"
+							"_data": "法抗百分比",
+						},
+						"matk": {
+							"_leaf": true,
+							"_type": "textarea",
+							"_data": "100为法强转化为等值魔攻",
+							"_docs": "魔攻比例"
+						},
+						"mhp": {
+							"_leaf": true,
+							"_type": "textarea",
+							"_data": "100为法强转化为等值护盾",
+							"_docs": "护盾比例"
 						},
 						"speed": {
 							"_leaf": true,

project/data.js

@@ -437,18 +437,21 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"face_440110.webp",
 			"green.webp",
 			"hero.webp",
+			"jianji.webp",
 			"l.webp",
 			"lane1.webp",
 			"light.webp",
 			"lock.webp",
 			"lr.webp",
 			"maba.webp",
+			"miwu.webp",
 			"null.webp",
 			"other_0001.webp",
 			"other_0002.webp",
 			"other_0003.webp",
 			"other_0004.webp",
 			"r.webp",
+			"sound.webp",
 			"status.webp",
 			"suiji.webp",
 			"tati_020101.webp",
@@ -1107,7 +1110,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		"hero": {
 			"image": "hero.webp",
 			"animate": false,
-			"name": "Caim",
+			"name": "凯伊姆",
 			"lv": 1,
 			"hpmax": 9999,
 			"hp": 1000,
@@ -1116,7 +1119,7 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"atk": 100,
 			"def": 100,
 			"mdef": 0,
-			"speed": 0,
+			"speed": 10,
 			"money": 0,
 			"exp": 0,
 			"equipment": [],
@@ -1135,7 +1138,11 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 				"useBetweenLight": true
 			},
 			"followers": [],
-			"steps": 0
+			"steps": 0,
+			"matk": 0,
+			"spell": 0,
+			"spelldef": 0,
+			"mhp": 0
 		},
 		"startCanvas": [
 			{
@@ -1491,14 +1498,12 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"startText": [
 			{
-				"type": "setValue",
+				"type": "function",
-				"name": "item:book",
+				"function": "function(){\ncore.getItem('book',1);core.getItem('fly',1)\n}"
-				"value": "1"
 			},
 			{
-				"type": "setValue",
+				"type": "insert",
-				"name": "item:fly",
+				"name": "战斗动画特效注册"
-				"value": "1"
 			},
 			{
 				"type": "insert",

project/enemys.js

@@ -1,10 +1,10 @@
 var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = 
 {
-	"greenSlime": {"name":"绿头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"magic":false},
+	"greenSlime": {"name":"绿头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0,"magic":false,"mdef":0},
 	"redSlime": {"name":"红头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[],"value":10,"magic":false},
 	"blackSlime": {"name":"青头怪","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"slimelord": {"name":"怪王","hp":100,"atk":120,"def":0,"money":10,"exp":0,"point":0,"special":[1,9]},
-	"bat": {"name":"小蝙蝠","hp":100,"atk":120,"def":0,"money":2,"exp":0,"point":0,"special":[1]},
+	"bat": {"name":"小蝙蝠","hp":100,"atk":120,"def":0,"money":2,"exp":0,"point":0,"special":[1],"mdef":0,"speed":15},
 	"bigBat": {"name":"大蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":0},
 	"redBat": {"name":"红蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]},
 	"vampire": {"name":"冥灵魔王","hp":888,"atk":888,"def":888,"money":888,"exp":888,"point":0,"special":[6],"n":8},

project/floors/yiqu1.js

@@ -14,14 +14,7 @@ main.floors.yiqu1=
     "firstArrive": [],
     "eachArrive": [],
     "parallelDo": "",
-    "events": {
+    "events": {},
-        "5,9": [
-            {
-                "type": "insert",
-                "name": "chapter01"
-            }
-        ]
-    },
     "changeFloor": {
         "0,7": {
             "floorId": "yiqu2",

project/icons.js

@@ -315,7 +315,18 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"jumpShoes": 49,
 		"skill1": 30,
 		"wand": 10,
-		"pack": 46
+		"pack": 46,
+		"I366": 5,
+		"I367": 7,
+		"I368": 26,
+		"I369": 31,
+		"I370": 32,
+		"I371": 34,
+		"I372": 35,
+		"I373": 36,
+		"I374": 37,
+		"I375": 38,
+		"I396": 39
 	},
 	"autotile": {
 		"autotile": 0,

project/items.js

@@ -332,7 +332,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"text": "可以自由往来去过的楼层",
 		"hideInReplay": true,
 		"hideInToolbox": true,
-		"useItemEffect": "//core.ui.drawFly(core.floorIds.indexOf(core.status.floorId));\nflags.canMoveFloor = core.canMoveFloor()\nif (core.isPlaying()) core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId));",
+		"useItemEffect": "//core.ui.drawFly(core.floorIds.indexOf(core.status.floorId));\nflags.canMoveFloor = core.canMoveFloor()\nif (!main.replayChecking && !core.isReplaying()) core.ui._drawViewMaps(core.floorIds.indexOf(core.status.floorId));",
 		"canUseItemEffect": "(function () {\n\tif (core.flags.flyNearStair && !core.nearStair() && !core.canMoveFloor())\n\t\treturn false;\n\treturn core.status.maps[core.status.floorId].canFlyFrom;\n})();"
 	},
 	"coin": {
@@ -546,5 +546,60 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"name": "钱袋",
 		"itemEffect": "core.status.hero.money += 500",
 		"itemEffectTip": "，金币+500"
+	},
+	"I366": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I367": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I368": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I369": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I370": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I371": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I372": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I373": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I374": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I375": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
+	},
+	"I396": {
+		"cls": "items",
+		"name": "新物品",
+		"canUseItemEffect": "true"
 	}
 }

project/maps.js

@@ -1,8 +1,8 @@
 var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = 
 {
-	"1": {"cls":"animates","id":"yellowWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{}}},
+	"1": {"cls":"animates","id":"yellowWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}},
-	"2": {"cls":"animates","id":"whiteWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{}}},
+	"2": {"cls":"animates","id":"whiteWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}},
-	"3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{}}},
+	"3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}},
 	"4": {"cls":"animates","id":"star","name":"星空"},
 	"5": {"cls":"animates","id":"lava","name":"岩浆"},
 	"6": {"cls":"animates","id":"ice","doorInfo":{"time":160,"openSound":"破冰镐","closeSound":"door.opus","keys":{"icePickaxe":1}},"animate":1},
@@ -68,12 +68,12 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"71": {"cls":"items","id":"shield0"},
 	"72": {"cls":"items","id":"skill1"},
 	"73": {"cls":"items","id":"wand"},
-	"81": {"cls":"animates","id":"yellowDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"yellowKey":1}},"name":"黄门"},
+	"81": {"cls":"animates","id":"yellowDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"yellowKey":1}},"name":"黄门"},
-	"82": {"cls":"animates","id":"blueDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"blueKey":1}},"name":"蓝门"},
+	"82": {"cls":"animates","id":"blueDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"blueKey":1}},"name":"蓝门"},
-	"83": {"cls":"animates","id":"redDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"redKey":1}},"name":"红门"},
+	"83": {"cls":"animates","id":"redDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"redKey":1}},"name":"红门"},
-	"84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"greenKey":1}},"name":"绿门"},
+	"84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"greenKey":1}},"name":"绿门"},
-	"85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"specialKey":1}},"name":"机关门"},
+	"85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"specialKey":1}},"name":"机关门"},
-	"86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"steelKey":1}},"name":"铁门"},
+	"86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"steelKey":1}},"name":"铁门"},
 	"87": {"cls":"terrains","id":"upFloor","canPass":true},
 	"88": {"cls":"terrains","id":"downFloor","canPass":true},
 	"89": {"cls":"animates","id":"portal","canPass":true},
@@ -86,7 +86,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"102": {"cls":"animates","id":"crystalBottom"},
 	"103": {"cls":"animates","id":"fire"},
 	"104": {"cls":"animates","id":"switch"},
-	"109": {"cls":"animates","id":"magentaWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{}}},
+	"109": {"cls":"animates","id":"magentaWall","canBreak":true,"animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{}}},
 	"121": {"cls":"npcs","id":"man"},
 	"122": {"cls":"npcs","id":"trader"},
 	"123": {"cls":"npcs","id":"thief"},
@@ -217,12 +217,12 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"316": {"cls":"terrains","id":"sWallTLR","name":"薄墙-上左右","cannotOut":["up","left","right"],"cannotIn":["up","left","right"]},
 	"317": {"cls":"terrains","id":"sWallTBR","name":"薄墙-上下右","cannotOut":["up","down","right"],"cannotIn":["up","down","right"]},
 	"318": {"cls":"terrains","id":"sWallTBL","name":"薄墙-上下左","cannotOut":["up","down","left"],"cannotIn":["up","down","left"]},
-	"319": {"cls":"npc48","id":"tallYellowDoor","trigger":"openDoor","name":"高黄门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"yellowKey":1}}},
+	"319": {"cls":"npc48","id":"tallYellowDoor","trigger":"openDoor","name":"高黄门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"yellowKey":1}}},
-	"320": {"cls":"npc48","id":"tallBlueDoor","trigger":"openDoor","name":"高蓝门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"blueKey":1}}},
+	"320": {"cls":"npc48","id":"tallBlueDoor","trigger":"openDoor","name":"高蓝门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"blueKey":1}}},
-	"321": {"cls":"npc48","id":"tallRedDoor","trigger":"openDoor","name":"高红门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"redKey":1}}},
+	"321": {"cls":"npc48","id":"tallRedDoor","trigger":"openDoor","name":"高红门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"redKey":1}}},
-	"322": {"cls":"npc48","id":"tallGreenDoor","trigger":"openDoor","name":"高绿门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"greenKey":1}}},
+	"322": {"cls":"npc48","id":"tallGreenDoor","trigger":"openDoor","name":"高绿门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"greenKey":1}}},
-	"323": {"cls":"npc48","id":"tallSpecialDoor","trigger":"openDoor","name":"高机关门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"specialKey":1}}},
+	"323": {"cls":"npc48","id":"tallSpecialDoor","trigger":"openDoor","name":"高机关门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"specialKey":1}}},
-	"324": {"cls":"npc48","id":"tallSteelDoor","trigger":"openDoor","name":"高铁门","animate":1,"doorInfo":{"time":160,"openSound":"door.mp3","closeSound":"door.opus","keys":{"steelKey":1}}},
+	"324": {"cls":"npc48","id":"tallSteelDoor","trigger":"openDoor","name":"高铁门","animate":1,"doorInfo":{"time":160,"openSound":"door.opus","closeSound":"door.opus","keys":{"steelKey":1}}},
 	"325": {"cls":"enemys","id":"keiskeiFairy"},
 	"326": {"cls":"enemys","id":"tulipFairy"},
 	"327": {"cls":"enemy48","id":"bearDown"},
@@ -264,6 +264,16 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"363": {"cls":"terrains","id":"T363"},
 	"364": {"cls":"terrains","id":"T364"},
 	"365": {"cls":"terrains","id":"T365"},
+	"366": {"cls":"items","id":"I366"},
+	"367": {"cls":"items","id":"I367"},
+	"368": {"cls":"items","id":"I368"},
+	"369": {"cls":"items","id":"I369"},
+	"370": {"cls":"items","id":"I370"},
+	"371": {"cls":"items","id":"I371"},
+	"372": {"cls":"items","id":"I372"},
+	"373": {"cls":"items","id":"I373"},
+	"374": {"cls":"items","id":"I374"},
+	"375": {"cls":"items","id":"I375"},
 	"376": {"cls":"terrains","id":"T376"},
 	"377": {"cls":"terrains","id":"T377"},
 	"378": {"cls":"terrains","id":"T378"},
@@ -284,6 +294,7 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"393": {"cls":"terrains","id":"T393"},
 	"394": {"cls":"terrains","id":"T394"},
 	"395": {"cls":"terrains","id":"T395"},
+	"396": {"cls":"items","id":"I396"},
 	"20034": {"cls":"tileset","id":"X20034","canPass":true},
 	"20154": {"cls":"tileset","id":"X20154","canPass":true},
 	"20216": {"cls":"tileset","id":"X20216","canPass":true},