From c2d6debcd8bac2a93ba9e17a918cff601a9b68bd Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 28 Jan 2023 23:59:36 -0800
Subject: [PATCH 1/2] add on/off light textures and expose to lua

---
 data/art/on-off.png                | Bin 0 -> 273 bytes
 library/LuaApi.cpp                 |   1 +
 library/include/modules/Textures.h |   5 +++++
 library/modules/Textures.cpp       |   7 +++++++
 4 files changed, 13 insertions(+)
 create mode 100644 data/art/on-off.png

diff --git a/data/art/on-off.png b/data/art/on-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b731e1c6b89ab99485a34c31cf65d6b9cd949b1
GIT binary patch
literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!2~3qw63}aq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vW?aSW-rl{97I#6$&F1ICZ)-u%=4nO3>WISWkSo_JV~
zZ;NB%SI+h9|Lg0Gn3Z;a&TsT!<576T<mBYQBF=tuL2A~%z!Ne_uVT`Scf57@nCy1Q
zE9#ZQ7uD<R4^<}pHSjT6@ovtS2M41SiuUgOa&hkMg3QL5w-tKIfBqFHbW6Cvl<cCR
z!@BOp-Bp$~$IBg*_=4w5yt0H*Ac5h(n{U)nk&S<Vj^s;?@J#ddWzYh$Ie-`hE(K2p
NQJ$`TF6*2Ung9(8Vvqm;

literal 0
HcmV?d00001

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 421821c05..764557499 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1693,6 +1693,7 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
     WRAPM(Textures, getGreenPinTexposStart),
     WRAPM(Textures, getRedPinTexposStart),
     WRAPM(Textures, getIconsTexposStart),
+    WRAPM(Textures, getOnOffTexposStart),
     WRAPM(Textures, getThinBordersTexposStart),
     WRAPM(Textures, getMediumBordersTexposStart),
     WRAPM(Textures, getPanelBordersTexposStart),
diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
index e01003704..446bd1962 100644
--- a/library/include/modules/Textures.h
+++ b/library/include/modules/Textures.h
@@ -41,6 +41,11 @@ DFHACK_EXPORT long getRedPinTexposStart();
  */
 DFHACK_EXPORT long getIconsTexposStart();
 
+/**
+ * Get the first texpos for the on and off icons. It's a 2x1 grid.
+ */
+DFHACK_EXPORT long getOnOffTexposStart();
+
 /**
  * Get the first texpos for the DFHack borders. Each is a 7x3 grid.
  */
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index 2975dc4d8..7781bfc10 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -22,6 +22,7 @@ static long g_dfhack_logo_texpos_start = -1;
 static long g_green_pin_texpos_start = -1;
 static long g_red_pin_texpos_start = -1;
 static long g_icons_texpos_start = -1;
+static long g_on_off_texpos_start = -1;
 static long g_thin_borders_texpos_start = -1;
 static long g_medium_borders_texpos_start = -1;
 static long g_panel_borders_texpos_start = -1;
@@ -124,6 +125,8 @@ void Textures::init(color_ostream &out) {
                                           &g_red_pin_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/icons.png",
                                           &g_icons_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/on-off.png",
+                                          &g_on_off_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-thin.png",
                                           &g_thin_borders_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-medium.png",
@@ -180,6 +183,10 @@ long Textures::getIconsTexposStart() {
     return g_icons_texpos_start;
 }
 
+long Textures::getOnOffTexposStart() {
+    return g_on_off_texpos_start;
+}
+
 long Textures::getThinBordersTexposStart() {
     return g_thin_borders_texpos_start;
 }

From 2a3710202a6854cb754ef3c8411cf78eaa2dd5e4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 29 Jan 2023 00:35:12 -0800
Subject: [PATCH 2/2] use new icons in pathable

---
 plugins/pathable.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/pathable.cpp b/plugins/pathable.cpp
index b66099a1f..dd26a712f 100644
--- a/plugins/pathable.cpp
+++ b/plugins/pathable.cpp
@@ -1,6 +1,7 @@
 #include "modules/Gui.h"
 #include "modules/Maps.h"
 #include "modules/Screen.h"
+#include "modules/Textures.h"
 
 #include "Debug.h"
 #include "LuaTools.h"
@@ -38,6 +39,11 @@ static void paintScreen(df::coord target, bool skip_unrevealed = false) {
 
     long pathable_tile_texpos = 779;
     long unpathable_tile_texpos = 782;
+    long on_off_texpos = Textures::getOnOffTexposStart();
+    if (on_off_texpos > 0) {
+        pathable_tile_texpos = on_off_texpos + 0;
+        unpathable_tile_texpos = on_off_texpos + 1;
+    }
 
     auto dims = Gui::getDwarfmodeViewDims().map();
     for (int y = dims.first.y; y <= dims.second.y; ++y) {