bdf1/tianta
1
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'noAnimate' into hasAnimate

Browse Source
This commit is contained in:
爱的天使Erdnase 2023-04-04 11:48:09 +08:00
commit 249597d14c
4 changed files with 100 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
project/floors/MT20.js
View File

@ -772,74 +772,9 @@ main.floors.MT20=
"opacity": 1,
"time": 0
},
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.2
],
"time": 500,
"keep": true
},
"\t[毒尾]还是，输了么",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.4
],
"time": 500,
"keep": true
},
"\t[毒尾]嗜骨，杀你的人已经中了我毕生所聚之毒，离死想必也不远了",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.6
],
"time": 500,
"keep": true
},
"\t[毒尾]看吧，我对你多好，这样一个可能颠覆联盟为我妖社所用的人，说杀就杀了",
{
"type": "setCurtain",
"color": [
0,
0,
0,
0.8
],
"time": 500,
"keep": true
},
"\t[毒尾]想起了，好多事呢...........",
{
"type": "setCurtain",
"color": [
0,
0,
0,
1
],
"time": 500,
"keep": true
},
{
"type": "setText",
"position": "center"
},
"嗜骨.......................",
{
"type": "setText",
"position": "down"
},
"\t[毒尾]..............哼.......还是输了么...",
"\t[毒尾].........意识........已经模糊了呢..........",
"\t[毒尾]想起了好多东西呢.......嗜骨.....",
{
"type": "hideImage",
"code": 1,

68
project/floors/MT21.js
View File

@ -304,7 +304,7 @@ main.floors.MT21=
{
"type": "jump",
"from": [
12,
13,
2
],
"to": [
@ -472,7 +472,7 @@ main.floors.MT21=
},
"\t[腐翼]嗯？你捣什么乱？我还没玩够呢！",
"\t[夜兽人乙]这......腐翼大人您不是......想要杀了他吗......",
"\t[腐翼]胡说！！！！我明明是想要你们打着打着\n同归于尽的！！谁占了上风我就“帮”他一下~你\n破坏了我的计划，就给我去死吧！！",
"\t[腐翼]胡说！！！！我明明是想要你们打着打着\n同归于尽的！！谁占了上风我就“帮”他一下~你破坏了我的计划，就给我去死吧！！",
"\t[夜兽人乙]这......腐翼大人饶命啊！！！",
"\t[腐翼]哈哈~~~让我开心一下吧~~~！！！",
{
@ -487,7 +487,7 @@ main.floors.MT21=
8
],
"to": [
10,
11,
3
],
"time": 500,
@ -556,12 +556,12 @@ main.floors.MT21=
{
"type": "jump",
"from": [
10,
11,
3
],
"to": [
12,
2
13,
3
],
"time": 500,
"keep": true
@ -571,7 +571,7 @@ main.floors.MT21=
"loc": [
[
13,
2
3
]
],
"remove": true
@ -662,6 +662,11 @@ main.floors.MT21=
"time": 0
},
"\t[杰克]那是当然了。那家伙可是“腐翼”啊。",
{
"type": "hideImage",
"code": 6,
"time": 0
},
{
"type": "hideImage",
"code": 9,
@ -801,6 +806,26 @@ main.floors.MT21=
2
]
]
},
{
"type": "setBlock",
"number": "whiteWall",
"loc": [
[
12,
2
]
]
},
{
"type": "setBlock",
"number": "whiteWall",
"loc": [
[
10,
3
]
]
}
]
},
@ -987,14 +1012,37 @@ main.floors.MT21=
},
"afterBattle": {},
"afterGetItem": {},
"afterOpenDoor": {},
"afterOpenDoor": {
"9,2": [
{
"type": "if",
"condition": "(switch:A===1)",
"true": [],
"false": [
{
"type": "playSound",
"name": "se86.ogg"
},
{
"type": "setBlock",
"number": "81"
},
{
"type": "setValue",
"name": "switch:A",
"value": "1"
}
]
}
]
},
"cannotMove": {},
"ratio": 1,
"bgmap": [
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0,10255, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0,10255, 0, 0, 0, 0, 2, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0,10247, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],

4
project/floors/MT23.js
View File

@ -515,11 +515,11 @@ main.floors.MT23=
{
"type": "jump",
"from": [
5,
6,
9
],
"to": [
5,
6,
9
],
"time": 500,

9
project/functions.js
View File

@ -1587,10 +1587,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
if (ignoreSteps >= 0) {
// 中毒也允许瞬移
if (core.hasFlag('poison')) {
var damage = ignoreSteps * core.values.poisonDamage;
if (damage >= core.status.hero.hp) return false;
core.status.hero.statistics.poisonDamage += damage;
core.status.hero.hp -= damage;
return false;
//var damage = ignoreSteps * core.values.poisonDamage;
//if (damage >= core.status.hero.hp) return false;
//core.status.hero.statistics.poisonDamage += damage;
//core.status.hero.hp -= damage;
}
core.clearMap('hero');