mention custom mode in watermark

attack.cpp

@@ -151,7 +151,7 @@ EX bool canAttack(cell *c1, eMonster m1, cell *c2, eMonster m2, flagtype flags)
   if(!(flags & (AF_GUN | AF_SWORD | AF_SWORD_INTO | AF_MAGIC | AF_PLAGUE)))
     if(c1 != c2 && !logical_adjacent(c1, m1, c2)) return false;
 
-  if(!(flags & (AF_LANCE | AF_STAB | AF_BACK | AF_APPROACH | AF_GUN | AF_MAGIC | AF_PLAGUE | AF_SIDE)))
+  if(!(flags & (AF_LANCE | AF_STAB | AF_BACK | AF_APPROACH | AF_GUN | AF_MAGIC | AF_PLAGUE | AF_SIDE | AF_BOW)))
     if(c1 && c2 && againstRose(c1, c2) && !ignoresSmell(m1))
       return false;
   

celldrawer.cpp

@@ -1848,6 +1848,12 @@ void celldrawer::draw_features_and_walls_3d() {
           queuepoly(V, cgi.shPlainWall3D[ofs + a], darkena(wcol2 - d * get_darkval(c, a), 0, 0xFF));
         }
       }
+    if(WDIM == 3 && c->wall == waRose) {
+      color_t col = winf[waRose].color;
+      color_t col2 = (col << 8) | 0xFF;
+      if(rosephase == 7) col2 = 0xFFFFFFFF;
+      addradar(V, winf[waRose].glyph, col, col2);
+      }
     } }
   else {
     if(!no_wall_rendering) for(int a=0; a<c->type; a++) if(c->move(a)) {

complex2.cpp

@@ -354,6 +354,8 @@ vector<string> knight_names = {
   "JeLomun", "kip", "Warmonger", "Fooruman", "Zyalin", "Prezombie", "ashley89", "bjobae", "MFErtre", "Roaringdragon2", "howilovepi", "Yulgash", "Sir Endipitous", "Roshlev",
   "BTernaryTau", "HiGuy", "coper", "Tirear", "qoala _", "Tyzone", "Tiegon", "Airin", "Metroid26", "Sklorg", "Fumblestealth", "Toph", "Tzaphqiel", "jruderman", "ray",
   "Deathroll", "Sinquetica", "mootmoot", "Noobinator", "freeofme", "Helyea", "Snakebird Priestess", "brisingre", "Khashishi", "Shiny", "kabado", "Berenthas", "Misery", "Altripp", "Aldrenean",
+  // via itch.io and reports on Discord
+  "AntiRogue"
   };
 
 map<cell*, int> knight_id;

control.cpp

@@ -872,7 +872,7 @@ EX void mainloopiter() {
     targetclick = pandora_leftclick | pandora_rightclick;
     pandora_leftclick = pandora_rightclick = 0;
     #else
-    targetclick = keystate[SDLK_RSHIFT] | keystate[SDLK_LSHIFT];
+    targetclick = keystate[SDL12(SDLK_RSHIFT, SDL_SCANCODE_RSHIFT)] | keystate[SDL12(SDLK_LSHIFT, SDL_SCANCODE_LSHIFT)];
     #endif
     }
   else {

graph.cpp

@@ -4029,6 +4029,7 @@ EX int colorhash(color_t i) {
   }
 
 EX bool isWall3(cell *c, color_t& wcol) {
+  if(c->wall == waRose) { wcol = gradient(0, wcol, -5 - 5 * (7-rosephase), sintick(50 * (8 - rosephase)), 1); }
   if(isWall(c)) return true;
   if(c->wall == waChasm && c->land == laMemory && (anyshiftclick || !(cgflags & qFRACTAL))) { wcol = 0x606000; return true; }
   if(c->wall == waInvisibleFloor) return false;

help.cpp

@@ -241,7 +241,7 @@ EX void buildCredits() {
     "Triple_Agent_AAA, bluetailedgnat, Allalinor, Shitford, KittyTac, Christopher King, KosGD, TravelDemon, Bubbles, rdococ, frozenlake, MagmaMcFry, "
     "Snakebird Priestess, roaringdragon2, Stopping Dog, bengineer8, Sir Light IJIJ, ShadeBlade, Saplou, shnourok, Ralith, madasa, 6% remaining, Chimera245, Remik Pi, alien foxcat thing, "
     "Piotr Grochowski, Ann, still-flow, tyzone, Paradoxica, LottieRatWorld, aismallard, albatross, EncodedSpirit, Jacob Mandelson, CrashTuvai, cvoight, jennlbw, Kali Ranya, spiritbackup, Dylan, L_Lord, AntiRogue, "
-    "masonlgreen, A human"
+    "masonlgreen, A human, Pasu4"
     );
 #ifdef EXTRALICENSE
   help += EXTRALICENSE;

hud.cpp

@@ -708,9 +708,10 @@ EX void drawStats() {
     if(bow::weapon && bow::style == bow::cbBull) vers += " b/bull";
     if(bow::weapon && bow::style == bow::cbGeodesic) vers += " b/geo";
     if(land_structure != default_land_structure())
-      vers += land_structure_name(true);
+      vers += " " + land_structure_name(true);
     if(princess::challenge) vers += " Princess";
     if(randomPatternsMode) vers += " RPM";
+    if(use_custom_land_list) vers += " custom";
     
     if(geometry != gNormal || !BITRUNCATED) 
       vers = vers + " " + full_geometry_name();

items.cpp

@@ -16,7 +16,12 @@ EX array<int, ittypes> items;
 
 EX map<modecode_t, array<int, ittypes> > hiitems;
 
+EX bool pickable_from_water(eItem it) {
+  return among(it, itOrbFish, itOrbAether);
+  }
+
 EX bool cannotPickupItem(cell *c, bool telekinesis) {
+  if(pickable_from_water(c->item) && isWatery(c)) return false;
   return itemHidden(c) && !telekinesis && !(isWatery(c) && markOrb(itOrbFish));
   }
 
@@ -737,7 +742,7 @@ EX void collectMessage(cell *c2, eItem which) {
 
 EX bool itemHiddenFromSight(cell *c) {
   return isWatery(c) && !items[itOrbInvis] && !(items[itOrbFish] && playerInWater())
-    && !(shmup::on && shmup::boatAt(c));
+    && !(shmup::on && shmup::boatAt(c)) && !(c->cpdist <= 1 && playerInWater());
   }
 
 }

passable.cpp

@@ -258,7 +258,8 @@ EX bool passable(cell *w, cell *from, flagtype flags) {
     }
     
   if(isWatery(w)) {
-    if(in_gravity_zone(w)) ;
+    if((flags & P_ISPLAYER) && from && isWatery(from) && pickable_from_water(w->item)) ;
+    else if(in_gravity_zone(w)) ;
     else if(from && from->wall == waBoat && F(P_USEBOAT) && 
       (!againstCurrent(w, from) || F(P_MARKWATER)) && !(from->item == itOrbYendor)) ;
     else if(from && isWatery(from) && F(P_CHAIN) && F(P_USEBOAT) && !againstCurrent(w, from)) ;