Adjusts tests

Sebaestschjin · May 7, 2021 · 9b441d7 · 9b441d7
1 parent cefe6a2
commit 9b441d7
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/gloomhaven-campaign-manager/Character.ttslua b/gloomhaven-campaign-manager/Character.ttslua
@@ -665,6 +665,7 @@ function Character.save(player, characters)
             table.insert(character.perks, perkIndex)
         end
     end
+    table.sort(character.perks)
 
     character.items = Character.saveItems(player)
     character.abilities = Character.saveAbilities(character.class, player)

diff --git a/test/output/all_perks_1-expected.json b/test/output/all_perks_1-expected.json
@@ -6,7 +6,7 @@
     "prosperity": 0
   },
   "unlocked": {
-    "classes": ["Sunkeeper", "Summoner", "Doomstalker", "Diviner"]
+    "classes": ["Diviner", "Doomstalker", "Summoner", "Sunkeeper"]
   },
   "events": {
     "city": {

diff --git a/test/output/all_perks_4-expected.json b/test/output/all_perks_4-expected.json
@@ -6,7 +6,7 @@
     "prosperity": 0
   },
   "unlocked": {
-    "classes": ["Beast Tyrant", "Soothsinger", "Plagueherald", "Nightshroud"]
+    "classes": ["Beast Tyrant", "Nightshroud", "Plagueherald", "Soothsinger"]
   },
   "events": {
     "city": {

diff --git a/test/output/big-expected.json b/test/output/big-expected.json
@@ -310,8 +310,8 @@
   ],
   "unlocked": {
     "classes": [
-      "Berserker", "Elementalist", "Quartermaster", "Beast Tyrant", "Soothsinger", "Nightshroud", "Sawbones",
-      "Sunkeeper", "Summoner", "Doomstalker", "Diviner"
+      "Beast Tyrant", "Berserker", "Diviner", "Doomstalker", "Elementalist", "Nightshroud",
+      "Quartermaster", "Sawbones", "Soothsinger", "Summoner", "Sunkeeper"
     ],
     "items": [
       "Circlet of Elements", "Circlet of Elements", "Curious Gear", "Doctor's Coat", "Doomed Compass",

diff --git a/test/output/complete-expected.json b/test/output/complete-expected.json
@@ -85,7 +85,7 @@
         "gold": 42,
         "checkmarks": 4,
         "abilities": ["Hook and Chain", "Juggernaut"],
-        "perks": [1, 3, 6, 11, 10],
+        "perks": [1, 3, 6, 10, 11],
         "items": {
           "Head": ["Iron Helmet"],
           "Armor": ["Hide Armor"],

diff --git a/test/output/five_player-expected.json b/test/output/five_player-expected.json
@@ -30,8 +30,8 @@
   },
   "unlocked": {
     "classes": [
-      "Berserker", "Elementalist", "Quartermaster", "Beast Tyrant", "Soothsinger", "Nightshroud", "Sawbones",
-      "Sunkeeper", "Summoner", "Doomstalker", "Diviner"
+      "Beast Tyrant", "Berserker", "Diviner", "Doomstalker", "Elementalist", "Nightshroud",
+      "Quartermaster", "Sawbones", "Soothsinger", "Summoner", "Sunkeeper"
     ],
     "items": [
       "Circlet of Elements", "Circlet of Elements", "Curious Gear", "Doctor's Coat", "Doomed Compass",

diff --git a/test/output/five_player_in_four-expected.json b/test/output/five_player_in_four-expected.json
@@ -30,8 +30,8 @@
   },
   "unlocked": {
     "classes": [
-      "Berserker", "Elementalist", "Quartermaster", "Beast Tyrant", "Soothsinger", "Nightshroud", "Sawbones",
-      "Sunkeeper", "Summoner", "Doomstalker", "Diviner"
+      "Beast Tyrant", "Berserker", "Diviner", "Doomstalker", "Elementalist", "Nightshroud",
+      "Quartermaster", "Sawbones", "Soothsinger", "Summoner", "Sunkeeper"
     ],
     "items": [
       "Circlet of Elements", "Circlet of Elements", "Curious Gear", "Doctor's Coat", "Doomed Compass",

diff --git a/test/output/v1-expected.json b/test/output/v1-expected.json
@@ -28,8 +28,8 @@
   "unlocked": {
     "sanctuary": 65,
     "classes": [
-      "Berserker", "Elementalist", "Quartermaster", "Beast Tyrant", "Soothsinger", "Plagueherald", "Nightshroud",
-      "Sawbones", "Sunkeeper", "Summoner", "Doomstalker", "Diviner"
+      "Beast Tyrant", "Berserker", "Diviner", "Doomstalker", "Elementalist", "Nightshroud",
+      "Plagueherald", "Quartermaster", "Sawbones", "Soothsinger", "Summoner", "Sunkeeper"
     ],
     "items": [
       "Ancient Drill", "Ancient Drill", "Black Censer", "Bloody Axe", "Boots of Levitation", "Boots of Levitation",

diff --git a/test/res/folder/game/gloomhaven.png b/test/res/folder/game/gloomhaven.png
diff --git a/test/tests.py b/test/tests.py
@@ -113,12 +113,12 @@ def load_file(filename, parent='input'):
 
 def load_latest_mod():
     tts.create_singleplayer()
-    tts.load_workshop("gloomhaven", folders=["coop"])
+    tts.load_workshop("gloomhaven", folders=["gloomhaven"])
     tts.load_saved_object("campaign_manager", folders=["gloomhaven"])
 
 
 def load_custom_class(name):
-    tts.load_workshop(f"custom_class_{name}", folders=["coop"], additive=True)
+    tts.load_workshop(f"custom_class_{name}", folders=["gloomhaven"], additive=True)
 
 
 def load_from_savegame(name):