From 38f75c73a8567493e5a1498a819a0299e0ba89f4 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 20 Sep 2012 00:28:41 +0000
Subject: [PATCH] Create challenges for GPs, reorganize GPs

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11613 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/challenges/gp1.challenge                | 19 +++++++++++++++++++
 data/challenges/gp2.challenge                | 19 +++++++++++++++++++
 data/challenges/gp3.challenge                | 19 +++++++++++++++++++
 data/challenges/gp4.challenge                | 19 +++++++++++++++++++
 data/grandprix/1_penguinplayground.grandprix |  6 +++---
 data/grandprix/2_offthebeatentrack.grandprix | 10 ++++++++++
 data/grandprix/2_tothemoonandback.grandprix  | 10 ----------
 data/grandprix/3_snagdrive.grandprix         | 11 -----------
 data/grandprix/3_tothemoonandback.grandprix  | 11 +++++++++++
 data/grandprix/4_atworldsend.grandprix       |  4 +++-
 10 files changed, 103 insertions(+), 25 deletions(-)
 create mode 100644 data/challenges/gp1.challenge
 create mode 100644 data/challenges/gp2.challenge
 create mode 100644 data/challenges/gp3.challenge
 create mode 100644 data/challenges/gp4.challenge
 create mode 100644 data/grandprix/2_offthebeatentrack.grandprix
 delete mode 100644 data/grandprix/2_tothemoonandback.grandprix
 delete mode 100644 data/grandprix/3_snagdrive.grandprix
 create mode 100644 data/grandprix/3_tothemoonandback.grandprix

diff --git a/data/challenges/gp1.challenge b/data/challenges/gp1.challenge
new file mode 100644
index 000000000..05d8920b4
--- /dev/null
+++ b/data/challenges/gp1.challenge
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <grandprix id="1_penguinplayground"/>
+    <mode major="grandprix" minor="quickrace"/>
+    <requirements trophies="4"/>
+    
+    <hard>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
diff --git a/data/challenges/gp2.challenge b/data/challenges/gp2.challenge
new file mode 100644
index 000000000..be227c411
--- /dev/null
+++ b/data/challenges/gp2.challenge
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <grandprix id="2_offthebeatentrack"/>
+    <mode major="grandprix" minor="quickrace"/>
+    <requirements trophies="4"/>
+    
+    <hard>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
diff --git a/data/challenges/gp3.challenge b/data/challenges/gp3.challenge
new file mode 100644
index 000000000..22b6a5aeb
--- /dev/null
+++ b/data/challenges/gp3.challenge
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <grandprix id="3_tothemoonandback"/>
+    <mode major="grandprix" minor="quickrace"/>
+    <requirements trophies="4"/>
+    
+    <hard>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
diff --git a/data/challenges/gp4.challenge b/data/challenges/gp4.challenge
new file mode 100644
index 000000000..f2c4cb303
--- /dev/null
+++ b/data/challenges/gp4.challenge
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<challenge version="2">
+    <grandprix id="4_atworldsend"/>
+    <mode major="grandprix" minor="quickrace"/>
+    <requirements trophies="4"/>
+    
+    <hard>
+        <karts number="5"/>
+        <requirements position="1"/>
+    </hard>
+    <medium>
+        <karts number="4"/>
+        <requirements position="1"/>
+    </medium>
+    <easy>
+        <karts number="3"/>
+        <requirements position="1"/>
+    </easy>
+</challenge>
diff --git a/data/grandprix/1_penguinplayground.grandprix b/data/grandprix/1_penguinplayground.grandprix
index 96972036f..7da95f0c2 100644
--- a/data/grandprix/1_penguinplayground.grandprix
+++ b/data/grandprix/1_penguinplayground.grandprix
@@ -2,9 +2,9 @@
 <supertuxkart_grand_prix name="Penguin Playground">
 
     <track id="sandtrack"    laps="3" reverse="false" />
-    <track id="snowmountain" laps="3" reverse="false" />
+    <track id="farm"         laps="3" reverse="false" />
     <track id="olivermath"   laps="4" reverse="false" />
-    <track id="scotland"     laps="3" reverse="false" />
-    <track id="jungle"       laps="2" reverse="false" /> 
+    <track id="subsea"       laps="2" reverse="false" />
+    <track id="scotland"     laps="3" reverse="false" /> 
  
 </supertuxkart_grand_prix>
diff --git a/data/grandprix/2_offthebeatentrack.grandprix b/data/grandprix/2_offthebeatentrack.grandprix
new file mode 100644
index 000000000..a6f2b0200
--- /dev/null
+++ b/data/grandprix/2_offthebeatentrack.grandprix
@@ -0,0 +1,10 @@
+
+<supertuxkart_grand_prix name="Off the beaten track">
+
+    <track id="jungle"       laps="3" reverse="false" />
+    <track id="snowmountain" laps="3" reverse="false" />
+    <track id="hacienda"     laps="3" reverse="false" />
+    <track id="zengarden"    laps="4" reverse="false" />
+    <track id="islandtrack"  laps="3" reverse="false" />
+    
+</supertuxkart_grand_prix>
diff --git a/data/grandprix/2_tothemoonandback.grandprix b/data/grandprix/2_tothemoonandback.grandprix
deleted file mode 100644
index 91c4e6749..000000000
--- a/data/grandprix/2_tothemoonandback.grandprix
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<supertuxkart_grand_prix name="To the Moon and Back">
-
-    <track id="lighthouse" laps="4" reverse="false" />
-    <track id="startrack"  laps="3" reverse="false" />
-    <track id="hacienda"   laps="3" reverse="false" />
-    <track id="zengarden"  laps="4" reverse="false" />
-    <track id="farm"       laps="3" reverse="false" />
-    
-</supertuxkart_grand_prix>
diff --git a/data/grandprix/3_snagdrive.grandprix b/data/grandprix/3_snagdrive.grandprix
deleted file mode 100644
index 5c579ba08..000000000
--- a/data/grandprix/3_snagdrive.grandprix
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<supertuxkart_grand_prix name="Snag Drive">
-
-    <track id="islandtrack"      laps="2" reverse="false" />
-    <track id="tuxtollway"       laps="2" reverse="false" />
-    <track id="crescentcrossing" laps="2" reverse="false" />
-    <track id="snowtuxpeak"      laps="3" reverse="false" />
-    <track id="subsea"           laps="2" reverse="false" />
-    
-</supertuxkart_grand_prix>
-
diff --git a/data/grandprix/3_tothemoonandback.grandprix b/data/grandprix/3_tothemoonandback.grandprix
new file mode 100644
index 000000000..8a7447b26
--- /dev/null
+++ b/data/grandprix/3_tothemoonandback.grandprix
@@ -0,0 +1,11 @@
+
+<supertuxkart_grand_prix name="To the moon and back">
+
+    <track id="snowtuxpeak"    laps="3" reverse="false" />
+    <track id="tuxtollway"     laps="2" reverse="false" />
+    <track id="mansion"        laps="3" reverse="false" />
+    <track id="startrack"      laps="3" reverse="false" />
+    <track id="city"           laps="2" reverse="false" />
+    
+</supertuxkart_grand_prix>
+
diff --git a/data/grandprix/4_atworldsend.grandprix b/data/grandprix/4_atworldsend.grandprix
index 562c8fcae..da6332254 100644
--- a/data/grandprix/4_atworldsend.grandprix
+++ b/data/grandprix/4_atworldsend.grandprix
@@ -1,11 +1,13 @@
 
 <supertuxkart_grand_prix name="At World's End">
 
+<!--
     <track id="fortmagma"    laps="3" reverse="false" />
+    -->
     <track id="minigolf"     laps="3" reverse="false" />
     <track id="xr591"        laps="3" reverse="false" />
     <track id="mines"        laps="3" reverse="false" />
-    <track id="city"         laps="3" reverse="false" />
+    <track id="lighthouse"   laps="4" reverse="false" />
     
 </supertuxkart_grand_prix>