Fine-tuned Sif Muna piety numbers a little more.

Moved Channel Energy from Vehumet to Sif Muna at 30 piety.
Tweaked ammo destruction numbers. Needles are 1 in 6, stones 1 in 4, darts 1 in 3 and bolts 1 in 4.
Changed salamander flame-brand check from check-for-bow to check-for-launcher.
Vorpal launchers now work for monsters, launcher base damage is taken into account for monsters.
Halved frequency of Okawaru ammo drops.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@125 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 4 deletions

diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index 91900bcdb3..744661acf8 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -37,7 +37,7 @@ static int real_god_power( int religion, int idx ) {
 	    return -1;
 	return idx-1;	
     case GOD_VEHUMET:
-	return ( idx == 4 ? -1 : idx );
+	return ( idx > 3 ? -1 : idx );
     case GOD_OKAWARU:
 	if ( idx < 2 )
 	    return idx;
@@ -45,9 +45,9 @@ static int real_god_power( int religion, int idx ) {
 	    return -1;
 	return idx - 2;
     case GOD_SIF_MUNA:
-	if ( idx == 0 || idx == 2 || idx == 4 ) return -1;
-	if ( idx == 1 ) return 0;
-	if ( idx == 3 ) return 1;
+	if ( idx == 2 || idx == 4 ) return -1;
+	if ( idx < 2 ) return idx;
+	if ( idx == 3 ) return 2;
     case GOD_TROG:
 	if ( idx == 2 || idx == 4 ) return -1;
 	if ( idx < 2 ) return idx;