Skip to content
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.

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

Dusky Client Improvements #268

Merged
merged 57 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
6762a5f
Basic version of better prescience
edisontim Jul 13, 2024
a4a0c32
Better better prescience
cwastche Jul 14, 2024
9bc7c87
introduce multiple path sorted by biggest health
edisontim Jul 14, 2024
91a5644
Fix health + gold after encounter
cwastche Jul 14, 2024
dcaf854
update potions correctly
edisontim Jul 26, 2024
539022e
remove hp
edisontim Aug 14, 2024
dbf96f1
Merge branch 'main' into feat/better-prescience
edisontim Aug 14, 2024
2c859d1
Merge branch 'main' into feat/better-prescience
edisontim Aug 30, 2024
1248e31
Fix rebase
edisontim Aug 31, 2024
2ae9717
Merge branch 'main' of github.com:edisontim/loot-survivor into feat/b…
edisontim Sep 4, 2024
a4fd5e8
Push for prod
edisontim Sep 4, 2024
c6f0be2
Merge pull request #1 from edisontim/feat/better-prescience
edisontim Sep 4, 2024
0b287cd
switch to mainnet
edisontim Sep 4, 2024
56f0e16
switch to mainnet
edisontim Sep 6, 2024
4f55191
Merge branch 'Provable-Games:main' into main
edisontim Sep 6, 2024
48e2dea
add .env for mainnet
edisontim Sep 6, 2024
82dd71e
blue client
edisontim Sep 6, 2024
e42b41b
change revenue address
edisontim Sep 6, 2024
1bdf643
Fix styling + prescience
edisontim Sep 6, 2024
c8f2b4c
fix build
edisontim Sep 6, 2024
5b07ddd
Merge pull request #2 from edisontim/fix/prescience-in-battle
cwastche Sep 6, 2024
d957df9
fix prescience combat outcomes
edisontim Sep 6, 2024
53c991c
Add info to shop, add close prescience button to draggable
cwastche Sep 7, 2024
d56fd96
Merge branch 'main' into enh/ui-qol
cwastche Sep 7, 2024
acbbb5d
lint
cwastche Sep 7, 2024
6a12e68
Add potion cost for next lvl
cwastche Sep 7, 2024
7a8549d
Move path component to new file
cwastche Sep 7, 2024
958bd7d
Change item Discovery name to tier
cwastche Sep 7, 2024
6de2d7e
Merge pull request #3 from edisontim/enh/ui-qol
edisontim Sep 7, 2024
1663190
Fix vscode auto lint
cwastche Sep 7, 2024
e9c3a60
Merge pull request #10 from edisontim/fix/vscode-lint
cwastche Sep 7, 2024
50aa9cb
Decouple Paths component from the EncounterTable
cwastche Sep 7, 2024
39601be
fix build
cwastche Sep 7, 2024
c468099
Merge pull request #12 from edisontim/enh/path-component
edisontim Sep 7, 2024
9eb5874
Merge branch 'Provable-Games:main' into main
edisontim Sep 10, 2024
5b1e604
Merge branch 'Provable-Games:main' into main
edisontim Sep 10, 2024
9cd53db
Merge branch 'Provable-Games:main' into main
edisontim Sep 10, 2024
95f64d2
fix payment
cwastche Sep 10, 2024
8ceb9d8
Merge pull request #16 from edisontim/fix/starknet-dev
cwastche Sep 10, 2024
b41664e
log battle beast attacks
cwastche Sep 11, 2024
9456212
remove console
cwastche Sep 11, 2024
52e1f85
Takes potions into account in final gold calculation
cwastche Sep 12, 2024
9e639a2
add loot encounter type
cwastche Sep 12, 2024
a3ded5d
Fix buy without equiping
cwastche Sep 12, 2024
60dacbc
Fix gold when buying w/o equipping
cwastche Sep 12, 2024
9c9c104
Merge pull request #19 from edisontim/ui-fixes
cwastche Sep 12, 2024
b01746f
Merge pull request #18 from edisontim/fix/potion-cost
cwastche Sep 12, 2024
7a32a2f
updates
starknetdev Sep 12, 2024
04ca87b
Merge branch 'main' into review-dusky
starknetdev Sep 12, 2024
4e12c34
remove tournament screen on testnet
starknetdev Sep 12, 2024
4e3f31b
- improve prescience styles
starknetdev Sep 12, 2024
1a86f59
improve styles of prescience draggable
starknetdev Sep 12, 2024
81a210c
fix styles
starknetdev Sep 13, 2024
b526ba6
improve styles
starknetdev Sep 13, 2024
cc7842c
change flee naming
starknetdev Sep 13, 2024
159d61a
- revert colors
starknetdev Sep 13, 2024
7f03cb6
fix removing purchase for upgrade bug
starknetdev Sep 13, 2024
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ keys
account
ls1.5.pem

.env
katana.log
scripts/katana/katana/
.snfoundry_cache/.prev_tests_failed
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"editor.wordWrap": "on",
"cairo1.enableLanguageServer": true,
"cairo1.enableScarb": true,
"cairo1.languageServerPath": "/Users/os/.asdf/shims/scarb-cairo-language-server"
"cairo1.languageServerPath": "/Users/os/.asdf/shims/scarb-cairo-language-server",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
}
}
1 change: 1 addition & 0 deletions ui/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NEXT_PUBLIC_NETWORK="mainnet"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't commit the .env file to version control.

It's generally considered a security risk to include the .env file in version control, as it often contains sensitive information like API keys or secrets.

Instead, add the .env file to your .gitignore to exclude it from version control, and provide a .env.example file with dummy values as a template for other developers to use.

3 changes: 0 additions & 3 deletions ui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# env files
.env*

# vercel
.vercel

Expand Down
2 changes: 1 addition & 1 deletion ui/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"editor.formatOnSave": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
}
4 changes: 4 additions & 0 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"@cartridge/connector": "^0.3.44",
"@dojoengine/create-burner": "^1.0.0-alpha.9",
"@fontsource/vt323": "^4.5.10",
"@scure/starknet": "^1.0.0",
"@starknet-react/chains": "^0.1.7",
"@starknet-react/core": "^2.9.0",
"@svgr/webpack": "^7.0.0",
"@types/js-cookie": "^3.0.3",
Expand All @@ -37,6 +39,7 @@
"react": "18.2.0",
"react-countup": "^6.4.2",
"react-dom": "18.2.0",
"react-draggable": "^4.4.6",
"react-icons": "^4.8.0",
"react-responsive": "^9.0.2",
"react-transition-group": "^4.4.5",
Expand All @@ -49,6 +52,7 @@
"typescript": "5.0.2",
"use-previous": "^1.2.0",
"use-sound": "^4.0.1",
"zod": "^3.23.8",
"zustand": "^4.3.7"
},
"devDependencies": {
Expand Down
Loading
Loading