Skip to content

слоудт в данжах и чармисы #2929

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
bylins merged 1 commit into from
Feb 23, 2026
Merged

слоудт в данжах и чармисы #2929

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
2 changes: 1 addition & 1 deletion src/gameplay/ai/mobact.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ void extract_charmice(CharData *ch, bool on_ground) {
if (on_ground || !ch->get_master()) {
DropObjOnZoneReset(ch, charmice_box, true, false);
} else {
SendMsgToChar(ch->get_master(), "&YВолшебный узелок с вещами появился у вас в инвентаре.&n");
SendMsgToChar(ch->get_master(), "&YВолшебный узелок с вещами появился у вас в инвентаре.&n\r\n");
PlaceObjToInventory(charmice_box, ch->get_master());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gameplay/mechanics/deathtrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void deathtrap::activity() {
for (auto it = room_list.cbegin(); it != room_list.cend(); ++it) {
const auto people = (*it)->people; // make copy of people in the room
for (const auto i : people) {
if (i->purged() || i->IsNpc()) {
if (i->purged() || (i->IsNpc() && !IS_CHARMICE(i))) {
continue;
}
std::string name = i->get_name_str();
Expand Down
9 changes: 8 additions & 1 deletion src/gameplay/mechanics/dungeons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "engine/entities/char_data.h"
#include "utils/utils_time.h"
#include "gameplay/ai/spec_procs.h"
#include "gameplay/mechanics/deathtrap.h"

#include <third_party_libs/fmt/include/fmt/format.h>

Expand Down Expand Up @@ -397,6 +398,9 @@ void RoomDataCopy(ZoneRnum zrn_from, ZoneRnum zrn_to, std::vector<ZrnComplexList
new_room->fires = 0;
new_room->gdark = 0;
new_room->glight = 0;
if (ROOM_FLAGGED(i, ERoomFlag::kSlowDeathTrap) || ROOM_FLAGGED(i, ERoomFlag::kIceTrap)) {
deathtrap::add(world[new_rnum]);
}
for (int dir = 0; dir < EDirection::kMaxDirNum; ++dir) {
const auto &from = world[i]->dir_option_proto[dir];
if (from) {
Expand Down Expand Up @@ -873,10 +877,13 @@ void ClearRoom(RoomData *room) {
void RoomDataFree(ZoneRnum zrn) {
RoomRnum rrn_start = zone_table[zrn].RnumRoomsLocation.first;

for (RoomVnum rrn = rrn_start; rrn <= rrn_start + 99; rrn++) {
for (RoomRnum rrn = rrn_start; rrn <= rrn_start + 99; rrn++) {
while (room_spells::IsRoomAffected(world[rrn], ESpell::kPortalTimer)) {
RemovePortalGate(rrn);
}
if (ROOM_FLAGGED(rrn, ERoomFlag::kSlowDeathTrap) || ROOM_FLAGGED(rrn, ERoomFlag::kIceTrap)) {
deathtrap::remove(world[rrn]);
}
}
for (RoomVnum rvn = 0; rvn <= 99; rvn++) {
auto &room = world[rrn_start + rvn];
Expand Down
Loading