From 8e15487a1eeae5f4b3706d8a40ffdcf2fc59f15e Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 26 May 2017 06:27:25 +0200
Subject: [PATCH] BUG 2328: wrong calendar seasons.

---
 conf/calendar.json              | 7 ++++---
 scripts/tests/e2/e2features.lua | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/conf/calendar.json b/conf/calendar.json
index 8a134dc40..43b01351a 100644
--- a/conf/calendar.json
+++ b/conf/calendar.json
@@ -2,17 +2,18 @@
     "calendar" : {
         "months" : [
             { "storm" : 60, "season" : 2 },
-            { "storm" : 10, "season" : 2 },
 
-            { "storm" : 60, "season" : 3 },
             { "storm" : 10, "season" : 3 },
+            { "storm" : 60, "season" : 3 },
 
+            { "storm" : 10, "season" : 0 },
             { "storm" : 60, "season" : 0 },
             { "storm" : 80, "season" : 0 },
 
             { "storm" : 50, "season" : 1 },
             { "storm" : 30, "season" : 1 },
-            { "storm" : 60, "season" : 1 }
+
+            { "storm" : 60, "season" : 2 }
         ],
         "weeks" : [
             "firstweek", "secondweek", "thirdweek"
diff --git a/scripts/tests/e2/e2features.lua b/scripts/tests/e2/e2features.lua
index 6495bd5e6..1a4047d63 100644
--- a/scripts/tests/e2/e2features.lua
+++ b/scripts/tests/e2/e2features.lua
@@ -404,3 +404,7 @@ function test_demonstealth()
   desc = u:show()
   assert_equal(nil, string.find(desc, "Drache"))
 end
+
+function test_calendar_season_2328()
+    assert_equal("fall", get_season(1026))
+end