Commit: c58e15a997e8018c3a6b8ee7a2ba8a9d0ec6300b - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• Revisión: c58e15a997e8018c3a6b8ee7a2ba8a9d0ec6300b (tree)
• Tiempo: 2002-12-09 00:56:20
• Autor: (no author) <(no author)@0568...>
• Commiter: (no author)

Log Message

This commit was manufactured by cvs2svn to create tag
'hengband-1-4-0'.

Cambiar Resumen

• modified: configure.in
• modified: lib/file/news.txt
• modified: lib/file/news_j.txt
• modified: lib/help/jobjects.txt
• modified: lib/help/objects.txt
• modified: readme.txt
• modified: readme_eng.txt
• modified: src/cmd6.c
• modified: src/defines.h
• modified: src/dungeon.c
• modified: src/effects.c
• modified: src/externs.h
• modified: src/flavor.c
• modified: src/grid.c
• modified: src/init1.c
• modified: src/init2.c
• modified: src/load.c
• modified: src/makefile.bcc
• modified: src/makefile.dos
• modified: src/makefile.ibm
• modified: src/racial.c
• modified: src/store.c
• modified: src/variable.c
• modified: src/xtra2.c

Diferencia incremental

--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(src/main.c)
 
 AM_CONFIG_HEADER(src/autoconf.h)
 
-AM_INIT_AUTOMAKE(hengband, 1.3.2)
+AM_INIT_AUTOMAKE(hengband, 1.4.0)
 
 AC_ARG_WITH(setgid,
 [  --with-setgid=NAME      install hengband as group NAME],

--- a/lib/file/news.txt
+++ b/lib/file/news.txt
@@ -1,6 +1,6 @@
 
                   ****************************************
-                  **           Hengband 1.3.2           **
+                  **           Hengband 1.4.0           **
                   ****************************************
 
           Based on Moria:    Copyright (c) 1985 Robert Alan Koeneke

--- a/lib/file/news_j.txt
+++ b/lib/file/news_j.txt
@@ -1,6 +1,6 @@
 
                   ***************************************
-                  **           変愚蛮怒  1.3.2         **
+                  **           変愚蛮怒  1.4.0         **
                   ***************************************
 
           Based on Moria:    Copyright (c) 1985 Robert Alan Koeneke

--- a/lib/help/jobjects.txt
+++ b/lib/help/jobjects.txt
@@ -459,22 +459,23 @@
 
 自動刻みの一覧:
 
-+攻 : +At : 追加攻撃                r酸 : Ac : 酸への耐性
-+速 : +Sp : 加速                    r電 : El : 電撃への耐性
-+腕 : +St : 腕力修正                r火 : Fi : 火への耐性
-+知 : +In : 知力修正                r冷 : Co : 冷気への耐性
-+賢 : +Wi : 賢さ修正                r毒 : Po : 毒への耐性
-+器 : +Dx : 器用さ修正              r閃 : Li : 光への耐性
-+耐 : +Cn : 耐久力修正              r暗 : Dk : 暗黒への耐性
-+魅 : +Ch : 魅力修正                r破 : Sh : 破片への耐性
-+隠 : +Sl : 隠密修正                r盲 : Bl : 盲目への耐性
-+探 : +Sr : 探索修正                r乱 : Cf : 混乱への耐性
-+赤 : +If : 赤外線修正              r轟 : So : 轟音への耐性
-+掘 : +Dg : 採掘力修正              r獄 : Nt : 地獄への耐性
-*酸 : *Ac : 酸への免疫              r因 : Nx : 因果混乱への耐性
-*電 : *El : 電撃への免疫            r沌 : Ca : 混沌への耐性
-*火 : *Fi : 火への免疫              r劣 : Di : 劣化への耐性
-*冷 : *Co : 冷気への免疫            r恐 : Fe : 恐怖への耐性
++攻 : At : 追加攻撃                 r酸 : Ac : 酸への耐性
++速 : Sp : 加速                     r電 : El : 電撃への耐性
++腕 : St : 腕力修正                 r火 : Fi : 火への耐性
++知 : In : 知力修正                 r冷 : Co : 冷気への耐性
++賢 : Wi : 賢さ修正                 r毒 : Po : 毒への耐性
++器 : Dx : 器用さ修正               r閃 : Li : 光への耐性
++耐 : Cn : 耐久力修正               r暗 : Dk : 暗黒への耐性
++魅 : Ch : 魅力修正                 r破 : Sh : 破片への耐性
++道 : Md : 魔法道具支配             r盲 : Bl : 盲目への耐性    
++隠 : Sl : 隠密修正                 r乱 : Cf : 混乱への耐性    
++探 : Sr : 探索修正                 r轟 : So : 轟音への耐性    
++赤 : If : 赤外線修正               r獄 : Nt : 地獄への耐性    
++掘 : Dg : 採掘力修正               r因 : Nx : 因果混乱への耐性
+*酸 : *Ac : 酸への免疫              r沌 : Ca : 混沌への耐性    
+*電 : *El : 電撃への免疫            r劣 : Di : 劣化への耐性    
+*火 : *Fi : 火への免疫              r恐 : Fe : 恐怖への耐性    
+*冷 : *Co : 冷気への免疫            
 
 魔力 : Ma : 魔力消費減少            (炎 : (F: 炎のバリア
 投 : Th : 投擲用武器                (電 : (E: 電撃のバリア

--- a/lib/help/objects.txt
+++ b/lib/help/objects.txt
@@ -501,14 +501,15 @@ Wi : affects wisdom                 Po : resistance to poison
 Dx : affects dexterity              Li : resistance to light
 Cn : affects constitution           Dk : resistance to darkness
 Ch : affects charisma               Sh : resistance to shards
-Sl : affects stealth                Bl : resistance to blindness
-Sr : affects searching ability      Cf : resistance to confusion
-If : affects infravision            So : resistance to sound
-Dg : affects tunneling ability      Nt : resistance to nether
-*Ac : immune to acid                Nx : resistance to nexus
-*El : immune to electricity         Ca : resistance to chaos
-*Fi : immune to fire                Di : resistance to disenchantment
-*Co : immune to cold                Fe : resistance to fear
+Md : affects magic devices          Bl : resistance to blindness     
+Sl : affects stealth                Cf : resistance to confusion     
+Sr : affects searching ability      So : resistance to sound         
+If : affects infravision            Nt : resistance to nether        
+Dg : affects tunneling ability      Nx : resistance to nexus         
+*Ac : immune to acid                Ca : resistance to chaos         
+*El : immune to electricity         Di : resistance to disenchantment
+*Fi : immune to fire                Fe : resistance to fear          
+*Co : immune to cold                
 
 Ma : decreases mana consumption     (F : fiery sheath
 Th : suitable for throwing          (E : electric sheath

--- a/readme.txt
+++ b/readme.txt
@@ -93,6 +93,9 @@
 
 ●コマンド
 
+  詳しいゲームの説明はオンライン・ヘルプ('?'キーを押して表示)を参照
+  してください。ここでは基本的なコマンドだけ説明します。
+
   コマンドは大文字と小文字を区別します。
   多くのコマンドは小文字なのでCapsはOFFにしておきましょう。
   以下のコマンドが全てではありませんが、
@@ -145,14 +148,18 @@
   i 持ち物の一覧表示
   l/x 周りを見る
   M 現在の階の全体マップを見る
+  ~ 様々な重要な情報を見るメニューを開く
 
   [その他]
   p ペットに命令する
   = オプション設定
-  $ 自動拾いファイルを再読み込みする。
-  _ 自動拾いファイルの編集。
-  n/[  前のコマンドを繰り返す。
-  @  マクロの設定をする。
+  $ 自動拾いファイルを再読み込みする
+  _ 自動拾いファイルの編集
+  n/[  前のコマンドを繰り返す
+  @  マクロの設定をする
+
+  [ヘルプ]
+  ? オンライン・ヘルプを開く ( a-z で項目選択。スペースで次ページ。)
 
 
 ●アイテム表記
@@ -234,7 +241,6 @@
   '<', '>': 階段, 坑道
        '<'は上りの、'>'は下りです。
        白は階段で階を1つ移動し、茶色は坑道で階を2つ移動します。
-       ただし、たまに移動する階数が1つ増えることがあります。
 
 
 ――― ちょっと高度なプレイ ―――

--- a/readme_eng.txt
+++ b/readme_eng.txt
@@ -79,6 +79,9 @@ Serpent of Chaos, whom you must kill in order to win the game.
 
 ---------  Commands  ----------- 
 
+     Please read on-line help (Press the ? key in the game) for full
+information of the game.  Here are only descriptions of basic commands.
+
      The following section lists most commands, and the less frequently used 
 ones may be accessed by pressing the return key, or (if using the original 
 keyset) the 'x' key, to bring up the command menu.  Almost any command may be 
@@ -147,7 +150,7 @@ keyset, and by pushing 'x' in the Rogue-like keyset.
   M  Full dungeon map
   ~  Display various information
 
-  [other]
+  [Other]
   p  Command pets
   =  Set options
   $  Reload auto-picker preference file
@@ -155,6 +158,10 @@ keyset, and by pushing 'x' in the Rogue-like keyset.
   n/[  Repeat previous command
   @  Interact with macros
 
+  [Help]
+  ?  View the on-line help 
+     (Press a-z to choose a section,  space key to go next page.)
+
 
 --- Inscriptions
 

--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -451,6 +451,13 @@ msg_print("
 #else
 			msg_format("The %s has no charges left.", staff);
 #endif
+
+			o_ptr->ident |= (IDENT_EMPTY);
+
+			/* Combine / Reorder the pack (later) */
+			p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+			p_ptr->window |= (PW_INVEN);
+
 			return;
 		}
 
@@ -1469,7 +1476,7 @@ msg_print("
 #else
 				msg_print("You are moistened.");
 #endif
-				set_food(MIN(p_ptr->food + o_ptr->pval + 1000, PY_FOOD_MAX - 1));
+				set_food(MIN(p_ptr->food + o_ptr->pval + MAX(0, o_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1));
 				break;
 			default:
 				(void)set_food(p_ptr->food + o_ptr->pval);

--- a/src/defines.h
+++ b/src/defines.h
@@ -39,15 +39,15 @@
 
 /* Savefile version for Hengband 1.1.1 and later */
 #define H_VER_MAJOR 1
-#define H_VER_MINOR 3
-#define H_VER_PATCH 2
+#define H_VER_MINOR 4
+#define H_VER_PATCH 0
 #define H_VER_EXTRA 0
 
 /* Added for ZAngband */
 #define FAKE_VERSION   0
 #define FAKE_VER_MAJOR 11
-#define FAKE_VER_MINOR 3
-#define FAKE_VER_PATCH 1
+#define FAKE_VER_MINOR 4
+#define FAKE_VER_PATCH 0
 
 #define ANGBAND_2_8_1
 #define ZANGBAND

--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -5556,10 +5556,16 @@ msg_format("%s(%c)
 		if (energy_use)
 		{
 			/* Use some energy */
-			if (!world_player)
-				p_ptr->energy_need += (s16b)((s32b)energy_use * ENERGY_NEED() / 100L);
-			else
+			if (world_player || energy_use > 400)
+			{
+				/* The Randomness is irrelevant */
 				p_ptr->energy_need += energy_use * TURNS_PER_TICK / 10;
+			}
+			else
+			{
+				/* There is some randomness of needed energy */
+				p_ptr->energy_need += (s16b)((s32b)energy_use * ENERGY_NEED() / 100L);
+			}
 
 			/* Hack -- constant hallucination */
 			if (p_ptr->image) p_ptr->redraw |= (PR_MAP);

--- a/src/effects.c
+++ b/src/effects.c
@@ -419,6 +419,18 @@ msg_print("
 			msg_print("You are confused!");
 #endif
 
+			if (p_ptr->action == ACTION_LEARN)
+			{
+#ifdef JP
+				msg_print("学習が続けられない！");
+#else
+				msg_print("You cannot continue Learning!");
+#endif
+				new_mane = FALSE;
+
+				p_ptr->redraw |= (PR_STATE);
+				p_ptr->action = ACTION_NONE;
+			}
 			if (p_ptr->action == ACTION_KAMAE)
 			{
 #ifdef JP

--- a/src/externs.h
+++ b/src/externs.h
@@ -393,14 +393,9 @@ extern vault_type *v_info;
 extern char *v_name;
 extern char *v_text;
 extern skill_table *s_info;
-extern char *s_name;
-extern char *s_text;
 extern player_magic *m_info;
-extern char *m_name;
-extern char *m_text;
 extern feature_type *f_info;
 extern char *f_name;
-extern char *f_text;
 extern object_kind *k_info;
 extern char *k_name;
 extern char *k_text;

--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1045,6 +1045,7 @@ static flag_insc_table flag_insc_plus[] =
 	{ "器", "Dx", TR_DEX, -1 },
 	{ "耐", "Cn", TR_CON, -1 },
 	{ "魅", "Ch", TR_CHR, -1 },
+	{ "道", "Md", TR_MAGIC_MASTERY, -1 },
 	{ "隠", "Sl", TR_STEALTH, -1 },
 	{ "探", "Sr", TR_SEARCH, -1 },
 	{ "赤", "If", TR_INFRA, -1 },
@@ -1201,6 +1202,7 @@ static flag_insc_table flag_insc_plus[] =
 	{ "Dx", TR_DEX, -1 },
 	{ "Cn", TR_CON, -1 },
 	{ "Ch", TR_CHR, -1 },
+	{ "Md", TR_MAGIC_MASTERY, -1 },
 	{ "Sl", TR_STEALTH, -1 },
 	{ "Sr", TR_SEARCH, -1 },
 	{ "If", TR_INFRA, -1 },

--- a/src/grid.c
+++ b/src/grid.c
@@ -196,6 +196,9 @@ void place_closed_door(int y, int x)
 		/* Create jammed door */
 		cave_set_feat(y, x, FEAT_DOOR_HEAD + 0x08 + randint0(8));
 	}
+
+	/* Now it is not floor */
+	cave[y][x].info &= ~(CAVE_MASK);
 }
 
 

--- a/src/init1.c
+++ b/src/init1.c
@@ -1213,20 +1213,6 @@ errr parse_f_info(char *buf, header *head)
 	}
 #endif
 
-#if 0
-
-	/* Process 'D' for "Description" */
-	else if (buf[0] == 'D')
-	{
-		/* Acquire the text */
-		s = buf+2;
-
-		/* Store the text */
-		if (!add_text(&f_ptr->text, head, s)) return (7);
-	}
-
-#endif
-
 
 	/* Process 'M' for "Mimic" (one line only) */
 	else if (buf[0] == 'M')

--- a/src/init2.c
+++ b/src/init2.c
@@ -652,7 +652,7 @@ static errr init_f_info(void)
 #endif /* ALLOW_TEMPLATES */
 
 	return init_info("f_info", &f_head,
-			 (void*)&f_info, (void*)&f_name, (void*)&f_text);
+			 (void*)&f_info, (void*)&f_name, NULL);
 }
 
 
@@ -799,7 +799,7 @@ static errr init_s_info(void)
 #endif /* ALLOW_TEMPLATES */
 
 	return init_info("s_info", &s_head,
-			 (void*)&s_info, (void*)&s_name, (void*)&s_text);
+			 (void*)&s_info, NULL, NULL);
 }
 
 
@@ -819,7 +819,7 @@ static errr init_m_info(void)
 #endif /* ALLOW_TEMPLATES */
 
 	return init_info("m_info", &m_head,
-			 (void*)&m_info, (void*)&m_name, (void*)&m_text);
+			 (void*)&m_info, NULL, NULL);
 }
 
 
@@ -879,16 +879,14 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] =
 		{ TV_FOOD, SV_FOOD_RATION },
 		{ TV_FOOD, SV_FOOD_RATION },
 
-		{ TV_LITE, SV_LITE_TORCH },
-		{ TV_LITE, SV_LITE_TORCH },
+		{ TV_POTION, SV_POTION_WATER },
+		{ TV_POTION, SV_POTION_WATER },
 		{ TV_LITE, SV_LITE_LANTERN },
 		{ TV_LITE, SV_LITE_LANTERN },
 
 		{ TV_FLASK, 0 },
 		{ TV_FLASK, 0 },
-
 		{ TV_CAPTURE, 0 },
-
 		{ TV_FIGURINE, 0 },
 
 		{ TV_SHOT, SV_AMMO_NORMAL },

--- a/src/load.c
+++ b/src/load.c
@@ -2250,9 +2250,17 @@ note(format("
 		c_ptr->m_idx = m_idx;
 
 
-		/* Access race */
+		/* Access real race */
 		r_ptr = &r_info[m_ptr->r_idx];
 
+		if (m_ptr->mflag2 & MFLAG_CHAMELEON)
+		{
+			if (r_ptr->flags1 & RF1_UNIQUE)
+				r_ptr = &r_info[MON_CHAMELEON_K];
+			else
+				r_ptr = &r_info[MON_CHAMELEON];
+		}
+
 		/* Count XXX XXX XXX */
 		r_ptr->cur_num++;
 	}

--- a/src/makefile.bcc
+++ b/src/makefile.bcc
@@ -70,7 +70,7 @@ OBJ = \
 	monster1.obj monster2.obj mspells1.obj mspells2.obj mspells3.obj \
 	mutation.obj \
 	obj_kind.obj object1.obj object2.obj racial.obj readdib.obj \
-	report.obj rooms.obj save.obj scores.obj script.obj spells1.obj \
+	report.obj rooms.obj save.obj scores.obj spells1.obj \
 	spells2.obj spells3.obj store.obj streams.obj tables.obj util.obj \
 	variable.obj wild.obj wizard1.obj wizard2.obj xtra1.obj xtra2.obj \
 	z-form.obj z-rand.obj z-term.obj z-util.obj z-virt.obj

--- a/src/makefile.dos
+++ b/src/makefile.dos
@@ -29,24 +29,6 @@ JP_OPT= -DJP -DSJIS
 # Basic definitions
 #
 
-# Objects
-#OBJS = \
-#	main.o main-dos.o main-ibm.o \
-#	artifact.o avatar.o birth.o bldg.o \
-#	cave.o cmd1.o cmd2.o cmd3.o \
-#	cmd4.o cmd5.o cmd6.o dungeon.o \
-#	effects.o files.o flavor.o generate.o \
-#	grid.o init1.o init2.o load.o \
-#	melee1.o melee2.o mind.o monster1.o \
-#	monster2.o mspells1.o mspells2.o mutation.o \
-#	notes.o \
-#	obj_kind.o object1.o object2.o racial.o \
-#	rooms.o save.o scores.o script.o \
-#	spells1.o spells2.o spells3.o store.o \
-#	streams.o tables.o util.o variable.o \
-#	wild.o wizard1.o wizard2.o xtra1.o \
-#	xtra2.o z-form.o z-rand.o z-term.o \
-#	z-util.o z-virt.o \
 OBJS = \
 	z-util.o z-virt.o z-form.o z-rand.o z-term.o \
 	variable.o tables.o util.o cave.o \
@@ -162,7 +144,6 @@ obj_kind.o: obj_kind.c $(INCS)
 racial.o: racial.c $(INCS)
 save.o: save.c $(INCS)
 scores.o: scores.c $(INCS)
-script.o: script.c $(INCS)
 spells1.o: spells1.c $(INCS)
 spells2.o: spells2.c $(INCS)
 spells3.o: spells3.c $(INCS)

--- a/src/makefile.ibm
+++ b/src/makefile.ibm
@@ -15,24 +15,6 @@ JP_OPT= -DJP -DSJIS
 ###################################################################
 
 
-#OBJS = \
-#	main.o main-ibm.o \
-#	artifact.o avatar.o birth.o bldg.o \
-#	cave.o cmd1.o cmd2.o cmd3.o \
-#	cmd4.o cmd5.o cmd6.o dungeon.o \
-#	effects.o files.o flavor.o generate.o \
-#	grid.o init1.o init2.o load.o \
-#	melee1.o melee2.o mind.o monster1.o \
-#	monster2.o mspells1.o mspells2.o mutation.o \
-#	notes.o \
-#	obj_kind.o object1.o object2.o racial.o \
-#	rooms.o save.o scores.o script.o \
-#	spells1.o spells2.o spells3.o store.o \
-#	streams.o tables.o util.o variable.o \
-#	wild.o wizard1.o wizard2.o xtra1.o \
-#	xtra2.o z-form.o z-rand.o z-term.o \
-#	z-util.o z-virt.o \
-
 OBJS = \
 	z-util.o z-virt.o z-form.o z-rand.o z-term.o \
 	variable.o tables.o util.o cave.o \

--- a/src/racial.c
+++ b/src/racial.c
@@ -2740,7 +2740,7 @@ strcpy(power_desc[num].name, "
 		power_desc[num].level = 10;
 		power_desc[num].cost = 10;
 		power_desc[num].fail = 100 - racial_chance(10, A_DEX, 20);
-		power_desc[num++].number = -4;
+		power_desc[num++].number = -3;
 		break;
 	}
 	case CLASS_MIRROR_MASTER:

--- a/src/store.c
+++ b/src/store.c
@@ -1308,6 +1308,9 @@ static bool store_will_buy(object_type *o_ptr)
 			/* Analyze the type */
 			switch (o_ptr->tval)
 			{
+				case TV_POTION:
+					if (o_ptr->sval != SV_POTION_WATER) return FALSE;
+
 				case TV_WHISTLE:
 				case TV_FOOD:
 				case TV_LITE:

--- a/src/variable.c
+++ b/src/variable.c
@@ -728,22 +728,17 @@ char *v_text;
  * The skill table
  */
 skill_table *s_info;
-char *s_name;
-char *s_text;
 
 /*
  * The magic info
  */
 player_magic *m_info;
-char *m_name;
-char *m_text;
 
 /*
  * The terrain feature arrays
  */
 feature_type *f_info;
 char *f_name;
-char *f_text;
 
 /*
  * The object kind arrays

--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -3150,6 +3150,7 @@ static int target_set_aux(int y, int x, int mode, cptr info)
 	{
 		monster_type *m_ptr = &m_list[c_ptr->m_idx];
 		monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
+		char m_name[80];
 		bool recall = FALSE;
 
 		/* Not boring */