Navigation

← Previous Changeset
Next Changeset →

Changeset 110

Timestamp:

05/04/07 13:43:35 (1 year ago)

Author:

takkaria

Message:

Lots of changes:

Fix nits from [91]. (some code from Pete Mack)
Reformat some code.
Move some constants to, and simplify, store.c
General Store moved to always stocking staples and nothing else -- there may be tweaking yet to do
Import Sangband's/Steamband's code to put chance of generating piles of items in object.txt
Simplify and genericise some more code in xtra1.c for subwindows and the status line
Update COPYING file with current licence information, incl. copy of the GPL
Add %b binary specifier to strnfmt for debugging purposes

Files:

trunk/COPYING (modified) (2 diffs)
trunk/lib/edit/object.txt (modified) (11 diffs)
trunk/src/cmd4.c (modified) (5 diffs)
trunk/src/defines.h (modified) (4 diffs)
trunk/src/init1.c (modified) (1 diff)
trunk/src/object2.c (modified) (2 diffs)
trunk/src/randname.c (modified) (1 diff)
trunk/src/store.c (modified) (17 diffs)
trunk/src/tables.c (modified) (4 diffs)
trunk/src/types.h (modified) (2 diffs)
trunk/src/ui.c (modified) (1 diff)
trunk/src/xtra1.c (modified) (22 diffs)
trunk/src/z-form.c (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/COPYING

r1	r110
	1	The game is currently moving to a dual-licence of the traditional Angband
	2	licence and the GPL, version 2. All new code will only be accepted under both
	3	licences, but some code is still only under the Angband licence.
	4
	5	At the time of release, almost all of the code is covered by both licences.
	6	The remaining people who have not yet been contacted include:
	7
	8	* Torbjorn Lindgren
	9	* George W Harris
	10	* John Rauser, monster list patch
	11	* "Prfnoff"
	12	* Ed Cogburn
	13	* Peter Berger
	14	* Roland Jay Roberts
	15	* Ross E Becker
	16	* Randy Hutson
	17	* Brent Ross
	18	* Kusunose Toru
	19	* Takeshi Mogami
	20	* Chris Ang
	21	* Heiko Herold
	22	* Jon Taylor
	23	* Ron Anderson
	24	* Alexander Wilkins
	25	* David Grabiner
	26
	27	Any information on the contact details for these people, whether online or
	28	otherwise, would be much appreciated.
	29
	30	For more information, see <http://entai.co.uk/angband/opensource>.
	31
	32
	33	------------------------------------------------------------------------------
	34
	35	The Angband Licence is:
	36
1	37	Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke
2	38
…	…
5	41	are included in all such copies. Other copyrights may also apply.
6	42
7
8		All changes made by Ben Harrison, Robert Ruehlmann, and many other Angband
9		developers are also available under the GNU GENERAL PUBLIC LICENSE.
10		Note that this doesn't influence the current distribution, since parts of
11		the source are still only available under the old Moria/Angband license.
12		Until all parts of Angband are distributed under the GPL the only valid
13		license remains the original Moria/Angband license.
14
15		More informations about Angband and the GPL can be found at:
16		http://www.thangorodrim.net/development/opensource.html
17
	43	------------------------------------------------------------------------------
	44
	45	The GNU GENERAL PUBLIC LICENCE is:
	46
	47	GNU GENERAL PUBLIC LICENSE
	48	Version 2, June 1991
	49
	50	Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
	51	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	52	Everyone is permitted to copy and distribute verbatim copies
	53	of this license document, but changing it is not allowed.
	54
	55	Preamble
	56
	57	The licenses for most software are designed to take away your
	58	freedom to share and change it. By contrast, the GNU General Public
	59	License is intended to guarantee your freedom to share and change free
	60	software--to make sure the software is free for all its users. This
	61	General Public License applies to most of the Free Software
	62	Foundation's software and to any other program whose authors commit to
	63	using it. (Some other Free Software Foundation software is covered by
	64	the GNU Lesser General Public License instead.) You can apply it to
	65	your programs, too.
	66
	67	When we speak of free software, we are referring to freedom, not
	68	price. Our General Public Licenses are designed to make sure that you
	69	have the freedom to distribute copies of free software (and charge for
	70	this service if you wish), that you receive source code or can get it
	71	if you want it, that you can change the software or use pieces of it
	72	in new free programs; and that you know you can do these things.
	73
	74	To protect your rights, we need to make restrictions that forbid
	75	anyone to deny you these rights or to ask you to surrender the rights.
	76	These restrictions translate to certain responsibilities for you if you
	77	distribute copies of the software, or if you modify it.
	78
	79	For example, if you distribute copies of such a program, whether
	80	gratis or for a fee, you must give the recipients all the rights that
	81	you have. You must make sure that they, too, receive or can get the
	82	source code. And you must show them these terms so they know their
	83	rights.
	84
	85	We protect your rights with two steps: (1) copyright the software, and
	86	(2) offer you this license which gives you legal permission to copy,
	87	distribute and/or modify the software.
	88
	89	Also, for each author's protection and ours, we want to make certain
	90	that everyone understands that there is no warranty for this free
	91	software. If the software is modified by someone else and passed on, we
	92	want its recipients to know that what they have is not the original, so
	93	that any problems introduced by others will not reflect on the original
	94	authors' reputations.
	95
	96	Finally, any free program is threatened constantly by software
	97	patents. We wish to avoid the danger that redistributors of a free
	98	program will individually obtain patent licenses, in effect making the
	99	program proprietary. To prevent this, we have made it clear that any
	100	patent must be licensed for everyone's free use or not licensed at all.
	101
	102	The precise terms and conditions for copying, distribution and
	103	modification follow.
	104
	105	GNU GENERAL PUBLIC LICENSE
	106	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
	107
	108	0. This License applies to any program or other work which contains
	109	a notice placed by the copyright holder saying it may be distributed
	110	under the terms of this General Public License. The "Program", below,
	111	refers to any such program or work, and a "work based on the Program"
	112	means either the Program or any derivative work under copyright law:
	113	that is to say, a work containing the Program or a portion of it,
	114	either verbatim or with modifications and/or translated into another
	115	language. (Hereinafter, translation is included without limitation in
	116	the term "modification".) Each licensee is addressed as "you".
	117
	118	Activities other than copying, distribution and modification are not
	119	covered by this License; they are outside its scope. The act of
	120	running the Program is not restricted, and the output from the Program
	121	is covered only if its contents constitute a work based on the
	122	Program (independent of having been made by running the Program).
	123	Whether that is true depends on what the Program does.
	124
	125	1. You may copy and distribute verbatim copies of the Program's
	126	source code as you receive it, in any medium, provided that you
	127	conspicuously and appropriately publish on each copy an appropriate
	128	copyright notice and disclaimer of warranty; keep intact all the
	129	notices that refer to this License and to the absence of any warranty;
	130	and give any other recipients of the Program a copy of this License
	131	along with the Program.
	132
	133	You may charge a fee for the physical act of transferring a copy, and
	134	you may at your option offer warranty protection in exchange for a fee.
	135
	136	2. You may modify your copy or copies of the Program or any portion
	137	of it, thus forming a work based on the Program, and copy and
	138	distribute such modifications or work under the terms of Section 1
	139	above, provided that you also meet all of these conditions:
	140
	141	a) You must cause the modified files to carry prominent notices
	142	stating that you changed the files and the date of any change.
	143
	144	b) You must cause any work that you distribute or publish, that in
	145	whole or in part contains or is derived from the Program or any
	146	part thereof, to be licensed as a whole at no charge to all third
	147	parties under the terms of this License.
	148
	149	c) If the modified program normally reads commands interactively
	150	when run, you must cause it, when started running for such
	151	interactive use in the most ordinary way, to print or display an
	152	announcement including an appropriate copyright notice and a
	153	notice that there is no warranty (or else, saying that you provide
	154	a warranty) and that users may redistribute the program under
	155	these conditions, and telling the user how to view a copy of this
	156	License. (Exception: if the Program itself is interactive but
	157	does not normally print such an announcement, your work based on
	158	the Program is not required to print an announcement.)
	159
	160	These requirements apply to the modified work as a whole. If
	161	identifiable sections of that work are not derived from the Program,
	162	and can be reasonably considered independent and separate works in
	163	themselves, then this License, and its terms, do not apply to those
	164	sections when you distribute them as separate works. But when you
	165	distribute the same sections as part of a whole which is a work based
	166	on the Program, the distribution of the whole must be on the terms of
	167	this License, whose permissions for other licensees extend to the
	168	entire whole, and thus to each and every part regardless of who wrote it.
	169
	170	Thus, it is not the intent of this section to claim rights or contest
	171	your rights to work written entirely by you; rather, the intent is to
	172	exercise the right to control the distribution of derivative or
	173	collective works based on the Program.
	174
	175	In addition, mere aggregation of another work not based on the Program
	176	with the Program (or with a work based on the Program) on a volume of
	177	a storage or distribution medium does not bring the other work under
	178	the scope of this License.
	179
	180	3. You may copy and distribute the Program (or a work based on it,
	181	under Section 2) in object code or executable form under the terms of
	182	Sections 1 and 2 above provided that you also do one of the following:
	183
	184	a) Accompany it with the complete corresponding machine-readable
	185	source code, which must be distributed under the terms of Sections
	186	1 and 2 above on a medium customarily used for software interchange; or,
	187
	188	b) Accompany it with a written offer, valid for at least three
	189	years, to give any third party, for a charge no more than your
	190	cost of physically performing source distribution, a complete
	191	machine-readable copy of the corresponding source code, to be
	192	distributed under the terms of Sections 1 and 2 above on a medium
	193	customarily used for software interchange; or,
	194
	195	c) Accompany it with the information you received as to the offer
	196	to distribute corresponding source code. (This alternative is
	197	allowed only for noncommercial distribution and only if you
	198	received the program in object code or executable form with such
	199	an offer, in accord with Subsection b above.)
	200
	201	The source code for a work means the preferred form of the work for
	202	making modifications to it. For an executable work, complete source
	203	code means all the source code for all modules it contains, plus any
	204	associated interface definition files, plus the scripts used to
	205	control compilation and installation of the executable. However, as a
	206	special exception, the source code distributed need not include
	207	anything that is normally distributed (in either source or binary
	208	form) with the major components (compiler, kernel, and so on) of the
	209	operating system on which the executable runs, unless that component
	210	itself accompanies the executable.
	211
	212	If distribution of executable or object code is made by offering
	213	access to copy from a designated place, then offering equivalent
	214	access to copy the source code from the same place counts as
	215	distribution of the source code, even though third parties are not
	216	compelled to copy the source along with the object code.
	217
	218	4. You may not copy, modify, sublicense, or distribute the Program
	219	except as expressly provided under this License. Any attempt
	220	otherwise to copy, modify, sublicense or distribute the Program is
	221	void, and will automatically terminate your rights under this License.
	222	However, parties who have received copies, or rights, from you under
	223	this License will not have their licenses terminated so long as such
	224	parties remain in full compliance.
	225
	226	5. You are not required to accept this License, since you have not
	227	signed it. However, nothing else grants you permission to modify or
	228	distribute the Program or its derivative works. These actions are
	229	prohibited by law if you do not accept this License. Therefore, by
	230	modifying or distributing the Program (or any work based on the
	231	Program), you indicate your acceptance of this License to do so, and
	232	all its terms and conditions for copying, distributing or modifying
	233	the Program or works based on it.
	234
	235	6. Each time you redistribute the Program (or any work based on the
	236	Program), the recipient automatically receives a license from the
	237	original licensor to copy, distribute or modify the Program subject to
	238	these terms and conditions. You may not impose any further
	239	restrictions on the recipients' exercise of the rights granted herein.
	240	You are not responsible for enforcing compliance by third parties to
	241	this License.
	242
	243	7. If, as a consequence of a court judgment or allegation of patent
	244	infringement or for any other reason (not limited to patent issues),
	245	conditions are imposed on you (whether by court order, agreement or
	246	otherwise) that contradict the conditions of this License, they do not
	247	excuse you from the conditions of this License. If you cannot
	248	distribute so as to satisfy simultaneously your obligations under this
	249	License and any other pertinent obligations, then as a consequence you
	250	may not distribute the Program at all. For example, if a patent
	251	license would not permit royalty-free redistribution of the Program by
	252	all those who receive copies directly or indirectly through you, then
	253	the only way you could satisfy both it and this License would be to
	254	refrain entirely from distribution of the Program.
	255
	256	If any portion of this section is held invalid or unenforceable under
	257	any particular circumstance, the balance of the section is intended to
	258	apply and the section as a whole is intended to apply in other
	259	circumstances.
	260
	261	It is not the purpose of this section to induce you to infringe any
	262	patents or other property right claims or to contest validity of any
	263	such claims; this section has the sole purpose of protecting the
	264	integrity of the free software distribution system, which is
	265	implemented by public license practices. Many people have made
	266	generous contributions to the wide range of software distributed
	267	through that system in reliance on consistent application of that
	268	system; it is up to the author/donor to decide if he or she is willing
	269	to distribute software through any other system and a licensee cannot
	270	impose that choice.
	271
	272	This section is intended to make thoroughly clear what is believed to
	273	be a consequence of the rest of this License.
	274
	275	8. If the distribution and/or use of the Program is restricted in
	276	certain countries either by patents or by copyrighted interfaces, the
	277	original copyright holder who places the Program under this License
	278	may add an explicit geographical distribution limitation excluding
	279	those countries, so that distribution is permitted only in or among
	280	countries not thus excluded. In such case, this License incorporates
	281	the limitation as if written in the body of this License.
	282
	283	9. The Free Software Foundation may publish revised and/or new versions
	284	of the General Public License from time to time. Such new versions will
	285	be similar in spirit to the present version, but may differ in detail to
	286	address new problems or concerns.
	287
	288	Each version is given a distinguishing version number. If the Program
	289	specifies a version number of this License which applies to it and "any
	290	later version", you have the option of following the terms and conditions
	291	either of that version or of any later version published by the Free
	292	Software Foundation. If the Program does not specify a version number of
	293	this License, you may choose any version ever published by the Free Software
	294	Foundation.
	295
	296	10. If you wish to incorporate parts of the Program into other free
	297	programs whose distribution conditions are different, write to the author
	298	to ask for permission. For software which is copyrighted by the Free
	299	Software Foundation, write to the Free Software Foundation; we sometimes
	300	make exceptions for this. Our decision will be guided by the two goals
	301	of preserving the free status of all derivatives of our free software and
	302	of promoting the sharing and reuse of software generally.
	303
	304	NO WARRANTY
	305
	306	11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
	307	FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
	308	OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
	309	PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
	310	OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
	311	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
	312	TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
	313	PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
	314	REPAIR OR CORRECTION.
	315
	316	12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
	317	WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
	318	REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
	319	INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
	320	OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
	321	TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
	322	YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
	323	PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
	324	POSSIBILITY OF SUCH DAMAGES.
	325
	326	END OF TERMS AND CONDITIONS
	327
	328	How to Apply These Terms to Your New Programs
	329
	330	If you develop a new program, and you want it to be of the greatest
	331	possible use to the public, the best way to achieve this is to make it
	332	free software which everyone can redistribute and change under these terms.
	333
	334	To do so, attach the following notices to the program. It is safest
	335	to attach them to the start of each source file to most effectively
	336	convey the exclusion of warranty; and each file should have at least
	337	the "copyright" line and a pointer to where the full notice is found.
	338
	339	<one line to give the program's name and a brief idea of what it does.>
	340	Copyright (C) <year> <name of author>
	341
	342	This program is free software; you can redistribute it and/or modify
	343	it under the terms of the GNU General Public License as published by
	344	the Free Software Foundation; either version 2 of the License, or
	345	(at your option) any later version.
	346
	347	This program is distributed in the hope that it will be useful,
	348	but WITHOUT ANY WARRANTY; without even the implied warranty of
	349	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	350	GNU General Public License for more details.
	351
	352	You should have received a copy of the GNU General Public License along
	353	with this program; if not, write to the Free Software Foundation, Inc.,
	354	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	355
	356	Also add information on how to contact you by electronic and paper mail.
	357
	358	If the program is interactive, make it output a short notice like this
	359	when it starts in an interactive mode:
	360
	361	Gnomovision version 69, Copyright (C) year name of author
	362	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
	363	This is free software, and you are welcome to redistribute it
	364	under certain conditions; type `show c' for details.
	365
	366	The hypothetical commands `show w' and `show c' should show the appropriate
	367	parts of the General Public License. Of course, the commands you use may
	368	be called something other than `show w' and `show c'; they could even be
	369	mouse-clicks or menu items--whatever suits your program.
	370
	371	You should also get your employer (if you work as a programmer) or your
	372	school, if any, to sign a "copyright disclaimer" for the program, if
	373	necessary. Here is a sample; alter the names:
	374
	375	Yoyodyne, Inc., hereby disclaims all copyright interest in the program
	376	`Gnomovision' (which makes passes at compilers) written by James Hacker.
	377
	378	<signature of Ty Coon>, 1 April 1989
	379	Ty Coon, President of Vice
	380
	381	This General Public License does not permit incorporating your program into
	382	proprietary programs. If your program is a subroutine library, you may
	383	consider it more useful to permit linking proprietary applications with the
	384	library. If this is what you want to do, use the GNU Lesser General
	385	Public License instead of this License.

trunk/lib/edit/object.txt

r60	r110
20	20	# A: depth/rarity : depth/rarity : etc
21	21	# C: charges
	22	# M: chance of being generated in a pile : dice for number of items
22	23	# F: flag \| flag \| etc
23	24	# D: description
…	…
764	765	I:17:1:0
765	766	W:3:0:2:1
	767	M:100:6d7
766	768	A:3/1:15/1:50/1
767	769	P:0:1d4:0:0:0
…	…
774	776	W:55:0:2:20
775	777	A:55/2:80/2
	778	M:100:6d7
776	779	P:0:4d4:0:0:0
777	780	F:SHOW_MODS
…	…
782	785	I:18:1:0
783	786	W:3:0:3:2
	787	M:100:6d7
784	788	A:3/1:25/1:60/1
785	789	P:0:1d5:0:0:0
…	…
791	795	I:18:2:0
792	796	W:65:0:3:25
	797	M:100:6d7
793	798	A:65/2:90/2
794	799	P:0:4d5:0:0:0
…	…
800	805	I:16:0:0
801	806	W:0:0:4:1
	807	M:100:6d7
802	808	A:0/1:10/2
803	809	P:0:1d2:0:0:0
…	…
809	815	I:16:1:0
810	816	W:3:0:5:2
	817	M:100:6d7
811	818	A:3/1:40/2
812	819	P:0:1d4:0:0:0
…	…
3107	3114	I:5:0:0
3108	3115	W:1:0:10:1
	3116	M:100:6d7
3109	3117	A:1/1
3110	3118	P:0:1d1:0:0:0
…	…
3914	3922	I:16:2:0
3915	3923	W:40:0:4:20
	3924	M:100:6d7
3916	3925	A:40/4:65/1
3917	3926	P:0:2d4:5:5:0
…	…
3923	3932	I:17:3:0
3924	3933	W:55:0:2:25
	3934	M:100:6d7
3925	3935	A:50/4:90/3
3926	3936	P:0:3d4:0:0:0
…	…
3932	3942	I:18:3:0
3933	3943	W:50:0:2:30
	3944	M:100:6d7
3934	3945	A:60/4:95/3
3935	3946	P:0:3d5:0:0:0

trunk/src/cmd4.c

r104	r110
1655	1655	}
1656	1656
1657		void do_cmd_resize() {
	1657	void do_cmd_resize()
	1658	{
1658	1659	/* Escape to main screen on resize */
1659	1660	Term_key_push(ESCAPE);
…	…
1712	1713	{
1713	1714	if (file_character(ftmp, FALSE))
1714		{
1715	1715	msg_print("Character dump failed!");
1716		}
1717	1716	else
1718		{
1719	1717	msg_print("Character dump successful.");
1720		}
1721	1718	}
1722	1719	}
…	…
1724	1721
1725	1722	/* Toggle mode */
1726		else if ((ke.key == 'h') \|\| (ke.key == '\xff') \|\| ke.key == '4')
	1723	else if ((ke.key == 'h') \|\| (ke.key == '\xff') \|\|
	1724	(ke.key == ARROW_LEFT) \|\| (ke.key == ' '))
1727	1725	{
1728	1726	mode = (mode + 1) % INFO_SCREENS;
…	…
1730	1728
1731	1729	/* Toggle mode */
1732		else if ((ke.key == 'l') \|\| ke.key == ~~'6'~~)
1733		{
1734		mode = (mode ~~+ 6~~ - 1) % INFO_SCREENS;
	1730	else if ((ke.key == 'l') \|\| ke.key == ARROW_RIGHT)
	1731	{
	1732	mode = (mode - 1) % INFO_SCREENS;
1735	1733	}
1736	1734
…	…
1738	1736	/* Oops */
1739	1737	else
1740		{
1741		bell(NULL);
1742		}
	1738	{
	1739	bell(NULL);
	1740	}
1743	1741
1744	1742	/* Flush messages */

trunk/src/defines.h

r82	r110
253	253	* Store constants
254	254	*
255		* Special note about STORE_MAX_KEEP; not only must it be below
256		* STORE_INVEN_MAX, it must actually be below (STORE_INVEN_MAX - maximum
257		* staple items across all stores); i.e. if the General Store has three
258		* staple items (and no other store has more than three staple items),
259		* then STORE_MAX_KEEP > (STORE_INVEN_MAX - 3), or > 21 (in this case).
	255	* STORE_MAX_KEEP must be < STORE_INVEN_MAX.
	256	*
260	257	*/
261	258	#define STORE_INVEN_MAX 24 /* Max number of discrete objs in inven */
262		#define STORE_OBJ_LEVEL 5 /* Magic Level for normal stores */
263		#define STORE_TURNOVER 9 /* Normal shop turnover, per day */
264		#define STORE_MIN_KEEP 6 /* Min slots to "always" keep full -
265		must be above 0 */
266		#define STORE_MAX_KEEP 18 /* Max slots to "always" keep full */
	259	#define STORE_TURNS 1000 /* Number of turns between turnovers */
267	260	#define STORE_SHUFFLE 25 /* 1/Chance (per day) of an owner changing */
268		~~#define STORE_TURNS 1000 /* Number of turns between turnovers */~~
269	261	#define STORE_CHOICES 32 /* Number of choices in the store selection table */
270	262
…	…
489	481	#define SEX_MALE 1
490	482
491
492		~~/* Screen Locations */~~
493
494		/*
495		* Some screen locations for various display routines
496		*/
497		~~#define ROW_HUNGRY (Term->hgt - 1)~~
498		~~#define COL_HUNGRY 0 /* "Weak" / "Hungry" / "Full" / "Gorged" */~~
499
500		~~#define ROW_BLIND (Term->hgt - 1)~~
501		~~#define COL_BLIND 7 /* "Blind" */~~
502
503		~~#define ROW_CONFUSED (Term->hgt - 1)~~
504		~~#define COL_CONFUSED 13 /* "Confused" */~~
505
506		~~#define ROW_AFRAID (Term->hgt - 1)~~
507		~~#define COL_AFRAID 22 /* "Afraid" */~~
508
509		~~#define ROW_POISONED (Term->hgt - 1)~~
510		~~#define COL_POISONED 29 /* "Poisoned" */~~
511
512		~~#define ROW_STATE (Term->hgt - 1)~~
513		~~#define COL_STATE 38 /* <state> */~~
514
515		~~#define ROW_SPEED (Term->hgt - 1)~~
516		~~#define COL_SPEED 49 /* "Slow (-NN)" or "Fast (+NN)" */~~
517
518		~~#define ROW_STUDY (Term->hgt - 1)~~
519		~~#define COL_STUDY 64 /* "Study" */~~
520
521		~~#define ROW_DEPTH (Term->hgt - 1)~~
522		~~#define COL_DEPTH 70 /* "Lev NNN" / "NNNN ft" */~~
523
524		~~#define ROW_OPPOSE_ELEMENTS (Term->hgt - 1)~~
525		~~#define COL_OPPOSE_ELEMENTS 80 /* "Acid Elec Fire Cold Pois" */~~
526	483
527	484
…	…
1667	1624
1668	1625	/*
1669		* Bit flags for the "p_ptr->window" variable ~~(etc)~~
	1626	* Bit flags for the "p_ptr->window" variable.
1670	1627	*/
1671	1628	#define PW_INVEN 0x00000001L /* Display inven/equip */
…	…
1681	1638	#define PW_MONLIST 0x00000400L /* Display monster list */
1682	1639	#define PW_STATUS 0x00000800L /* Display status */
1683		#define PW_SCRIPT_VARS 0x00001000L /* Display script variables */
1684		#define PW_SCRIPT_SOURCE 0x00002000L /* Display script source */
	1640	/* xxx */
1685	1641	#define PW_BORG_1 0x00004000L /* Display borg messages */
1686	1642	#define PW_BORG_2 0x00008000L /* Display borg status */

trunk/src/init1.c

r103	r110
1412	1412	return (PARSE_ERROR_GENERIC);
1413	1413	}
	1414	}
	1415
	1416	/* Process 'M' for "Multiple quantity" (one line only) */
	1417	else if (buf[0] == 'M')
	1418	{
	1419	int prob, dice, side;
	1420
	1421	/* There better be a current k_ptr */
	1422	if (!k_ptr) return (PARSE_ERROR_MISSING_RECORD_HEADER);
	1423
	1424	/* Scan for the values */
	1425	if (3 != sscanf(buf+2, "%d:%dd%d", &prob, &dice, &side))
	1426	return (PARSE_ERROR_GENERIC);
	1427
	1428	/* Sanity check */
	1429	if (!(dice * side)) prob = dice = side = 0;
	1430
	1431	/* Save the values */
	1432	k_ptr->gen_mult_prob = prob;
	1433	k_ptr->gen_dice = dice;
	1434	k_ptr->gen_side = side;
1414	1435	}
1415	1436

trunk/src/object2.c

r86	r110
2904	2904	{
2905	2905	int prob, base;
	2906	object_kind *k_ptr;
2906	2907
2907	2908
…	…
2951	2952	apply_magic(j_ptr, object_level, TRUE, good, great);
2952	2953
2953		/* Hack -- generate multiple spikes/missiles */
2954		switch (j_ptr->tval)
2955		{
2956		case TV_SPIKE:
2957		case TV_SHOT:
2958		case TV_ARROW:
2959		case TV_BOLT:
2960		{
2961		j_ptr->number = damroll(6, 7);
2962		}
2963		}
	2954
	2955	/* Generate multiple items */
	2956	/* Imported from Steamband and Sangband */
	2957	/* XXX Will probably not work so well for stacks of potions (yet) */
	2958	k_ptr = &k_info[j_ptr->k_idx];
	2959
	2960	if (k_ptr->gen_mult_prob >= 100 \|\|
	2961	k_ptr->gen_mult_prob >= randint(100))
	2962	{
	2963	j_ptr->number = damroll(k_ptr->gen_dice, k_ptr->gen_side);
	2964	}
	2965
2964	2966
2965	2967	/* Notice "okay" out-of-depth objects */

trunk/src/randname.c

r42	r110
281	281	assert(name_type > 0 && name_type < RANDNAME_NUM_TYPES);
282	282
283		/* To allow for a terminating character */
	283	/* To allow for a terminating character */
284	284	assert(buflen > max);
285	285

trunk/src/store.c

r102	r110
43	43	/* Compound flag for the initial display of a store */
44	44	#define STORE_INIT_CHANGE (STORE_FRAME_CHANGE \| STORE_GOLD_CHANGE)
	45
	46
	47
	48	/* Some local constants */
	49	#define STORE_TURNOVER 9 /* Normal shop turnover, per day */
	50	#define STORE_OBJ_LEVEL 5 /* Magic Level for normal stores */
	51	#define STORE_MIN_KEEP 6 /* Min slots to "always" keep full (>0) */
	52	#define STORE_MAX_KEEP 18 /* Max slots to "always" keep full */
	53
45	54
46	55
…	…
389	398	* "greed" value is always something (?).
390	399	*/
391		static s32b price_item(const object_type *o_ptr, bool ~~flip~~)
	400	static s32b price_item(const object_type *o_ptr, bool store_buying)
392	401	{
393	402	int factor;
…	…
416	425
417	426	/* Shop is buying */
418		if (~~flip~~)
	427	if (store_buying)
419	428	{
420	429	/* Adjust for greed */
…	…
426	435	/* Mega-Hack -- Black market sucks */
427	436	if (store_current == STORE_B_MARKET) price = price / 2;
	437
	438	/* Now limit the price to the purse limit */
	439	if (price > ot_ptr->max_cost) price = ot_ptr->max_cost;
428	440	}
429	441
…	…
1139	1151
1140	1152	/*
1141		* Helper function: create an item with the given tval,sval pair, add it to the
1142		* store st. Return the slot in the inventory.
1143		*/
1144		~~static int store_create_item(int st, int tval, int sval)~~
1145		{
1146		~~object_type object;~~
1147		~~int k_idx;~~
1148
1149		~~/* Resolve tval,sval pair into an index */~~
1150		~~k_idx = lookup_kind(tval, sval);~~
1151
1152		~~/* Validation - do something more substantial here? XXX */~~
1153		~~if (!k_idx)~~
1154		{
1155		~~msg_print("No object in store_create_item().");~~
1156		~~return -1;~~
1157		}
1158
1159		~~/* Wipe this object */~~
1160		~~object_wipe(&object);~~
1161
1162		~~/* Create a new object of the chosen kind */~~
1163		~~object_prep(&object, k_idx);~~
1164
1165		~~/* The object is "known" */~~
1166		~~object_known(&object);~~
1167
1168		~~/* Item belongs to a store */~~
1169		~~object.ident \|= IDENT_STORE;~~
1170
1171		~~/* Charge lights */~~
1172		~~if (object.tval == TV_LITE)~~
1173		{
1174		~~if (object.sval == SV_LITE_TORCH) object.timeout = FUEL_TORCH / 2;~~
1175		~~else if (object.sval == SV_LITE_LANTERN) object.timeout = FUEL_LAMP / 2;~~
1176		}
1177
1178		~~/* Mass produce and/or apply discount */~~
1179		~~mass_produce(&object);~~
1180
1181		~~/* Attempt to carry the object */~~
1182		~~return store_carry(st, &object);~~
1183		}
1184
1185		/*
1186	1153	* Find tval, sval from k_idx.
1187	1154	* XXX Should be in object2.c; is here for low impact.
…	…
1322	1289	}
1323	1290
1324
1325		static struct
1326		{
1327		int store;
1328		int tval;
1329		int sval;
1330		int likelihood;
	1291	/*
	1292	* Staple definitions.
	1293	*/
	1294	typedef enum { MAKE_SINGLE, MAKE_NORMAL, MAKE_MAX } create_mode;
	1295
	1296	static struct staple_type
	1297	{
	1298	int tval, sval;
	1299	create_mode mode;
1331	1300	} staples[] =
1332	1301	{
1333		{ STORE_GENERAL, TV_FOOD, SV_FOOD_RATION, 100 },
1334		{ STORE_GENERAL, TV_LITE, SV_LITE_TORCH, 100 },
1335		{ STORE_ALCHEMY, TV_SCROLL, SV_SCROLL_WORD_OF_RECALL, 100 },
	1302	{ TV_FOOD, SV_FOOD_RATION, MAKE_NORMAL },
	1303	{ TV_LITE, SV_LITE_TORCH, MAKE_NORMAL },
	1304	{ TV_SCROLL, SV_SCROLL_WORD_OF_RECALL, MAKE_NORMAL },
	1305	{ TV_FOOD, SV_FOOD_BISCUIT, MAKE_NORMAL },
	1306	{ TV_FOOD, SV_FOOD_JERKY, MAKE_NORMAL },
	1307	{ TV_FOOD, SV_FOOD_PINT_OF_WINE, MAKE_NORMAL },
	1308	{ TV_LITE, SV_LITE_TORCH, MAKE_NORMAL },
	1309	{ TV_LITE, SV_LITE_LANTERN, MAKE_NORMAL },
	1310	{ TV_FLASK, 0, MAKE_NORMAL },
	1311	{ TV_SPIKE, 0, MAKE_NORMAL },
	1312	{ TV_SHOT, SV_AMMO_NORMAL, MAKE_MAX },
	1313	{ TV_ARROW, SV_AMMO_NORMAL, MAKE_MAX },
	1314	{ TV_BOLT, SV_AMMO_NORMAL, MAKE_MAX },
	1315	{ TV_DIGGING, SV_SHOVEL, MAKE_SINGLE },
	1316	{ TV_DIGGING, SV_PICK, MAKE_SINGLE },
	1317	{ TV_CLOAK, SV_CLOAK, MAKE_SINGLE }
1336	1318	};
1337	1319
	1320
	1321	/*
	1322	* Helper function: create an item with the given tval,sval pair, add it to the
	1323	* store st. Return the slot in the inventory.
	1324	*/
	1325	static int store_create_item(int st, int tval, int sval, create_mode mode)
	1326	{
	1327	object_type object;
	1328	int k_idx;
	1329
	1330	/* Resolve tval,sval pair into an index */
	1331	k_idx = lookup_kind(tval, sval);
	1332
	1333	/* Validation - do something more substantial here? XXX */
	1334	if (!k_idx)
	1335	{
	1336	msg_print("No object in store_create_item().");
	1337	return -1;
	1338	}
	1339
	1340	/* Wipe this object */
	1341	object_wipe(&object);
	1342
	1343	/* Create a new object of the chosen kind */
	1344	object_prep(&object, k_idx);
	1345
	1346	/* The object is "known" */
	1347	object_known(&object);
	1348
	1349	/* Item belongs to a store */
	1350	object.ident \|= IDENT_STORE;
	1351
	1352	/* Charge lights */
	1353	if (object.tval == TV_LITE)
	1354	{
	1355	if (object.sval == SV_LITE_TORCH) object.timeout = FUEL_TORCH / 2;
	1356	else if (object.sval == SV_LITE_LANTERN) object.timeout = FUEL_LAMP / 2;
	1357	}
	1358
	1359	/* Make according to mode */
	1360	switch (mode)
	1361	{
	1362	case MAKE_SINGLE:
	1363	break;
	1364
	1365	case MAKE_NORMAL:
	1366	mass_produce(&object);
	1367	break;
	1368
	1369	case MAKE_MAX:
	1370	object.number = 99;
	1371	break;
	1372	}
	1373
	1374	/* Attempt to carry the object */
	1375	return store_carry(st, &object);
	1376	}
	1377
	1378
	1379
1338	1380	/*
1339	1381	* Create all staple items.
1340		*/
1341		static void store_create_staples(int st)
1342		{
1343		int i, which, prob;
	1382	*
	1383	* XXX should ensure that entries marked as "max" stay in stock
	1384	*/
	1385	static void store_create_staples(void)
	1386	{
	1387	unsigned i;
1344	1388
1345	1389	/* Iterate through staples */
1346		for (i = 0; (unsigned int) i < N_ELEMENTS(staples); i++)
1347		{
1348		/* Ignore this one */
1349		if (staples[i].store != st) continue;
1350
1351		/* Find this staple */
1352		which = store_find(st, staples[i].tval, staples[i].sval);
1353
1354		/* Not found */
1355		if (which == -1)
1356		{
1357		prob = rand_int(100);
1358
1359		/* Create the item */
1360		if (prob <= staples[i].likelihood)
1361		store_create_item(st, staples[i].tval, staples[i].sval);
1362		}
1363
1364		/* In future, do something like ensuring the size of the stack of staples is high enough - take note of mass_roll */
1365		}
1366		}
	1390	for (i = 0; i < N_ELEMENTS(staples); i++)
	1391	{
	1392	struct staple_type *s = &staples[i];
	1393
	1394	/* Look for the item, and if it isn't there, create it */
	1395	if (store_find(STORE_GENERAL, s->tval, s->sval) == -1)
	1396	store_create_item(STORE_GENERAL, s->tval, s->sval, s->mode);
	1397	}
	1398	}
	1399
	1400
1367	1401
1368	1402	/*
…	…
1381	1415	/* Ignore home */
1382	1416	if (which == STORE_HOME) return;
	1417
	1418	/* General Store gets special treatment */
	1419	if (which == STORE_GENERAL)
	1420	{
	1421	store_create_staples();
	1422	return;
	1423	}
1383	1424
1384	1425
…	…
1421	1462	/*** "Buy in" various items */
1422	1463
1423		~~/* Ensure all staple items are present */~~
1424		~~store_create_staples(which);~~
1425
1426	1464	/* Buy a few items */
1427	1465	stock = st_ptr->stock_num;
…	…
1616	1654
1617	1655	/* Show weights */
	1656	colour = curs_attrs[CURS_KNOWN][(int)cursor];
1618	1657	strnfmt(out_val, sizeof out_val, "%3d.%d lb", o_ptr->weight / 10, o_ptr->weight % 10);
1619		~~put_str(~~out_val, row, scr_places_x[LOC_WEIGHT]);
	1658	c_put_str(colour, out_val, row, scr_places_x[LOC_WEIGHT]);
1620	1659
1621	1660	/* Describe an object (fully) in a store */
…	…
1626	1665
1627	1666	/* Make sure the player can afford it */
1628		if ((unsigned int) p_ptr->au < (unsigned int) x)
1629		colour = TERM_SLATE;
1630		else
1631		colour = TERM_WHITE;
	1667	if ((int) p_ptr->au < (int) x)
	1668	colour = curs_attrs[CURS_UNKNOWN][(int)cursor];
1632	1669
1633	1670	/* Actually draw the price */
…	…
2239	2276
2240	2277	/* Describe it fully */
	2278	Term_erase(0, 0, 255);
	2279	Term_gotoxy(0, 0);
2241	2280	object_info_screen(o_ptr);
2242	2281	}
…	…
2317	2356	static bool store_process_command(char cmd, void *db, int oid)
2318	2357	{
2319		~~(void)db~~;
	2358	bool equip_toggle = FALSE;
2320	2359
2321	2360	/* Parse the command */
…	…
2331	2370	/* Sell */
2332	2371	case 's':
	2372	case 'd':
2333	2373	{
2334	2374	store_sell();
…	…
2350	2390	/* Examine */
2351	2391	case 'l':
	2392	case 'x':
2352	2393	{
2353	2394	store_examine(oid);
…	…
2394	2435	case 'e':
2395	2436	{
2396		do_cmd_equip();
2397		break;
	2437	equip_toggle = TRUE;
2398	2438	}
2399	2439
…	…
2401	2441	case 'i':