[Freedroid-cvslog] SF.net SVN: freedroid:[2875] src/enemy.c

[<sal...@us...>]

Revision: 2875
          http://freedroid.svn.sourceforge.net/freedroid/?rev=2875&view=rev
Author:   salimiles
Date:     2010-05-30 21:38:19 +0000 (Sun, 30 May 2010)

Log Message:
-----------
Set a faction to be hostile with you if you hit one of their members too hard. Fix to bug ID: 3009110 .

Modified Paths:
--------------
    src/enemy.c

Modified: src/enemy.c
===================================================================
--- src/enemy.c	2010-05-30 16:35:48 UTC (rev 2874)
+++ src/enemy.c	2010-05-30 21:38:19 UTC (rev 2875)
@@ -905,9 +905,16 @@
 	 * check if droid is dead
 	 */
 
-	// no XP is given for killing a friendly bot
-	if (is_friendly(target->faction, FACTION_SELF) && givexp)
-		givexp = 0;
+	if (is_friendly(target->faction, FACTION_SELF) ) {
+		// no XP is given for killing a friendly bot
+		if (givexp) {
+			givexp = 0;
+		}
+		// do not keep bots friendly if you cause a hit of >2% damage
+		if ((killertype == -1) && (hit / Druidmap[target->type].maxenergy >= 0.02)){
+			set_faction_state(target->faction, FACTION_SELF, HOSTILE);
+		}
+	}
 
 	// spray blood
 	if (hit > 1 && MyRandom(6) == 1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.