INcorporated pak64.svcifi insto installer

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6378 8aca7d54-2c30-db11-9de9-000461428c89
KimEbert42 · Mar 5, 2013 · 85d0ad6 · 85d0ad6
1 parent 30dab3b
commit 85d0ad6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/get_pak.sh b/get_pak.sh
@@ -65,14 +65,14 @@ paksets=( \
 "http://hd.simutrans.com/release/PakHD_v04B_100-0.zip" \
 "http://downloads.sourceforge.net/project/simutrans/pak128.britain/pak128.Britain%20for%20112-0/pak128.Britain.1.13-112-0.zip" \
 "http://downloads.sourceforge.net/project/simutrans/pak128.japan/for%20Simutrans%20110.0.1/pak128.japan-110.0.1-version16-08-2011.zip" \
+"http://downloads.sourceforge.net/project/simutrans/pak64.scifi/pak64.scifi_112.1_v0.12.zip" \
 "http://downloads.sourceforge.net/project/ironsimu/pak48.Excentrique/v018/pak48-excentrique_v018.zip" \
 )
 
 tgzpaksets=( \
  "http://simutrans.bilkinfo.de/pak64.ho-scale-latest.tar.gz" \
 )
 
-
 choices=()
 installpak=()
 

diff --git a/gui/settings_stats.cc b/gui/settings_stats.cc
@@ -490,7 +490,7 @@ void settings_climates_stats_t::init(settings_t* const sets)
 	INIT_NUM_NEW( "forest_base_size", sets->get_forest_base_size(), 10, 255, 1, false );
 	INIT_NUM_NEW( "forest_map_size_divisor", sets->get_forest_map_size_divisor(), 2, 255, 1, false );
 	INIT_NUM_NEW( "forest_count_divisor", sets->get_forest_count_divisor(), 2, 255, 1, false );
-	INIT_NUM_NEW( "forest_inverse_spare_tree_density", sets->get_forest_inverse_spare_tree_density(), 0, 10000, 1, false );
+	INIT_NUM_NEW( "forest_inverse_spare_tree_density", sets->get_forest_inverse_spare_tree_density(), 33, 10000, 10, false );
 	INIT_NUM( "max_no_of_trees_on_square", sets->get_max_no_of_trees_on_square(), 1, 5, 1, true );
 	INIT_NUM_NEW( "tree_climates", sets->get_tree_climates(), 0, 255, 1, false );
 	INIT_NUM_NEW( "no_tree_climates", sets->get_no_tree_climates(), 0, 255, 1, false );

diff --git a/nsis/other-functions.nsh b/nsis/other-functions.nsh
@@ -147,6 +147,8 @@ Function componentsPre
   Call EnableSectionIfThere
   Push ${pak192comic}
   Call EnableSectionIfThere
+  Push ${pak64scifi}
+  Call EnableSectionIfThere
   Push ${pak48excentrique}
   Call EnableSectionIfThere
   Push ${pak32comic}
@@ -352,7 +354,6 @@ FunctionEnd
 
 
 
-
 ; $downloadlink is then name of the link, $downloadname the name of the pak for error messages
 Function DownloadInstallNoRemoveZip
   Call ConnectInternet

diff --git a/nsis/paksets.nsh b/nsis/paksets.nsh
@@ -214,6 +214,15 @@ Section /o "pak192 Comic (Freeware) for 102.2.1" pak192comic
 SectionEnd
 
 
+Section /o "pak64.SciFi V0.12 (alpha)" pak64scifi
+  AddSize 2596
+  StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64.scifi/pak64.scifi_112.1_v0.12.zip"
+  StrCpy $archievename "pak64.scifi_112.1_v0.12.zip"
+  StrCpy $downloadname "pak64.SciFi"
+  StrCpy $VersionString "pak64.SciFi V0.12"
+  Call DownloadInstallZip
+SectionEnd
+
 
 Section /o "pak48.excentrique V0.18" pak48excentrique
   AddSize 1385
@@ -225,7 +234,6 @@ Section /o "pak48.excentrique V0.18" pak48excentrique
 SectionEnd
 
 
-
 ; name does not match folder name (pak32) but otherwise always selected for update
 Section /o "pak32.Comic (alpha) for 102.2.1" pak32comic
   AddSize 2108