Navigation

← Previous Changeset
Next Changeset →

Changeset 24

Timestamp:

03/29/07 13:22:01 (1 year ago)

Author:

takkaria

Message:

Fix #60:

Make player effects an array
Remove duplicated code in xtra2.c
Add inc_timed(), dec_timed, clear_timed() functions to simplify use

Also, up the defines.h version to 3.0.8, and the savefile/edit file version
to 3.0.7.

+641 lines, -1414 lines, -773 net.

Files:

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/src/cave.c (modified) (4 diffs)
trunk/src/cmd1.c (modified) (10 diffs)
trunk/src/cmd2.c (modified) (8 diffs)
trunk/src/cmd5.c (modified) (11 diffs)
trunk/src/cmd6.c (modified) (4 diffs)
trunk/src/defines.h (modified) (3 diffs)
trunk/src/dungeon.c (modified) (14 diffs)
trunk/src/externs.h (modified) (1 diff)
trunk/src/files.c (modified) (1 diff)
trunk/src/load.c (modified) (1 diff)
trunk/src/melee1.c (modified) (13 diffs)
trunk/src/melee2.c (modified) (10 diffs)
trunk/src/monster2.c (modified) (6 diffs)
trunk/src/save.c (modified) (1 diff)
trunk/src/spells1.c (modified) (21 diffs)
trunk/src/spells2.c (modified) (11 diffs)
trunk/src/types.h (modified) (1 diff)
trunk/src/use-obj.c (modified) (66 diffs)
trunk/src/wizard2.c (modified) (1 diff)
trunk/src/x-spell.c (modified) (28 diffs)
trunk/src/xtra1.c (modified) (25 diffs)
trunk/src/xtra2.c (modified) (39 diffs)

Legend:

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

trunk/lib/edit/artifact.txt

r1 r24

65 65 # Version stamp (required)
66 66
67 V:3.0.6
67 V:3.0.7
68 68
69 69
trunk/lib/edit/cost_adj.txt

r1 r24

17 17 # Version stamp (required)
18 18
19 V:3.0.6
19 V:3.0.7
20 20
21 21
trunk/lib/edit/ego_item.txt

r1 r24

52 52 # Version stamp (required)
53 53
54 V:3.0.6
54 V:3.0.7
55 55
56 56 # 1 (unused)
trunk/lib/edit/flavor.txt

r1 r24

15 15 # Version stamp (required)
16 16
17 V:3.0.6
17 V:3.0.7
18 18
19 19
trunk/lib/edit/limits.txt

r1 r24

12 12 # Version stamp (required)
13 13
14 V:3.0.6
14 V:3.0.7
15 15
16 16
trunk/lib/edit/monster.txt

r1 r24

97 97 # Version stamp (required)
98 98
99 V:3.0.6
99 V:3.0.7
100 100
101 101
trunk/lib/edit/object.txt

r1 r24

80 80 # Version stamp (required)
81 81
82 V:3.0.6
82 V:3.0.7
83 83
84 84
trunk/lib/edit/p_class.txt

r1 r24

63 63 # Version stamp (required)
64 64
65 V:3.0.6
65 V:3.0.7
66 66
67 67
trunk/lib/edit/p_hist.txt

r1 r24

30 30 # Version stamp (required)
31 31
32 V:3.0.6
32 V:3.0.7
33 33
34 34
trunk/lib/edit/p_race.txt

r1 r24

51 51 # Version stamp (required)
52 52
53 V:3.0.6
53 V:3.0.7
54 54
55 55
trunk/lib/edit/shop_own.txt

r1 r24

17 17 # Version stamp (required)
18 18
19 V:3.0.6
19 V:3.0.7
20 20
21 21 # General Store
trunk/lib/edit/spell.txt

r1 r24

38 38 # Version stamp (required)
39 39
40 V:3.0.6
40 V:3.0.7
41 41
42 42
trunk/lib/edit/terrain.txt

r1 r24

36 36 # Version stamp (required)
37 37
38 V:3.0.6
38 V:3.0.7
39 39
40 40
trunk/lib/edit/vault.txt

r1 r24

47 47 # Version stamp (required)
48 48
49 V:3.0.6
49 V:3.0.7
50 50
51 51

trunk/src/cave.c

r16	r24
473	473
474	474	/* Handle "dark" grids and "blindness" */
475		else if ((p_ptr->~~blind~~) \|\| (!(info & CAVE_GLOW)))
	475	else if ((p_ptr->timed[TMD_BLIND]) \|\| (!(info & CAVE_GLOW)))
476	476	{
477	477	/* Use a dark tile */
…	…
518	518
519	519	/* Handle "blind" */
520		else if (p_ptr->~~blind~~)
	520	else if (p_ptr->timed[TMD_BLIND])
521	521	{
522	522	switch (use_graphics)
…	…
748	748	s16b m_idx;
749	749
750		s16b image = p_ptr->~~image~~;
	750	s16b image = p_ptr->timed[TMD_IMAGE];
751	751
752	752	int floor_num = 0;
…	…
3095	3095
3096	3096	/* Handle blindness */
3097		if (p_ptr->~~blind~~)
	3097	if (p_ptr->timed[TMD_BLIND])
3098	3098	{
3099	3099	/* Process "new" grids */

trunk/src/cmd1.c

r1	r24
422	422
423	423	/* Penalize various conditions */
424		if (p_ptr->~~blind~~ \|\| no_lite()) chance = chance / 10;
425		if (p_ptr->~~confused \|\| p_ptr->image~~) chance = chance / 10;
	424	if (p_ptr->timed[TMD_BLIND] \|\| no_lite()) chance = chance / 10;
	425	if (p_ptr->timed[TMD_CONFUSED] \|\| p_ptr->timed[TMD_IMAGE]) chance = chance / 10;
426	426
427	427	/* Search the nearby grids, which are always in bounds */
…	…
899	899
900	900	dam = dam * 2;
901		(void)~~set_cut(p_ptr->cut +~~ randint(dam));
	901	(void)inc_timed(TMD_CUT, randint(dam));
902	902	}
903	903
…	…
929	929
930	930	dam = dam * 2;
931		(void)~~set_cut(p_ptr->cut +~~ randint(dam));
932
933		if (p_ptr->resist_pois \|\| p_ptr->~~oppose_pois~~)
	931	(void)inc_timed(TMD_CUT, randint(dam));
	932
	933	if (p_ptr->resist_pois \|\| p_ptr->timed[TMD_OPP_POIS])
934	934	{
935	935	msg_print("The poison does not affect you!");
…	…
938	938	{
939	939	dam = dam * 2;
940		(void)~~set_poisoned(p_ptr->poisoned +~~ randint(dam));
	940	(void)inc_timed(TMD_POISONED, randint(dam));
941	941	}
942	942	}
…	…
993	993	dam = damroll(1, 4);
994	994	take_hit(dam, name);
995		(void)~~set_slow(p_ptr->slow +~~ rand_int(20) + 20);
	995	(void)inc_timed(TMD_SLOW, rand_int(20) + 20);
996	996	}
997	997	else
…	…
1055	1055	if (!p_ptr->resist_blind)
1056	1056	{
1057		(void)~~set_blind(p_ptr->blind +~~ rand_int(50) + 25);
	1057	(void)inc_timed(TMD_BLIND, rand_int(50) + 25);
1058	1058	}
1059	1059	break;
…	…
1065	1065	if (!p_ptr->resist_confu)
1066	1066	{
1067		(void)~~set_confused(p_ptr->confused +~~ rand_int(20) + 10);
	1067	(void)inc_timed(TMD_CONFUSED, rand_int(20) + 10);
1068	1068	}
1069	1069	break;
…	…
1073	1073	{
1074	1074	msg_print("You are surrounded by a pungent green gas!");
1075		if (!p_ptr->resist_pois && !p_ptr->~~oppose_pois~~)
1076		{
1077		(void)~~set_poisoned(p_ptr->poisoned +~~ rand_int(20) + 10);
	1075	if (!p_ptr->resist_pois && !p_ptr->timed[TMD_OPP_POIS])
	1076	{
	1077	(void)inc_timed(TMD_POISONED, rand_int(20) + 10);
1078	1078	}
1079	1079	break;
…	…
1085	1085	if (!p_ptr->free_act)
1086	1086	{
1087		(void)~~set_paralyzed(p_ptr->paralyzed +~~ rand_int(10) + 5);
	1087	(void)inc_timed(TMD_PARALYZED, rand_int(10) + 5);
1088	1088	}
1089	1089	break;
…	…
1142	1142
1143	1143	/* Handle player fear */
1144		if (p_ptr->~~afraid~~)
	1144	if (p_ptr->timed[TMD_AFRAID])
1145	1145	{
1146	1146	/* Message */

trunk/src/cmd2.c

r1	r24
290	290	{
291	291	msg_print("A puff of green gas surrounds you!");
292		if (!(p_ptr->resist_pois \|\| p_ptr->~~oppose_pois~~))
293		{
294		(void)~~set_poisoned(p_ptr->poisoned +~~ 10 + randint(20));
	292	if (!(p_ptr->resist_pois \|\| p_ptr->timed[TMD_OPP_POIS]))
	293	{
	294	(void)inc_timed(TMD_POISONED, 10 + randint(20));
295	295	}
296	296	}
…	…
302	302	if (!p_ptr->free_act)
303	303	{
304		(void)~~set_paralyzed(p_ptr->paralyzed +~~ 10 + randint(20));
	304	(void)inc_timed(TMD_PARALYZED, 10 + randint(20));
305	305	}
306	306	}
…	…
357	357
358	358	/* Penalize some conditions */
359		if (p_ptr->~~blind~~ \|\| no_lite()) i = i / 10;
360		if (p_ptr->~~confused \|\| p_ptr->image~~) i = i / 10;
	359	if (p_ptr->timed[TMD_BLIND] \|\| no_lite()) i = i / 10;
	360	if (p_ptr->timed[TMD_CONFUSED] \|\| p_ptr->timed[TMD_IMAGE]) i = i / 10;
361	361
362	362	/* Extract the difficulty */
…	…
426	426
427	427	/* Penalize some conditions */
428		if (p_ptr->~~blind~~ \|\| no_lite()) i = i / 10;
429		if (p_ptr->~~confused \|\| p_ptr->image~~) i = i / 10;
	428	if (p_ptr->timed[TMD_BLIND] \|\| no_lite()) i = i / 10;
	429	if (p_ptr->timed[TMD_CONFUSED] \|\| p_ptr->timed[TMD_IMAGE]) i = i / 10;
430	430
431	431	/* Extract the difficulty */
…	…
676	676
677	677	/* Penalize some conditions */
678		if (p_ptr->~~blind~~ \|\| no_lite()) i = i / 10;
679		if (p_ptr->~~confused \|\| p_ptr->image~~) i = i / 10;
	678	if (p_ptr->timed[TMD_BLIND] \|\| no_lite()) i = i / 10;
	679	if (p_ptr->timed[TMD_CONFUSED] \|\| p_ptr->timed[TMD_IMAGE]) i = i / 10;
680	680
681	681	/* Extract the lock power */
…	…
1377	1377
1378	1378	/* Penalize some conditions */
1379		if (p_ptr->~~blind~~ \|\| no_lite()) i = i / 10;
1380		if (p_ptr->~~confused \|\| p_ptr->image~~) i = i / 10;
	1379	if (p_ptr->timed[TMD_BLIND] \|\| no_lite()) i = i / 10;
	1380	if (p_ptr->timed[TMD_CONFUSED] \|\| p_ptr->timed[TMD_IMAGE]) i = i / 10;
1381	1381
1382	1382	/* XXX XXX XXX Variable power? */
…	…
1643	1643
1644	1644	/* Hack -- Lose balance ala paralysis */
1645		(void)~~set_paralyzed(p_ptr->paralyzed +~~ 2 + rand_int(2));
	1645	(void)inc_timed(TMD_PARALYZED, 2 + rand_int(2));
1646	1646	}
1647	1647
…	…
2133	2133
2134	2134	/* Hack XXX XXX XXX */
2135		if (p_ptr->~~confused~~)
	2135	if (p_ptr->timed[TMD_CONFUSED])
2136	2136	{
2137	2137	msg_print("You are too confused!");

trunk/src/cmd5.c

r1	r24
64	64
65	65	/* Stunning makes spells harder (after minfail) */
66		if (p_ptr->~~stun~~ > 50) chance += 25;
67		else if (p_ptr->~~stun~~) chance += 15;
	66	if (p_ptr->timed[TMD_STUN] > 50) chance += 25;
	67	else if (p_ptr->timed[TMD_STUN]) chance += 15;
68	68
69	69	/* Always a 5 percent chance of working */
…	…
609	609
610	610	/* No lite */
611		if (p_ptr->~~blind~~ \|\| no_lite())
	611	if (p_ptr->timed[TMD_BLIND] \|\| no_lite())
612	612	{
613	613	msg_print("You cannot see!");
…	…
616	616
617	617	/* Confused */
618		if (p_ptr->~~confused~~)
	618	if (p_ptr->timed[TMD_CONFUSED])
619	619	{
620	620	msg_print("You are too confused!");
…	…
673	673	}
674	674
675		if (p_ptr->~~blind~~ \|\| no_lite())
	675	if (p_ptr->timed[TMD_BLIND] \|\| no_lite())
676	676	{
677	677	msg_print("You cannot see!");
…	…
679	679	}
680	680
681		if (p_ptr->~~confused~~)
	681	if (p_ptr->timed[TMD_CONFUSED])
682	682	{
683	683	msg_print("You are too confused!");
…	…
832	832
833	833	/* Require lite */
834		if (p_ptr->~~blind~~ \|\| no_lite())
	834	if (p_ptr->timed[TMD_BLIND] \|\| no_lite())
835	835	{
836	836	msg_print("You cannot see!");
…	…
839	839
840	840	/* Not when confused */
841		if (p_ptr->~~confused~~)
	841	if (p_ptr->timed[TMD_CONFUSED])
842	842	{
843	843	msg_print("You are too confused!");
…	…
958	958
959	959	/* Hack -- Bypass free action */
960		(void)~~set_paralyzed(p_ptr->paralyzed +~~ randint(5 * oops + 1));
	960	(void)inc_timed(TMD_PARALYZED, randint(5 * oops + 1));
961	961
962	962	/* Damage CON (possibly permanently) */
…	…
1003	1003
1004	1004	/* Must have lite */
1005		if (p_ptr->~~blind~~ \|\| no_lite())
	1005	if (p_ptr->timed[TMD_BLIND] \|\| no_lite())
1006	1006	{
1007	1007	msg_print("You cannot see!");
…	…
1010	1010
1011	1011	/* Must not be confused */
1012		if (p_ptr->~~confused~~)
	1012	if (p_ptr->timed[TMD_CONFUSED])
1013	1013	{
1014	1014	msg_print("You are too confused!");
…	…
1128	1128
1129	1129	/* Hack -- Bypass free action */
1130		(void)~~set_paralyzed(p_ptr->paralyzed +~~ randint(5 * oops + 1));
	1130	(void)inc_timed(TMD_PARALYZED, randint(5 * oops + 1));
1131	1131
1132	1132	/* Damage CON (possibly permanently) */

trunk/src/cmd6.c

r1	r24
246	246
247	247	/* Check some conditions */
248		if (p_ptr->~~blind~~)
	248	if (p_ptr->timed[TMD_BLIND])
249	249	{
250	250	msg_print("You can't see anything.");
…	…
256	256	return;
257	257	}
258		if (p_ptr->~~confused~~)
	258	if (p_ptr->timed[TMD_CONFUSED])
259	259	{
260	260	msg_print("You are too confused!");
…	…
393	393
394	394	/* Confusion hurts skill */
395		if (p_ptr->~~confused~~) chance = chance / 2;
	395	if (p_ptr->timed[TMD_CONFUSED]) chance = chance / 2;
396	396
397	397	/* High level objects are harder */
…	…
698	698
699	699	/* Confusion hurts skill */
700		if (p_ptr->~~confused~~) chance = chance / 2;
	700	if (p_ptr->timed[TMD_CONFUSED]) chance = chance / 2;
701	701
702	702	/* High level objects are harder */

trunk/src/defines.h

r16	r24
48	48	* Current version string
49	49	*/
50		#define VERSION_STRING "3.0.7s"
	50	#define VERSION_STRING "3.0.8"
51	51
52	52
…	…
56	56	#define VERSION_MAJOR 3
57	57	#define VERSION_MINOR 0
58		#define VERSION_PATCH 6
59		#define VERSION_EXTRA 4
	58	#define VERSION_PATCH 7
	59	#define VERSION_EXTRA 0
60	60
61	61
…	…
448	448	*/
449	449	#define MAX_FLOOR_STACK 23
	450
	451
	452	/*
	453	* Timed effects
	454	*/
	455	enum
	456	{
	457	TMD_FAST = 0, TMD_SLOW, TMD_BLIND, TMD_PARALYZED, TMD_CONFUSED,
	458	TMD_AFRAID, TMD_IMAGE, TMD_POISONED, TMD_CUT, TMD_STUN, TMD_PROTEVIL,
	459	TMD_INVULN, TMD_HERO, TMD_SHERO, TMD_SHIELD, TMD_BLESSED, TMD_SINVIS,
	460	TMD_SINFRA, TMD_OPP_ACID, TMD_OPP_ELEC, TMD_OPP_FIRE, TMD_OPP_COLD,
	461	TMD_OPP_POIS,
	462
	463	TMD_MAX
	464	};
450	465
451	466

trunk/src/dungeon.c

r16	r24
106	106
107	107	/* No sensing when confused */
108		if (p_ptr->~~confused~~) return;
	108	if (p_ptr->timed[TMD_CONFUSED]) return;
109	109
110	110	if (cp_ptr->flags & CF_PSEUDO_ID_IMPROV)
…	…
753	753
754	754	/* Take damage from poison */
755		if (p_ptr->~~poisoned~~)
	755	if (p_ptr->timed[TMD_POISONED])
756	756	{
757	757	/* Take damage */
…	…
760	760
761	761	/* Take damage from cuts */
762		if (p_ptr->~~cut~~)
	762	if (p_ptr->timed[TMD_CUT])
763	763	{
764	764	/* Mortal wound or Deep Gash */
765		if (p_ptr->~~cut~~ > 200)
	765	if (p_ptr->timed[TMD_CUT] > 200)
766	766	{
767	767	i = 3;
…	…
769	769
770	770	/* Severe cut */
771		else if (p_ptr->~~cut~~ > 100)
	771	else if (p_ptr->timed[TMD_CUT] > 100)
772	772	{
773	773	i = 2;
…	…
851	851	{
852	852	/* Faint occasionally */
853		if (!p_ptr->~~paralyzed~~ && (rand_int(100) < 10))
	853	if (!p_ptr->timed[TMD_PARALYZED] && (rand_int(100) < 10))
854	854	{
855	855	/* Message */
…	…
858	858
859	859	/* Hack -- faint (bypass free action) */
860		(void)~~set_paralyzed(p_ptr->paralyzed +~~ 1 + rand_int(5));
	860	(void)inc_timed(TMD_PARALYZED, 1 + rand_int(5));
861	861	}
862	862	}
…	…
882	882
883	883	/* Various things interfere with healing */
884		if (p_ptr->~~paralyzed~~) regen_amount = 0;
885		if (p_ptr->~~poisoned~~) regen_amount = 0;
886		if (p_ptr->~~stun~~) regen_amount = 0;
887		if (p_ptr->~~cut~~) regen_amount = 0;
	884	if (p_ptr->timed[TMD_PARALYZED]) regen_amount = 0;
	885	if (p_ptr->timed[TMD_POISONED]) regen_amount = 0;
	886	if (p_ptr->timed[TMD_STUN]) regen_amount = 0;
	887	if (p_ptr->timed[TMD_CUT]) regen_amount = 0;
888	888
889	889	/* Regenerate Hit Points if needed */
…	…
897	897
898	898	/* Hack -- Hallucinating */
899		if (p_ptr->~~image~~)
900		{
901		(void)~~set_image(p_ptr->image -~~ 1);
	899	if (p_ptr->timed[TMD_IMAGE])
	900	{
	901	(void)dec_timed(TMD_IMAGE, 1);
902	902	}
903	903
904	904	/* Blindness */
905		if (p_ptr->~~blind~~)
906		{
907		(void)~~set_blind(p_ptr->blind -~~ 1);
	905	if (p_ptr->timed[TMD_BLIND])
	906	{
	907	(void)dec_timed(TMD_BLIND, 1);
908	908	}
909	909
910	910	/* Times see-invisible */
911		if (p_ptr->tim~~_invis~~)
912		{
913		(void)~~set_tim_invis(p_ptr->tim_invis -~~ 1);
	911	if (p_ptr->timed[TMD_SINVIS])
	912	{
	913	(void)dec_timed(TMD_SINVIS, 1);
914	914	}
915	915
916	916	/* Timed infra-vision */
917		if (p_ptr->tim~~_infra~~)
918		{
919		(void)~~set_tim_infra(p_ptr->tim_infra -~~ 1);
	917	if (p_ptr->timed[TMD_SINFRA])
	918	{
	919	(void)dec_timed(TMD_SINFRA, 1);
920	920	}
921	921
922	922	/* Paralysis */
923		if (p_ptr->~~paralyzed~~)
924		{
925		(void)~~set_paralyzed(p_ptr->paralyzed -~~ 1);
	923	if (p_ptr->timed[TMD_PARALYZED])
	924	{
	925	(void)dec_timed(TMD_PARALYZED, 1);
926	926	}
927	927
928	928	/* Confusion */
929		if (p_ptr->~~confused~~)
930		{
931		(void)~~set_confused(p_ptr->confused -~~ 1);
	929	if (p_ptr->timed[TMD_CONFUSED])
	930	{
	931	(void)dec_timed(TMD_CONFUSED, 1);
932	932	}
933	933
934	934	/* Afraid */
935		if (p_ptr->~~afraid~~)
936		{
937		(void)~~set_afraid(p_ptr->afraid -~~ 1);
	935	if (p_ptr->timed[TMD_AFRAID])
	936	{
	937	(void)dec_timed(TMD_AFRAID, 1);
938	938	}
939	939
940	940	/* Fast */
941		if (p_ptr->~~fast~~)
942		{
943		(void)~~set_fast(p_ptr->fast -~~ 1);
	941	if (p_ptr->timed[TMD_FAST])
	942	{
	943	(void)dec_timed(TMD_FAST, 1);
944	944	}
945	945
946	946	/* Slow */
947		if (p_ptr->~~slow~~)
948		{
949		(void)~~set_slow(p_ptr->slow -~~ 1);
	947	if (p_ptr->timed[TMD_SLOW])
	948	{
	949	(void)dec_timed(TMD_SLOW, 1);
950	950	}
951	951
952	952	/* Protection from evil */
953		if (p_ptr->~~protevil~~)
954		{
955		(void)~~set_protevil(p_ptr->protevil -~~ 1);
	953	if (p_ptr->timed[TMD_PROTEVIL])
	954	{
	955	(void)dec_timed(TMD_PROTEVIL, 1);
956	956	}
957	957
958	958	/* Invulnerability */
959		if (p_ptr->~~invuln~~)
960		{
961		(void)~~set_invuln(p_ptr->invuln -~~ 1);
	959	if (p_ptr->timed[TMD_INVULN])
	960	{
	961	(void)dec_timed(TMD_INVULN, 1);
962	962	}
963	963
964	964	/* Heroism */
965		if (p_ptr->~~hero~~)
966		{
967		(void)~~set_hero(p_ptr->hero -~~ 1);
	965	if (p_ptr->timed[TMD_HERO])
	966	{
	967	(void)dec_timed(TMD_HERO, 1);
968	968	}
969	969
970	970	/* Super Heroism */
971		if (p_ptr->~~shero~~)
972		{
973		(void)~~set_shero(p_ptr->shero -~~ 1);
	971	if (p_ptr->timed[TMD_SHERO])
	972	{
	973	(void)dec_timed(TMD_SHERO, 1);
974	974	}
975	975
976	976	/* Blessed */
977		if (p_ptr->~~blessed~~)
978		{
979		(void)~~set_blessed(p_ptr->blessed -~~ 1);
	977	if (p_ptr->timed[TMD_BLESSED])
	978	{
	979	(void)dec_timed(TMD_BLESSED, 1);
980	980	}
981	981
982	982	/* Shield */
983		if (p_ptr->~~shield~~)
984		{
985		(void)~~set_shield(p_ptr->shield -~~ 1);
	983	if (p_ptr->timed[TMD_SHIELD])
	984	{
	985	(void)dec_timed(TMD_SHIELD, 1);
986	986	}
987	987
988	988	/* Oppose Acid */
989		if (p_ptr->~~oppose_acid~~)
990		{
991		(void)~~set_oppose_acid(p_ptr->oppose_acid -~~ 1);
	989	if (p_ptr->timed[TMD_OPP_ACID])
	990	{
	991	(void)dec_timed(TMD_OPP_ACID, 1);
992	992	}
993	993
994	994	/* Oppose Lightning */
995		if (p_ptr->~~oppose_elec~~)
996		{
997		(void)~~set_oppose_elec(p_ptr->oppose_elec -~~ 1);
	995	if (p_ptr->timed[TMD_OPP_ELEC])
	996	{
	997	(void)dec_timed(TMD_OPP_ELEC, 1);
998	998	}
999	999
1000	1000	/* Oppose Fire */
1001		if (p_ptr->~~oppose_fire~~)
1002		{
1003		(void)~~set_oppose_fire(p_ptr->oppose_fire -~~ 1);
	1001	if (p_ptr->timed[TMD_OPP_FIRE])
	1002	{
	1003	(void)dec_timed(TMD_OPP_FIRE, 1);
1004	1004	}
1005	1005
1006	1006	/* Oppose Cold */
1007		if (p_ptr->~~oppose_cold~~)
1008		{
1009		(void)~~set_oppose_cold(p_ptr->oppose_cold -~~ 1);
	1007	if (p_ptr->timed[TMD_OPP_COLD])
	1008	{
	1009	(void)dec_timed(TMD_OPP_COLD, 1);
1010	1010	}
1011	1011
1012	1012	/* Oppose Poison */
1013		if (p_ptr->~~oppose_pois~~)
1014		{
1015		(void)~~set_oppose_pois(p_ptr->oppose_pois -~~ 1);
	1013	if (p_ptr->timed[TMD_OPP_POIS])
	1014	{
	1015	(void)dec_timed(TMD_OPP_POIS, 1);
1016	1016	}
1017	1017
…	…
1020	1020
1021	1021	/* Poison */
1022		if (p_ptr->~~poisoned~~)
	1022	if (p_ptr->timed[TMD_POISONED])
1023	1023	{
1024	1024	int adjust = (adj_con_fix[p_ptr->stat_ind[A_CON]] + 1);
1025	1025
1026	1026	/* Apply some healing */
1027		(void)~~set_poisoned(p_ptr->poisoned -~~ adjust);
	1027	(void)dec_timed(TMD_POISONED, adjust);
1028	1028	}
1029	1029
1030	1030	/* Stun */
1031		if (p_ptr->~~stun~~)
	1031	if (p_ptr->timed[TMD_STUN])
1032	1032	{
1033	1033	int adjust = (adj_con_fix[p_ptr->stat_ind[A_CON]] + 1);
1034	1034
1035	1035	/* Apply some healing */
1036		(void)~~set_stun(p_ptr->stun -~~ adjust);
	1036	(void)dec_timed(TMD_STUN, adjust);
1037	1037	}
1038	1038
1039	1039	/* Cut */
1040		if (p_ptr->~~cut~~)
	1040	if (p_ptr->timed[TMD_CUT])
1041	1041	{
1042	1042	int adjust = (adj_con_fix[p_ptr->stat_ind[A_CON]] + 1);
1043	1043
1044	1044	/* Hack -- Truly "mortal" wound */
1045		if (p_ptr->~~cut~~ > 1000) adjust = 0;
	1045	if (p_ptr->timed[TMD_CUT] > 1000) adjust = 0;
1046	1046
1047	1047	/* Apply some healing */
1048		(void)~~set_cut(p_ptr->cut -~~ adjust);
	1048	(void)dec_timed(TMD_CUT, adjust);
1049	1049	}
1050	1050
…	…
1073	1073
1074	1074	/* Hack -- Special treatment when blind */
1075		if (p_ptr->~~blind~~)
	1075	if (p_ptr->timed[TMD_BLIND])
1076	1076	{
1077	1077	/* Hack -- save some light for later */
…	…
2003	2003	if ((p_ptr->chp == p_ptr->mhp) &&
2004	2004	(p_ptr->csp == p_ptr->msp) &&
2005		!p_ptr->~~blind && !p_ptr->confused~~ &&
2006		!p_ptr->~~poisoned && !p_ptr->afraid~~ &&
2007		!p_ptr->~~stun && !p_ptr->cut~~ &&
2008		!p_ptr->~~slow && !p_ptr->paralyzed~~ &&
2009		!p_ptr->~~image~~ && !p_ptr->word_recall)
	2005	!p_ptr->timed[TMD_BLIND] && !p_ptr->timed[TMD_CONFUSED] &&
	2006	!p_ptr->timed[TMD_POISONED] && !p_ptr->timed[TMD_AFRAID] &&
	2007	!p_ptr->timed[TMD_STUN] && !p_ptr->timed[TMD_CUT] &&
	2008	!p_ptr->timed[TMD_SLOW] && !p_ptr->timed[TMD_PARALYZED] &&
	2009	!p_ptr->timed[TMD_IMAGE] && !p_ptr->word_recall)
2010	2010	{
2011	2011	disturb(0, 0);
…	…
2121	2121
2122	2122	/* Paralyzed or Knocked Out */
2123		if ((p_ptr->~~paralyzed) \|\| (p_ptr->stun~~ >= 100))
	2123	if ((p_ptr->timed[TMD_PARALYZED]) \|\| (p_ptr->timed[TMD_STUN] >= 100))
2124	2124	{
2125	2125	/* Take a turn */
…	…
2201	2201
2202	2202	/* Hack -- constant hallucination */
2203		if (p_ptr->~~image~~)
	2203	if (p_ptr->timed[TMD_IMAGE])
2204	2204	{
2205	2205	p_ptr->redraw \|= (PR_MAP);
…	…
2969	2969
2970	2970	/* Hack -- Healing */
2971		(void)~~set_blind(0~~);
2972		(void)~~set_confused(0~~);
2973		(void)~~set_poisoned(0~~);
2974		(void)~~set_afraid(0~~);
2975		(void)~~set_paralyzed(0~~);
2976		(void)~~set_image(0~~);
2977		(void)~~set_stun(0~~);
2978		(void)~~set_cut(0~~);
	2971	(void)clear_timed(TMD_BLIND);
	2972	(void)clear_timed(TMD_CONFUSED);
	2973	(void)clear_timed(TMD_POISONED);
	2974	(void)clear_timed(TMD_AFRAID);
	2975	(void)clear_timed(TMD_PARALYZED);
	2976	(void)clear_timed(TMD_IMAGE);
	2977	(void)clear_timed(TMD_STUN);
	2978	(void)clear_timed(TMD_CUT);
2979	2979
2980	2980

r1	r24
65	65	# Version stamp (required)
66	66
67		V:3.0.6
	67	V:3.0.7
68	68
69	69