Spawn and Free Cell Search Behavior #8324

Playtester · 2024-05-11T09:04:10Z

Addressed Issue(s): Monsters should not spawn on unwalkable tiles #8300

Server Mode: Both

Description of Pull Request:

When searching for a map-wide free cell, the tiles 15 cells from the edge are no longer considered
- Added a configuration to change the edge size to any value between 1 and 40
When searching for a free cell, the tiles 4-5 cells from the edge are now considered invalid and trigger a retry
- If you make the edge size smaller than this, it will use edge size instead
Searching for a free cell now defaults to 50 tries, but if the "no spawn on player" option is active, those failed attempts are not counted towards the limit anymore
When a monster spawns in a defined area there will now be 8 attempts to spawn it on a valid cell within the area and then one attempt on the center cell; if all 9 attempts fail, there will now be 50 tries to spawn it map-wide before it gives up
When a monster has fixed spawn coordinates, but those coordinates are a wall, it will now spawn in a random location map-wide instead
- This also applies to icewall blocking the cell unless the boss_monster command was used
Each monster in an area spawn will now receive its own spawn center within the spawn area on server start
- This results in the spawn area being larger but having a bias towards the center
- Added a configuration to disable this behavior
Fixed slave monsters always being active and constantly calling the "search freecell" function even though neither them nor their master have been spotted yet
Fixed map server crash when setting no_spawn_on_player to 100 (follow-up to 33b2b02)
Updated prontera field spawns to official episode 18+
Updated all champion mob respawn times to 3 minutes and sorted them by map name
Fixes Monsters should not spawn on unwalkable tiles #8300

- When searching for a map-wide free cell, the tiles 15 cells from the edge are no longer considered * Added a configuration to change the edge size to any value between 4 and 40 - When searching for a free cell, the tiles 4-5 cells from the edge are now considered invalid and trigger a retry - Searching for a free cell now defaults to 50 tries, but if the "no spawn on player" option is active, those failed attempts are not counted towards the limit anymore - When a monster spawns in a defined area there will now be 9 attempts to spawn it on a valid cell within the area; if all 9 attempts fail, there will now be 50 tries to spawn it map-wide before it gives up - When a monster has fixed spawn coordinates, but those coordinates are a wall, it will now spawn in a random location map-wide instead - Fixes #8300

- Reduced number of area tries to 8 - If all tries fail and the center cell is not a wall, the monster will spawn there

- Follow-up to 33b2b02

src/map/map.cpp

src/map/pc.cpp

src/map/map.cpp

src/map/pc.cpp

src/map/mob.cpp

src/map/map.cpp

src/map/pc.cpp

conf/battle/misc.conf

Other code needs to be adjusted individually Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>

src/map/map.cpp

src/map/npc.cpp

src/map/pc.cpp

src/map/mob.cpp

src/map/npc.cpp

src/map/mob.cpp

src/map/pc.cpp

src/map/mob.cpp

Lemongrass3110 · 2024-05-13T22:56:38Z

src/map/mob.cpp

+			if (!map_search_freecell(&md->bl, -1, &md->bl.x, &md->bl.y, md->spawn->xs-1, md->spawn->ys-1, battle_config.no_spawn_on_player?4:0, 8))
+			{
+				// If area search failed and center cell not reachable, try to spawn the monster anywhere on the map (50 tries)
+				if (!map_getcell(md->bl.m, md->bl.x, md->bl.y, CELL_CHKREACH) && !map_search_freecell(&md->bl, -1, &md->bl.x, &md->bl.y, -1, -1, battle_config.no_spawn_on_player?4:0))


Note:
Here this is not the (original) center cell anymore. It was already adjusted by the call to map_search_freecell.
Therefore the first part of the if is useless.

Not useless. If you are implying it cannot currently be on an unwalkable cell, then the whole if() would be useless and not just the first part.

The first part of the if would only be useless if we are guaranteed to currently be on an unwalkable cell which is definitely not guaranteed.

Basically if the official spawn search cell algorithm fails and then current cell is walkable, then it should always spawn on that cell (even if it's the cell that was found by the first call of map_search_freecell), but if the cell is unwalkable, then the monster spawns in a random area of the map.

src/map/npc.cpp

doc/script_commands.txt

Lemongrass3110 · 2024-05-19T12:32:17Z

src/map/map.cpp

@@ -1754,10 +1756,11 @@ int map_search_freecell(struct block_list *src, int16 m, int16 *x,int16 *y, int1
 				if (spawn >= 100) return 0; //Limit of retries reached.


Suggested change

if (spawn >= 100) return 0; //Limit of retries reached.

The battle config is already limited [0,100]

This will break the feature. It's different because if you set it to 100 the monster should not spawn at all, whereas if the value is lower than 100, it should spawn anyway.

Lemongrass3110 · 2024-05-19T12:36:25Z

src/map/mob.cpp

+		md->bl.x = md->centerX;
+		md->bl.y = md->centerY;


Suggested change

md->bl.x = md->centerX;

md->bl.y = md->centerY;

if( battle_config.randomize_center_cell ){

md->bl.x = md->centerX;

md->bl.y = md->centerY;

}else{

md->bl.x = md->spawn->x;

md->bl.y = md->spawn->y;

}

Not needed, md->centerX is set to md->spawn->x during initialization of the spawnset.

Lemongrass3110 · 2024-05-19T12:40:41Z

src/map/mob.cpp

+		if ((!md->spawn->state.boss || (md->bl.x == 0 && md->bl.y == 0) || md->spawn->xs != 1 || md->spawn->ys != 1)
+			&& (md->spawn->xs + md->spawn->ys < 1 || !rnd_chance(1, md->spawn->xs * md->spawn->ys) || !map_getcell(md->bl.m, md->bl.x, md->bl.y, CELL_CHKREACH)))


Based on the complexity of this condition I would say that it may be better to put this into a function and make those conditions return early.
Otherwise you could create a pseudo scope, to be able to break out of it as well.

It's not really that complex and the comment explains it too. Also too much structural change so close before pushing would just be more risky than not touching it anymore.

Lemongrass3110 · 2024-05-19T12:43:54Z

src/map/npc.cpp

+		// Determine center cell for each mob in the spawn line
+		if (battle_config.randomize_center_cell) {
+			if (mob->xs > 1)
+				md->centerX = rnd_value(mob->x - mob->xs + 1, mob->x + mob->xs - 1);


Suggested change

md->centerX = rnd_value(mob->x - mob->xs + 1, mob->x + mob->xs - 1);

md->centerX = rnd_value(mob->x - mob->xs + 1, mob->x + mob->xs - 1);

else

md->centerX = 0;

Let's just leave centerX as initialized, then we also don't need the other changes!

Lemongrass3110 · 2024-05-19T12:44:22Z

src/map/npc.cpp

+			if (mob->xs > 1)
+				md->centerX = rnd_value(mob->x - mob->xs + 1, mob->x + mob->xs - 1);
+			if (mob->ys > 1)
+				md->centerY = rnd_value(mob->y - mob->ys + 1, mob->y + mob->ys - 1);


Suggested change

md->centerY = rnd_value(mob->y - mob->ys + 1, mob->y + mob->ys - 1);

md->centerY = rnd_value(mob->y - mob->ys + 1, mob->y + mob->ys - 1);

else

md->centerY = 0;

Lemongrass3110 · 2024-05-19T12:44:50Z

src/map/npc.cpp

+				md->centerX = rnd_value(mob->x - mob->xs + 1, mob->x + mob->xs - 1);
+			if (mob->ys > 1)
+				md->centerY = rnd_value(mob->y - mob->ys + 1, mob->y + mob->ys - 1);
+		}


Suggested change

}

}else{

md->centerX = 0;

md->centerY = 0;

}

Playtester self-assigned this May 11, 2024

Playtester added 3 commits May 11, 2024 11:38

Map edge size now also applies to player teleportation

d52ea6b

More accurate monster spawn code

b5fb146

- Reduced number of area tries to 8 - If all tries fail and the center cell is not a wall, the monster will spawn there

Fixed map server crash when setting no_spawn_on_player to 100

a9f0858

- Follow-up to 33b2b02

Atemo reviewed May 11, 2024

View reviewed changes

src/map/map.cpp Outdated Show resolved Hide resolved

aleos89 reviewed May 11, 2024

View reviewed changes

src/map/pc.cpp Outdated Show resolved Hide resolved

Code optimization

f25737f

aleos89 approved these changes May 11, 2024

View reviewed changes

Playtester added 2 commits May 12, 2024 20:10

Official spawn area

a074bb3

Official Renewal Prontera Field spawns and Champion Mobs

fbcfd6e

Lemongrass3110 reviewed May 13, 2024

View reviewed changes

Playtester and others added 2 commits May 13, 2024 21:47

Applied suggestions from Lemongrass that work as suggested

07b5612

Other code needs to be adjusted individually Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>

Code improvements based on feedback from Lemongrass

7fc6088

Lemongrass3110 reviewed May 13, 2024

View reviewed changes

Playtester and others added 5 commits May 14, 2024 20:34

Small optimization on slave AI check

3891691

Spawn center is now picked per monster at server start

8eb830a

Merge branch 'master' into hotfix/issue8300

f3b621b

Fixed default value handling and updated documentation

d12a3dc

Added a config for randomizing the center cell

8eee002

Lemongrass3110 approved these changes May 19, 2024

View reviewed changes

Lemongrass3110 added component:core A fault that lies within the main framework of rAthena mode:renewal A fault that exists within the renewal mode mode:prerenewal A fault that exists within the pre-renewal mode type:bug Issue that is a bug within rAthena labels May 19, 2024

Improved documentation

aaf3352

Playtester merged commit 5d232db into master May 19, 2024
33 checks passed

Playtester deleted the hotfix/issue8300 branch May 19, 2024 15:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spawn and Free Cell Search Behavior #8324

Spawn and Free Cell Search Behavior #8324

Playtester commented May 11, 2024 •

edited

Lemongrass3110 May 13, 2024

Playtester May 14, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

Lemongrass3110 May 19, 2024

Playtester May 19, 2024

		@@ -1754,10 +1756,11 @@ int map_search_freecell(struct block_list src, int16 m, int16 x,int16 *y, int1
		if (spawn >= 100) return 0; //Limit of retries reached.

		if ((!md->spawn->state.boss \|\| (md->bl.x == 0 && md->bl.y == 0) \|\| md->spawn->xs != 1 \|\| md->spawn->ys != 1)
		&& (md->spawn->xs + md->spawn->ys < 1 \|\| !rnd_chance(1, md->spawn->xs * md->spawn->ys) \|\| !map_getcell(md->bl.m, md->bl.x, md->bl.y, CELL_CHKREACH)))

-		}
+		}else{
+			md->centerX = 0;
+			md->centerY = 0;
+		}

Spawn and Free Cell Search Behavior #8324

Spawn and Free Cell Search Behavior #8324

Conversation

Playtester commented May 11, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Playtester commented May 11, 2024 •

edited