adventure beta updates

CMakeLists.txt

@@ -7,8 +7,8 @@ cmake_policy(SET CMP0074 NEW)
 project(dfhack)
 
 # set up versioning.
-set(DF_VERSION "50.12")
-set(DFHACK_RELEASE "r3")
+set(DF_VERSION "51.01")
+set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

plugins/hotkeys.cpp

@@ -21,7 +21,9 @@ using std::vector;
 
 using namespace DFHack;
 
-static const string INVOKE_MENU_COMMAND = "overlay trigger hotkeys.menu";
+static const string INVOKE_MENU_BASE_COMMAND = "overlay trigger ";
+static const string INVOKE_MENU_PREFIX = INVOKE_MENU_BASE_COMMAND + "hotkeys.";
+static const string INVOKE_MENU_DEFAULT_COMMAND = INVOKE_MENU_BASE_COMMAND + "hotkeys.menu";
 static const string INVOKE_HOTKEYS_COMMAND = "hotkeys";
 static const std::string MENU_SCREEN_FOCUS_STRING = "dfhack/lua/hotkeys/menu";
 
@@ -64,7 +66,7 @@ static void add_binding_if_valid(color_ostream &out, const string &sym, const st
     if (!can_invoke(cmdline, screen))
         return;
 
-    if (filtermenu && (cmdline == INVOKE_MENU_COMMAND ||
+    if (filtermenu && (cmdline.starts_with(INVOKE_MENU_PREFIX) ||
                        cmdline == INVOKE_HOTKEYS_COMMAND)) {
         DEBUG(log).print("filtering out hotkey menu keybinding\n");
         return;
@@ -191,8 +193,12 @@ static bool invoke_command(color_ostream &out, const size_t index) {
 
 static command_result hotkeys_cmd(color_ostream &out, vector <string> & parameters) {
     if (!parameters.size()) {
-        DEBUG(log).print("invoking command: '%s'\n", INVOKE_MENU_COMMAND.c_str());
-        return Core::getInstance().runCommand(out, INVOKE_MENU_COMMAND );
+        DEBUG(log).print("invoking command: '%s'\n", INVOKE_MENU_DEFAULT_COMMAND.c_str());
+        return Core::getInstance().runCommand(out, INVOKE_MENU_DEFAULT_COMMAND );
+    } else if (parameters.size() == 2 && parameters[0] == "menu") {
+        string cmd = INVOKE_MENU_BASE_COMMAND + parameters[1];
+        DEBUG(log).print("invoking command: '%s'\n", cmd.c_str());
+        return Core::getInstance().runCommand(out, cmd);
     }
 
     CoreSuspender guard;

plugins/lua/hotkeys.lua

@@ -27,28 +27,7 @@ end
 
 HotspotMenuWidget = defclass(HotspotMenuWidget, overlay.OverlayWidget)
 HotspotMenuWidget.ATTRS{
-    desc='Shows the DFHack logo context menu button.',
-    default_pos={x=5,y=1},
     default_enabled=true,
-    version=2,
-    viewscreens={
-        'adopt_region',
-        'choose_game_type',
-        -- 'choose_start_site', -- conflicts with vanilla panel layouts
-        'dwarfmode',
-        'export_region',
-        'game_cleaner',
-        'initial_prep',
-        -- 'legends', -- conflicts with vanilla export button and info text
-        -- 'loadgame', -- disable temporarily while we get texture reloading sorted
-        -- 'new_arena', -- conflicts with vanilla panel layouts
-        -- 'new_region', -- conflicts with vanilla panel layouts
-        'savegame',
-        'setupdwarfgame',
-        'title/Default',
-        'update_region',
-        'world'
-    },
     frame={w=4, h=3}
 }
 
@@ -84,7 +63,7 @@ function HotspotMenuWidget:init()
                 get_tile_token(5, 179), get_tile_token(6, 'H'), get_tile_token(7, 'a'), get_tile_token(8, 179), NEWLINE,
                 get_tile_token(9, 179), get_tile_token(10, 'c'), get_tile_token(11, 'k'), get_tile_token(12, 179),
             },
-            on_click=function() dfhack.run_command('hotkeys') end,
+            on_click=function() dfhack.run_command{'hotkeys', 'menu', self.name} end,
         },
     }
 end
@@ -93,8 +72,51 @@ function HotspotMenuWidget:overlay_trigger()
     return MenuScreen{hotspot=self}:show()
 end
 
+DwarfHotspotMenuWidget = defclass(DwarfHotspotMenuWidget, HotspotMenuWidget)
+DwarfHotspotMenuWidget.ATTRS{
+    desc='Shows the DFHack logo context menu button in non-adventure mode screens.',
+    default_pos={x=5,y=1},
+    version=2,
+    viewscreens={
+        'adopt_region',
+        'choose_game_type',
+        -- 'choose_start_site', -- conflicts with vanilla panel layouts
+        'dwarfmode',
+        'export_region',
+        'game_cleaner',
+        'initial_prep',
+        -- 'legends', -- conflicts with vanilla export button and info text
+        -- 'loadgame', -- disable temporarily while we get texture reloading sorted
+        -- 'new_arena', -- conflicts with vanilla panel layouts
+        -- 'new_region', -- conflicts with vanilla panel layouts
+        'savegame',
+        'setupdwarfgame',
+        'title/Default',
+        'update_region',
+        'world'
+    },
+}
+
+DungeonHotspotMenuWidget = defclass(DungeonHotspotMenuWidget, HotspotMenuWidget)
+DungeonHotspotMenuWidget.ATTRS{
+    desc='Shows the DFHack logo context menu button in adventure mode screens.',
+    default_pos={x=5,y=-13},
+    viewscreens={
+        -- 'adventure_log', -- need to verify compatibility
+        -- 'barter', -- need to verify compatibility
+        -- 'dungeon_monsterstatus', -- need to verify compatibility
+        'dungeonmode',
+        -- 'layer_unit_action', -- need to verify compatibility
+        -- 'layer_unit_health', -- need to verify compatibility
+        -- 'setupadventure', -- need to verify compatibility
+    },
+}
+
 -- register the menu hotspot with the overlay
-OVERLAY_WIDGETS = {menu=HotspotMenuWidget}
+OVERLAY_WIDGETS = {
+    menu=DwarfHotspotMenuWidget,
+    adventuremenu=DungeonHotspotMenuWidget,
+}
 
 -- ---- --
 -- Menu --

plugins/overlay.cpp

@@ -1,16 +1,23 @@
 #include "df/enabler.h"
 #include "df/viewscreen_adopt_regionst.h"
+//#include "df/viewscreen_adventure_logst.h"
+//#include "df/viewscreen_barterst.h"
 #include "df/viewscreen_choose_game_typest.h"
 #include "df/viewscreen_choose_start_sitest.h"
+//#include "df/viewscreen_dungeon_monsterstatusst.h"
+#include "df/viewscreen_dungeonmodest.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_export_regionst.h"
 #include "df/viewscreen_game_cleanerst.h"
 #include "df/viewscreen_initial_prepst.h"
+//#include "df/viewscreen_layer_unit_actionst.h"
+//#include "df/viewscreen_layer_unit_healthst.h"
 #include "df/viewscreen_legendsst.h"
 #include "df/viewscreen_loadgamest.h"
 #include "df/viewscreen_new_arenast.h"
 #include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_savegamest.h"
+#include "df/viewscreen_setupadventurest.h"
 #include "df/viewscreen_setupdwarfgamest.h"
 #include "df/viewscreen_titlest.h"
 #include "df/viewscreen_update_regionst.h"
@@ -112,17 +119,24 @@ struct viewscreen_overlay : T {
     template<> IMPLEMENT_VMETHOD_INTERPOSE_PRIO(screen##_overlay, render, 100);
 
 IMPLEMENT_HOOKS(adopt_region)
+//IMPLEMENT_HOOKS(adventure_log)
+//IMPLEMENT_HOOKS(barter)
 IMPLEMENT_HOOKS(choose_game_type)
 IMPLEMENT_HOOKS(choose_start_site)
+//IMPLEMENT_HOOKS(dungeon_monsterstatus)
+IMPLEMENT_HOOKS(dungeonmode)
 IMPLEMENT_HOOKS(dwarfmode)
 IMPLEMENT_HOOKS(export_region)
 IMPLEMENT_HOOKS(game_cleaner)
 IMPLEMENT_HOOKS(initial_prep)
+//IMPLEMENT_HOOKS(layer_unit_action)
+//IMPLEMENT_HOOKS(layer_unit_health)
 IMPLEMENT_HOOKS(legends)
 IMPLEMENT_HOOKS(loadgame)
 IMPLEMENT_HOOKS(new_arena)
 IMPLEMENT_HOOKS(new_region)
 IMPLEMENT_HOOKS(savegame)
+IMPLEMENT_HOOKS(setupadventure)
 IMPLEMENT_HOOKS(setupdwarfgame)
 IMPLEMENT_HOOKS(title)
 IMPLEMENT_HOOKS(update_region)
@@ -147,17 +161,24 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) {
     DEBUG(control).print("%sing interpose hooks\n", enable ? "enabl" : "disabl");
 
     if (INTERPOSE_HOOKS_FAILED(adopt_region) ||
+//            INTERPOSE_HOOKS_FAILED(adventure_log) ||
+//            INTERPOSE_HOOKS_FAILED(barter) ||
             INTERPOSE_HOOKS_FAILED(choose_start_site) ||
             INTERPOSE_HOOKS_FAILED(choose_game_type) ||
+//            INTERPOSE_HOOKS_FAILED(dungeon_monsterstatus) ||
+            INTERPOSE_HOOKS_FAILED(dungeonmode) ||
             INTERPOSE_HOOKS_FAILED(dwarfmode) ||
             INTERPOSE_HOOKS_FAILED(export_region) ||
             INTERPOSE_HOOKS_FAILED(game_cleaner) ||
             INTERPOSE_HOOKS_FAILED(initial_prep) ||
+//            INTERPOSE_HOOKS_FAILED(layer_unit_action) ||
+//            INTERPOSE_HOOKS_FAILED(layer_unit_health) ||
             INTERPOSE_HOOKS_FAILED(legends) ||
             INTERPOSE_HOOKS_FAILED(loadgame) ||
             INTERPOSE_HOOKS_FAILED(new_arena) ||
             INTERPOSE_HOOKS_FAILED(new_region) ||
             INTERPOSE_HOOKS_FAILED(savegame) ||
+            INTERPOSE_HOOKS_FAILED(setupadventure) ||
             INTERPOSE_HOOKS_FAILED(setupdwarfgame) ||
             INTERPOSE_HOOKS_FAILED(title) ||
             INTERPOSE_HOOKS_FAILED(update_region) ||

plugins/remotefortressreader/remotefortressreader.cpp

@@ -2526,9 +2526,9 @@ static void CopyLocalMap(df::world_data * worldData, df::world_region_details* w
                 if (region_x < 0 || region_y < 0 || region_x >= 16 || region_y >= 16)
                     continue;
 
-                for (size_t j = 0; j < realization->building_map[site_x][site_y].buildings.size(); j++)
+                for (size_t j = 0; j < realization->face[site_x][site_y].buildings.size(); j++)
                 {
-                    auto in_building = realization->building_map[site_x][site_y].buildings[j];
+                    auto in_building = realization->face[site_x][site_y].buildings[j];
                     auto out_building = outputTiles[region_x][region_y]->add_buildings();
 
                     out_building->set_id(in_building->id);