diff --git a/project/floors/JQ51.js b/project/floors/JQ51.js index 6b0f111..6d291fd 100644 --- a/project/floors/JQ51.js +++ b/project/floors/JQ51.js @@ -50,7 +50,7 @@ main.floors.JQ51= { "type": "setValue", "name": "status:hp", - "value": "flag:score*5" + "value": "flag:score*15" }, { "type": "win", @@ -93,9 +93,22 @@ main.floors.JQ51= "找工作和找导师都最好大二就开始准备起来了。最好有两段实习,有实习比没有好,即使实习的企业很小。\n以上就是我的全部建议。", "愿我们的征途都是星辰大海....", { - "type": "setValue", - "name": "status:hp", - "value": "flag:score*5" + "type": "if", + "condition": "flag:hard==1", + "true": [ + { + "type": "setValue", + "name": "status:hp", + "value": "flag:score*3" + } + ], + "false": [ + { + "type": "setValue", + "name": "status:hp", + "value": "flag:score*5" + } + ] }, { "type": "win", @@ -113,9 +126,22 @@ main.floors.JQ51= }, "愿我们的征途都是星辰大海....", { - "type": "setValue", - "name": "status:hp", - "value": "flag:score*5" + "type": "if", + "condition": "flag:hard==1", + "true": [ + { + "type": "setValue", + "name": "status:hp", + "value": "flag:score*3" + } + ], + "false": [ + { + "type": "setValue", + "name": "status:hp", + "value": "flag:score*5" + } + ] }, { "type": "win", diff --git a/project/functions.js b/project/functions.js index e79f12c..3b0e173 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1634,7 +1634,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = if (core.status.hero.flags.hideStatusBar) { var salary = ((core.itemCount('yellowKey') * 2 + core.itemCount('blueKey') * 5 + core.itemCount('redKey') * 15 + core.itemCount('pickaxe') * 30)) / 2; if (flags.score) salary = flags.score / 2; - if (flags.hard == 1) salary *= .6; + if (flags.hard == 1) salary = salary * 3 / 5; else if (flags.hard == 3) salary *= 3; if (hero.lv < 5) salary = 0; @@ -1734,7 +1734,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = fill(core.setTwoDigits(core.itemCount('pickaxe')), 291, 86, '#BC6E27'); var salary = ((core.itemCount('yellowKey') * 2 + core.itemCount('blueKey') * 5 + core.itemCount('redKey') * 15 + core.itemCount('pickaxe') * 30)) / 2; if (flags.score) salary = flags.score / 2; - if (flags.hard == 1) salary *= .6; + if (flags.hard == 1) salary = salary * 3 / 5; else if (flags.hard == 3) salary *= 3; if (hero.lv < 5) salary = 0; if (salary <= 13.5) { @@ -1828,7 +1828,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = fill(core.setTwoDigits(core.itemCount('pickaxe')), 92, 270, '#BC6E27'); var salary = ((core.itemCount('yellowKey') * 2 + core.itemCount('blueKey') * 5 + core.itemCount('redKey') * 15 + core.itemCount('pickaxe') * 30)) / 2; if (flags.score) salary = flags.score / 2; - if (flags.hard == 1) salary *= .6; + if (flags.hard == 1) salary = salary * 3 / 5; else if (flags.hard == 3) salary *= 3; if (hero.lv < 5) salary = 0; if (salary <= 13.5) {