Merge pull request #114 from fmasa/enemy-in-shadows

fmasa · web-flow · commit 7b3081eaad84 · 2023-05-27T17:55:01.000+02:00
[EiS] Enemy in Shadows Spell import
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/RulebookCompendiumImportScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/RulebookCompendiumImportScreen.kt
@@ -29,6 +29,7 @@ import cafe.adriel.voyager.navigator.currentOrThrow
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.PdfCompendiumImporter
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.Book
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.CoreRulebook
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.EnemyInShadowsCompanion
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.UpInArms
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.WindsOfMagic
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.loadDocument
@@ -101,7 +102,7 @@ class RulebookCompendiumImportScreen(
                 modifier = Modifier.padding(bottom = Spacing.medium)
             )
 
-            val books = remember { listOf(CoreRulebook, UpInArms, WindsOfMagic) }
+            val books = remember { listOf(CoreRulebook, UpInArms, WindsOfMagic, EnemyInShadowsCompanion) }
 
             books.forEach { book ->
                 key(book) {
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt
@@ -26,7 +26,7 @@ data class Spell(
         const val RANGE_MAX_LENGTH = 50
         const val TARGET_MAX_LENGTH = 50
         const val DURATION_MAX_LENGTH = 50
-        const val EFFECT_MAX_LENGTH = 1000
+        const val EFFECT_MAX_LENGTH = 1500
         const val LORE_MAX_LENGTH = 50
     }
 
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/CoreRulebook.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/CoreRulebook.kt
@@ -79,7 +79,12 @@ object CoreRulebook :
     }
 
     override fun importSpells(document: Document): List<Spell> {
-        return SpellParser().import(document, this, sequenceOf(240..257))
+        return SpellParser(
+            specialLores = mapOf(
+                "Petty Spells" to "Petty Spells",
+                "Arcane Spells" to "Arcane Spells",
+            ),
+        ).import(document, this, sequenceOf(240..257))
     }
 
     override fun importBlessings(document: Document): List<Blessing> {
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/EnemyInShadowsCompanion.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/EnemyInShadowsCompanion.kt
@@ -0,0 +1,79 @@
+package cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books
+
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.Spell
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.Document
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.SpellParser
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.TextPosition
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.TextToken
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.Token
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.sources.SpellSource
+
+object EnemyInShadowsCompanion : Book, SpellSource {
+
+    override val name = "Enemy in Shadows - Companion"
+
+    private const val pageOffset = 2
+
+    override fun importSpells(document: Document): List<Spell> {
+        return SpellParser(
+            specialLores = mapOf(
+                "Chaos Arcane Spells" to "Chaos Arcane Spells",
+            ),
+            ignoredSpellLikeHeadings = setOf("Lore Attribute"),
+        ).import(
+            document,
+            this,
+            pageRanges = sequenceOf(79 + pageOffset..83 + pageOffset)
+        ).map { it.copy(isVisibleToPlayers = false) }
+    }
+
+    override fun areSameStyle(a: TextPosition, b: TextPosition): Boolean {
+        return super.areSameStyle(a, b) || arePartsOfHeading2(a, b)
+    }
+
+    private fun arePartsOfHeading2(a: TextPosition, b: TextPosition): Boolean {
+        // Some special symbols have different height
+        return a.getFont().getName().endsWith("CaslonAntique-Bold-SC700") &&
+            a.getFont().getName().endsWith("CaslonAntique-Bold-SC700") && (
+            a.getFontSizeInPt() == b.getFontSizeInPt() || (
+                minOf(a.getFontSizeInPt(), b.getFontSizeInPt()) == 12f &&
+                    maxOf(a.getFontSizeInPt(), b.getFontSizeInPt()) == 18f
+                )
+            )
+    }
+
+    override fun resolveToken(textToken: TextToken): Token? {
+        if (
+            (textToken.fontSizePt == 12f || textToken.fontSizePt == 18f) &&
+            textToken.fontName.endsWith("CaslonAntique-Bold-SC700")
+        ) {
+            return Token.Heading2(textToken.text)
+        }
+
+        if (
+            (textToken.fontSizePt == 19f || textToken.fontSizePt == 22f) &&
+            textToken.fontName.endsWith("CaslonAntique-Bold")
+        ) {
+            return Token.Heading2(textToken.text)
+        }
+
+        if (textToken.fontSizePt == 12f && textToken.fontName.endsWith("ACaslonPro-Bold")) {
+            return Token.Heading3(textToken.text)
+        }
+
+        if (textToken.fontSizePt == 10f || textToken.fontSizePt == 9f) {
+            if (textToken.fontName.endsWith("ACaslonPro-Bold")) {
+                return Token.BoldPart(textToken.text)
+            }
+
+            if (textToken.fontName.endsWith("ACaslonPro-Italic")) {
+                return Token.ItalicsPart(textToken.text)
+            }
+            if (textToken.fontName.endsWith("ACaslonPro-Regular")) {
+                return Token.NormalPart(textToken.text)
+            }
+        }
+
+        return null
+    }
+}
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/WindsOfMagic.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/books/WindsOfMagic.kt
@@ -31,6 +31,9 @@ object WindsOfMagic : Book, CareerSource, SpellSource {
 
     override fun importSpells(document: Document): List<Spell> {
         return SpellParser(
+            specialLores = mapOf(
+                "New Arcane Spells" to "Arcane Spells",
+            ),
             isEnd = {
                 (
                     it is Token.Heading1 && it.text.trim()
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/CareerParser.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/CareerParser.kt
@@ -39,7 +39,7 @@ class CareerParser {
         val stream = TokenStream(firstColumn.toList())
         val english = Localization.English
 
-        val name = stream.consumeOneOfType<Token.Heading1>().text
+        val name = stream.consumeOneOfType<Token.Heading>().text
             .trim()
             .splitToSequence(' ', '\n')
             .map { it.lowercase() }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/SpellParser.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/SpellParser.kt
@@ -4,6 +4,8 @@ import com.benasher44.uuid.uuid4
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.Spell
 
 class SpellParser(
+    private val specialLores: Map<String, String>,
+    private val ignoredSpellLikeHeadings: Set<String> = emptySet(),
     private val isEnd: (Token?) -> Boolean = { it == null },
 ) {
 
@@ -39,7 +41,10 @@ class SpellParser(
     }
 
     private fun consumeSpells(lore: String, stream: TokenStream): Sequence<Spell> = sequence {
-        stream.dropUntil { it is Token.Heading3 }
+        stream.dropUntil { token ->
+            token is Token.Heading3 &&
+                ignoredSpellLikeHeadings.none { token.text.trim().equals(it, ignoreCase = true) }
+        }
 
         while (stream.peek() is Token.Heading3) {
             val name = stream.consumeOneOfType<Token.Heading3>().text.trim()
@@ -136,10 +141,5 @@ class SpellParser(
 
     companion object {
         private val loreHeadingRegex = Regex("(The )?Lore of ([a-z]+)", RegexOption.IGNORE_CASE)
-        private val specialLores = mapOf(
-            "Petty Spells" to "Petty Spells",
-            "Arcane Spells" to "Arcane Spells",
-            "New Arcane Spells" to "Arcane Spells",
-        )
     }
 }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/Token.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/Token.kt
@@ -4,7 +4,9 @@ sealed interface Token {
 
     sealed class TextToken(val text: String) : Token
 
-    interface Heading
+    interface Heading : Token {
+        val text: String
+    }
     class Heading1(text: String) : TextToken(text), Heading
     class Heading2(text: String) : TextToken(text), Heading
     class Heading3(text: String) : ParagraphToken(text, "heading3"), Heading
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt
@@ -57,7 +57,7 @@ data class Spell(
         const val RANGE_MAX_LENGTH = 50
         const val TARGET_MAX_LENGTH = 50
         const val DURATION_MAX_LENGTH = 50
-        const val EFFECT_MAX_LENGTH = 1000
+        const val EFFECT_MAX_LENGTH = 1500
 
         fun fromCompendium(spell: CompendiumSpell): Spell {
             return Spell(
diff --git a/common/src/jvmTest/kotlin/ImporterTest.kt b/common/src/jvmTest/kotlin/ImporterTest.kt
@@ -1,4 +1,5 @@
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.CoreRulebook
+import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.EnemyInShadowsCompanion
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.UpInArms
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.books.WindsOfMagic
 import cz.frantisekmasa.wfrp_master.common.compendium.domain.importer.parsers.Document
@@ -84,6 +85,14 @@ class ImporterTest {
         }
     }
 
+    @Test
+    fun `spell import (Enemy in Shadows - Companion)`() {
+        withEnemyInShadowsCompanion { document ->
+            val spells = EnemyInShadowsCompanion.importSpells(document)
+            assertEquals(9 + 14, spells.size)
+        }
+    }
+
     @Test
     fun `blessings import (Core Rulebook)`() {
         withCoreRuleBook { document ->
@@ -112,6 +121,12 @@ class ImporterTest {
             .use(block)
     }
 
+    private fun withEnemyInShadowsCompanion(block: (Document) -> Unit) {
+        loadDocument(
+            javaClass.getResourceAsStream("enemy_in_shadows_companion.pdf") as InputStream
+        ).use(block)
+    }
+
     private fun withUpInArms(block: (Document) -> Unit) {
         loadDocument(javaClass.getResourceAsStream("up_in_arms.pdf") as InputStream)
             .use(block)
diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -88,7 +88,7 @@ service cloud.firestore {
                         && spell.range is string && spell.range.size() <= 50
                         && spell.target is string && spell.target.size() <= 50
                         && spell.duration is string && spell.duration.size() <= 50
-                        && spell.effect is string && spell.effect.size() <= 1000
+                        && spell.effect is string && spell.effect.size() <= 1500
                         && spell.castingNumber is int && spell.castingNumber >= 0 && spell.castingNumber <= 99
                         && spell.lore is string && spell.lore.size() <= 50
                         && (! ("isVisibleToPlayers" in spell) || spell.isVisibleToPlayers is bool);
@@ -392,7 +392,7 @@ service cloud.firestore {
                             && spell.range is string && spell.range.size() <= 50
                             && spell.target is string && spell.target.size() <= 50
                             && spell.duration is string && spell.duration.size() <= 50
-                            && spell.effect is string && spell.effect.size() <= 1000
+                            && spell.effect is string && spell.effect.size() <= 1500
                             && spell.castingNumber is int && spell.castingNumber >= 0 && spell.castingNumber <= 99
                             && (! ("memorized" in spell) || spell.memorized is bool)
                             && (! ("compendiumId" in spell)
diff --git a/firebase/tests/Spells.ts b/firebase/tests/Spells.ts
@@ -168,7 +168,7 @@ class Spells extends CharacterSubCollectionSuite {
                 {name: "a".repeat(51)},
 
                 // Effect too long
-                {effect: "a".repeat(1001)},
+                {effect: "a".repeat(1501)},
 
                 // Empty name
                 {name: ""},

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ data class Spell(`
`26`	`26`	`const val RANGE_MAX_LENGTH = 50`
`27`	`27`	`const val TARGET_MAX_LENGTH = 50`
`28`	`28`	`const val DURATION_MAX_LENGTH = 50`
`29`		`- const val EFFECT_MAX_LENGTH = 1000`
	`29`	`+ const val EFFECT_MAX_LENGTH = 1500`
`30`	`30`	`const val LORE_MAX_LENGTH = 50`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,12 @@ object CoreRulebook :`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`override fun importSpells(document: Document): List<Spell> {`
`82`		`- return SpellParser().import(document, this, sequenceOf(240..257))`
	`82`	`+ return SpellParser(`
	`83`	`+ specialLores = mapOf(`
	`84`	`+ "Petty Spells" to "Petty Spells",`
	`85`	`+ "Arcane Spells" to "Arcane Spells",`
	`86`	`+ ),`
	`87`	`+ ).import(document, this, sequenceOf(240..257))`
`83`	`88`	`}`
`84`	`89`
`85`	`90`	`override fun importBlessings(document: Document): List<Blessing> {`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ object WindsOfMagic : Book, CareerSource, SpellSource {`
`31`	`31`
`32`	`32`	`override fun importSpells(document: Document): List<Spell> {`
`33`	`33`	`return SpellParser(`
	`34`	`+ specialLores = mapOf(`
	`35`	`+ "New Arcane Spells" to "Arcane Spells",`
	`36`	`+ ),`
`34`	`37`	`isEnd = {`
`35`	`38`	`(`
`36`	`39`	`it is Token.Heading1 && it.text.trim()`