MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`report_init` -> `announcement_infost` 

also changes in field names due to identifying unks and canonicalization
develop
Kelly Kinkade 2023-11-21 05:08:40 -06:00
parent 37322de59b
commit adfcbc897e
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/LuaApi.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ distribution.
#include "df/specific_ref.h" #include "df/specific_ref.h"
#include "df/specific_ref_type.h" #include "df/specific_ref_type.h"
#include "df/vermin.h" #include "df/vermin.h"
#include "df/report_init.h" #include "df/announcement_infost.h"
#include "df/report_zoom_type.h" #include "df/report_zoom_type.h"
#include <lua.h> #include <lua.h>
@ -1564,7 +1564,7 @@ static int gui_getCurFocus(lua_State *state) {
static int gui_autoDFAnnouncement(lua_State *state) static int gui_autoDFAnnouncement(lua_State *state)
{ {
bool rv; bool rv;
df::report_init *r = Lua::GetDFObject<df::report_init>(state, 1); df::announcement_infost *r = Lua::GetDFObject<df::announcement_infost>(state, 1);
if (r) if (r)
{ {

4
library/include/modules/Gui.h
Unescape Escape View File

@ -37,7 +37,7 @@ distribution.
#include "df/announcement_type.h" #include "df/announcement_type.h"
#include "df/announcement_flags.h" #include "df/announcement_flags.h"
#include "df/building_stockpilest.h" #include "df/building_stockpilest.h"
#include "df/report_init.h" #include "df/announcement_infost.h"
#include "df/report_zoom_type.h" #include "df/report_zoom_type.h"
#include "df/unit_report_type.h" #include "df/unit_report_type.h"
@ -141,7 +141,7 @@ namespace DFHack
DFHACK_EXPORT void showAutoAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color = 7, bool bright = true, df::unit *unit1 = NULL, df::unit *unit2 = NULL); DFHACK_EXPORT void showAutoAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color = 7, bool bright = true, df::unit *unit1 = NULL, df::unit *unit2 = NULL);
// Process an announcement exactly like DF would, which might result in no announcement // Process an announcement exactly like DF would, which might result in no announcement
DFHACK_EXPORT bool autoDFAnnouncement(df::report_init r, std::string message); DFHACK_EXPORT bool autoDFAnnouncement(df::announcement_infost r, std::string message);
DFHACK_EXPORT bool autoDFAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color = 7, bool bright = true, DFHACK_EXPORT bool autoDFAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color = 7, bool bright = true,
df::unit *unit1 = NULL, df::unit *unit2 = NULL, bool is_sparring = false); df::unit *unit1 = NULL, df::unit *unit2 = NULL, bool is_sparring = false);

44
library/modules/Gui.cpp
Unescape Escape View File

@ -1769,7 +1769,7 @@ void Gui::showPopupAnnouncement(std::string message, int color, bool bright)
void Gui::showAutoAnnouncement( void Gui::showAutoAnnouncement(
df::announcement_type type, df::coord pos, std::string message, int color, bool bright, df::announcement_type type, df::coord pos, std::string message, int color, bool bright,
df::unit *unit1, df::unit *unit2 df::unit *unit_a, df::unit *unit_d
) { ) {
using df::global::d_init; using df::global::d_init;
@ -1781,11 +1781,11 @@ void Gui::showAutoAnnouncement(
int id = makeAnnouncement(type, flags, pos, message, color, bright); int id = makeAnnouncement(type, flags, pos, message, color, bright);
addCombatReportAuto(unit1, flags, id); addCombatReportAuto(unit_a, flags, id);
addCombatReportAuto(unit2, flags, id); addCombatReportAuto(unit_d, flags, id);
} }
bool Gui::autoDFAnnouncement(df::report_init r, string message) bool Gui::autoDFAnnouncement(df::announcement_infost r, string message)
{ // Reverse-engineered from DF announcement code { // Reverse-engineered from DF announcement code
if (!world->allow_announcements) if (!world->allow_announcements)
{ {
@ -1814,7 +1814,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
r.type != announcement_type::CONFLICT_CONVERSATION && r.type != announcement_type::CONFLICT_CONVERSATION &&
r.type != announcement_type::MECHANISM_SOUND) r.type != announcement_type::MECHANISM_SOUND)
{ // If not sound, make sure we can see pos { // If not sound, make sure we can see pos
if (world->units.active.empty() || (r.unit1 != world->units.active[0] && r.unit2 != world->units.active[0])) if (world->units.active.empty() || (r.unit_a != world->units.active[0] && r.unit_d != world->units.active[0]))
{ // Adventure mode reuses a dwarf mode digging designation bit to determine current visibility { // Adventure mode reuses a dwarf mode digging designation bit to determine current visibility
if (!Maps::isValidTilePos(r.pos) || (Maps::getTileDesignation(r.pos)->whole & 0x10) == 0x0) if (!Maps::isValidTilePos(r.pos) || (Maps::getTileDesignation(r.pos)->whole & 0x10) == 0x0)
{ {
@ -1826,7 +1826,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
} }
else else
{ // Dwarf mode { // Dwarf mode
if ((r.unit1 != NULL || r.unit2 != NULL) && (r.unit1 == NULL || Units::isHidden(r.unit1)) && (r.unit2 == NULL || Units::isHidden(r.unit2))) if ((r.unit_a != NULL || r.unit_d != NULL) && (r.unit_a == NULL || Units::isHidden(r.unit_a)) && (r.unit_d == NULL || Units::isHidden(r.unit_d)))
{ {
DEBUG(gui).print("Dwarf mode announcement not detected:\n%s\n", message.c_str()); DEBUG(gui).print("Dwarf mode announcement not detected:\n%s\n", message.c_str());
return false; return false;
@ -1836,7 +1836,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
{ {
if (a_flags.bits.UNIT_COMBAT_REPORT) if (a_flags.bits.UNIT_COMBAT_REPORT)
{ {
if (r.unit1 == NULL && r.unit2 == NULL) if (r.unit_a == NULL && r.unit_d == NULL)
{ {
DEBUG(gui).print("Skipped UNIT_COMBAT_REPORT because it has no units:\n%s\n", message.c_str()); DEBUG(gui).print("Skipped UNIT_COMBAT_REPORT because it has no units:\n%s\n", message.c_str());
return false; return false;
@ -1849,7 +1849,7 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
DEBUG(gui).print("Skipped announcement not enabled for this game mode:\n%s\n", message.c_str()); DEBUG(gui).print("Skipped announcement not enabled for this game mode:\n%s\n", message.c_str());
return false; return false;
} }
else if (!recent_report_any(r.unit1) && !recent_report_any(r.unit2)) else if (!recent_report_any(r.unit_a) && !recent_report_any(r.unit_d))
{ {
DEBUG(gui).print("Skipped UNIT_COMBAT_REPORT_ALL_ACTIVE because there's no active report:\n%s\n", message.c_str()); DEBUG(gui).print("Skipped UNIT_COMBAT_REPORT_ALL_ACTIVE because there's no active report:\n%s\n", message.c_str());
return false; return false;
@ -1908,8 +1908,8 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
new_report->id = world->status.next_report_id++; new_report->id = world->status.next_report_id++;
new_report->year = *df::global::cur_year; new_report->year = *df::global::cur_year;
new_report->time = *df::global::cur_year_tick; new_report->time = *df::global::cur_year_tick;
new_report->unk_v40_1 = r.unk_v40_1; new_report->activity_id = r.activity_id;
new_report->unk_v40_2 = r.unk_v40_2; new_report->activity_event_id = r.activity_event_id;
new_report->speaker_id = r.speaker_id; new_report->speaker_id = r.speaker_id;
world->status.reports.push_back(new_report); world->status.reports.push_back(new_report);
@ -1932,22 +1932,22 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
{ {
if (a_flags.bits.UNIT_COMBAT_REPORT) if (a_flags.bits.UNIT_COMBAT_REPORT)
{ {
if (r.unit1 != NULL) if (r.unit_a != NULL)
success |= add_proper_report(r.unit1, !r.flags.bits.hostile_combat, new_report_index); success |= add_proper_report(r.unit_a, !r.flags.bits.hostile_combat, new_report_index);
if (r.unit2 != NULL) if (r.unit_d != NULL)
success |= add_proper_report(r.unit2, !r.flags.bits.hostile_combat, new_report_index); success |= add_proper_report(r.unit_d, !r.flags.bits.hostile_combat, new_report_index);
} }
if (a_flags.bits.UNIT_COMBAT_REPORT_ALL_ACTIVE) if (a_flags.bits.UNIT_COMBAT_REPORT_ALL_ACTIVE)
{ {
FOR_ENUM_ITEMS(unit_report_type, slot) FOR_ENUM_ITEMS(unit_report_type, slot)
{ {
if (recent_report(r.unit1, slot)) if (recent_report(r.unit_a, slot))
success |= addCombatReport(r.unit1, slot, new_report_index); success |= addCombatReport(r.unit_a, slot, new_report_index);
if (recent_report(r.unit2, slot)) if (recent_report(r.unit_d, slot))
success |= addCombatReport(r.unit2, slot, new_report_index); success |= addCombatReport(r.unit_a, slot, new_report_index);
} }
} }
} }
@ -1972,16 +1972,16 @@ bool Gui::autoDFAnnouncement(df::report_init r, string message)
} }
bool Gui::autoDFAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color, bool Gui::autoDFAnnouncement(df::announcement_type type, df::coord pos, std::string message, int color,
bool bright, df::unit *unit1, df::unit *unit2, bool is_sparring) bool bright, df::unit *unit_a, df::unit *unit_d, bool is_sparring)
{ {
auto r = df::report_init(); auto r = df::announcement_infost();
r.type = type; r.type = type;
r.color = color; r.color = color;
r.bright = bright; r.bright = bright;
r.pos = pos; r.pos = pos;
r.display_timer = ANNOUNCE_DISPLAY_TIME; r.display_timer = ANNOUNCE_DISPLAY_TIME;
r.unit1 = unit1; r.unit_a = unit_a;
r.unit2 = unit2; r.unit_d = unit_d;
r.flags.bits.hostile_combat = !is_sparring; r.flags.bits.hostile_combat = !is_sparring;
return autoDFAnnouncement(r, message); return autoDFAnnouncement(r, message);