fiddlerwoaroof/crawl - Change SKV6JBDAWUWTFECFSQARSNA3DDPUFCR7N3T7D5J35NYTEDMXLP3QC

Modify the Zot trap "Do you really ...?" prompt to only accept "yes" as a

confirming answer, and add an option trap_prompt that, if set to true (the default) will prompt the player before stepping on known mechanical traps trapwalk.lua considers unsafe.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3611 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on March 12, 2008

SKV6JBDAWUWTFECFSQARSNA3DDPUFCR7N3T7D5J35NYTEDMXLP3QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.h at line 75 [8.29464]
[6.85650]
[7.191]
```
#ifdef CLUA_BINDINGS
const char *trap_name(int x, int y);
#endif
```
Replacement in crawl-ref/source/travel.cc at line 190 [8.39949]
B:BD[8.45356] → [8.45356:45399]
```
static const char *trap_name(int x, int y)
```
[8.45356]
[8.45399]
```
const char *trap_name(int x, int y)
```
Deletion in crawl-ref/source/player.cc at line 121 [10.962854]
∅:D[9.320] → [6.338008:338074]
∅:D[4.3060] → [6.338008:338074]
B:BD[6.338008] → [6.338008:338074]
```
    // if (grid_is_solid( new_grid ))
    //     return (false);
```

Deletion in crawl-ref/source/player.cc at line 125 [10.962854]

B:BD[6.338224] → [6.338224:338335]


    // if (mgrd[x][y] != NON_MONSTER && !mons_is_submerged( &menv[ mgrd[x][y] ] ))
    //     return (false);

Insertion in crawl-ref/source/player.cc at line 155 [10.962854]

[11.740]

#ifdef CLUA_BINDINGS
                 || new_grid == DNGN_TRAP_MECHANICAL
                    && Options.trap_prompt
#endif

Replacement in crawl-ref/source/player.cc at line 161 [10.962854]

B:BD[12.1112] → [11.792:1010]

∅:D[11.1010] → [12.1187:1261]

B:BD[12.1187] → [12.1187:1261]

B:BD[12.1261] → [3.3059:3131]

∅:D[11.1076] → [12.1323:1536]

∅:D[3.3131] → [12.1323:1536]

B:BD[12.1323] → [12.1323:1536]

            std::string prompt = "Really step ";
                        prompt += (trap_type_at_xy(x,y) == TRAP_ALARM ?
                                   "onto" : "into");
                        prompt += " that ";
            prompt += feature_description(new_grid, trap_type_at_xy(x,y),
                                          false, DESC_BASENAME, false);
            prompt += '?';
            
            // Zot traps require capital confirmation
            bool harmless = (trap_type_at_xy(x,y) != TRAP_ZOT);
            if (!yesno(prompt.c_str(), harmless, 'n'))

[12.1112]

[12.1536]

            if (trap_type_at_xy(x,y) == TRAP_ZOT)
            {
                mpr("Do you really want to step into the Zot trap? "
                    "(Confirm with \"yes\".) ", MSGCH_PROMPT);
                char buf[10];
                if (cancelable_get_line(buf, sizeof buf)
                    || strcasecmp(buf, "yes"))
                {
                    canned_msg(MSG_OK);
                    you.turn_is_over = false;
                    return (false);
                }
            }
            else
#ifdef CLUA_BINDINGS
                 // prompt for any trap where you might not have enough hp
                 // as defined in init.txt (see trapwalk.lua)
                 if (new_grid != DNGN_TRAP_MECHANICAL
                     || !clua.callbooleanfn(false, "ch_cross_trap",
                                            "s", trap_name(x, y)))
#endif

Replacement in crawl-ref/source/player.cc at line 184 [10.962854]

B:BD[12.1550] → [12.1550:1624]

                you.turn_is_over = false;
                return (false);

[12.1550]

[12.1624]

                std::string prompt = "Really step ";
                            prompt += (trap_type_at_xy(x,y) == TRAP_ALARM ?
                                      "onto" : "into");
                            prompt += " that ";
                prompt += feature_description(new_grid, trap_type_at_xy(x,y),
                                              false, DESC_BASENAME, false);
                prompt += '?';
                if (!yesno(prompt.c_str(), true, 'n'))
                {
                    canned_msg(MSG_OK);
                    you.turn_is_over = false;
                    return (false);
                }

Insertion in crawl-ref/source/item_use.cc at line 3289 [10.2781507]
[13.280]
[5.4689]
```
    
```
Replacement in crawl-ref/source/initfile.cc at line 744 [10.2957258]
∅:D[14.308] → [15.8906:8911]
∅:D[16.1228] → [15.8906:8911]
∅:D[2.2685] → [15.8906:8911]
∅:D[17.5298] → [15.8906:8911]
B:BD[15.8906] → [15.8906:8911]
```
    
```
[2.2685]
[6.793978]
```
    trap_prompt            = true;
```

Insertion in crawl-ref/source/initfile.cc at line 2520 [10.2957258]

[16.1338]

[8.421774]

    else if (key == "trap_prompt")
    {
        trap_prompt = read_bool(field, trap_prompt);
    }

Insertion in crawl-ref/source/externs.h at line 1672 [10.3270163]

[18.5889]

[19.4769]

    
    bool        trap_prompt;        // Prompt when stepping on mechnical traps
                                    // without enough hp (using trapwalk.lua)

Insertion in crawl-ref/init.txt at line 168 [10.4830895]
[20.3994]
[21.6457]
```
# trap_prompt = false
```

Insertion in crawl-ref/docs/crawl_options.txt at line 759 [20.63392]

[22.23241]


trap_prompt = true
        If trap_prompt is set to true Crawl will use the trapwalk_safe_hp
	values to decide whether the player should be prompted before
	stepping on a mechanical trap. Note that you'll always be prompted
	for non-mechanical traps.

Modify the Zot trap "Do you really ...?" prompt to only accept "yes" as a

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.h at line 75 [8.29464]

Replacement in crawl-ref/source/travel.cc at line 190 [8.39949]

Deletion in crawl-ref/source/player.cc at line 121 [10.962854]