[crawl-ref-commits] stone_soup-0.9 branch updated: 0.9.0-24-gd9698e1

[<gi...@cr...>]

       via  d9698e19fe3bea020a562eaed45cd7afc90b002a (commit)
       via  e8ad7bc799cc323d2fc8ff573b783134231abf68 (commit)
       via  951a52237e03dc099556b3628c800eb9fb6cff0a (commit)
      from  23aabfa6a2f429adab038af24d3e89e317722450 (commit)

-----------------------------------------------------------------------
commit d9698e19fe3bea020a562eaed45cd7afc90b002a
Author: Adam Borowski <kil...@an...>
Date:   Wed Aug 31 01:00:44 2011 +0200

    A dummy edit to variable/large.des so the timestamp is updated.
    
    Otherwise, someone for whom entry/large.des got into the cache won't see it.

commit e8ad7bc799cc323d2fc8ff573b783134231abf68
Author: Adam Borowski <kil...@an...>
Date:   Wed Aug 31 00:57:22 2011 +0200

    Don't list Octopodes in aptitudes.txt

commit 951a52237e03dc099556b3628c800eb9fb6cff0a
Author: Adam Borowski <kil...@an...>
Date:   Wed Aug 31 00:48:46 2011 +0200

    Rename entry/large.des so it doesn't conflict with variable/large.des
    
    The real cause for this bug will be fixed in trunk.

-----------------------------------------------------------------------

Summary of changes:
 .../dat/des/entry/{large.des => entry_large.des}   |    0
 crawl-ref/source/dat/des/variable/large.des        |    1 +
 crawl-ref/source/util/gen-apt.pl                   |    1 +
 3 files changed, 2 insertions(+), 0 deletions(-)
 rename crawl-ref/source/dat/des/entry/{large.des => entry_large.des} (100%)

diff --git a/crawl-ref/source/dat/des/entry/large.des b/crawl-ref/source/dat/des/entry/entry_large.des
similarity index 100%
rename from crawl-ref/source/dat/des/entry/large.des
rename to crawl-ref/source/dat/des/entry/entry_large.des
diff --git a/crawl-ref/source/dat/des/variable/large.des b/crawl-ref/source/dat/des/variable/large.des
index f287ab1..65ce4de 100644
--- a/crawl-ref/source/dat/des/variable/large.des
+++ b/crawl-ref/source/dat/des/variable/large.des
@@ -50,6 +50,7 @@ ENDMAP
 
 ###############################################################################
 # Castle of kobolds and goblins
+#
 NAME:    minmay_goblin_kobold_castle
 TAGS:    no_rotate
 ORIENT:  north
diff --git a/crawl-ref/source/util/gen-apt.pl b/crawl-ref/source/util/gen-apt.pl
index 3f7a1bf..bcee4a1 100755
--- a/crawl-ref/source/util/gen-apt.pl
+++ b/crawl-ref/source/util/gen-apt.pl
@@ -189,6 +189,7 @@ sub load_aptitudes {
     else {
       if (/APT\(\s*SP_(\w+)\s*,\s*SK_(\w+)\s*,\s*(-?\d+)\s*\)/) {
         $species = propercase_string(fix_underscores($1));
+        next if $species eq "Octopode";
         if (!$SEEN_SPECIES{$species}) {
           $SEEN_SPECIES{$species} = 1;
           push @SPECIES, $species;


-- 
Dungeon Crawl Stone Soup