diff --git a/README.md b/README.md
index f16c415..c655b17 100644
--- a/README.md
+++ b/README.md
@@ -181,11 +181,12 @@ content: keep it for your own use and do not redistribute it.
## Community add-ons
-The [Core Rules Community Add-ons Collection](addons/README.md) gathers 686
+The [Core Rules Community Add-ons Collection](addons/README.md) gathers 672
add-ons the community made for Core Rules 2.0 and the Expansion (races,
classes, kits, spells, monsters, modules and the AD&D Core Rules User
Database), converted to the Expansion's format and consolidated into
-36,716 items. It ships as its own self-installing AppImage
+36,525 items, with the 668 pictures that came with them. Monster types,
+monsters, races and characters show those pictures in the app. It ships as its own self-installing AppImage
(`crates/cr-addons`, GTK 4 and libadwaita), published on GitHub Packages as
[`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons),
and needs the app 0.7.2 or newer. The installer finds the app on its own,
diff --git a/addons/Comunidade-extras.xz b/addons/Comunidade-extras.xz
new file mode 100644
index 0000000..49d5b39
Binary files /dev/null and b/addons/Comunidade-extras.xz differ
diff --git a/addons/Comunidade.xpx.xz b/addons/Comunidade.xpx.xz
index 745303b..efe95fa 100644
Binary files a/addons/Comunidade.xpx.xz and b/addons/Comunidade.xpx.xz differ
diff --git a/addons/GUIA.md b/addons/GUIA.md
index e0ec534..7c99e58 100644
--- a/addons/GUIA.md
+++ b/addons/GUIA.md
@@ -1,6 +1,6 @@
# Core Rules Community Add-ons Collection: guia de instalação
-Este pacote junta 686 addons feitos pela comunidade para o AD&D Core Rules 2.0 e a Expansion: raças, classes, kits, magias, monstros, equipamentos, encontros, módulos com personagens e a AD&D Core Rules User Database. Todos foram testados, convertidos para o formato da Expansion e consolidados num único arquivo, `Comunidade.xpx`, com 36.716 itens. O [README](README.md) apresenta a coleção, em inglês, e o [relatorio.md](relatorio.md) conta o que foi convertido, reparado ou deixado de fora.
+Este pacote junta 672 addons feitos pela comunidade para o AD&D Core Rules 2.0 e a Expansion: raças, classes, kits, magias, monstros, equipamentos, encontros, módulos com personagens e a AD&D Core Rules User Database. Todos foram testados, convertidos para o formato da Expansion e consolidados num único arquivo, `Comunidade.xpx`, com 36.525 itens. As 668 imagens que vieram com eles também são instaladas. Os goodies mensais da Evermore Entertainment ficaram de fora. O [README](README.md) apresenta a coleção, em inglês, e o [relatorio.md](relatorio.md) conta o que foi convertido, reparado ou deixado de fora.
Mapas do Map Maker II e desenhos do Campaign Mapper não fazem parte do pacote, porque o app não trata desses programas.
@@ -56,13 +56,15 @@ Além de `latest`, cada versão do app tem a sua tag, como `0.7.2`.
| Pacote .deb ou .rpm | `~/.local/share/corerules/data` |
| AppImage (em Downloads, Aplicativos, Área de Trabalho, `~/.local/bin`, `/opt` ou a pasta pessoal) | `~/.local/share/corerules/data` |
+ O botão **Detalhes dos addons…** mostra, quando você quiser, cada pasta de addons com o que ela trouxe para a coleção e os textos que os autores escreveram.
+
Sem essa pasta, cada cópia usa a instalação do programa original no Wine, em `~/.wine/drive_c/Program Files/AD&D Core Rules 2.0`, como o próprio app faz. Se a cópia ainda não tem os dados do jogo, o botão **Abrir o Core Rules** a abre para você usar **Extrair dados do CD…**; depois clique em ↻ para procurar de novo. Para instalar numa pasta que o instalador não achou, use **Outra pasta…** e indique a pasta que tem `Database`.
3. Clique em **Instalar**. A importação leva menos de um minuto.
-4. Abra o Core Rules, pelo botão **Abrir o Core Rules** ou como de costume. Os addons aparecem nos bancos de dados do usuário (Raças, Classes, Magias, Monstros e o resto) e os personagens dos módulos na lista de personagens. Se o app já estava aberto, feche e abra de novo.
+4. Abra o Core Rules, pelo botão **Abrir o Core Rules** ou como de costume. Os addons aparecem nos bancos de dados do usuário (Raças, Classes, Magias, Monstros e o resto) e os personagens dos módulos na lista de personagens. Tipos de monstro, monstros, raças e personagens mostram a imagem que veio com o addon. Se o app já estava aberto, feche e abra de novo.
-A janela fala os mesmos idiomas do app (português, inglês, espanhol, italiano, francês e alemão) e segue o que foi escolhido nas Preferências do Core Rules; sem escolha, segue o idioma do sistema. Os addons em si continuam em português.
+A janela fala os mesmos idiomas do app (português, inglês, espanhol, italiano, francês e alemão) e segue o que foi escolhido nas Preferências do Core Rules; sem escolha, segue o idioma do sistema. Os addons em si e os textos dos autores estão em inglês.
## O que o instalador faz
@@ -70,6 +72,7 @@ A janela fala os mesmos idiomas do app (português, inglês, espanhol, italiano,
2. Copia `UserDbas/` e `Chars/` para uma pasta ao lado, por exemplo `data-before-addons-20261019-010700/`.
3. Importa o `Comunidade.xpx`. Um registro do usuário com o mesmo nome de um addon é substituído pelo do addon, como no Import do programa original.
4. Importa de novo só as classes. Uma combinação raça/classe que cita duas classes novas só entra quando as duas já existem.
+5. Copia as imagens para onde os registros as procuram (`Bitmaps/Monsters`, `Bitmaps/Portrait` e `UserBMP`, e no Wine também as pastas do drive C: que os registros citam). Um arquivo que já existe não é substituído.
O registro da importação fica ao lado da pasta, como `data-addons-20261019-010700.log`, e o botão **Abrir o registro** o mostra no fim.
@@ -77,7 +80,7 @@ Instalar de novo não duplica os personagens. Se a pasta estiver dentro de um pr
## Como desfazer
-Troque `UserDbas/` e `Chars/` pela cópia de segurança, pondo no lugar de `DATA` a data da cópia que quer usar:
+Troque `UserDbas/` e `Chars/` pela cópia de segurança, pondo no lugar de `DATA` a data da cópia que quer usar. As imagens gravadas estão listadas no registro da instalação e podem ficar, já que nada as usa sem os addons:
```sh
cd ~/.local/share/corerules
@@ -89,4 +92,4 @@ No Flatpak, a pasta é `~/.var/app/io.github.brahm.CoreRules/data/corerules`.
## Como o instalador é gerado
-O instalador é o crate `crates/cr-addons`, em Rust com GTK 4 e libadwaita. Ele embute `addons/Comunidade.xpx.xz` e importa pelo mesmo código do app (`cr-store`). `packaging/appimage/build-in-sdk.sh VERSÃO addons` gera a AppImage no SDK do GNOME 51, e o workflow `Addons package` (`.github/workflows/addons.yml`) a publica no GitHub Packages a cada mudança na main.
+O instalador é o crate `crates/cr-addons`, em Rust com GTK 4 e libadwaita. Ele embute `addons/Comunidade.xpx.xz` e `addons/Comunidade-extras.xz` (imagens e textos) e importa pelo mesmo código do app (`cr-store`). `packaging/appimage/build-in-sdk.sh VERSÃO addons` gera a AppImage no SDK do GNOME 51, e o workflow `Addons package` (`.github/workflows/addons.yml`) a publica no GitHub Packages a cada mudança na main.
diff --git a/addons/README.md b/addons/README.md
index 6bfdcc1..03987e1 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -6,14 +6,18 @@
The add-ons that the AD&D Core Rules community made for **AD&D Core Rules 2.0** and its **Expansion**, gathered into one
package and installed with one click into [Core Rules](../README.md), the
-Linux replica of the original program. 686 add-on packages became 36,716
+Linux replica of the original program. 672 add-on packages became 36,525
items: new races and classes, kits, thousands of spells and monsters,
equipment, encounters, the characters of the published modules and the
-AD&D Core Rules User Database.
+AD&D Core Rules User Database. The 668 pictures that came with them are
+installed too, and the texts their authors wrote can be read in the
+installer.
-> This collection contains no TSR or Wizards of the Coast content. It holds
-> only what the community wrote and shared as add-ons; the rules data still
-> comes from a Core Rules installation you already own.
+> The collection holds what the community wrote and shared as add-ons. It
+> leaves out the monthly goodies that Evermore Entertainment, the company
+> that made Core Rules 2.0, published in 1998–2000, and the copies of them
+> in the User Database. The rules data still comes from a Core Rules
+> installation you already own.

@@ -26,29 +30,36 @@ the original program alike.
| --- | ---: |
| Wizard spells | 7,479 |
| Priest spells | 3,514 |
-| Monsters | 5,315 |
-| Monster types | 1,874 |
-| Magical items | 2,376 |
-| Weapons | 2,117 |
-| Equipment | 1,587 |
+| Monsters | 5,307 |
+| Monster types | 1,871 |
+| Magical items | 2,367 |
+| Weapons | 2,112 |
+| Equipment | 1,578 |
| Armor | 752 |
-| Races | 515 |
+| Races | 512 |
| Classes | 558 |
| Kits | 477 |
-| Racial and class abilities | 5,456 |
+| Racial and class abilities | 5,449 |
| Nonweapon proficiencies | 1,804 |
| Languages | 672 |
-| Encounters and encounter templates | 674 |
+| Encounters and encounter templates | 584 |
| Traps | 173 |
| Psionic powers | 160 |
| Traits and disadvantages | 253 |
| Spheres and schools of magic | 362 |
| Treasure bundles, gems, art and currencies | 336 |
-| Characters from the modules | 105 |
+| Characters from the modules | 48 |
| Other parts | 157 |
Once installed, the add-ons sit in the user databases next to your own
-records, and the module characters join the character list.
+records, and the module characters join the character list. Monster types,
+races and characters show the picture their author drew or scanned, in the
+app and in the original program.
+
+
+
+
+
@@ -94,7 +105,14 @@ with the data folder that copy reads:
Without that folder, a copy falls back to the original program in the Wine
prefix, as the app does. **Install** copies `UserDbas` and `Chars` to a
backup beside each folder, then imports the add-ons, in under a minute per
-folder. **Other Folder…** is there for an installation it does not find.
+folder. It also copies the pictures to where the records look for them
+(`Bitmaps/Monsters`, `Bitmaps/Portrait` and `UserBMP` in the data folder,
+and the folders on drive C: that the records name, inside Wine), never over
+a file that is already there. **Other Folder…** is there for an
+installation it does not find, and **Add-on Details…** lists every add-on
+folder with what it brought into the collection and its authors' texts.
+
+

@@ -108,7 +126,8 @@ Core Rules' Preferences, or the system's.
**Testing every add-on.** The community's archive held 686 packages: 492
Expansion `.xpx` files and 194 Core Rules 2.0 `.xpt` files, including the
-AD&D Core Rules User Database. Each one was read and written back byte for
+AD&D Core Rules User Database. 14 of them were Evermore's monthly goodies,
+which the collection leaves out. Each one was read and written back byte for
byte by this project's reader, and the doubtful ones were imported into the
original Expansion program under Wine.
@@ -136,7 +155,17 @@ failed.
the installer, `crates/cr-addons`, a Rust program with GTK 4 and
libadwaita that imports it through the same code as the app (`cr-store`),
in two passes so race and class combinations that name two new classes
-come in. `packaging/appimage/build-in-sdk.sh VERSION addons` builds the
+come in.
+
+**Pictures and texts.** The 668 pictures (8-bit BMP files) and 309 texts
+that came with the add-ons, again without Evermore's, are built into the
+installer as `Comunidade-extras.xz`. Each picture goes to the place the
+records name: a record stores the Windows path the picture had on its
+author's computer (`C:\Program Files\AD&D Core Rules 2.0\Bitmaps\Monsters\
+Achaierai.BMP`, `C:\AD&D Pics\troll.bmp`), and the app maps that path into
+the data folder the same way (`cr-store`'s `pictures` module). The texts,
+readme files in plain text, HTML, RTF, Word and PDF, were converted to plain
+text. `packaging/appimage/build-in-sdk.sh VERSION addons` builds the
AppImage in the GNOME 51 SDK, and the `Addons package` workflow
(`.github/workflows/addons.yml`) publishes it on GitHub Packages on every
change to `main`.
@@ -146,6 +175,8 @@ change to `main`.
| File | Contents |
| --- | --- |
| `Comunidade.xpx.xz` | The consolidated add-ons, as built into the installer |
+| `Comunidade-extras.xz` | The add-ons' pictures and texts, and where each picture goes |
+| `tools/` | The scripts that chose each picture's place and built `Comunidade-extras.xz` |
| [`relatorio.md`](relatorio.md) | The report, in Portuguese: what was converted, repaired or left out |
| [`compatibilidade.csv`](compatibilidade.csv) | One line per add-on package, with its status and item count |
| [`conflitos.csv`](conflitos.csv) | The names found in more than one package, and which version stayed |
diff --git a/addons/compatibilidade.csv b/addons/compatibilidade.csv
index 531fcc9..f606ad7 100644
--- a/addons/compatibilidade.csv
+++ b/addons/compatibilidade.csv
@@ -1,10 +1,10 @@
ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos por addon mais novo,observações
-1,Official Addons/cr2goodie9809/phaser.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",10,0,10,
+1,Official Addons/cr2goodie9809/phaser.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",10,0,10,"goodie mensal da Evermore Entertainment, fora da coleção"
2,Spells/drow/drow.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",25,0,25,
3,Classes/drowgods/drowgods.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,
4,Equipment/harpermagicitems/hrperitm.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",33,29,4,
5,Nonweapon Proficiencies/Player's Option NWPs/ponwps.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",43,43,0,
-6,Official Addons/cr2goodie9810/newart.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,
+6,Official Addons/cr2goodie9810/newart.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,"goodie mensal da Evermore Entertainment, fora da coleção"
7,Races/deepgnom/svirfneblin (deep gnome).xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",10,0,10,
8,Races/dwarves/deep dwarf.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",7,0,7,
9,Races/dwarves/duergar.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",9,0,9,
@@ -22,7 +22,7 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
21,From Dragon Magazine/Dragon239/eqpdr239.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,
22,From Dragon Magazine/Dragon226/magic226.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",15,1,14,
23,Equipment/droweqip/droweqip.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",4,0,4,
-24,Official Addons/cr2goodie9811/soul.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",5,0,5,
+24,Official Addons/cr2goodie9811/soul.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",5,0,5,"goodie mensal da Evermore Entertainment, fora da coleção"
25,From Dragon Magazine/Dragon214/magic214.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,
26,From Dragon Magazine/Dragon207/magic207.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,
27,Races/kender/kender.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",16,1,15,
@@ -40,7 +40,7 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
39,Monsters/cooshee/cooshee.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",2,0,2,
40,Equipment/Complete Ninja's Handbook Items & Others/ninjaspells.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",13,0,13,
41,Equipment/Complete Ninja's Handbook Items & Others/ninjamiscmagicitems.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",10,0,10,
-42,Official Addons/cr2goodie9812/decimprt.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,5 mapa(s) do Map Maker ignorado(s)
+42,Official Addons/cr2goodie9812/decimprt.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",8,0,8,"5 mapa(s) do Map Maker ignorado(s); goodie mensal da Evermore Entertainment, fora da coleção"
43,Traits & Disadvantages/disadvant/disads1.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",17,1,16,
44,Nonweapon Proficiencies/nwpnetbook/misc nwp's.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",88,12,76,
45,Races/mino/minotaur-krynn.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",15,1,14,
@@ -146,13 +146,13 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
145,From Dragon Magazine/Dragon259/dragon259.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",17,9,8,
146,Races/irda/irda.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",13,1,12,
147,Spells/pftf-umberlee/pftf-umberlee (reparado).xpt,xpt,reparado: o arquivo veio corrompido (quebras de linha convertidas por transferência em modo texto),11,7,4,o original do CD recusa o arquivo como veio e aceita o reparado
-148,Official Addons/cr2goodie9905/maygoodie.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",7,0,7,
+148,Official Addons/cr2goodie9905/maygoodie.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",7,0,7,"goodie mensal da Evermore Entertainment, fora da coleção"
149,Demihuman Deities/Elves/Sehanine Moonbow/sehanine.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",4,4,0,
150,Equipment/miscequip/miscequip.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,
151,Kits/Lots of Kits/kits (recuperado).xpt,xpt,recuperado em parte: o zip veio truncado (671.294 de 1.045.873 bytes),103,27,76,103 kits recuperados; o resto do arquivo se perdeu
152,From Dragon Magazine/Dragon261/dragon261.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",51,51,0,
153,From Dragon Magazine/Dragon260/dragon260.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",39,0,39,
-154,Official Addons/CR2goodie9906/torment.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",2,0,2,
+154,Official Addons/CR2goodie9906/torment.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",2,0,2,"goodie mensal da Evermore Entertainment, fora da coleção"
155,Equipment/miscweaps/miscweaps.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",12,1,10,1 personagem(ns)
156,Demihuman Deities/Dwarves/Alaghar/alaghar.xpx,xpx,compatível,7,0,7,
157,Demihuman Deities/Gnomes/Earthblood/earthblood.xpx,xpx,compatível,11,1,10,
@@ -164,8 +164,8 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
163,Kits/Elfcourtwarriors/elvencourtwar.xpx,xpx,compatível,1,0,1,
164,Kits/Cormyr Kits/cormyrkits.xpx,xpx,compatível,2,0,2,
165,From Dragon Magazine/Dragon263/magic263.xpx,xpx,compatível,6,0,6,
-166,Official Addons/CR2goodie9908/dmartheon.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",29,0,29,1 mapa(s) do Map Maker ignorado(s)
-167,Official Addons/CR2goodie9908/partheon.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",0,0,0,1 mapa(s) do Map Maker ignorado(s)
+166,Official Addons/CR2goodie9908/dmartheon.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",29,0,29,"1 mapa(s) do Map Maker ignorado(s); goodie mensal da Evermore Entertainment, fora da coleção"
+167,Official Addons/CR2goodie9908/partheon.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",0,0,0,"1 mapa(s) do Map Maker ignorado(s); goodie mensal da Evermore Entertainment, fora da coleção"
168,Demihuman Deities/Gnomes/Hoodwinker/hoodwinker.xpx,xpx,compatível,9,0,9,
169,Demihuman Deities/Drow/Sworddancer/sword dancer.xpx,xpx,compatível,11,2,9,
170,Demihuman Deities/Drow/Arachne/arachne.xpx,xpx,compatível,17,2,15,
@@ -173,7 +173,7 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
172,Kits/Dalewarriors/dalewarriors.xpx,xpx,compatível,11,0,11,
173,Classes/branchdruids/branchdruid.xpx,xpx,compatível,37,0,37,
174,Nonweapon Proficiencies/survival/survival.xpx,xpx,compatível,10,0,10,
-175,Official Addons/CR2goodie9911/artheonnpc.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",60,0,4,56 personagem(ns)
+175,Official Addons/CR2goodie9911/artheonnpc.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",60,0,4,"56 personagem(ns); goodie mensal da Evermore Entertainment, fora da coleção"
176,Demihuman Deities/Dwarves/Delvesonn/delvesonn.xpx,xpx,compatível,10,1,9,
177,Demihuman Deities/Dwarves/Barakor/barakor.xpx,xpx,compatível,12,6,6,
178,Demihuman Deities/Dwarves/Luckmaiden/luckmaiden.xpx,xpx,compatível,12,1,11,
@@ -208,8 +208,8 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
207,Classes/Forgotten Realms - Faiths & Avatars Specialty Priests/f&a.xpx,xpx,convertido: pontos de magia retirados das classes (o original do CD recusa o pacote),24,0,24,"3 classes sem pontos de magia: Holy Champion, Holy Justice, Luckbringer"
208,faiths-and-avatars/f&a.xpx,xpx,convertido: pontos de magia retirados das classes (o original do CD recusa o pacote),24,0,24,"3 classes sem pontos de magia: Holy Champion, Holy Justice, Luckbringer"
209,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx,xpx,compatível,93,0,93,
-210,Official Addons/CR2goodie9911/robert.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",1,0,0,1 personagem(ns)
-211,Official Addons/CR2goodie9911/dmmap.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",56,0,56,1 mapa(s) do Map Maker ignorado(s)
+210,Official Addons/CR2goodie9911/robert.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",1,0,0,"1 personagem(ns); goodie mensal da Evermore Entertainment, fora da coleção"
+211,Official Addons/CR2goodie9911/dmmap.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",56,0,56,"1 mapa(s) do Map Maker ignorado(s); goodie mensal da Evermore Entertainment, fora da coleção"
212,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca4 items.xpx,xpx,compatível,11,1,10,
213,Races/Improved Kender/improved kender.xpx,xpx,compatível,21,0,21,
214,Races/Updated Drow Abilities/updated drow abilities.xpx,xpx,compatível,22,2,20,
@@ -328,8 +328,8 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
327,Monsters/Dragonlance/dragonlance/dragonlance.xpx,xpx,compatível,158,1,157,
328,Monsters/Fiend Folio/fiend folio.xpx,xpx,compatível,82,0,82,
329,"Spells/Priest's Spell Compendium, A-F/psc-c.xpx",xpx,compatível,155,51,104,
-330,Equipment/cr2-march-goodie/useful.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,
-331,Official Addons/CR2goodie0003/useful.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,
+330,Equipment/cr2-march-goodie/useful.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,"goodie mensal da Evermore Entertainment, fora da coleção"
+331,Official Addons/CR2goodie0003/useful.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,"goodie mensal da Evermore Entertainment, fora da coleção"
332,From Monster Mythology/Kuraulyek Shaman/kuraulyek shaman.xpx,xpx,compatível,2,0,2,
333,From Monster Mythology/Elder God Specialty Priest/elder god specialty priest.xpx,xpx,compatível,7,0,7,
334,From Monster Mythology/Jubilex Specialty Priest/jubilex specialty priest.xpx,xpx,compatível,4,0,4,
@@ -411,7 +411,7 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
410,From Monster Mythology/Sess'innek Specialty Priest/shaman of sess'innek.xpx,xpx,compatível,1,0,1,
411,From Monster Mythology/Squerrik - Specialty Priest & Wererat Priests/shaman of squerrik.xpx,xpx,compatível,2,0,2,
412,From Monster Mythology/Skerrit Specialty Priest & Shaman/specialty priest & shaman of skerrit.xpx,xpx,convertido: pontos de magia retirados das classes (o original do CD recusa o pacote),3,0,3,1 classes sem pontos de magia: Priest of Skerrit
-413,Official Addons/CR2goodie0004/skylene.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,
+413,Official Addons/CR2goodie0004/skylene.xpt,xpt,"compatível: formato 2.0, convertido para a Expansion na importação",3,0,3,"goodie mensal da Evermore Entertainment, fora da coleção"
414,Equipment/more-weapons/moreweapons.xpx,xpx,compatível,8,0,8,
415,Miscellaneous/Artwork/artworks.xpx,xpx,compatível,98,0,98,
416,Nonweapon Proficiencies/Hypnosis/hypnosis.xpx,xpx,compatível,1,0,1,
@@ -684,8 +684,8 @@ ordem,addon,formato,situação,itens,itens no pacote final,itens substituídos p
683,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx",xpx,compatível,11,0,10,1 mapa(s) do Map Maker ignorado(s); 1 personagem(ns)
684,"Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx",xpx,compatível,36,1,32,1 mapa(s) do Map Maker ignorado(s); 3 personagem(ns)
685,Modules/necroguild/necromancersguild.xpx,xpx,compatível,9,0,9,6 mapa(s) do Map Maker ignorado(s)
-686,AD&D Core Rules User Database/user database.xpx,xpx,convertido: feito com a Expansion com patches 3 a 5 (o original do CD recusa),31067,30787,0,"130 classes sem pontos de magia: , Aerial Druid, Aetharnar, Agronomist, Alaghor, Anti-Paladin, Apothecary, Appraiser, Aquatic Druid, Archer - Ranger, Artiste, Avenger, Bard (Planar), Battlescourge, Black Knight, Blacksmith, Blue Knight, Bounty Hunter, Brotankir Knight, Caretaker, Cartographer, Celtic Bard, Chaos Crusader, Chiurgeon, Chronomancer, Circle Singer (A), Crusader, Darankir Knight, Darkbringer, Demonolog; 269 kits regravados da versão 31 para a 30"
-,Official Addons/completebookofnecromancers.exe,exe,inutilizável: instalador web da InstallShield sem o conteúdo (só baixa da internet),0,0,0,
-,Official Addons/CR2goodie9907/crbmputility.exe,exe,não é addon: utilitário de imagens para Windows,0,0,0,
+686,AD&D Core Rules User Database/user database.xpx,xpx,convertido: feito com a Expansion com patches 3 a 5 (o original do CD recusa),31067,30653,0,"130 classes sem pontos de magia: , Aerial Druid, Aetharnar, Agronomist, Alaghor, Anti-Paladin, Apothecary, Appraiser, Aquatic Druid, Archer - Ranger, Artiste, Avenger, Bard (Planar), Battlescourge, Black Knight, Blacksmith, Blue Knight, Bounty Hunter, Brotankir Knight, Caretaker, Cartographer, Celtic Bard, Chaos Crusader, Chiurgeon, Chronomancer, Circle Singer (A), Crusader, Darankir Knight, Darkbringer, Demonolog; 269 kits regravados da versão 31 para a 30; 134 itens e 57 personagens dos goodies da Evermore retirados da coleção"
+,Official Addons/completebookofnecromancers.exe,exe,inutilizável: instalador web da InstallShield sem o conteúdo (só baixa da internet),0,0,0,"goodie mensal da Evermore Entertainment, fora da coleção"
+,Official Addons/CR2goodie9907/crbmputility.exe,exe,não é addon: utilitário de imagens para Windows,0,0,0,"goodie mensal da Evermore Entertainment, fora da coleção"
,From Dragon Magazine/Dragon270.zip,zip,truncado: os pacotes vieram inteiros,0,0,0,perdidos: Dragon Magazine 270 Portraits.zip e pic12.BMP
,From Dragon Magazine/Dragon272.zip,zip,truncado: os pacotes vieram inteiros,0,0,0,"perdidos: dragon 272 pics.zip e Dragonet, Pavilion Dragon.BMP"
diff --git a/addons/conflitos.csv b/addons/conflitos.csv
index 03d1cf5..75613b9 100644
--- a/addons/conflitos.csv
+++ b/addons/conflitos.csv
@@ -1704,8 +1704,8 @@ Encounter Templates,lost in the wilderness,não,AD&D Core Rules User Database/us
Encounter Templates,Shadowdale guards,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounter Templates,shrine to corellon larethian,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounter Templates,Skeletons of the Woods,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
-Encounter Templates,"Soul Seeker, Lair",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9811/soul.xpt
-Encounter Templates,"Soul Seeker, Wandering",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9811/soul.xpt
+Encounter Templates,"Soul Seeker, Lair",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9811/soul.xpt
+Encounter Templates,"Soul Seeker, Wandering",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9811/soul.xpt
Encounter Templates,sure success,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounter Templates,the sylvan guardians,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounter Templates,weather changes,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
@@ -1755,110 +1755,110 @@ Encounters,8 Skeletons,não,AD&D Core Rules User Database/user database.xpx,Modu
Encounters,8. male quarters,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx"
Encounters,"8. the third shaft, the heros tale, web of death",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, web of death.xpx"
Encounters,9. female quarters,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx"
-Encounters,Armory,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Armory,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,At Death's Door the sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounters,Banshee,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
-Encounters,Bullywug Lair,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Circle of Druids,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
-Encounters,City Patrol,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Compound patrol,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Country Patrol,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Bullywug Lair,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Circle of Druids,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
+Encounters,City Patrol,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Compound patrol,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Country Patrol,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,Death Knight,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
-Encounters,Desert Chimera,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Gremlin,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Megalo,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Minotaur Lizard,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Sphinx,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Vulture,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Wild Dog,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Desert Wild Horse,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Dinosaure Stegosaurus,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Dock patrol,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Dock Reserve,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Farms,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Desert Chimera,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Gremlin,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Megalo,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Minotaur Lizard,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Sphinx,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Vulture,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Wild Dog,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Desert Wild Horse,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Dinosaure Stegosaurus,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Dock patrol,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Dock Reserve,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Farms,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,"first encounter, the hero's tale, haggsh's secret",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/hero's tale, hagashs secret.xpx"
Encounters,first get to sinnoma,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heros tale, the covey.xpx"
-Encounters,Forest dangerous plant,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest flying squirrel,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Giant Constrictor,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Giant Hornet,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Giant Lynx,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Giant Tick,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Outlaws,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Retch Plant,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Small Chipmunk,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Sprite,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Unicorn,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Wandering Owlbear,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Forest Worg,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Fort,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Gatehouse,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,General store,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Forest dangerous plant,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest flying squirrel,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Giant Constrictor,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Giant Hornet,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Giant Lynx,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Giant Tick,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Outlaws,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Retch Plant,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Small Chipmunk,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Sprite,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Unicorn,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Wandering Owlbear,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Forest Worg,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Fort,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Gatehouse,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,General store,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,giant cave (now dragon),não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
Encounters,giant's craw the sword of the dales,sim,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
-Encounters,Gnomes of misinformation,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Governor's office,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Governor's secretary,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Gnomes of misinformation,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Governor's office,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Governor's secretary,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,"hero's tale, the covey, on the road",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heros tale, the covey.xpx"
-Encounters,Hill Giant,não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
-Encounters,Hill Giant Wandering,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Hill Giant,não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
+Encounters,Hill Giant Wandering,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
Encounters,hounds of the storm,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
Encounters,icy rocks,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
-Encounters,Inn,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Jungle Carnivorous Ape,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Jungle Monkey Spider,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,jungle/Swamp Giant Leech,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Inn,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Jungle Carnivorous Ape,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Jungle Monkey Spider,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,jungle/Swamp Giant Leech,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
Encounters,Kobold ambush sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
-Encounters,Kobold attack,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Kuo-Toa Cove Encounter,não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
+Encounters,Kobold attack,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Kuo-Toa Cove Encounter,não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
Encounters,Lich,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
Encounters,Lich Treasure,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
Encounters,lost souls,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
-Encounters,Lost World Giant Crayfish,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Lost World Giant Piranha,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Lost World Mantrap Plant,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Lost World Mastodon,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Lost World Tyrannosaurus,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Lost World Giant Crayfish,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Lost World Giant Piranha,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Lost World Mantrap Plant,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Lost World Mastodon,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Lost World Tyrannosaurus,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
Encounters,merchant caravan the sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
-Encounters,Mountain Bombardier Beetle,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Giant Eagle,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Giant Mountain Lion,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Pegasus,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Stone Giant,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wanderin Gnoll,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Cave Bear,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Giant Ettin,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Goblin,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Ogre,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Orc,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Wandering Two-Headed Troll,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Winter Wolf,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Mountain Yeti,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,New Orc City,não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
+Encounters,Mountain Bombardier Beetle,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Giant Eagle,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Giant Mountain Lion,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Pegasus,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Stone Giant,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wanderin Gnoll,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Cave Bear,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Giant Ettin,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Goblin,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Ogre,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Orc,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Wandering Two-Headed Troll,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Winter Wolf,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Mountain Yeti,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,New Orc City,não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
Encounters,Night Bat,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
-Encounters,Ocean Dragon Turtle,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ocean Dragonfish,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ocean Giant Squid,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ocean Killer Whale,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ocean Sea Serpent,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ocean/Coast Selkie,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Orc Camp,não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
-Encounters,Person on street,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Ocean Dragon Turtle,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ocean Dragonfish,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ocean Giant Squid,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ocean Killer Whale,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ocean Sea Serpent,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ocean/Coast Selkie,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Orc Camp,não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
+Encounters,Person on street,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,regal roost sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounters,rhund,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
-Encounters,Ruins Skeleton,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ruins Stone Golem,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Ruins Zombie,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Sacred Flame,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Ruins Skeleton,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ruins Stone Golem,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Ruins Zombie,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Sacred Flame,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,serpentsbridge the sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
-Encounters,Ship's Watch,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Ship's Watch,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,Shrine to Torm sword of the dales,não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Encounters,"Sinnoma, the heros tale, the covey",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heros tale, the covey.xpx"
-Encounters,Standard Stone Tower,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Standard Tower,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Stone Keep,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Swamp Giant Crocodile,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Taverns,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Standard Stone Tower,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Standard Tower,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Stone Keep,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Swamp Giant Crocodile,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Taverns,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,"the covey's lair, the heros tale, the covey",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heros tale, the covey.xpx"
Encounters,"the covey, if the hags know the pcs are coming",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heros tale, the covey.xpx"
Encounters,the crypt,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/hero's tale, hagashs secret.xpx"
@@ -1897,14 +1897,14 @@ Encounters,"the heros tale, the covey, waiting",não,AD&D Core Rules User Databa
Encounters,"the livery, the heros tale, haggashs secret",não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/hero's tale, hagashs secret.xpx"
Encounters,the plea,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx"
Encounters,the river,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
-Encounters,The Shrine,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,The Temple,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
-Encounters,Thomas' test,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,The Shrine,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,The Temple,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Thomas' test,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Encounters,though i walk through the valley,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
Encounters,"Treasure (Lg Chest, Great Room)",não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
Encounters,varawa,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the hero's tale, frost and thorn.xpx"
-Encounters,Wandering Bugbear,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/dmmap.xpt
-Encounters,Water Tower,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Encounters,Wandering Bugbear,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/dmmap.xpt
+Encounters,Water Tower,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Equipment,[SC],não,Miscellaneous/Spell Components/spell components1.xpt,Equipment/spellcomponents1/spell components1.xpt
Equipment,[SC] * Notes *,sim,AD&D Core Rules User Database/user database.xpx,Equipment/spellcomponents1/spell components1.xpt | Miscellaneous/Spell Components/spell components1.xpt
Equipment,[SC] Acid,sim,AD&D Core Rules User Database/user database.xpx,Equipment/spellcomponents1/spell components1.xpt | Miscellaneous/Spell Components/spell components1.xpt
@@ -2319,7 +2319,7 @@ Equipment,"Courier, per day",não,AD&D Core Rules User Database/user database.xp
Equipment,"Cricket, fighting",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental animals.xpx
Equipment,Crowbar,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx"
Equipment,"Dancers, per performance",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental services.xpx
-Equipment,Dancing shoes,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt
+Equipment,Dancing shoes,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt
Equipment,"Deer, Fey",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 equipment 2.xpx
Equipment,"Dinnerware set, adventurer's",sim,AD&D Core Rules User Database/user database.xpx,Equipment/bundles/equipment bundle 02.xpt
Equipment,Disappearing Ink (Black),sim,AD&D Core Rules User Database/user database.xpx,Equipment/aurora/aurora--thieves.xpt
@@ -2348,7 +2348,7 @@ Equipment,Firerod Scabbard,não,AD&D Core Rules User Database/user database.xpx,
Equipment,"Fish, ornamental",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental animals.xpx
Equipment,"Fisher, Gnomish",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 equipment 2.xpx
Equipment,Fishing Tackle,sim,AD&D Core Rules User Database/user database.xpx,"Equipment/aurora/aurora_ranger.xpt | Equipment/gear/ranger.xpt | Modules/the_heros_tale/the hero's tale/hero's tale, hagashs secret.xpx"
-Equipment,Flail Sheath,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/artheonnpc.xpt
+Equipment,Flail Sheath,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/artheonnpc.xpt
Equipment,Flash Globes,sim,AD&D Core Rules User Database/user database.xpx,Equipment/droweqip/droweqip.xpt
Equipment,"Food, banquet",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental provisions.xpx
Equipment,"Food, common meal",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental provisions.xpx
@@ -2373,7 +2373,7 @@ Equipment,"Handkerchief, plain cotton",sim,AD&D Core Rules User Database/user da
Equipment,Harness and feed bag,não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental tack & harness.xpx
Equipment,"Hat, fur",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
Equipment,"Hat, straw",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
-Equipment,Hatchet sheath,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/artheonnpc.xpt
+Equipment,Hatchet sheath,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/artheonnpc.xpt
Equipment,"Hawk, Elven",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 equipment 2.xpx
Equipment,"Hawk, fledgling",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental animals.xpx
Equipment,"Hawk, trained",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental animals.xpx
@@ -2391,7 +2391,7 @@ Equipment,Hinge Removing Set,sim,AD&D Core Rules User Database/user database.xpx
Equipment,"Hobbit Army Knife, Troop",sim,AD&D Core Rules User Database/user database.xpx,Equipment/gear/fight.xpt
Equipment,Holy Symbol,sim,AD&D Core Rules User Database/user database.xpx,Equipment/spellcomponents1/spell components1.xpt | Miscellaneous/Spell Components/spell components1.xpt
Equipment,"Holy Symbol, silver",sim,AD&D Core Rules User Database/user database.xpx,Equipment/spellcomponents1/spell components1.xpt | Miscellaneous/Spell Components/spell components1.xpt
-Equipment,Horn Pipe,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/artheonnpc.xpt
+Equipment,Horn Pipe,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/artheonnpc.xpt
Equipment,Horse yoke,não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental tack & harness.xpx
Equipment,"Horse, Elven Riding",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 equipment 2.xpx
Equipment,"Horse, Elven War",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 equipment 2.xpx
@@ -2427,7 +2427,7 @@ Equipment,Lockpicks,sim,AD&D Core Rules User Database/user database.xpx,Equipmen
Equipment,"Lodging, common or small village",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental services.xpx
Equipment,"Lodging, good inn",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental services.xpx
Equipment,Loincloth,sim,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
-Equipment,Mace sheath,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9911/artheonnpc.xpt
+Equipment,Mace sheath,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9911/artheonnpc.xpt
Equipment,Makeup,sim,AD&D Core Rules User Database/user database.xpx,"Equipment/auroras-bards-equipment/aurora's bards equipment.xpt | Modules/the_heros_tale/the hero's tale/the heros tale, look of love.xpx"
Equipment,Map-Making Kit,sim,AD&D Core Rules User Database/user database.xpx,Miscellaneous/kenderpack/kender package.xpt
Equipment,Marbles (Spoiler),sim,AD&D Core Rules User Database/user database.xpx,Equipment/aurora/aurora--thieves.xpt
@@ -2492,7 +2492,7 @@ Equipment,Scent Lure - Ranger,não,Equipment/gear/ranger.xpt,Spells/ranger/range
Equipment,"Servant, one month",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental services.xpx
Equipment,"Sewing Kit, small",sim,AD&D Core Rules User Database/user database.xpx,Equipment/gear/advent.xpt
Equipment,shovel,não,AD&D Core Rules User Database/user database.xpx,"Modules/the_heros_tale/the hero's tale/hero's tale, hagashs secret.xpx | Modules/the_heros_tale/the hero's tale/the heroes tale, the mistake.xpx"
-Equipment,Signal Horn,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Equipment,Signal Horn,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Equipment,Signal rocket,não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental equipment.xpx
Equipment,Silent Shoes,sim,AD&D Core Rules User Database/user database.xpx,Equipment/aurora/aurora--thieves.xpt
Equipment,Silk BodySuit,sim,AD&D Core Rules User Database/user database.xpx,Equipment/aurora/aurora--thieves.xpt
@@ -2539,10 +2539,10 @@ Equipment,"Trousers, cotton",não,AD&D Core Rules User Database/user database.xp
Equipment,"Trousers, woolen",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
Equipment,Turban,sim,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
Equipment,"Twine, fine silk",sim,AD&D Core Rules User Database/user database.xpx,Equipment/gear/advent.xpt
-Equipment,Utility belt,sim,AD&D Core Rules User Database/user database.xpx,"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
+Equipment,Utility belt,sim,retirado da coleção (goodie da Evermore),"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
Equipment,"Varsk, pack/riding",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/wastes/tribes_of_the_heartless_wastes.xpx
Equipment,"Varsk, war",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/wastes/tribes_of_the_heartless_wastes.xpx
-Equipment,Veggie Rations,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt
+Equipment,Veggie Rations,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt
Equipment,Vellum (per sheet),sim,AD&D Core Rules User Database/user database.xpx,Equipment/spellcomponents1/spell components1.xpt | Miscellaneous/Spell Components/spell components1.xpt
Equipment,"Vest, fur",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
Equipment,"Vest, silk",não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental clothing.xpx
@@ -2550,7 +2550,7 @@ Equipment,Violin,sim,AD&D Core Rules User Database/user database.xpx,Equipment/a
Equipment,"Wagon, common",sim,AD&D Core Rules User Database/user database.xpx,Equipment/bundles/equipment bundle 01.xpt
Equipment,"Wagon, merchant",sim,AD&D Core Rules User Database/user database.xpx,Equipment/bundles/equipment bundle 01.xpt | Modules/The Sword of the Dales/the sword of the dales.xpx
Equipment,Waistcoat,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon264/dr264.xpx
-Equipment,Water Pack,sim,AD&D Core Rules User Database/user database.xpx,"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
+Equipment,Water Pack,sim,retirado da coleção (goodie da Evermore),"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
Equipment,Waterproof Boots,sim,AD&D Core Rules User Database/user database.xpx,Equipment/gear/ranger.xpt
Equipment,Wax Pad,sim,AD&D Core Rules User Database/user database.xpx,Equipment/gear/thief.xpt
Equipment,Weapon Black,sim,AD&D Core Rules User Database/user database.xpx,Equipment/aurora/aurora--thieves.xpt
@@ -2804,8 +2804,8 @@ Languages,Voadkyn,sim,AD&D Core Rules User Database/user database.xpx,"Races/cbh
Languages,Wa,não,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Goblin Pantheon/the goblin pantheon.xpx
Languages,Yaun-ti,não,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Merrshaulk - Specialty Priest & Yuan-Ti Priests/yaun-ti.xpx
Languages,Yeti,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/races.xpx
-Magical Items,"Air Hoist, Large",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt
-Magical Items,"Air Hoist, Small",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt
+Magical Items,"Air Hoist, Large",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt
+Magical Items,"Air Hoist, Small",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt
Magical Items,Airboat,sim,AD&D Core Rules User Database/user database.xpx,Equipment/Complete Wizard's Handbook - Magic Items/cwhmagic.xpx
Magical Items,Alieren's Orb,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-priestcraft/book_of_priestcraft.xpx
Magical Items,Amulet of Aquatic Transformation,não,AD&D Core Rules User Database/user database.xpx,Miscellaneous/shipnsea/of ships and seas.xpx
@@ -2815,7 +2815,7 @@ Magical Items,Amulet of Protection +1,não,AD&D Core Rules User Database/user da
Magical Items,Amulet of Protection +2,não,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
Magical Items,Amulet of the Abyss,sim,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
Magical Items,"Amulet, Blackstone",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon263/magic263.xpx
-Magical Items,Backpack of Utility,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Magical Items,Backpack of Utility,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Magical Items,Bag of Feathers,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
Magical Items,Bag of Tricks (Sea-creatures),não,AD&D Core Rules User Database/user database.xpx,Miscellaneous/shipnsea/of ships and seas.xpx
Magical Items,Banner of the Gray Legion,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-of-regency/book_of_regency.xpx
@@ -2930,7 +2930,7 @@ Magical Items,Fanged Mask,não,AD&D Core Rules User Database/user database.xpx,C
Magical Items,Feather Tabi,sim,AD&D Core Rules User Database/user database.xpx,"Equipment/Complete Ninja's Handbook Items & Others/ninjamiscmagicitems.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
Magical Items,Figurine of Traveling,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
Magical Items,"Gauntlets, Ansuit's",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon263/magic263.xpx
-Magical Items,Gem of Fertility,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Magical Items,Gem of Fertility,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Magical Items,Gem of Spell Deflection,não,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
Magical Items,Gloves of Delegation,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
Magical Items,Gourd of Concealment,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/magic items.xpx
@@ -2962,7 +2962,7 @@ Magical Items,Land-and-Sea Ring,não,AD&D Core Rules User Database/user database
Magical Items,Lenses of Light Shielding,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon267/dr267.xpx
Magical Items,Lenses of Second Sight,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon267/dr267.xpx
Magical Items,Liar's Boots,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon256/dragon 256.xpt
-Magical Items,Librarian's Backpack,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Magical Items,Librarian's Backpack,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Magical Items,Living Tapestry,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-of-regency/book_of_regency.xpx
Magical Items,"Living Tapestry, greater",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-of-regency/book_of_regency.xpx
Magical Items,Lock of Security,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon214/magic214.xpt
@@ -2981,7 +2981,7 @@ Magical Items,Moonwater Gourd,não,AD&D Core Rules User Database/user database.x
Magical Items,Murada's Censer,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-priestcraft/book_of_priestcraft.xpx
Magical Items,Murq's Magica,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 magical items.xpx
Magical Items,Necklace of Animal Communication,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/magic items.xpx
-Magical Items,Nimble fingers,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt
+Magical Items,Nimble fingers,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt
Magical Items,Octapus Mantle,não,AD&D Core Rules User Database/user database.xpx,Miscellaneous/shipnsea/of ships and seas.xpx
Magical Items,Oil of Marking,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/magic items.xpx
Magical Items,Orb of Weather,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
@@ -2994,7 +2994,7 @@ Magical Items,Pendant of Augmentation,sim,AD&D Core Rules User Database/user dat
Magical Items,Pendants of Azurel,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon214/magic214.xpt
Magical Items,Pigskin of Tuis,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon207/magic207.xpt
Magical Items,"Pipes, Heramais",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon263/magic263.xpx
-Magical Items,Polar Pelt,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Magical Items,Polar Pelt,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Magical Items,Potion of Blood Concealing,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
Magical Items,Potion of Blood Enhancement,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
Magical Items,Potion of Double Duration,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
@@ -3063,7 +3063,7 @@ Magical Items,rings of readiness,não,AD&D Core Rules User Database/user databas
Magical Items,"Rings, Tether",não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon267/dr267.xpx
Magical Items,Robe of the Archmage of Ched Nasad,não,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
Magical Items,Robe of the Archmage of Menzoberranzan,não,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
-Magical Items,Sack of Lugging,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Magical Items,Sack of Lugging,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Magical Items,Satchel of Nourishment,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/dragon-annual-4/magic items.xpx
Magical Items,Satyr Pipes,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon269/dragon mag 269 magical items.xpx
Magical Items,Scabbard of Adjustment,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon226/magic226.xpt
@@ -3138,7 +3138,7 @@ Magical Items,Spurs of Awnmaur,não,AD&D Core Rules User Database/user database.
Magical Items,Standard of Courage,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-priestcraft/book_of_priestcraft.xpx
Magical Items,Standard of Terror,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/book-priestcraft/book_of_priestcraft.xpx
Magical Items,State Crown of Anuire,não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/magecraft/book_of_magecraft.xpx
-Magical Items,Statue of Wonder,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9908/dmartheon.xpt
+Magical Items,Statue of Wonder,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9908/dmartheon.xpt
Magical Items,Stone Cheese,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/dragon-annual-4/magic items.xpx
Magical Items,Sweet Bladder,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/dragon-annual-4/magic items.xpx
Magical Items,Tablets of Fate,não,AD&D Core Rules User Database/user database.xpx,Miscellaneous/Waterdeep Stuff/waterdeepstuff.xpx
@@ -3750,14 +3750,14 @@ Monster Types,Skulcap Ivy,sim,AD&D Core Rules User Database/user database.xpx,Fr
Monster Types,Skulk,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mca5/greyhawk.xpt | Classes/Forgotten Realms - Faiths & Avatars Specialty Priests/ibrandul.xpx | faiths-and-avatars/ibrandul.xpx
Monster Types,Skum,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,Skuz,não,AD&D Core Rules User Database/user database.xpx,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx
-Monster Types,Skylene,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie0004/skylene.xpt
+Monster Types,Skylene,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie0004/skylene.xpt
Monster Types,Slig,não,AD&D Core Rules User Database/user database.xpx,Monsters/Dragonlance/dragonlance/dragonlance.xpx
Monster Types,Snail,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mca5/greyhawk.xpt
Monster Types,"Snake, Giant Cobra",não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,"Snake, Messenger",sim,AD&D Core Rules User Database/user database.xpx,Miscellaneous/zhent/zhentmonsters.xpt | Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,"Snake, Stone",não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,Sollux,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
-Monster Types,Soul Seeker,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9811/soul.xpt
+Monster Types,Soul Seeker,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9811/soul.xpt
Monster Types,Spanner,sim,AD&D Core Rules User Database/user database.xpx,Monsters/Fiend Folio/fiend folio.xpx
Monster Types,Spectral Death,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
Monster Types,Spectral Hound,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
@@ -3814,7 +3814,7 @@ Monster Types,"Tiger, Ebon",sim,AD&D Core Rules User Database/user database.xpx,
Monster Types,Time Dimensional,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,Tomb Trapper,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monster Types,Topi,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
-Monster Types,Tormentor,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9906/torment.xpt
+Monster Types,Tormentor,sim,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9906/torment.xpt
Monster Types,Tortle,sim,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
Monster Types,Treasure,não,AD&D Core Rules User Database/user database.xpx,Modules/necroguild/necromancersguild.xpx
Monster Types,"Tree, Dark",não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
@@ -4139,7 +4139,7 @@ Monsters,Darktentacles,não,AD&D Core Rules User Database/user database.xpx,Mons
Monsters,Darkwing,não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 1.xpx
Monsters,Darter,não,AD&D Core Rules User Database/user database.xpx,Monsters/Fiend Folio/fiend folio.xpx
Monsters,Dazzle,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
-Monsters,"Death Knight, Brandeis",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
+Monsters,"Death Knight, Brandeis",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
Monsters,Decapus,não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 1.xpx
Monsters,"Decapus, Marine",não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 1.xpx
Monsters,Deceiver,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
@@ -4925,8 +4925,8 @@ Monsters,Harrier Larvae,não,AD&D Core Rules User Database/user database.xpx,Mon
Monsters,Harrla,não,AD&D Core Rules User Database/user database.xpx,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx
Monsters,Haun,não,AD&D Core Rules User Database/user database.xpx,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx
Monsters,Haundar,não,AD&D Core Rules User Database/user database.xpx,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx
-Monsters,"Haunt, Julius",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
-Monsters,"Haunt, Karin",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9812/decimprt.xpt
+Monsters,"Haunt, Julius",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
+Monsters,"Haunt, Karin",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9812/decimprt.xpt
Monsters,"Haunt, Knight",não,AD&D Core Rules User Database/user database.xpx,Monsters/Dragonlance/dragonlance/dragonlance.xpx
Monsters,Hazer,não,AD&D Core Rules User Database/user database.xpx,Equipment/miscnetstuff/miscnetstuff.xpx
Monsters,Head Hunter,não,AD&D Core Rules User Database/user database.xpx,Monsters/Ravenloft Annual 3/ravenloft file 1.xpx
@@ -5064,7 +5064,7 @@ Monsters,"Imp, Wood, Leader",não,AD&D Core Rules User Database/user database.xp
Monsters,"Imp, Wood, Shaman",não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 2.xpx
Monsters,Impersonator,não,AD&D Core Rules User Database/user database.xpx,Monsters/Ravenloft Annual 1/ravenloft annual 1.xpx
Monsters,Ingundi,não,AD&D Core Rules User Database/user database.xpx,Monsters/mca5/greyhawk.xpt
-Monsters,Inner Torment,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie9906/torment.xpt
+Monsters,Inner Torment,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie9906/torment.xpt
Monsters,Inquisitor,não,AD&D Core Rules User Database/user database.xpx,Monsters/FR_monsters/fr_monsters.xpx | Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monsters,Intelligent Mist - Guardians (Class II),não,AD&D Core Rules User Database/user database.xpx,Equipment/miscnetstuff/miscnetstuff.xpx
Monsters,Intelligent Mist - Messenger Class I,não,AD&D Core Rules User Database/user database.xpx,Equipment/miscnetstuff/miscnetstuff.xpx
@@ -5601,8 +5601,8 @@ Monsters,Skulk,não,AD&D Core Rules User Database/user database.xpx,Monsters/mca
Monsters,Skullcap Ivy,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon259/dragon259.xpt
Monsters,Skum,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monsters,Skuz,não,AD&D Core Rules User Database/user database.xpx,Monsters/Forgotten Realms Creatures/fr creatures/fr creatures.xpx
-Monsters,Skylene,não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie0004/skylene.xpt
-Monsters,"Skylene, Greater",não,AD&D Core Rules User Database/user database.xpx,Official Addons/CR2goodie0004/skylene.xpt
+Monsters,Skylene,não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie0004/skylene.xpt
+Monsters,"Skylene, Greater",não,retirado da coleção (goodie da Evermore),Official Addons/CR2goodie0004/skylene.xpt
Monsters,Slig,não,AD&D Core Rules User Database/user database.xpx,Monsters/Dragonlance/dragonlance/dragonlance.xpx
Monsters,Slig (champion),não,AD&D Core Rules User Database/user database.xpx,Monsters/Dragonlance/dragonlance/dragonlance.xpx
Monsters,Slig (warrior),não,AD&D Core Rules User Database/user database.xpx,Monsters/Dragonlance/dragonlance/dragonlance.xpx
@@ -5627,8 +5627,8 @@ Monsters,Sollux 11HD,não,AD&D Core Rules User Database/user database.xpx,Monste
Monsters,Sollux 12HD,não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
Monsters,Sollux 13HD,não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
Monsters,Sollux 14HD,não,AD&D Core Rules User Database/user database.xpx,Monsters/mystara_creatures/mystara page 3.xpx
-Monsters,"Soul Seeker, Helper",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9811/soul.xpt
-Monsters,"Soul Seeker, Master",não,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9811/soul.xpt
+Monsters,"Soul Seeker, Helper",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9811/soul.xpt
+Monsters,"Soul Seeker, Master",não,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9811/soul.xpt
Monsters,Soultaker,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca 1to4.xpx
Monsters,Spanner,não,AD&D Core Rules User Database/user database.xpx,Monsters/Fiend Folio/fiend folio.xpx
Monsters,Spanner 11HD,não,AD&D Core Rules User Database/user database.xpx,Monsters/Fiend Folio/fiend folio.xpx
@@ -8000,14 +8000,14 @@ Races,Kuo-toa,sim,AD&D Core Rules User Database/user database.xpx,From Monster M
Races,Laridian,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon266/races.xpx
Races,Locathah,sim,AD&D Core Rules User Database/user database.xpx,"From Monster Mythology/Eadro - Specialty Priest, Shaman & Merfolk or Locathah Priest/locathah.xpx"
Races,"Lycanthrope, True",não,AD&D Core Rules User Database/user database.xpx,Races/True Lycanthropes/true_lycanthrope.xpx
-Races,Magic Phaser,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
+Races,Magic Phaser,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
Races,Merfolk,sim,AD&D Core Rules User Database/user database.xpx,"From Monster Mythology/Eadro - Specialty Priest, Shaman & Merfolk or Locathah Priest/merfolk.xpx"
Races,Minotaur-Krynn,sim,AD&D Core Rules User Database/user database.xpx,Races/mino/minotaur-krynn.xpt | Races/custraces/minotaur/minotaur.xpt
Races,Mold Man,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/races.xpx
Races,Moon Elf,sim,AD&D Core Rules User Database/user database.xpx,Classes/FR Class&Race/fr_class&race.xpx
Races,Mycanoid,sim,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Psilofyr Specialty Priest/psilofyr specialty priest.xpx
Races,Orog,não,AD&D Core Rules User Database/user database.xpx,Races/Orog.XPX
-Races,Phaser,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
+Races,Phaser,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
Races,Quaggoth,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/races.xpx
Races,Red Falcon,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon266/races.xpx
Races,Sahuagin,sim,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Sekolah - Specialty Priest & Sahaugin Priests/sahuagin.xpx
@@ -8026,7 +8026,7 @@ Races,Triton,sim,AD&D Core Rules User Database/user database.xpx,From Monster My
Races,Troglodyte,sim,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/races.xpx | From Monster Mythology/Laogzed - Specialty Priest and Troglodyte Priests/troglodyte.xpx
Races,Urd,sim,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Kuraulyek Shaman/kuraulyek shaman.xpx | From Monster Mythology/Meriadar Specialty Priest & Shaman/meriadar sp-shaman.xpx
Races,Vodyanoi,sim,AD&D Core Rules User Database/user database.xpx,"From Monster Mythology/Panzuriel - Specialty Priest & Kraken, Scrag and Vodyanoi Pri/vodyanoi.xpx"
-Races,Watching Phaser,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
+Races,Watching Phaser,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
Races,Wererat,sim,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Squerrik - Specialty Priest & Wererat Priests/wererat.xpx
Races,Yaun-ti,sim,AD&D Core Rules User Database/user database.xpx,From Monster Mythology/Merrshaulk - Specialty Priest & Yuan-Ti Priests/yaun-ti.xpx
Races,Yeti,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon265/races.xpx
@@ -8432,13 +8432,13 @@ Racial Abilities,"Orog, Hit point bonus (10)",não,AD&D Core Rules User Database
Racial Abilities,"Orog, Infravision (10)",não,AD&D Core Rules User Database/user database.xpx,Races/Orog.XPX
Racial Abilities,"Orog, Stamina bonus (10)",não,AD&D Core Rules User Database/user database.xpx,Races/Orog.XPX
Racial Abilities,"Orog, Tough hide (5)",não,AD&D Core Rules User Database/user database.xpx,Races/Orog.XPX
-Racial Abilities,"Phaser, Infravision 120' (10)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, Intuition bonus (10)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, Knowledge bonus (10)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, No hunger (5)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, Phasing (5)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, Spell resistance (10)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
-Racial Abilities,"Phaser, Spellcraft (5)",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Infravision 120' (10)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Intuition bonus (10)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Knowledge bonus (10)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, No hunger (5)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Phasing (5)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Spell resistance (10)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
+Racial Abilities,"Phaser, Spellcraft (5)",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9809/phaser.xpt
Racial Abilities,"Pixie, cause confusion 1/day",sim,AD&D Core Rules User Database/user database.xpx,Races/cbhraces/cbhu.race.xpt
Racial Abilities,"Pixie, create illusion, 1/day",sim,AD&D Core Rules User Database/user database.xpx,Races/cbhraces/cbhu.race.xpt
Racial Abilities,"Pixie, dancing lights 1/day",sim,AD&D Core Rules User Database/user database.xpx,Races/cbhraces/cbhu.race.xpt
@@ -9006,7 +9006,7 @@ Weapons,Dart of Wounding,não,AD&D Core Rules User Database/user database.xpx,Eq
Weapons,"Dart, Death, Large",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Dart, Death, Small",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Dart, Illusory Missile",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
-Weapons,"Dart, Magical Missiles",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Weapons,"Dart, Magical Missiles",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Weapons,"Dart, Svirfnebli",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,Demon Staff,não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,Eagle-Claw (Avariel) - Dr233,não,Races/avariel/avariel elf.xpt,From Dragon Magazine/Dragon233/dragon magazine 233.xpt
@@ -9018,7 +9018,7 @@ Weapons,Elven bow +5,sim,AD&D Core Rules User Database/user database.xpx,Equipme
Weapons,Energy Bow,não,AD&D Core Rules User Database/user database.xpx,Equipment/more-weapons/moreweapons.xpx
Weapons,Fang,não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental weapons.xpx
Weapons,Fiendblade,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon272/magical items.xpx
-Weapons,Fighting spurs,sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9905/maygoodie.xpt | Equipment/miscweaps/miscweaps.xpt
+Weapons,Fighting spurs,sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9905/maygoodie.xpt | Equipment/miscweaps/miscweaps.xpt
Weapons,Firerod,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca4 items.xpx
Weapons,Firestaff,não,AD&D Core Rules User Database/user database.xpx,Monsters/Monsterous Compendium Annuals 1 through 4/mca all/mca4 items.xpx
Weapons,Flail of Apomps,não,AD&D Core Rules User Database/user database.xpx,From Dragon Magazine/Dragon272/magical items.xpx
@@ -9043,7 +9043,7 @@ Weapons,"Hellblade, Soulsucker",não,AD&D Core Rules User Database/user database
Weapons,"Hellblade, Soulswallower",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Hellblade, Soultaster",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Hellblade, Soulzapper",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
-Weapons,Hidden Dagger,sim,AD&D Core Rules User Database/user database.xpx,"Official Addons/cr2goodie9810/newart.xpt | Equipment/miscweaps/miscweaps.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
+Weapons,Hidden Dagger,sim,retirado da coleção (goodie da Evermore),"Official Addons/cr2goodie9810/newart.xpt | Equipment/miscweaps/miscweaps.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
Weapons,Holy water (vial),não,AD&D Core Rules User Database/user database.xpx,Modules/The Sword of the Dales/the sword of the dales.xpx
Weapons,Hoopak,sim,AD&D Core Rules User Database/user database.xpx,Miscellaneous/kenderpack/kender package.xpt
Weapons,Horroodisomoth's Dagger,não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
@@ -9164,7 +9164,7 @@ Weapons,"Sword, Darkthorn ",não,AD&D Core Rules User Database/user database.xpx
Weapons,"Sword, defender scimitar +5, Twinkle",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Sword, frostbrand scimitar +3, Icingdeath",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,"Sword, Goblinbane",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/sword-crown/sword_and_crown.xpx
-Weapons,"Sword, Kasim's Kopesh",sim,AD&D Core Rules User Database/user database.xpx,Official Addons/cr2goodie9810/newart.xpt
+Weapons,"Sword, Kasim's Kopesh",sim,retirado da coleção (goodie da Evermore),Official Addons/cr2goodie9810/newart.xpt
Weapons,"Sword, Katana +5 Flame Tongue",não,AD&D Core Rules User Database/user database.xpx,Equipment/more-weapons/moreweapons.xpx
Weapons,"Sword, katana of speed +3",não,AD&D Core Rules User Database/user database.xpx,Equipment/more-weapons/moreweapons.xpx
Weapons,"Sword, katana of speed +4",não,AD&D Core Rules User Database/user database.xpx,Equipment/more-weapons/moreweapons.xpx
@@ -9210,7 +9210,7 @@ Weapons,"Twin Mace, Qu'ilth",não,AD&D Core Rules User Database/user database.xp
Weapons,"Twin Mace, Qu'uente",não,AD&D Core Rules User Database/user database.xpx,Equipment/FR_Weapons/fr_weapons.xpx | Classes/FR Class&Race/fr_class&race.xpx
Weapons,Uchi-ne,não,AD&D Core Rules User Database/user database.xpx,Equipment/oriental-adventures-equipment/oriental weapons.xpx
Weapons,Umberlant Dueling Knife,não,AD&D Core Rules User Database/user database.xpx,Classes/Forgotten Realms - Faiths & Avatars Specialty Priests/waveservant.xpx | faiths-and-avatars/waveservant.xpx
-Weapons,"Vial, (un)holy water/acid",sim,AD&D Core Rules User Database/user database.xpx,"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
+Weapons,"Vial, (un)holy water/acid",sim,retirado da coleção (goodie da Evermore),"Equipment/cr2-march-goodie/useful.xpt | Official Addons/CR2goodie0003/useful.xpt | Miscellaneous/Forgotten Realms Oriental Kits, Spells & Misc/fotd.xpt"
Weapons,"War Spear, Birthright",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/wastes/tribes_of_the_heartless_wastes.xpx
Weapons,"War Spear, Truthbreaker",não,AD&D Core Rules User Database/user database.xpx,Birthright Setting/sword-crown/sword_and_crown.xpx
Weapons,"Warhammer, +3 Dwarf thrower",não,AD&D Core Rules User Database/user database.xpx,Kits/Dwarfstuff/dwarfstuff.xpx
diff --git a/addons/relatorio.md b/addons/relatorio.md
index a5b7d36..428a88f 100644
--- a/addons/relatorio.md
+++ b/addons/relatorio.md
@@ -1,6 +1,6 @@
# Core Rules Community Add-ons Collection: relatório
-O `addons.zip` (50.842.950 bytes) traz 686 pacotes: 492 `.xpx` da Expansion e 194 `.xpt` do Core Rules 2.0, contando a User Database e os dois arquivos que precisaram de conserto. Todos foram consolidados num único pacote, `Comunidade.xpx`, no formato que o `TSRP3.EXE` do CD da Expansion lê.
+O `addons.zip` (50.842.950 bytes) traz 686 pacotes: 492 `.xpx` da Expansion e 194 `.xpt` do Core Rules 2.0, contando a User Database e os dois arquivos que precisaram de conserto. Todos foram consolidados num único pacote, `Comunidade.xpx`, no formato que o `TSRP3.EXE` do CD da Expansion lê. Os 14 goodies mensais da Evermore Entertainment ficaram de fora depois, como explica a seção [Goodies da Evermore](#goodies-da-evermore): o pacote tem 36.525 itens de 672 addons.
O instalador, que leva o `Comunidade.xpx` dentro dele, e como usá-lo estão no [GUIA.md](GUIA.md). Junto deste relatório:
@@ -8,6 +8,7 @@ O instalador, que leva o `Comunidade.xpx` dentro dele, e como usá-lo estão no
|---|---|
| `compatibilidade.csv` | uma linha por addon, com a situação, o número de itens e as observações |
| `conflitos.csv` | os nomes que aparecem em mais de um addon e qual versão ficou |
+| `Comunidade-extras.xz` | as imagens e os textos dos addons, embutidos no instalador |
## Situação dos addons
@@ -53,17 +54,35 @@ Algumas regras do Import do original se aplicam aqui:
* **Magias com o mesmo nome.** Magias de mago e de sacerdote dividem o mesmo espaço de nomes. "Freshen" existe nas duas listas da User Database, e ficou só a de sacerdote.
* **Raças sem combinações.** 36 raças da User Database não têm combinações raça/classe registradas (Aranea, os Avatares, Voadkyn, Xevis e outras). Elas entram sem classes permitidas, como no original.
+## Goodies da Evermore
+
+Os pacotes `cr2goodieAAMM` da pasta `Official Addons`, e o `cr2-march-goodie.zip` da pasta Equipment, são os goodies mensais que a Evermore Entertainment, a empresa que fez o Core Rules 2.0 para a TSR, publicou de 1998 a 2000. Não são da comunidade, e por isso saíram da coleção:
+
+* **191 itens retirados:** 134 registros (a raça Phaser, os monstros Soul Seeker, Inner Torment e Skylene com os seus tipos, os encontros de The Black Rock e de Artheon, os equipamentos e itens mágicos) e 57 personagens (os 56 moradores de Artheon e Robert). A User Database tinha cópias de todos eles, e as cópias também saíram.
+* **Cinco itens também estavam em `fotd.xpt` e `miscweaps.xpt`** (Utility belt, Water Pack, Fighting spurs, Hidden Dagger e Vial of (un)holy water/acid), com o texto da Evermore palavra por palavra, e saíram também.
+* **Validação:** o pacote novo foi importado numa instalação limpa da Expansion, como o anterior. A primeira passagem deu os mesmos avisos e a segunda, nenhum. Os bancos do usuário diferem dos do pacote anterior só pelos itens retirados.
+* Em `compatibilidade.csv` os 16 arquivos da Evermore estão marcados como fora da coleção. Em `conflitos.csv` os 134 nomes retirados têm "retirado da coleção" no lugar do vencedor.
+
+Ficaram algumas menções de nomes nas listas de outros addons: kits de raças da comunidade citam "Phaser" e listas de armas citam "Hidden Dagger" e "Fighting spurs". São só nomes numa lista, como acontece com qualquer item que não existe na instalação.
+
## Validação
* **Leitura e regravação:** os 686 pacotes, o consolidado incluído, são lidos e regravados byte a byte pelo leitor do projeto.
* **Original da Expansion no Wine:** o diálogo Import do original abriu o `Comunidade.xpx` e listou os itens. A leitura levou cerca de 35 minutos. O Import All não foi executado no original.
* **Edição no app Linux:** depois da instalação, cada registro dos addons foi aberto, editado e salvo pelos mesmos editores que o app usa, e relido depois. Foram 10.993 magias, 173 armadilhas, 160 poderes psiônicos, 1.874 tipos de monstro, 5.315 monstros, 515 raças, 558 classes, 16.290 partes, 59 tesouros, 299 encontros e os 105 personagens importados. Nenhum falhou. Regravar os bancos sem mudanças mantém os arquivos idênticos byte a byte. Salvar um registro pelo editor faz os mesmos ajustes do original, como tirar espaços do fim do nome. Dez registros têm o nome de um registro padrão: seis classes ("Fighter", "Cleric", "Mage", "Illusionist", "Ranger" e "Thief"), três magias e uma raça. O app recusava salvá-los e agora aceita, desde que o nome continue o mesmo.
* **Instalador:** a AppImage foi testada numa cópia limpa do pacote de dados.
- * Importou 36.716 itens, 105 deles personagens, em menos de um minuto.
+ * Importou 36.525 itens, 48 deles personagens, em menos de um minuto, e copiou 1.204 imagens.
+ * Antes da retirada dos goodies da Evermore, eram 36.716 itens e 105 personagens.
* A segunda passagem terminou sem nenhum aviso.
* Os bancos do usuário ficaram idênticos byte a byte aos que o antigo script de instalação gravava.
* Instalar de novo não duplica personagens nem altera os registros, a não ser por 4 combinações de raças cujo nome se repete no pacote.
-## Imagens e documentação
+## Imagens e textos
+
+Os addons trouxeram 685 imagens BMP e 321 textos. Sem os da Evermore, ficam 668 imagens e 309 textos, embutidos no instalador em `Comunidade-extras.xz`.
-As imagens BMP dos addons (retratos e figuras de monstros, que no original iam para `UserBMP/`) e os textos de documentação não estão no pacote: o app Linux não mostra essas figuras.
+* **Para onde vai cada imagem.** Os registros guardam o caminho do Windows que a imagem tinha no computador do autor, como `C:\Program Files\AD&D Core Rules 2.0\Bitmaps\Monsters\Achaierai.BMP` ou `C:\AD&D Pics\troll.bmp`. Um caminho dentro de uma instalação do Core Rules, em qualquer drive, vira o mesmo caminho dentro da pasta de dados (`Bitmaps/Monsters/Achaierai.BMP`). Um caminho para o `Bitmaps` do CD fica em `Bitmaps`. Os outros vão para `UserBMP`, sem o drive (`UserBMP/AD&D Pics/troll.bmp`). No Wine, estes últimos também vão para o drive C:, onde o original os procura.
+* **Escolha da imagem.** 528 imagens são citadas pelos registros e vão para 536 lugares. Quando dois addons trazem imagens com o mesmo nome, vale a do addon de onde veio o registro. Nenhum lugar recebe duas imagens diferentes. As 4 citações a imagens do próprio CD ficam com as do CD. Todas as 668 imagens também vão para `UserBMP/`, na pasta do seu addon, que é onde o diálogo de imagens do original abre.
+* **Nada é sobrescrito.** Um arquivo que já existe fica como está, e o registro da instalação lista cada imagem gravada.
+* **No app.** Tipos de monstro, monstros (pela imagem do seu tipo), raças e personagens mostram a imagem quando o arquivo está na pasta de dados. As imagens são lidas pelo próprio app, sem depender dos leitores de imagem do sistema. 3.800 citações apontam para imagens que nenhum addon trouxe, quase todas as do CD (`6.bmp`, `NA.bmp`), e o app não as mostra porque **Extrair dados do CD…** não copia o `Bitmaps` do CD.
+* **Textos.** Os leia-me em texto, HTML, RTF, Word e PDF foram convertidos para texto simples. O botão **Detalhes dos addons…** do instalador mostra, para cada pasta de addons, os pacotes, o que cada um trouxe para a coleção e esses textos.
diff --git a/addons/screenshots/details.png b/addons/screenshots/details.png
new file mode 100644
index 0000000..8b661a5
Binary files /dev/null and b/addons/screenshots/details.png differ
diff --git a/addons/screenshots/picture.png b/addons/screenshots/picture.png
new file mode 100644
index 0000000..8300986
Binary files /dev/null and b/addons/screenshots/picture.png differ
diff --git a/addons/screenshots/portrait.png b/addons/screenshots/portrait.png
new file mode 100644
index 0000000..82f46bc
Binary files /dev/null and b/addons/screenshots/portrait.png differ
diff --git a/addons/tools/extras_bundle.py b/addons/tools/extras_bundle.py
new file mode 100644
index 0000000..0b963fa
--- /dev/null
+++ b/addons/tools/extras_bundle.py
@@ -0,0 +1,133 @@
+"""Builds addons/Comunidade-extras.xz: the add-ons' pictures and texts,
+and what the installer's details list shows.
+
+usage: extras_bundle.py EXTRAS_DIR MANIFEST_DIR ITEMS.tsv FINAL_ITEMS.tsv COMPAT.csv WORK_DIR OUT
+
+The bundle, before xz, is a text header then the files' bytes in order:
+ CRX1
+ Fsizepath a file: pictures/..., texts/....txt, addons.tsv
+ Ppictureplace where a picture goes, in the installation
+ (blank line)
+addons.tsv, one block per add-on folder:
+ Afolder
+ Kpackageitems in the package
+ Icategoryname the items, under their package
+ Ttexts/....txtoriginal file name
+"""
+import collections, csv, html, html.parser, os, re, subprocess, sys
+
+extras, manifest, items_tsv, final_tsv, compat_csv, work, out = sys.argv[1:8]
+files = [l.rstrip('\n') for l in open(os.path.join(manifest, 'files.txt'), encoding='utf-8') if l.strip()]
+placements = [l.rstrip('\n').split('\t') for l in open(os.path.join(manifest, 'placements.tsv'), encoding='utf-8')]
+pictures = [f for f in files if f.lower().endswith('.bmp')]
+texts = [f for f in files if f.lower().rsplit('.', 1)[-1] in ('txt', 'htm', 'html', 'doc', 'rtf', 'pdf')]
+
+class Text(html.parser.HTMLParser):
+ BLOCK = {'p', 'br', 'div', 'tr', 'li', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'table', 'hr'}
+ def __init__(self):
+ super().__init__(convert_charrefs=True)
+ self.out, self.skip = [], 0
+ def handle_starttag(self, tag, attrs):
+ if tag in ('script', 'style', 'title'): self.skip += 1
+ if tag in self.BLOCK: self.out.append('\n')
+ def handle_endtag(self, tag):
+ if tag in ('script', 'style', 'title'): self.skip = max(0, self.skip - 1)
+ if tag in self.BLOCK: self.out.append('\n')
+ def handle_data(self, data):
+ if not self.skip: self.out.append(re.sub(r'\s+', ' ', data))
+
+def decode(raw):
+ # DOS text with box-drawing art (Fantaseum readmes) is code page 437.
+ high = [b for b in raw if b >= 0x80]
+ if len([b for b in high if 0xb0 <= b <= 0xdf]) > max(20, len(high) // 2):
+ try: raw.decode('utf-8')
+ except UnicodeDecodeError: return raw.decode('cp437')
+ for enc in ('utf-8', 'cp1252'):
+ try: return raw.decode(enc)
+ except UnicodeDecodeError: pass
+ return raw.decode('latin-1')
+
+def tidy(text):
+ text = text.replace('\r\n', '\n').replace('\r', '\n').lstrip('')
+ text = '\n'.join(l.rstrip() for l in text.split('\n'))
+ return re.sub(r'\n{3,}', '\n\n', text).strip() + '\n'
+
+conv = os.path.join(work, 'conv')
+os.makedirs(conv, exist_ok=True)
+converted = {}
+for t in texts:
+ src = os.path.join(extras, t)
+ ext = t.lower().rsplit('.', 1)[-1]
+ if ext == 'txt':
+ text = decode(open(src, 'rb').read())
+ elif ext in ('htm', 'html'):
+ p = Text(); p.feed(decode(open(src, 'rb').read())); text = ''.join(p.out)
+ else:
+ dest = os.path.join(conv, re.sub(r'[^A-Za-z0-9]+', '_', t) + '.txt')
+ if not os.path.exists(dest):
+ if ext == 'pdf':
+ subprocess.run(['pdftotext', '-layout', '-enc', 'UTF-8', src, dest], check=True)
+ else:
+ tmp = os.path.join(work, 'soffice'); os.makedirs(tmp, exist_ok=True)
+ subprocess.run(['soffice', '--headless', '--convert-to', 'txt:Text (encoded):UTF8',
+ '--outdir', tmp, src], check=True, capture_output=True, timeout=300)
+ os.replace(os.path.join(tmp, os.path.basename(src).rsplit('.', 1)[0] + '.txt'), dest)
+ text = open(dest, encoding='utf-8', errors='replace').read()
+ text = tidy(text)
+ if text.strip():
+ converted[t] = text
+
+# Packages and the items each brought into the final package.
+rows = [r for r in csv.DictReader(open(compat_csv, encoding='utf-8'))
+ if not (r['addon'].lower().startswith('official addons/') or 'goodie' in r['addon'].lower())]
+final = {tuple(l.rstrip('\n').split('\t')[:2]) for l in open(final_tsv, encoding='utf-8')}
+winner = {}
+for line in open(items_tsv, encoding='utf-8'):
+ order, pkg, cat, name, _ = line.rstrip('\n').split('\t')
+ key = (cat, name)
+ if key in final and (key not in winner or int(order) >= winner[key][0]):
+ winner[key] = (int(order), pkg.removeprefix('./'))
+brought = collections.defaultdict(list)
+for (cat, name), (_, pkg) in winner.items():
+ brought[pkg].append((cat, name))
+
+folders = collections.defaultdict(list)
+total = {r['addon']: int(r['itens'] or 0) for r in rows}
+for r in rows:
+ folders[r['addon'].rsplit('/', 1)[0] if '/' in r['addon'] else ''].append(r['addon'])
+def home(path):
+ d = path.rsplit('/', 1)[0]
+ best = max((f for f in folders if d == f or d.startswith(f + '/')), key=len, default=None)
+ if best is None:
+ under = [f for f in folders if f.startswith(d + '/')]
+ best = under[0] if len(under) == 1 else d
+ return best
+folder_texts = collections.defaultdict(list)
+for t in converted:
+ folder_texts[home(t)].append(t)
+
+index = []
+for folder in sorted(set(folders) | set(folder_texts), key=str.lower):
+ index.append(f'A\t{folder}')
+ for pkg in sorted(folders.get(folder, []), key=str.lower):
+ items = sorted(brought.get(pkg, []))
+ index.append(f'K\t{pkg}\t{total[pkg]}')
+ index += [f'I\t{c}\t{n}' for c, n in items]
+ for t in sorted(folder_texts.get(folder, []), key=str.lower):
+ index.append(f'T\ttexts/{t}.txt\t{t.rsplit("/", 1)[-1]}')
+index = ('\n'.join(index) + '\n').encode('utf-8')
+
+entries = [('addons.tsv', index)]
+entries += [(f'texts/{t}.txt', converted[t].encode('utf-8')) for t in sorted(converted)]
+entries += [(f'pictures/{p}', open(os.path.join(extras, p), 'rb').read()) for p in pictures]
+header = ['CRX1'] + [f'F\t{len(d)}\t{p}' for p, d in entries]
+header += [f'P\tpictures/{s}\t{t}' for s, t in placements]
+blob = ('\n'.join(header) + '\n\n').encode('utf-8') + b''.join(d for _, d in entries)
+raw = os.path.join(work, 'extras.bin')
+open(raw, 'wb').write(blob)
+subprocess.run(['xz', '-9e', '-T1', '--check=crc64', '-kf', raw], check=True)
+os.replace(raw + '.xz', out)
+folders_count = sum(1 for l in index.split(b'\n') if l.startswith(b'A'))
+print(f'{len(pictures)} pictures, {len(converted)} texts of {len(texts)}, '
+ f'{folders_count} add-on folders, '
+ f'{sum(len(v) for v in brought.values())} items; {len(blob)} bytes, {os.path.getsize(out)} compressed')
diff --git a/addons/tools/pictures_manifest.py b/addons/tools/pictures_manifest.py
new file mode 100644
index 0000000..24b2206
--- /dev/null
+++ b/addons/tools/pictures_manifest.py
@@ -0,0 +1,87 @@
+"""Chooses where each add-on picture goes.
+
+usage: pictures_manifest.py EXTRAS_DIR REFS.tsv ITEMS.tsv CD_BITMAPS_DIR OUT_DIR
+
+EXTRAS_DIR the unzipped Comunidade-extras.zip
+REFS.tsv `cargo run -p cr-addons --example pictures -- Comunidade.xpx`
+ITEMS.tsv order, package, category, name, hash of every add-on item
+CD_BITMAPS_DIR the CD's BITMAPS folder, whose pictures are never replaced
+"""
+import collections, hashlib, os, sys
+
+extras, refs_tsv, items_tsv, cd, out = sys.argv[1:6]
+EVERMORE = ('official addons/', 'equipment/cr2-march-goodie/')
+
+def evermore(path):
+ p = path.lower()
+ return p.startswith(EVERMORE) or 'goodie' in p
+
+files = []
+for d, _, fs in os.walk(extras):
+ for f in fs:
+ rel = os.path.relpath(os.path.join(d, f), extras).replace(os.sep, '/')
+ if not evermore(rel):
+ files.append(rel)
+files.sort()
+bmps = [f for f in files if f.lower().endswith('.bmp')]
+digest = {b: hashlib.sha1(open(os.path.join(extras, b), 'rb').read()).hexdigest() for b in bmps}
+by_name = collections.defaultdict(list)
+for b in bmps:
+ by_name[b.rsplit('/', 1)[-1].lower()].append(b)
+
+cd_files = set()
+for d, _, fs in os.walk(cd):
+ for f in fs:
+ cd_files.add(('bitmaps/' + os.path.relpath(os.path.join(d, f), cd)).replace(os.sep, '/').lower())
+
+# The package each final item came from: the newest one that has it.
+winner = {}
+for line in open(items_tsv, encoding='utf-8'):
+ order, pkg, cat, name, _ = line.rstrip('\n').split('\t')
+ pkg = pkg.removeprefix('./')
+ key = (cat, name)
+ if key not in winner or int(order) >= winner[key][0]:
+ winner[key] = (int(order), pkg)
+
+def closeness(a, b):
+ a, b = a.lower().split('/')[:-1], b.lower().split('/')[:-1]
+ n = 0
+ while n < min(len(a), len(b)) and a[n] == b[n]:
+ n += 1
+ return n
+
+targets = collections.defaultdict(collections.Counter)
+spelling = {}
+unmatched = skipped_cd = 0
+for line in open(refs_tsv, encoding='utf-8'):
+ cat, name, stored, rel = line.rstrip('\n').split('\t')
+ cands = by_name.get(rel.rsplit('/', 1)[-1].lower())
+ if not cands:
+ unmatched += 1
+ continue
+ if rel.lower() in cd_files:
+ skipped_cd += 1
+ continue
+ pkg = winner.get((cat, name), (0, ''))[1]
+ best = max(cands, key=lambda c: (closeness(c, pkg), -cands.index(c)))
+ spelling.setdefault(rel.lower(), rel)
+ targets[rel.lower()][best] += 1
+
+placements, clashes = [], 0
+for rel, counter in sorted(targets.items()):
+ (src, _), *rest = counter.most_common()
+ if any(digest[s] != digest[src] for s, _ in rest):
+ clashes += 1
+ placements.append((src, spelling[rel]))
+
+os.makedirs(out, exist_ok=True)
+with open(os.path.join(out, 'placements.tsv'), 'w', encoding='utf-8') as f:
+ for src, rel in placements:
+ f.write(f'{src}\t{rel}\n')
+with open(os.path.join(out, 'files.txt'), 'w', encoding='utf-8') as f:
+ f.write('\n'.join(files) + '\n')
+used = {s for s, _ in placements}
+print(f'{len(files)} files, {len(bmps)} pictures, {len(used)} placed for records '
+ f'in {len(placements)} places, {len(bmps) - len(used)} only in UserBMP; '
+ f'{unmatched} references with no picture, {skipped_cd} to CD pictures, '
+ f'{clashes} places where different pictures share a name')
diff --git a/crates/cr-addons/examples/pictures.rs b/crates/cr-addons/examples/pictures.rs
new file mode 100644
index 0000000..5e294bb
--- /dev/null
+++ b/crates/cr-addons/examples/pictures.rs
@@ -0,0 +1,49 @@
+//! Lists the pictures the records of a package name, for building the
+//! add-ons' pictures: one line per record and picture,
+//! `CATEGORYNAMESTORED PATHPATH IN THE INSTALLATION`.
+
+use cr_formats::Object;
+use cr_formats::export::ExportFile;
+use cr_store::pictures::{Kind, joined, relative};
+
+fn main() {
+ let path = std::env::args().nth(1).expect("usage: pictures FILE.xpx");
+ let file = ExportFile::parse(&std::fs::read(path).unwrap()).unwrap();
+ let print = |category: &str, name: &str, stored: &str, kind: Kind| {
+ if let Some(rel) = relative(stored, kind) {
+ println!("{category}\t{name}\t{stored}\t{rel}");
+ }
+ };
+ for o in &file.monster_types {
+ if let Object::MonsterType(t) = o {
+ print("Monster Types", &t.name, &t.picture, Kind::Monster);
+ }
+ }
+ for o in &file.races {
+ if let Object::Race(r) = o {
+ print(
+ "Races",
+ &r.name,
+ &joined(&r.portrait_folder, &r.portrait),
+ Kind::Portrait,
+ );
+ for p in &r.portraits {
+ print(
+ "Races",
+ &r.name,
+ &joined(&r.portrait_folder, p),
+ Kind::Portrait,
+ );
+ }
+ }
+ }
+ for c in &file.characters {
+ let [folder, name] = &c.data.unknown_0x1db8;
+ print(
+ "Characters",
+ &c.data.name,
+ &joined(folder, name),
+ Kind::Portrait,
+ );
+ }
+}
diff --git a/crates/cr-addons/src/details.rs b/crates/cr-addons/src/details.rs
new file mode 100644
index 0000000..b004cef
--- /dev/null
+++ b/crates/cr-addons/src/details.rs
@@ -0,0 +1,286 @@
+//! The add-on details, shown on request: every add-on folder of the
+//! community's archive, what its packages brought into the collection and
+//! the texts that came with it.
+
+use adw::prelude::*;
+use cr_i18n::{tr, trn};
+use gtk::glib;
+
+use crate::extras::{self, Addon, Extras};
+
+/// Item names a category shows before the rest are only counted.
+const SHOWN: usize = 300;
+
+/// Opens the details over `parent`, unpacking the texts first.
+pub fn show(parent: &impl IsA) {
+ let nav = adw::NavigationView::new();
+ let spinner = gtk::Spinner::builder()
+ .spinning(true)
+ .width_request(32)
+ .height_request(32)
+ .halign(gtk::Align::Center)
+ .valign(gtk::Align::Center)
+ .vexpand(true)
+ .build();
+ nav.add(&page(tr("Add-on Details"), &spinner, None));
+ let dialog = adw::Dialog::builder()
+ .title(tr("Add-on Details"))
+ .content_width(640)
+ .content_height(640)
+ .child(&nav)
+ .build();
+ dialog.present(Some(parent));
+ glib::spawn_future_local(async move {
+ let result = gtk::gio::spawn_blocking(extras::get)
+ .await
+ .unwrap_or_else(|_| Err(tr("The built-in pictures are damaged.").to_string()));
+ match result {
+ Ok(extras) => nav.replace(&[list(extras, &nav)]),
+ Err(message) => {
+ let status = adw::StatusPage::builder()
+ .icon_name("dialog-error-symbolic")
+ .title(tr("The Details Could Not Be Read"))
+ .description(glib::markup_escape_text(&message))
+ .build();
+ nav.replace(&[page(tr("Add-on Details"), &status, None)]);
+ }
+ }
+ });
+}
+
+/// A page with a header bar over `content`, and a search bar when given.
+fn page(
+ title: &str,
+ content: &impl IsA,
+ search: Option<>k::SearchEntry>,
+) -> adw::NavigationPage {
+ let view = adw::ToolbarView::new();
+ view.add_top_bar(&adw::HeaderBar::new());
+ if let Some(search) = search {
+ let bar = adw::Clamp::builder()
+ .maximum_size(560)
+ .child(search)
+ .margin_start(12)
+ .margin_end(12)
+ .margin_bottom(6)
+ .build();
+ view.add_top_bar(&bar);
+ }
+ view.set_content(Some(content));
+ adw::NavigationPage::builder()
+ .title(title)
+ .child(&view)
+ .build()
+}
+
+fn scrolled(child: &impl IsA) -> gtk::ScrolledWindow {
+ gtk::ScrolledWindow::builder()
+ .hscrollbar_policy(gtk::PolicyType::Never)
+ .vexpand(true)
+ .child(child)
+ .build()
+}
+
+/// The add-on folders, with a search on their names.
+fn list(extras: &'static Extras, nav: &adw::NavigationView) -> adw::NavigationPage {
+ let addons: Vec = extras
+ .addons()
+ .into_iter()
+ .filter(|a| a.total() > 0 || !a.texts.is_empty())
+ .collect();
+ let rows = gtk::ListBox::builder()
+ .selection_mode(gtk::SelectionMode::None)
+ .css_classes(["boxed-list"])
+ .valign(gtk::Align::Start)
+ .build();
+ let addons = std::rc::Rc::new(addons);
+ for addon in addons.iter() {
+ let mut subtitle = vec![trn!(
+ "{count} item",
+ "{count} items",
+ addon.total() as u64,
+ count = crate::thousands(addon.total())
+ )];
+ if !addon.texts.is_empty() {
+ subtitle.push(trn!("{n} text", "{n} texts", addon.texts.len() as u64));
+ }
+ let parent = addon.folder.rsplit_once('/').map_or("", |(p, _)| p);
+ let row = adw::ActionRow::builder()
+ .title(glib::markup_escape_text(addon.name()))
+ .subtitle(glib::markup_escape_text(&if parent.is_empty() {
+ subtitle.join(" · ")
+ } else {
+ format!("{parent} · {}", subtitle.join(" · "))
+ }))
+ .activatable(true)
+ .build();
+ row.add_suffix(>k::Image::from_icon_name("go-next-symbolic"));
+ rows.append(&row);
+ }
+ rows.connect_row_activated({
+ let nav = nav.clone();
+ let addons = addons.clone();
+ move |_, row| {
+ if let Some(addon) = addons.get(row.index() as usize) {
+ nav.push(&addon_page(extras, addon, &nav));
+ }
+ }
+ });
+ let search = gtk::SearchEntry::builder()
+ .placeholder_text(tr("Search the add-ons"))
+ .hexpand(true)
+ .build();
+ rows.set_filter_func({
+ let search = search.clone();
+ let addons = addons.clone();
+ move |row| {
+ let text = search.text().to_lowercase();
+ text.is_empty()
+ || addons
+ .get(row.index() as usize)
+ .is_some_and(|a| a.folder.to_lowercase().contains(&text))
+ }
+ });
+ search.connect_search_changed({
+ let rows = rows.clone();
+ move |_| rows.invalidate_filter()
+ });
+ let intro = gtk::Label::builder()
+ .label(tr(
+ "Each add-on folder of the community's archive, what its packages brought into the \
+ collection and the texts its authors wrote. Most texts are in English.",
+ ))
+ .wrap(true)
+ .xalign(0.0)
+ .css_classes(["dim-label"])
+ .build();
+ let column = gtk::Box::builder()
+ .orientation(gtk::Orientation::Vertical)
+ .spacing(12)
+ .margin_top(6)
+ .margin_bottom(18)
+ .build();
+ column.append(&intro);
+ column.append(&rows);
+ let clamp = adw::Clamp::builder()
+ .maximum_size(560)
+ .margin_start(12)
+ .margin_end(12)
+ .child(&column)
+ .build();
+ page(tr("Add-on Details"), &scrolled(&clamp), Some(&search))
+}
+
+/// One add-on: its packages and items, then its texts.
+fn addon_page(
+ extras: &'static Extras,
+ addon: &Addon,
+ nav: &adw::NavigationView,
+) -> adw::NavigationPage {
+ let prefs = adw::PreferencesPage::new();
+ let heading = adw::PreferencesGroup::builder()
+ .title(glib::markup_escape_text(&addon.folder))
+ .build();
+ prefs.add(&heading);
+ if !addon.texts.is_empty() {
+ let group = adw::PreferencesGroup::builder().title(tr("Texts")).build();
+ for (path, name) in &addon.texts {
+ let row = adw::ActionRow::builder()
+ .title(glib::markup_escape_text(name))
+ .activatable(true)
+ .build();
+ row.add_suffix(>k::Image::from_icon_name("go-next-symbolic"));
+ row.connect_activated({
+ let nav = nav.clone();
+ let (path, name) = (path.clone(), name.clone());
+ move |_| nav.push(&text_page(&name, &extras.text(&path)))
+ });
+ group.add(&row);
+ }
+ prefs.add(&group);
+ }
+ for package in &addon.packages {
+ let file = package.path.rsplit('/').next().unwrap_or(&package.path);
+ let group = adw::PreferencesGroup::builder()
+ .title(glib::markup_escape_text(file))
+ .description(match (package.items.len(), package.total) {
+ (kept, total) if kept >= total => trn!(
+ "{count} item, all in the collection",
+ "{count} items, all in the collection",
+ kept as u64,
+ count = crate::thousands(kept)
+ ),
+ (0, total) => trn!(
+ "{n} item, which a newer add-on replaced",
+ "{n} items, which newer add-ons replaced",
+ total as u64
+ ),
+ (kept, total) => trn!(
+ "{n} item; {kept} are in the collection as written here",
+ "{n} items; {kept} are in the collection as written here",
+ total as u64,
+ kept
+ ),
+ })
+ .build();
+ let mut categories: Vec<(&str, Vec<&str>)> = Vec::new();
+ for (category, name) in &package.items {
+ match categories.iter_mut().find(|(c, _)| c == category) {
+ Some((_, names)) => names.push(name),
+ None => categories.push((category, vec![name])),
+ }
+ }
+ for (category, names) in categories {
+ let mut text = names
+ .iter()
+ .take(SHOWN)
+ .copied()
+ .collect::>()
+ .join(", ");
+ if names.len() > SHOWN {
+ text.push_str(", ");
+ text.push_str(&trn!(
+ "and {n} more",
+ "and {n} more",
+ (names.len() - SHOWN) as u64
+ ));
+ }
+ let row = adw::ExpanderRow::builder()
+ .title(glib::markup_escape_text(tr(category)))
+ .subtitle(names.len().to_string())
+ .build();
+ row.add_row(
+ >k::Label::builder()
+ .label(&text)
+ .wrap(true)
+ .wrap_mode(gtk::pango::WrapMode::WordChar)
+ .xalign(0.0)
+ .selectable(true)
+ .margin_top(12)
+ .margin_bottom(12)
+ .margin_start(12)
+ .margin_end(12)
+ .build(),
+ );
+ group.add(&row);
+ }
+ prefs.add(&group);
+ }
+ page(addon.name(), &prefs, None)
+}
+
+/// A text of an add-on, as its author wrote it.
+fn text_page(name: &str, text: &str) -> adw::NavigationPage {
+ let view = gtk::TextView::builder()
+ .editable(false)
+ .cursor_visible(false)
+ .monospace(true)
+ .wrap_mode(gtk::WrapMode::WordChar)
+ .top_margin(12)
+ .bottom_margin(12)
+ .left_margin(12)
+ .right_margin(12)
+ .build();
+ view.buffer().set_text(text);
+ page(name, &scrolled(&view), None)
+}
diff --git a/crates/cr-addons/src/extras.rs b/crates/cr-addons/src/extras.rs
new file mode 100644
index 0000000..9cc7112
--- /dev/null
+++ b/crates/cr-addons/src/extras.rs
@@ -0,0 +1,299 @@
+//! The add-ons' pictures and texts, built into the program beside the
+//! package: the pictures go where the records look for them, and the
+//! texts (the add-ons' readme files, as plain text) are shown on request.
+//!
+//! `addons/Comunidade-extras.xz` is, before xz, a text header and then the
+//! files' bytes in the header's order:
+//!
+//! ```text
+//! CRX1
+//! Fsizepath pictures/..., texts/....txt, addons.tsv
+//! Ppictureplace a picture's place in the installation
+//! (blank line)
+//! ```
+//!
+//! `addons.tsv` holds one block per add-on folder: `Afolder`, then
+//! `Kpackageitems in it` for each package, `Icategoryname`
+//! for the items it brought and `Ttextfile name` for its texts.
+
+use std::collections::HashMap;
+use std::fs;
+use std::io;
+use std::path::{Path, PathBuf};
+
+use cr_i18n::tr;
+use cr_store::Installation;
+
+static EXTRAS: &[u8] = include_bytes!("../../../addons/Comunidade-extras.xz");
+
+pub struct Extras {
+ data: Vec,
+ /// Each file's bytes in `data`, by its path.
+ files: HashMap,
+ /// Pictures in the order of the header.
+ pictures: Vec,
+ /// (picture, place in the installation).
+ placements: Vec<(String, String)>,
+}
+
+/// One add-on folder of the community's archive.
+#[derive(Debug, Default)]
+pub struct Addon {
+ pub folder: String,
+ pub packages: Vec,
+ /// (path in the extras, file name).
+ pub texts: Vec<(String, String)>,
+}
+
+#[derive(Debug, Default)]
+pub struct Package {
+ pub path: String,
+ /// Items in the package, before newer add-ons replaced some.
+ pub total: usize,
+ /// (category, name) of the items it brought.
+ pub items: Vec<(String, String)>,
+}
+
+impl Addon {
+ pub fn name(&self) -> &str {
+ self.folder.rsplit('/').next().unwrap_or(&self.folder)
+ }
+
+ /// Items in its packages.
+ pub fn total(&self) -> usize {
+ self.packages.iter().map(|p| p.total).sum()
+ }
+}
+
+/// The built-in pictures and texts, unpacked on first use.
+pub fn get() -> Result<&'static Extras, String> {
+ static EXTRAS: std::sync::OnceLock> = std::sync::OnceLock::new();
+ EXTRAS
+ .get_or_init(Extras::load)
+ .as_ref()
+ .map_err(Clone::clone)
+}
+
+impl Extras {
+ /// The built-in pictures and texts, unpacked.
+ fn load() -> Result {
+ let mut data = Vec::new();
+ lzma_rs::xz_decompress(&mut io::Cursor::new(EXTRAS), &mut data)
+ .map_err(|e| tr!("The built-in pictures are damaged: {e}", e))?;
+ Self::parse(data).ok_or_else(|| tr("The built-in pictures are damaged.").to_string())
+ }
+
+ fn parse(data: Vec) -> Option {
+ let end = data.windows(2).position(|w| w == b"\n\n")?;
+ let header = std::str::from_utf8(&data[..end]).ok()?;
+ let mut lines = header.lines();
+ if lines.next()? != "CRX1" {
+ return None;
+ }
+ let mut at = end + 2;
+ let (mut files, mut pictures, mut placements) = (HashMap::new(), Vec::new(), Vec::new());
+ for line in lines {
+ let mut fields = line.split('\t');
+ match (fields.next(), fields.next(), fields.next()) {
+ (Some("F"), Some(size), Some(path)) => {
+ let size: usize = size.parse().ok()?;
+ files.insert(path.to_owned(), (at, size));
+ if path.starts_with("pictures/") {
+ pictures.push(path.to_owned());
+ }
+ at += size;
+ }
+ (Some("P"), Some(picture), Some(place)) => {
+ placements.push((picture.to_owned(), place.to_owned()));
+ }
+ _ => return None,
+ }
+ }
+ (at <= data.len()).then_some(Self {
+ data,
+ files,
+ pictures,
+ placements,
+ })
+ }
+
+ pub fn file(&self, path: &str) -> Option<&[u8]> {
+ let &(at, size) = self.files.get(path)?;
+ self.data.get(at..at + size)
+ }
+
+ pub fn text(&self, path: &str) -> String {
+ self.file(path)
+ .map(|t| String::from_utf8_lossy(t).into_owned())
+ .unwrap_or_default()
+ }
+
+ /// The add-on folders, in the archive's order.
+ pub fn addons(&self) -> Vec {
+ let mut addons: Vec = Vec::new();
+ for line in self.text("addons.tsv").lines() {
+ let fields: Vec<&str> = line.split('\t').collect();
+ match fields[..] {
+ ["A", folder] => addons.push(Addon {
+ folder: folder.to_owned(),
+ ..Default::default()
+ }),
+ ["K", path, total] => {
+ if let Some(a) = addons.last_mut() {
+ a.packages.push(Package {
+ path: path.to_owned(),
+ total: total.parse().unwrap_or_default(),
+ items: Vec::new(),
+ });
+ }
+ }
+ ["I", category, name] => {
+ if let Some(p) = addons.last_mut().and_then(|a| a.packages.last_mut()) {
+ p.items.push((category.to_owned(), name.to_owned()));
+ }
+ }
+ ["T", path, name] => {
+ if let Some(a) = addons.last_mut() {
+ a.texts.push((path.to_owned(), name.to_owned()));
+ }
+ }
+ _ => {}
+ }
+ }
+ addons
+ }
+
+ /// Where each picture goes in `install`: the places the records name,
+ /// then every picture under `UserBMP/`, in its add-on's folder, where
+ /// the original's picture dialogs open. Inside Wine, a picture the
+ /// records look for elsewhere on drive C: (`C:\AD&D Pics`) goes there
+ /// too.
+ fn targets(&self, install: &Installation) -> Vec<(&str, PathBuf)> {
+ let root = install.root();
+ let drive_c = root
+ .ancestors()
+ .find(|a| a.file_name().is_some_and(|n| n == "drive_c"));
+ let mut out = Vec::new();
+ for (picture, place) in &self.placements {
+ out.push((picture.as_str(), join(root, place)));
+ if let (Some(c), Some(rest)) = (drive_c, place.strip_prefix("UserBMP/")) {
+ out.push((picture.as_str(), join(c, rest)));
+ }
+ }
+ for picture in &self.pictures {
+ let place = format!("UserBMP/{}", picture.trim_start_matches("pictures/"));
+ out.push((picture.as_str(), join(root, &place)));
+ }
+ out
+ }
+
+ /// Writes the pictures into `install`, never over a file that is
+ /// already there; returns the files written, for the log.
+ pub fn install_pictures(&self, install: &Installation) -> Result, String> {
+ let mut written = Vec::new();
+ for (picture, target) in self.targets(install) {
+ let Some(bytes) = self.file(picture) else {
+ continue;
+ };
+ let target = existing_case(&target);
+ if target.exists() {
+ continue;
+ }
+ let write = || -> io::Result<()> {
+ if let Some(dir) = target.parent() {
+ fs::create_dir_all(dir)?;
+ }
+ fs::write(&target, bytes)
+ };
+ write().map_err(|e| tr!("Could not write {file}: {e}", file = target.display(), e))?;
+ written.push(target);
+ }
+ Ok(written)
+ }
+}
+
+fn join(root: &Path, relative: &str) -> PathBuf {
+ relative.split('/').fold(root.to_owned(), |p, c| p.join(c))
+}
+
+/// `path`, with each part that is already there in another case spelled
+/// as it is on disk: the original's folders are `BITMAPS` on one
+/// computer and `Bitmaps` on the next, and its file names ignore case.
+fn existing_case(path: &Path) -> PathBuf {
+ let mut out = PathBuf::new();
+ for part in path.components() {
+ let next = out.join(part);
+ if next.exists() || out.as_os_str().is_empty() {
+ out = next;
+ continue;
+ }
+ let name = part.as_os_str().to_string_lossy();
+ let found = fs::read_dir(&out).ok().and_then(|entries| {
+ entries
+ .filter_map(|e| e.ok())
+ .find(|e| e.file_name().to_string_lossy().eq_ignore_ascii_case(&name))
+ .map(|e| e.path())
+ });
+ out = found.unwrap_or(next);
+ }
+ out
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn the_built_in_extras_read() {
+ let extras = get().unwrap();
+ let addons = extras.addons();
+ assert!(addons.len() > 250);
+ assert!(
+ addons
+ .iter()
+ .all(|a| !a.folder.starts_with("Official Addons"))
+ );
+ let udb = addons
+ .iter()
+ .find(|a| a.folder == "AD&D Core Rules User Database")
+ .unwrap();
+ assert!(udb.packages[0].items.len() > 30_000);
+ assert!(udb.total() >= udb.packages[0].items.len());
+ assert!(extras.pictures.len() > 600);
+ assert!(
+ extras
+ .pictures
+ .iter()
+ .all(|p| extras.file(p).is_some_and(|b| b.starts_with(b"BM")))
+ );
+ for (path, _) in addons.iter().flat_map(|a| &a.texts) {
+ assert!(extras.file(path).is_some(), "{path}");
+ }
+ }
+
+ #[test]
+ fn pictures_go_where_the_records_look() {
+ let data = b"CRX1\nF\t2\tpictures/M/a.bmp\nP\tpictures/M/a.bmp\tBitmaps/Monsters/A.bmp\n\
+ P\tpictures/M/a.bmp\tUserBMP/AD&D Pics/a.bmp\n\nBM"
+ .to_vec();
+ let extras = Extras::parse(data).unwrap();
+ let base = std::env::temp_dir().join(format!("cr-addons-pictures-{}", std::process::id()));
+ let root = base.join("drive_c/Program Files/AD&D Core Rules 2.0");
+ fs::create_dir_all(root.join("Database")).unwrap();
+ fs::create_dir_all(root.join("BITMAPS/MONSTERS")).unwrap();
+ let install = Installation::open(&root).unwrap();
+ let written = extras.install_pictures(&install).unwrap();
+ assert_eq!(
+ written,
+ [
+ root.join("BITMAPS/MONSTERS/A.bmp"),
+ root.join("UserBMP/AD&D Pics/a.bmp"),
+ base.join("drive_c/AD&D Pics/a.bmp"),
+ root.join("UserBMP/M/a.bmp"),
+ ]
+ );
+ // A second install leaves them as they are.
+ assert!(extras.install_pictures(&install).unwrap().is_empty());
+ fs::remove_dir_all(base).unwrap();
+ }
+}
diff --git a/crates/cr-addons/src/install.rs b/crates/cr-addons/src/install.rs
index a78beae..d299e36 100644
--- a/crates/cr-addons/src/install.rs
+++ b/crates/cr-addons/src/install.rs
@@ -76,6 +76,8 @@ pub fn backup(install: &Installation, stamp: &str) -> Result {
pub struct Outcome {
pub imported: usize,
pub characters: usize,
+ /// Pictures written by [`pictures`].
+ pub pictures: usize,
pub log: PathBuf,
}
@@ -109,10 +111,40 @@ pub fn import(install: &Installation, file: &ExportFile, stamp: &str) -> Result<
Ok(Outcome {
imported: report.imported.len(),
characters: report.characters.len(),
+ pictures: 0,
log: path,
})
}
+/// Writes the add-ons' pictures into `install`, beside nothing that is
+/// there already, and adds the files to the log.
+pub fn pictures(install: &Installation, outcome: &mut Outcome) -> Result<(), String> {
+ let written = crate::extras::get()?.install_pictures(install)?;
+ let mut log = String::from("=== pictures\n");
+ for file in &written {
+ let _ = writeln!(log, "wrote {}", file.display());
+ }
+ let mut file = fs::OpenOptions::new()
+ .append(true)
+ .open(&outcome.log)
+ .map_err(|e| {
+ tr!(
+ "Could not write {file}: {e}",
+ file = outcome.log.display(),
+ e
+ )
+ })?;
+ io::Write::write_all(&mut file, log.as_bytes()).map_err(|e| {
+ tr!(
+ "Could not write {file}: {e}",
+ file = outcome.log.display(),
+ e
+ )
+ })?;
+ outcome.pictures = written.len();
+ Ok(())
+}
+
/// The report in the words `cr import` prints.
fn write_report(out: &mut String, report: &ImportReport) {
for c in &report.imported {
@@ -166,9 +198,9 @@ mod tests {
let file = package().unwrap();
assert!(file.is_expansion());
let items = contents(&file);
- assert_eq!(items.len(), 36_716);
+ assert_eq!(items.len(), 36_525);
let characters = items.iter().filter(|c| c.category == Category::Character);
- assert_eq!(characters.count(), 105);
+ assert_eq!(characters.count(), 48);
}
#[test]
diff --git a/crates/cr-addons/src/main.rs b/crates/cr-addons/src/main.rs
index a352fb6..814aac8 100644
--- a/crates/cr-addons/src/main.rs
+++ b/crates/cr-addons/src/main.rs
@@ -3,6 +3,8 @@
//! folder. The window speaks the app's languages and follows the one chosen
//! in its Preferences; the add-ons themselves are in Portuguese.
+mod details;
+mod extras;
mod install;
mod locate;
@@ -96,9 +98,19 @@ impl Window {
actions.append(&install_button);
let other = gtk::Button::builder()
.label(tr("Other Folder…"))
- .halign(gtk::Align::Center)
.css_classes(["flat"])
.build();
+ let details = gtk::Button::builder()
+ .label(tr("Add-on Details…"))
+ .css_classes(["flat"])
+ .build();
+ details.connect_clicked(details::show);
+ let more = gtk::Box::builder()
+ .spacing(6)
+ .halign(gtk::Align::Center)
+ .build();
+ more.append(&other);
+ more.append(&details);
let form = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical)
.spacing(18)
@@ -106,17 +118,18 @@ impl Window {
form.append(&group);
form.append(¬ice);
form.append(&actions);
- form.append(&other);
+ form.append(&more);
let clamp = adw::Clamp::builder().maximum_size(480).child(&form).build();
let start = adw::StatusPage::builder()
.title(tr("Core Rules Community Add-ons Collection"))
.description(tr!(
- "The 686 add-ons the community made for AD&D Core Rules 2.0 and the \
+ "The {addons} add-ons the community made for AD&D Core Rules 2.0 and the \
Expansion, in one package: races, classes, kits, spells, monsters, \
equipment, encounters, the characters of the modules and the User \
- Database. {items} items in all.",
- items = thousands(36_716)
+ Database. {items} items in all, with the pictures that came with them.",
+ addons = 672,
+ items = thousands(36_525)
))
.child(&clamp)
.build();
@@ -463,7 +476,9 @@ impl Window {
let stamp = stamp.clone();
let outcome = gio::spawn_blocking(move || {
let file = install::package()?;
- install::import(&install, &file, &stamp)
+ let mut outcome = install::import(&install, &file, &stamp)?;
+ install::pictures(&install, &mut outcome)?;
+ Ok::<_, String>(outcome)
})
.await
.map_err(|_| tr("The import stopped with an unexpected error.").to_string())??;
@@ -511,6 +526,14 @@ impl Window {
backup
),
});
+ if outcome.pictures > 0 {
+ text.push(' ');
+ text.push_str(&trn!(
+ "{n} picture of the add-ons was copied there.",
+ "{n} pictures of the add-ons were copied there.",
+ outcome.pictures as u64
+ ));
+ }
text.push_str("\n\n");
}
text.push_str(tr(
diff --git a/crates/cr-formats/src/bmp.rs b/crates/cr-formats/src/bmp.rs
new file mode 100644
index 0000000..fa6b04b
--- /dev/null
+++ b/crates/cr-formats/src/bmp.rs
@@ -0,0 +1,142 @@
+//! Windows bitmaps (`.bmp`), the pictures of monster types, races and
+//! characters: decoded here so showing them does not depend on which
+//! image loaders the system has.
+//!
+//! Every picture of the CD and of the community add-ons is an
+//! uncompressed 8-bit bitmap with a `BITMAPINFOHEADER`; 1, 4, 24 and 32
+//! bits are read too. Compressed bitmaps are not.
+
+/// A decoded picture: rows from the top, 4 bytes (R, G, B, A) a pixel.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Image {
+ pub width: u32,
+ pub height: u32,
+ pub rgba: Vec,
+}
+
+/// Decodes a bitmap file; `None` when it is not one this reads.
+pub fn decode(data: &[u8]) -> Option {
+ let u16_at = |at: usize| Some(u16::from_le_bytes(data.get(at..at + 2)?.try_into().ok()?));
+ let u32_at = |at: usize| Some(u32::from_le_bytes(data.get(at..at + 4)?.try_into().ok()?));
+ if data.get(..2)? != b"BM" {
+ return None;
+ }
+ let offset = u32_at(10)? as usize;
+ let header = u32_at(14)? as usize;
+ if header < 40 {
+ return None;
+ }
+ let width = u32_at(18)? as i32;
+ let raw_height = u32_at(22)? as i32;
+ let bits = u16_at(28)?;
+ let compression = u32_at(30)?;
+ if width <= 0 || raw_height == 0 || compression != 0 || width > 16_384 {
+ return None;
+ }
+ let (width, height) = (width as usize, raw_height.unsigned_abs() as usize);
+ if height > 16_384 {
+ return None;
+ }
+ let palette: Vec<[u8; 3]> = if bits <= 8 {
+ let used = match u32_at(46)? {
+ 0 => 1 << bits,
+ n => n as usize,
+ };
+ (0..used.min(256))
+ .map(|i| {
+ let at = 14 + header + i * 4;
+ data.get(at..at + 3).map(|b| [b[2], b[1], b[0]])
+ })
+ .collect::