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

Feat/adventurer mart #303

Open
wants to merge 155 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
9a6f09f
improvements
starknetdev Feb 25, 2023
7e1e985
add health to gui
starknetdev Feb 25, 2023
d4b9ad3
gui work
starknetdev Feb 27, 2023
956fac5
fix your gold text color
starknetdev Feb 27, 2023
4a05f35
fix market items
starknetdev Feb 27, 2023
90da905
handling invoke outputs
starknetdev Feb 28, 2023
07ac30e
continue gui
starknetdev Feb 28, 2023
1e7d688
add equipped items display
starknetdev Feb 28, 2023
d382c52
items now receive special names as part of greatness leveling
loothero Mar 1, 2023
e57c639
Current PR:
starknetdev Mar 1, 2023
b7fd9df
Merge branch 'main' into feat/adventurer-mart
starknetdev Mar 1, 2023
53f49b3
fixes
starknetdev Mar 2, 2023
70d44a1
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Mar 2, 2023
8ce5764
mini fix in startup.sh
starknetdev Mar 2, 2023
5f38db8
added running gui stetup in readme
starknetdev Mar 2, 2023
1b8dcc0
run as root in devontainer
loothero Mar 3, 2023
fb9a93e
deploy update
ponderingdemocritus Mar 3, 2023
ca447b4
Adds option to kill the king
loothero Mar 3, 2023
4ff1961
Switch from claiming throne to looting the throne
loothero Mar 3, 2023
e7f3247
fixes
starknetdev Mar 3, 2023
6a17945
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Mar 3, 2023
43a40d3
mini fixes
starknetdev Mar 3, 2023
f76299d
deploy script, and interface id
ponderingdemocritus Mar 3, 2023
ad28f2c
merge
ponderingdemocritus Mar 3, 2023
830b13e
deploy scripts
ponderingdemocritus Mar 4, 2023
a4c3d77
Merge branch 'main' into feat/adventurer-mart
ponderingdemocritus Mar 4, 2023
9892862
redeploy new gamestate, update script
ponderingdemocritus Mar 4, 2023
a08b13e
thief spelling
starknetdev Mar 6, 2023
d1de7e9
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Mar 6, 2023
f1be92a
fix XP bug, deploy CLI, CLI improvements
ponderingdemocritus Mar 6, 2023
78cdb96
fix handling empty calldata
starknetdev Mar 6, 2023
bb33e4a
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Mar 6, 2023
a182e61
update magic items ranks
starknetdev Mar 6, 2023
820db1d
Fixes
starknetdev Mar 8, 2023
a31cb3e
fix timestamp error
starknetdev Mar 8, 2023
4e93eb1
quick fix
starknetdev Mar 8, 2023
f102a89
fixes
starknetdev Mar 8, 2023
9b268e1
fixes
starknetdev Mar 8, 2023
d3df9d8
quick fix for installing protostar deps on mac
starknetdev Mar 8, 2023
2adac13
add print to user they have goerli.accounts.json
starknetdev Mar 8, 2023
7f65d96
update explore to print xp amount
starknetdev Mar 9, 2023
cb0f6db
fixes
starknetdev Mar 9, 2023
6454898
fixes
starknetdev Mar 10, 2023
4b49c45
Improve gui notes
starknetdev Mar 10, 2023
3eaad69
improve notes, improve startup script
starknetdev Mar 10, 2023
d041a74
add startup fix for bash or zsh
starknetdev Mar 10, 2023
5cc1d1e
tidy up
starknetdev Mar 10, 2023
113447e
fix startup, improve gui code
starknetdev Mar 10, 2023
52432e8
quick fix
starknetdev Mar 10, 2023
9c0370a
quick fix
starknetdev Mar 10, 2023
ee4fa82
fix startup.sh
starknetdev Mar 10, 2023
563a0b5
separate gui startup and devcontainer startup
starknetdev Mar 12, 2023
cd0c615
Use protostar v0.8.1 for devcontainer startup.sh
loothero Mar 12, 2023
a901d76
resolves #305: bug in flee from beast
loothero Mar 13, 2023
2f882e3
thief spelling
starknetdev Mar 13, 2023
90213f3
fixes
starknetdev Mar 13, 2023
0bc4690
- add vitiality health increase
starknetdev Mar 13, 2023
aa7c5c5
fix gui
starknetdev Mar 13, 2023
9a85aeb
fix startup.sh
starknetdev Mar 13, 2023
7857f75
improve notes
starknetdev Mar 13, 2023
cb8e38b
Add auto `unequip` if item exists in `equip_item`
starknetdev Mar 13, 2023
242ebab
- reduce beast level boost to random of 4
starknetdev Mar 15, 2023
efcf7a9
assert starter weapon for starter beast
starknetdev Mar 15, 2023
76b4006
Increases minimum damage
loothero Mar 16, 2023
9037b5c
Adventurers gain XP when encountering obstacles
loothero Mar 16, 2023
108df0f
deploy script
ponderingdemocritus Mar 16, 2023
97ed91a
Merge branch 'feat/adventurer-mart' of github.com:BibliothecaForAdven…
ponderingdemocritus Mar 16, 2023
0226dce
Merge branch 'main' of github.com:BibliothecaForAdventurers/realms-co…
ponderingdemocritus Mar 16, 2023
705b246
- added `allocate_xp_to_items` as an external function
starknetdev Mar 16, 2023
be7a58b
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Mar 16, 2023
1896c51
add no bids for level 1 adventurers
starknetdev Mar 16, 2023
c504d30
- add claim and equip button to gui
starknetdev Mar 20, 2023
8f053da
- fix storing of xp for loot items
starknetdev Mar 20, 2023
4f89392
- fix dead assertions
starknetdev Mar 21, 2023
9e07dfd
cli updateS
ponderingdemocritus Mar 21, 2023
12f04b8
merge
ponderingdemocritus Mar 21, 2023
e273789
Remove proxy from lords contract
loothero Mar 24, 2023
f5c0687
Reduces XP Discovery to 1-10XP
loothero Mar 24, 2023
d740f4f
Makes ambush logic same as obstacle dodge logic
loothero Mar 24, 2023
9c4c1f0
Increase vitality effect from +10 to +20HP
loothero Mar 24, 2023
0a84101
- create xoroshiro tests for random number checks
starknetdev Mar 28, 2023
3fb74ef
- add more events for indexer
starknetdev Mar 30, 2023
b4e2b22
implement devnet config to nile commands
starknetdev Apr 2, 2023
b60d04f
- event updates
starknetdev Apr 7, 2023
9c997b0
- fix goerli deploy script
starknetdev Apr 8, 2023
f3fcdf7
update beast events
starknetdev Apr 11, 2023
fec5cfa
- add event for item minting
starknetdev Apr 13, 2023
5316173
fixes path bug in startup script
loothero Apr 19, 2023
1af070a
- add event to mint item
starknetdev Apr 19, 2023
3b58380
Merge branch 'feat/adventurer-mart' of https://github.com/Bibliotheca…
starknetdev Apr 19, 2023
b489e52
- update scripts to new devnet deployments
starknetdev Apr 19, 2023
50d8a5b
add events for battles
starknetdev Apr 20, 2023
7269efb
- fix battle events
starknetdev Apr 20, 2023
0069207
- fix bidding mechanism + add events
starknetdev Apr 22, 2023
ec1500b
- add account decleration
starknetdev Apr 28, 2023
d39bbe5
- add argent contracts deployment
starknetdev May 1, 2023
e9742f7
add events for increasing xp
starknetdev May 2, 2023
15468f9
add argent account
starknetdev May 5, 2023
acad1ca
closes#318: Grant shop discount for charisma stats (#324)
loothero May 5, 2023
be140b3
closes #325: items receive 3x XP from battles
loothero May 8, 2023
bb947de
Half market bid and new inventory for alpha play
loothero May 8, 2023
455edc7
lower minimum bid for charisma from 2 to 1
loothero May 8, 2023
4a3311c
reward top 3 scores with lords tokens
loothero May 4, 2023
f59166d
- update devnet to https
starknetdev May 9, 2023
8f02ec0
- update bid time to 15 minutes
starknetdev May 10, 2023
caeb6f5
- fix `assert_can_purchase`
starknetdev May 10, 2023
80c7bb2
fix expiry check
starknetdev May 11, 2023
27cc16b
resolves #328: Fixes item xp not increasing
loothero May 12, 2023
c256b05
#329 generate HighScoreReward on new top score
loothero May 12, 2023
c238d90
#320 equip can also swap for single counter attack
loothero May 12, 2023
5a828f2
#323 assign random names to beasts
loothero May 12, 2023
dc5ea00
fix item suffix assignment
starknetdev May 13, 2023
90a1a7f
#334: moves ambush from flee to beast discovery
loothero May 13, 2023
0d9bf93
#335: makes beasts lvl and health dynamic based on adventurers level
loothero May 13, 2023
e6cf77d
#336: double speed of adventurer and item leveling
loothero May 13, 2023
2c3cc7d
#337: failing to flee results in beast counter attack
loothero May 13, 2023
937f2e1
Fixes:
loothero May 19, 2023
73c9f2c
Closes #339: update item stat modifier on greatness increase
loothero May 19, 2023
cb06332
Closes ##331: improves critical damage system
loothero May 19, 2023
904ca23
Closes #345: Removes obsolete Loot.cairo contract
loothero May 20, 2023
cbcc52a
signficantly improves combat system:
loothero May 20, 2023
97d6b23
fix tests
starknetdev May 22, 2023
0697f82
fix item prefix assignments
starknetdev May 22, 2023
be812ed
fix gold ring test
starknetdev May 22, 2023
eca8b8e
- fix revoke
starknetdev May 22, 2023
23c5341
add scaling xp and gold discovery ranges
starknetdev May 22, 2023
b7b0c5d
closes #348: increases max beast level and health by 50%
loothero May 31, 2023
1b352b5
closes #353: rebalances beasts by removing half the magical set
loothero May 31, 2023
4b99d95
#349: scale obstacle lvl with adventurer lvl
loothero May 31, 2023
bd573e5
#350: increase cost of potion with adventurer lvl
loothero May 31, 2023
1f55989
#352: Grant additional stat boost point for G20 (+1) items
loothero May 31, 2023
2b999be
Revert "closes #353: rebalances beasts by removing half the magical set"
loothero May 31, 2023
7eef7dc
#352: remove +1 stat boost on unequip
loothero May 31, 2023
26ce97a
#353: balances beast types
loothero May 31, 2023
9f99802
#354: fixes bug with stat modifier not being removed on item swap
loothero May 31, 2023
678a85f
tiered prices
ponderingdemocritus Jun 3, 2023
4be2b07
fix brackets
ponderingdemocritus Jun 3, 2023
d23e0dc
potion discount
ponderingdemocritus Jun 3, 2023
2731510
implement floor for potion cost
ponderingdemocritus Jun 3, 2023
3a3e6e5
#355: zero out gold balance when adventurer dies
loothero Jun 3, 2023
35194b1
- fix adventurer error
starknetdev Jun 3, 2023
e3d5648
Closes #105: increases charisma item discount
loothero Jun 3, 2023
3cd343a
#64: don't assign name prefix to starter beasts
loothero Jun 3, 2023
fabacff
fix item
ponderingdemocritus Jun 3, 2023
e6decdb
market id
ponderingdemocritus Jun 3, 2023
f8bfd52
#356: removes min bid override for charisma
loothero Jun 3, 2023
107b173
#357: changes starter beast for sword from golem to gnome
loothero Jun 3, 2023
e96e9ab
#358: increase base chance of flee & avoiding obstacles and ambushes
loothero Jun 3, 2023
d94e7bf
fix beast library
starknetdev Jun 3, 2023
bb9a228
#359: Charisma lowers minimum bid price in market
loothero Jun 3, 2023
f15fc2d
#366: fixes bug allowing bids equal to top bid
loothero Jun 6, 2023
233dd98
#362: increases starting gold from 20 to 40
loothero Jun 6, 2023
e82e1cd
#367: increase difficulty cliff from level 4 to 6
loothero Jun 6, 2023
f3d8d3a
#368: doubles gold bonus for defeating beasts
loothero Jun 6, 2023
81119eb
#369: apply elemental bonus to raw attack hp
loothero Jun 6, 2023
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
Empty file modified .devcontainer/Dockerfile
100644 → 100755
Empty file.
12 changes: 4 additions & 8 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"build": {
"dockerfile": "Dockerfile",
"context": "..",
"args": {
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
Expand All @@ -14,13 +14,12 @@
"NODE_VERSION": "lts/*"
}
},

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"settings": {
"python.defaultInterpreterPath": "/usr/local/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
Expand All @@ -35,7 +34,6 @@
"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
"cairols.useVenv": false
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-python.python",
Expand All @@ -45,18 +43,16 @@
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "pip3 install --user -r requirements.txt",
"remoteEnv": {
"CAIRO_PATH": "/workspaces/realms-contracts/lib/cairo_graphs/src:/workspaces/realms-contracts/lib/cairo_contracts/src:/workspaces/realms-contracts/lib/cairo_math_64x61/contracts:/workspaces/realms-contracts/lib/guild_contracts:${containerEnv:PATH}"
},
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "root",
"remoteUser": "root",
"features": {
"github-cli": "latest"
}
}
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ goerli.deployments.txt.backup
goerli.declarations.txt
goerli.accounts.json
goerli.accounts.json.backup

devnet.accounts.json
devnet.declarations.txt
devnet.deployments.txt
#we create this file if user opts to create new account via our setup script
account_details.txt

Expand Down
Loading