diff -urN jnethack-3.6.6-0.6-org/src/objnam.c jnethack-3.6.6-0.6-patch/src/objnam.c --- jnethack-3.6.6-0.6-org/src/objnam.c 2023-01-30 15:16:42.737418300 +0900 +++ jnethack-3.6.6-0.6-patch/src/objnam.c 2023-02-16 11:13:45.089490500 +0900 @@ -4198,6 +4198,104 @@ mntmp = NON_PM; /* no monster */ goto typfnd; } + + if (!strcmpi(bp, "短剣")) { + if (mntmp == PM_ELF) { + typ = ELVEN_DAGGER; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_ORC) { + typ = ORCISH_DAGGER; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + } + + if (!strcmpi(bp, "つるはし") && mntmp == PM_DWARF) { + typ = DWARVISH_MATTOCK; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + + if (!strcmpi(bp, "小剣")) { + if (mntmp == PM_ELF) { + typ = ELVEN_SHORT_SWORD; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_ORC) { + typ = ORCISH_SHORT_SWORD; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_DWARF) { + typ = DWARVISH_SHORT_SWORD; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + } + + if (!strcmpi(bp, "幅広の剣") && mntmp == PM_ELF) { + typ = ELVEN_BROADSWORD; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + + if (!strcmpi(bp, "槍")) { + if (mntmp == PM_ELF) { + typ = ELVEN_SPEAR; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_ORC) { + typ = ORCISH_SPEAR; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_DWARF) { + typ = DWARVISH_SPEAR; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + } + + if (!strcmpi(bp, "弓")) { + if (mntmp == PM_ELF) { + typ = ELVEN_BOW; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_ORC) { + typ = ORCISH_BOW; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + } + + if (!strcmpi(bp, "矢")) { + if (mntmp == PM_ELF) { + typ = ELVEN_ARROW; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } else if (mntmp == PM_ORC) { + typ = ORCISH_ARROW; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + } + + if (!strcmpi(bp, "鉄環の鎧") && mntmp == PM_ORC) { + typ = ORCISH_RING_MAIL; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + + if (!strcmpi(bp, "鎖かたびら") && mntmp == PM_ORC) { + typ = ORCISH_CHAIN_MAIL; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } + + if (!strcmpi(bp, "兜") && mntmp == PM_ORC) { + typ = ORCISH_HELM; + mntmp = NON_PM; /* no monster */ + goto typfnd; + } #endif p = eos(bp);