Skip to content

Commit

Permalink
Some final changes for 0.5.6.1 (#2940)
Browse files Browse the repository at this point in the history
* Updated credits and translation progress

* Add version upgrade for 0.5.6.1

* Fix case where no species exist in a patch

* Put strict niche competition back on
  • Loading branch information
hhyyrylainen authored Dec 11, 2021
1 parent 211bf3f commit 0161a4d
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 43 deletions.
2 changes: 1 addition & 1 deletion simulation_parameters/common/auto-evo_parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"BiodiversityNearbyPatchIsFreePopulation": true,
"NewBiodiversityIncreasingSpeciesPopulation": 100,
"BiodiversitySplitIsMutated": true,
"StrictNicheCompetition": false,
"StrictNicheCompetition": true,
"MaximumSpeciesInPatch": 12,
"ProtectNewCellsFromSpeciesCap": true,
"ProtectMigrationsFromSpeciesCap": false,
Expand Down
32 changes: 22 additions & 10 deletions simulation_parameters/common/credits.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"person": "FuJa0815",
"lead": false
},
{
"person": "Generatoror",
"lead": false
},
{
"person": "hhyyrylainen (Henri Hyyryläinen)",
"lead": true
Expand Down Expand Up @@ -111,6 +115,10 @@
}
],
"Testing Team": [
{
"person": "RacerBG (Georgi Georgiev)",
"lead": false
},
{
"person": "Sir Danforth",
"lead": false
Expand Down Expand Up @@ -704,20 +712,22 @@
"punctdan",
"Henri Hyyryläinen",
"doomlightning",
"fgdfgfthgr-fox",
"aleixcoma",
"Simone Nobili",
"Capivaresco",
"fgdfgfthgr-fox",
"Jan",
"icedjuro",
"Undibundi",
"Nozt",
"TomDev03",
"Telegina Alexandra",
"robby driesen",
"Levi Monjeau",
"0nmyhead",
"LibreHacker",
"Maksymilian Adamski",
"Gr0vey",
"ShadowMoon",
"Rune Vercauteren",
"Maximilian",
Expand All @@ -730,11 +740,13 @@
"Jesper Welagen",
"Vojtěch John",
"Tibor Šťastný",
"Pikamochzo",
"Jiří NnN",
"Vladislav Kuznetsov",
"mrcsilva",
"Joah van der Maaden",
"Lorenzo Fagnani",
"Lordiii",
"Moriaan Wiegandt",
"François Roduit",
"Kubagliko_PL",
Expand All @@ -752,6 +764,8 @@
"Liam Hallberg",
"FrisKisDr",
"84634E1A607A",
"Nicholas Stephens",
"Adam Duży",
"Azuriem",
"Jędrzej Kawa",
"Span Staans",
Expand All @@ -772,22 +786,22 @@
"the80hz",
"Nathaniel Balderramas",
"tommy koning",
"Generatoror",
"EzraZebra",
"Thor Andreas Laan",
"Little Tony",
"Fredy Ivan Sucari Callohuanca",
"Adam Duży",
"John",
"Viktor",
"magicTimon",
"Albert Saltarin",
"Vladimir Didenko",
"GitHubUser-GER-ENG",
"George Dupond",
"Peter Kleber",
"Generatoror",
"Regi",
"George Fel",
"1n48yg",
"Regi",
"angelbisector",
"Anderson Smith",
"josem019",
Expand Down Expand Up @@ -835,10 +849,10 @@
"Aidan Collins",
"Alex Yong",
"andrew james morris",
"Ben ",
"blackjacksike",
"Daniel Beauchamp",
"Emily Wideman",
"Ethan Schraven",
"fraang",
"Grape",
"GRKTheGreat ",
Expand All @@ -860,9 +874,9 @@
"Adam Blaisdell",
"Atmos Quake",
"Axium ",
"Beint Bentsen",
"Bekay ",
"Ben Cundick",
"Bernard Gardiner",
"Blisto",
"Caleb Hall Tigh",
"Cameron Schryver",
Expand All @@ -871,6 +885,7 @@
"CyrusPlayz",
"Dak28",
"Daniel Sanche",
"Doctortinykat ",
"Doomacz",
"Emil Mannby",
"Ethan The Terrarian Gamer",
Expand Down Expand Up @@ -902,7 +917,6 @@
"Nicholas Irish",
"Nick McKay",
"No thanks",
"pain_in_the_bex",
"Poskmyst ?",
"Roan Critter",
"Robert Bassett",
Expand All @@ -911,7 +925,6 @@
"Seveer ",
"Spring Chicken",
"thatguyoverthere ",
"Timo Grümpel",
"Ultrax ",
"Violet Rose Hill",
"W. Hutton",
Expand All @@ -936,9 +949,7 @@
"Guillermo Lozano",
"Jacob Walters",
"Josep Martínez Sarrà",
"Kerman Guy",
"Lukas Kubicek .",
"MadMadRamblings",
"Manuel Hubl",
"Michael Foley",
"Mo Ro",
Expand All @@ -948,6 +959,7 @@
"Perasha",
"RadRadishRadiator ",
"RubenS",
"Segon ",
"Shiuzan",
"Snoogie",
"T3chKn1ght",
Expand Down
62 changes: 31 additions & 31 deletions simulation_parameters/common/translations_info.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"TranslationProgress": {
"bg": 1,
"ca": 1,
"cs": 0.8241379310344827,
"ca": 0.998898678414097,
"cs": 0.8303964757709251,
"da": 0,
"de": 0.8804597701149425,
"de": 0.986784140969163,
"en": 1,
"eo": 0.539080459770115,
"es": 0.6540229885057471,
"es_AR": 0.014942528735632184,
"et": 0.028735632183908046,
"fi": 0.6206896551724138,
"fr": 0.7505747126436781,
"eo": 0.5165198237885462,
"es": 0.6288546255506607,
"es_AR": 0.014317180616740088,
"et": 0.02753303964757709,
"fi": 0.5947136563876652,
"fr": 0.7213656387665198,
"frm": 0,
"he": 0.8839080459770114,
"hu": 0.7586206896551724,
"id": 0.7333333333333333,
"it": 0.9252873563218391,
"ko": 0.5137931034482759,
"la": 0.0011494252873563218,
"he": 0.8513215859030837,
"hu": 0.7466960352422908,
"id": 0.7026431718061674,
"it": 0.9372246696035242,
"ko": 0.4922907488986784,
"la": 0.0011013215859030838,
"lb_LU": 0,
"lt": 0,
"lv": 0.2942528735632184,
"nl": 0.5,
"nl_BE": 0.5379310344827586,
"pl": 0.5977011494252874,
"pt_BR": 0.8586206896551725,
"pt_PT": 0.8770114942528736,
"ru": 0.8804597701149425,
"si_LK": 0.008045977011494253,
"sr_Cyrl": 0.5126436781609195,
"sr_Latn": 0.3954022988505747,
"sv": 0.4896551724137931,
"th_TH": 0.4471264367816092,
"tr": 0.8839080459770114,
"uk": 0.08160919540229886,
"zh_CN": 0.8839080459770114,
"zh_TW": 0.40804597701149425
"lv": 0.45374449339207046,
"nl": 0.4790748898678414,
"nl_BE": 0.986784140969163,
"pl": 0.788546255506608,
"pt_BR": 0.8226872246696035,
"pt_PT": 0.8403083700440529,
"ru": 0.8436123348017621,
"si_LK": 0.007709251101321586,
"sr_Cyrl": 0.4911894273127753,
"sr_Latn": 0.3788546255506608,
"sv": 0.46916299559471364,
"th_TH": 0.42841409691629956,
"tr": 1,
"uk": 0.09140969162995595,
"zh_CN": 0.986784140969163,
"zh_TW": 0.3909691629955947
}
}
6 changes: 5 additions & 1 deletion src/auto-evo/steps/ForceExtinction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ public bool RunStep(RunResults results)

foreach (var patch in patches)
{
IEnumerable<KeyValuePair<Species, long>> targetEnumerator = targetSpeciesPopulationsByPatch[patch];
// If no species exist in a patch, we need to skip handling the current patch
if (!targetSpeciesPopulationsByPatch.TryGetValue(patch, out var tmpTarget))
continue;

IEnumerable<KeyValuePair<Species, long>> targetEnumerator = tmpTarget;

if (configuration.ProtectNewCellsFromSpeciesCap)
{
Expand Down
1 change: 1 addition & 0 deletions src/saving/ISaveUpgradeStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ private static Dictionary<string, ISaveUpgradeStep> InitializeSaveUpgradeSteps()
{ "0.5.5.0", new UpgradeStep055To056() },
{ "0.5.6.0-alpha", new UpgradeJustVersionNumber("0.5.6.0-rc1") },
{ "0.5.6.0-rc1", new UpgradeJustVersionNumber("0.5.6.0") },
{ "0.5.6.0", new UpgradeJustVersionNumber("0.5.6.1") },
};
}
}
Expand Down

0 comments on commit 0161a4d

Please sign in to comment.