From 70b1bb31437937f1f36b13c5a80836ba524aaeeb Mon Sep 17 00:00:00 2001
From: Procyonae <45432782+Procyonae@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:55:22 +0000
Subject: [PATCH] Remove sees_player_hitbutton mod

---
 data/mods/sees_player_hitbutton/mod_tileset.json |  12 ------------
 data/mods/sees_player_hitbutton/modinfo.json     |  11 -----------
 .../sees_player_hitbutton_green.png              | Bin 1178 -> 0 bytes
 .../sees_player_hitbutton_pink.png               | Bin 1180 -> 0 bytes
 .../sees_player_hitbutton_red.png                | Bin 1179 -> 0 bytes
 .../sees_player_hitbutton_yellow.png             | Bin 1180 -> 0 bytes
 src/game.cpp                                     |   8 +++++---
 7 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 data/mods/sees_player_hitbutton/mod_tileset.json
 delete mode 100644 data/mods/sees_player_hitbutton/modinfo.json
 delete mode 100644 data/mods/sees_player_hitbutton/sees_player_hitbutton_green.png
 delete mode 100644 data/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png
 delete mode 100644 data/mods/sees_player_hitbutton/sees_player_hitbutton_red.png
 delete mode 100644 data/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png

diff --git a/data/mods/sees_player_hitbutton/mod_tileset.json b/data/mods/sees_player_hitbutton/mod_tileset.json
deleted file mode 100644
index 04d5c8471f370..0000000000000
--- a/data/mods/sees_player_hitbutton/mod_tileset.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-  {
-    "type": "mod_tileset",
-    "compatibility": [ "HitButton_iso" ],
-    "tiles-new": [
-      { "file": "sees_player_hitbutton_green.png", "tiles": [ { "id": "overlay_friendly_sees_player", "fg": 0 } ] },
-      { "file": "sees_player_hitbutton_yellow.png", "tiles": [ { "id": "overlay_neutral_sees_player", "fg": 1 } ] },
-      { "file": "sees_player_hitbutton_red.png", "tiles": [ { "id": "overlay_hostile_sees_player", "fg": 2 } ] },
-      { "file": "sees_player_hitbutton_pink.png", "tiles": [ { "id": "overlay_other_sees_player", "fg": 3 } ] }
-    ]
-  }
-]
diff --git a/data/mods/sees_player_hitbutton/modinfo.json b/data/mods/sees_player_hitbutton/modinfo.json
deleted file mode 100644
index 5ddaa27574508..0000000000000
--- a/data/mods/sees_player_hitbutton/modinfo.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    "type": "MOD_INFO",
-    "id": "sees_player_hitbutton",
-    "name": "sees-player icon, HitButton_iso",
-    "authors": [ "esotericist", "AnthonBerg" ],
-    "description": "Adds indicator icon if a creature sees the player.  Designed for the HitButton isometric tileset.",
-    "category": "graphical",
-    "dependencies": [ "dda" ]
-  }
-]
diff --git a/data/mods/sees_player_hitbutton/sees_player_hitbutton_green.png b/data/mods/sees_player_hitbutton/sees_player_hitbutton_green.png
deleted file mode 100644
index 70a11d86426c8646ef810fdea439062f279d176c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1178
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDVB6cUq=RpjeRx011B>uFeYa@
zI|q0=J1Ybf<)>xlq%tsQOiWHlh?*D?FyXMufddm}hX;u~dACGBP;%*ke={0;8#@_!
zgeG@$%P=$5IOIt5a_x&vPGGq>z0@%+@zi5h8_ktRPxA2eC^?jQ7C8oTPPogMqCI`O
zNW+cnhMb8?3l=xLVOA)!YN=&C;@7kxzTs*MizV~T`i7i+o1T;`h*OhOxUHbCYRrFP
z8{?+8lZ=Ie8{SAMM5}Xp)>;WkKaw+;P~>;!q>q-Dj;C)R18Z+_onKvGp<_~!R_8nw
z7Ox;}FNZC~b&jclX;p5WP09u;!J;;wCw(mu>EYqgm6UM!$Q0Pik>3*W&xnn!`#lfO
znY|nvm(1khxqVwgLS>!uk&tIb1|Q6g4RUVJj)@9k+d6OJ$r+7|LTLhaM`{eZ8O5cA
z)+HnyJFuarwNWueo7s7SDf3|;J2tk`ggG1xg)A4=y$I&<Ikv2ThxKUYF}H%^iHu@)
z4EpQh%co_R$pC|2A=x9ymw}<3pMjwVi2nlPsL_Fep|+BN;bk`igUwS02FWwUHm#tj
z;w<opEM{QfI|9OtQ?>b|85o$tGD9LtB7A+UlJj%*5>xV%QuQiw3xKMDnk%e;%-qzH
zM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&BvUzDm~s%N5Spk&9TprBw=l#*r@
z<l+X^4&>P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)Qsw
zftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-`&<47aDCv?vE`OG>hSYEEiyYF<gP
zzM-C>J~n-+6`2SZ<`qMO0~j#+AQ_-G1FYJBfdsb?MOQ^)0YnoxG$4+&NlCUUE=|fx
zO)fza1<HW~%PBEkA4%9oAFFB`kaMg;i&Kl7^K(I7vU4s<O)N=GQ7F$W$xv|j^bN29
zI~hd{BA{%5F17+|$uA1Y&(E<dNX*PD(aTFMQ83Xn)HAcuM^^yVYoiYed8C+tL^D_v
z7|(WGK%KBOW5;zmT{RMzjO;yK978MwlM^IZdsNsQnI`>WRWK8t#87zVKhNihqLcC%
zHsvYIE@76C6q<Ne;Vwhh-iBvPDc5^8xjQF3aAIIs^nsPfNMgxRP?Gd?^>bP0l+XkK
D$xC)z

diff --git a/data/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png b/data/mods/sees_player_hitbutton/sees_player_hitbutton_pink.png
deleted file mode 100644
index 970a8b8cb6395d6c36b063964787f68774211bdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDVB6cUq=RpjeRx011B>uFeYa@
zI|q0=J1Ybf<)>xlq%tsQOiWHlh?*D?FyXMufddm}hX;u~dACGBP;%*ke={0;8#@_!
zgeG@$%P=$5IOIt5a_x&vPGGq>z0@%+@zi5h8_ktRPxA2eC^?jQ7C8oTPPogMqCI`O
zNW+cnhMb8?3l=xLVOA)!YN=&C;@7kxzTs*MizV~T`i7i+o1T;`h*OhOxUHbCYRrFP
z8{?+8lZ=Ie8{SAMM5}Xp)>;WkKaw+;P~>;!q>q-Dj;C)R18Z+_onKvGp<_~!R_8nw
z7Ox;}FNZC~b&jclX;p5WP09u;!J;;wCw(mu>EYqgm6UM!$Q0Pik>3*W&xnn!`#lfO
znY|nvm(1khxqVwgLS>!uk&tIb1|Q6g4RUVJj)@9k+d6OJ$r+7|LTLhaM`{eZ8O5cA
z)+HnyJFuarwNWueo7s7SDf3|;J2tk`ggG1xg)A4=y$I&<Ikv2ThxKUYF}H%^iHu@)
z4EpQh%co_R$pC|2A=x9ymw}<3pMjwVi2nlPsL_Fep|+BN;bk`igUwS02FWwUHm#tj
z;w<opEM{QfI|9OtQ?>b|85o$tGD9LtB7A+UlJj%*5>xV%QuQiw3xKMDnk%e;%-qzH
zM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&BvUzDm~s%N5Spk&9TprBw=l#*r@
z<l+X^4&>P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)Qsw
zftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-`&<47aDCv?vE`OG>hSYEEiyYF<gP
zzM-C>J~n-+6`2SZ<`qMO0~j#+AQ_-G1FYJBfdsb?MOQ^)0YnoxG$4+&NlCUUE=|fx
zO)fza1<HW~%PBEkA4%9oAFFB`kaMg;i&Kl7^K(I7vU4s<O)N=GQ7F$W$xv|j^bN29
zI~hd{BA{%5F17+|$uA1Y&(E<dNX*PD(aTFMQ83Xn)HAcuM^^yVYoiYed8C+tL^D_v
z7|(WGK%KBOW5;zmT{RMzj2t~(978MwlM^IZdsNsQnI`>WRWK8t#1MGqKhOW?%GxS7
z8B)$Fn4M%ZFfve6l6Km}C{oRMm-WOt$<+R~0|#1xDR>$?k29af8&IP3boFyt=akR{
E0A2=kLjV8(

diff --git a/data/mods/sees_player_hitbutton/sees_player_hitbutton_red.png b/data/mods/sees_player_hitbutton/sees_player_hitbutton_red.png
deleted file mode 100644
index 6143c2d1be851d5f18ff6f6be99d9b0a43400cb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1179
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDVB6cUq=RpjeRx011B>uFeYa@
zI|q0=J1Ybf<)>xlq%tsQOiWHlh?*D?FyXMufddm}hX;u~dACGBP;%*ke={0;8#@_!
zgeG@$%P=$5IOIt5a_x&vPGGq>z0@%+@zi5h8_ktRPxA2eC^?jQ7C8oTPPogMqCI`O
zNW+cnhMb8?3l=xLVOA)!YN=&C;@7kxzTs*MizV~T`i7i+o1T;`h*OhOxUHbCYRrFP
z8{?+8lZ=Ie8{SAMM5}Xp)>;WkKaw+;P~>;!q>q-Dj;C)R18Z+_onKvGp<_~!R_8nw
z7Ox;}FNZC~b&jclX;p5WP09u;!J;;wCw(mu>EYqgm6UM!$Q0Pik>3*W&xnn!`#lfO
znY|nvm(1khxqVwgLS>!uk&tIb1|Q6g4RUVJj)@9k+d6OJ$r+7|LTLhaM`{eZ8O5cA
z)+HnyJFuarwNWueo7s7SDf3|;J2tk`ggG1xg)A4=y$I&<Ikv2ThxKUYF}H%^iHu@)
z4EpQh%co_R$pC|2A=x9ymw}<3pMjwVi2nlPsL_Fep|+BN;bk`igUwS02FWwUHm#tj
z;w<opEM{QfI|9OtQ?>b|85o$tGD9LtB7A+UlJj%*5>xV%QuQiw3xKMDnk%e;%-qzH
zM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&BvUzDm~s%N5Spk&9TprBw=l#*r@
z<l+X^4&>P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)Qsw
zftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-`&<47aDCv?vE`OG>hSYEEiyYF<gP
zzM-C>J~n-+6`2SZ<`qMO0~j#+AQ_-G1FYJBfdsb?MOQ^)0YnoxG$4+&NlCUUE=|fx
zO)fza1<HW~%PBEkA4%9oAFFB`kaMg;i&Kl7^K(I7vU4s<O)N=GQ7F$W$xv|j^bN29
zI~hd{BA{%5F17+|$uA1Y&(E<dNX*PD(aTFMQ83Xn)HAcuM^^yVYoiYed8C+tL^D_v
z7|(WGK%KBOW5;zmT{RMzj2t{&978MwlM^IZdsNsQnI`>WRWK8t#1MGqKM&96iK3Ho
z7&fH|%uZo$sPl6%Ye`|&_{Ox0dqS-7DLLN8Ms7xiB_CLMlK0;{4N8-qu6{1-oD!M<
D^wf15

diff --git a/data/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png b/data/mods/sees_player_hitbutton/sees_player_hitbutton_yellow.png
deleted file mode 100644
index db582541a3265c722b7bd9d644570b4cda2fd6a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRn!3HE-lJ=GZDVB6cUq=RpjeRx011B>uFeYa@
zI|q0=J1Ybf<)>xlq%tsQOiWHlh?*D?FyXMufddm}hX;u~dACGBP;%*ke={0;8#@_!
zgeG@$%P=$5IOIt5a_x&vPGGq>z0@%+@zi5h8_ktRPxA2eC^?jQ7C8oTPPogMqCI`O
zNW+cnhMb8?3l=xLVOA)!YN=&C;@7kxzTs*MizV~T`i7i+o1T;`h*OhOxUHbCYRrFP
z8{?+8lZ=Ie8{SAMM5}Xp)>;WkKaw+;P~>;!q>q-Dj;C)R18Z+_onKvGp<_~!R_8nw
z7Ox;}FNZC~b&jclX;p5WP09u;!J;;wCw(mu>EYqgm6UM!$Q0Pik>3*W&xnn!`#lfO
znY|nvm(1khxqVwgLS>!uk&tIb1|Q6g4RUVJj)@9k+d6OJ$r+7|LTLhaM`{eZ8O5cA
z)+HnyJFuarwNWueo7s7SDf3|;J2tk`ggG1xg)A4=y$I&<Ikv2ThxKUYF}H%^iHu@)
z4EpQh%co_R$pC|2A=x9ymw}<3pMjwVi2nlPsL_Fep|+BN;bk`igUwS02FWwUHm#tj
z;w<opEM{QfI|9OtQ?>b|85o$tGD9LtB7A+UlJj%*5>xV%QuQiw3xKMDnk%e;%-qzH
zM1_jnoV;SI3R@+x3M(KRB&@Hb09I0xZL1XF8=&BvUzDm~s%N5Spk&9TprBw=l#*r@
z<l+X^4&>P?Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)Qsw
zftllyTAW;zSx}OhpQivaH!&%{w8U0P31kr*K-`&<47aDCv?vE`OG>hSYEEiyYF<gP
zzM-C>J~n-+6`2SZ<`qMO0~j#+AQ_-G1FYJBfdsb?MOQ^)0YnoxG$4+&NlCUUE=|fx
zO)fza1<HW~%PBEkA4%9oAFFB`kaMg;i&Kl7^K(I7vU4s<O)N=GQ7F$W$xv|j^bN29
zI~hd{BA{%5F17+|$uA1Y&(E<dNX*PD(aTFMQ83Xn)HAcuM^^yVYoiYed8C+tL^D_v
z7|(WGK%KBOW5;zmT{RMzj2t~(978MwlM^IZdsNsQnI`>WRWK8t#1MGq|9{D6%GxS7
z8B)$Fn4M%ZFfvk6l6Km}C{oRMm-WOt$<+R~0|#0e7^J7M^B9{?Sqw^)p00i_>zopr
E0A+S`jQ{`u

diff --git a/src/game.cpp b/src/game.cpp
index 825df7ee8e71a..efc7a6a9d19c3 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -319,6 +319,7 @@ static const json_character_flag json_flag_WEB_RAPPEL( "WEB_RAPPEL" );
 
 static const mod_id MOD_INFORMATION_Graphical_Overmap( "Graphical_Overmap" );
 static const mod_id MOD_INFORMATION_dda( "dda" );
+static const mod_id MOD_INFORMATION_sees_player_hitbutton( "sees_player_hitbutton" );
 
 static const mongroup_id GROUP_BLACK_ROAD( "GROUP_BLACK_ROAD" );
 
@@ -3335,9 +3336,10 @@ void game::load_packs( const std::string &msg, const std::vector<mod_id> &packs
         load_mod_interaction_data_from_dir( mod.path / "mod_interactions", mod.ident.str() );
     }
 
-
-    std::unordered_set<mod_id> removed_mods {
-        MOD_INFORMATION_Graphical_Overmap // Removed in 0.I
+    // Missing mods removed within the last version cycle trigger a different message to make it clear they have been intentionally removed
+    const std::unordered_set<mod_id> removed_mods {
+        MOD_INFORMATION_Graphical_Overmap, // Removed in 0.I
+        MOD_INFORMATION_sees_player_hitbutton // Removed in 0.I
     };
     std::unordered_set<mod_id> mods_to_remove;
     for( const mod_id &e : missing ) {