Fixed bug cybernetics affects all specialized skills

Author: softwaremagico

think-machine-pdf/src/main/java/com/softwaremagico/tm/pdf/small/SmallCharacterSheet.java

@@ -103,7 +103,7 @@ protected PdfPTable createCharacterContent(CharacterPlayer characterPlayer) thro
 		infoCell.setBorderWidthBottom(1);
 		mainTable.addCell(infoCell);
 
-		final PdfPTable learnedSkillsTable = LearnedSkillsTable.getSkillsTable(characterPlayer, getLanguage());
+		final PdfPTable learnedSkillsTable = LearnedSkillsTable.getSkillsTable(characterPlayer);
 		final PdfPCell learnedSkillsCell = new PdfPCell(learnedSkillsTable);
 		learnedSkillsCell.setColspan(2);
 		learnedSkillsCell.setRowspan(3);

think-machine-pdf/src/main/java/com/softwaremagico/tm/pdf/small/skills/LearnedSkillsTable.java

@@ -41,18 +41,17 @@ public class LearnedSkillsTable extends SkillsTable {
 	private static final int MAX_SKILL_COLUMN_WIDTH = 115;
 	private static final int MAX_SKILL_RANK_WIDTH = 15;
 
-	public static PdfPTable getSkillsTable(CharacterPlayer characterPlayer, String language)
+	public static PdfPTable getSkillsTable(CharacterPlayer characterPlayer)
 			throws InvalidXmlElementException {
 		final float[] widths = { 1f };
 		final PdfPTable table = new PdfPTable(widths);
 		setTablePropierties(table);
 		table.getDefaultCell().setBorder(0);
-		table.addCell(getSkillsColumnTable(characterPlayer, language));
+		table.addCell(getSkillsColumnTable(characterPlayer));
 		return table;
 	}
 
-	private static PdfPCell getSkillsColumnTable(CharacterPlayer characterPlayer, String language)
-			throws InvalidXmlElementException {
+	private static PdfPCell getSkillsColumnTable(CharacterPlayer characterPlayer) {
 		final float[] widths = { 4f, 1f };
 		final PdfPTable table = new PdfPTable(widths);
 		setTablePropierties(table);

think-machine-pdf/src/test/java/com/softwaremagico/tm/export/pdf/CustomCharacters.java

@@ -173,6 +173,11 @@ public void createPaolaCharacter() throws InvalidXmlElementException, TooManyBle
         player.addCybernetics(CyberneticDeviceFactory.getInstance().getElement("secondBrainThinkMachineLore", LANGUAGE,
                 PathManager.DEFAULT_MODULE_FOLDER));
 
+        Assert.assertEquals((int) player.getSkillTotalRanks(AvailableSkillsFactory.getInstance().getElement("lore", "thinkMachineLore",
+                LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER)), 4);
+        Assert.assertEquals((int) player.getSkillTotalRanks(AvailableSkillsFactory.getInstance().getElement("lore", "beastsLore",
+                LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER)), 0);
+
         player.setShield(
                 ShieldFactory.getInstance().getElement("duelingShield", player.getLanguage(), player.getModuleName()));
 

think-machine-rules/src/main/java/com/softwaremagico/tm/character/CharacterPlayer.java

@@ -351,9 +351,21 @@ private Integer getCyberneticsValue(Skill<?> skill) {
         int maxValue = 0;
         for (final ICyberneticDevice device : cybernetics.getElements()) {
             for (final StaticValue staticValue : device.getStaticValues()) {
-                if (Objects.equals(staticValue.getAffects().getId(), skill.getId())) {
-                    if (maxValue < staticValue.getValue()) {
-                        maxValue = staticValue.getValue();
+                if (!(skill instanceof AvailableSkill) || ((AvailableSkill) skill).getSpecialization() == null) {
+                    if (Objects.equals(staticValue.getAffects().getId(), skill.getId())) {
+                        if (maxValue < staticValue.getValue()) {
+                            maxValue = staticValue.getValue();
+                        }
+                    }
+                } else {
+                    //Check cybernetic skill specialization.
+                    if (staticValue.getAffects() instanceof AvailableSkill) {
+                        if (Objects.equals(((AvailableSkill) staticValue.getAffects()).getSpecialization().getId(),
+                                ((AvailableSkill) skill).getSpecialization().getId())) {
+                            if (maxValue < staticValue.getValue()) {
+                                maxValue = staticValue.getValue();
+                            }
+                        }
                     }
                 }
             }
@@ -1096,7 +1108,8 @@ public List<AvailableSkill> getLearnedSkills() {
         final List<AvailableSkill> learnedSkills = new ArrayList<>();
         for (final AvailableSkill skill : AvailableSkillsFactory.getInstance().getLearnedSkills(getLanguage(),
                 getModuleName())) {
-            if (getSkillTotalRanks(skill) != null) {
+            final Integer skillRanks = getSkillTotalRanks(skill);
+            if (skillRanks != null && skillRanks > 0) {
                 learnedSkills.add(skill);
             }
         }