Fix 6 bugs found in nitan6's deep functional test (F_DBASE bootstrapping trap + type-mismatch)

Ported nitan170911's 4 documented F_DBASE bare-call fixes (AGENTS.md
§7.15) after confirming byte-identical pre-fix shapes:
- feature/name.lpc, feature/command.lpc: this_object() redirects on
  bare set()/query() calls, which otherwise silently hit the shared
  simul_efun dbase instead of the caller's own.
- adm/daemons/databased.lpc: guarded db_restore_all()'s ten
  restore_variable() calls against NULL/unpopulated DB columns.
- adm/kernel/simul_efun/message.lpc: forward prototype + varargs so
  tell_room()/etc. bind to the local exclude-normalizing wrapper
  instead of the raw efun.

Found a 5th instance of the same F_DBASE class (missed by nitan170911's
own pass): feature/apprentice.lpc's sect/family accessors were reading
and writing the shared dbase, corrupting every character's family data.
Live-reproduced (a character's 门派 field changed with no bai ever
succeeding) and fixed identically.

Also fixed a new, unrelated bug: d/city/npc/gongzi.lpc and guidao.lpc
called is_killing(who) with an object where feature/attack.lpc's
is_killing() takes a string id, a hard compile-time type mismatch that
silently prevented these NPCs from ever spawning. Fixed to match the
query("id", who) convention used at every other call site.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VyQCUoTo1Z93Py9aVFHQi1

Author: thefallentree

libs/nitan6/NOTES.md

@@ -410,18 +410,33 @@ int db_restore_all(object user) {
     f_alias = res[n + 9];
     f_user = res[n + 10];
     char_idname = res[n + 11];
-    user->set_dbase(restore_variable(f_dbase));
-    user->set_autoload_info(restore_variable(f_autoload));
-    user->set_CONDITION(restore_variable(f_condition));
-    user->set_business(restore_variable(f_business));
-    user->set_mail(restore_variable(f_mail));
-    user->set_ALIAS(restore_variable(f_alias));
-    user->set_ATTACK(restore_variable(f_attack));
-    user->set_ghost(restore_variable(f_damage));
-    user->set_SKILL(restore_variable(f_skill));
-    user->set_USER(restore_variable(f_user));
-    user->set_IDNAME(restore_variable(char_idname));
-    if (objectp(myob)) myob->set_dbase(restore_variable(login_dbase));
+    // Every f_*/char_idname/login_dbase column here is NULL (comes back
+    // from db_fetch() as int 0, not "") for any account whose row was
+    // written by db_new_player() -- that INSERT only ever populates a
+    // handful of columns at creation time, leaving every other column
+    // NULL until the player's first real save. restore_variable() rejects
+    // a non-string argument outright ("Bad argument 1 to
+    // restore_variable() Expected: string Got: 0"), and since none of
+    // these calls were wrapped in catch(), the FIRST such error aborted
+    // db_restore_all() entirely -- every restore call after the failing
+    // one silently never ran, leaving a just-logged-in character
+    // half-initialized (same shape confirmed live on sibling
+    // nitan170911, see that lib's NOTES.md). Guard each with stringp()
+    // and fall back to the same empty value each setter's own callers
+    // already treat as "nothing saved yet" elsewhere in the codebase.
+    user->set_dbase(stringp(f_dbase) ? restore_variable(f_dbase) : ([]));
+    user->set_autoload_info(stringp(f_autoload) ? restore_variable(f_autoload) : ({}));
+    user->set_CONDITION(stringp(f_condition) ? restore_variable(f_condition) : ([]));
+    user->set_business(stringp(f_business) ? restore_variable(f_business) : ([]));
+    user->set_mail(stringp(f_mail) ? restore_variable(f_mail) : ({}));
+    user->set_ALIAS(stringp(f_alias) ? restore_variable(f_alias) : ([]));
+    user->set_ATTACK(stringp(f_attack) ? restore_variable(f_attack) : ([]));
+    user->set_ghost(stringp(f_damage) ? restore_variable(f_damage) : 0);
+    user->set_SKILL(stringp(f_skill) ? restore_variable(f_skill) : ([]));
+    user->set_USER(stringp(f_user) ? restore_variable(f_user) : ([]));
+    user->set_IDNAME(stringp(char_idname) ? restore_variable(char_idname) : 0);
+    if (objectp(myob))
+      myob->set_dbase(stringp(login_dbase) ? restore_variable(login_dbase) : ([]));
     n = 1;
   }
 

libs/nitan6/work/adm/daemons/databased.lpc

@@ -2,6 +2,17 @@
 // Update by Doing
 // Update by Lonely
 
+// Forward prototype: tell_object()/tell_room()/shout()/write()/say()/etc.
+// below all call bare message() before its own definition later in this
+// file. Without a prototype, FluffOS's single-pass compiler resolves
+// those earlier bare calls directly to the driver EFUN `message()`
+// instead of the local wrapper defined below -- silently bypassing the
+// exclude-argument normalization that wrapper exists to provide (see its
+// own comment) for every caller ABOVE its definition. This is the exact
+// bug confirmed live on sibling nitan170911 (AGENTS.md §6.5/§7.12 combo);
+// this prototype makes every call site in this file bind to the local
+// function instead.
+varargs void message(mixed arg, string message, mixed target, mixed exclude);
 
 string sort_msg(string input) {
 #ifdef BINARY_SUPPORT
@@ -328,8 +339,16 @@ varargs void say(string str, mixed exclude) {
     message("say", str, environment(this_player()), this_player());
 }
 
-void message(mixed arg, string message, mixed target, mixed exclude) {
-  efun::message(arg, message, target, exclude || ({}));
+// `exclude` is passed as bare mixed (not `varargs object|object *`) because
+// call sites throughout this mudlib either omit it or pass literal `0`,
+// relying on LPC's "missing trailing arg becomes int 0" behavior.
+// efun::message()'s real signature only accepts `void | object | object *`
+// for this argument and throws "Bad argument 4 to EFUN message()" at
+// runtime on int(0) -- normalize here instead of touching every call
+// site (same fix as sibling nitan170911).
+varargs void message(mixed arg, string message, mixed target, mixed exclude) {
+  if (!arrayp(exclude) && !objectp(exclude)) exclude = ({});
+  efun::message(arg, message, target, exclude);
 }
 
 void message_system(string message) {

libs/nitan6/work/adm/kernel/simul_efun/message.lpc

@@ -52,7 +52,15 @@ string ask_me(object who) {
   object *ob;
 
   if (query("revealed")) {
-    if (is_killing(who))
+    // is_killing() (feature/attack.lpc) takes a string `id`, not an
+    // object -- passing `who` directly is a driver-rejected type
+    // mismatch ("Bad type for argument 1 of is_killing (string vs
+    // object)"), a hard compile error that made this whole file fail
+    // to load (`new()` in inherit/room/room.lpc's make_inventory()
+    // silently returns 0, so this NPC never actually spawns wherever
+    // it's listed). Fixed to match the query("id", ob) convention used
+    // at every other is_killing() call site in this codebase.
+    if (is_killing(query("id", who)))
       return "你既然知道了我的秘密，今日休想活命！\n";
     else {
       kill_ob(who);

libs/nitan6/work/d/city/npc/gongzi.lpc

@@ -52,7 +52,9 @@ string ask_me(object who) {
   object *ob;
 
   if (query("revealed")) {
-    if (is_killing(who)) return "你既然知道了我的身分，今日休想活命！\n";
+    // Same is_killing(object) vs is_killing(string) type-mismatch bug
+    // as sibling /d/city/npc/gongzi.lpc -- see that file's comment.
+    if (is_killing(query("id", who))) return "你既然知道了我的身分，今日休想活命！\n";
     else {
       kill_ob(who);
       who->fight_ob(this_object());

libs/nitan6/work/d/city/npc/guidao.lpc

@@ -0,0 +1,2 @@
+#/clone/user/login.lpc
+dbase (["purename":"风","registered":0,"password":"$1$92953668$BGk5u89gVSf65p4/DU2es.","last_from":"127.0.0.1","id":"xiakebug","ad_password":"$1$60330041$FndmuR3279XofxI/DsnNj/","login_times":1,"surname":"秦","body":"/clone/user/user",])

libs/nitan6/work/data/login/x/xiakebug.o

@@ -0,0 +1,11 @@
+#/clone/user/user.lpc
+killer ({})
+want_kills ({})
+dbase (["max_jing":650,"qi":614,"title":"普通百姓","jingli":1200,"special_skill":(["ironskin":1,"clever":1,]),"dex":20,"jing":464,"water":217,"max_jingli":1200,"newbie":1,"channels":915655,"birthday":1784959297,"per":29,"default_actions":,"sec_id":"$6$1h/wupTpHi/zpUjS$DYcL5xDOu5./zpZxy5DzucBSgZehPN8JlGXDFihSG.FXo38QqBaT.GJhP/nfSdGBN5jggpytO7hvR/zJsgbFF/","race":"人类","env":(["wimpy":60,]),"analecta_last_read":(["2026":1784959301,]),"startroom":"/d/city/wumiao","gender":"男性","character":"光明磊落","con":20,"msg":(["rumor":1,"chat":1,"size":100,"emotion":1,"say":1,"tell":1,"time":1784959300,]),"eff_jing":465,"neili":2200,"surname":"秦","potential":102853,"newbie_mygift":(["cur_quest_number":"1",]),"max_neili":2200,"gift_xinshoucun":1,"mud_age":0,"born":"古村","name":"秦风","int":20,"newbie_quest_completed":(["can_out":1,]),"purename":"风","registered":1,"id":"xiakebug","combat_exp":53207,"attitude":"peaceful","score":163,"limbs":({"头部","颈部","胸口","后心","左肩","右肩","左臂","右臂","左手","右手","两肋","左脸","腰间","小腹","左腿","右腿","右脸","左脚","右脚","左耳","右耳",}),"on_birthday":1,"monfee":1793599297,"last_read_news":971000000,"food":217,"email":"test-xiakebug@example.com","kar":30,"last_save":1784959323,"shen_type":0,"max_qi":900,"unit":"位","age":11,"level":1,"can_speak":1,"last_on":1784959955,"str":20,"born_family":"没有","shen":0,"chann":(["tch":1,"auc":1,"sos":1,]),"eff_qi":615,])
+mail_log ({})
+skills (["blade":164,"force":164,"unarmed":164,"dodge":164,"sword":164,"parry":164,])
+learned (["blade":16211,"force":16211,"unarmed":16211,"dodge":16211,"sword":16211,"parry":16211,])
+autoload ({})
+all ({})
+at_time 1784959974
+ban_say_msg ""

libs/nitan6/work/data/user/x/xiakebug.o

@@ -0,0 +1,3 @@
+0
/clone/cloth/male3-cloth
original_data
0
({"cloth",})
+0
/clone/cloth/male-shoe
original_data
0
({"skin shoes","shoe",})
+0
/clone/misc/newbie
original_data
0
({"book","newbie book",})

libs/nitan6/work/data/user/x/xiakebug.package.o

@@ -1,17 +1,30 @@
 // apprentice.c
 // Written by Lonely@nitan.org
 
+// feature/apprentice.lpc is inherited (as F_APPRENTICE) as a SIBLING of
+// F_DBASE by char.lpc, not through it -- same F_DBASE bare-call
+// bootstrapping trap as feature/name.lpc/feature/command.lpc (AGENTS.md
+// §7.15): every bare set()/query() call below that omits the `ob`
+// redirect silently reads/writes the SIMUL_EFUN OBJECT's own shared
+// dbase instead of this_object()'s, so sect/family data (query_family()
+// et al) was being read from and written to ONE property bag shared by
+// every player and NPC in the game. Confirmed live: score's 门派 field
+// changed on its own between two sessions of the same idle character
+// with no `bai` ever succeeding, because another object's bare call
+// elsewhere was clobbering the same shared "family" key. Fixed with
+// explicit this_object() redirects on every self-referring call (calls
+// that already redirect to a different `ob` parameter are untouched).
 int is_apprentice_of(object ob) {
   mapping family;
   string *fams;
 
-  if (!mapp(family = query("family"))) return 0;
+  if (!mapp(family = query("family", this_object()))) return 0;
 
   if (family["master_id"] == (string)query("id", ob) &&
     family["master_name"] == (string)query("name", ob))
     return 1;
 
-  if (!arrayp(fams = query("reborn/fams")) ||
+  if (!arrayp(fams = query("reborn/fams", this_object())) ||
     !query("family/family_name", ob))
     return 0;
 
@@ -24,20 +37,20 @@ int is_apprentice_of(object ob) {
 void assign_apprentice(string title, int privs) {
   mapping family;
 
-  if (!mapp(family = query("family"))) return;
+  if (!mapp(family = query("family", this_object()))) return;
   family["title"] = title;
   family["privs"] = privs;
-  if (userp(this_object()) || !query("title")) {
+  if (userp(this_object()) || !query("title", this_object())) {
     switch (family["generation"]) {
       case 0:
-        set("title", family["family_name"] + family["title"]);
+        set("title", family["family_name"] + family["title"], this_object());
         break;
       case 1:
-        set("title", family["family_name"] + "开山祖师");
+        set("title", family["family_name"] + "开山祖师", this_object());
         break;
       default:
         set("title", sprintf("%s第%s代%s", family["family_name"],
-          chinese_number(family["generation"]), family["title"]));
+          chinese_number(family["generation"]), family["title"]), this_object());
         break;
     }
   }
@@ -49,7 +62,7 @@ void create_family(string family_name, int generation, string title) {
   family = allocate_mapping(6);
   family["family_name"] = family_name;
   family["generation"] = generation;
-  set("family", family);
+  set("family", family, this_object());
   // priv = -1 for ALL privileges.
   assign_apprentice(title, -1);
 }
@@ -62,7 +75,7 @@ int recruit_apprentice(object ob) {
   if (ob->is_apprentice_of(this_object()))
     return 0;
 
-  if (!mapp(my_family = query("family")))
+  if (!mapp(my_family = query("family", this_object())))
     return 0;
 
   // 这里处理判师的bug
@@ -77,16 +90,16 @@ int recruit_apprentice(object ob) {
     }
   }
 
-  class1 = query("class");
+  class1 = query("class", this_object());
   class2 = query("class", ob);
   if (stringp(class1) &&
     class2 != "bonze" && class2 != "eunach" &&
     class1 != "bonze" && class1 != "eunach")
     set("class", class1, ob);
 
   family = allocate_mapping(sizeof(my_family));
-  family["master_id"] = query("id");
-  family["master_name"] = query("name");
+  family["master_id"] = query("id", this_object());
+  family["master_name"] = query("name", this_object());
   family["family_name"] = my_family["family_name"];
   family["generation"] = my_family["generation"] + 1;
   family["enter_time"] = time();
@@ -135,11 +148,11 @@ int recruit_apprentice(object ob) {
   if (query("family/first", ob) && family_name == family["family_name"])
     family["first"] = 1;
 
-  if (query("inherit_title")) {
+  if (query("inherit_title", this_object())) {
     set("title", query("inherit_title", this_object()), ob);
     set("family", family, ob);
     return 1;
-  } else if (query("born_family") != "没有")
+  } else if (query("born_family", this_object()) != "没有")
     family["title"] = "传人";
   else
     family["title"] = "弟子";
@@ -150,17 +163,17 @@ int recruit_apprentice(object ob) {
 }
 
 string query_bunch() {
-  return query("bunch/bunch_name");
+  return query("bunch/bunch_name", this_object());
 }
 
 string query_family() {
-  return query("family/family_name");
+  return query("family/family_name", this_object());
 }
 
 string query_master() {
-  return query("family/master_name");
+  return query("family/master_name", this_object());
 }
 
 string query_generation() {
-  return query("family/generation");
+  return query("family/generation", this_object());
 }

libs/nitan6/work/feature/apprentice.lpc

@@ -138,10 +138,19 @@ nomask void enable_player() {
   object me;
   string *my_path;
 
-  if (stringp(query("id")))
-    set_living_name(query("id"));
+  // feature/command.lpc inherits nothing and is composed as a SIBLING of
+  // F_DBASE (via char.lpc's `inherit F_COMMAND`), so bare query() here
+  // hits the same F_DBASE bare-call bootstrapping trap as feature/name.lpc
+  // (AGENTS.md §7.15): it silently reads the SIMUL_EFUN object's own
+  // shared dbase instead of this_object()'s, always returning 0 -- which
+  // made every character (player or NPC) call set_living_name(0) and
+  // error out every time enable_player() ran, leaving living_name
+  // permanently unset mudlib-wide. Explicit this_object() redirect fixes
+  // it the same way as nitan170911's identical shape.
+  if (stringp(query("id", this_object())))
+    set_living_name(query("id", this_object()));
   else
-    set_living_name(query("name"));
+    set_living_name(query("name", this_object()));
 
   if (query_temp("disable_input", this_object()))
     delete_temp("disable_input", this_object());