Author: cazfi Date: Mon Dec 15 03:04:25 2014 New Revision: 27307 URL: http://svn.gna.org/viewcvs/freeciv?rev=27307&view=rev Log: Updated Earth scenarios - Most scenario-specific settings removed. Defaults are used instead - Added and adjusted starting positions - Changed ocean to land between Java and Sumatra in Small Earth scenario - Fixed metamessage setting in Big Earth scenario - Set maxplayers to 39 in both scenarios - Increased aifill from 30 to 32 in Big Earth
Patch by David Fernandez <bardo> and myself See patch #5487 Modified: branches/S2_5/data/scenarios/earth-160x90-v2.sav branches/S2_5/data/scenarios/earth-80x50-v3.sav Modified: branches/S2_5/data/scenarios/earth-160x90-v2.sav URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/scenarios/earth-160x90-v2.sav?rev=27307&r1=27306&r2=27307&view=diff ============================================================================== --- branches/S2_5/data/scenarios/earth-160x90-v2.sav (original) +++ branches/S2_5/data/scenarios/earth-160x90-v2.sav Mon Dec 15 03:04:25 2014 @@ -29,7 +29,7 @@ server_state="S_S_INITIAL" meta_patches="none" meta_usermessage=TRUE -meta_meta_message="Scenario: Earth(Large)" +meta_message="Scenario: Earth(Large)" meta_server="http://meta.freeciv.org/metaserver.php" id="" serverid="" @@ -64,30 +64,15 @@ [settings] set={"name","value","gamestart" -"aifill",30,5 -"borders","ENABLED","ENABLED" -"civilwarsize",10,10 -"conquercost",0,0 -"diplcost",0,0 -"foodbox",100,100 -"freecost",0,0 -"gameseed",0,0 -"generator","SCENARIO","RANDOM" -"happyborders",TRUE,TRUE -"huts",50,50 -"landmass",33,30 -"mapsize","FULLSIZE","FULLSIZE" -"maxplayers",38,126 -"minplayers",1,1 -"size",14,4 -"startunits","cwx","ccwwx" -"techlevel",3,0 +"aifill",32,32 +"generator","SCENARIO","SCENARIO" +"maxplayers",39,39 "topology","WRAPX","WRAPX" -"xsize",160,64 -"ysize",90,64 +"xsize",160,160 +"ysize",90,90 } -set_count=21 -gamestart_valid=FALSE +set_count=6 +gamestart_valid=TRUE [map] have_huts=TRUE @@ -181,7 +166,7 @@ t0087=" :::: :: :::: :: :::::::: :::: :::::: :::: :::::: :: :: :::::::::::::: :::::::: :::::::: " t0088="aa aa aa aa aaaaaaaaaa aa aa aa aaaaaa aaaa aaaa aa aa aa aaaa aaaaaa " t0089="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -startpos_count=38 +startpos_count=39 startpos={"x","y","exclude","nations" 64,41,FALSE,"Indian" 37,15,FALSE,"Viking" @@ -204,13 +189,14 @@ 95,35,FALSE,"Japanese" 142,44,FALSE,"Aztec" 41,40,FALSE,"Egyptian" -156,33,FALSE,"Iroquois" +154,29,FALSE,"Iroquois" +150,35,FALSE,"Cherokee" 147,46,FALSE,"Mayan" 63,31,FALSE,"Turkish" 56,36,FALSE,"Persian" 45,47,FALSE,"Ethiopian" 50,43,FALSE,"Arab" -98,58,FALSE,"Papuan" +98,58,FALSE,"Polynesian" 29,22,FALSE,"English" 82,24,FALSE,"Mongol" 34,56,FALSE,"Kongo" Modified: branches/S2_5/data/scenarios/earth-80x50-v3.sav URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/scenarios/earth-80x50-v3.sav?rev=27307&r1=27306&r2=27307&view=diff ============================================================================== --- branches/S2_5/data/scenarios/earth-80x50-v3.sav (original) +++ branches/S2_5/data/scenarios/earth-80x50-v3.sav Mon Dec 15 03:04:25 2014 @@ -56,18 +56,7 @@ save_known=FALSE [random] -save=TRUE -index_J=32 -index_K=7 -index_X=31 -table0="785d4232 b7a4f412 e52af223 dc69cb88 71894119 46a9d4f2 cfd3f734" -table1="7c01984b 35975f60 51dd426c 2c105b7b 442eb4e2 995b227a 396749bf" -table2="7a337f2e fbbe34ee eb48d916 c299a3c4 832bfe64 df38857a 33f07e80" -table3="b39c8d1d 8973b9ca b4a07b35 d2c8cabf cfd4c759 37c1ce68 d5202e7f" -table4="73e246af 9c7d0b91 54fc6cf2 531048d7 595850bb d24a776 5ebb409c" -table5="5d631753 7b705455 27dffcc7 f69b35ac 6832ece7 ec5012d4 41049b4b" -table6="4bfa8366 3fbcab51 36a6d84e d9abc21 ff40023d 9be2312d 577d4981" -table7="ac3e7f20 968b84e dbc552d3 4fb824bd 7861f261 8a56052f 1f82cd4e" +save=FALSE [script] code=$$ @@ -76,43 +65,13 @@ [settings] set={"name","value","gamestart" "aifill",10,10 -"borders","ENABLED","ENABLED" -"citymindist",2,2 -"civilwarsize",10,10 -"contactturns",20,20 -"diplchance",80,80 -"endturn",5000,5000 -"fulltradesize",1,1 -"gameseed",1293042902,1293042902 "generator","SCENARIO","SCENARIO" -"gold",50,50 -"happyborders",TRUE,TRUE -"homecaughtunits",TRUE,TRUE -"killcitizen",FALSE,FALSE -"landmass",34,34 -"mapseed",318483391,318483391 -"maxplayers",18,18 -"nuclearwinter",TRUE,TRUE -"onsetbarbs",60,60 -"razechance",20,20 -"savename","freeciv-earth","freeciv-earth" -"size",4,4 -"spacerace",FALSE,FALSE -"specials",250,250 -"startpos","DEFAULT","DEFAULT" -"startunits","ccxx","ccxx" -"techlevel",3,3 -"techpenalty",100,100 -"temperature",50,50 -"tilesperplayer",100,100 -"timeaddenemymove",0,0 -"timeout",0,0 -"tinyisles",FALSE,FALSE +"maxplayers",39,39 "topology","WRAPX","WRAPX" "xsize",80,80 "ysize",50,50 } -set_count=36 +set_count=6 gamestart_valid=TRUE [map] @@ -147,7 +106,7 @@ t0027="::::::::::: ggfjgg ::::::: gjjjfhmpp :::::: : g jf j ::::::" t0028=":::::::::::: ghhjjjfg :::::::: ggjjjh+gg :::::::::: pf pg j gfj ::::::" t0029=":::::::::::: ghhjjjjfffg ::::::: ggjjjgg :::::::::: g fgp :::::::" -t0030=":::::::::::: ghfffjjfffgg :::::::: gpfggfg :::::::::: gg ::::::" +t0030=":::::::::::: ghfffjjfffgg :::::::: gpfggfg :::::::::: pgg ::::::" t0031=":::::::::::: ghfjffffggp :::::::: gppgghg g :::::::::::: gg g g ::::::" t0032="::::::::::::: gmgffggpg :::::::: ppgpgf f ::::::::::::: ppgggg ::::::" t0033=":::::::::::::: pdgggpgg ::::::::: dpppgf gg :::::::::::: pddppgf p :::::" @@ -167,26 +126,72 @@ t0047=" t ::::::::::::: tt aatttaaaaaaaa ::::::" t0048=" aaataaatattaaataa aaaaaattaaataa aaaaaaaaaaaaaaaaataata " t0049="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -startpos_count=18 +startpos_count=50 startpos={"x","y","exclude","nations" -36,17,FALSE,"Roman" -15,18,FALSE,"Iroquois" -32,12,FALSE,"English" -39,34,FALSE,"Zulu" -38,21,FALSE,"Egyptian" -39,25,FALSE,"Ethiopian" -16,34,FALSE,"Inca" -39,17,FALSE,"Greek" -51,22,FALSE,"Indian" -65,36,FALSE,"Australian Aboriginal" -44,12,FALSE,"Russian" -9,11,FALSE,"Inuit" -59,18,FALSE,"Chinese" -9,23,FALSE,"Aztec" -34,14,FALSE,"French" -49,16,FALSE,"Mongol" -37,14,FALSE,"German" -44,19,FALSE,"Babylonian" +; EUROPE +36,17,FALSE,"Roman#Italian" +38,18,FALSE,"Greek#Hellenic" +34,14,FALSE,"Celtic#Dutch#French" +37,14,FALSE,"Germanic#Austrian#German" +36,10,FALSE,"Viking#Swedish#Norwegian" +32,12,FALSE,"Briton#English#British" +31,16,FALSE,"Iberian#Spanish" +29,17,FALSE,"Celtiberian#Portuguese" +39,13,FALSE,"Slavic#Polish" +35,12,FALSE,"Danish" + +; AFRICA +38,21,FALSE,"Egyptian#Egyptian Arab" +33,19,FALSE,"Carthaginian#Numidian#Algerian" +40,25,FALSE,"Ethiopian" +30,24,FALSE,"Mali#Songhai#Malian" +36,29,FALSE,"Kongo#Congolese" +39,34,FALSE,"Zulu#South African" + +; MIDDLE EAST +41,17,FALSE,"Hittite#Byzantine#Turkish" +44,19,FALSE,"Babylonian#Sumerian#Iraqi" +43,22,FALSE,"Arab#Saudi" +46,18,FALSE,"Persian#Iranian" + +; ASIA +43,12,FALSE,"Soviet#Russian" +50,10,FALSE,"Tatar#Siberian" +50,21,FALSE,"Indian" +53,20,FALSE,"Tibetan" +49,14,FALSE,"Hunnic#Kazakh" +56,12,FALSE,"Xiongnu#Mongol" +59,17,FALSE,"Han#Chinese" +62,13,FALSE,"Manchu" +62,17,FALSE,"Korean" +67,16,FALSE,"Japanese" +56,24,FALSE,"Khmer#Thai#Cambodian" + +; OCEANIA +57,30,FALSE,"Indonesian" +66,36,FALSE,"Australian Aboriginal#Australian" +67,29,FALSE,"Papuan#Polynesian" +73,37,FALSE,"Maori#New Zealand" + +; NORTH AMERICA +10,11,FALSE,"Inuit" +15,18,FALSE,"American" +15,15,FALSE,"Iroquois#Canadian" +13,19,FALSE,"Cherokee" +10,15,FALSE,"Sioux" +7,19,FALSE,"Apache" + +; SOUTH AMERICA +9,23,FALSE,"Aztec#Mexican" +11,24,FALSE,"Mayan#Central American" +15,31,FALSE,"Inca#Peruvian" +17,32,FALSE,"Aymara#Bolivian" +17,26,FALSE,"Taino#Venezuelan" +21,32,FALSE,"Tupi#Brazilian" +15,39,FALSE,"Mapuche#Chilean" +19,35,FALSE,"Guarani#Paraguayan" +19,38,FALSE,"Argentine" + } b00_0000="00000000000000000000000000000000000000000000000000000000000000000000000000000000" b00_0001="00000000000000000000000000000000000000000000000000000000000000000000000000000000" _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits