Skip to content

Bugfix/merchant bugs #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hacktier merged 31 commits into from
Apr 8, 2025
Merged

Bugfix/merchant bugs #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a887758
WIP
Hacktier Apr 7, 2025
b3e1763
colorized limitedUsage Cards
Hacktier Apr 7, 2025
9a55e78
changed font and adjusted positioning
Hacktier Apr 7, 2025
7e75836
changed line height
Hacktier Apr 7, 2025
efbdee7
Merge branch 'main' into feature/newCardsAndColors
Hacktier Apr 7, 2025
dbca124
added 12 bg images with change function
Hacktier Apr 7, 2025
7992007
optimized
Hacktier Apr 7, 2025
a33a7b8
Merge branch 'main' into improvement/bg-images
Hacktier Apr 7, 2025
5277768
removed custom css
Hacktier Apr 7, 2025
7199ab7
removed style tag
Hacktier Apr 7, 2025
94fdb26
balancing wip
Hacktier Apr 7, 2025
39f9cf3
fixed conflict
Hacktier Apr 7, 2025
721a5a4
started destroying asteroid field
Hacktier Apr 7, 2025
96944d2
started destroying asteroid field
Hacktier Apr 7, 2025
3faf74e
changed shipwreck event to spawn card
Hacktier Apr 7, 2025
eba5e85
filled distress signal card actions
Hacktier Apr 7, 2025
4550469
added action to radar
Hacktier Apr 7, 2025
cb3c324
only reveal events if there is something to reveal
Hacktier Apr 7, 2025
40b9e4f
added pages dir?
Hacktier Apr 7, 2025
218d7b6
evaluated if card is stacked
Hacktier Apr 7, 2025
c2ddb3c
updated startup board
Hacktier Apr 7, 2025
c131ac4
changed 3 imgs
Hacktier Apr 7, 2025
03c2348
added soundeffects
Hacktier Apr 8, 2025
02f3a1f
Update composables/actions/replace.ts
Hacktier Apr 8, 2025
9f8ff65
Merge branch 'main' into feature/sounds
Hacktier Apr 8, 2025
23e05da
Merge branch 'main' into feature/sounds
Hacktier Apr 8, 2025
3e1bf2f
repaired broken index after merge
Hacktier Apr 8, 2025
2f79fa5
adjusted baby volume
Hacktier Apr 8, 2025
2bf6016
adjusted cant buy trades problem
Hacktier Apr 8, 2025
7b8766d
fixed merchant trading
Hacktier Apr 8, 2025
7a02ae9
removed conflict
Hacktier Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/cards/fuel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"amount": 1,
"buyable": true,
"buyableMaxAmount": 10,
"price": 50,
"price": 100,
"interactions": [
{
"card": "fuel",
Expand Down
4 changes: 2 additions & 2 deletions content/cards/merchant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"type": "buy",
"card": "money",
"amount": 6
"amount": 60
},
{
"type": "destroyInteracting"
Expand All @@ -24,7 +24,7 @@
{
"type": "buy",
"card": "money",
"amount": 25
"amount": 75
},
{
"type": "destroyInteracting"
Expand Down
2 changes: 1 addition & 1 deletion content/cards/metal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"amount": 1,
"buyable": true,
"buyableMaxAmount": 10,
"price": 10,
"price": 65,
"interactions": [
{
"card": "metal",
Expand Down
2 changes: 1 addition & 1 deletion content/cards/radar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"icon": "mingcute:radar-2-line",
"type": "building",
"buyable": true,
"price": 350,
"price": 450,
"cooldown": 90,
"interactions": [
{
Expand Down
2 changes: 1 addition & 1 deletion pages/game.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ watchOnce(container, () => {
addPercentage('trade-link', 90, 50)

addPercentage('fuel', 45, 25, 3)
addPercentage('money', 50, 25, 400)
addPercentage('money', 50, 25, 800)
addPercentage('metal', 55, 25, 5)

addPercentage('flux-generator', 50, 80)
Expand Down