Merge pull request #22 from Carifio24/add-ggr

Guildmaster's Guide to Ravnica

app/build.gradle

@@ -10,13 +10,13 @@ android {
             keyPassword System.getenv('ANDROID_KEY_PASSWORD')
         }
     }
-    compileSdkVersion 31
+    compileSdkVersion 33
     defaultConfig {
         applicationId "dnd.jon.spellbook"
         minSdkVersion 24
-        targetSdkVersion 31
-        versionCode 300050
-        versionName "3.0.5"
+        targetSdkVersion 33
+        versionCode 300060
+        versionName "3.0.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
     }

app/src/main/assets/Spells.json

@@ -16251,5 +16251,34 @@
                 "page": 22
             }
         ]
+    },
+    {
+        "casting_time": "1 action",
+        "classes":  [
+            "Wizard"
+        ],
+        "components": [
+            "S"
+        ],
+        "concentration": false,
+        "desc": "You pull a memory, an idea, or a message from your mind and transform it into a tangible string of glowing energy called a thought strand, which persists for the duration or until you cast this spell again. The thought strand appears in an unoccupied space within 5 feet of you as a Tiny, weightless, semisolid object that can be held and carried like a ribbon. It is otherwise stationary.\n\nIf you cast this spell while concentrating on a spell or an ability that allows you to read or manipulate the thoughts of others (such as detect thoughts or modify memory), you can transform the thoughts or memories you read, rather than your own, into a thought strand.\n\nCasting this spell while holding a thought strand allows you to instantly receive whatever memory, idea, or message the thought strand contains. (Casting detect thoughts on the strand has the same effect.)\n\nThis spell can be used by any character with the Dimir Operative background.",
+        "duration": "8 hours",
+        "higher_level": "",
+        "id":  523,
+        "level": 0,
+        "material": "",
+        "name": "Encode Thoughts",
+        "range": "Self",
+        "ritual": false,
+        "school": "Enchantment",
+        "subclasses": [
+            "Dimir Operative"
+        ],
+        "locations": [
+            {
+                "sourcebook": "GGR",
+                "page": 47
+            }
+        ]
     }
 ]

app/src/main/assets/Spells_pt.json

@@ -15052,5 +15052,34 @@
                 "page": 22
             }
         ]
+    },
+    {
+        "casting_time": "1 ação",
+        "classes": [
+            "Mago"
+        ],
+        "components": [
+            "S"
+        ],
+        "concentration": false,
+        "desc": "Você puxa uma memória, uma ideia ou uma mensagem de sua mente e a transforma em um fio tangível de energia brilhante chamado fio de pensamento, que persiste pela duração ou até que você lance esse feitiço novamente. O fio de pensamento aparece em um espaço desocupado a até 1,5 metro de você como um objeto minúsculo, sem peso e semissólido que pode ser segurado e carregado como uma fita. Caso contrário, ele é estacionário.\n\nSe você conjurar esta magia enquanto se concentra em uma magia ou habilidade que lhe permite ler ou manipular os pensamentos dos outros (como detectar pensamentos ou modificar a memória), você pode transformar os pensamentos ou memórias que você leia, em vez do seu próprio, em um fio de pensamento.\n\nLançar este feitiço enquanto segura um fio de pensamento permite que você receba instantaneamente qualquer memória, ideia ou mensagem que o fio de pensamento contenha. (Lançar detectar pensamentos no fio tem o mesmo efeito.)\n\nEste feitiço pode ser usado por qualquer personagem com antecedente Operativo Dimir.",
+        "duration": "8 horas",
+        "higher_level": "",
+        "id": 523,
+        "level": 0,
+        "material": "",
+        "name": "Codificar Pensamentos",
+        "range": "Pessoal",
+        "ritual": false,
+        "school": "Encantamento",
+        "subclasses": [
+            "Dimir Operative"
+        ],
+        "locations": [
+            {
+                "sourcebook": "GGR",
+                "page": 47
+            }
+        ]
     }
-]
+]

app/src/main/java/dnd/jon/spellbook/GlobalInfo.java

@@ -2,13 +2,13 @@
 
 class GlobalInfo {
 
-    static final Version VERSION = new Version(3,0,5);
+    static final Version VERSION = new Version(3,0,6);
     static final String VERSION_CODE = VERSION.string();
 
     // We don't always want to show an update message
     // i.e. for updates that are pure bugfixes, the old message may be
     // more useful to users
-    static final Version UPDATE_LOG_VERSION = new Version(3,0,4);
+    static final Version UPDATE_LOG_VERSION = new Version(3,0,6);
     static final String UPDATE_LOG_CODE = UPDATE_LOG_VERSION.string();
 
     static final int ANDROID_VERSION = android.os.Build.VERSION.SDK_INT;

app/src/main/java/dnd/jon/spellbook/MainActivity.java

@@ -1247,8 +1247,8 @@ private void showUpdateDialog(boolean checkIfNecessary) {
         final boolean noCharacters = (characterNames == null) || characterNames.size() <= 0;
         final boolean toShow = !checkIfNecessary || !(prefs.contains(key) || noCharacters);
         if (toShow) {
-            final int titleID = string.update_03_00_04_title;
-            final int descriptionID = string.update_03_00_04_description;
+            final int titleID = string.update_03_00_06_title;
+            final int descriptionID = string.update_03_00_06_description;
             final Runnable onDismissAction = () -> {
                 final SharedPreferences.Editor editor = prefs.edit();
                 editor.putBoolean(key, true).apply();

app/src/main/java/dnd/jon/spellbook/Source.java

@@ -27,7 +27,7 @@ public class Source implements NameDisplayable {
     static final Source FIZBANS_TOD = new Source(R.string.ftd_name, R.string.ftd_code, "Fizban's Treasury of Dragons", "FTD", false);
     static final Source STRIXHAVEN_COC = new Source(R.string.scc_name, R.string.scc_code, "Strixhaven: A Curriculum of Chaos", "SCC", false);
     static final Source ASTRAL_AG = new Source(R.string.aag_name, R.string.aag_code, "Astral Adventurer's Guide", "AAG", false);
-    //GUILDMASTERS_GTR(9, R.string.ggr_name, R.string.ggr_code, "Guildmaster's Guide to Ravnica", "GGR", false);
+    static final Source GUILDMASTERS_GTR = new Source(R.string.ggr_name, R.string.ggr_code, "Guildmaster's Guide to Ravnica", "GGR", false);
 
     // Constructor
     private Source(int value, int displayNameID, int codeID, String internalName, String internalCode, boolean core, boolean created) {

app/src/main/java/dnd/jon/spellbook/Spellbook.java

@@ -21,16 +21,18 @@ class Spellbook {
     static final Version V_2_13_0 = new Version(2, 13 ,0);
     static final Version V_3_0_0 = new Version(3, 0, 0);
     static final Version V_3_0_4 = new Version(3,0,4);
+    static final Version V_3_0_6 = new Version(3, 0, 6);
 
-    static final Version[] VERSIONS = { V_2_0_0, V_2_10_0, V_2_11_0, V_2_11_0, V_2_12_0, V_2_13_0,
-                                        V_3_0_4 };
+    //static final Version[] VERSIONS = { V_2_0_0, V_2_10_0, V_2_11_0, V_2_11_0, V_2_12_0, V_2_13_0,
+    //                                    V_3_0_4, V_3_0_6 };
     static private final Map<Version, Collection<Source>> SOURCES_NEW_IN_VERSION = new HashMap<Version, Collection<Source>>() {{
        put(V_2_0_0, Arrays.asList(Source.PLAYERS_HANDBOOK, Source.XANATHARS_GTE, Source.SWORD_COAST_AG));
        put(V_2_10_0, Arrays.asList(Source.TASHAS_COE));
        put(V_2_11_0, Arrays.asList(Source.ACQUISITIONS_INC, Source.EXPLORERS_GTW, Source.LOST_LAB_KWALISH, Source.RIME_FROSTMAIDEN));
        put(V_2_12_0, Arrays.asList(Source.FIZBANS_TOD));
        put(V_2_13_0, Arrays.asList(Source.STRIXHAVEN_COC));
        put(V_3_0_4, Arrays.asList(Source.ASTRAL_AG));
+       put(V_3_0_6, Arrays.asList(Source.GUILDMASTERS_GTR));
     }};
 
     static Collection<Source> newSourcesForVersion(Version version) {

app/src/main/java/dnd/jon/spellbook/Subclass.java

@@ -24,7 +24,8 @@ enum Subclass {
     ARCANE_TRICKSTER(15, "Arcane Trickster"),
     CLOCKWORK_SOUL(16, "Clockwork Soul"),
     ABERRANT_MIND(17, "Aberrant Mind"),
-    DIVINE_SOUL(18, "Divine Soul");
+    DIVINE_SOUL(18, "Divine Soul"),
+    DIMIR_OPERATIVE(19, "Dimir Operative");
 
     private final int value;
     private final String displayName;

app/src/main/res/values-pt/strings.xml

@@ -391,6 +391,8 @@
     <string name="update_03_00_description">O grimório foi atualizado com os seguintes novos recursos de feitiços:\n\n\u2022A <b>rastreador de slot de feitiço</b> para acompanhar os slots de feitiço de cada personagem\n\n\u2022Novas <b>opções de interface</b>, que pode ser controlado em <b>Configurações</b> no menu à esquerda\n\n\u2022A capacidade de <b>copiar, exportar e importar</b> perfis de caracteres no formato JSON\n\nSe você gostou mais do layout anterior do que o novo, definir todas as opções (duas no telefone, uma no tablet) para \"Gaveta lateral\" nas configurações</string>
     <string name="update_03_00_04_title">Atualização da versão 3.0.4</string>
     <string name="update_03_00_04_description">Esta atualização adiciona novamente os feitiços do <b>Guia do Aventureiro Astral</b>, que foram removidos por engano na v3.0.0.\n\nAlém disso, existem algumas pequenas correções de bugs.</string>
+    <string name="update_03_00_06_title">Atualização da versão 3.0.4</string>
+    <string name="update_03_00_06_description">O livro de feitiços foi atualizado para incluir o feitiço do <b>Guia do Mestre da Guilda para Ravnica</b>.\n\nUm erro no conteúdo de <b>Parede de Luz</b> foi corrigido.</string>
 
     <!-- Character profile actions -->
     <string name="rename">Renomear</string>

app/src/main/res/values/strings.xml

@@ -309,7 +309,7 @@
     <string name="llk_name">Lost Laboratory of Kwalish</string>
     <string name="rf_name">Rime of the Frostmaiden</string>
     <string name="egw_name">Explorer\'s Guide to Wildemount</string>
-    <string name="ggr_name">Guildmaster\'s Guide to Wildemount</string>
+    <string name="ggr_name">Guildmaster\'s Guide to Ravnica</string>
     <string name="ftd_name">Fizban\'s Treasury of Dragons</string>
     <string name="scc_name">Strixhaven: A Curriculum of Chaos</string>
     <string name="aag_name">Astral Adventurer\'s Guide</string>
@@ -392,6 +392,8 @@
     <string name="update_03_00_description">The spellbook has been updated with the following new spell features:\n\n\u2022A <b>spell slot tracker</b> to keep track of each character\'s spell slots\n\n\u2022New <b>UI options</b>, which can be controlled from the <b>Settings</b> in the left menu\n\n\u2022The ability to <b>copy, export, and import</b> character profiles in JSON format\n\nIf you liked the previous layout better than the new one, set all options (two on phone, one on tablet) to \"Side drawer\" in the settings</string>
     <string name="update_03_00_04_title">Version 3.0.4 update</string>
     <string name="update_03_00_04_description">This update re-adds spells from the <b>Astral Adventurer\'s Guide</b>, which were mistakenly removed in v3.0.0.\n\nAdditionally, there are some small bugfixes.</string>
+    <string name="update_03_00_06_title">Version 3.0.6 update</string>
+    <string name="update_03_00_06_description">The spellbook has been updated to include the spell from the <b>Guildmaster\'s Guide to Ravnica</b>.\n\nA mistake in the content of <b>Wall of Light</b> has been corrected.</string>
 
     <!-- Character profile actions -->
     <string name="rename">Rename</string>