From 0c77533f260f3aaf6574c48662ec8c76a8b23f44 Mon Sep 17 00:00:00 2001 From: kuroma6666 Date: Sun, 15 Sep 2024 15:55:28 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E3=83=A2=E3=83=96=E8=A8=8E?= =?UTF-8?q?=E4=BC=90=E7=B7=8F=E6=95=B0=E3=81=AE=E8=A8=88=E7=AE=97=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seichiassist/data/player/GiganticBerserk.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala b/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala index e7e343e342..99cc7bec50 100644 --- a/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala +++ b/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala @@ -44,4 +44,16 @@ case class GiganticBerserk( val current = stage * 10 + level LevelThresholds.giganticBerserkLevelList(current) } + + /** + * 現在の `level` と `stage` において、倒した敵の総数(= `toatlExp`)を返します。 + * + * @return + * 倒した敵の総数(= `totalExp`) + */ + def totalExpToCurrentLevel(exp: Int ): Int = { + val total = (stage * 10 + level) - 1 + LevelThresholds.giganticBerserkLevelList.take(total).sum + exp + } + } From 6138dc4db1a7bff1fb5fcc886dc639c749484da7 Mon Sep 17 00:00:00 2001 From: kuroma6666 Date: Sun, 15 Sep 2024 15:56:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20GB=E3=81=AELore=E3=81=ABMOB?= =?UTF-8?q?=E8=A8=8E=E4=BC=90=E7=B7=8F=E6=95=B0=E8=A1=A8=E7=A4=BA=E6=AC=84?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unchama/seichiassist/menus/skill/PassiveSkillMenu.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala index 9def38cd0f..651c34e32c 100644 --- a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala +++ b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala @@ -262,7 +262,9 @@ object PassiveSkillMenu extends Menu { } else { List( s"${GRAY}MOBの魂を${openerData.giganticBerserk.requiredExpToNextLevel()}回吸収すると更なる力が得られる", - s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}" + s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}", + s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}", + s"${GRAY}MOB討伐総数:${openerData.giganticBerserk.totalExpToCurrentLevel(openerData.giganticBerserk.exp)}" ) } val probability = 100 * openerData.giganticBerserk.manaRegenerationProbability() From 86270751f5f98a72a75fd79723aecbbade138197 Mon Sep 17 00:00:00 2001 From: kuroma6666 Date: Sat, 12 Oct 2024 15:24:10 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E9=87=8D=E8=A4=87=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E3=81=AElore=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unchama/seichiassist/menus/skill/PassiveSkillMenu.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala index 651c34e32c..31f405b029 100644 --- a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala +++ b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala @@ -263,7 +263,6 @@ object PassiveSkillMenu extends Menu { List( s"${GRAY}MOBの魂を${openerData.giganticBerserk.requiredExpToNextLevel()}回吸収すると更なる力が得られる", s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}", - s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}", s"${GRAY}MOB討伐総数:${openerData.giganticBerserk.totalExpToCurrentLevel(openerData.giganticBerserk.exp)}" ) } From b393e07943ef472bfc80ce4cf6ab99c7543226b1 Mon Sep 17 00:00:00 2001 From: kuroma6666 Date: Sat, 12 Oct 2024 15:46:46 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=80=92=E3=81=97=E3=81=9F=E6=95=B5?= =?UTF-8?q?=E3=81=AE=E7=B7=8F=E6=95=B0=E3=82=92=E8=BF=94=E3=81=99=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/player/GiganticBerserk.scala | 15 +++++++-------- .../menus/skill/PassiveSkillMenu.scala | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala b/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala index 99cc7bec50..d165487061 100644 --- a/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala +++ b/src/main/scala/com/github/unchama/seichiassist/data/player/GiganticBerserk.scala @@ -46,14 +46,13 @@ case class GiganticBerserk( } /** - * 現在の `level` と `stage` において、倒した敵の総数(= `toatlExp`)を返します。 - * - * @return - * 倒した敵の総数(= `totalExp`) + * @return 今までに倒した敵の総数 */ - def totalExpToCurrentLevel(exp: Int ): Int = { - val total = (stage * 10 + level) - 1 - LevelThresholds.giganticBerserkLevelList.take(total).sum + exp + def totalNumberOfKilledEnemies: Int = { + val currentStage = stage * 10 + val previousLevel = level - 1 + val previousStageLevel = currentStage + previousLevel + LevelThresholds.giganticBerserkLevelList.take(previousStageLevel).sum + exp } - + } diff --git a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala index 31f405b029..f9eed5e419 100644 --- a/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala +++ b/src/main/scala/com/github/unchama/seichiassist/menus/skill/PassiveSkillMenu.scala @@ -263,7 +263,7 @@ object PassiveSkillMenu extends Menu { List( s"${GRAY}MOBの魂を${openerData.giganticBerserk.requiredExpToNextLevel()}回吸収すると更なる力が得られる", s"$GRAY${openerData.giganticBerserk.exp}/${openerData.giganticBerserk.requiredExpToNextLevel()}", - s"${GRAY}MOB討伐総数:${openerData.giganticBerserk.totalExpToCurrentLevel(openerData.giganticBerserk.exp)}" + s"${GRAY}MOB討伐総数:${openerData.giganticBerserk.totalNumberOfKilledEnemies}" ) } val probability = 100 * openerData.giganticBerserk.manaRegenerationProbability()