- [+] shift+backward shouldn't let you attack backwards!

- [+] if LFINWAY and not "infront", "you run into somehting"
- [+] change tumle to just take a direction
    - [+] change to take a dir
    - [+] different dirs should give different messages
- [+] abilities should only charge STAMINA if they were successful!
    - [+] at end of useability()
    - [+] abilityeffects miust only retur TRUE on cancellation
- [+] scroll of awareness not being used up!
- [+] lore:  at adept level, add "it could potentially kill you in xx
      hits"
    - [+] (assume no armour)
    - [+] need getweapons()
- [+] implment 'canuseweapons(lf)'
- [-] spells should only charge mp if they were successful???
    - [+] move the validatespellcell() call into castspell. 
    - [+] add f_targettedspell, tt_xx to all spell defs
    - [+] remove validatespellcall() call from dospelleffects
    - [+] test with player
    - [+] test with monsters
    - [ ] special cases:
        - [ ] blink
        - [ ] test digging...
        - [ ] invisibillity?
        - [ ] light
        - [ ] darkness
    - [ ] do i still need "frompot" in spelleffects???
- [+] new ability: flipthrow

ai.c

@@ -1784,6 +1784,11 @@ int aispellok(lifeform_t *lf, enum OBTYPE spellid, lifeform_t *victim, enum FLAG
 	if ((ot->id == OT_S_DRAINLIFE) && isimmuneto(victim->flags, DT_NECROTIC)) {
 		specificcheckok = B_FALSE;
 	}
+	if (ot->id == OT_A_FLIP) {
+		if (getlfsize(victim) > getlfsize(lf)) {
+			specificcheckok = B_FALSE;
+		}
+	}
 	if (ot->id == OT_A_FLURRY) {
 		if (!isdualweilding(lf)) {
 			specificcheckok = B_FALSE;

attack.c

@@ -151,7 +151,7 @@ void applyarmourdamreduction(lifeform_t *lf, object_t *wep, int reduceamt, int *
 int attackcell(lifeform_t *lf, cell_t *c, int force) {
 	int validwep[MAXCANDIDATES];
 	object_t *wep[MAXCANDIDATES];
-	flag_t *damflag[MAXCANDIDATES], *f;
+	flag_t *damflag[MAXCANDIDATES];
 	obpile_t *op = NULL;
 	enum {
 		AT_NONE = 0,
@@ -168,8 +168,6 @@ int attackcell(lifeform_t *lf, cell_t *c, int force) {
 	int attacksdone = 0;
 	int lastweaponidx = -1;
 	int saysorry = B_FALSE;
-	flag_t *retflag[MAXCANDIDATES];
-	int nretflags = 0;
 	int attackedhelpless = B_FALSE;
 	int attackedfriend = B_FALSE;
 	int attackedpeaceful = B_FALSE;
@@ -295,53 +293,9 @@ int attackcell(lifeform_t *lf, cell_t *c, int force) {
 		}
 	}
 
-	// first use our weapon...
+	gotweapon = getweapons(lf, wep, damflag, &lastweaponidx, &op, &nweps);
-	nweps = 0;
+	for (i = 0; i < nweps; i++) {
-	wep[nweps] = getweapon(lf);
+		validwep[i] = B_TRUE;
-	if (wep[nweps]) {
-		damflag[nweps] = hasflag(wep[nweps]->flags, F_DAM);
-		validwep[nweps] = B_TRUE;
-		lastweaponidx = 0;
-		nweps++;
-		gotweapon = B_TRUE;
-	}
-
-	// if we are skilled at twoweaponing, we can attack with our second weapon
-	// as well, with a possible accuracy penalty depending on our skill level.
-	if (getskill(lf, SK_TWOWEAPON)) {
-		wep[nweps] = getsecmeleeweapon(lf);
-		if (wep[nweps]) {
-			if ((nweps >= 1) && (wep[nweps] == wep[nweps-1])) {
-				// can't be the same as first one
-			} else {
-				damflag[nweps] = hasflag(wep[nweps]->flags, F_DAM);
-				validwep[nweps] = B_TRUE;
-				lastweaponidx = nweps;
-				nweps++;
-				gotweapon = B_TRUE;
-			}
-		}
-	}
-
-	// then use all our innate attacks..
-	getflags(lf->flags, retflag, &nretflags, F_HASATTACK, F_NONE);
-	for (i = 0; i < nretflags; i++) {
-		f = retflag[i];
-		if (f->id == F_HASATTACK) {
-			objecttype_t *ot;
-
-			if (!op) {
-				op = addobpile(NULL, NULL, NULL);
-			}
-
-			ot = findot(f->val[0]);
-			if (ot) {
-				wep[nweps] = addobfast(op, ot->id);
-				validwep[nweps] = B_TRUE;
-				damflag[nweps] = f;
-				nweps++;
-			}
-		}
 	}
 
 	innateattacks = countinnateattacks(lf);
@@ -2511,7 +2465,7 @@ void wepeffects(flagpile_t *fp, cell_t *where, flag_t *damflag, int dam) {
 			int dir;
 			// knock back victim
 			dir = getdirtowards(owner->cell, victim->cell, victim, B_FALSE, DT_COMPASS);
-			knockback(victim, dir , 2, owner, 30);
+			knockback(victim, dir , 2, owner, 30, B_TRUE);
 			f->known = B_TRUE;
 		} else if ((f->id == F_HITCONFER) && victim ) {
 			// only works if we did damage

data.c

@@ -110,7 +110,7 @@ void initjobs(void) {
 
 	// NOTE:  try to always make the job's primary weapon be the first object defined.
 	//        this will make sure that they have the letter 'a'. 
-	addjob(J_GOD, "Diety");
+	addjob(J_GOD, "Diety", "A divine job mainly known for its importance in debugging.  Dieties can use all abilities and are prompted before death. Due to their infinite power, they consider earthly diversions such as high score tables beneath their dignity.");
 	addflag(lastjob->flags, F_STARTATT, A_STR, AT_EXHIGH, NA, NULL);
 	addflag(lastjob->flags, F_STARTATT, A_AGI, AT_EXHIGH, NA, NULL);
 	addflag(lastjob->flags, F_STARTATT, A_IQ, AT_EXHIGH, NA, NULL);
@@ -157,7 +157,7 @@ void initjobs(void) {
 	}
 	addflag(lastjob->flags, F_NOSCORE, B_TRUE, NA, NA, NULL);
 
-	addjob(J_ADVENTURER, "Adventurer");
+	addjob(J_ADVENTURER, "Adventurer", "Adventurers are a basic jack-of-all-trades type job.  They can learn all skills, and already have basic Cartography and Lore skills.  They start the game with three healing potions.  Recommended for beginners.");
 		// stat mods
 		// initial objects
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "2 bananas");
@@ -182,7 +182,8 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_MPDICE, 1, NA, NA, NULL);
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
 
-	addjob(J_ALLOMANCER, "Allomancer");
+	/*
+	addjob(J_ALLOMANCER, "Allomancer",  "Mages specialising in metal-based magic.");
 		// stat mods
 		addflag(lastjob->flags, F_JOBATTRMOD, A_AGI, 2, NA, NULL);
 		// initial objects
@@ -212,7 +213,8 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_DETECTMETAL, B_TRUE, NA, NA, NULL);
 		mayusespellschool(lastjob->flags, SS_ALLOMANCY, F_CANCAST);
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
-	addjob(J_COMMANDO, "Commando");
+	*/
+	addjob(J_COMMANDO, "Commando", "An elite modern military fighter. Commandoes are very well equipped and capable of using (or learning to use) all technology. Unfortunately their adreneline-filled lifestyle leaves them a little lacking in wisdom, and they have no magical aptitude.");
 		// stat mods
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, 2, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_IQ, -3, NA, NULL);
@@ -252,7 +254,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_CANLEARN, SK_UNARMED, PR_SKILLED, NA, NULL);
                 // abilities
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
-	addjob(J_DRUID, "Druid");
+	addjob(J_DRUID, "Druid", "Druids use the power of nature to aid themselves or harm others.  They start with a pet wolf, and their spells are more powerful when near plants.  They are willing to eat other lifeforms when neccessary but prefer a vegetable-based diet.");
 		// stats
 		addflag(lastjob->flags, F_MPDICE, 1, 1, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_WIS, 3, NA, NULL);
@@ -290,7 +292,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
 
 	///////////////////////////////////////
-	addjob(J_MONK, "Monk");
+	addjob(J_MONK, "Monk", "A life of strict self-discipline from an early age makes Monks masters of unarmed combat. This discipline extends to their minds, sometimes allowing them to develop powerful psionic abilities over time. On the downside, they are useless with most weapons and are strict vegetarians.");
 		// stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, 1, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_AGI, 2, NA, NULL);
@@ -306,7 +308,6 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_STARTSKILL, SK_CARTOGRAPHY, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_EVASION, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_PERCEPTION, PR_NOVICE, NA, NULL);
-		addflag(lastjob->flags, F_STARTSKILL, SK_STEALTH, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_UNARMED, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_SS_MENTAL, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_STAVES, PR_NOVICE, NA, NULL);
@@ -316,6 +317,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_CANLEARN, SK_FIRSTAID, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_LISTEN, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_SEWING, NA, NA, NULL);
+		addflag(lastjob->flags, F_CANLEARN, SK_STEALTH, PR_ADEPT, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_SWIMMING, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_THROWING, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_TRAPS, PR_ADEPT, NA, NULL);
@@ -352,12 +354,12 @@ void initjobs(void) {
 		// 20: tower of iron will
 		// 21: planeshift 
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
-	addjob(J_PLUMBER, "Plumber");
+	addjob(J_MECHANIC, "Mechanic", "Mechanics, while highly paid, are not generally very suited for adventuring. Their spanner and metal-working skills might come in handy though.");
 		// stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_CHA, -4, NA, NULL);
 		// initial objects
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "spanner");
-		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "10 gold coins");
+		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "80 gold coins");
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "overalls");
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "cap");
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "3-5 mushrooms");
@@ -365,12 +367,12 @@ void initjobs(void) {
 		// initial skills
 		addflag(lastjob->flags, F_STARTSKILL, SK_SWIMMING, PR_NOVICE, NA, NULL);
 		// learnable akills
-		addflag(lastjob->flags, F_CANLEARN, SK_ATHLETICS, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_CLIMBING, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_LISTEN, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_METALWORK, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_TECHUSAGE, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_SPELLCASTING, PR_ADEPT, NA, NULL);
+		addflag(lastjob->flags, F_CANLEARN, SK_SS_ALLOMANCY, PR_ADEPT, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_SS_FIRE, PR_ADEPT, NA, NULL);
 		addflag(lastjob->flags, F_CANLEARN, SK_SS_COLD, PR_ADEPT, NA, NULL);
 		// abilities
@@ -378,7 +380,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_OBESE, B_TRUE, NA, NA, NULL);
 		addflag(lastjob->flags, F_CANWILL, OT_A_JUMP, NA, NA, NULL);
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
-	addjob(J_PRINCE, "Prince");
+	addjob(J_PRINCE, "Prince", "Princes have lived a life of leisure and privilege. Their time is generally spent either hunting (making them quite fit and skilled with a bow) or reading (giving them knowledge about the world around them). As they normally travel with a pack of bodyguards though, their weapons are more for show than actually useful.");
                 // stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_CHA, 4, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_WIS, 2, NA, NULL);
@@ -391,6 +393,8 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "silk shirt");
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "riding trousers");
 		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "leather boots");
+		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "short bow");
+		addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "15 arrows");
                 // initial skills
 		addflag(lastjob->flags, F_STARTSKILL, SK_ARMOUR, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_SHIELDS, PR_NOVICE, NA, NULL);
@@ -398,6 +402,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_STARTSKILL, SK_LONGBLADES, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_LORE_HUMANOID, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_LORE_NATURE, PR_NOVICE, NA, NULL);
+		addflag(lastjob->flags, F_STARTSKILL, SK_RANGED, PR_NOVICE, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_SWIMMING, PR_BEGINNER, NA, NULL);
 		addflag(lastjob->flags, F_STARTSKILL, SK_SPEECH, PR_SKILLED, NA, NULL);
                 // learnable skills
@@ -413,7 +418,7 @@ void initjobs(void) {
                 // abilities
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
 
-	addjob(J_PIRATE, "Pirate");
+	addjob(J_PIRATE, "Pirate", "Pirates roam the seven seas, their mug of ale in one hand, and... nothing much in the other, since all pirates (in deference to some kind of ancient tale) have had their left hand replaced with a sharp hook.  Their lifestyle had made them very wealthy and given them an impressive ability to handle their alcohol.  They even start with a pet hawk. On the other hand, they are missing an eye, and not very attractive.");
 		// stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, 3, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_AGI, 2, NA, NULL);
@@ -458,7 +463,7 @@ void initjobs(void) {
 		//           also:  has a hook instead of fists.
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
 
-	addjob(J_ROGUE, "Rogue");
+	addjob(J_ROGUE, "Rogue", "Rogues (sometimes known as \"thieves\") are criminals who are skilled in the appropriation of valuable goods. They can hide in the shadows, stab unsuspecting victims in the back and foil the most cunning traps.");
                 // stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, -3, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_AGI, 4, NA, NULL);
@@ -502,7 +507,7 @@ void initjobs(void) {
                 // abilities
 		addflag(lastjob->flags, F_MPDICE, 1, NA, NA, NULL);
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
-	addjob(J_WARRIOR, "Warrior");
+	addjob(J_WARRIOR, "Warrior", "Warriors are good at hitting things, hard.");
 		// stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, 2, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_AGI, 2, NA, NULL);
@@ -555,7 +560,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_LEVABIL, 10, OT_A_HURRICANESTRIKE, NA, NULL);
 		addflag(lastjob->flags, F_HIRABLE, B_TRUE, NA, NA, NULL);
 
-	addjob(J_WIZARD, "Wizard");
+	addjob(J_WIZARD, "Wizard", "Wizards specialise in Arcane lore, using their magic to create awe-inspiring effects on the world around them.");
                 // stats
 		addflag(lastjob->flags, F_JOBATTRMOD, A_STR, -4, NA, NULL);
 		addflag(lastjob->flags, F_JOBATTRMOD, A_IQ, 4, NA, NULL);
@@ -613,7 +618,7 @@ void initjobs(void) {
 		addflag(lastjob->flags, F_CASTCHANCE, 30, NA, NA, NULL);
 
 	// non-player jobs
-	addjob(J_SHOPKEEPER, "Shopkeeper");
+	addjob(J_SHOPKEEPER, "Shopkeeper", "Shopkeepers make a living by selling goods to others.  Always wary of thieves, most of them keep a shotgun under the counter.");
 	addflag(lastjob->flags, F_NOPLAYER, B_TRUE, NA, NA, NULL);
 	addflag(lastjob->flags, F_STARTATT, A_IQ, AT_AVERAGE, NA, NULL);
 	addflag(lastjob->flags, F_STARTOB, 100, NA, NA, "100-1000 gold coins");
@@ -1783,6 +1788,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ALLOMANCY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_WALLSTOP, NA, NULL);
 	addot(OT_S_ACCELMETAL, "accelerate metal", "Greatly accelerates a metal object thrown by the caster.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -1800,6 +1806,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ALLOMANCY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_MAGSHIELD, "magnetic shield", "Surrounds the caster with magnetic force, repelling metal objects and attacks.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines how long the magnetic shield will last.");
@@ -1821,6 +1828,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l2
@@ -1830,12 +1838,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_COMMANDUNDEAD, "command undead", "Compels an undead creature to follow a single simple command.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_FEAR, "cause fear", "Causes intense fear in the target.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability and duration.");
@@ -1843,12 +1853,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SMITEGOOD, "smite good", "Instantly deals 1-^bpower*2^n damage to good creatures.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 6, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l3
@@ -1857,12 +1869,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	addot(OT_S_DRAINLIFE, "drain life", "Draws life force from the victim in order to heal the caster.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The amount of life force drained is ^b1d6+power^n.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	addot(OT_S_PAIN, "pain", "Causes extreme pain in the target whenever they move.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -1870,6 +1884,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l4
@@ -1878,12 +1893,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_PARALYZE, "paralyze", "Disables the target's muscles, leaving them unable to move for ^bpower*2^n turns.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l5
@@ -1899,6 +1916,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l6
@@ -1906,6 +1924,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines its resistability.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DEATH, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_INFINITEDEATH, "infinite death", "Annihilates all nearby life, including the caster!", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
@@ -2014,6 +2033,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines its range and the weight of objects affected.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 5, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL);
 	addot(OT_S_JOLT, "jolt", "Jolts an adjacent enemy with a short pulse of electricity, dealing 1-^bpower^n damage.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2021,6 +2041,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 6, NA, NA, NULL);
 	addflag(lastot->flags, F_RANGE, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_ADJVICTIM, NA, NA, NULL);
 
@@ -2031,6 +2052,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER|TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL);
@@ -2039,6 +2061,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_GRAVITY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
@@ -2070,12 +2093,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	// l5
 	addot(OT_S_CHAINLIGHTNING, "chain lightning", "Electricity arcs up to 5 times between all nearby enemies. The initial arc deals 3d6 damage, the next deals 3d5 damage, etc.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's range is based on its power.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL);
 	///////////////////
@@ -2085,6 +2110,7 @@ void initobjects(void) {
 	addot(OT_S_SPARK, "spark", "Creates a tiny spark of flame, dealing 1-3 fire damage to creatures and objects.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT|TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
@@ -2095,12 +2121,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SELF, NA, NA, NULL); 
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_FIREDART, "flame dart", "Fires a medium-sized dart of fire, dealing 1d6+^bpower^n fire damage.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	// l3
 	addot(OT_S_FLAMEBURST, "flame burst", "Creates a radial blast of fire out from the caster, inflicting 2d6 fire damage to all within.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2114,6 +2142,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_WALLSTOP, NA, NULL);
 	// l5
@@ -2122,6 +2151,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL); 
 	addflag(lastot->flags, F_RANGE, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_WALLSTOP, NA, NULL);
@@ -2129,6 +2159,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The damage is lower for enemies further away from the ball's centre.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_FIRE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL); // TODO: should be "near victim"
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	///////////////////
@@ -2139,17 +2170,20 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_GLACIATE, "glaciate", "Slows down molecules in a given area, instantly freezing any water present.  Has no effect on living creatures.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SNOWBALL, "snowball", "Throws a large snowball, dealing 1 cold damage to all within its blast.  The remaining snow will quickly melt to water.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL);
 	// l2
@@ -2163,6 +2197,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SELF, NA, NA, NULL); 
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_CRYSTALSHIELD, "crystalline shield", "Summons a shield of ice crystals to protect you from missiles.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2178,6 +2213,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	addot(OT_S_COLDBURST, "cold burst", "Creates a radial blast of coldness out from the caster, dealing 1d8+3 cold damage.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2190,6 +2226,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SLIDE, "slipslide", "Generate ice underneath your feet, allowing you to slide along the ground at high speeds.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2204,11 +2241,13 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_WALLOFICE, "wall of ice", "Creates an impassable wall of solid ice.", MT_ICE, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how long the wall will remain.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
@@ -2225,12 +2264,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's range is determined by its power.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_WALLSTOP, NA, NULL);
 	addot(OT_S_SNAPFREEZE, "snap freeze", "Instantly freezes the target creature.  Cold-resistant creatures will take minor damage instead.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_RANGE, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	// l6
@@ -2273,6 +2314,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how the maximum hit dice creature which can be affected.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 5, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_LESSENPOISON, "lessen poison", "Reduces the effects of poison within the caster's bloodstream.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2280,6 +2322,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_LIFE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_REPELINSECTS, "repel insects", "Surrounds the caster with an insect-repelling smell.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
@@ -2290,6 +2333,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how much mud will be created.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_NONE, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SUMMONANIMALSSM, "summon small animals", "Summons 2-3 small animals.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2302,6 +2346,7 @@ void initobjects(void) {
 	addot(OT_S_WARPWOOD, "warp wood", "Causes damage to all wooden object in the target area.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
@@ -2311,6 +2356,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_LIGHTNINGBOLT, "electricity bolt", "Fires a bolt of electricity through multiple enemies, dealing 2d6 damage to each.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2318,6 +2364,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_AIR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_WALLSTOP, NA, NULL);
 	addot(OT_S_ENDUREELEMENTS, "endure elements", "Provides resistance to fire and cold.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2327,22 +2374,26 @@ void initobjects(void) {
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SELF, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_QUENCH, "quench", "Extinguishes all fires within the given area.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_EVAPORATE, "evaporate", "Instantly converts all water in the given area into steam.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines the amount of water affected.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SLEETSTORM, "sleet storm", "Creates an cloud of sleet, hampering vision and movement.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines the size of the storm.");
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "This spell's power is boosted when cast outside.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
@@ -2357,6 +2408,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how much webbing is created.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_NEED, NA, NULL);
@@ -2372,6 +2424,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_CALMINGSCENT, "calming scent", "Automatically calms any nearby animals.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
@@ -2382,6 +2435,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addot(OT_S_SUMMONANIMALSMD, "summon medium animals", "Summons 2-3 medium animals.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how long the summoned creatures will remain.");
@@ -2394,6 +2448,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how far enemies are knocked back.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	// l5
@@ -2409,6 +2464,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_COLD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 5, NA, NA, NULL);
@@ -2431,6 +2487,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines the amount of water which appears.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	///////////////////
 	// gravity
@@ -2441,6 +2498,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_GRAVITY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_PLAYER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addflag(lastot->flags, F_VARPOWER, B_TRUE, NA, NA, NULL);
 	// l2
@@ -2455,6 +2513,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_GRAVITY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	addot(OT_S_FORCESPHERE, "force sphere", "Radiates a shock wave out from the caster, knocking opponents away.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2467,6 +2526,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how long its effects will last.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_GRAVITY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addot(OT_S_LEVITATION, "levitation", "Causes the caster hover a metre above the ground.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
@@ -2488,6 +2548,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines how long its effects will last.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_GRAVITY, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SELF, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	///////////////////
@@ -2499,6 +2560,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_LIFE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_SELF, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_TURNUNDEAD, "turn undead", "Instills fear in undead creatures.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2514,6 +2576,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_LIFE, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 10, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l3
@@ -2522,6 +2585,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_LIFE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_SELF, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_HOLYAURA, "holy aura", "Surrounds the target with a holy aura, causing their weapon to deal holy damage.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2537,6 +2601,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_LIFE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_SELF, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_CUREPOISON, "cure poison", "Cures the target of all poisons.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2544,6 +2609,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_NATURE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	///////////////////
 	// mental/psionic
@@ -2552,10 +2618,12 @@ void initobjects(void) {
 	addot(OT_S_MINDSCAN, "mind scan", "Reveals detailed information about the target.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER|TT_ALLY, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_STUN, "stun", "Stuns the target, preventing them from taking agressive action for a few seconds.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	// l2
@@ -2564,6 +2632,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 10, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addot(OT_S_LOWERMETAB, "lower metabolism", "Slow your body's functions, decreasing your rate of hunger but also your movement speed.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "At power level III: your speed penalty is reduced.");
@@ -2581,6 +2650,7 @@ void initobjects(void) {
 	addot(OT_S_LETHARGY, "lethargy", "Reduces the target's stamina by ^bpower^n*2.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l3
@@ -2597,6 +2667,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_SLEEP, "sleep", "Puts the target creature to sleep.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2604,12 +2675,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_HUNGER, "hunger", "Causes the target to become ravenously hungry.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l4
@@ -2618,6 +2691,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_STUNMASS, "mass stun", "Stuns all creatures within sight.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
@@ -2630,6 +2704,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MENTAL, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SPECIAL, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	///////////////////
@@ -2639,6 +2714,7 @@ void initobjects(void) {
 	addot(OT_S_HOLDPORTAL, "seal entrance", "Prevents a door from opening.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MODIFICATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ENCHANTMENT, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_DOOR, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_INSCRIBE, "inscribe", "Creates a magical inscription viewable to anyone standing nearby.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2649,6 +2725,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MODIFICATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_WILD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_DOOR|TT_IMPASSABLE, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_LIGHT, "light area", "Creates a temporary light source centred on the caster.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "At Power III, you can control where the light appears.");
@@ -2675,6 +2752,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "The spell's power determines the size of the grease pool.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MODIFICATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL);
 	// l3
@@ -2705,11 +2783,13 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MODIFICATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addot(OT_S_POLYMORPH, "polymorph", "Transmutes the target into a new living race.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "At power V, you can polymorph other creatures.");
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "At power VIII, you can choose what kind of creature to polymorph into.");
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_MODIFICATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_SELF, 10, NA, NULL);
@@ -2755,6 +2835,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_TRANSLOCATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_OBJECT, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l2
 	addot(OT_S_BLINK, "blink", "Teleports the caster to a random location within view.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2768,12 +2849,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_TRANSLOCATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_WALLSTOP, NA, NULL);
 	// l3
 	addot(OT_S_TWIDDLE, "twiddle", "Swaps places with the target creature.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_TRANSLOCATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	// l4
@@ -2782,6 +2865,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLLEVEL, 4, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_TELEPORT, "teleportation", "Teleports the caster (and Power-1 adjacent allies) to a new location within the same level.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "At power V, you can choose the general direction to teleport in.");
@@ -2794,6 +2878,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines resistability.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_TRANSLOCATION, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 5, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOFLEE, ST_VICTIM, NA, NA, NULL); 
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL); 
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
@@ -2817,12 +2902,14 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_WILD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 1, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
 	// l2
 	addot(OT_S_ENERGYBOLT, "energy bolt", "Fires a medium-sized bolt of wild magic, dealing 1d4 damage per power level.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_WILD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 2, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_MAXPOWER, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_FALSE, LOF_NEED, NA, NULL);
@@ -2848,6 +2935,7 @@ void initobjects(void) {
 	addflag(lastot->flags, F_EXTRADESC, NA, NA, NA, "Spell power determines the size of the explosion.");
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_WILD, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER|TT_DOOR, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 
 
@@ -2871,6 +2959,7 @@ void initobjects(void) {
 	addot(OT_S_CONFISCATE, "confiscate", "Takes any object from the target.", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_DIVINE, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLLEVEL, 6, NA, NA, NULL);
+	addflag(lastot->flags, F_TARGETTEDSPELL, TT_MONSTER, NA, NA, NULL);
 	addflag(lastot->flags, F_AICASTTOATTACK, ST_VICTIM, NA, NA, NULL);
 	addflag(lastot->flags, F_LOSLOF, B_TRUE, LOF_DONTNEED, NA, NULL);
 	addot(OT_S_GIFT, "gift", "Grants the target any item of their choice (with some limitations).", MT_NOTHING, 0, OC_SPELL, SZ_TINY);
@@ -2914,6 +3003,10 @@ void initobjects(void) {
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL);
 	addot(OT_A_FEIGNDEATH, "feign death", "Pretend to be dead.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL);
+	addot(OT_A_FLIP, "flip", "Flip your opponent over your head.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY);
+	addflag(lastot->flags, F_STAMCOST, 3, NA, NA, NULL);
+	addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL);
+	addflag(lastot->flags, F_AICASTTOATTACK, ST_ADJVICTIM, NA, NA, NULL);
 	addot(OT_A_FLURRY, "flurry", "Perform a flurry of attacks, forcing your opponent backwards.", MT_NOTHING, 0, OC_ABILITY, SZ_TINY);
 	addflag(lastot->flags, F_STAMCOST, 3, NA, NA, NULL);
 	addflag(lastot->flags, F_SPELLSCHOOL, SS_ABILITY, NA, NA, NULL);
@@ -7959,10 +8052,6 @@ void initrace(void) {
 	addflag(lastrace->flags, F_HITDICE, NA, NA, NA, "2d4+2");
 	addflag(lastrace->flags, F_HASATTACK, OT_TEETH, NA, NA, "1d3");
 	addflag(lastrace->flags, F_MAXATTACKS, 1, 1, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_WEAPON, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_SECWEAPON, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_SHOULDERS, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_HANDS, NA, NA, NULL);
 	addflag(lastrace->flags, F_NOSPELLS, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_CARNIVORE, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_WANTSOBFLAG, F_EDIBLE, B_COVETS, NA, NULL);
@@ -7988,10 +8077,6 @@ void initrace(void) {
 	addflag(lastrace->flags, F_HASATTACK, OT_CLAWS, NA, NA, "1d5");
 	addflag(lastrace->flags, F_MAXATTACKS, 1, 1, NA, NULL);
 	addflag(lastrace->flags, F_EVASION, 10, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_WEAPON, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_SECWEAPON, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_SHOULDERS, NA, NA, NULL);
-	addflag(lastrace->flags, F_NOBODYPART, BP_HANDS, NA, NA, NULL);
 	addflag(lastrace->flags, F_NOSPELLS, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_CARNIVORE, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_WANTSOBFLAG, F_EDIBLE, B_COVETS, NA, NULL);
@@ -8085,7 +8170,7 @@ void initrace(void) {
 	addflag(lastrace->flags, F_ATTACKRANGE, 1, 2, NA, NULL); // just buzz around
 	addflag(lastrace->flags, F_MORALE, 0, NA, NA, NULL);
 	addflag(lastrace->flags, F_AWARENESS, B_TRUE, NA, NA, NULL);
-	addrace(R_STIRGE, "stirge", 10, 'i', C_BROWN, MT_FLESH, RC_INSECT); 
+	addrace(R_STIRGE, "mosquitoid", 10, 'i', C_BROWN, MT_FLESH, RC_INSECT); 
 	addflag(lastrace->flags, F_INSECT, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_HOSTILE, B_TRUE, NA, NA, NULL);
 	addflag(lastrace->flags, F_STARTATT, A_IQ, IQ_ANIMAL, NA, NULL);

defs.h

@@ -906,9 +906,9 @@ enum JOB {
 	J_WARRIOR,
 	J_COMMANDO,
 	J_DRUID,
+	J_MECHANIC,
 	J_MONK,
 	J_PIRATE,
-	J_PLUMBER,
 	J_PRINCE,
 	J_ROGUE,
 	J_SHOPKEEPER,
@@ -1283,6 +1283,7 @@ enum OBTYPE {
 	OT_A_DARKWALK,
 	OT_A_DISARM,
 	OT_A_FEIGNDEATH,
+	OT_A_FLIP,
 	OT_A_FLURRY,
 	OT_A_GRAB,
 	OT_A_CHARGE,
@@ -2178,6 +2179,8 @@ enum FLAG {
 	F_FALLDISTANCE, // how many floors this lf has fallen through.
 	// ABILITY/SPELL FLAGS / ability flags / spell flags
 	F_FAILEDINSPECT,   // lf has failed an inspect check for item id v0
+	F_TARGETTEDSPELL, // this spell needs you to specify a target cell
+			// v0 is the tt_targettype
 	F_BOOSTSPELL, 	// v0 is active boost spell, v1 is ongoing mpcost, v2 is power
 	F_SWOOPRANGE,	// v0 = how far a flying creature can swoop
 	F_LOSLOF, 	// v0 = whether this spell needs line of sight
@@ -3156,6 +3159,7 @@ typedef struct knowledge_s {
 typedef struct job_s {
 	enum JOB id;
 	char *name;
+	char *desc;
 	flagpile_t *flags;
 	struct job_s *next, *prev;
 } job_t;

flag.c

@@ -425,6 +425,7 @@ int flagcausesstatredraw(lifeform_t *lf, enum FLAG fid) {
 		case F_EATING:
 		case F_FASTMOVE:
 		case F_FLYING:
+		case F_GRAVBOOSTED:
 		case F_HASNEWLEVEL:
 		case F_HIDING:
 		case F_ICESLIDE:

io.c

@@ -7607,7 +7607,7 @@ void handleinput(void) {
 				domsghist();
 				break;
 			case '/': // explain object
-				doexplain("Select glyph to explain (ESC to cancel):");
+				doexplain("Select glyph to explain (v for info, ESC to cancel):");
 				break;
 			case '\\': // list knowledge
 				doknowledgelist();
@@ -8629,7 +8629,7 @@ void showlfstats(lifeform_t *lf, int showall) {
 			isplayer(lf) ? "" : "^WI^ntems " );
 		snprintf(cmdchars, BUFLEN, "@asme%s%s",isplayer(lf) ? "g" : "", isplayer(lf) ? "" : "i");
 	} else {
-		snprintf(promptstr, BUFLEN, "^h[^W@^n=stats ^WE^nffects %s ESC=quit]", isplayer(lf) ? "" : "^WI^ntems ");
+		snprintf(promptstr, BUFLEN, "^h[^W@^n=stats ^WE^nffects %s ^WESC^n=quit]", isplayer(lf) ? "" : "^WI^ntems ");
 		snprintf(cmdchars, BUFLEN, "@ie");
 	}
 
@@ -9147,6 +9147,35 @@ void showlfstats(lifeform_t *lf, int showall) {
 
 				// extra info from lore?
 				if (lorelev >= PR_ADEPT) {
+					int hitstokillyou,hitstokillit;
+					hitstokillit = gethitstokill(player, lf);
+					hitstokillyou = gethitstokill(lf, player);
+					if (hitstokillit || hitstokillyou) {
+						if (hitstokillit == hitstokillyou) {	
+							setcol(mainwin, lorecol);
+							mvwprintw(mainwin, y, 0, "You could both kill each other in %d hit%s.", hitstokillit,
+								(hitstokillit == 1) ? "" : "s");
+							unsetcol(mainwin, lorecol);
+							y++;
+						} else {
+							if (hitstokillit) {	
+								setcol(mainwin, lorecol);
+								mvwprintw(mainwin, y, 0, "You could kill it in %d hit%s.", hitstokillit,
+									(hitstokillit == 1) ? "" : "s");
+								unsetcol(mainwin, lorecol);
+								y++;
+							}
+							if (hitstokillyou) {	
+								setcol(mainwin, lorecol);
+								mvwprintw(mainwin, y, 0, "It could kill you in %d hit%s.", hitstokillyou,
+									(hitstokillyou == 1) ? "" : "s");
+								unsetcol(mainwin, lorecol);
+								y++;
+							}
+						}
+					}
+				}
+				if (lorelev >= PR_SKILLED) {
 					float rating;
 					// get threat rating
 					rating = comparelfs(player, lf);
@@ -9308,8 +9337,7 @@ void showlfstats(lifeform_t *lf, int showall) {
 				wrapprint(mainwin, &y, &x, "%s", buf);
 			}
 
-			// missing body parts?
+			if (!canuseweapons(lf)) {
-			if (lfhasflagval(lf, F_NOBODYPART, BP_WEAPON, NA, NA, NULL)) {
 				wrapprint(mainwin, &y, &x, "%s cannot use weapons.", you(lf));
 			}
 

lf.c

@@ -995,6 +995,13 @@ int cansleep(lifeform_t *lf) {
 	return B_TRUE;
 }
 
+int canuseweapons(lifeform_t *lf) {
+	if (lfhasflag(lf, F_HUMANOID)) {
+		return B_TRUE;
+	}
+	return B_TRUE;
+}
+
 // where == BP_NONE means "can i wear it anywhere?'
 int canwear(lifeform_t *lf, object_t *o, enum BODYPART where) {
 	int i;
@@ -1137,7 +1144,7 @@ int canweild(lifeform_t *lf, object_t *o) {
 		return B_TRUE;
 	}
 
-	if (!lfhasflag(lf, F_HUMANOID)) {
+	if (!canuseweapons(lf)) {
 		reason = E_IMPOSSIBLE;
 		return B_FALSE;
 	} 
@@ -1211,6 +1218,8 @@ int cantakeoff(lifeform_t *lf, object_t *o) {
 
 int castspell(lifeform_t *lf, enum OBTYPE sid, lifeform_t *targlf, object_t *targob, cell_t *targcell) {
 	int rv;
+	int needtovalidate = B_FALSE;
+	int targettype;
 	int cost;
 	flag_t *f,*willflag;
 	int power;
@@ -1294,21 +1303,43 @@ int castspell(lifeform_t *lf, enum OBTYPE sid, lifeform_t *targlf, object_t *tar
 		}
 	}
 
+	// ask for target cell
+	if ((f = hasflag(sp->flags, F_TARGETTEDSPELL)) != NULL) {
+		targettype = f->val[0];
+		needtovalidate = B_TRUE;
+	} else if (targcell) {
+		targettype = TT_NONE;
+		needtovalidate = B_TRUE;
+	}
+
+	if (needtovalidate) {
+		if (!validatespellcell(lf, &targcell,targettype, sid, power, B_FALSE)) {
+			if (isplayer(lf)) msg("Cancelled.");
+			return B_TRUE;
+		}
+	}
+
+	// stop hiding
+	killflagsofid(lf->flags, F_HIDING);
 	// take time
 	taketime(lf, getspellspeed(lf));
-
 	// lose mp
 	losemp(lf, cost);
 
+	// spell fails?
 	// miscast chance?
 	if (isplayer(lf) && !hasjob(lf, J_GOD)) {
 		if (pctchance(getmiscastchance(lf))) {
 			msg("^WYour cumbersome armour makes you miscast your spell!");
 			return B_FALSE;
 		}
-	}
+	} 
-	
 
+	// adjust power?
+	if (hasjob(lf, J_DRUID)) {
+		power += countplantsinsight(lf);
+		limit(&power, NA, 10);
+	}
 	if (getmr(lf) && skillcheck(lf, SC_RESISTMAG, 20 + power, 0)) {
 		if (power > 1) {
 			// half strength
@@ -1321,6 +1352,7 @@ int castspell(lifeform_t *lf, enum OBTYPE sid, lifeform_t *targlf, object_t *tar
 		}
 	}
 
+
 	// announce
 	if (!isplayer(lf)) {
 		if (cansee(player, lf)) {
@@ -1361,15 +1393,6 @@ int castspell(lifeform_t *lf, enum OBTYPE sid, lifeform_t *targlf, object_t *tar
 		}
 	}
 
-	// boost power?
-	if (hasjob(lf, J_DRUID)) {
-		power += countplantsinsight(lf);
-		limit(&power, NA, 10);
-	}
-
-	// stop hiding
-	killflagsofid(lf->flags, F_HIDING);
-
 	// willing this spell? reset counter!
 	// do this _before_ casting the spell,
 	// in case the spell causes us to lose
@@ -1430,6 +1453,8 @@ int castspell(lifeform_t *lf, enum OBTYPE sid, lifeform_t *targlf, object_t *tar
 
 	// successful cast?
 	if (!rv) {
+		// TODO: charge mp
+
 		practice(lf, SK_SPELLCASTING, 1);
 		if (isplayer(lf)) {
 			switch (getschool(sid)) {
@@ -1658,7 +1683,7 @@ int check_rest_ok(lifeform_t *lf) {
 float comparelfs(lifeform_t *lf1, lifeform_t *lf2) {
 	float avgdam[2]; 
 	lifeform_t *lf[2];
-	float turnstokill[2];
+	float avgturnstokill[2];
 	int i;
 	float ratio;
 	lf[0] = lf1;
@@ -1672,15 +1697,14 @@ float comparelfs(lifeform_t *lf1, lifeform_t *lf2) {
 		avgdam[i] -= pctof(otherevasion, avgdam[i]);
 		// divide other lf's hit points by this lf's avg dam
 		if (avgdam[i] == 0) {
-			turnstokill[1-i] = 9999;
+			avgturnstokill[1-i] = 9999;
 		} else {
-			turnstokill[1-i] = (float)lf[1-i]->hp / avgdam[i];
+			avgturnstokill[1-i] = (float)lf[1-i]->hp / avgdam[i];
 		}
 	}
 	
-	// compare turnstokill values
+	// compare avgturnstokill values
-	ratio = (turnstokill[0] / turnstokill[1]);
+	ratio = (avgturnstokill[0] / avgturnstokill[1]);
-	
 
 	return ratio;
 }
@@ -5158,6 +5182,23 @@ int gethitdicerace(race_t *r) {
 	return 1;
 }
 
+int gethitstokill(lifeform_t *lf, lifeform_t *victim) {
+	object_t *wep[MAXCANDIDATES];
+	flag_t *damflag[MAXCANDIDATES];
+	obpile_t *op = NULL;
+	int nweps = 0,hitstokill = 0;
+	getweapons(lf, wep, damflag, NULL, &op, &nweps);
+	if (nweps) {
+		int maxdam;
+		getdamrange(damflag[0], NULL, &maxdam);
+		hitstokill = victim->hp / maxdam;
+		limit(&hitstokill, 1, NA);
+	}
+	if (op) killobpile(op);
+	return hitstokill;
+}
+
+
 int gethppct(lifeform_t *lf) {
 	float pct;
 	pct = (int)(((float)lf->hp / (float)lf->maxhp) * 100);
@@ -5896,15 +5937,19 @@ int getmovespeed(lifeform_t *lf) {
 		} else if ((f->id == F_FASTMOVE) || (f->id == F_FASTACTMOVE)) {
 			speed -= f->val[0];
 		} else if (f->id == F_INJURY) {
-			switch (f->val[0]) {
+			if (!isairborne(lf)) {	
-				case IJ_LEGBROKEN:
+				switch (f->val[0]) {
-				case IJ_HAMSTRUNG:
+					case IJ_LEGBROKEN:
-					speed += 10; break;
+					case IJ_HAMSTRUNG:
-				case IJ_LEGBRUISE:
+						speed += 10; break;
-					speed += 5; break;
+					case IJ_LEGBRUISE:
+						speed += 5; break;
+				}
 			}
 		} else if (f->id == F_SPRINTING) {
-			speed -= 10;
+			if (!isairborne(lf)) {	
+				speed -= 10;
+			}
 		}
 	}
 
@@ -6969,7 +7014,6 @@ int getturnspeed(lifeform_t *lf) {
 	return speed;
 }
 
-
 void getwantdistance(lifeform_t *lf, lifeform_t *victim, int *min, int *max, int attacking) {
 	flag_t *f;
 	// default - run into them
@@ -7020,6 +7064,59 @@ object_t *getweapon(lifeform_t *lf) {
 	return NULL;
 }
 
+// this function MIGHT allocat op!
+int getweapons(lifeform_t *lf, object_t **wep, flag_t **damflag, int *lastweaponidx, obpile_t **op, int *nweps) {
+	int gotweapon = B_FALSE;
+        flag_t *retflag[MAXCANDIDATES],*f;
+        int nretflags,i;
+	// first use our weapon...
+	*nweps = 0;
+	wep[*nweps] = getweapon(lf);
+	if (wep[*nweps]) {
+		if (damflag) damflag[*nweps] = hasflag(wep[*nweps]->flags, F_DAM);
+		if (lastweaponidx) *lastweaponidx = 0;
+		(*nweps)++;
+		gotweapon = B_TRUE;
+	}
+
+	// if we are skilled at twoweaponing, we can attack with our second weapon
+	// as well, with a possible accuracy penalty depending on our skill level.
+	if (getskill(lf, SK_TWOWEAPON)) {
+		wep[*nweps] = getsecmeleeweapon(lf);
+		if (wep[*nweps]) {
+			if ((*nweps >= 1) && (wep[*nweps] == wep[(*nweps)-1])) {
+				// can't be the same as first one
+			} else {
+				if (damflag) damflag[*nweps] = hasflag(wep[*nweps]->flags, F_DAM);
+				if (lastweaponidx) *lastweaponidx = *nweps;
+				(*nweps)++;
+				gotweapon = B_TRUE;
+			}
+		}
+	}
+
+	// then use all our innate attacks..
+	getflags(lf->flags, retflag, &nretflags, F_HASATTACK, F_NONE);
+	for (i = 0; i < nretflags; i++) {
+		f = retflag[i];
+		if (f->id == F_HASATTACK) {
+			objecttype_t *ot;
+
+			if (!(*op)) {
+				*op = addobpile(NULL, NULL, NULL);
+			}
+
+			ot = findot(f->val[0]);
+			if (ot) {
+				wep[*nweps] = addobfast(*op, ot->id);
+				if (damflag) damflag[*nweps] = f;
+				(*nweps)++;
+			}
+		}
+	}
+	return gotweapon;
+}
+
 enum SKILLLEVEL getweaponskill(lifeform_t *lf, object_t *o) {
 	skill_t *sk;
 	sk = getobskill(o);
@@ -9105,7 +9202,7 @@ object_t *isstuck(lifeform_t *lf) {
 	return NULL;
 }
 
-job_t *addjob(enum JOB id, char *name) {
+job_t *addjob(enum JOB id, char *name, char *desc) {
         job_t *a;
 
         // add to the end of the list 
@@ -9126,6 +9223,7 @@ job_t *addjob(enum JOB id, char *name) {
 	// props
 	a->id = id;
 	a->name = strdup(name);
+	a->desc = strdup(desc);
 
 	a->flags = addflagpile(NULL, NULL);
 	return a;
@@ -14670,6 +14768,21 @@ int useability(lifeform_t *lf, enum OBTYPE aid, lifeform_t *who, cell_t *where)
 	
 	cwflag = lfhasflagval(lf, F_CANWILL, aid, NA, NA, NULL);
 	rv = abilityeffects(lf, aid, where, who, cwflag);
+
+	if (!rv) {
+		objecttype_t *ot;
+		flag_t *f;
+		int stamcost = 0;
+		// success - charge stamina
+		ot = findot(aid);
+		f = hasflag(ot->flags, F_STAMCOST);
+		if (f) stamcost = f->val[0];
+		if (stamcost) {
+			modstamina(lf, -stamcost);
+		}
+		
+	}
+
 	return rv;
 }
 
@@ -15497,14 +15610,20 @@ int wear(lifeform_t *lf, object_t *o) {
 						inway = getequippedob(lf->pack, f->val[0]);
 						getobname(inway,buf, 1);
 						if (isplayer(lf)) {
-							int ch;
+							int ch = '\0';
 							char buf2[BUFLEN];
 							if (inway->blessknown && iscursed(inway)) {
 								msg("You cannot remove your %s.", noprefix(buf));
 							} else {
 								// take offending item off first - this takes extra time.
 								snprintf(buf2, BUFLEN, "Remove your %s",noprefix(buf));
-								ch = askchar(buf2, "yn","y", B_TRUE);	
+								while (!ch) {
+									ch = askchar(buf2, "yn?","y", B_TRUE);	
+									if (ch == '?') {
+										describeob(o);
+										ch = '\0';
+									}
+								}
 								if (ch == 'y') {
 									if (isarmour(inway)) {
 										if (!takeoff(player, inway)) {
@@ -15774,7 +15893,7 @@ int weild(lifeform_t *lf, object_t *o) {
 			if (isarmour(oo)) {
 				char inwayname[BUFLEN];
 				char buf2[BUFLEN];
-				char ch;
+				char ch = '\0';
 				if (isplayer(lf)) {
 					if (oo->blessknown && iscursed(oo)) {
 						msg("You cannot remove your %s.", noprefix(inwayname));
@@ -15783,7 +15902,13 @@ int weild(lifeform_t *lf, object_t *o) {
 						getobname(oo, inwayname, oo->amt);
 						// prompt before taking it off.
 						snprintf(buf2, BUFLEN, "Remove your %s",noprefix(inwayname));
-						ch = askchar(buf2, "yn","y", B_TRUE);	
+						while (!ch) {
+							ch = askchar(buf2, "yn?","y", B_TRUE);	
+							if (ch == '?') {
+								describeob(o);
+								ch = '\0';
+							}
+						}
 					}
 				} else {
 					ch = 'y';

lf.h

@@ -2,7 +2,7 @@
 
 lifeform_t *addlf(cell_t *cell, enum RACE rid, int level);
 lifeform_t *real_addlf(cell_t *cell, enum RACE rid, int level, int controller);
-job_t *addjob(enum JOB id, char *name);
+job_t *addjob(enum JOB id, char *name, char *desc);
 race_t *addrace(enum RACE id, char *name, float weight, char glyph, int glyphcolour, enum MATERIAL mat, enum RACECLASS raceclass);
 raceclass_t *addraceclass(enum RACECLASS id, char *name, char *pluralname, enum SKILL skill);
 skill_t *addskill(enum SKILL id, char *name, char *desc, int traintime);
@@ -42,6 +42,7 @@ int canquaff(lifeform_t *lf, object_t *o);
 int cansee(lifeform_t *viewer, lifeform_t *viewee);
 int cansee_real(lifeform_t *viewer, lifeform_t *viewee, int uselos);
 int cansleep(lifeform_t *lf);
+int canuseweapons(lifeform_t *lf);
 int canwear(lifeform_t *lf, object_t *o, enum BODYPART where);
 int canweild(lifeform_t *lf, object_t *o);
 int cantakeoff(lifeform_t *lf, object_t *o);
@@ -135,6 +136,7 @@ int gethearingrange(lifeform_t *lf);
 int gethidemodifier(lifeform_t *lf);
 int gethitdice(lifeform_t *lf);
 int gethitdicerace(race_t *r);
+int gethitstokill(lifeform_t *lf, lifeform_t *victim);
 int gethppct(lifeform_t *lf);
 enum COLOUR gethungercol(enum HUNGER hlev);
 enum HUNGER gethungerlevel(int hunger);
@@ -218,6 +220,7 @@ int getthrowspeed(int str);
 int getturnspeed(lifeform_t *lf);
 void getwantdistance(lifeform_t *lf, lifeform_t *victim, int *min, int *max, int attacking);
 object_t *getweapon(lifeform_t *lf);
+int getweapons(lifeform_t *lf, object_t **wep, flag_t **damflag, int *lastweaponidx, obpile_t **op, int *nweps);
 enum SKILLLEVEL getweaponskill(lifeform_t *lf, object_t *o);
 long getxpforlev(int level);
 void givejob(lifeform_t *lf, enum JOB jobid);

map.c

@@ -3794,7 +3794,7 @@ void explodecells(cell_t *c, int dam, int killwalls, object_t *o, int range, int
 					}
 					
 					// move away from centre of explosion
-					knockback(cc->lf, getdiraway(cc, c, NULL, B_FALSE, DT_COMPASS, B_FALSE), 2, NULL, 40-(mydist*10));
+					knockback(cc->lf, getdiraway(cc, c, NULL, B_FALSE, DT_COMPASS, B_FALSE), 2, NULL, 40-(mydist*10), B_TRUE);
 				}
 			}
 		}

move.c

@@ -706,7 +706,7 @@ int getwalkoffdir(lifeform_t *lf, int dir) {
 }
 
 // use 'n/a' for zero chance of falling. 0 means 'calculate based on distance'
-int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallcheckdiff) {
+int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallcheckdiff, int wantannounce) {
 	int i,dam;
 	char lfname[BUFLEN];
 	char newlfname[BUFLEN];
@@ -748,7 +748,7 @@ int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallc
 	
 	for (i = 0; i < howfar; i++) {
 		if (moveclear(lf, dir, &reason)) {
-			if ((i == 0) && seen) {
+			if ((i == 0) && seen && wantannounce) {
 				msg("%s %s knocked backwards!",lfname,is(lf));
 			}
 			trymove(lf, dir, B_FALSE, B_FALSE);
@@ -805,7 +805,7 @@ int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallc
 							fallcheckdiff += (momentumleft*5);
 						}
 						// confer our remaining momentum on to them 
-						knockback(newcell->lf, dir, momentumleft, lf, fallcheckdiff); // NOTE: recursive call
+						knockback(newcell->lf, dir, momentumleft, lf, fallcheckdiff, B_TRUE); // NOTE: recursive call
 					}
 					break;
 				default:
@@ -2600,28 +2600,45 @@ int trymove(lifeform_t *lf, int dir, int onpurpose, int strafe) {
 					// failed?
 					return B_TRUE;
 				}
-				if (canswapwith(lf, cell->lf)) {
+				// walking backwards/sideways into someone
-					lifeform_t *lfinway;
+				if (!lfhasflag(lf, F_AWARENESS) && (getrelativedir(lf, dir) != RD_FORWARDS)) {
-					// otherwise swap locations.
+					char lfname[BUFLEN];
-					lfinway = cell->lf;
+					char inwayname[BUFLEN];
-
+					getlfname(cell->lf, inwayname);
 					if (isplayer(lf)) {
-						char lfname[BUFLEN];
+						msg("You bump into %s.", inwayname);
-						getlfname(lfinway, lfname);
+					} else if (isplayer(cell->lf)) {
-						msg("You swap places with %s.", lfname);
+						getlfname(lf, lfname);
-						dontclearmsg = B_TRUE;
+						msg("%s bumps into you.", lfname);
+					} else if (cansee(player, lf)) {
+						getlfname(lf, lfname);
+						msg("%s bumps into %s.", lfname, inwayname);
 					}
-
-					swapplaces(lf, lfinway, B_FALSE, onpurpose);
-
 					if (onpurpose) taketime(lf, getmovespeed(lf));
-
 				} else {
-					if (!onpurpose || canandwillmove(lf, dir, &errcode)) {
+					if (canswapwith(lf, cell->lf)) {
-						return attackcell(lf, cell, B_FALSE);
+						lifeform_t *lfinway;
+						// otherwise swap locations.
+						lfinway = cell->lf;
+
+						if (isplayer(lf)) {
+							char lfname[BUFLEN];
+							getlfname(lfinway, lfname);
+							msg("You swap places with %s.", lfname);
+							dontclearmsg = B_TRUE;
+						}
+
+						swapplaces(lf, lfinway, B_FALSE, onpurpose);
+
+						if (onpurpose) taketime(lf, getmovespeed(lf));
+
 					} else {
-						// won't attack for some reason.
+						if (!onpurpose || canandwillmove(lf, dir, &errcode)) {
-						return B_TRUE;
+							return attackcell(lf, cell, B_FALSE);
+						} else {
+							// won't attack for some reason.
+							return B_TRUE;
+						}
 					}
 				}
 				break;

move.h

@@ -12,7 +12,7 @@ int dorandommove(lifeform_t *lf, int badmovesok, int restonfail);
 int getdiraway(cell_t *src, cell_t *dst, lifeform_t *srclf, int wantcheck, int dirtype, int keepinlof);
 int getdirtowards(cell_t *src, cell_t *dst, lifeform_t *srclf, int wantcheck, int dirtype);
 int getwalkoffdir(lifeform_t *lf, int dir);
-int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallcheckdiff);
+int knockback(lifeform_t *lf, int dir, int howfar, lifeform_t *pusher, int fallcheckdiff, int wantannounce);
 int makeorthogonal(int dir);
 int moveawayfrom(lifeform_t *lf, cell_t *dst, int dirtype, int keepinlof, int strafe);
 int moveclear(lifeform_t *lf, int dir, enum ERROR *error);

nexus.c

@@ -217,7 +217,7 @@ int main(int argc, char **argv) {
 			ch = 'a';
 			for (j = firstjob ; j ; j = j->next) {
 				if (!hasflag(j->flags, F_NOPLAYER)) {
-					addchoice(&prompt, ch++, j->name, NULL, j, NULL);
+					addchoice(&prompt, ch++, (j->id == J_GOD) ? "Diety (for debugging)" : j->name, NULL, j, j->desc);
 				}
 			}
 			j = NULL;

objects.c

@@ -9123,6 +9123,9 @@ int readsomething(lifeform_t *lf, object_t *o) {
 			}
 		} else if (o->type->id == OT_SCR_AWARENESS) {
 			addtempflag(lf->flags, F_AWARENESS, B_TRUE, NA, NA, NULL, getspellduration(30,60,o->blessed));
+			if (isplayer(lf)) msg("The scroll crumbles to dust.");
+			// removeob one of the object
+			removeob(o, 1);
 		} else if (o->type->id == OT_SCR_NOTHING) {
 			if (isplayer(lf)) {
 				msg("The scroll crumbles to dust.");
@@ -9866,8 +9869,8 @@ int real_takedamage(object_t *o, unsigned int howmuch, int damtype, int wantanno
 		if (o->material->id == MT_GLASS) {
 			char buf[BUFLEN];
 			char buf2[BUFLEN];
-			getobname(o, buf2, 1);
+			real_getobname(o, buf2, 1, B_FALSE, B_FALSE, B_FALSE, B_FALSE, B_FALSE);
-			snprintf(buf, BUFLEN, "a shattering %s", buf2);
+			snprintf(buf, BUFLEN, "a shattering %s", noprefix(buf2));
 			shatter(o, B_TRUE, buf, B_FALSE);
 			return howmuch;
 		}
@@ -10606,7 +10609,7 @@ int fireat(lifeform_t *thrower, object_t *o, int amt, cell_t *where, int speed,
 		if ((getobunitweight(o)*amt) >= getlfweight(target, B_NOOBS)) {
 			int dir;
 			dir = getdirtowards(srcloc, target->cell, target, B_FALSE, DT_COMPASS);
-			knockback(target, dir, 1, thrower, 0);
+			knockback(target, dir, 1, thrower, 0, B_TRUE);
 		}
 	}