Use stdscr instead of w_terrain for adjacent query message
fix array index being to big, causes #6118
Add a parameter to mdefense to differentiate range and melee attacks.

Allows the shocker to shock only when attacked by a melee attack.
Merge pull request #7076 from BevapDin/magic-values

use constants instead of magic values
Added missing comma
Fix display bug in wish_item_callback

- create a new item on during the menu item callback. The constructor of item knows better how to make a new item object than this code.
- remove member tmp. It was not really used outside of the menu callback.
- remove advance_nextinv and assigning a invlet to the tmp member. That item object was not used anyway.
- move the two in_its_container calls outside of the if clause and make only once.
- use fold_and_print instead of manually printing the description
- simply clean the whole right side of the window, including the single-character column between the menu list and the item description.
- remove translation of "%s" - what was it supposed to do?
- show the "How many?" dialog only when the amount is actually going to be used.
- use the name of the granted item, instead of asking the item_controller again for the very same item.
Prevent the player from putting things into the grabbed vehicle pane when they have not grabbed any vehicle
Make the martial art books proper book item types.
Modified corpse revival check
Pizza parlor now spawns with regular restuauraunts
Merge action menu code move.

Conflicts:
	src/action.cpp
Merge query message in SDL mode fix.

Conflicts:
	src/game.cpp
Merge many bugfixes.
Merge pull request #7084 from BevapDin/martial-art-books

Make the martial art books proper book item types.
introduction of armor_layers.h
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod

Conflicts:
	src/action.cpp
Merge remote-tracking branch 'illi-kun/armor_layers.h' into FrankenMod

Conflicts:
	src/item.cpp
Merge remote-tracking branch 'TranquilMarmot/pizzaparlor' into FrankenMod

Conflicts:
	data/json/regional_map_settings.json
Merge remote-tracking branch 'MattAmmann/corpse_rot' into FrankenMod

Conflicts:
	src/item.h
Removed debug mutation.