From 7d57899524ad4641a24bcf55123e83d0d2378fce Mon Sep 17 00:00:00 2001 From: Undercova Date: Mon, 18 Mar 2024 00:14:40 +0100 Subject: [PATCH 1/3] Adjusted lightsaber inventory test value for 1 test case --- .../global/commands/callbacks/LightsaberInventoryTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt b/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt index d78edeeb4..6d3e3f3a7 100644 --- a/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt +++ b/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt @@ -74,7 +74,7 @@ class LightsaberInventoryTest : TestRunnerSimulatedWorld() { transferItem(player, colorCrystal, lightsaber.lightsaberInventory) - assertEquals(14, lightsaber.elementalValue) // The color crystal takes 6% of lightsaber max damage and turns that into the elemental value, rounded down + assertEquals(9, lightsaber.elementalValue) // The color crystal takes 6% of lightsaber max damage and turns that into the elemental value, rounded down } @Test From fb7c61c5d2af8d41138965d147e0c71cc97e92a2 Mon Sep 17 00:00:00 2001 From: Undercova Date: Sat, 23 Mar 2024 12:48:19 +0100 Subject: [PATCH 2/3] Removed entertainer flourish 9 from code /// #1507 --- .../global/commands/callbacks/FlourishCmdCallback.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/FlourishCmdCallback.java b/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/FlourishCmdCallback.java index 11fc04083..a727cbfa2 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/FlourishCmdCallback.java +++ b/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/FlourishCmdCallback.java @@ -50,10 +50,8 @@ public class FlourishCmdCallback implements ICmdCallback { try { int flourishNumber = Integer.parseInt(args); - if(flourishNumber < 1 || flourishNumber > 9) { + if(flourishNumber < 1 || flourishNumber > 8) { new SystemMessageIntent(player, "@performance:flourish_not_valid").broadcast(); - } else if(flourishNumber == 9) { - new FlourishIntent(player, "mistake").broadcast(); } else { new FlourishIntent(player, "skill_action_" + flourishNumber).broadcast(); } @@ -64,4 +62,4 @@ public class FlourishCmdCallback implements ICmdCallback { } -} +} \ No newline at end of file From 77b634dd8f966ff47371fca7ff6b772aeea3a8f1 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Sat, 23 Mar 2024 18:12:19 +0100 Subject: [PATCH 3/3] Revert "Adjusted lightsaber inventory test value for 1 test case" This reverts commit 7d57899524ad4641a24bcf55123e83d0d2378fce. --- .../global/commands/callbacks/LightsaberInventoryTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt b/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt index 6d3e3f3a7..d78edeeb4 100644 --- a/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt +++ b/src/test/java/com/projectswg/holocore/resources/support/global/commands/callbacks/LightsaberInventoryTest.kt @@ -74,7 +74,7 @@ class LightsaberInventoryTest : TestRunnerSimulatedWorld() { transferItem(player, colorCrystal, lightsaber.lightsaberInventory) - assertEquals(9, lightsaber.elementalValue) // The color crystal takes 6% of lightsaber max damage and turns that into the elemental value, rounded down + assertEquals(14, lightsaber.elementalValue) // The color crystal takes 6% of lightsaber max damage and turns that into the elemental value, rounded down } @Test