From a64747829ad28258d32d7a32e57c309ba6416521 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 8 Jan 2017 15:54:17 +0100 Subject: [PATCH] Fix levels numbering in main.txt The numbers were offset by one due to the raidercamp between Level 7 and Level 8, which had caused a bogus decrement of numlevels causing crashes. Fixes regression from 4343a4e3ad10d520d65dc537012440fc7077eeb0. --- Data/Campaigns/main.txt | 97 +++++++++++++++--------------- Data/Maps/{Start1 => Lugaru1} | Bin Data/Maps/{Start9 => Lugaru10} | Bin Data/Maps/{Start10 => Lugaru11} | Bin Data/Maps/{Start11 => Lugaru12} | Bin Data/Maps/{Start12 => Lugaru13} | Bin Data/Maps/{Start13 => Lugaru14} | Bin Data/Maps/{Start14 => Lugaru15} | Bin Data/Maps/{Start15 => Lugaru16} | Bin Data/Maps/{Start16 => Lugaru17} | Bin Data/Maps/{Start17 => Lugaru18} | Bin Data/Maps/{Start18 => Lugaru19} | Bin Data/Maps/{Start2 => Lugaru2} | Bin Data/Maps/{Start19 => Lugaru20} | Bin Data/Maps/{Start20 => Lugaru21} | Bin Data/Maps/{Start21 => Lugaru22} | Bin Data/Maps/{Start22 => Lugaru23} | Bin Data/Maps/{Start23 => Lugaru24} | Bin Data/Maps/{Start24 => Lugaru25} | Bin Data/Maps/{Start25 => Lugaru26} | Bin Data/Maps/{Start26 => Lugaru27} | Bin Data/Maps/{Start27 => Lugaru28} | Bin Data/Maps/{Start28 => Lugaru29} | Bin Data/Maps/{Start3 => Lugaru3} | Bin Data/Maps/{Start29 => Lugaru30} | Bin Data/Maps/{Start30 => Lugaru31} | Bin Data/Maps/{Start4 => Lugaru4} | Bin Data/Maps/{Start5 => Lugaru5} | Bin Data/Maps/{Start6 => Lugaru6} | Bin Data/Maps/{Start7 => Lugaru7} | Bin Data/Maps/{raidercamp => Lugaru8} | Bin Data/Maps/{Start8 => Lugaru9} | Bin 32 files changed, 48 insertions(+), 49 deletions(-) rename Data/Maps/{Start1 => Lugaru1} (100%) rename Data/Maps/{Start9 => Lugaru10} (100%) rename Data/Maps/{Start10 => Lugaru11} (100%) rename Data/Maps/{Start11 => Lugaru12} (100%) rename Data/Maps/{Start12 => Lugaru13} (100%) rename Data/Maps/{Start13 => Lugaru14} (100%) rename Data/Maps/{Start14 => Lugaru15} (100%) rename Data/Maps/{Start15 => Lugaru16} (100%) rename Data/Maps/{Start16 => Lugaru17} (100%) rename Data/Maps/{Start17 => Lugaru18} (100%) rename Data/Maps/{Start18 => Lugaru19} (100%) rename Data/Maps/{Start2 => Lugaru2} (100%) rename Data/Maps/{Start19 => Lugaru20} (100%) rename Data/Maps/{Start20 => Lugaru21} (100%) rename Data/Maps/{Start21 => Lugaru22} (100%) rename Data/Maps/{Start22 => Lugaru23} (100%) rename Data/Maps/{Start23 => Lugaru24} (100%) rename Data/Maps/{Start24 => Lugaru25} (100%) rename Data/Maps/{Start25 => Lugaru26} (100%) rename Data/Maps/{Start26 => Lugaru27} (100%) rename Data/Maps/{Start27 => Lugaru28} (100%) rename Data/Maps/{Start28 => Lugaru29} (100%) rename Data/Maps/{Start3 => Lugaru3} (100%) rename Data/Maps/{Start29 => Lugaru30} (100%) rename Data/Maps/{Start30 => Lugaru31} (100%) rename Data/Maps/{Start4 => Lugaru4} (100%) rename Data/Maps/{Start5 => Lugaru5} (100%) rename Data/Maps/{Start6 => Lugaru6} (100%) rename Data/Maps/{Start7 => Lugaru7} (100%) rename Data/Maps/{raidercamp => Lugaru8} (100%) rename Data/Maps/{Start8 => Lugaru9} (100%) diff --git a/Data/Campaigns/main.txt b/Data/Campaigns/main.txt index a3518a9..083b8b2 100644 --- a/Data/Campaigns/main.txt +++ b/Data/Campaigns/main.txt @@ -1,8 +1,8 @@ -Campaign Levels: 26 +Campaign Levels: 27 Level 1: -Name: Start1 -Description: Village_-_start_campaign_mode! +Name: Lugaru1 +Description: Village_-_start_campaign! ChooseNext: 2 NumNext: 1 NextLevel: 2 @@ -10,7 +10,7 @@ LocationX: 264 LocationY: 310 Level 2: -Name: Start2 +Name: Lugaru2 Description: Stranger ChooseNext: 0 NumNext: 1 @@ -19,7 +19,7 @@ LocationX: 264 LocationY: 310 Level 3: -Name: Start3 +Name: Lugaru3 Description: Village ChooseNext: 1 NumNext: 1 @@ -28,7 +28,7 @@ LocationX: 264 LocationY: 310 Level 4: -Name: Start4 +Name: Lugaru4 Description: Wanderer ChooseNext: 1 NumNext: 1 @@ -37,7 +37,7 @@ LocationX: 274 LocationY: 310 Level 5: -Name: Start5 +Name: Lugaru5 Description: Village ChooseNext: 1 NumNext: 1 @@ -46,7 +46,7 @@ LocationX: 264 LocationY: 310 Level 6: -Name: Start6 +Name: Lugaru6 Description: Clearing ChooseNext: 1 NumNext: 1 @@ -55,7 +55,7 @@ LocationX: 260 LocationY: 295 Level 7: -Name: Start7 +Name: Lugaru7 Description: Raider_Patrol ChooseNext: 1 NumNext: 1 @@ -64,7 +64,7 @@ LocationX: 250 LocationY: 278 Level 8: -Name: raidercamp +Name: Lugaru8 Description: Raider_Camp ChooseNext: 1 NumNext: 1 @@ -72,9 +72,8 @@ NextLevel: 9 LocationX: 240 LocationY: 270 - -Level 8: -Name: Start8 +Level 9: +Name: Lugaru9 Description: Raider_Sentries ChooseNext: 1 NumNext: 1 @@ -82,8 +81,8 @@ NextLevel: 10 LocationX: 255 LocationY: 265 -Level 9: -Name: Start9 +Level 10: +Name: Lugaru10 Description: Raider_Base ChooseNext: 0 NumNext: 1 @@ -91,8 +90,8 @@ NextLevel: 11 LocationX: 265 LocationY: 273 -Level 10: -Name: Start10 +Level 11: +Name: Lugaru11 Description: Raider_Base ChooseNext: 1 NumNext: 1 @@ -100,8 +99,8 @@ NextLevel: 12 LocationX: 265 LocationY: 273 -Level 11: -Name: Start11 +Level 12: +Name: Lugaru12 Description: Old_Raider_Base ChooseNext: 1 NumNext: 1 @@ -109,8 +108,8 @@ NextLevel: 13 LocationX: 286 LocationY: 276 -Level 12: -Name: Start12 +Level 13: +Name: Lugaru13 Description: Village ChooseNext: 1 NumNext: 1 @@ -118,8 +117,8 @@ NextLevel: 14 LocationX: 264 LocationY: 310 -Level 13: -Name: Start13 +Level 14: +Name: Lugaru14 Description: Rocky_Hall ChooseNext: 1 NumNext: 1 @@ -127,8 +126,8 @@ NextLevel: 15 LocationX: 284 LocationY: 312 -Level 14: -Name: Start14 +Level 15: +Name: Lugaru15 Description: Heading_North ChooseNext: 1 NumNext: 1 @@ -136,8 +135,8 @@ NextLevel: 16 LocationX: 332 LocationY: 272 -Level 15: -Name: Start15 +Level 16: +Name: Lugaru16 Description: Heading_North ChooseNext: 1 NumNext: 1 @@ -145,8 +144,8 @@ NextLevel: 17 LocationX: 345 LocationY: 246 -Level 16: -Name: Start16 +Level 17: +Name: Lugaru17 Description: Jack's_camp ChooseNext: 0 NumNext: 1 @@ -154,8 +153,8 @@ NextLevel: 18 LocationX: 324 LocationY: 224 -Level 17: -Name: Start17 +Level 18: +Name: Lugaru18 Description: Jack's_camp ChooseNext: 1 NumNext: 1 @@ -163,8 +162,8 @@ NextLevel: 19 LocationX: 324 LocationY: 224 -Level 18: -Name: Start18 +Level 19: +Name: Lugaru19 Description: Rocky_Hall ChooseNext: 0 NumNext: 1 @@ -172,8 +171,8 @@ NextLevel: 20 LocationX: 284 LocationY: 312 -Level 19: -Name: Start19 +Level 20: +Name: Lugaru20 Description: Rocky_Hall ChooseNext: 1 NumNext: 1 @@ -181,8 +180,8 @@ NextLevel: 21 LocationX: 284 LocationY: 312 -Level 20: -Name: Start20 +Level 21: +Name: Lugaru21 Description: To_Alpha_Wolf ChooseNext: 1 NumNext: 1 @@ -190,8 +189,8 @@ NextLevel: 22 LocationX: 360 LocationY: 269 -Level 21: -Name: Start21 +Level 22: +Name: Lugaru22 Description: To_Alpha_Wolf ChooseNext: 1 NumNext: 1 @@ -199,8 +198,8 @@ NextLevel: 23 LocationX: 343 LocationY: 219 -Level 22: -Name: Start22 +Level 23: +Name: Lugaru23 Description: Wolf_Den ChooseNext: 0 NumNext: 1 @@ -208,8 +207,8 @@ NextLevel: 24 LocationX: 327 LocationY: 179 -Level 23: -Name: Start23 +Level 24: +Name: Lugaru24 Description: Alpha_Wolf ChooseNext: 1 NumNext: 1 @@ -217,8 +216,8 @@ NextLevel: 25 LocationX: 314 LocationY: 179 -Level 24: -Name: Start24 +Level 25: +Name: Lugaru25 Description: Rocky_Hall ChooseNext: 0 NumNext: 1 @@ -226,8 +225,8 @@ NextLevel: 26 LocationX: 284 LocationY: 312 -Level 25: -Name: Start25 +Level 26: +Name: Lugaru26 Description: Rocky_Hall ChooseNext: 0 NumNext: 1 @@ -235,8 +234,8 @@ NextLevel: 27 LocationX: 284 LocationY: 312 -Level 26: -Name: Start26 +Level 27: +Name: Lugaru27 Description: Leave ChooseNext: 1 NumNext: 0 diff --git a/Data/Maps/Start1 b/Data/Maps/Lugaru1 similarity index 100% rename from Data/Maps/Start1 rename to Data/Maps/Lugaru1 diff --git a/Data/Maps/Start9 b/Data/Maps/Lugaru10 similarity index 100% rename from Data/Maps/Start9 rename to Data/Maps/Lugaru10 diff --git a/Data/Maps/Start10 b/Data/Maps/Lugaru11 similarity index 100% rename from Data/Maps/Start10 rename to Data/Maps/Lugaru11 diff --git a/Data/Maps/Start11 b/Data/Maps/Lugaru12 similarity index 100% rename from Data/Maps/Start11 rename to Data/Maps/Lugaru12 diff --git a/Data/Maps/Start12 b/Data/Maps/Lugaru13 similarity index 100% rename from Data/Maps/Start12 rename to Data/Maps/Lugaru13 diff --git a/Data/Maps/Start13 b/Data/Maps/Lugaru14 similarity index 100% rename from Data/Maps/Start13 rename to Data/Maps/Lugaru14 diff --git a/Data/Maps/Start14 b/Data/Maps/Lugaru15 similarity index 100% rename from Data/Maps/Start14 rename to Data/Maps/Lugaru15 diff --git a/Data/Maps/Start15 b/Data/Maps/Lugaru16 similarity index 100% rename from Data/Maps/Start15 rename to Data/Maps/Lugaru16 diff --git a/Data/Maps/Start16 b/Data/Maps/Lugaru17 similarity index 100% rename from Data/Maps/Start16 rename to Data/Maps/Lugaru17 diff --git a/Data/Maps/Start17 b/Data/Maps/Lugaru18 similarity index 100% rename from Data/Maps/Start17 rename to Data/Maps/Lugaru18 diff --git a/Data/Maps/Start18 b/Data/Maps/Lugaru19 similarity index 100% rename from Data/Maps/Start18 rename to Data/Maps/Lugaru19 diff --git a/Data/Maps/Start2 b/Data/Maps/Lugaru2 similarity index 100% rename from Data/Maps/Start2 rename to Data/Maps/Lugaru2 diff --git a/Data/Maps/Start19 b/Data/Maps/Lugaru20 similarity index 100% rename from Data/Maps/Start19 rename to Data/Maps/Lugaru20 diff --git a/Data/Maps/Start20 b/Data/Maps/Lugaru21 similarity index 100% rename from Data/Maps/Start20 rename to Data/Maps/Lugaru21 diff --git a/Data/Maps/Start21 b/Data/Maps/Lugaru22 similarity index 100% rename from Data/Maps/Start21 rename to Data/Maps/Lugaru22 diff --git a/Data/Maps/Start22 b/Data/Maps/Lugaru23 similarity index 100% rename from Data/Maps/Start22 rename to Data/Maps/Lugaru23 diff --git a/Data/Maps/Start23 b/Data/Maps/Lugaru24 similarity index 100% rename from Data/Maps/Start23 rename to Data/Maps/Lugaru24 diff --git a/Data/Maps/Start24 b/Data/Maps/Lugaru25 similarity index 100% rename from Data/Maps/Start24 rename to Data/Maps/Lugaru25 diff --git a/Data/Maps/Start25 b/Data/Maps/Lugaru26 similarity index 100% rename from Data/Maps/Start25 rename to Data/Maps/Lugaru26 diff --git a/Data/Maps/Start26 b/Data/Maps/Lugaru27 similarity index 100% rename from Data/Maps/Start26 rename to Data/Maps/Lugaru27 diff --git a/Data/Maps/Start27 b/Data/Maps/Lugaru28 similarity index 100% rename from Data/Maps/Start27 rename to Data/Maps/Lugaru28 diff --git a/Data/Maps/Start28 b/Data/Maps/Lugaru29 similarity index 100% rename from Data/Maps/Start28 rename to Data/Maps/Lugaru29 diff --git a/Data/Maps/Start3 b/Data/Maps/Lugaru3 similarity index 100% rename from Data/Maps/Start3 rename to Data/Maps/Lugaru3 diff --git a/Data/Maps/Start29 b/Data/Maps/Lugaru30 similarity index 100% rename from Data/Maps/Start29 rename to Data/Maps/Lugaru30 diff --git a/Data/Maps/Start30 b/Data/Maps/Lugaru31 similarity index 100% rename from Data/Maps/Start30 rename to Data/Maps/Lugaru31 diff --git a/Data/Maps/Start4 b/Data/Maps/Lugaru4 similarity index 100% rename from Data/Maps/Start4 rename to Data/Maps/Lugaru4 diff --git a/Data/Maps/Start5 b/Data/Maps/Lugaru5 similarity index 100% rename from Data/Maps/Start5 rename to Data/Maps/Lugaru5 diff --git a/Data/Maps/Start6 b/Data/Maps/Lugaru6 similarity index 100% rename from Data/Maps/Start6 rename to Data/Maps/Lugaru6 diff --git a/Data/Maps/Start7 b/Data/Maps/Lugaru7 similarity index 100% rename from Data/Maps/Start7 rename to Data/Maps/Lugaru7 diff --git a/Data/Maps/raidercamp b/Data/Maps/Lugaru8 similarity index 100% rename from Data/Maps/raidercamp rename to Data/Maps/Lugaru8 diff --git a/Data/Maps/Start8 b/Data/Maps/Lugaru9 similarity index 100% rename from Data/Maps/Start8 rename to Data/Maps/Lugaru9 -- 2.39.5