add goon crawl

chroot/data/menus/experimental.txt

@@ -12,7 +12,8 @@ branches may cause the loss of existing games, and branches may be removed
 without warning: don't get too attached to your character. Thanks for helping!
 
 D) Dynamic Monsters! (As monsters track you, they can become more scary)
-H) HellCrawl! (Unofficial Crawl Fork, created by hellmonk)
+H) HellCrawl! (Features: less experience. Unfeatures: everything tavern hates)
+G) GoonCrawl! (Crawl, designed by committee)
 
 A) Advanced Options (create save backup for experimental versions)
 

chroot/data/menus/experimental_adv.txt

@@ -13,6 +13,7 @@ Select the experimental version you wish to backup
 
 D) Dpegs Dynamic Monsters
 H) HellCrawl
+G) GoonCrawl
 
 q) Return to previous menu
 

config.py

@@ -462,6 +462,18 @@
         inprogress_path = "%%CHROOT_INPROGRESSDIR%%/crawl-hellcrawl-cbro/",
         ttyrec_path = "%%CHROOT_TTYRECDIR%%/%n/",
 	socket_path = "%%CHROOT_WEBDIR%%/sockets")),
+
+   ("dcss-gooncrawl-cbro", dict(
+        name = "GoonCrawl! (Crawl, but designed by committee)",
+        crawl_binary = "/bin/crawl-stable-launcher.sh",
+  	separator = "<br>",
+        pre_options  = [ "gooncrawl-cbro" ],
+        rcfile_path = "%%CHROOT_RCFILESDIR%%/crawl-git/",
+        macro_path = "%%CHROOT_RCFILESDIR%%/crawl-git/",
+        morgue_path = "%%CHROOT_MORGUEDIR%%/%n/",
+        inprogress_path = "%%CHROOT_INPROGRESSDIR%%/crawl-gooncrawl-cbro/",
+        ttyrec_path = "%%CHROOT_TTYRECDIR%%/%n/",
+	socket_path = "%%CHROOT_WEBDIR%%/sockets")),
 
 ])
 

crawl-build/update-crawl-stable-build.sh

@@ -3,7 +3,7 @@ VERSION=${1:-0.11}
 
 # Quoting for =~ changed from bash 3.0 to 3.2; using a variable for the
 # regexp works with both.
-VERS_RE='^[0-9]+.[0-9]+|nostalgia|frogs|hellcrawl-cbro|cyno-PR|dpegs_dynamic_monsters|councilgod-PR|councilgod|adrenaline_rush|thorn_god|basajaun|salamander|faithful|evoker-god-rebase|orcs_and_elves|combo_god|abyssrun|evoker-god|imp|bearkin|squarelos-0.17|mulch_ado_about_nothing|no_backtracking_god$'
+VERS_RE='^[0-9]+.[0-9]+|nostalgia|frogs|gooncrawl-cbro|hellcrawl-cbro|cyno-PR|dpegs_dynamic_monsters|councilgod-PR|councilgod|adrenaline_rush|thorn_god|basajaun|salamander|faithful|evoker-god-rebase|orcs_and_elves|combo_god|abyssrun|evoker-god|imp|bearkin|squarelos-0.17|mulch_ado_about_nothing|no_backtracking_god$'
 if [[ ! $VERSION =~ $VERS_RE ]]; then
     echo "Bad crawl version $VERSION"
     exit 1

dgamelaunch.conf

@@ -402,6 +402,7 @@ menu["experimental"] {
   bannerfile = "%%CHROOT_DGLDIR%%/data/menus/experimental.txt"
   commands["dD"] = play_game "dcss-dpegs_dynamic_monsters"
   commands["hH"] = play_game "dcss-hellcrawl-cbro"
+  commands["gG"] = play_game "dcss-gooncrawl-cbro"
   commands["qQ"] = return
   commands["A"] = submenu "crawl-experimental-adv"
 }
@@ -414,6 +415,9 @@ menu["crawl-experimental-adv"] {
   commands["H"] =
     exec "/bin/savegame-backup.sh" "%n crawl-hellcrawl-cbro %%CHROOT_CRAWL_BASEDIR%%",
     return
+  commands["G"] =
+    exec "/bin/savegame-backup.sh" "%n crawl-gooncrawl-cbro %%CHROOT_CRAWL_BASEDIR%%",
+    return
   commands["qQ"] = return
 }
 
@@ -2565,6 +2569,43 @@ DEFINE {
   encoding = "UTF-8"
 }
 
+DEFINE {
+  game_path = "/bin/crawl-stable-launcher.sh"
+  game_name = "Crawl (gooncrawl-cbro)"
+  short_name = "dcss-gooncrawl-cbro"
+
+  game_args = "/bin/crawl-stable-launcher.sh", "gooncrawl-cbro",
+              "-name", "%n",
+              "-rc", "%rrcfiles/crawl-git/%n.rc",
+              "-macro", "%rrcfiles/crawl-git/%n.macro",
+              "-webtiles-socket", "%%CHROOT_CRAWL_BASEDIR%%/webserver/sockets/%n:dcss-gooncrawl-cbro.sock",
+              "-morgue", "%rmorgue/%n/"
+
+  extra_info_file = "%rmorgue/%n/%n.dglwhere"
+
+  #
+  # From inside the jail, where dgamelaunch should put mail - should
+  # match up with the game's settings.
+  spooldir = "%%CHROOT_MAILSPOOL%%/"
+
+  max_idle_time = 3600
+
+  # make sure the inprogress dir actually exists. default is "inprogress/"
+  # each game you define here must have it's own.
+  inprogressdir = "%rinprogress/crawl-gooncrawl-cbro/"
+  ttyrecdir = "%%CHROOT_TTYRECDIR%%/%n/"
+
+  commands =
+    ifnxcp "%rdata/crawl-git.macro" "%rrcfiles/crawl-git/%n.macro",
+    ifnxcp "%rdata/crawl-git-settings/init.txt" "%rrcfiles/crawl-git/%n.rc",
+    setenv "MAIL" "%%CHROOT_MAILSPOOL%%/%n",
+    setenv "SIMPLEMAIL" "1",
+    unlink "%%CHROOT_MAILSPOOL%%/%n",
+    mkdir "%rmorgue/%n/"
+
+  encoding = "UTF-8"
+}
+
 DEFINE {
   game_path = "/bin/crawl-stable-launcher.sh"
   game_name = "Crawl (frogs)"

utils/trigger-rebuild.pl

@@ -151,10 +151,10 @@ ()
   my $ver = param('v');
 
   if (not $ver) {
-    do_prompt 'trunk', '0.13', '0.14', '0.15', '0.16', '0.17', '0.18', '0.19', '0.20', '0.21', 'nostalgia', 'frogs','hellcrawl-cbro','cyno-PR','dpegs_dynamic_monsters','councilgod-PR', 'adrenaline_rush','thorn_god', 'basajaun', 'salamander', 'no_backtracking_god','evoker-god-rebase','orcs_and_elves','combo_god','abyssrun', 'evoker-god', 'imp', 'bearkin', 'mulch_ado_about_nothing', 'squarelos-0.17', 'faithful';
+    do_prompt 'trunk', '0.13', '0.14', '0.15', '0.16', '0.17', '0.18', '0.19', '0.20', '0.21', 'nostalgia', 'frogs','gooncrawl-cbro', 'hellcrawl-cbro','cyno-PR','dpegs_dynamic_monsters','councilgod-PR', 'adrenaline_rush','thorn_god', 'basajaun', 'salamander', 'no_backtracking_god','evoker-god-rebase','orcs_and_elves','combo_god','abyssrun', 'evoker-god', 'imp', 'bearkin', 'mulch_ado_about_nothing', 'squarelos-0.17', 'faithful';
   } elsif ($ver eq 'trunk') {
     do_update 'trunk';
-  } elsif ($ver =~ /^0.1[3456789]|^0.2[01]|evoker-god-rebase|orcs_and_elves|combo_god|abyssrun|nostalgia|frogs|hellcrawl-cbro|cyno-PR|dpegs_dynamic_monsters|councilgod-PR|councilgod|adrenaline_rush|thorn_god|basajaun|salamander|faithful|evoker-god|imp|bearkin|squarelos-0.17|mulch_ado_about_nothing|no_backtracking_god$/) {
+  } elsif ($ver =~ /^0.1[3456789]|^0.2[01]|evoker-god-rebase|orcs_and_elves|combo_god|abyssrun|nostalgia|frogs|gooncrawl-cbro|hellcrawl-cbro|cyno-PR|dpegs_dynamic_monsters|councilgod-PR|councilgod|adrenaline_rush|thorn_god|basajaun|salamander|faithful|evoker-god|imp|bearkin|squarelos-0.17|mulch_ado_about_nothing|no_backtracking_god$/) {
 
     do_update 'stable', $ver;
   } else {