Changeset 48

Timestamp:

04/19/07 12:56:23 (2 years ago)

Author:

takkaria

Message:

• Fix logic in my_fexists()
  
• Ammo in stores is now treated in groups of 5/10/20
  
• Implement the big options clearout (requires bumping version number to 3.0.8) (#27)
  
• Update compile instructions (incomplete)
  

Files:

• trunk/compile.txt (modified) (3 diffs)
• trunk/lib/edit/artifact.txt (modified) (1 diff)
• trunk/lib/edit/cost_adj.txt (modified) (1 diff)
• trunk/lib/edit/ego_item.txt (modified) (1 diff)
• trunk/lib/edit/flavor.txt (modified) (1 diff)
• trunk/lib/edit/limits.txt (modified) (1 diff)
• trunk/lib/edit/monster.txt (modified) (1 diff)
• trunk/lib/edit/object.txt (modified) (1 diff)
• trunk/lib/edit/p_class.txt (modified) (1 diff)
• trunk/lib/edit/p_hist.txt (modified) (1 diff)
• trunk/lib/edit/p_race.txt (modified) (1 diff)
• trunk/lib/edit/shop_own.txt (modified) (1 diff)
• trunk/lib/edit/spell.txt (modified) (1 diff)
• trunk/lib/edit/terrain.txt (modified) (1 diff)
• trunk/lib/edit/vault.txt (modified) (1 diff)
• trunk/scripts/pkg_win (modified) (1 diff)
• trunk/src/birth.c (modified) (5 diffs)
• trunk/src/cave.c (modified) (9 diffs)
• trunk/src/cmd1.c (modified) (1 diff)
• trunk/src/cmd3.c (modified) (2 diffs)
• trunk/src/cmd4.c (modified) (1 diff)
• trunk/src/config.h (modified) (4 diffs)
• trunk/src/defines.h (modified) (12 diffs)
• trunk/src/dungeon.c (modified) (5 diffs)
• trunk/src/files.c (modified) (1 diff)
• trunk/src/generate.c (modified) (4 diffs)
• trunk/src/load.c (modified) (3 diffs)
• trunk/src/melee2.c (modified) (16 diffs)
• trunk/src/monster1.c (modified) (1 diff)
• trunk/src/monster2.c (modified) (1 diff)
• trunk/src/obj-info.c (modified) (1 diff)
• trunk/src/object1.c (modified) (16 diffs)
• trunk/src/object2.c (modified) (1 diff)
• trunk/src/save.c (modified) (2 diffs)
• trunk/src/store.c (modified) (9 diffs)
• trunk/src/tables.c (modified) (24 diffs)
• trunk/src/types.h (modified) (1 diff)
• trunk/src/util.c (modified) (2 diffs)
• trunk/src/xtra1.c (modified) (1 diff)
• trunk/src/xtra2.c (modified) (3 diffs)
• trunk/src/z-file.c (modified) (1 diff)

trunk/compile.txt

@@ -3 +3 @@
-
-Last updated on 23rd March 2007 by Andrew Sidwell
+
+You only want to read this file if you want to compile the game.  It is
+probably unnecessary todo so, since most platforms have pre-compiled versions
+available.
-
-If you are able to construct "main-xxx.c" and/or "Makefile.xxx" files for
@@ -14 +18 @@
-
-----------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-appropriate "extra archive", which contains some extra platform specific
-files, and instructions about how to use them.  Some "extra archives" may
@@ -50 +50 @@
-Configure may modify all but CC.
-
-a makefile
-probably src/Makefile.std, and
+src/Makefile.std
+then
-
-

trunk/lib/edit/artifact.txt

@@ -65 +65 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/cost_adj.txt

@@ -17 +17 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/ego_item.txt

@@ -52 +52 @@
-# Version stamp (required)
-
-7
+8
-
-# 1 (unused)

trunk/lib/edit/flavor.txt

@@ -15 +15 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/limits.txt

@@ -12 +12 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/monster.txt

@@ -97 +97 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/object.txt

@@ -80 +80 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/p_class.txt

@@ -63 +63 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/p_hist.txt

@@ -30 +30 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/p_race.txt

@@ -51 +51 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/shop_own.txt

@@ -17 +17 @@
-# Version stamp (required)
-
-7
+8
-
-# General Store

trunk/lib/edit/spell.txt

@@ -38 +38 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/terrain.txt

@@ -36 +36 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/lib/edit/vault.txt

@@ -47 +47 @@
-# Version stamp (required)
-
-7
+8
-
-

trunk/scripts/pkg_win

@@ -53 +53 @@
-cp ../lib/xtra/sound/*.wav lib/xtra/sound
-
-
+#
-
-cd ..

trunk/src/birth.c

@@ -1102 +1102 @@
- * This function handles "auto-rolling" and "random-rolling".
- */
-void
+bool autoroll
-{
-        int i, j, m, v;
@@ -1131 +1131 @@
-
-        /* Initialize */
-dult_auto_roller
+utoroll
-        {
-                int mval[A_MAX];
@@ -1242 +1242 @@
-
-                /* Feedback */
-dult_auto_roller
+utoroll
-                {
-                        Term_clear();
@@ -1467 +1467 @@
-        cptr prompt = "['Q' to suicide, 'S' to start over, or any other key to continue]";
-
+        bool point_based = FALSE, autoroll = FALSE;
+        bool done = FALSE;
+
-        /* Ask questions */
-        if (!player_birth_aux_1()) return (FALSE);
-
+        /* XXX Ask for autoroll preference */
+        /* Turn into a real menu later */
+        Term_clear();
+        while (!done)
+        {
+                prt("To create a character, would you like to:", 1, 1);
+                prt(" a) Use the point-based system", 2, 1);
+                prt(" b) Use the autoroller", 3, 1);
+                prt(" a) Use the basic roller", 4, 1);
+
+                prt("", 6, 1);
+                ch = inkey();
+
+                switch (ch)
+                {
+                        case 'a':
+                        case 'A':
+                                done = point_based = TRUE;
+                                break;
+
+                        case 'b':
+                        case 'B':
+                                done = autoroll = TRUE;
+                                break;
+
+                        case 'c':
+                        case 'C':
+                                done = TRUE;
+                                break;
+                }
+        }
+
-        /* Point-based */
-adult_
+
-        {
-                /* Point based */
@@ -1481 +1516 @@
-        {
-                /* Auto-roll */
-
+autoroll
-        }
-

trunk/src/cave.c

@@ -719 +719 @@
- * they take the symbol of whatever is under them.  Technically, the flag
- * "CHAR_MULTI" is supposed to indicate that a monster looks strange when
-
-
-
+
- *
- * Normally, players could be handled just like monsters, except that the
@@ -728 +726 @@
- * "player" symbol always "pre-empts" any other facts about the grid.
- *
- * The "hidden_player" efficiency option, which only makes sense with a
- * single player, allows the player symbol to be hidden while running.
- *
- * ToDo: The transformations for tile colors, or brightness for the 16x16
- * tiles should be handled differently.  One possibility would be to
@@ -918 +913 @@
-                        }
-
-Ignore weird
-avoid_other
+Special attr/char
+(da & 0x80) && (dc & 0x80)
-                        {
-                                /* Use attr */
@@ -928 +923 @@
-                        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        {
-                                /* Use attr */
@@ -938 +943 @@
-                        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                /* Normal char */
-                                c = dc;
-                        }
-
-                        /* Normal monster (not "clear" in any way) */
-                        else if (!(r_ptr->flags1 & (RF1_ATTR_CLEAR | RF1_CHAR_CLEAR)))
-                        {
-                                /* Use attr */
-                                a = da;
-
-                                /* Use char */
-                                c = dc;
-                        }
-
-                        /* Hack -- Bizarre grid under monster */
-                        else if ((a & 0x80) || (c & 0x80))
-                        {
-                                /* Use attr */
-                                a = da;
-
-                                /* Use char */
-                                c = dc;
-                        }
-
-                        /* Normal char, Clear attr, monster */
-                        else if (!(r_ptr->flags1 & (RF1_CHAR_CLEAR)))
-                        {
-                                /* Normal char */
-                                c = dc;
-                        }
-
-                        /* Normal attr, Clear char, monster */
-                        else if (!(r_ptr->flags1 & (RF1_ATTR_CLEAR)))
@@ -985 +970 @@
-
-        /* Handle "player" */
-(m_idx < 0) && !(p_ptr->running && hidden_player)
+m_idx < 0
-        {
-                monster_race *r_ptr = &r_info[0];
@@ -1014 +999 @@
-        }
-
-#ifdef MAP_INFO_MULTIPLE_PLAYERS
-        /* Players */
-        else if (m_idx < 0)
-#else /* MAP_INFO_MULTIPLE_PLAYERS */
-        /* Handle "player" */
-        else if ((m_idx < 0) && !(p_ptr->running && hidden_player))
-#endif /* MAP_INFO_MULTIPLE_PLAYERS */
-        {
-                monster_race *r_ptr = &r_info[0];
@@ -3286 +3266 @@
-
-        /* Hack -- disabled */
-flow_by
+adult_ai
-
-
@@ -4146 +4126 @@
-                /* Calculate torch radius */
-                p_ptr->update |= (PU_TORCH);
-
-                /* Redraw the player */
-                if (hidden_player)
-                {
-                        int py = p_ptr->py;
-                        int px = p_ptr->px;
-
-                        /* Redraw player */
-                        lite_spot(py, px);
-                }
-        }
-

trunk/src/cmd1.c

@@ -1874 +1874 @@
-                                        break;
-                                }
-
-                                /* Stairs */
-                                case FEAT_LESS:
-                                case FEAT_MORE:
-                                {
-                                        /* Option -- ignore */
-                                        if (run_ignore_stairs) notice = FALSE;
-
-                                        /* Done */
-                                        break;
-                                }
-                        }
-

trunk/src/cmd3.c

@@ -1590 +1590 @@
-                {
-                        if (++i == n)
-                        {
-                                i = 0;
-                                if (!expand_list) break;
-                        }
-                }
-
@@ -1600 +1597 @@
-                {
-                        if (i-- == 0)
-                        {
-                                i = n - 1;
-                                if (!expand_list) break;
-                        }
-                }
-        }

trunk/src/cmd4.c

@@ -3993 +3993 @@
-static menu_item option_actions [] =
-{
-
-
-
-
-
-
-
+
+
+
+
+
+
-        {{0, 0, 0, 0}}, /* Load and append */
-F
-Squelch and Autoinscribe Menu
+f
+squelch and Autoinscribe setting
-        {{0, "Load a user pref file", (action_f) do_cmd_pref_file_hack, (void*)20}, 'L'},
-O
+o
-        {{0, 0, 0,}, 0}, /* Special choices */
-Base Delay F
-Hitpoint W
+Set base delay f
+Set hitpoint w
-};
-

trunk/src/config.h

@@ -145 +145 @@
-
-/*
-flow_by_smell" and "flow_by
+adult_ai_smell" and "adult_ai
- * software options, which enable "monster flowing".
- */
@@ -158 +158 @@
-
-/*
-smart_monsters" and "smart
+adult_ai_smart" and "adult_ai
- * software options, which attempt to make monsters smarter.
- *
@@ -168 +168 @@
-
-/*
- * OPTION: Support multiple "player" grids in "map_info()"
- */
-/* #define MAP_INFO_MULTIPLE_PLAYERS */
-
-
-/*
- * OPTION: Use the "complex" wall illumination code
- */
@@ -192 +186 @@
-
-/*
-smart_learn" and "smart
- They let monsters make more "intelligent" choices about attacks
-(including spell attacks) based on their observations of the
-player's reactions to previous attacks.  The "smart_cheat" option
-lets the monster know how the player would react to an attack
-ithout actually needing to make the attack.  The "smart_learn"
-
+adult_ai_learn" and "adult_ai
+
+They let monsters make more "intelligent" choices about attacks (including
+spell attacks) based on their observations of the player's reactions to
+previous attacks.  The "cheat" option lets the monster know how the player
+ould react to an attack without actually needing to make the attack.  The
+"learn" 
- * learning that the player is not harmed by that attack.
- *
- * This adds about 3K to the memory and about 5K to the executable.
- */
-#define DRS_SMART_OPTIONS

trunk/src/defines.h

@@ -50 +50 @@
-#define VERSION_MAJOR   3
-#define VERSION_MINOR   0
-7
+8
-#define VERSION_EXTRA   0
-
@@ -2433 +2433 @@
-#define OPT_stack_force_costs           9
-#define OPT_show_labels                         10
-
-
-
+
-#define OPT_ring_bell                           14
-#define OPT_show_flavors                        15
-#define OPT_run_ignore_stairs           16
-#define OPT_run_ignore_doors            17
-#define OPT_run_cut_corners                     18
@@ -2447 +2444 @@
-#define OPT_disturb_state                       23
-#define OPT_disturb_minor                       24
-
-
-
+
-#define OPT_verify_destroy                      28
-#define OPT_verify_special                      29
-
-
-
-
-
-
-
-
+
-#define OPT_view_perma_grids            38
-#define OPT_view_torch_grids            39
-
-
-
-
-
-
-
-
-
-
-
-
+
-#define OPT_flush_failure                       52
-#define OPT_flush_disturb                       53
-
+
-#define OPT_fresh_before                        55
-#define OPT_fresh_after                         56
-
-
+
-#define OPT_hilite_player                       59
-#define OPT_view_yellow_lite            60
@@ -2492 +2468 @@
-#define OPT_center_player                       68
-#define OPT_run_avoid_center            69
-
+
-#define OPT_auto_more                           71
-#define OPT_smart_monsters                      72
-#define OPT_smart_packs                         73
-#define OPT_hp_changes_color            74
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define OPT_cheat_peek                          (OPT_CHEAT+0)
-#define OPT_cheat_hear                          (OPT_CHEAT+1)
@@ -2519 +2496 @@
-#define OPT_cheat_know                          (OPT_CHEAT+4)
-#define OPT_cheat_live                          (OPT_CHEAT+5)
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define OPT_score_peek                          (OPT_SCORE+0)
-#define OPT_score_hear                          (OPT_SCORE+1)
@@ -2536 +2520 @@
-#define OPT_score_know                          (OPT_SCORE+4)
-#define OPT_score_live                          (OPT_SCORE+5)
-/* xxx xxx */
-
-
@@ -2553 +2536 @@
-#define stack_force_costs               op_ptr->opt[OPT_stack_force_costs]
-#define show_labels                             op_ptr->opt[OPT_show_labels]
-#define show_weights                    op_ptr->opt[OPT_show_weights]
-#define show_choices                    op_ptr->opt[OPT_show_choices]
-#define show_details                    op_ptr->opt[OPT_show_details]
-#define ring_bell                               op_ptr->opt[OPT_ring_bell]
-#define show_flavors                    op_ptr->opt[OPT_show_flavors]
-#define run_ignore_stairs               op_ptr->opt[OPT_run_ignore_stairs]
-#define run_ignore_doors                op_ptr->opt[OPT_run_ignore_doors]
-#define run_cut_corners                 op_ptr->opt[OPT_run_cut_corners]
@@ -2567 +2546 @@
-#define disturb_state                   op_ptr->opt[OPT_disturb_state]
-#define disturb_minor                   op_ptr->opt[OPT_disturb_minor]
-/* xxx next_xp */
-/* xxx */
-/* xxx alert_failure */
-#define verify_destroy                  op_ptr->opt[OPT_verify_destroy]
-#define verify_special                  op_ptr->opt[OPT_verify_special]
-#define allow_quantity                  op_ptr->opt[OPT_allow_quantity]
-/* xxx */
-/* auto_haggle */
-#define auto_scum                               op_ptr->opt[OPT_auto_scum]
-/* xxx testing_stack */
-/* xxx testing_carry */
-#define expand_look                             op_ptr->opt[OPT_expand_look]
-#define expand_list                             op_ptr->opt[OPT_expand_list]
-#define view_perma_grids                op_ptr->opt[OPT_view_perma_grids]
-#define view_torch_grids                op_ptr->opt[OPT_view_torch_grids]
-#define dungeon_align                   op_ptr->opt[OPT_dungeon_align]
-#define dungeon_stair                   op_ptr->opt[OPT_dungeon_stair]
-#define flow_by_sound                   op_ptr->opt[OPT_flow_by_sound]
-#define flow_by_smell                   op_ptr->opt[OPT_flow_by_smell]
-/* xxx track_follow */
-/* xxx track_target */
-#define smart_learn                             op_ptr->opt[OPT_smart_learn]
-#define smart_cheat                             op_ptr->opt[OPT_smart_cheat]
-#define view_reduce_lite                op_ptr->opt[OPT_view_reduce_lite]
-#define hidden_player                   op_ptr->opt[OPT_hidden_player]
-#define avoid_abort                             op_ptr->opt[OPT_avoid_abort]
-#define avoid_other                             op_ptr->opt[OPT_avoid_other]
-#define flush_failure                   op_ptr->opt[OPT_flush_failure]
-#define flush_disturb                   op_ptr->opt[OPT_flush_disturb]
-/* xxx */
-#define fresh_before                    op_ptr->opt[OPT_fresh_before]
-#define fresh_after                             op_ptr->opt[OPT_fresh_after]
-/* xxx */
-#define compress_savefile               op_ptr->opt[OPT_compress_savefile]
-#define hilite_player                   op_ptr->opt[OPT_hilite_player]
-#define view_yellow_lite                op_ptr->opt[OPT_view_yellow_lite]
@@ -2612 +2565 @@
-#define center_player                   op_ptr->opt[OPT_center_player]
-#define run_avoid_center                op_ptr->opt[OPT_run_avoid_center]
-/* xxx */
-#define auto_more                               op_ptr->opt[OPT_auto_more]
-#define smart_monsters                  op_ptr->opt[OPT_smart_monsters]
-#define smart_packs                             op_ptr->opt[OPT_smart_packs]
-#define hp_changes_color                op_ptr->opt[OPT_hp_changes_color]
-
-
-
-
-
-
-
-
+
-#define birth_maximize                  op_ptr->opt[OPT_birth_maximize]
-
+
+
-#define birth_ironman                   op_ptr->opt[OPT_birth_ironman]
-#define birth_no_stores                 op_ptr->opt[OPT_birth_no_stores]
-#define birth_no_artifacts              op_ptr->opt[OPT_birth_no_artifacts]
-#define birth_rand_artifacts    op_ptr->opt[OPT_birth_rand_artifacts]
-#define birth_no_stacking       op_ptr->opt[OPT_birth_no_stacking]
-
+
+
+
+
+
+
+
+