Skip to content

Commit

Permalink
Merge branch '262-remove-rulestext' of github.com:DecentralCardGame/f…
Browse files Browse the repository at this point in the history
…rontend into 262-remove-rulestext-from-card-model
  • Loading branch information
lxgr-linux committed Jun 29, 2024
2 parents 1ffaec6 + 346b924 commit 14cfcb6
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/components/elements/CardComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25654,8 +25654,8 @@

<script lang="ts">
import * as R from "ramda";
import {Card} from "@/model/Card";
import {useCardsRules} from "@/def-composables/useCardRules";
import { Card } from "@/model/Card";
import { useCardsRules } from "@/def-composables/useCardRules";

export default {
name: "CardComponent",
Expand All @@ -25678,7 +25678,7 @@ export default {
},
},
setup() {
const {rules} = useCardsRules();
const { rules } = useCardsRules();

return {
cardRules: rules,
Expand Down Expand Up @@ -25788,8 +25788,8 @@ export default {
};
cardType[tempType] = true;

let frameType = R.mergeAll(cardClass, {HQ: false, MultiClass: false});
let colorType = R.mergeAll(cardClass, {MultiClass: false});
let frameType = R.mergeAll(cardClass, { HQ: false, MultiClass: false });
let colorType = R.mergeAll(cardClass, { MultiClass: false });

if (R.countBy((x) => x === true)(R.values(this.model.Class)).true > 1) {
frameType = {
Expand Down Expand Up @@ -25898,9 +25898,9 @@ export default {
} else {
console.error(
"Invalid card type. Must be one of the following: " +
R.values(R.pluck("name", this.$cardRules.children)) +
". Instead is: " +
type,
R.values(R.pluck("name", this.$cardRules.children)) +
". Instead is: " +
type,
);
}
}
Expand Down Expand Up @@ -26087,8 +26087,8 @@ export default {
let additionalCostText = [];

let abc = R.concat(additionalCostText, this.model.RulesTexts);
console.log(this.model.RulesTexts)
return abc
console.log(this.model.RulesTexts);
return abc;
},
textToSvg(text) {
if (!text) return text;
Expand Down

0 comments on commit 14cfcb6

Please sign in to comment.