Show creature skulls https://otland.net/threads/tfs-1-x-monster-skull…

…s.281787/ Now it's going to show skulls based on creature levels.
ralke23 · Dec 28, 2022 · fdcdabd · fdcdabd
1 parent 7175b79
commit fdcdabd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/monster.cpp b/src/monster.cpp
@@ -53,6 +53,24 @@ Monster::Monster(MonsterType* mType) :
 	currentOutfit = mType->info.outfit;
 	skull = mType->info.skull;
 	level = uniform_random(mType->info.minLevel, mType->info.maxLevel);
+
+	// Elite Monsters skull by LEVEL:
+	if (level >= 1 && level <= 20) {
+		skull = SKULL_GREEN;
+	}
+	else if (level >= 21 && level <= 45) {
+		skull = SKULL_YELLOW;
+	}
+	else if (level >= 45 && level <= 65) {
+		skull = SKULL_WHITE;
+	}
+	else if (level >= 65 && level <= 85) {
+		skull = SKULL_RED;
+	}
+	else if (level >= 86) {
+		skull = SKULL_BLACK;
+	}
+
 	health = mType->info.health;
 	healthMax = mType->info.healthMax;
 	baseSpeed = mType->info.baseSpeed;

diff --git a/src/player.cpp b/src/player.cpp
@@ -3772,7 +3772,7 @@ Skulls_t Player::getSkullClient(const Creature* creature) const
 	}
 
 	const Player* player = creature->getPlayer();
-	if (!player || player->getSkull() != SKULL_NONE) {
+	if (!player || creature->getSkull() != SKULL_NONE) {
 		return Creature::getSkullClient(creature);
 	}
 

diff --git a/src/protocolgame.cpp b/src/protocolgame.cpp
@@ -2196,7 +2196,7 @@ void ProtocolGame::AddCreature(NetworkMessage& msg, const Creature* creature, bo
 
 	msg.add<uint16_t>(creature->getStepSpeed());
 
-	msg.addByte(player->getSkullClient(otherPlayer));
+	msg.addByte(creature->getSkullClient(creature));
 	msg.addByte(player->getPartyShield(otherPlayer));
 
 	if (!known) {