OSDN Git Service
(root)
/
jnethack
/
source.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to 3.6.1
[jnethack/source.git]
/
src
/
sit.c
diff --git
a/src/sit.c
b/src/sit.c
index
0c47c8e
..
3dc0d0a
100644
(file)
--- a/
src/sit.c
+++ b/
src/sit.c
@@
-1,5
+1,6
@@
-/* NetHack 3.6 sit.c $NHDT-Date: 14
45906863 2015/10/27 00:47:43 $ $NHDT-Branch: master $:$NHDT-Revision: 1.51
$ */
+/* NetHack 3.6 sit.c $NHDT-Date: 14
58341129 2016/03/18 22:45:29 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.53
$ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
@@
-160,9
+161,9
@@
dosit()
} else if (u.utraptype == TT_LAVA) {
/* Must have fire resistance or they'd be dead already */
/*JP
} else if (u.utraptype == TT_LAVA) {
/* Must have fire resistance or they'd be dead already */
/*JP
- You("sit in the
lava!"
);
+ You("sit in the
%s!", hliquid("lava")
);
*/
*/
- You("
\97
n
\8a
â
\82
Ì
\92
\86
\82
É
\8d
À
\82
Á
\82
½
\81
I"
);
+ You("
%s
\82
Ì
\92
\86
\82
É
\8d
À
\82
Á
\82
½
\81
I", hliquid("
\97
n
\8a
â")
);
if (Slimed)
burn_away_slime();
u.utrap += rnd(4);
if (Slimed)
burn_away_slime();
u.utrap += rnd(4);
@@
-184,7
+185,7
@@
dosit()
You("sit down.");
*/
You("
\8d
À
\82
Á
\82
½
\81
D");
You("sit down.");
*/
You("
\8d
À
\82
Á
\82
½
\81
D");
- dotrap(trap,
0
);
+ dotrap(trap,
VIASITTING
);
}
} else if (Underwater || Is_waterlevel(&u.uz)) {
if (Is_waterlevel(&u.uz))
}
} else if (Underwater || Is_waterlevel(&u.uz)) {
if (Is_waterlevel(&u.uz))
@@
-200,9
+201,9
@@
dosit()
} else if (is_pool(u.ux, u.uy)) {
in_water:
/*JP
} else if (is_pool(u.ux, u.uy)) {
in_water:
/*JP
- You("sit in the
water."
);
+ You("sit in the
%s.", hliquid("water")
);
*/
*/
- You("
\90
\85
\82
Ì
\92
\86
\82
Å
\8d
À
\82
Á
\82
½
\81
D"
);
+ You("
%s
\82
Ì
\92
\86
\82
Å
\8d
À
\82
Á
\82
½
\81
D", hliquid("
\90
\85
")
);
if (!rn2(10) && uarm)
/*JP
(void) water_damage(uarm, "armor", TRUE);
if (!rn2(10) && uarm)
/*JP
(void) water_damage(uarm, "armor", TRUE);
@@
-237,21
+238,21
@@
dosit()
} else if (is_lava(u.ux, u.uy)) {
/* must be WWalking */
/*JP
} else if (is_lava(u.ux, u.uy)) {
/* must be WWalking */
/*JP
- You(sit_message,
"lava"
);
+ You(sit_message,
hliquid("lava")
);
*/
*/
- You(sit_message,
"
\97
n
\8a
â"
);
+ You(sit_message,
hliquid("
\97
n
\8a
â")
);
burn_away_slime();
if (likes_lava(youmonst.data)) {
/*JP
burn_away_slime();
if (likes_lava(youmonst.data)) {
/*JP
- pline_The("
lava feels warm."
);
+ pline_The("
%s feels warm.", hliquid("lava")
);
*/
*/
- pline
("
\97
n
\8a
â
\82
Í
\92
g
\82
©
\82
¢
\81
D"
);
+ pline
_The("%s
\82
Í
\92
g
\82
©
\82
¢
\81
D", hliquid("
\97
n
\8a
â")
);
return 1;
}
/*JP
return 1;
}
/*JP
- pline_The("
lava burns you!"
);
+ pline_The("
%s burns you!", hliquid("lava")
);
*/
*/
-
You("
\97
n
\8a
â
\82
Å
\94
R
\82
¦
\82
½
\81
I"
);
+
pline_The("%s
\82
Å
\94
R
\82
¦
\82
½
\81
I", hliquid("
\97
n
\8a
â")
);
losehp(d((Fire_resistance ? 2 : 10), 10), /* lava damage */
/*JP
"sitting on lava", KILLED_BY);
losehp(d((Fire_resistance ? 2 : 10), 10), /* lava damage */
/*JP
"sitting on lava", KILLED_BY);
@@
-311,6
+312,7
@@
dosit()
if (u.uhp >= (u.uhpmax - 5))
u.uhpmax += 4;
u.uhp = u.uhpmax;
if (u.uhp >= (u.uhpmax - 5))
u.uhpmax += 4;
u.uhp = u.uhpmax;
+ u.ucreamed = 0;
make_blinded(0L, TRUE);
make_sick(0L, (char *) 0, FALSE, SICK_ALL);
heal_legs();
make_blinded(0L, TRUE);
make_sick(0L, (char *) 0, FALSE, SICK_ALL);
heal_legs();
@@
-377,6
+379,7
@@
dosit()
"
\90
¹
\82
È
\82
é
\8b
Ê
\8d
À
\82
É
\8d
À
\82
è
\82
µ
\93
ð
\82
É
\8e
ô
\82
¢
\82
\82
ê
\81
I");
if (Luck > 0) {
make_blinded(Blinded + rn1(100, 250), TRUE);
"
\90
¹
\82
È
\82
é
\8b
Ê
\8d
À
\82
É
\8d
À
\82
è
\82
µ
\93
ð
\82
É
\8e
ô
\82
¢
\82
\82
ê
\81
I");
if (Luck > 0) {
make_blinded(Blinded + rn1(100, 250), TRUE);
+ change_luck((Luck > 1) ? -rnd(2) : -1);
} else
rndcurse();
break;
} else
rndcurse();
break;
@@
-612,6
+615,7
@@
attrcurse()
You("
\92
g
\82
©
\82
³
\82
ð
\8a
´
\82
¶
\82
½
\81
D");
break;
}
You("
\92
g
\82
©
\82
³
\82
ð
\8a
´
\82
¶
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 2:
if (HTeleportation & INTRINSIC) {
HTeleportation &= ~INTRINSIC;
case 2:
if (HTeleportation & INTRINSIC) {
HTeleportation &= ~INTRINSIC;
@@
-621,6
+625,7
@@
attrcurse()
You("
\82
¿
\82
å
\82
Á
\82
Æ
\97
\8e
\82
¿
\82
Â
\82
¢
\82
½
\81
D");
break;
}
You("
\82
¿
\82
å
\82
Á
\82
Æ
\97
\8e
\82
¿
\82
Â
\82
¢
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 3:
if (HPoison_resistance & INTRINSIC) {
HPoison_resistance &= ~INTRINSIC;
case 3:
if (HPoison_resistance & INTRINSIC) {
HPoison_resistance &= ~INTRINSIC;
@@
-630,6
+635,7
@@
attrcurse()
You("
\8f
\82
µ
\8b
C
\95
ª
\82
ª
\88
«
\82
\82
È
\82
Á
\82
½
\81
I");
break;
}
You("
\8f
\82
µ
\8b
C
\95
ª
\82
ª
\88
«
\82
\82
È
\82
Á
\82
½
\81
I");
break;
}
+ /*FALLTHRU*/
case 4:
if (HTelepat & INTRINSIC) {
HTelepat &= ~INTRINSIC;
case 4:
if (HTelepat & INTRINSIC) {
HTelepat &= ~INTRINSIC;
@@
-641,6
+647,7
@@
attrcurse()
Your("
\8c
Ü
\8a
´
\82
Í
\96
\83
á
\83
\82
µ
\82
½
\81
I");
break;
}
Your("
\8c
Ü
\8a
´
\82
Í
\96
\83
á
\83
\82
µ
\82
½
\81
I");
break;
}
+ /*FALLTHRU*/
case 5:
if (HCold_resistance & INTRINSIC) {
HCold_resistance &= ~INTRINSIC;
case 5:
if (HCold_resistance & INTRINSIC) {
HCold_resistance &= ~INTRINSIC;
@@
-650,6
+657,7
@@
attrcurse()
You("
\97
Á
\82
µ
\82
³
\82
ð
\8a
´
\82
¶
\82
½
\81
D");
break;
}
You("
\97
Á
\82
µ
\82
³
\82
ð
\8a
´
\82
¶
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 6:
if (HInvis & INTRINSIC) {
HInvis &= ~INTRINSIC;
case 6:
if (HInvis & INTRINSIC) {
HInvis &= ~INTRINSIC;
@@
-659,6
+667,7
@@
attrcurse()
You("
\96
Ï
\91
z
\82
ð
\95
ø
\82
¢
\82
½
\81
D");
break;
}
You("
\96
Ï
\91
z
\82
ð
\95
ø
\82
¢
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 7:
if (HSee_invisible & INTRINSIC) {
HSee_invisible &= ~INTRINSIC;
case 7:
if (HSee_invisible & INTRINSIC) {
HSee_invisible &= ~INTRINSIC;
@@
-673,6
+682,7
@@
attrcurse()
#endif
break;
}
#endif
break;
}
+ /*FALLTHRU*/
case 8:
if (HFast & INTRINSIC) {
HFast &= ~INTRINSIC;
case 8:
if (HFast & INTRINSIC) {
HFast &= ~INTRINSIC;
@@
-682,6
+692,7
@@
attrcurse()
You("
\92
x
\82
\82
È
\82
Á
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
You("
\92
x
\82
\82
È
\82
Á
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 9:
if (HStealth & INTRINSIC) {
HStealth &= ~INTRINSIC;
case 9:
if (HStealth & INTRINSIC) {
HStealth &= ~INTRINSIC;
@@
-691,6
+702,7
@@
attrcurse()
You("
\95
s
\8a
í
\97
p
\82
É
\82
È
\82
Á
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
You("
\95
s
\8a
í
\97
p
\82
É
\82
È
\82
Á
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 10:
/* intrinsic protection is just disabled, not set back to 0 */
if (HProtection & INTRINSIC) {
case 10:
/* intrinsic protection is just disabled, not set back to 0 */
if (HProtection & INTRINSIC) {
@@
-701,6
+713,7
@@
attrcurse()
You("
\96
³
\96
h
\94
õ
\82
É
\82
È
\82
Á
\82
½
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
You("
\96
³
\96
h
\94
õ
\82
É
\82
È
\82
Á
\82
½
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
case 11:
if (HAggravate_monster & INTRINSIC) {
HAggravate_monster &= ~INTRINSIC;
case 11:
if (HAggravate_monster & INTRINSIC) {
HAggravate_monster &= ~INTRINSIC;
@@
-710,6
+723,7
@@
attrcurse()
You("
\96
£
\97
Í
\82
ª
\8e
¸
\82
¹
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
You("
\96
£
\97
Í
\82
ª
\8e
¸
\82
¹
\82
½
\82
æ
\82
¤
\82
È
\8b
C
\82
ª
\82
µ
\82
½
\81
D");
break;
}
+ /*FALLTHRU*/
default:
break;
}
default:
break;
}