diff --git a/.github/workflows/addons.yml b/.github/workflows/addons.yml index 83c365b..8c1c414 100644 --- a/.github/workflows/addons.yml +++ b/.github/workflows/addons.yml @@ -1,9 +1,10 @@ name: Addons package -# Builds the add-ons installer, one AppImage with the add-ons inside -# (crates/cr-addons), and, on main or by hand, publishes it on GitHub -# Packages as the OCI artifact ghcr.io//corerules-addons, tagged with -# the app version and latest. +# Builds Core Rules Community Add-ons Collection, one self-installing +# AppImage with the add-ons inside (crates/cr-addons), and, on main or by +# hand, publishes it on GitHub Packages as the OCI artifact +# ghcr.io//corerules-community-addons, tagged with the app version +# and latest. on: push: branches: [main] @@ -43,9 +44,9 @@ jobs: - name: Check the AppImage run: | cd target/AppDir - test -x usr/bin/corerules-addons + test -x usr/bin/corerules-community-addons test -f usr/share/icons/hicolor/256x256/apps/io.github.brahm.CoreRules.Addons.png - ls -l "$GITHUB_WORKSPACE"/dist/CoreRules-Addons-*.AppImage + ls -l "$GITHUB_WORKSPACE"/dist/CoreRules-Community-Addons-*.AppImage - if: github.event_name != 'pull_request' uses: oras-project/setup-oras@v1 - if: github.event_name != 'pull_request' @@ -55,9 +56,9 @@ jobs: owner=$(echo "$GITHUB_REPOSITORY_OWNER" | tr '[:upper:]' '[:lower:]') echo "${{ secrets.GITHUB_TOKEN }}" | oras login ghcr.io -u "${{ github.actor }}" --password-stdin cd dist - oras push "ghcr.io/$owner/corerules-addons:$version,latest" \ + oras push "ghcr.io/$owner/corerules-community-addons:$version,latest" \ --artifact-type application/vnd.corerules.addons \ --annotation "org.opencontainers.image.source=https://github.com/${GITHUB_REPOSITORY}" \ - --annotation "org.opencontainers.image.description=Instalador dos addons da comunidade para o Core Rules Expansion" \ + --annotation "org.opencontainers.image.description=Core Rules Community Add-ons Collection: 686 community add-ons for AD&D Core Rules 2.0 Expansion, in one self-installing AppImage" \ --annotation "org.opencontainers.image.version=$version" \ - "CoreRules-Addons-$version-x86_64.AppImage:application/vnd.appimage" + "CoreRules-Community-Addons-$version-x86_64.AppImage:application/vnd.appimage" diff --git a/README.md b/README.md index 10887ce..54c9afc 100644 --- a/README.md +++ b/README.md @@ -181,19 +181,17 @@ content: keep it for your own use and do not redistribute it. ## Community add-ons -[`addons/`](addons/README.md) holds 686 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 one file. They ship as a -self-installing app, a single AppImage with the add-ons inside +The [Core Rules Community Add-ons Collection](addons/README.md) gathers 686 +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 (`crates/cr-addons`, GTK 4 and libadwaita), published on GitHub Packages as -[`corerules-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-addons); -it needs the app 0.7.2 or newer. The installer finds the app on its own, -whether it came as the Flatpak, the .deb or .rpm package or an AppImage, and -installs into the data folder that copy reads; it speaks the app's six -languages and follows the one chosen in its Preferences. The [guide](addons/README.md), which says -how to download and use it, and the [report](addons/relatorio.md) are in -Portuguese. +[`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, +whether it came as the Flatpak, the .deb or .rpm package or an AppImage, +and speaks the app's six languages. Its [README](addons/README.md) says +what is inside, how it was built and how to install it. ## Testing against your own installation @@ -214,7 +212,7 @@ CORERULES_DIR="$HOME/.wine/drive_c/Program Files/AD&D Core Rules 2.0" cargo test | `cr-cli` | `cr` command for inspecting data | | `cr-i18n` | Translations of the interface (`po/*.po`, built into the program) | | `cr-gtk` | The GNOME app | -| `cr-addons` | The community add-ons installer, with the add-ons built in | +| `cr-addons` | Core Rules Community Add-ons Collection, the add-ons and their installer | The backend crates have no GTK dependency so macOS and Windows front ends can reuse them later. diff --git a/addons/GUIA.md b/addons/GUIA.md new file mode 100644 index 0000000..e0ec534 --- /dev/null +++ b/addons/GUIA.md @@ -0,0 +1,92 @@ +# 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. + +Mapas do Map Maker II e desenhos do Campaign Mapper não fazem parte do pacote, porque o app não trata desses programas. + +## O instalador + +Os addons são distribuídos num único arquivo, `CoreRules-Community-Addons-VERSÃO-x86_64.AppImage`. Ele é um programa com janela que leva os addons dentro dele e os instala no Core Rules, sem script nem outros arquivos. + +O que é preciso: + +* Linux x86-64 com glibc 2.43 ou mais nova (Fedora 44, Ubuntu 26.04 ou mais novos). +* O app Core Rules 0.7.2 ou mais novo, da [página de releases](https://github.com/brahm/corerules/releases). Até a versão 0.7.1 o app não lia parte destes addons: classes com habilidades por nível (`CClassFreeSpellsOb`) e o que a Expansion com patch grava. +* Os dados da sua Expansion no app. Se ainda não tiver, abra o Core Rules e use **Extrair dados do CD…** no menu. + +## Onde baixar + +O instalador é publicado no GitHub Packages do projeto, como [`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons). É um artefato OCI, e não uma imagem de contêiner: o `docker pull` que a página do GitHub mostra não serve. Baixe com o [ORAS](https://oras.land): + +```sh +oras pull ghcr.io/brahm/corerules-community-addons:latest +``` + +Ou só com `curl`: + +```sh +repo=brahm/corerules-community-addons +token=$(curl -s "https://ghcr.io/token?scope=repository:$repo:pull" | sed 's/.*"token":"\([^"]*\)".*/\1/') +layer=$(curl -s -H "Authorization: Bearer $token" \ + -H "Accept: application/vnd.oci.image.manifest.v1+json" \ + "https://ghcr.io/v2/$repo/manifests/latest" | + grep -o '"digest":"sha256:[0-9a-f]*"' | tail -n 1 | cut -d'"' -f4) +curl -L -H "Authorization: Bearer $token" -o CoreRules-Community-Addons-x86_64.AppImage \ + "https://ghcr.io/v2/$repo/blobs/$layer" +``` + +Além de `latest`, cada versão do app tem a sua tag, como `0.7.2`. + +## Instalação + +1. Torne o arquivo executável e abra-o: + + ```sh + chmod +x CoreRules-Community-Addons-*-x86_64.AppImage + ./CoreRules-Community-Addons-*-x86_64.AppImage + ``` + + Sem FUSE, rode com `APPIMAGE_EXTRACT_AND_RUN=1`. + +2. A janela procura o Core Rules sozinha e mostra cada cópia que achou, com a pasta de dados que ela lê: + + | Como o app foi instalado | Pasta de dados | + | --- | --- | + | Flatpak | `~/.var/app/io.github.brahm.CoreRules/data/corerules/data` | + | 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` | + + 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. + +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. + +## O que o instalador faz + +1. Confere se cada pasta é uma instalação da Expansion. Quando duas cópias do app leem a mesma pasta, ela recebe os addons uma vez só. +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. + +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. + +Instalar de novo não duplica os personagens. Se a pasta estiver dentro de um prefixo do Wine, o instalador pede confirmação antes de mexer. O programa original do CD também lê os addons, mas o Import dele leva cerca de 35 minutos. + +## 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: + +```sh +cd ~/.local/share/corerules +rm -rf data/UserDbas data/Chars +cp -r data-before-addons-DATA/UserDbas data-before-addons-DATA/Chars data/ +``` + +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. diff --git a/addons/README.md b/addons/README.md index 341100d..6bfdcc1 100644 --- a/addons/README.md +++ b/addons/README.md @@ -1,92 +1,154 @@ -# Addons da comunidade para o Core Rules Expansion - -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 [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. - -## O instalador - -Os addons são distribuídos num único arquivo, `CoreRules-Addons-VERSÃO-x86_64.AppImage`. Ele é um programa com janela que leva os addons dentro dele e os instala no Core Rules, sem script nem outros arquivos. - -O que é preciso: - -* Linux x86-64 com glibc 2.43 ou mais nova (Fedora 44, Ubuntu 26.04 ou mais novos). -* O app Core Rules 0.7.2 ou mais novo, da [página de releases](https://github.com/brahm/corerules/releases). Até a versão 0.7.1 o app não lia parte destes addons: classes com habilidades por nível (`CClassFreeSpellsOb`) e o que a Expansion com patch grava. -* Os dados da sua Expansion no app. Se ainda não tiver, abra o Core Rules e use **Extrair dados do CD…** no menu. - -## Onde baixar - -O instalador é publicado no GitHub Packages do projeto, como [`corerules-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-addons). É um artefato OCI, e não uma imagem de contêiner: o `docker pull` que a página do GitHub mostra não serve. Baixe com o [ORAS](https://oras.land): - -```sh -oras pull ghcr.io/brahm/corerules-addons:latest -``` - -Ou só com `curl`: - -```sh -repo=brahm/corerules-addons -token=$(curl -s "https://ghcr.io/token?scope=repository:$repo:pull" | sed 's/.*"token":"\([^"]*\)".*/\1/') -layer=$(curl -s -H "Authorization: Bearer $token" \ - -H "Accept: application/vnd.oci.image.manifest.v1+json" \ - "https://ghcr.io/v2/$repo/manifests/latest" | - grep -o '"digest":"sha256:[0-9a-f]*"' | tail -n 1 | cut -d'"' -f4) -curl -L -H "Authorization: Bearer $token" -o CoreRules-Addons-x86_64.AppImage \ - "https://ghcr.io/v2/$repo/blobs/$layer" -``` - -Além de `latest`, cada versão do app tem a sua tag, como `0.7.2`. - -## Instalação - -1. Torne o arquivo executável e abra-o: - - ```sh - chmod +x CoreRules-Addons-*-x86_64.AppImage - ./CoreRules-Addons-*-x86_64.AppImage - ``` - - Sem FUSE, rode com `APPIMAGE_EXTRACT_AND_RUN=1`. - -2. A janela procura o Core Rules sozinha e mostra cada cópia que achou, com a pasta de dados que ela lê: - - | Como o app foi instalado | Pasta de dados | - | --- | --- | - | Flatpak | `~/.var/app/io.github.brahm.CoreRules/data/corerules/data` | - | 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` | - - 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. - -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. - -## O que o instalador faz - -1. Confere se cada pasta é uma instalação da Expansion. Quando duas cópias do app leem a mesma pasta, ela recebe os addons uma vez só. -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. - -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. - -Instalar de novo não duplica os personagens. Se a pasta estiver dentro de um prefixo do Wine, o instalador pede confirmação antes de mexer. O programa original do CD também lê os addons, mas o Import dele leva cerca de 35 minutos. - -## 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: +

+ Core Rules Community Add-ons Collection icon +

+ +# Core Rules Community Add-ons Collection + +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 +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. + +> 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 installer finds three copies of Core Rules and the two data folders they read](screenshots/installer.png) + +## What's inside + +Every item is in the Expansion's own format, so it opens in the app and in +the original program alike. + +| Kind | Items | +| --- | ---: | +| 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 | +| Armor | 752 | +| Races | 515 | +| Classes | 558 | +| Kits | 477 | +| Racial and class abilities | 5,456 | +| Nonweapon proficiencies | 1,804 | +| Languages | 672 | +| Encounters and encounter templates | 674 | +| 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 | +| 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. + +

+ The Anti-Paladin, one of the add-on classes + A psionic beholder among the add-on monsters +

+ +![A character from the modules, the Avatar of Bahgtru](screenshots/character.png) + +## Installing + +The collection is a single AppImage, `CoreRules-Community-Addons-VERSION-x86_64.AppImage`, +that carries the add-ons inside and installs them itself. It needs: + +* Linux x86-64 with glibc 2.43 or newer (Fedora 44, Ubuntu 26.04 or newer) +* [Core Rules](https://github.com/brahm/corerules/releases) 0.7.2 or newer, + as the Flatpak, the .deb or .rpm package or the AppImage +* Your Expansion data in the app; if it is not there yet, open Core Rules + and use **Extract Data from CD…** + +It is published on GitHub Packages as +[`corerules-community-addons`](https://github.com/brahm/corerules/pkgs/container/corerules-community-addons), +an OCI artifact rather than a container image, so `docker pull` does not +apply. Download it with [ORAS](https://oras.land): ```sh -cd ~/.local/share/corerules -rm -rf data/UserDbas data/Chars -cp -r data-before-addons-DATA/UserDbas data-before-addons-DATA/Chars data/ +oras pull ghcr.io/brahm/corerules-community-addons:latest +chmod +x CoreRules-Community-Addons-*-x86_64.AppImage +./CoreRules-Community-Addons-*-x86_64.AppImage ``` -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. +The [Portuguese guide](GUIA.md) also shows how to download it with +`curl` alone, and how to undo an install. + +The window looks for Core Rules on its own and lists every copy it finds +with the data folder that copy reads: + +| How the app was installed | Data folder | +| --- | --- | +| Flatpak | `~/.var/app/io.github.brahm.CoreRules/data/corerules/data` | +| .deb or .rpm package | `~/.local/share/corerules/data` | +| AppImage in Downloads, Applications, Desktop, `~/.local/bin`, `/opt` or the home folder | `~/.local/share/corerules/data` | + +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. + +![The add-ons installed in both folders](screenshots/installed.png) + +The installer speaks the app's six languages (English, Português (Brasil), +Español, Italiano, Français and Deutsch) and follows the one chosen in +Core Rules' Preferences, or the system's. + +The installer in Brazilian Portuguese + +## How it was built + +**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 +byte by this project's reader, and the doubtful ones were imported into the +original Expansion program under Wine. + +**Converting and repairing.** 90 packages, made with the Expansion after +patches 3 to 5, were refused by the CD's program. Their classes lost the +spell point objects the CD's version does not know, and the User +Database's kits were rewritten in the older kit format. A spell package +damaged by a text-mode transfer had its line endings and lengths restored, +and 103 kits were recovered from a truncated archive. One package held only +a web installer and could not be used. Map Maker II maps and Campaign +Mapper drawings were left out, since the app does not handle those +programs. + +**Consolidating.** The packages were imported into a clean Expansion +installation from oldest to newest, the User Database last, and exported +as one file, `Comunidade.xpx`. Where a name appears in more than one +add-on, the newest version wins, as in the original Import; the +[report](relatorio.md) lists every conflict and every package's status. + +**Checking in the app.** After an install, every add-on record was opened, +edited and saved with the app's own editors and read back, and none +failed. + +**Packaging.** The consolidated file is compressed with xz and built into +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 +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`. + +## Files + +| File | Contents | +| --- | --- | +| `Comunidade.xpx.xz` | The consolidated add-ons, as built into the installer | +| [`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 | +| [`GUIA.md`](GUIA.md) | The install guide, in Portuguese | + +The add-ons belong to their authors in the Core Rules community. diff --git a/addons/relatorio.md b/addons/relatorio.md index 0248161..a5b7d36 100644 --- a/addons/relatorio.md +++ b/addons/relatorio.md @@ -1,8 +1,8 @@ -# Addons da comunidade para o Core Rules Expansion +# 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 instalador, que leva o `Comunidade.xpx` dentro dele, e como usá-lo estão no [README.md](README.md). Junto deste relatório: +O instalador, que leva o `Comunidade.xpx` dentro dele, e como usá-lo estão no [GUIA.md](GUIA.md). Junto deste relatório: | arquivo | conteúdo | |---|---| diff --git a/addons/screenshots/character.png b/addons/screenshots/character.png new file mode 100644 index 0000000..59e7720 Binary files /dev/null and b/addons/screenshots/character.png differ diff --git a/addons/screenshots/class.png b/addons/screenshots/class.png new file mode 100644 index 0000000..3b3c46b Binary files /dev/null and b/addons/screenshots/class.png differ diff --git a/addons/screenshots/installed.png b/addons/screenshots/installed.png new file mode 100644 index 0000000..4a22152 Binary files /dev/null and b/addons/screenshots/installed.png differ diff --git a/addons/screenshots/installer.png b/addons/screenshots/installer.png new file mode 100644 index 0000000..d46fab8 Binary files /dev/null and b/addons/screenshots/installer.png differ diff --git a/addons/screenshots/monster.png b/addons/screenshots/monster.png new file mode 100644 index 0000000..47f807a Binary files /dev/null and b/addons/screenshots/monster.png differ diff --git a/addons/screenshots/portuguese.png b/addons/screenshots/portuguese.png new file mode 100644 index 0000000..e523c4f Binary files /dev/null and b/addons/screenshots/portuguese.png differ diff --git a/crates/cr-addons/Cargo.toml b/crates/cr-addons/Cargo.toml index 66216da..a869f45 100644 --- a/crates/cr-addons/Cargo.toml +++ b/crates/cr-addons/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cr-addons" -description = "Installer of the community add-ons for Core Rules" +description = "Core Rules Community Add-ons Collection, the self-installing add-ons" version.workspace = true edition.workspace = true license.workspace = true @@ -8,7 +8,7 @@ repository.workspace = true rust-version.workspace = true [[bin]] -name = "corerules-addons" +name = "corerules-community-addons" path = "src/main.rs" [dependencies] diff --git a/crates/cr-addons/src/locate.rs b/crates/cr-addons/src/locate.rs index ac163b5..d8f056c 100644 --- a/crates/cr-addons/src/locate.rs +++ b/crates/cr-addons/src/locate.rs @@ -237,7 +237,8 @@ fn app(kind: Kind, version: Option, data: &Path, wine: &Path) -> App { } /// `CoreRules-0.8.0-x86_64.AppImage` files, newest version first; the -/// installer's own (`CoreRules-Addons-…`) is not one. +/// add-ons' own (`CoreRules-Community-Addons-…`, or `CoreRules-Addons-…` +/// before) are not. fn appimages(places: &Places) -> Vec { let mut found: Vec = Vec::new(); for dir in &places.appimage_dirs { @@ -248,7 +249,7 @@ fn appimages(places: &Places) -> Vec { let name = entry.file_name().to_string_lossy().to_string(); let lower = name.to_lowercase(); if lower.starts_with("corerules") - && !lower.starts_with("corerules-addons") + && !lower.contains("addons") && lower.ends_with(".appimage") && entry.path().is_file() { @@ -437,6 +438,10 @@ mod tests { fake.file("home/Downloads/CoreRules-0.7.2-x86_64.AppImage", ""); fake.file("home/Applications/CoreRules-0.8.0-x86_64.AppImage", ""); fake.file("home/Downloads/CoreRules-Addons-0.8.0-x86_64.AppImage", ""); + fake.file( + "home/Downloads/CoreRules-Community-Addons-0.8.1-x86_64.AppImage", + "", + ); fake.data("home/.local/share/corerules/data"); let found = apps(&fake.places()); let versions: Vec<_> = found.iter().map(|a| a.version.clone().unwrap()).collect(); diff --git a/crates/cr-addons/src/main.rs b/crates/cr-addons/src/main.rs index 0354344..a352fb6 100644 --- a/crates/cr-addons/src/main.rs +++ b/crates/cr-addons/src/main.rs @@ -1,4 +1,4 @@ -//! The community add-ons installer: one window that imports the +//! Core Rules Community Add-ons Collection: one window that imports the //! consolidated add-ons, built into the program, into the Core Rules data //! folder. The window speaks the app's languages and follows the one chosen //! in its Preferences; the add-ons themselves are in Portuguese. @@ -58,7 +58,7 @@ impl Window { fn new(app: &adw::Application) -> Self { let window = adw::ApplicationWindow::builder() .application(app) - .title(tr("Community Add-ons")) + .title(tr("Core Rules Community Add-ons Collection")) .default_width(560) .default_height(680) .width_request(360) @@ -110,7 +110,7 @@ impl Window { let clamp = adw::Clamp::builder().maximum_size(480).child(&form).build(); let start = adw::StatusPage::builder() - .title(tr("Community Add-ons")) + .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 \ Expansion, in one package: races, classes, kits, spells, monsters, \ diff --git a/crates/cr-i18n/po/corerules.pot b/crates/cr-i18n/po/corerules.pot index 1dfcbe9..d0acf03 100644 --- a/crates/cr-i18n/po/corerules.pot +++ b/crates/cr-i18n/po/corerules.pot @@ -43,7 +43,7 @@ msgstr "" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" +msgid "Core Rules Community Add-ons Collection" msgstr "" #: crates/cr-addons/src/main.rs:69 diff --git a/crates/cr-i18n/po/de.po b/crates/cr-i18n/po/de.po index cf3afcb..56908e2 100644 --- a/crates/cr-i18n/po/de.po +++ b/crates/cr-i18n/po/de.po @@ -43,8 +43,8 @@ msgstr "AppImage in {folder}" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" -msgstr "Add-ons der Community" +msgid "Core Rules Community Add-ons Collection" +msgstr "Community-Add-on-Sammlung für Core Rules" #: crates/cr-addons/src/main.rs:69 msgid "Core Rules on This Computer" diff --git a/crates/cr-i18n/po/es.po b/crates/cr-i18n/po/es.po index bfe7d5e..f0b13d6 100644 --- a/crates/cr-i18n/po/es.po +++ b/crates/cr-i18n/po/es.po @@ -43,8 +43,8 @@ msgstr "AppImage en {folder}" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" -msgstr "Add-ons de la comunidad" +msgid "Core Rules Community Add-ons Collection" +msgstr "Colección de add-ons de la comunidad de Core Rules" #: crates/cr-addons/src/main.rs:69 msgid "Core Rules on This Computer" diff --git a/crates/cr-i18n/po/fr.po b/crates/cr-i18n/po/fr.po index 727364f..d27784f 100644 --- a/crates/cr-i18n/po/fr.po +++ b/crates/cr-i18n/po/fr.po @@ -43,8 +43,8 @@ msgstr "AppImage dans {folder}" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" -msgstr "Add-ons de la communauté" +msgid "Core Rules Community Add-ons Collection" +msgstr "Collection d’add-ons de la communauté Core Rules" #: crates/cr-addons/src/main.rs:69 msgid "Core Rules on This Computer" diff --git a/crates/cr-i18n/po/it.po b/crates/cr-i18n/po/it.po index 2d00410..9a6e3bd 100644 --- a/crates/cr-i18n/po/it.po +++ b/crates/cr-i18n/po/it.po @@ -43,8 +43,8 @@ msgstr "AppImage in {folder}" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" -msgstr "Add-on della comunità" +msgid "Core Rules Community Add-ons Collection" +msgstr "Raccolta di add-on della comunità di Core Rules" #: crates/cr-addons/src/main.rs:69 msgid "Core Rules on This Computer" diff --git a/crates/cr-i18n/po/pt_BR.po b/crates/cr-i18n/po/pt_BR.po index 4b6d1a8..76b5826 100644 --- a/crates/cr-i18n/po/pt_BR.po +++ b/crates/cr-i18n/po/pt_BR.po @@ -43,8 +43,8 @@ msgstr "AppImage em {folder}" #: crates/cr-addons/src/main.rs:61 #: crates/cr-addons/src/main.rs:113 -msgid "Community Add-ons" -msgstr "Addons da comunidade" +msgid "Core Rules Community Add-ons Collection" +msgstr "Coleção de addons da comunidade do Core Rules" #: crates/cr-addons/src/main.rs:69 msgid "Core Rules on This Computer" diff --git a/data/addons/io.github.brahm.CoreRules.Addons.desktop b/data/addons/io.github.brahm.CoreRules.Addons.desktop index e5284e6..bb76f43 100644 --- a/data/addons/io.github.brahm.CoreRules.Addons.desktop +++ b/data/addons/io.github.brahm.CoreRules.Addons.desktop @@ -1,17 +1,17 @@ [Desktop Entry] -Name=Core Rules Add-ons -Name[pt_BR]=Addons do Core Rules -Name[es]=Add-ons de Core Rules -Name[it]=Add-on di Core Rules -Name[fr]=Add-ons de Core Rules -Name[de]=Core-Rules-Add-ons +Name=Core Rules Community Add-ons Collection +Name[pt_BR]=Coleção de addons da comunidade do Core Rules +Name[es]=Colección de add-ons de la comunidad de Core Rules +Name[it]=Raccolta di add-on della comunità di Core Rules +Name[fr]=Collection d’add-ons de la communauté Core Rules +Name[de]=Community-Add-on-Sammlung für Core Rules Comment=Install the community add-ons into Core Rules Comment[pt_BR]=Instale os addons da comunidade no Core Rules Comment[es]=Instale los add-ons de la comunidad en Core Rules Comment[it]=Installa gli add-on della comunità in Core Rules Comment[fr]=Installez les add-ons de la communauté dans Core Rules Comment[de]=Installieren Sie die Add-ons der Community in Core Rules -Exec=corerules-addons +Exec=corerules-community-addons Icon=io.github.brahm.CoreRules.Addons Terminal=false Type=Application diff --git a/packaging/appimage/build.sh b/packaging/appimage/build.sh index 3221e61..269dd26 100755 --- a/packaging/appimage/build.sh +++ b/packaging/appimage/build.sh @@ -2,7 +2,8 @@ # Builds dist/CoreRules-VERSION-ARCH.AppImage from target/release with # linuxdeploy and its GTK plugin, which bundle GTK 4, libadwaita and their # data from the system it runs on. `build.sh VERSION addons` builds the -# add-ons installer instead, dist/CoreRules-Addons-VERSION-ARCH.AppImage. +# Community Add-ons Collection instead, +# dist/CoreRules-Community-Addons-VERSION-ARCH.AppImage. # Releases run it inside the GNOME 51 SDK (build-in-sdk.sh), so the # AppImage carries that platform's libraries and runs on systems with the # SDK's glibc or newer. @@ -11,7 +12,7 @@ version=$1 arch=$(uname -m) case ${2:-app} in app) app=io.github.brahm.CoreRules exe=corerules name=CoreRules ;; - addons) app=io.github.brahm.CoreRules.Addons exe=corerules-addons name=CoreRules-Addons ;; + addons) app=io.github.brahm.CoreRules.Addons exe=corerules-community-addons name=CoreRules-Community-Addons ;; *) echo "$0: unknown target $2" >&2; exit 2 ;; esac tools=${TOOLS_DIR:-$PWD/target/appimage-tools}