SG2: Update for latest Freeciv21

longturn · Dec 31, 2023 · a8eee11 · a8eee11
1 parent 9a1564e
commit a8eee11
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 52 deletions.
diff --git a/SG2/SG2.serv b/SG2/SG2.serv
@@ -112,7 +112,6 @@ set unitwaittime 36000
 set fixedlength enabled
 set savefrequency "15"
 set savename "freeciv"
-set infrapoints "0"
 set kicktime "1800"
 set first_timeout "-1"
 set fixedlength "DISABLED"
@@ -161,8 +160,6 @@ metapatches longturn
 set nationset all
 read players.serv
 
-syncturn # for longturn games
-start
 
 Easy
 metapatches 
diff --git a/SG2/SG2_local.serv b/SG2/SG2_local.serv
@@ -4,62 +4,60 @@
 rulesetdir SG2
 
 # map
-set aifill=10            # Fill with 10 AI players. Standard LT games have no AI players, only human.
-set mapsize="PLAYER"
-set generator="FRACTAL"
-set barbarians=enabled   # Standard LT games don't have Barbarians enabled, but good for local AI games
-set startpos="ALL"
-set huts=0
-set landmass=40
-set separatepoles=enabled
-set specials=300
-set steepness=40
-set temperature=70
-set tilesperplayer=500
-set topology="WRAPX|WRAPY|ISO"
-set wetness=40
-set alltemperate=disabled
+set aifill 10            # Fill with 10 AI players. Standard LT games have no AI players, only human.
+set mapsize "PLAYER"
+set generator "FRACTAL"
+set barbarians HORDES # Standard LT games don't have Barbarians enabled, but good for local AI games
+set startpos "ALL"
+set huts 0
+set landmass 40
+set separatepoles enabled
+set specials 300
+set steepness 40
+set temperature 70
+set tilesperplayer 500
+set topology "WRAPX|WRAPY|ISO"
+set wetness 40
+set alltemperate disabled
 set tinyisles disabled   # Don't allow 1x1 islands
 
 # general rules
-set nationset=all
-set citymindist=4
-set contactturns=1
-set dispersion=6
-set foggedborders=enabled
-set rapturedelay=3
-set restrictinfra=enabled
-set revolen=2
-set revolentype=FIXED
-set spacerace=enabled
-set startunits=cccccwwwwwwxx
-set techlevel=0
-set unreachableprotects=disabled
-set killunhomed=0
-set trading_tech=disabled
-set airliftingstyle="FROM_ALLIES|TO_ALLIES|DEST_UNLIMITED"
-set razechance=10
-set happyborders=enabled
-set occupychance=0
-set globalwarming=enabled
+set nationset all
+set citymindist 4
+set contactturns 1
+set dispersion 6
+set foggedborders enabled
+set rapturedelay 3
+set restrictinfra enabled
+set revolen 2
+set revolentype FIXED
+set startunits cccccwwwwwwxx
+set techlevel 0
+set unreachableprotects disabled
+set killunhomed 0
+set trading_tech disabled
+set airliftingstyle "FROM_ALLIES|TO_ALLIES|DEST_UNLIMITED"
+set razechance 10
+set happyborders NATIONAL
+set occupychance 0
+set globalwarming enabled
 
 # diplomacy
-set diplchance=40
-set diplgoldcost=20
-set diplbulbcost=20
-set diplomacy=ALL
+set diplchance 40
+set diplgoldcost 20
+set diplbulbcost 20
+set diplomacy ALL
 
 # technology
-set sciencebox=100
-set techlost_donor=0
-set techlost_recv=0
-set techpenalty=10
-set trademindist=999     # LT games don't do trade routes
-set trading_city=disabled
-set team_pooled_research=disabled
-set techlevel=0
+set sciencebox 100
+set techlost_donor 0
+set techlost_recv 0
+set techpenalty 10
+set trademindist 999     # LT games don't do trade routes
+set trading_city disabled
+set team_pooled_research disabled
+set techlevel 0
 set techlossforgiveness -1
 set techlossrestore 50
 set freecost 50
-set diplcost 50
 set conquercost 50
diff --git a/SG2/data/SG2/effects.ruleset b/SG2/data/SG2/effects.ruleset
@@ -4747,6 +4747,5 @@ reqs  =
     { "type",                 "name",         "range",  "present"
       "NationalIntelligence", "Mood",         "Player", FALSE
       "NationalIntelligence", "History",      "Player", FALSE
-      "NationalIntelligence", "Infra Points", "Player", FALSE
       "DiplRel",              "Has embassy",  "Local",  TRUE
     }