Kentaro Shirakata
argra****@users*****
2005年 6月 5日 (日) 17:17:58 JST
ForkIndex: jnethack/src/dothrow.c
diff -u jnethack/src/dothrow.c:1.30 jnethack/src/dothrow.c:1.31
--- jnethack/src/dothrow.c:1.30 Wed Apr 27 05:51:16 2005
+++ jnethack/src/dothrow.c Sun Jun 5 17:17:57 2005
@@ -1234,8 +1234,16 @@
#endif
(void) artifact_hit((struct monst *)0,
&youmonst, obj, &dmg, 0);
+#if 0 /*JP*/
losehp(dmg, xname(obj),
obj_is_pname(obj) ? KILLED_BY : KILLED_BY_AN);
+#else
+ {
+ char jbuf[BUFSZ];
+ Sprintf(jbuf, "%sで", xname(obj));
+ losehp(dmg, jbuf, KILLED_BY);
+ }
+#endif
}
if (ship_object(obj, u.ux, u.uy, FALSE)) {
thrownobj = (struct obj*)0;
Index: jnethack/src/eat.c
diff -u jnethack/src/eat.c:1.38 jnethack/src/eat.c:1.39
--- jnethack/src/eat.c:1.38 Sun Jun 5 06:46:21 2005
+++ jnethack/src/eat.c Sun Jun 5 17:17:57 2005
@@ -318,7 +318,7 @@
/*JP
killer = "a very rich meal";
*/
- killer = "とても高価な料理で";
+ killer = "とても高価な料理";
} else {
killer = food_xname(food, FALSE);
if (food->otyp == CORPSE &&
@@ -336,7 +336,7 @@
/*JP
killer = "quick snack";
*/
- killer = "早食いで";
+ killer = "早食い";
}
/*JP
You("die...");
@@ -3008,7 +3008,7 @@
/*JP
killer = "exhaustion";
*/
- killer = "空腹と衰弱で";
+ killer = "空腹と衰弱で死んだ";
done(STARVING);
return;
}
Index: jnethack/src/mon.c
diff -u jnethack/src/mon.c:1.27 jnethack/src/mon.c:1.28
--- jnethack/src/mon.c:1.27 Sun Jun 5 06:46:21 2005
+++ jnethack/src/mon.c Sun Jun 5 17:17:57 2005
@@ -2330,11 +2330,10 @@
if(u.uhp < 1) {
killer_format = kprefix;
killer = pname;
+#if 0 /*JP*//*「毒針の毒で死んだ」はあり*/
/* "Poisoned by a poisoned ___" is redundant */
-/*JP
done(strstri(pname, "poison") ? DIED : POISONING);
-*/
- done(strstr(pname, "毒") ? DIED : POISONING); /*argrath:いらないかも*/
+#endif
}
(void) encumber_msg();
}
Index: jnethack/src/potion.c
diff -u jnethack/src/potion.c:1.27 jnethack/src/potion.c:1.28
--- jnethack/src/potion.c:1.27 Wed Apr 27 05:51:16 2005
+++ jnethack/src/potion.c Sun Jun 5 17:17:57 2005
@@ -1226,7 +1226,7 @@
pline("%s焦げた！", otmp->blessed ? "少し" :
otmp->cursed ? "すごく" : "");
losehp(d(otmp->cursed ? 2 : 1, otmp->blessed ? 4 : 8),
- "酸の薬で", KILLED_BY_AN);
+ "酸の薬を飲んで", KILLED_BY_AN);
#endif
exercise(A_CON, FALSE);
}
@@ -1413,7 +1413,7 @@
"potion of acid", KILLED_BY_AN);
#else
losehp(d(obj->cursed ? 2 : 1, obj->blessed ? 4 : 8),
- "酸の薬", KILLED_BY_AN);
+ "酸の薬を浴びて", KILLED_BY_AN);
#endif
}
break;
Index: jnethack/src/zap.c
diff -u jnethack/src/zap.c:1.35 jnethack/src/zap.c:1.36
--- jnethack/src/zap.c:1.35 Wed Apr 27 05:51:16 2005
+++ jnethack/src/zap.c Sun Jun 5 17:17:57 2005
@@ -3573,7 +3573,7 @@
/*JP
poisoned("blast", A_DEX, "poisoned blast", 15);
*/
- poisoned("息", A_DEX, "毒の息で", 15);
+ poisoned("息", A_DEX, "毒の息", 15);
break;
case ZT_ACID:
if (Acid_resistance) {