Skip to content

monster ownership update #24

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
thogard785 merged 1 commit into from
Jul 10, 2025
Merged

monster ownership update #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 27 additions & 27 deletions broadcast/deploy-battle-nads.s.sol/10143/run-latest.json
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 25 additions & 1 deletion src/battle-nads/Balances.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import { Errors } from "./libraries/Errors.sol";
import { Events } from "./libraries/Events.sol";
import { StatSheet } from "./libraries/StatSheet.sol";
import { IShMonad } from "@fastlane-contracts/shmonad/interfaces/IShMonad.sol";

import { Instances } from "./Instances.sol";

import { SessionKey } from "lib/fastlane-contracts/src/common/relay/types/GasRelayTypes.sol";

// These are the entrypoint functions called by the tasks
abstract contract Balances is GasRelayWithScheduling, Instances {
using StatSheet for BattleNad;
Expand Down Expand Up @@ -156,6 +157,29 @@ abstract contract Balances is GasRelayWithScheduling, Instances {
balances = balanceTracker;
}

function _validatePersistOwnerDuringTask(
BattleNad memory combatant,
bool revertIfInvalid
)
internal
returns (bool reschedule)
{
address _oldOwner = _abstractedMsgSender();
SessionKey memory key = _loadSessionKey(msg.sender);
if (key.expiration <= block.number) {
revert Errors.InvalidCaller(msg.sender);
}
if (_oldOwner != combatant.owner || combatant.owner != key.owner) {
if (revertIfInvalid) {
revert Errors.InvalidCaller(msg.sender);
}
_deactivateSessionKey(msg.sender);
_clearActiveTask(combatant.id);
return false;
}
return true;
}

function _getMinTaskReserveAmount() internal view returns (uint256 minBondedAmount) {
minBondedAmount = TASK_COMMIT_RESERVE_FACTOR * _estimateTaskCost(block.number + SPAWN_DELAY, TASK_GAS);
}
Expand Down
22 changes: 13 additions & 9 deletions src/battle-nads/Character.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,17 +328,21 @@ abstract contract Character is Abilities {
if (combatant.stats.health > 3) {
combatant = _outOfCombatStatUpdate(combatant);

combatant.activeTask.taskAddress = _loadActiveTaskAddress(combatant.id);
if (_isValidAddress(combatant.activeTask.taskAddress)) {
_clearKey(combatant, combatant.activeTask.taskAddress);
if (!combatant.isMonster()) {
combatant.activeTask.taskAddress = _loadActiveTaskAddress(combatant.id);
if (_isValidAddress(combatant.activeTask.taskAddress)) {
_clearKey(combatant, combatant.activeTask.taskAddress);
}
_clearActiveTask(combatant.id);
combatant.activeTask.taskAddress = _EMPTY_ADDRESS;
combatant.tracker.updateActiveTask = false;
combatant = _checkClearAbility(combatant);
}
} else {
if (!combatant.isMonster()) {
combatant = _checkClearAbility(combatant);
}
_clearActiveTask(combatant.id);
combatant.activeTask.taskAddress = _EMPTY_ADDRESS;
combatant.tracker.updateActiveTask = false;
}

combatant = _checkClearAbility(combatant);

return combatant;
}

Expand Down
29 changes: 23 additions & 6 deletions src/battle-nads/Combat.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,13 @@ abstract contract Combat is MonsterFactory {
{
if (attacker.isDead() || defender.isDead()) return false;
if (attacker.stats.index == defender.stats.index) return false;
if (defender.isMonster()) return true;
if (defender.isMonster()) {
if (!attacker.isMonster()) {
return true;
} else {
return false;
}
}
return attacker.stats.level + defender.stats.sumOfCombatantLevels <= (defender.stats.level * 2) + 1;
}

Expand All @@ -171,6 +177,9 @@ abstract contract Combat is MonsterFactory {
uint256 attackerIndex = uint256(attacker.stats.index);
uint256 targetIndex;
uint256 targetBit;
bool isBossEncounter = (excludedIndex != uint8(RESERVED_BOSS_INDEX))
&& (attacker.stats.class != CharacterClass.Boss)
&& (_isBoss(attacker.stats.depth, attacker.stats.x, attacker.stats.y));

// Sanity check against area bitmap
uint256 areaBitmap = uint256(area.playerBitMap) | uint256(area.monsterBitMap);
Expand All @@ -181,7 +190,6 @@ abstract contract Combat is MonsterFactory {
// Monsters can attack any player once they're aggro'd but not each other
if (attacker.isMonster()) {
combatantBitmap &= uint256(area.playerBitMap);
combatantBitmap &= ~uint256(area.monsterBitMap);
}
// Remove any excluded index
if (excludedIndex != 0) {
Expand All @@ -198,9 +206,18 @@ abstract contract Combat is MonsterFactory {
}

targetIndex = uint256(attacker.stats.nextTargetIndex);
if (targetIndex == attackerIndex) targetIndex = 0;
if (targetIndex == 0) {
targetIndex = attackerIndex == 1 ? 2 : 1;
if (targetIndex < 2) {
if (isBossEncounter) {
targetIndex = 1; // uint8(RESERVED_BOSS_INDEX)
} else {
targetIndex = 2;
}
}

if (attackerIndex == targetIndex) {
if (++targetIndex > 64) {
targetIndex = isBossEncounter ? 1 : 2;
}
}

do {
Expand Down Expand Up @@ -268,7 +285,7 @@ abstract contract Combat is MonsterFactory {
// Increment loop
unchecked {
if (++targetIndex > 64) {
targetIndex = 1;
targetIndex = isBossEncounter ? 1 : 2;
}
}
} while (combatantBitmap != 0 && gasleft() > 110_000);
Expand Down
1 change: 1 addition & 0 deletions src/battle-nads/Constants.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ contract Constants {
uint256 internal constant DEFAULT_AGGRO_CHANCE = 18; // out of 255 - spawns a new monster
uint256 internal constant STARTING_OCCUPANT_THRESHOLD = 16;
uint8 internal constant NO_COMBAT_ZONE_SPACING = 5;
uint256 internal constant RESERVED_BOSS_INDEX = 1;

uint256 internal constant DAMAGE_DILUTION_FACTOR = 620;
uint256 internal constant ABILITY_DILUTION_FACTOR = 780;
Expand Down
121 changes: 91 additions & 30 deletions src/battle-nads/Handler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
pragma solidity 0.8.28;

import {
BattleNad, BattleArea, StorageTracker, Inventory, BalanceTracker, Log, AbilityTracker, Ability
BattleNad,
BattleArea,
StorageTracker,
Inventory,
BalanceTracker,
Log,
AbilityTracker,
Ability,
CharacterClass
} from "./Types.sol";

import { Balances } from "./Balances.sol";
Expand Down Expand Up @@ -152,6 +160,13 @@ abstract contract Handler is Balances {

// Flag for combat
(monster, player) = _enterMutualCombatToTheDeath(monster, player);
if (monster.isDead()) {
player = _exitCombat(player);
player.stats.nextTargetIndex = 0;
player.tracker.updateStats = true;
_storeArea(area, newDepth, newX, newY);
return player;
}

// Create tasks
bool scheduledTask = false;
Expand All @@ -161,17 +176,20 @@ abstract contract Handler is Balances {
uint256 targetBlock = block.number + _cooldown(monster.stats) + COMBAT_COLD_START_DELAY_MONSTER;
(monster, scheduledTask) = _createOrRescheduleCombatTask(monster, targetBlock);
if (!scheduledTask) {
monster.owner = _EMPTY_ADDRESS;
monster.tracker.updateOwner = true;
emit Events.TaskNotScheduledInHandler(3, monster.id, block.number, targetBlock);
}
} else {
// If task is no longer active, start a new one
(scheduledTask,) = _checkClearTasks(monster);
if (!scheduledTask) {
monster.owner = player.owner;
monster.tracker.updateOwner = true;
uint256 targetBlock = block.number + _cooldown(monster.stats) + COMBAT_COLD_START_DELAY_MONSTER;
if (!scheduledTask || !_isValidAddress(monster.owner)) {
uint256 targetBlock = block.number + _cooldown(monster.stats);
(monster, scheduledTask) = _createOrRescheduleCombatTask(monster, targetBlock);
if (!scheduledTask) {
if (scheduledTask) {
monster.owner = player.owner;
monster.tracker.updateOwner = true;
} else {
emit Events.TaskNotScheduledInHandler(4, monster.id, block.number, targetBlock);
}
}
Expand Down Expand Up @@ -281,6 +299,12 @@ abstract contract Handler is Balances {
bytes32 defenderTargetID =
areaCombatants[defender.stats.depth][defender.stats.x][defender.stats.y][defender.stats.nextTargetIndex];
if (!_isValidID(defenderTargetID)) {
uint256 defenderBitmap = uint256(defender.stats.combatantBitMap);
uint256 targetBit = 1 << uint256(defender.stats.nextTargetIndex);
if (defenderBitmap & targetBit != 0) {
defenderBitmap &= ~targetBit;
defender.stats.combatantBitMap = uint64(defenderBitmap);
}
defender.stats.nextTargetIndex = attacker.stats.index;
defender.tracker.updateStats = true;
}
Expand All @@ -292,21 +316,20 @@ abstract contract Handler is Balances {
// Create tasks
// Only create for attacker and defendant if tasks don't already exist
(bool scheduledTask,) = _checkClearTasks(defender);
if (!scheduledTask) {
if (defender.isMonster()) {
defender.owner = attacker.owner;
defender.tracker.updateOwner = true;
}
(defender, scheduledTask) = _createOrRescheduleCombatTask(
defender, block.number + _cooldown(defender.stats) + COMBAT_COLD_START_DELAY_DEFENDER
);
if (!scheduledTask) {
emit Events.TaskNotScheduledInHandler(
1,
defender.id,
block.number,
block.number + _cooldown(defender.stats) + COMBAT_COLD_START_DELAY_DEFENDER
);
if (defender.isMonster()) {
if (!scheduledTask || !_isValidAddress(defender.owner)) {
if (!scheduledTask) {
(defender, scheduledTask) =
_createOrRescheduleCombatTask(defender, block.number + _cooldown(defender.stats));
if (scheduledTask) {
defender.owner = attacker.owner;
defender.tracker.updateOwner = true;
} else {
emit Events.TaskNotScheduledInHandler(
1, defender.id, block.number, block.number + _cooldown(defender.stats)
);
}
}
}
}

Expand Down Expand Up @@ -479,7 +502,9 @@ abstract contract Handler is Balances {

// CASE: No combatants remain
if (!attacker.isInCombat()) {
attacker = _checkClearAbility(attacker);
if (!attacker.isMonster()) {
attacker = _checkClearAbility(attacker);
}

reschedule = false;
nextExecutionBlock = 0;
Expand All @@ -505,14 +530,14 @@ abstract contract Handler is Balances {
// Process attack
(attacker, defender, log) = _attack(attacker, defender, log);

// If it's a monster, update defender's owner to most recent attacker
// If it's a monster, update defender's owner to n
// Only do this if there was a funding issue with prev task

if (defender.isMonster() && !attacker.isMonster()) {
defender.owner = _loadOwner(defender.id);
if (defender.owner != attacker.owner) {
if (defender.owner != attacker.owner && _isValidAddress(defender.owner)) {
(bool hasActiveCombatTask,) = _checkClearTasks(defender);
if (!hasActiveCombatTask) {
defender.owner = attacker.owner;
defender.owner = _EMPTY_ADDRESS;
defender.tracker.updateOwner = true;
}
}
Expand Down Expand Up @@ -718,6 +743,31 @@ abstract contract Handler is Balances {
if (!attackerInCombat || !defenderInCombat) {
(attacker, defender) = _enterMutualCombatToTheDeath(attacker, defender);
}
if (defender.isMonster() && !attacker.isMonster()) {
if (!_isTask()) {
(bool scheduledTask,) = _checkClearTasks(defender);
if (!scheduledTask || !_isValidAddress(defender.owner)) {
(defender, scheduledTask) =
_createOrRescheduleCombatTask(defender, block.number + _cooldown(defender.stats));
if (scheduledTask) {
defender.owner = attacker.owner;
defender.tracker.updateOwner = true;
} else {
emit Events.TaskNotScheduledInHandler(
1, defender.id, block.number, block.number + _cooldown(defender.stats)
);
}
}
} else {
if (defender.owner != attacker.owner && _isValidAddress(defender.owner)) {
(bool hasActiveCombatTask,) = _checkClearTasks(defender);
if (!hasActiveCombatTask) {
defender.owner = _EMPTY_ADDRESS;
defender.tracker.updateOwner = true;
}
}
}
}
} else {
if (attacker.activeAbility.targetIndex != 0 && attacker.activeAbility.ability != Ability.Pray) {
revert Errors.AbilityCantHaveTarget();
Expand Down Expand Up @@ -794,6 +844,8 @@ abstract contract Handler is Balances {
}

function _combatCheckLoop(BattleNad memory combatant, bool forceRemoveCombat) internal returns (BattleNad memory) {
bool isBossEncounter = (combatant.stats.class != CharacterClass.Boss)
&& (_isBoss(combatant.stats.depth, combatant.stats.x, combatant.stats.y));
combatant.tracker.updateStats = true;

BattleArea memory area = _loadArea(combatant.stats.depth, combatant.stats.x, combatant.stats.y);
Expand All @@ -816,9 +868,18 @@ abstract contract Handler is Balances {

// Can't have an index of 0, start i at 1.
uint256 targetIndex = uint256(combatant.stats.nextTargetIndex);
if (targetIndex == uint256(combatant.stats.index)) targetIndex = 0;
if (targetIndex == 0) {
targetIndex = uint256(combatant.stats.index) == 1 ? 2 : 1;
if (targetIndex < 2) {
if (isBossEncounter) {
targetIndex = 1; // uint8(RESERVED_BOSS_INDEX)
} else {
targetIndex = 2;
}
}

if (uint256(combatant.stats.index) == targetIndex) {
if (++targetIndex > 64) {
targetIndex = isBossEncounter ? 1 : 2;
}
}

while (gasleft() > 215_000 && combatantBitmap != 0) {
Expand Down Expand Up @@ -885,7 +946,7 @@ abstract contract Handler is Balances {
// Increment loop
unchecked {
if (++targetIndex > 64) {
targetIndex = 1;
targetIndex = isBossEncounter ? 1 : 2;
}
}
combatant.stats.nextTargetIndex = uint8(targetIndex);
Expand Down
Loading
Loading