-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #337 from vincent4vx/feature-critical-effect-target
feat(spell): Allow to define critical effect target
- Loading branch information
Showing
12 changed files
with
299 additions
and
16 deletions.
There are no files selected for viewing
70 changes: 70 additions & 0 deletions
70
src/main/java/fr/quatrevieux/araknemu/data/transformer/SpellTargetsTransformer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * This file is part of Araknemu. | ||
| * | ||
| * Araknemu is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Araknemu is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Araknemu. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * Copyright (c) 2017-2024 Vincent Quatrevieux | ||
| */ | ||
|
|
||
| package fr.quatrevieux.araknemu.data.transformer; | ||
|
|
||
| import fr.quatrevieux.araknemu.data.value.SpellTarget; | ||
| import org.checkerframework.checker.nullness.qual.PolyNull; | ||
|
|
||
| /** | ||
| * Transformer for spell effect target flags | ||
| * | ||
| * Parse format: "normal,critical;normal;..." | ||
| * Example: "1,2;3;4,5" | ||
| * | ||
| * When critical is not specified, it's the same as normal | ||
| */ | ||
| public final class SpellTargetsTransformer implements Transformer<SpellTarget[]> { | ||
| @Override | ||
| public @PolyNull String serialize(SpellTarget @PolyNull [] value) { | ||
| throw new UnsupportedOperationException("Not implemented"); | ||
| } | ||
|
|
||
| @Override | ||
| public SpellTarget @PolyNull [] unserialize(@PolyNull String serialize) throws TransformerException { | ||
| if (serialize == null) { | ||
| return null; | ||
| } | ||
|
|
||
| final String[] parts = serialize.split(";"); | ||
|
|
||
| if (parts.length == 1 && parts[0].isEmpty()) { | ||
| return new SpellTarget[0]; | ||
| } | ||
|
|
||
| final SpellTarget[] targets = new SpellTarget[parts.length]; | ||
|
|
||
| for (int i = 0; i < parts.length; i++) { | ||
| final String[] subParts = parts[i].split(",", 2); | ||
|
|
||
| final int normal = Integer.parseInt(subParts[0]); | ||
| final int critical; | ||
|
|
||
| if (subParts.length > 1) { | ||
| critical = Integer.parseInt(subParts[1]); | ||
| } else { | ||
| critical = normal; | ||
| } | ||
|
|
||
| targets[i] = new SpellTarget(normal, critical); | ||
| } | ||
|
|
||
| return targets; | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
src/main/java/fr/quatrevieux/araknemu/data/value/SpellTarget.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * This file is part of Araknemu. | ||
| * | ||
| * Araknemu is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Araknemu is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Araknemu. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * Copyright (c) 2017-2024 Vincent Quatrevieux | ||
| */ | ||
|
|
||
| package fr.quatrevieux.araknemu.data.value; | ||
|
|
||
| /** | ||
| * Target flags for a spell effect | ||
| */ | ||
| public final class SpellTarget { | ||
| private final int normal; | ||
| private final int critical; | ||
|
|
||
| public SpellTarget(int normal, int critical) { | ||
| this.normal = normal; | ||
| this.critical = critical; | ||
| } | ||
|
|
||
| /** | ||
| * Target flags for normal spell effect | ||
| */ | ||
| public int normal() { | ||
| return normal; | ||
| } | ||
|
|
||
| /** | ||
| * Target flags for critical spell effect | ||
| */ | ||
| public int critical() { | ||
| return critical; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/test/java/fr/quatrevieux/araknemu/data/transformer/SpellTargetsTransformerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * This file is part of Araknemu. | ||
| * | ||
| * Araknemu is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Araknemu is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with Araknemu. If not, see <https://www.gnu.org/licenses/>. | ||
| * | ||
| * Copyright (c) 2017-2024 Vincent Quatrevieux | ||
| */ | ||
|
|
||
| package fr.quatrevieux.araknemu.data.transformer; | ||
|
|
||
| import fr.quatrevieux.araknemu.data.value.SpellTarget; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| class SpellTargetsTransformerTest { | ||
| @Test | ||
| void serialize() { | ||
| assertThrows(UnsupportedOperationException.class, () -> new SpellTargetsTransformer().serialize(null)); | ||
| } | ||
|
|
||
| @Test | ||
| void unserializeNull() { | ||
| assertNull(new SpellTargetsTransformer().unserialize(null)); | ||
| } | ||
|
|
||
| @Test | ||
| void unserializeEmpty() { | ||
| assertArrayEquals(new SpellTarget[0], new SpellTargetsTransformer().unserialize("")); | ||
| } | ||
|
|
||
| @Test | ||
| void unserializeSimple() { | ||
| SpellTarget[] parsed = new SpellTargetsTransformer().unserialize("1"); | ||
|
|
||
| assertEquals(1, parsed.length); | ||
| assertEquals(1, parsed[0].normal()); | ||
| assertEquals(1, parsed[0].critical()); | ||
| } | ||
|
|
||
| @Test | ||
| void unserializeMultiple() { | ||
|
|
||
| SpellTarget[] parsed = new SpellTargetsTransformer().unserialize("1;4;0"); | ||
|
|
||
| assertEquals(3, parsed.length); | ||
| assertEquals(1, parsed[0].normal()); | ||
| assertEquals(1, parsed[0].critical()); | ||
| assertEquals(4, parsed[1].normal()); | ||
| assertEquals(4, parsed[1].critical()); | ||
| assertEquals(0, parsed[2].normal()); | ||
| assertEquals(0, parsed[2].critical()); | ||
| } | ||
|
|
||
| @Test | ||
| void unserializeMultipleWithExplicitCritical() { | ||
|
|
||
| SpellTarget[] parsed = new SpellTargetsTransformer().unserialize("1,5;4;0,1"); | ||
|
|
||
| assertEquals(3, parsed.length); | ||
| assertEquals(1, parsed[0].normal()); | ||
| assertEquals(5, parsed[0].critical()); | ||
| assertEquals(4, parsed[1].normal()); | ||
| assertEquals(4, parsed[1].critical()); | ||
| assertEquals(0, parsed[2].normal()); | ||
| assertEquals(1, parsed[2].critical()); | ||
| } | ||
| } |
Oops, something went wrong.