From a88775813550a90c3756e9b14e84db97b6c9513e Mon Sep 17 00:00:00 2001 From: Markus Kapp Date: Mon, 7 Apr 2025 13:34:11 +0200 Subject: [PATCH 01/25] WIP --- content/cards/hyperdrive.json | 32 +++++++++++++++++++++-------- content/cards/hyperdriveBroken.json | 7 ------- content/cards/navCom.json | 6 ------ content/cards/navComBroken.json | 7 ------- content/cards/radar.json | 8 ++++++++ content/cards/radarBroken.json | 7 +++++++ content/cards/rocket.json | 30 +++++++++++++++++++++++++++ content/cards/rocketBroken.json | 7 +++++++ 8 files changed, 76 insertions(+), 28 deletions(-) delete mode 100644 content/cards/hyperdriveBroken.json delete mode 100644 content/cards/navCom.json delete mode 100644 content/cards/navComBroken.json create mode 100644 content/cards/radar.json create mode 100644 content/cards/radarBroken.json create mode 100644 content/cards/rocket.json create mode 100644 content/cards/rocketBroken.json diff --git a/content/cards/hyperdrive.json b/content/cards/hyperdrive.json index cc9dbb0..d502244 100644 --- a/content/cards/hyperdrive.json +++ b/content/cards/hyperdrive.json @@ -3,26 +3,42 @@ "label": "Hyperdrive", "icon": "game-icons:hypersonic-bolt", "type": "building", - "container": "fuel", - "containerMax": 10, + "buyable": true, + "price": 200, "interactions": [ { - "card": "fuel", + "card": "worker", "time": 5, "actions": [ { - "type": "fill" + "type": "travel" + }, + { + "type": "destroy" } ] }, { - "card": "worker", - "time": 10, - "infinite": true, - "consumeContainer": true, + "card": "helmsman", + "time": 3, "actions": [ { "type": "travel" + }, + { + "type": "destroy" + } + ] + }, + { + "card": "helmsman-instructor", + "time": 3, + "actions": [ + { + "type": "travel" + }, + { + "type": "destroy" } ] } diff --git a/content/cards/hyperdriveBroken.json b/content/cards/hyperdriveBroken.json deleted file mode 100644 index 32efef1..0000000 --- a/content/cards/hyperdriveBroken.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "identifier": "hyperdrive-broken", - "label": "Broken Hyperdrive", - "icon": "game-icons:hypersonic-bolt", - "iconColor": "red", - "type": "building" -} diff --git a/content/cards/navCom.json b/content/cards/navCom.json deleted file mode 100644 index fed1109..0000000 --- a/content/cards/navCom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "identifier": "navcom", - "label": "NavCom", - "icon": "carbon:navaid-ndb-dme", - "type": "building" -} diff --git a/content/cards/navComBroken.json b/content/cards/navComBroken.json deleted file mode 100644 index a0eab48..0000000 --- a/content/cards/navComBroken.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "identifier": "navcom-broken", - "label": "Broken NavCom", - "icon": "carbon:navaid-ndb-dme", - "iconColor": "red", - "type": "building" -} diff --git a/content/cards/radar.json b/content/cards/radar.json new file mode 100644 index 0000000..d78ef8c --- /dev/null +++ b/content/cards/radar.json @@ -0,0 +1,8 @@ +{ + "identifier": "radar", + "label": "Radar", + "icon": "mingcute:radar-2-line", + "type": "building", + "buyable": true, + "price": 350 +} diff --git a/content/cards/radarBroken.json b/content/cards/radarBroken.json new file mode 100644 index 0000000..2657ac2 --- /dev/null +++ b/content/cards/radarBroken.json @@ -0,0 +1,7 @@ +{ + "identifier": "radar-broken", + "label": "Broken Radar", + "icon": "mingcute:radar-2-line", + "iconColor": "red", + "type": "building" +} diff --git a/content/cards/rocket.json b/content/cards/rocket.json new file mode 100644 index 0000000..abac824 --- /dev/null +++ b/content/cards/rocket.json @@ -0,0 +1,30 @@ +{ + "identifier": "rocket", + "label": "Rocket", + "icon": "material-symbols:rocket-launch", + "type": "building", + "container": "fuel", + "containerMax": 10, + "interactions": [ + { + "card": "fuel", + "time": 5, + "actions": [ + { + "type": "fill" + } + ] + }, + { + "card": "worker", + "time": 10, + "infinite": true, + "consumeContainer": true, + "actions": [ + { + "type": "travel" + } + ] + } + ] +} diff --git a/content/cards/rocketBroken.json b/content/cards/rocketBroken.json new file mode 100644 index 0000000..c0c5324 --- /dev/null +++ b/content/cards/rocketBroken.json @@ -0,0 +1,7 @@ +{ + "identifier": "rocket-broken", + "label": "Broken Rocket", + "icon": "material-symbols:rocket-launch", + "iconColor": "red", + "type": "building" +} From b3e1763c50fab4e8efdee07f2a87a5c570821d37 Mon Sep 17 00:00:00 2001 From: Markus Kapp Date: Mon, 7 Apr 2025 13:43:30 +0200 Subject: [PATCH 02/25] colorized limitedUsage Cards --- components/Object/Card/Visual/ObjectCardVisualDefault.vue | 2 ++ content.config.ts | 2 +- content/cards/brainrot.json | 2 +- content/cards/fire-extinguisher.json | 2 +- content/cards/hyperdrive.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/Object/Card/Visual/ObjectCardVisualDefault.vue b/components/Object/Card/Visual/ObjectCardVisualDefault.vue index 76f5b5a..d8fab4e 100644 --- a/components/Object/Card/Visual/ObjectCardVisualDefault.vue +++ b/components/Object/Card/Visual/ObjectCardVisualDefault.vue @@ -17,6 +17,7 @@ const styleCardHeader = computed(() => { merchant: 'bg-amber-400', building: 'bg-[#D6A77A]', event: 'bg-green-400', + limitedUsage: 'bg-purple-400', }[props.boardCard.card.type as string] ?? 'bg-stone-200' }) @@ -28,6 +29,7 @@ const styleCardBody = computed(() => { merchant: 'bg-amber-200', building: 'bg-[#F3D9B1]', event: 'bg-green-200', + limitedUsage: 'bg-purple-200', }[props.boardCard.card.type as string] ?? 'bg-stone-100' }) diff --git a/content.config.ts b/content.config.ts index 70f8810..61f9b37 100644 --- a/content.config.ts +++ b/content.config.ts @@ -27,7 +27,7 @@ export default defineContentConfig({ iconColor: z.string().optional().default('#000000'), health: z.number().gte(0).lte(20).optional(), amount: z.number().gte(0).optional(), - type: z.enum(['person', 'resource', 'building', 'merchant', 'enemy', 'event']), + type: z.enum(['person', 'resource', 'building', 'merchant', 'enemy', 'event', 'limitedUsage']), strength: z.number().gte(0).optional(), buyable: z.boolean().default(false), buyableMaxAmount: z.number().gte(1).default(1), diff --git a/content/cards/brainrot.json b/content/cards/brainrot.json index 1fc5a74..a6aef66 100644 --- a/content/cards/brainrot.json +++ b/content/cards/brainrot.json @@ -2,7 +2,7 @@ "identifier": "brainrot", "label": "Brainrot", "icon": "mdi:brain", - "type": "event", + "type": "limitedUsage", "buyable": true, "buyableMaxAmount": 3, "price": 40 diff --git a/content/cards/fire-extinguisher.json b/content/cards/fire-extinguisher.json index bdaa5ac..0df7598 100644 --- a/content/cards/fire-extinguisher.json +++ b/content/cards/fire-extinguisher.json @@ -2,7 +2,7 @@ "identifier": "fire-extinguisher", "label": "Fire Extinguisher", "icon": "material-symbols:fire-extinguisher-outline", - "type": "tool", + "type": "limitedUsage", "health": 3, "buyable": true, "buyableMaxAmount": 1, diff --git a/content/cards/hyperdrive.json b/content/cards/hyperdrive.json index d502244..64ee2a1 100644 --- a/content/cards/hyperdrive.json +++ b/content/cards/hyperdrive.json @@ -2,7 +2,7 @@ "identifier": "hyperdrive", "label": "Hyperdrive", "icon": "game-icons:hypersonic-bolt", - "type": "building", + "type": "limitedUsage", "buyable": true, "price": 200, "interactions": [ From 9a55e789e9ab72b24e79f692f165b338396701e3 Mon Sep 17 00:00:00 2001 From: Markus Kapp Date: Mon, 7 Apr 2025 14:35:35 +0200 Subject: [PATCH 03/25] changed font and adjusted positioning --- assets/css/main.css | 4 ++++ .../Object/Card/Visual/ObjectCardVisualDefault.vue | 14 ++++++++------ .../Object/Card/Visual/ObjectCardVisualTrade.vue | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 9d88692..5ddb0ac 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,2 +1,6 @@ @import 'tailwindcss'; @import "@nuxt/ui"; + +.card-font { + font-family: "Itim", monospace; +} diff --git a/components/Object/Card/Visual/ObjectCardVisualDefault.vue b/components/Object/Card/Visual/ObjectCardVisualDefault.vue index d8fab4e..e790fc7 100644 --- a/components/Object/Card/Visual/ObjectCardVisualDefault.vue +++ b/components/Object/Card/Visual/ObjectCardVisualDefault.vue @@ -12,7 +12,7 @@ const maxWidth = 70 - 16 const styleCardHeader = computed(() => { return { person: 'bg-sky-400', - resource: 'bg-zinc-400', + resource: 'bg-zinc-500', enemy: 'bg-red-500', merchant: 'bg-amber-400', building: 'bg-[#D6A77A]', @@ -24,7 +24,7 @@ const styleCardHeader = computed(() => { const styleCardBody = computed(() => { return { person: 'bg-sky-200', - resource: 'bg-zinc-200', + resource: 'bg-zinc-300', enemy: 'bg-red-300', merchant: 'bg-amber-200', building: 'bg-[#F3D9B1]', @@ -45,17 +45,18 @@ onMounted(() => {