Martial ar bonust in weapon list (#66)

* Add Martial Arts modifier to weapons tables

Author: twonirwana

JSA-inch.pdf

@@ -27,6 +27,6 @@ public static void main(String[] args) {
                 .flatMap(k -> al.getCombatGroups().get(k).stream())
                 .toList();
 
-        new HtmlPrinter().printCardForArmyCode(armyListOptions, List.of(), al.getSectorial(), fileName, armyCode, useInch, Set.of(Weapon.Type.WEAPON, Weapon.Type.EQUIPMENT, Weapon.Type.SKILL, Weapon.Type.TURRET), true, false, HtmlPrinter.Template.a7_image);
+        new HtmlPrinter().printCardForArmyCode(armyListOptions, List.of(), db.getAllMartialArtLevels(), al.getSectorial(), fileName, armyCode, useInch, Set.of(Weapon.Type.WEAPON, Weapon.Type.EQUIPMENT, Weapon.Type.SKILL, Weapon.Type.TURRET), true, false, HtmlPrinter.Template.a7_image);
     }
 }

app/src/main/java/de/twonirwana/infinity/ExportArmyCode.java

@@ -107,6 +107,7 @@ public HtmlPrinter() {
 
     public void printCardForArmyCode(List<UnitOption> unitOptions,
                                      List<HackingProgram> allHackingPrograms,
+                                     List<MartialArtLevel> allMartialArtLevels,
                                      Sectorial sectorial,
                                      String fileName,
                                      String armyCode,
@@ -115,14 +116,14 @@ public void printCardForArmyCode(List<UnitOption> unitOptions,
                                      boolean showImage,
                                      boolean showHackingPrograms,
                                      Template template) {
-        writeCards(unitOptions, allHackingPrograms, fileName, armyCode, sectorial, UNIT_IMAGE_FOLDER, CUSTOM_UNIT_IMAGE_FOLDER, UNIT_LOGOS_FOLDER, CARD_FOLDER, useInch, showWeaponOfType, showImage, showHackingPrograms, template);
+        writeCards(unitOptions, allHackingPrograms, allMartialArtLevels, fileName, armyCode, sectorial, UNIT_IMAGE_FOLDER, CUSTOM_UNIT_IMAGE_FOLDER, UNIT_LOGOS_FOLDER, CARD_FOLDER, useInch, showWeaponOfType, showImage, showHackingPrograms, template);
     }
 
     public void printAll(Database db, boolean useInch, Template template) {
         db.getAllSectorials().stream()
                 .filter(s -> !s.isDiscontinued())
                 .flatMap(s -> db.getAllUnitsForSectorialWithoutMercs(s).stream())
-                .forEach(u -> writeToFile(u, UNIT_IMAGE_FOLDER, CUSTOM_UNIT_IMAGE_FOLDER, UNIT_LOGOS_FOLDER, "all/" + u.getSectorial().getSlug(), useInch, template));
+                .forEach(u -> writeToFile(u, db.getAllMartialArtLevels(), UNIT_IMAGE_FOLDER, CUSTOM_UNIT_IMAGE_FOLDER, UNIT_LOGOS_FOLDER, "all/" + u.getSectorial().getSlug(), useInch, template));
     }
 
     private void copyFile(String fileName, String sourcePath, String outPath) {
@@ -199,6 +200,8 @@ private void copyCustomUnitImages(UnitOption option, String unitImagePath, Strin
     }
 
     public void writeToFile(UnitOption unitOption,
+                            List<MartialArtLevel> allMartialArtLevels,
+
                             String unitImagePath,
                             String customUnitImagePath,
                             String logoImagePath,
@@ -208,6 +211,7 @@ public void writeToFile(UnitOption unitOption,
         String fileName = "%s_%s".formatted(unitOption.getCombinedId(), unitOption.getSlug());
         writeCards(List.of(unitOption),
                 List.of(),
+                allMartialArtLevels,
                 fileName,
                 "-",
                 unitOption.getSectorial(),
@@ -224,6 +228,7 @@ public void writeToFile(UnitOption unitOption,
 
     public void writeCards(List<UnitOption> unitOptions,
                            List<HackingProgram> allHackingPrograms,
+                           List<MartialArtLevel> allMartialArtLevels,
                            String fileName,
                            String armyCode,
                            Sectorial sectorial,
@@ -260,7 +265,7 @@ public void writeCards(List<UnitOption> unitOptions,
         String headerColor = HEADER_TEXT_COLOR.getOrDefault(sectorial.getParentId() - 1, "white");
 
         List<UnitPrintCard> unitPrintCards = unitOptions.stream()
-                .flatMap(u -> UnitPrintCard.fromUnitOption(u, useInch, showWeaponOfType, showImage).stream())
+                .flatMap(u -> UnitPrintCard.fromUnitOption(u, useInch, showWeaponOfType, showImage, allMartialArtLevels).stream())
                 .toList();
 
         List<PrintHackingProgram> usedHackingPrograms = showHackingPrograms ? getUsedHackingPrograms(unitOptions, allHackingPrograms) : List.of();

app/src/main/java/de/twonirwana/infinity/HtmlPrinter.java

@@ -2,6 +2,7 @@
 
 import com.google.common.base.Joiner;
 import de.twonirwana.infinity.unit.api.ExtraValue;
+import de.twonirwana.infinity.unit.api.Skill;
 import de.twonirwana.infinity.unit.api.TrooperProfile;
 import de.twonirwana.infinity.unit.api.Weapon;
 
@@ -12,6 +13,8 @@
 import java.util.stream.Stream;
 
 public class PrintUtils {
+    public static final String CC_ATTACK_SKILL_NAME = "CC Attack";
+    public static final String BS_ATTACK_SKILL_NAME = "BS Attack";
     private static final Pattern PS_EXTRA_REGEX = Pattern.compile("PS=(\\d)");
     private static final Pattern BURST_EXTRA_REGEX = Pattern.compile("\\+(\\d)B");
     private static final Pattern SPECIAL_DIE_EXTRA_REGEX = Pattern.compile("\\+(\\d)SD");
@@ -23,6 +26,7 @@ public class PrintUtils {
     private static final String MINUS_3_MODI = "-3";
     private static final String MINUS_6_MODI = "-6";
     private static final String XVISOR_NAME = "X Visor";
+    private static final String MARTIAL_ARTS_SKILL_NAME_PREFIX = "Martial Arts L";
 
     public static String getRangeHeader(boolean useInch) {
         return "Range %s".formatted(useInch ? "″" : "cm");
@@ -48,6 +52,20 @@ public static String prettyWeaponName(Weapon weapon, boolean useInch) {
         return out;
     }
 
+    public static boolean skillIsMartialArt(Skill skill) {
+        return skill.getName().startsWith(MARTIAL_ARTS_SKILL_NAME_PREFIX);
+    }
+
+    public static Optional<MartialArtLevel> getMartialArtLevel(TrooperProfile profile, Map<String, MartialArtLevel> allMartialArtLevels) {
+        return profile.getSkills().stream()
+                .filter(PrintUtils::skillIsMartialArt)
+                .map(Skill::getName)
+                .map(s -> s.replace(MARTIAL_ARTS_SKILL_NAME_PREFIX, ""))
+                .map(allMartialArtLevels::get)
+                .filter(Objects::nonNull)
+                .findFirst();
+    }
+
     private static String getExtraString(Weapon weapon, boolean useInch) {
         return weapon.getExtras().stream()
                 .filter(e -> toPsExtra(e).isEmpty())
@@ -57,21 +75,18 @@ private static String getExtraString(Weapon weapon, boolean useInch) {
                 .collect(Collectors.joining(", "));
     }
 
-    public static final String CC_ATTACK_SKILL_NAME =  "CC Attack";
-    public static final String BS_ATTACK_SKILL_NAME =  "BS Attack";
-
     private static String getWeaponSkill(Weapon weapon) {
-        return Weapon.Skill.CC == weapon.getSkill() ? CC_ATTACK_SKILL_NAME: BS_ATTACK_SKILL_NAME;
+        return Weapon.Skill.CC == weapon.getSkill() ? CC_ATTACK_SKILL_NAME : BS_ATTACK_SKILL_NAME;
     }
 
-    public static String getWeaponBurstWithExtra(TrooperProfile trooperProfile, Weapon weapon) {
+    public static String getWeaponBurstWithExtra(UnitPrintCard unitPrintCard, Weapon weapon) {
         if (weapon.getBurst() == null) {
             return "";
         }
         String weaponSkill = getWeaponSkill(weapon);
         List<ExtraValue> weaponAndSkillExtra = Stream.concat(
                 weapon.getExtras().stream(),
-                trooperProfile.getSkills().stream()
+                unitPrintCard.getProfile().getSkills().stream()
                         .filter(s -> s.getName().equals(weaponSkill))
                         .filter(s -> isWeaponOrHasBsProperty(weapon)) //only weapon or bs trait get skill extra
                         .flatMap(s -> s.getExtras().stream())
@@ -94,7 +109,15 @@ public static String getWeaponBurstWithExtra(TrooperProfile trooperProfile, Weap
                 .map(Optional::get)
                 .map("+%sSD"::formatted)
                 .toList();
-        return weapon.getBurst() + Joiner.on("").join(burstExtra) + Joiner.on("").join(sdExtra);
+
+        String maBurstBonus = "";
+        if (weapon.getSkill() == Weapon.Skill.CC
+                && unitPrintCard.getMartialArtLevels() != null
+                && !"0".equals(unitPrintCard.getMartialArtLevels().getBurst())) {
+            maBurstBonus = unitPrintCard.getMartialArtLevels().getBurst();
+        }
+
+        return weapon.getBurst() + Joiner.on("").join(burstExtra) + Joiner.on("").join(sdExtra) + maBurstBonus;
     }
 
     public static String getWeaponPsWithExtra(TrooperProfile trooperProfile, Weapon weapon) {
@@ -219,7 +242,7 @@ static Optional<String> toBurstExtra(ExtraValue extraValue) {
         return Optional.empty();
     }
 
-     static Optional<String> toSpecialDieExtra(ExtraValue extraValue) {
+    static Optional<String> toSpecialDieExtra(ExtraValue extraValue) {
         if (extraValue.getText() == null) {
             return Optional.empty();
         }

app/src/main/java/de/twonirwana/infinity/PrintUtils.java

@@ -5,6 +5,7 @@
 import lombok.Value;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -18,13 +19,23 @@ public class UnitPrintCard {
     boolean useInch;
     Set<Weapon.Type> showWeaponOfType;
     boolean showImage;
+    MartialArtLevel martialArtLevels;
 
     public static List<UnitPrintCard> fromUnitOption(UnitOption unitOption,
                                                      boolean useInch,
                                                      Set<Weapon.Type> showWeaponOfType,
-                                                     boolean showImage) {
+                                                     boolean showImage,
+                                                     List<MartialArtLevel> allMartialArtLevels) {
+        Map<String, MartialArtLevel> martialArtLevelMap = allMartialArtLevels.stream()
+                .collect(Collectors.toMap(MartialArtLevel::getName, Function.identity()));
         return unitOption.getAllTrooper().stream()
-                .flatMap(t -> t.getProfiles().stream().map(p -> new UnitPrintCard(unitOption, t, p, useInch, showWeaponOfType, showImage)))
+                .flatMap(t -> t.getProfiles().stream().map(p -> new UnitPrintCard(unitOption,
+                        t,
+                        p,
+                        useInch,
+                        showWeaponOfType,
+                        showImage,
+                        PrintUtils.getMartialArtLevel(p, martialArtLevelMap).orElse(null))))
                 .toList();
     }
 
@@ -48,6 +59,7 @@ private static boolean notAppliedToWeapon(Skill skill) {
         if (PrintUtils.toSrExtra(extraValue).isPresent()) {
             return false;
         }
+        //martial arts is still shown
         return true;
     }
 
@@ -150,8 +162,15 @@ public List<String> getIconFileNames() {
 
     public String prettySkills() {
         return profile.getSkills().stream()
-                .filter(UnitPrintCard::notAppliedToWeapon)
-                .map(this::getSkillNameAndExtra).collect(Collectors.joining(", "));
+                .filter(UnitPrintCard::notAppliedToWeapon).map(this::getSkillNameAndExtra)
+                .collect(Collectors.joining(", "));
+    }
+
+    public String getMartialArtsBonus() {
+        if (martialArtLevels == null) {
+            return "CC";
+        }
+        return "CC [MA Att./Opp: %s/%s]".formatted(martialArtLevels.getAttackerModi(), martialArtLevels.getOpponentModi());
     }
 
     public String prettyEquipments() {

app/src/main/java/de/twonirwana/infinity/UnitPrintCard.java

@@ -4,6 +4,7 @@
 import de.twonirwana.infinity.UnitPrintCard;
 import de.twonirwana.infinity.unit.api.Weapon;
 
+import java.util.List;
 import java.util.Set;
 
 public class UnitNameCheck {
@@ -26,7 +27,7 @@ public static void main(final String[] args) {
 
 
         new DatabaseImp().getAllUnitOptions().stream()
-                .flatMap(u -> UnitPrintCard.fromUnitOption(u, true, Set.of(Weapon.Type.WEAPON, Weapon.Type.EQUIPMENT, Weapon.Type.SKILL), true).stream())
+                .flatMap(u -> UnitPrintCard.fromUnitOption(u, true, Set.of(Weapon.Type.WEAPON, Weapon.Type.EQUIPMENT, Weapon.Type.SKILL), true, List.of()).stream())
                 .map(c -> {
                     String oldName = c.getProfile().getName();
                     String newName = c.getUnitName();

app/src/main/java/de/twonirwana/infinity/util/UnitNameCheck.java

@@ -239,7 +239,7 @@ <h3>Weapons</h3>
                         </div>
                     </td>
                     <td th:text="${printUtils.getWeaponPsWithExtra(unitPrintCard.getProfile(), weapon)}"></td>
-                    <td th:text="${printUtils.getWeaponBurstWithExtra(unitPrintCard.getProfile(), weapon)}"></td>
+                    <td th:text="${printUtils.getWeaponBurstWithExtra(unitPrintCard, weapon)}"></td>
                     <td th:text="${weapon.ammunition != null ? weapon.ammunition.name : ''}"></td>
                 </tr>
 

app/src/main/resources/templates/CardBW.html

@@ -244,13 +244,13 @@ <h2 class="unit-header-title">
                     </thead>
                     <tbody>
                     <tr th:each="weapon : ${unitPrintCard.getWeapons()}">
-                        <td th:text="${printUtils.prettyWeaponName(weapon, unitPrintCard.isUseInch())}"></td>
+                        <td style="white-space: pre" th:text="${printUtils.prettyWeaponName(weapon, unitPrintCard.isUseInch())}"></td>
                         <th:block th:if="${printUtils.getRangeTemplate(weapon) != null}">
                             <td colspan="7" th:text="${printUtils.getRangeTemplate(weapon)}"></td>
                         </th:block>
 
                         <th:block th:if="${printUtils.isCC(weapon)}">
-                            <td colspan="7">CC</td>
+                            <td colspan="7" th:text="${unitPrintCard.getMartialArtsBonus()}">CC</td>
                         </th:block>
 
                         <th:block th:if="${printUtils.getRangeTemplate(weapon) == null && !printUtils.isCC(weapon)}">
@@ -271,7 +271,7 @@ <h2 class="unit-header-title">
                         </th:block>
 
                         <td th:text="${printUtils.getWeaponPsWithExtra(unitPrintCard.getProfile(), weapon)}"></td>
-                        <td th:text="${printUtils.getWeaponBurstWithExtra(unitPrintCard.getProfile(), weapon)}"></td>
+                        <td th:text="${printUtils.getWeaponBurstWithExtra(unitPrintCard, weapon)}"></td>
                         <td th:text="${weapon.ammunition != null ? weapon.ammunition.name : ''}"></td>
                         <td th:text="${printUtils.getWeaponPropertiesString(weapon)}"
                             th:style="' white-space: normal; font-size: ' + ${secondaryFontSize}"></td>

app/src/main/resources/templates/ColorAndOptionalImageCard.html

@@ -20,10 +20,11 @@ public class HtmlPrinterTest {
             Set.of(Weapon.Type.WEAPON),
             Set.of(Weapon.Type.WEAPON, Weapon.Type.EQUIPMENT, Weapon.Type.SKILL, Weapon.Type.TURRET));
     HtmlPrinter underTest;
-    String fileName = "testFile";
+    String fileName;
     Sectorial sectorial;
     UnitOption unitOption;
     HackingProgram hackingProgram;
+    List<MartialArtLevel> martialArtLevels;
 
     private static Stream<Arguments> generateTestData() {
         List<Arguments> testData = new ArrayList<>();
@@ -46,10 +47,12 @@ void setup() {
         underTest = new HtmlPrinter();
         sectorial = new Sectorial(1, 1, "name", "slug", false, "logo.png");
 
-        List<Skill> skills = List.of(new Skill(1, "skill", "wiki", 1, List.of(
-                new ExtraValue(2, "extra", ExtraValue.Type.Text, null),
-                new ExtraValue(3, "extra distance", ExtraValue.Type.Distance, 10f))
-        ));
+        List<Skill> skills = List.of(
+                new Skill(1, "skill", "wiki", 1, List.of(
+                        new ExtraValue(2, "extra", ExtraValue.Type.Text, null),
+                        new ExtraValue(3, "extra distance", ExtraValue.Type.Distance, 10f))
+                ),
+                new Skill(2, "Martial Arts L3", "wiki", 1, List.of()));
         List<Weapon> weapons = List.of(
                 new Weapon(4, Weapon.Skill.BS, Weapon.Type.WEAPON, "weapon name", "mode", "wiki", new Ammunition(4, "ammo", "wiki"), "3", "7", "saving", "savingNum", List.of("property"), "+3", "+3", "0", "-3", "-3", "-6", "+6", "profile", 2, List.of(
                         new ExtraValue(1, "PS=6", ExtraValue.Type.Text, null),
@@ -99,14 +102,17 @@ void setup() {
         ));
         TrooperProfile trooperProfile = new TrooperProfile(sectorial, 1, 2, 3, 4, "name", List.of(10, 10), 10, 10, 10, 10, 3, 3, 2, false, 2, "notes", "type", 3, weapons, skills, equipments, List.of("char1", "char2"), "logo.png", List.of("image.png"), List.of(new Order(Order.Type.REGULAR, 0, 1)));
         Trooper trooper = new Trooper(sectorial, 1, 2, 3, "optionName", "category", "0.5", 20, List.of(trooperProfile), List.of(), "note", "groupNote");
+        martialArtLevels = List.of(new MartialArtLevel("-3", "-", "+3", "3", "+1SD"));
+
         unitOption = new UnitOption(sectorial, 1, 2, 3, "isc", "iscAbbr", "unitName", "optionName", "slug", "unitOptionName",
                 trooper, List.of(), 20, "0.5", "note", false);
     }
 
     @ParameterizedTest
     @MethodSource("generateTestData")
     void testHtml(boolean useInch, Set<Weapon.Type> weaponOption, boolean showImage, boolean showHackingProgram, HtmlPrinter.Template template) {
-        underTest.writeCards(List.of(unitOption), List.of(), fileName, "", sectorial, "", "", "", "", useInch, weaponOption, showImage, showHackingProgram, template);
+        fileName = "testFile_" + System.currentTimeMillis();
+        underTest.writeCards(List.of(unitOption), List.of(), martialArtLevels, fileName, "", sectorial, "", "", "", "", useInch, weaponOption, showImage, showHackingProgram, template);
 
         assertThat(new File("out/html/" + fileName + ".html")).exists();
     }

app/src/test/java/de/twonirwana/infinity/HtmlPrinterTest.java

@@ -126,7 +126,7 @@ void testHtml(String armyCode, String expectedUnitIds, boolean useInch, Set<Weap
                 .flatMap(k -> al.getCombatGroups().get(k).stream())
                 .toList();
 
-        underTest.printCardForArmyCode(armyListOptions, db.getAllHackingPrograms(), al.getSectorial(), fileName, armyCode, useInch, weaponOption, showImage, showHackingPrograms, template);
+        underTest.printCardForArmyCode(armyListOptions, db.getAllHackingPrograms(), db.getAllMartialArtLevels(), al.getSectorial(), fileName, armyCode, useInch, weaponOption, showImage, showHackingPrograms, template);
 
         Path result = Paths.get("out/html/card/" + fileName + ".html");
         assertThat(result).exists();