Merge branch 'develop'

configure.ac

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(PosChengband, 2.0.1, [email protected])
+AC_INIT(PosChengband, 3.4.4, https://github.com/poschengband/poschengband/issues)
 AC_CONFIG_SRCDIR(src)
 
 AC_CANONICAL_HOST

lib/edit/a_info.txt

@@ -2001,12 +2001,12 @@ F:SLOW_DIGEST | SHOW_MODS
 N:181:of halfheart
 I:21:63:7
 W:127:1:50:1000000
-P:0:1d77:22:22:10
+P:0:8d8:22:27:10
 F:STR | DEX | SUST_STR | SUST_DEX | FREE_ACT | SEE_INVIS | VAMPIRIC |
 F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_ELEC | BRAND_ACID |
 F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC | WARNING |
 F:IM_FIRE | RES_SHARDS | RES_FEAR | TUNNEL | INFRA | SEARCH | REFLECT |
-F:LITE | TELEPATHY | REGEN | BRAND_FIRE | BRAND_COLD | BRAND_POIS | WILD
+F:LITE | TELEPATHY | REGEN | BRAND_FIRE | BRAND_COLD | BRAND_POIS
 F:SLAY_HUMAN | HIDE_TYPE | SHOW_MODS | RIDING | QUESTITEM | INSTA_ART
 
 N:182:of irresponsibility

lib/edit/s_info.txt

@@ -10782,7 +10782,7 @@ W:2:17:0:2  #
 W:2:18:0:1  # TWO_HANDED_FLAIL
 W:2:19:0:1  # GREAT_HAMMER
 W:2:20:0:1  # MACE_OF_DISRUPTION
-W:2:21:1:1  # WIZSTAFF
+W:2:21:0:0  # WIZSTAFF
 W:2:22:0:2  # 
 W:2:23:0:2  # 
 W:2:24:0:2  # 
@@ -10866,7 +10866,7 @@ W:3:36:0:2  #
 W:3:37:0:2  # 
 W:3:38:0:2  # 
 W:3:39:0:2  # 
-W:3:40:0:2  # 40
+W:3:40:0:0  # 40
 W:3:41:0:2  # 
 W:3:42:0:2  # 
 W:3:43:0:2  # 
@@ -10876,7 +10876,7 @@ W:3:46:0:2  #
 W:3:47:0:2  # 
 W:3:48:0:2  # 
 W:3:49:0:2  # 
-W:3:50:0:1  # DEATH_SCYTHE
+W:3:50:0:0  # DEATH_SCYTHE
 W:3:51:0:2  # 
 W:3:52:0:2  # 
 W:3:53:0:2  # 
@@ -10923,10 +10923,10 @@ W:4:28:0:2  # EXECUTIOERS_SWORD
 W:4:29:0:2  # ZWEIHANDER
 W:4:30:0:2  # BLADE_OF_CHAOS
 W:4:31:0:2  # DIAMOND_EDGE
-W:4:32:0:2  # DOKUBARI
-W:4:33:0:2  # 
-W:4:34:0:2  # 
-W:4:35:0:2  # 
+W:4:32:0:0  # DOKUBARI
+W:4:33:0:3  # FALCON SWORD
+W:4:34:0:2  # RUNE SWORD
+W:4:35:0:3  # DRAGON FANG 
 W:4:36:0:2  # 
 W:4:37:0:2  # 
 W:4:38:0:2  # 

lib/edit/v_info.txt

@@ -631,7 +631,7 @@ M:
 M:                 
 
 N:Marauding Orcs
-T:AMBUSH:GRASS:FORMATION
+T:AMBUSH:GRASS:FORMATION | NIGHT
 W:1:*:1
 L:0:MON(o, DEPTH+5)
 L:T:MON(T, NO_SLEEP | NO_GROUP | DEPTH+10)
@@ -1009,7 +1009,7 @@ M:  8  $232$  8
 M:   8$  4  $8   
 
 N:Roasting Hobbits
-T:WILD:TREES
+T:WILD:TREES:NIGHT
 W:15:*:4
 L:T:MON(297, NO_SLEEP)
 L:h:MON(74, FRIENDLY)

lib/file/news.txt

@@ -1,5 +1,5 @@
                   ****************************************
-                  **         PosChengband 3.4.3         **
+                  **         PosChengband 3.4.4         **
                   ****************************************
 
           Based on Moria:   Copyright (c) 1985 Robert Alan Koeneke

lib/file/rumors.txt

@@ -289,7 +289,7 @@ Are you really suffering withdrawal symptoms and want something crushable?
 Smaug and alcohol may disturb your .. was it sanity, courage or boredom?
 Ha, treasures! Like all vaults it was full of depths and dangers.
 The benefits of alchemy are my marriage, danger is my passion.
-Any dungeons offer mazes. But don't they lack the ZAngband sense of humor?
+Any dungeons offer mazes. But don't they lack the PosChengband sense of humor?
 Bodychecks, bodycounts itching all my ways but the awful software bugs...
 Be constantly on guard, joker, don't take anything at face value.
 Which is better: mind blast or mind wash? Will lost memories return gradually?
@@ -512,7 +512,7 @@ Selling blessed weapons to a sympathizing temple is not too bad an idea.
 I'd prefer ball sorcery or breath ability to mass genocide for good reason.
 Scrolls of genocide will extinct annoying monster races from your level area.
 *Destruction* will cause a 15x15 area to change completely, but you undamaged.
-There are mostly only rumors about the effects of rarer ZAngband items.
+There are mostly only rumors about the effects of rarer PosChengband items.
 What does NETHER mean? The (arch.) N. regions are the world of the dead/hell.
 What does NEXUS mean? It refers to connexion/bond. Location/stats get unstable.
 Such a Blade of Chaos (chaotic) is quite a rare and precious finding.
@@ -645,4 +645,4 @@ Some say the RNG itself lurks deep in the caverns.
 They say some space monsters are not what they appear to be.
 Never read a scroll that asks you to use an item.
 There is a powerful spell which can remove even the strongest curses...
-You feel the Windows (2000) on your hard disk is broken...
+You feel the Windows 8 on your hard disk is broken...

lib/pref/pref-opt.prf

@@ -118,7 +118,7 @@ Y:powerup_home
 
 ##### Easy Object Auto-Destroyer #####
 
-Y:destroy_items
+X:destroy_items
 Y:destroy_feeling
 Y:destroy_identify
 Y:leave_worth

mk/.gitignore

@@ -0,0 +1,2 @@
+extra.mk
+sinclude.mk

readme.txt

@@ -10,6 +10,7 @@
   From the root of the source archive:
     $ sh autogen.sh
     $ ./configure
+    % make clean
     $ make
 
   To install, you may need to elevate your credentials:

src/Makefile

@@ -8,7 +8,7 @@ OBJECTS = $(ANGFILES) $(ZFILES)
 SRCS    = ${OBJECTS:.o=.c} ${MAINFILES:.o=.c}
 PROG    = poschengband$(PROG_SUFFIX)
 # VERSION := $(shell ../scripts/version.sh)
-CFLAGS += -DBUILD_ID=${VERSION} -I. -std=c99 -Wdeclaration-after-statement -O0
+CFLAGS += -DBUILD_ID=${VERSION} -I. -std=c99 -Wdeclaration-after-statement -O0 -g -fno-omit-frame-pointer
 
 CLEAN = poschengband.o $(OBJECTS) win/poschengband.res
 DISTCLEAN = autoconf.h

src/Poschengband.vcxproj.filters

@@ -546,9 +546,6 @@
     <ClCompile Include="skills.c">
       <Filter>Player</Filter>
     </ClCompile>
-    <ClCompile Include="race_centipede.c">
-      <Filter>Player\Races</Filter>
-    </ClCompile>
     <ClCompile Include="race_ghost.c">
       <Filter>Player\Races</Filter>
     </ClCompile>
@@ -564,6 +561,9 @@
     <ClCompile Include="race_mimic.c">
       <Filter>Player\Races</Filter>
     </ClCompile>
+    <ClCompile Include="race_centipede.c">
+      <Filter>Player\Races</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="angband.h">

src/archaeologist.c

@@ -840,4 +840,4 @@ class_t *archaeologist_get_class_t(void)
     }
 
     return &me;
-}
+}

src/artifact.c

@@ -2591,7 +2591,8 @@ s32b create_artifact(object_type *o_ptr, u32b mode)
     add_flag(o_ptr->art_flags, TR_IGNORE_FIRE);
     add_flag(o_ptr->art_flags, TR_IGNORE_COLD);
 
-    if (!have_flag(o_ptr->art_flags, TR_ACTIVATE))
+    if ( !have_flag(o_ptr->art_flags, TR_ACTIVATE)
+      && !object_is_ammo(o_ptr) )
     {
         int odds = object_is_armour(o_ptr) ? ACTIVATION_CHANCE * 2 : ACTIVATION_CHANCE;
         if (one_in_(odds))

src/birth.c

@@ -2141,7 +2141,7 @@ static void player_wipe(void)
     p_ptr->visit = 1;
     p_ptr->wild_mode = FALSE;
 
-    for (i = 0; i < 108; i++)
+    for (i = 0; i < MAX_MAGIC_NUM; i++)
     {
         p_ptr->magic_num1[i] = 0;
         p_ptr->magic_num2[i] = 0;
@@ -2628,9 +2628,9 @@ static byte player_init[MAX_CLASS][3][2] =
     },
     {
         /* Duelist */
-        { TV_SOFT_ARMOR, SV_SOFT_LEATHER_ARMOR},
+        { TV_SOFT_ARMOR, SV_SOFT_LEATHER_ARMOR },
         { TV_SWORD, SV_RAPIER },
-        { TV_GLOVES, SV_SET_OF_GAUNTLETS },
+        { TV_POTION, SV_POTION_SPEED },
     },
     {
         /* Wild-Talent */

src/bldg.c

@@ -1702,7 +1702,7 @@ static bool kankin(void)
     object_type *o_ptr;
 
     /* Loop for inventory and right/left arm */
-    for (i = 0; i <= INVEN_TOTAL; i++)
+    for (i = 0; i < INVEN_TOTAL; i++)
     {
         o_ptr = &inventory[i];
 
@@ -2432,8 +2432,8 @@ static bool eval_ac(int iAC)
     for (col = 17 + 1, lvl = 0; lvl <= 100; lvl += 10, col += 5)
     {
         int quality = 60 + lvl * 3; /* attack quality with power 60 */
-        int dodge;   /* 回避率(%) */
-        int average; /* ダメージ期待値 */
+        int dodge;
+        int average;
 
         put_str(format("%3d", lvl), row + 0, col);
 
@@ -3645,7 +3645,6 @@ static bool research_mon(void)
         /* Require unique monsters if needed */
         if (uniq && !(r_ptr->flags1 & (RF1_UNIQUE))) continue;
 
-        /* 名前検索 */
         if (temp[0])
         {
             int xx;