Merge branch 'master' into vehumet
authorRaphael Langella <raphael.langella@gmail.com>
Mon, 11 Jun 2012 21:52:30 +0000 (23:52 +0200)
committerRaphael Langella <raphael.langella@gmail.com>
Mon, 11 Jun 2012 21:52:30 +0000 (23:52 +0200)
Conflicts:
crawl-ref/source/dat/descript/ability.txt
crawl-ref/source/dat/descript/gods.txt
crawl-ref/source/religion.cc

13 files changed:
1  2 
crawl-ref/source/abl-show.cc
crawl-ref/source/dat/descript/ability.txt
crawl-ref/source/dat/descript/gods.txt
crawl-ref/source/defines.h
crawl-ref/source/describe.cc
crawl-ref/source/enum.h
crawl-ref/source/godabil.cc
crawl-ref/source/main.cc
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/religion.cc
crawl-ref/source/religion.h
crawl-ref/source/wiz-you.cc

Simple merge
@@@ -114,7 -204,12 +204,12 @@@ much the better; if not, well, there'l
  %%%%
  Vehumet powers
  
- Worshippers of Vehumet will quickly be able to recover their magical energy upon killing beings. As they gain favour, they will also gain various enhancements to their destructive spells - firstly, assistance in casting such spells; then increased range for conjurations; and finally a lowered cost for casting higher level destructive spells. Vehumet will offer followers the knowledge of increasingly destructive spells as they gain piety.
+ Worshippers of Vehumet will quickly be able to recover their magical energy
+ upon killing beings. As they gain favour, they will also gain various
+ enhancements to their destructive spells - firstly, assistance in casting such
+ spells; then increased range for conjurations; and finally a lowered cost for
 -casting higher level destructive spells. Eventually, Vehumet will gift
 -followers rare books of destructive magic.
++casting higher level destructive spells. Vehumet will offer followers the
++knowledge of increasingly destructive spells as they gain piety.
  %%%%
  Okawaru powers
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2387,15 -2268,16 +2388,12 @@@ bool do_god_gift(bool forced
                      simple_god_message(" grants you a gift!");
                      more();
  
-                     // HACK: you.num_total_gifts keeps track of
-                     // Necronomicon and weapon blessing for Kiku, so
-                     // don't increase it.  Also, timeouts are
-                     // meaningless for Kiku. evk
+                     you.num_current_gifts[you.religion]++;
+                     you.num_total_gifts[you.religion]++;
+                     // Timeouts are meaningless for Kiku.
                      if (you.religion != GOD_KIKUBAAQUDGHA)
                      {
 -                        // Vehumet gives books less readily.
 -                        if (you.religion == GOD_VEHUMET)
 -                            _inc_gift_timeout(10 + random2(10));
 -
                          _inc_gift_timeout(40 + random2avg(19, 2));
-                         you.num_current_gifts[you.religion]++;
-                         you.num_total_gifts[you.religion]++;
                      }
                      take_note(Note(NOTE_GOD_GIFT, you.religion));
                  }
Simple merge
Simple merge