minecraft-pi-reborn
/
minecraft-pi-reborn
7
11
Fork 13
Code Issues 5 Pull Requests 1 Actions Releases 3 Activity

Add Cake #81

Merged
TheBrokenRail merged 22 commits from bigjango13/minecraft-pi-reborn:master into master 2024-02-07 06:47:47 +00:00
Conversation 5 Commits 22 Files Changed 36 +26 -36
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 19dd4b1d79 - Show all commits

62
mods/src/death/death.cpp
View File

@ -11,63 +11,53 @@ static const char *monster_names[] = {"Zombie", "Creeper", "Skeleton", "Spider",
static std::string get_death_message(Player *player, Entity *cause, bool was_shot = false) {
// Prepare Death Message
std::string message = player->username;
// The cause
if (cause) {
// Entity cause
int type_id = cause->vtable->getEntityTypeId(cause);
int aux = cause->vtable->getAuxData(cause);
if (cause->vtable->isPlayer(cause)) {
// Another player
bool is_player = cause->vtable->isPlayer(cause);
if (cause->vtable->getCreatureBaseType(cause) != 0 || is_player) {
// Killed by a creature
if (was_shot) {
message += " was shot by ";
} else {
message += " was killed by ";
}
message += ((Player *) cause)->username;
} else if (cause->vtable->getCreatureBaseType(cause) == 1) {
// Killed by a monster
if (was_shot) {
message += " was shot by a ";
} else {
message += " was killed by a ";
}
if (32 <= type_id && type_id <= 36) {
if (is_player) {
// Killed by a player
message += ((Player *) cause)->username;
} else if (32 <= type_id && type_id <= 36) {
// Normal monster
message += "a ";
message += monster_names[type_id - 32];
} else {
// Unknown monster
message += "Mysterious Beast";
// Unknown creature
message += "a Mysterious Beast";
}
return message;
} else if (aux) {
// Throwable with owner
// Killed by a throwable with owner
Level *level = player->level;
Entity *shooter = Level_getEntity(level, aux);
return get_death_message(player, shooter, true);
} else if (80 <= type_id || type_id <= 82) {
// Throwable without owner
message += " was shot under mysterious circumstances";
} else if (type_id == 65) {
bigjango13 marked this conversation as resolved
TheBrokenRail commented 2024-01-30 03:54:12 +00:00
Review
Copy Link

Shouldn't this check if this was an arrow? What if another entity has aux data?

Shouldn't this check if this was an arrow? What if another entity has aux data?
bigjango13 commented 2024-01-30 04:00:40 +00:00
Review
Copy Link

That's intended, only throwables have aux values:

// The owner entity id for arrows/throwables, else 0
virtual-method int getAuxData() = 0xf4;

So if I egg you to death, it still says that I'm the one who did it.

That's intended, only throwables have aux values: ``` // The owner entity id for arrows/throwables, else 0 virtual-method int getAuxData() = 0xf4; ``` So if I egg you to death, it still says that I'm the one who did it.
// TNT
message += " was blown apart";
// Blown up by TNT
return message + " was blown apart";
} else if (cause->vtable->isHangingEntity(cause)) {
// Painting?
message += " admired too much art";
} else {
if (was_shot) {
message += " was shot under mysterious circumstances";
} else {
message += " was killed under mysterious circumstances";
}
return message + " admired too much art";
bigjango13 marked this conversation as resolved Outdated
TheBrokenRail commented 2024-01-30 03:53:31 +00:00
Outdated
Review
Copy Link

A lot of these death messages are duplicated. Is there any chance these could be consolidated into fewer if statements?

A lot of these death messages are duplicated. Is there any chance these could be consolidated into fewer if statements?
bigjango13 commented 2024-01-30 05:47:50 +00:00
Outdated
Review
Copy Link

Done 👍

Done 👍
}
}
if (was_shot) {
// Throwable with invalid owner
return message + " was shot under mysterious circumstances";
TheBrokenRail commented 2024-01-30 03:53:41 +00:00
Outdated
Review
Copy Link

When would this ever happen?

When would this ever happen?
bigjango13 commented 2024-01-30 04:01:39 +00:00
Outdated
Review
Copy Link

No idea, I thought it might be useful in case the paintings ever try to take over.

No idea, I thought it might be useful in case the paintings ever try to take over.
} else if (cause) {
// Unknown entity
return message + " was killed";
} else {
// Non-entity cause
if (was_shot) {
// Throwable with invalid owner
message += " was shot under mysterious circumstances";
} else {
// Anything else
message += " has died";
}
// Anything else
return message + " has died";
}
// Return