From 4c7ac6eeee33d7d5cdaf7d2d3315e8e1d84602bb Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 6 Aug 2012 12:42:05 +0000 Subject: [PATCH] =?utf8?q?dungeon=5Fturn=E3=81=AE=E9=81=8E=E5=89=B0?= =?utf8?q?=E7=B5=8C=E9=81=8E=E3=81=AB=E3=82=88=E3=82=8B=E3=80=81NASTY=5FMO?= =?utf8?q?NSTER=E7=99=BA=E7=94=9F=E7=8E=87=E3=81=A8=E9=9A=8E=E5=B1=A4?= =?utf8?q?=E4=B8=8A=E6=98=87=E3=82=92=E6=9C=89=E5=8A=B9=E3=81=AA=E5=BD=A2?= =?utf8?q?=E3=81=AB=E5=AE=9F=E8=A3=85=E3=81=97=E7=9B=B4=E3=81=97=E3=81=9F?= =?utf8?q?=E4=B8=8A=E3=81=A7=E3=80=81=E8=8B=A5=E5=B9=B2=E8=AA=BF=E6=95=B4?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/bldg.c | 2 +- src/defines.h | 4 +++- src/main-win.c | 3 +-- src/monster2.c | 23 +++++++---------------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index fc703ff5a..36819edf4 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -2833,7 +2833,7 @@ msg_print(" turn = (turn / (TURNS_PER_TICK*TOWN_DAWN/2) + 1) * (TURNS_PER_TICK*TOWN_DAWN/2); if (dungeon_turn < dungeon_turn_limit) { - dungeon_turn += MIN(turn - oldturn, TURNS_PER_TICK*250); + dungeon_turn += MIN(turn - oldturn, TURNS_PER_TICK * 250); if (dungeon_turn > dungeon_turn_limit) dungeon_turn = dungeon_turn_limit; } diff --git a/src/defines.h b/src/defines.h index 5ea200ffe..ad7b20850 100644 --- a/src/defines.h +++ b/src/defines.h @@ -632,7 +632,9 @@ * during the creation of a monsters (see "get_mon_num()" in "monster.c"). * Lower values yield harder monsters more often. */ -#define NASTY_MON 50 /* 1/chance of inflated monster level */ +#define NASTY_MON_BASE 50 /* 1/chance of inflated monster level */ +#define NASTY_MON_MAX 3 +#define NASTY_MON_PLUS_MAX 20 /* 1/x chance of hurting even if invulnerable! */ #define PENETRATE_INVULNERABILITY 13 diff --git a/src/main-win.c b/src/main-win.c index 05aeacb5e..b698e1b3b 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -2645,8 +2645,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s) rc.right += td->tile_wid; } else { /* Dump the text */ - ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc, - s+i, 1, NULL); + ExtTextOut(hdc, rc.left, rc.top, ETO_CLIPPED, &rc, s+i, 1, NULL); /* Advance */ rc.left += td->tile_wid; diff --git a/src/monster2.c b/src/monster2.c index 35dfd533a..a0290ef81 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -1263,31 +1263,23 @@ s16b get_mon_num(int level) alloc_entry *table = alloc_race_table; int pls_kakuritu, pls_level; - int hoge=mysqrt(level*10000L); + int hoge = mysqrt(level*10000L); if (level > MAX_DEPTH - 1) level = MAX_DEPTH - 1; - if ((dungeon_turn > hoge*(TURNS_PER_TICK*500L)) && !level) - { - pls_kakuritu = MAX(2, NASTY_MON-((dungeon_turn/(TURNS_PER_TICK*2500L)-hoge/10))); - pls_level = MIN(8,3 + dungeon_turn/(TURNS_PER_TICK*20000L)-hoge/40); - } - else - { - pls_kakuritu = NASTY_MON; - pls_level = 2; - } + pls_kakuritu = MAX(NASTY_MON_MAX, NASTY_MON_BASE - ((dungeon_turn / (TURNS_PER_TICK * 2500L) - hoge / 10))); + pls_level = MIN(NASTY_MON_PLUS_MAX, 3 + dungeon_turn / (TURNS_PER_TICK * 20000L) - hoge / 40); if (d_info[dungeon_type].flags1 & DF1_MAZE) { - pls_kakuritu = MIN(pls_kakuritu/2, pls_kakuritu-10); + pls_kakuritu = MIN(pls_kakuritu / 2, pls_kakuritu - 10); if (pls_kakuritu < 2) pls_kakuritu = 2; pls_level += 2; level += 3; } /* Boost the level */ - if ((level > 0) && !p_ptr->inside_battle && !(d_info[dungeon_type].flags1 & DF1_BEGINNER)) + if (!p_ptr->inside_battle && !(d_info[dungeon_type].flags1 & DF1_BEGINNER)) { /* Nightmare mode allows more out-of depth monsters */ if (ironman_nightmare && !randint0(pls_kakuritu)) @@ -1301,7 +1293,7 @@ s16b get_mon_num(int level) if (!randint0(pls_kakuritu)) { /* Pick a level bonus */ - int d = MIN(5, level/10) + pls_level; + int d = MIN(5, level / 10) + pls_level; /* Boost the level */ level += d; @@ -1311,7 +1303,7 @@ s16b get_mon_num(int level) if (!randint0(pls_kakuritu)) { /* Pick a level bonus */ - int d = MIN(5, level/10) + pls_level; + int d = MIN(5, level / 10) + pls_level; /* Boost the level */ level += d; @@ -1319,7 +1311,6 @@ s16b get_mon_num(int level) } } - /* Reset total */ total = 0L; -- 2.11.0