Skip to content

Commit

Permalink
Merge branch 'master' into starforged-dataforged-npm-moves
Browse files Browse the repository at this point in the history
  • Loading branch information
MichelleHeihin committed Oct 27, 2023
2 parents f61ba42 + 94538f2 commit 6091b05
Show file tree
Hide file tree
Showing 679 changed files with 97,362 additions and 34,991 deletions.
68 changes: 68 additions & 0 deletions .github/workflows/handle-sheet-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Processes and uploads sheet changes

on:
push:
branches:
- staging
- master

env:
NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

jobs:
deployment:
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/master'
environment: ${{ github.ref_name == 'master' && 'production' || 'staging' }}
runs-on: ubuntu-latest
env:
CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
# Set job outputs to values from filter step
outputs:
sheet: ${{ steps.filter.outputs.sheet }}
sheet-json: ${{ steps.filter.outputs.sheet_files }}
steps:
- uses: actions/checkout@v3
- uses: dorny/paths-filter@v2
id: filter
with:
# Enable listing of files matching each filter.
# Paths to files will be available in `${FILTER_NAME}_files` output variable.
# Paths will be escaped and space-delimited.
# Output is usable as command-line argument list in Linux shell
list-files: shell
filters: |
sheet:
- added|modified: '*/sheet.json'
- id: 'auth'
if: steps.filter.outputs.sheet == 'true'
uses: 'google-github-actions/auth@v1'
with:
credentials_json: '${{ secrets.SHEET_HTTP_GCP_KEYFILE }}'
- name: 'Set up Cloud SDK'
if: steps.filter.outputs.sheet == 'true'
uses: 'google-github-actions/setup-gcloud@v1'

- name: 'Use gcloud CLI'
if: steps.filter.outputs.sheet == 'true'
run: 'gcloud info'
- uses: oven-sh/setup-bun@v1
if: steps.filter.outputs.sheet == 'true'

- run: bun install
if: steps.filter.outputs.sheet == 'true'
working-directory: contrib/sheet-pixie

# Handles when sheets have been updated individually
- run: bun run contrib/sheet-pixie/index.ts ${{ steps.filter.outputs.sheet_files }}
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: find ${{ env.DEST_DIR }} -maxdepth 1 -type d -exec sh -c 'cp -R --verbose "$(basename "{}")/translations" "{}/"' 2>/dev/null \;
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }} gs://roll20-cdn/${{ env.CDN_SHEETS_FOLDER }} --cache-control='no-cache' --recursive
if: steps.filter.outputs.sheet == 'true'
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
43 changes: 43 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Forces-updates all sheets

on:
push:
tags:
- 'v*'

env:
NPM_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}

jobs:
deployment:
environment: production
runs-on: ubuntu-latest
env:
CDN_SHEETS_FOLDER: ${{ vars.CDN_SHEETS_FOLDER }}
steps:
- uses: actions/checkout@v3

- id: 'auth'
uses: 'google-github-actions/auth@v1'
with:
credentials_json: '${{ secrets.SHEET_HTTP_GCP_KEYFILE }}'
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'

- name: 'Use gcloud CLI'
run: 'gcloud info'
- uses: oven-sh/setup-bun@v1

- run: bun install
working-directory: contrib/sheet-pixie

# Handles when a force-update has been requested (meaning all sheets will be re-built and deployed)
- run: make all
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: find ${{ env.DEST_DIR }} -maxdepth 1 -type d -exec sh -c 'cp -R --verbose "$(basename "{}")/translations" "{}/"' 2>/dev/null \;
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
- run: gcloud storage rsync --project=roll20-actual ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }} gs://roll20-cdn/${{ env.CDN_SHEETS_FOLDER }} --delete-unmatched-destination-objects --cache-control='no-cache' --recursive
env:
DEST_DIR: ${{ runner.temp }}/${{ env.CDN_SHEETS_FOLDER }}
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build/Release

# Dependency directories
node_modules/
!Shadowrun6th-German/node_modules
!Shadowrun6th-German/node_modules/jake/Makefile
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
Expand Down Expand Up @@ -84,7 +86,6 @@ out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
Expand Down Expand Up @@ -144,3 +145,9 @@ Icon
Network Trash Folder
Temporary Items
.apdisk

sync_sheets.sh

**/*/dist/*.html
**/*/dist/*.css
**/*/dist/*.json
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 18.17.0
12 changes: 12 additions & 0 deletions 3DX/3dx.css
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,10 @@ label, input, button, select, textarea {
height: 100%;
width: 1rem;
}
.Proficiencias_Pontos_Totais {
align-items: center;
display: flex;
}

.Inventory__Wrap {
align-items: center;
Expand Down Expand Up @@ -699,6 +703,14 @@ label, input, button, select, textarea {
padding-bottom: 0px;
}

#suminput {
background-color: transparent;
border: none;
padding-bottom: 0.4rem;
padding-left: 0.3rem;
text-align: left;
}

.Rolagens__Wrap {
align-items: center;
display: flex;
Expand Down
89 changes: 46 additions & 43 deletions 3DX/3dx.html
Original file line number Diff line number Diff line change
Expand Up @@ -227,27 +227,27 @@
</div>
<div class="Proficiencias__Column ProficienciasNivel">
<label for="nivel" class="Proficiencias__Label OpenSans" id="subtitle">NÍVEL</label>
<input type="text" name="attr_nv1" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv2" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv3" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv4" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv5" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv6" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv7" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv8" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv9" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv10" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv11" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv12" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv13" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv14" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv15" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv16" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv17" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv18" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv19" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv20" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv21" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv1" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv2" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv3" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv4" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv5" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv6" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv7" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv8" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv9" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv10" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv11" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv12" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv13" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv14" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv15" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv16" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv17" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv18" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv19" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv20" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv21" size="1" class="Proficiencias__Input OpenSans" value="0">
</div>
<div class="Proficiencias__Column ProficienciasNome">
<label for="nome" class="Proficiencias__Label OpenSans" id="subtitle">NOME</label>
Expand Down Expand Up @@ -302,30 +302,33 @@
</div>
<div class="Proficiencias__Column ProficienciasNivel">
<label for="nivel" class="Proficiencias__Label OpenSans Hidden" id="subtitle">NÍVEL</label>
<input type="text" name="attr_nv22" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv23" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv24" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv25" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv26" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv27" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv28" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv29" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv30" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv31" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv32" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv33" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv34" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv35" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv36" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv37" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv38" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv39" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv40" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv41" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv42" size="1" class="Proficiencias__Input OpenSans">
<input type="text" name="attr_nv22" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv23" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv24" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv25" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv26" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv27" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv28" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv29" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv30" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv31" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv32" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv33" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv34" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv35" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv36" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv37" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv38" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv39" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv40" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv41" size="1" class="Proficiencias__Input OpenSans" value="0">
<input type="text" name="attr_nv42" size="1" class="Proficiencias__Input OpenSans" value="0">
</div>
<div class="Proficiencias__Column ProficienciasNome Proficiencias__Column--Right">
<label for="nome" class="Proficiencias__Label OpenSans Hidden" id="subtitle">NOME</label>
<div class="Proficiencias_Pontos_Totais">
<label for="nivel" class="Proficiencias__Label OpenSans" id="subtitle">PONTOS: </label>
<input type="number" name="attr_nvsoma" size="1" value="(@{nv1})+(@{nv2})+(@{nv3})+(@{nv4})+(@{nv5})+(@{nv6})+(@{nv7})+(@{nv8})+(@{nv9})+(@{nv10})+(@{nv11})+(@{nv12})+(@{nv13})+(@{nv14})+(@{nv15})+(@{nv16})+(@{nv17})+(@{nv18})+(@{nv19})+(@{nv20})+(@{nv21})+(@{nv22})+(@{nv23})+(@{nv24})+(@{nv25})+(@{nv26})+(@{nv27})+(@{nv28})+(@{nv29})+(@{nv30})+(@{nv31})+(@{nv32})+(@{nv33})+(@{nv34})+(@{nv35})+(@{nv36})+(@{nv37})+(@{nv38})+(@{nv39})+(@{nv40})+(@{nv41})+(@{nv42})" disabled="true" class="Resource__Input OpenSans" id="suminput">
</div>
<input type="text" name="attr_proficiencia22" size="1" class="Proficiencias__Input OpenSans LeftAlign">
<input type="text" name="attr_proficiencia23" size="1" class="Proficiencias__Input OpenSans LeftAlign">
<input type="text" name="attr_proficiencia24" size="1" class="Proficiencias__Input OpenSans LeftAlign">
Expand Down
5 changes: 3 additions & 2 deletions 5eShaped/sheet.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"compendium": "dnd5e",
"instructions": "This sheet is designed for use with D&D 5th edition. It has been designed to match the layout of the D&D 5e Character Sheet.",
"patreon": "https://www.patreon.com/mlenser",
"legacy": true
}
"legacy": true,
"version": "1695962898"
}
1 change: 1 addition & 0 deletions APOCALYPSE FRAME/apocalypse-frame.css

Large diffs are not rendered by default.

646 changes: 646 additions & 0 deletions APOCALYPSE FRAME/apocalypse-frame.html

Large diffs are not rendered by default.

Binary file added APOCALYPSE FRAME/preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions APOCALYPSE FRAME/sheet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"html":"apocalypse-frame.html","css":"apocalypse-frame.css","authors":"Bill Garrett <[email protected]>; Binary Star <[email protected]>","roll20userid":"118980","preview":"preview.png","instructions":"**APOCALYPSE FRAME Sheet**\n\nMade by Astral Frontier, with some help by Binary Star Games, for [APOCALYPSE FRAME](https://binarystar.games/apocalypse-frame-itch-r/)!\n\n**Autofilling**: \n\n- Just put in your favorite Frame and it'll auto-populate! It has data for all non-Advanced Frames in the core book.\n- Likewise with Armaments and Systems, just start typing. (Do Frame first though, it populates defaults.)\n- Maximum resources will be set automatically when you set Attributes. Current resources are dependent on the number of boxes checked.\n- If you add more tags to the listing, it'll display them as well.\n\n**Reference**: \n\nA quick cheat sheet for most of the core player rules is on the second tab!","legacy":false}
5 changes: 3 additions & 2 deletions AgainstTheDarkMaster/sheet.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"roll20userid": "111814",
"preview": "AgainstTheDarkMaster.png",
"instructions": "Esta hoja de personaje ha sido diseñada para uso en partidas de Against The Dark Master, el juego de rol publicado por Other Selves.",
"legacy": true
}
"legacy": true,
"version": "1695979152"
}
2 changes: 1 addition & 1 deletion Ars_Magica_5th/translations/pb.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"abilities": "Abilities",
"magic": "Magic",
"combat": "Combat",
"spells": "Spells",
"spells": "Grimório",
"simple": "Simple",
"stress": "Stress",
"roll": "Roll",
Expand Down
Loading

0 comments on commit 6091b05

Please sign in to comment.