Skip to content

Leveling #82

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
ECWireless merged 15 commits into from
Jul 24, 2024
Merged

Leveling #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ee18a34
item drops added, untested
MrDeadCe11 Jul 18, 2024
a53c454
some tweaks to combat
MrDeadCe11 Jul 18, 2024
cfa88f5
added missing files
MrDeadCe11 Jul 19, 2024
7f91b5b
some slight tweaks
MrDeadCe11 Jul 19, 2024
9be7e92
fixed combat system errors
MrDeadCe11 Jul 19, 2024
4670540
added action outcome offline table
MrDeadCe11 Jul 23, 2024
e6ae3b6
modified the combat outcome calculations to be a little more efficient
MrDeadCe11 Jul 23, 2024
46cf5ad
added leveling function
MrDeadCe11 Jul 23, 2024
c8963da
added admin system and changed some function inputs in the loot manag…
MrDeadCe11 Jul 23, 2024
614e723
added leveling test
MrDeadCe11 Jul 24, 2024
7b6d8e6
Merge branch 'main' of https://github.com/raid-guild/ultimate-dominio…
MrDeadCe11 Jul 24, 2024
93b0490
fixed combat test and added a revert if we have an unrecognized actio…
MrDeadCe11 Jul 24, 2024
31ca560
deleted commented code
MrDeadCe11 Jul 24, 2024
5bc9fd3
revert if unrecognized action id
MrDeadCe11 Jul 24, 2024
2dedf63
Remove disable lint in Leaderboard page
ECWireless Jul 24, 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
8 changes: 8 additions & 0 deletions packages/contracts/.NOTprettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"plugins": ["prettier-plugin-solidity"],
"printWidth": 120,
"semi": true,
"tabWidth": 2,
"useTabs": false,
"bracketSpacing": true
}
4 changes: 4 additions & 0 deletions packages/contracts/constants.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ uint256 constant CRIT_MODIFIER = 2;

//Gold Drop constants
uint256 constant BASE_GOLD_DROP = 1e15; //

// LEVELING
uint256 constant BASE_HP_GAIN = 1;
uint256 constant ABILITY_POINTS_PER_LEVEL = 2;
44 changes: 43 additions & 1 deletion packages/contracts/mud.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ export default defineWorld({
/**
* Marks an entity as an admin. Used on address entities.
*/
Admin: "bool",
Admin: {
key: ["user"],
schema: {
user: "address",
isAdmin: "bool",
},
},
Characters: {
key: ["characterId"],
schema: {
Expand Down Expand Up @@ -180,6 +186,41 @@ export default defineWorld({
},
key: ["encounterId"],
},
ActionOutcome: {
schema: {
encounterId: "bytes32",
currentTurn: "uint256",
actionNumber: "uint256",
actionId: "bytes32",
weaponId: "uint256",
attackerId: "bytes32",
defenderId: "bytes32",
hit: "bool",
miss: "bool",
crit: "bool",
attackerDamageDelt: "int256",
defenderDamageDelt: "int256",
attackerDied: "bool",
defenderDied: "bool",
blockNumber: "uint256",
timestamp: "uint256",
},
key: ["encounterId", "currentTurn", "actionNumber"],
type: "offchainTable",
},
CombatOutcome: {
schema: {
encounterId: "bytes32",
endTime: "uint256",
expDropped: "uint256",
goldDropped: "uint256",
itemsDropped: "uint256[]",
deadAttackers: "bytes32[]",
deadDefenders: "bytes32[]",
},
key: ["encounterId"],
type: "offchainTable",
},
// when an entity starts combat it creates a "match entity" for that encounter.
//when combat ends, the encounterId is set to zero, and the damage taken subtracted from the entities hp.
MatchEntity: {
Expand All @@ -190,6 +231,7 @@ export default defineWorld({
// if the mob survives its encounter this will be set back to bytes(0)
encounterId: "bytes32",
damageTaken: "int256",
died: "bool",
},
},
RandomNumbers: {
Expand Down
62 changes: 61 additions & 1 deletion packages/contracts/out/CharacterSystem.sol/CharacterSystem.abi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
],
"outputs": [
{
"name": "currentLevel",
"name": "currentAvailibleLevel",
"type": "uint256",
"internalType": "uint256"
}
Expand Down Expand Up @@ -307,6 +307,66 @@
],
"stateMutability": "view"
},
{
"type": "function",
"name": "levelCharacter",
"inputs": [
{
"name": "characterId",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "desiredStats",
"type": "tuple",
"internalType": "struct StatsData",
"components": [
{
"name": "strength",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "agility",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "class",
"type": "uint8",
"internalType": "enum Classes"
},
{
"name": "intelligence",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "baseHp",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "currentHp",
"type": "int256",
"internalType": "int256"
},
{
"name": "experience",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "level",
"type": "uint256",
"internalType": "uint256"
}
]
}
],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "mintCharacter",
Expand Down
62 changes: 61 additions & 1 deletion packages/contracts/out/CharacterSystem.sol/CharacterSystem.abi.json.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ declare const abi: [
],
"outputs": [
{
"name": "currentLevel",
"name": "currentAvailibleLevel",
"type": "uint256",
"internalType": "uint256"
}
Expand Down Expand Up @@ -307,6 +307,66 @@ declare const abi: [
],
"stateMutability": "view"
},
{
"type": "function",
"name": "levelCharacter",
"inputs": [
{
"name": "characterId",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "desiredStats",
"type": "tuple",
"internalType": "struct StatsData",
"components": [
{
"name": "strength",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "agility",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "class",
"type": "uint8",
"internalType": "enum Classes"
},
{
"name": "intelligence",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "baseHp",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "currentHp",
"type": "int256",
"internalType": "int256"
},
{
"name": "experience",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "level",
"type": "uint256",
"internalType": "uint256"
}
]
}
],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "mintCharacter",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/out/CharacterSystem.sol/CharacterSystem.json
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 0 additions & 124 deletions packages/contracts/out/CombatSystem.sol/CombatSystem.abi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,82 +6,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "_calculatePhysicalAttack",
"inputs": [
{
"name": "attackStats",
"type": "tuple",
"internalType": "struct PhysicalAttackStats",
"components": [
{
"name": "bonusDamage",
"type": "int256",
"internalType": "int256"
},
{
"name": "armorPenetration",
"type": "int256",
"internalType": "int256"
},
{
"name": "attackModifierBonus",
"type": "int256",
"internalType": "int256"
},
{
"name": "critChanceBonus",
"type": "int256",
"internalType": "int256"
},
{
"name": "classRestrictions",
"type": "uint8[]",
"internalType": "uint8[]"
}
]
},
{
"name": "attackerId",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "defenderId",
"type": "bytes32",
"internalType": "bytes32"
},
{
"name": "weaponId",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "randomNumber",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [
{
"name": "damage",
"type": "int256",
"internalType": "int256"
},
{
"name": "hit",
"type": "bool",
"internalType": "bool"
},
{
"name": "crit",
"type": "bool",
"internalType": "bool"
}
],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "_msgSender",
Expand Down Expand Up @@ -121,54 +45,6 @@
],
"stateMutability": "view"
},
{
"type": "function",
"name": "calculateGoldDrop",
"inputs": [
{
"name": "mobLevel",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "randomNumber",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [
{
"name": "dropAmount",
"type": "uint256",
"internalType": "uint256"
}
],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "calculateItemDrop",
"inputs": [
{
"name": "randomNumber",
"type": "uint256",
"internalType": "uint256"
},
{
"name": "itemId",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [
{
"name": "",
"type": "bool",
"internalType": "bool"
}
],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "createMatch",
Expand Down
Loading