Move all challenge files into one directory. Please tell if any problems occur.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7320 178a84e3-b1eb-0310-8ba1-8eac791a3b58

data/challenges/canyon.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="tollway"
+    name="Win a race on Tux Tollway"
+    description="Win a 3 lap race on Tux Tollway against 4 Expert level AI karts."
+    depend-on="lighthousetime tothemoonandbackgp"
+    unlock-track="canyon"
+    major="single"
+    minor="quickrace"
+    track="tuxtollway"
+    difficulty="hard"
+    laps="3"
+    karts="4"
+    position="1"
+/>
+

data/challenges/crescentcrossing.challenge

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="energymathclass"
+    name="Collect Nitro in Math Class"
+    description="Finish with at least 6 points of nitro on three laps of Oliver's Math Class in under 52 seconds."
+    unlock-track="crescentcrossing"
+    depend-on="penguinplaygroundgp"
+    major="single"
+    minor="quickrace"
+    track="olivermath"
+    difficulty="hard"
+    laps="3"
+    karts="1"
+    energy="6"
+    time="52"
+/>
+

data/challenges/fortmagma.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="minestime"
+    name="Finish Mines in 3:00"
+    description="Finish 3 laps in mines with 3 expert AI karts in under 3:00 minutes."
+    depend-on="energyxr591"
+    unlock-track="fortmagma"
+    major="single"
+    minor="quickrace"
+    track="mines"
+    difficulty="hard"
+    laps="3"
+    karts="4"
+    time="180"
+/>
+

data/challenges/gnu.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="fortmagma"
+    name="Win a race on Fort Magma"
+    description="Win a 3 lap race on Fort Magma against 3 Expert level AI karts."
+    depend-on="worldsend"
+    unlock-kart="gnu"
+    major="single"
+    minor="quickrace"
+    track="fortmagma"
+    difficulty="hard"
+    laps="3"
+    karts="4"
+    position="1"
+/>
+

data/challenges/hacienda.challenge

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="farmtracktime"
+    name="Finish Farm in 2:30"
+    description="Finish 3 laps in Farm with 3 easy AI karts in under 2:30 minutes."
+    unlock-track="hacienda"
+    major="single"
+    minor="quickrace"
+    track="farm"
+    difficulty="easy"
+    laps="3"
+    karts="4"
+    time="150"
+/>
+

data/challenges/island.challenge

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="snowmountain"
+    name="Win a race on Snow Mountain"
+    description="Win a 3 lap race on Snow Mountain under 3:05 against 3 medium AI karts."
+    unlock-track="islandtrack"
+    major="single"
+    minor="quickrace"
+    track="snowmountain"
+    difficulty="medium"
+    laps="3"
+    karts="4"
+    time="185"
+/>
+

data/challenges/lighthouse.challenge

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="starfollow"
+    name="Follow the Leader around the Solar System"
+    description="Win a Follow the Leader race with 5 AI karts on Star track"
+    unlock-track="lighthouse"
+    depend-on="farmtracktime penguinplaygroundgp"
+    major="single"
+    minor="followtheleader"
+    track="startrack"
+    difficulty="medium"
+    laps="3"
+    karts="6"
+    position="2"
+/>
+
+

data/challenges/mines.challenge

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="energyxr591"
+    name="Collect fuel for your rocket"
+    description="Finish with at least 16 nitro points on 2 laps of XR591 in under 2:30 minutes."
+    unlock-track="mines"
+    depend-on="lighthousetime canyon"
+    major="single"
+    minor="quickrace"
+    track="xr591"
+    difficulty="hard"
+    karts="1"
+    laps="2"
+    energy="16"
+    time="150"
+/>
+

data/challenges/skyline.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="gardenhead"
+    name="Win a Head to Head in the Secret Garden"
+    description="Win a 1 lap Head to Head in the Secret Garden against 1 Expert level AI kart."
+    depend-on="snowmountain"
+    unlock-track="skyline"
+    major="single"
+    minor="timetrial"
+    track="secretgarden"
+    difficulty="hard"
+    laps="1"
+    karts="2"
+    position="1"
+/>
+

data/challenges/tollway.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="lighthousetime"
+    name="Finish Lighthouse in 1:30"
+    description="Finish 3 laps in Lighthouse with 3 Expert AI karts in under 1:30 minutes."
+    unlock-track="tuxtollway"
+    depend-on="starfollow"
+    major="single"
+    minor="quickrace"
+    track="lighthouse"
+    difficulty="hard"
+    laps="3"
+    karts="4"
+    time="90"
+/>
+

data/challenges/xr591.challenge

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<challenge
+    id="canyon"
+    name="Win a race on Canyon"
+    description="Win a 3 lap race on Canyon against 4 Expert level AI karts."
+    depend-on="tollway"
+    unlock-track="xr591"
+    major="single"
+    minor="quickrace"
+    track="canyon"
+    difficulty="hard"
+    laps="3"
+    karts="5"
+    position="1"
+/>
+

src/challenges/unlock_manager.cpp

@@ -46,38 +46,27 @@ UnlockManager::UnlockManager()
 
     m_locked_sound = sfx_manager->createSoundSource("locked");
     
-    // Read challenges from .../data
-    // -----------------------------
+
+    // Read challenges from .../data/challenges
+    // ----------------------------------------
     std::set<std::string> result;
-    file_manager->listFiles(result, "data");
+    file_manager->listFiles(result, "data/challenges");
     for(std::set<std::string>::iterator i  = result.begin();
                                         i != result.end()  ; i++)
     {
         if (StringUtils::hasSuffix(*i, ".challenge")) 
-            addChallenge(file_manager->getDataFile(*i));
+            addChallenge(file_manager->getDataFile("challenges/"+*i));
     }   // for i
 
     // Read challenges from .../data/tracks/*
     // --------------------------------------
     const std::vector<std::string> *all_track_dirs = track_manager->getAllTrackDirs();
     readAllChallengesInDirs(all_track_dirs);
-    
-    
+
     // Read challenges from .../data/karts/*
     // --------------------------------------
     const std::vector<std::string> *all_kart_dirs  = kart_properties_manager->getAllKartDirs();
     readAllChallengesInDirs(all_kart_dirs);
-    
-    
-    // Challenges from .../data/grandprix
-    // ----------------------------------
-    file_manager->listFiles(result, "data/grandprix");
-    for(std::set<std::string>::iterator i  = result.begin();
-                                        i != result.end()  ; i++)
-    {
-        if (StringUtils::hasSuffix(*i, ".challenge")) 
-            addChallenge(file_manager->getDataFile("grandprix/"+*i));
-    }   // for i
 
     // Hard coded challenges can be added here.