Skip to content

Commit

Permalink
Merge branch 'master' into devnet
Browse files Browse the repository at this point in the history
  • Loading branch information
lxgr-linux committed Nov 29, 2023
2 parents ac7b155 + 518da0c commit 5802d41
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]
workflow_dispatch:
env:
# Setting an environment variable with the value of a configuration variable
tag_name: ${{
contains(github.event.pull_request.labels.*.name, 'deploy_5173') && 'deploy_5173' ||
(contains(github.event.pull_request.labels.*.name, 'deploy_5174') && 'deploy_5175' || "")
}}


jobs:
run_pull:
if: ${{ env.tag_name != "" }}
name: run pull
runs-on: ubuntu-latest

steps:
- name: install ssh keys
# check this thread to understand why its needed:
# https://stackoverflow.com/a/70447517
run: |
echo env.tag_name
install -m 600 -D /dev/null ~/.ssh/id_rsa
echo "${{ secrets.LXGR_DEPLOY_PRIV }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.LXGR_HOST }} > ~/.ssh/known_hosts
- name: connect and pull
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$tag_name && git fetch && git checkout ${{ github.event.pull_request.base.ref }} && git pull && npm i && exit"
- name: cleanup
run: rm -rf ~/.ssh
16 changes: 16 additions & 0 deletions src/views/CardCreatorPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,21 @@ export default {
}
}
// if an ability was created, but it has no effect, then this should be fixed
if (newModel.Abilities.length > 0) {
let effectsList = R.flatten(R.map(
x => R.values(R.pluck("Effects", x)),
newModel.Abilities))
if (R.any(y => y === undefined, effectsList)) {
this.notifyFail(
"Useless Ability",
"Card has an Ability, which does not do anything. Please add an Effect to the Ability."
);
return;
}
}
// check if the old Keywords and RulesTexts should be restored
let checkZeroAmount = () => {
return (this.model.AdditionalCost.SacrificeCost && this.model.AdditionalCost.SacrificeCost.Amount == 0) ||
Expand All @@ -1211,6 +1226,7 @@ export default {
newModel.image = this.model.image
newModel.balanceAnchor = this.model.balanceAnchor
// many characters will not make it into the blockchain, so here we check if all is valid ASCII
let checkASCII = (string, origin) => {
string.split('').forEach(char => {
if (!isASCII(char)) {
Expand Down

0 comments on commit 5802d41

Please sign in to comment.