Merge remote-tracking branch 'origin/master' into voting_gui

CHANGELOG.md

@@ -6,25 +6,53 @@ It should be kept in mind that some versions have a less complete changelog than
 For similar reasons, and because some features are vastly more complex than others, attributions of main changes should not be taken as a shorcut for overall contribution.
 
 ## Unreleased
+* New game mode Capture the Flag for online multiplayer by Benau
+* New game mode Free for All for online multiplayer by Benau
 * Networking game for normal race, time trial, free for all, capture the flag and soccer
 * Better random item distribution for various numbers of karts by Alayan and hiker
 * Numerous improvements to input on Android by deveee
+* Gyroscope support for Android by Pelya
 * Unlockable SuperTux challenges in Story Mode by Alayan
-* Race UI improvements (new speedometer, nitro gauge, bigger minimap) by Alayan
+* Improvements to ghost replays (more data saved, live time difference, replay comparison, egg hunt replays) by Alayan
-* Improvements to ghost replays (more data saved, live time difference, replay comparison, UI improvements, egg hunt replays) by Alayan
 * Kart color customization by Benau
-* Improved powerup handling in AI by Alayan
+* Multithreading contention fixes by Benau
+* Improved powerup and nitro handling in AI by Alayan
 * Local multiplayer improvements by Fantasmos
-* New coal skin by Alayan
+* Revised kart characteristics for better balance between light, medium and heavy karts by Alayan
+* Fix kart being uncontrollable and hovering when landing on some downward slopes by hiker
+* Mitigate a physics issue which could send a kart flying on collisions by hiker
+* Make kart turn radius based on kart class instead of kart model length (which made Adiumy unplayable and caused AI issues) by Alayan
+* Major revamp of the achievement system to make adding new achievements much easier and flexible, also fixing some related bugs by Alayan
+* Fix position interpolation causing some incorrect lapline validation by Auria
+* Store up to 5 highscores for a track/difficulty/mode/kart number combination, instead of 3
+* Start boost/penalty moved to the set phase for smoother networking
 * Visual improvements (new skidding particles, better rescue, bubblegum flashing before ending)
 * Audio improvements (crash sound depending on speed/direction, sound cue in nitro challenges)
-* Gameplay improvements (much better slipstreaming, GP points...)
+* Gameplay improvements (level 1 skid boost doesn't interrupt level 2 boost, fairer rubber-banding in low difficulties, boosted AI for some karts for more challenge in GPs, much better slipstreaming, small balance change of GP points, more useful and consistent handicap option...)
 * Terrain slowdown works again as intended on several tracks where it was missing
+* Fix STK incorrectly connecting to the server when the internet option is disabled by Auria
 * Many bugfixes
+### User Interface
+* Race UI improvements (new speedometer, nitro gauge, bigger minimap, minimap display options, more legible text with outlines and for some bigger font) by Alayan
+* New coal skin by Alayan
+* New networking user interface by Benau and hiker
+* Multidirectional keyboard navigation in menus by Alayan
+* Support text breaks into multiple line in lists, e.g. in the addons menu, by Alayan
+* Improved help menu with lateral tabs and a lot more information by Alayan
+* Improved option menu with lateral tabs by Alayan
+* Many improvements to the ghost replay selection list (give access to egg hunt replays, kart icon shown in the list, replay's game version shown, hide player number column by default) and dialog (allow replay comparison, show track picture, show information about the selected replays) by Alayan
+* Other significant enhancements (detailed progress of multi-goal achievements, reset password button, clearer checkbox status, milliseconds displayed in time-trials and egg hunts, nitro efficiency in the kart selection screen, better track info screen, better warnings when trying to do an online action with internet access disabled, control configurations can be disabled without being deleted...)
+* Many bugfixes and small enhancements mostly by deveee and Alayan
+
 ### Tracks and modeling
 #### Tracks
-* Many unwanted shortcuts and exploits fixed by Auria
 * Las Dunas Soccer by samuncle
+* Candela City arena by Benau based on samuncle's track
+* Unwanted shortcuts and exploits fixed by Auria in many tracks :
+    * Around the Lighthouse, Fort Magma Grand Paradisio Island, Hacienda, Minigolf, Nessie's Pond, Northern Resort, Oliver's Math Class, Shifting Sands, STK Enterprise, XR591
+* Smoothness issues causing collisions and kart slowdown fixed by Auria :
+    * Nessie's Pond, Old Mine, Shifting Sands, Volcano Island, XR591
+
 
 ## SuperTuxKart 0.9.3 (28. October 2017)
 * Reduced RAM and VRAM usage, reducing load times by Auria and Benau
@@ -42,8 +70,9 @@ For similar reasons, and because some features are vastly more complex than othe
 * Various improvements (starting boost effect, wall driving fixes, parachutes, GP points, help page for bananas, cannon fixes, colorization shader)
 ### Tracks and modeling
 #### Karts
-* New kart Wilber and Hexley by Jymis
+* Kiki by Benau
-* New kart Kiki and updated Konqi by Benau
+* New versions of Wilber and Hexley by Jymis
+* New version of Konqi by Benau
 #### Tracks
 * All tracks drivable in reverse, with arrows pointing in the correct direction
 * Candela City by samuncle (replace Shiny Suburbs)

CMakeLists.txt

@@ -470,7 +470,7 @@ else()
     find_package(CURL REQUIRED)
     include_directories(${CURL_INCLUDE_DIRS})
 
-    find_path(NETTLE_INCLUDE_DIRS nettle/gcm.h nettle/sha.h nettle/base64.h nettle/version.h nettle/yarrow.h)
+    find_path(NETTLE_INCLUDE_DIRS nettle/version.h)
     find_library(NETTLE_LIBRARY NAMES nettle libnettle)
 
     if (NOT NETTLE_INCLUDE_DIRS OR NOT NETTLE_LIBRARY OR USE_CRYPTO_OPENSSL)

INSTALL.md

@@ -20,6 +20,7 @@ To build SuperTuxKart from source, you'll need to install the following packages
   * Freetype (libfreetype6-dev)
   * libcurl (libcurl-devel)
   * libbluetooth (bluez-devel)
+  * libnettle (nettle-dev)
   * libpng (libpng-devel)
   * zlib (zlib-devel)
   * jpeg (libjpeg-turbo-devel)
@@ -30,7 +31,7 @@ Ubuntu command:
 sudo apt-get install build-essential cmake libbluetooth-dev \
 libcurl4-openssl-dev libenet-dev libfreetype6-dev libfribidi-dev \
 libgl1-mesa-dev libglew-dev libjpeg-dev libogg-dev libopenal-dev libpng-dev \
-libssl-dev libvorbis-dev libxrandr-dev libx11-dev pkg-config zlib1g-dev
+libssl-dev libvorbis-dev libxrandr-dev libx11-dev nettle-dev pkg-config zlib1g-dev
 ```
 Fedora command:
 
@@ -38,7 +39,7 @@ Fedora command:
 sudo dnf install @development-tools cmake bluez-libs-devel \
 openssl-devel libcurl-devel freetype-devel fribidi-devel mesa-libGL-devel \
 libjpeg-turbo-devel libogg-devel openal-soft-devel libpng-devel \
-libvorbis-devel libXrandr-devel libGLEW pkgconf zlib-devel
+libvorbis-devel libXrandr-devel libGLEW nettle-devel pkgconf zlib-devel
 ```
 ### In-game recorder
 
@@ -48,14 +49,23 @@ Compilation instruction is explained there. If you don't need this feature, pass
 
 ### Compiling
 
-To compile SuperTuxKart, run the following commands inside `stk-code` directory:
+To compile SuperTuxKart, run the following commands inside `stk-code` directory
-
+ 
 ```bash
+# go into the stk-code directory
+cd stk-code
+ 
+# create and enter the cmake_build directory
 mkdir cmake_build
 cd cmake_build
+ 
+# run cmake to generate the makefile
 cmake ..
+ 
+# compile
 make -j4
 ```
+
 STK can then be run from the build directory with `bin/supertuxkart`
 
 #### Keeping your build up to date
@@ -195,6 +205,7 @@ brew install libvorbis
 brew install openal-soft
 brew install freetype
 brew install curl
+brew install nettle
 brew install openssl@1.1
 brew install fribidi
 brew install glew

NETWORKING.md

@@ -21,7 +21,7 @@ It will create that xml configuration file if not found in current directory, yo
 The current server configuration xml looks like this:
 ```xml
 <?xml version="1.0"?>
-<server-config version="3" >
+<server-config version="4" >
 
     <!-- Name of server, encode in XML if you want to use unicode characters. -->
     <server-name value="stk server" />
@@ -74,6 +74,12 @@ The current server configuration xml looks like this:
     <!-- Time to wait before entering kart selection screen if satisfied min-start-game-players below for owner less or ranked server. -->
     <start-game-counter value="60" />
 
+    <!-- Clients below this value will be rejected from joining this server. It's determined by number of official karts in client / number of official karts in server -->
+    <official-karts-threshold value="1" />
+
+    <!-- Clients below this value will be rejected from joining this server. It's determined by number of official tracks in client / number of official tracks in server, setting this value too high will prevent android players from joining this server, because STK android apk has some official tracks removed. -->
+    <official-tracks-threshold value="0.7" />
+
     <!-- Only auto start kart selection when number of connected player is larger than or equals this value, for owner less or ranked server, after start-game-counter reaches 0. -->
     <min-start-game-players value="2" />
 
@@ -89,6 +95,9 @@ The current server configuration xml looks like this:
     <!-- Server will submit ranking to stk addons server for linear race games, you require permission for that. validating-player, auto-end, strict-player and owner-less will be turned on. -->
     <ranked value="false" />
 
+    <!-- If true, the server owner can config the difficulty and game mode in the GUI of lobby. This option cannot be used with owner-less or grand prix server, and will be automatically turned on if the server was created using the in-game GUI. The changed difficulty and game mode will not be saved in this config file. -->
+    <server-configurable value="false" />
+
     <!-- Time in seconds when a flag is dropped a by player in CTF returning to its own base. -->
     <flag-return-timemout value="20" />
 
@@ -104,8 +113,8 @@ The current server configuration xml looks like this:
     <!-- Value used to calculate time limit in CTF, which is max(3.0, number of players * (time-limit-threshold-ctf + flag-return-timemout / 60.0)) * 60.0, negative value to disable time limit. -->
     <time-limit-threshold-ctf value="0.9" />
 
-    <!-- Value used by server to automatically calculate lap of each race in network game, if more than 0.0f, the number of lap of each track vote in linear race will be determined by max(1.0f, auto-lap-ratio * default lap of that track). -->
+    <!-- Value used by server to automatically estimate each game time. For races, it decides the lap of each race in network game, if more than 0.0f, the number of lap of each track vote in linear race will be determined by max(1.0f, auto-game-time-ratio * default lap of that track). For soccer if more than 0.0f, for time limit game it will be auto-game-time-ratio * soccer-time-limit in UserConfig, for goal limit game it will be auto-game-time-ratio * numgoals in UserConfig, -1 to disable for all. -->
-    <auto-lap-ratio value="-1" />
+    <auto-game-time-ratio value="-1" />
 
     <!-- Maximum ping allowed for a player (in ms). -->
     <max-ping value="300" />
@@ -116,6 +125,9 @@ The current server configuration xml looks like this:
     <!-- Kick players whose ping is above max-ping. -->
     <kick-high-ping-players value="false" />
 
+    <!-- Kick idle player which has no network activity to server for more than some seconds during game, unless he has finished the race. Negative value to disable, and this option will always be disabled for LAN server. -->
+    <kick-idle-player-seconds value="60" />
+
     <!-- ip: IP in X.X.X.X/Y (CIDR) format for banning, use Y of 32 for a specific ip, expired-time: unix timestamp to expire, -1 (uint32_t max) for a permanent ban. -->
     <server-ip-ban-list>
         <ban ip="0.0.0.0/0" expired-time="0"/>
@@ -163,7 +175,7 @@ x.x.x.x:y is your server ip address with its port, id is the id field of server-
 
 You can see STK server xml list [here](https://addons.supertuxkart.net/api/v2/server/get-all).
 
-The server you want to test must be able to be connected without NAT penetration. You can remove `--auto-connect` if you have another client which can control the starting of games in server, or you can consider enable owner-less mode on server so the games on server can keep going. Remove `--no-graphics` if you want to see the AI racing. You can also run network AI tester in server-only build of STK.
+You can remove `--auto-connect` if you have another client which can control the starting of games in server, or you can consider enable owner-less mode on server so the games on server can keep going. Remove `--no-graphics` if you want to see the AI racing. You can also run network AI tester in server-only build of STK.
 
 With the network AI tester, it's easier to for example simulate high-loaded servers or bad (high ping with packet loss) network.
 

android/AndroidManifest.xml

@@ -17,6 +17,7 @@
 
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
+                  android:launchMode="singleTask"
                   android:configChanges="fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|uiMode"
                   android:screenOrientation="sensorLandscape">
 

android/README.ANDROID

@@ -102,7 +102,10 @@ SDK_PATH        - Path to SDK directory
 NDK_PATH        - Path to NDK directory
 
 PROJECT_VERSION - Set Supertuxkart version number, for example "0.9.3" or 
-                  "git20170409" or whatever. 
+                  "git20170409" or whatever. The version must match with file
+                  assets/data/supertuxkart.$PROJECT_VERSION
+                  and that file must exist, because it is used for extracting 
+                  and loading game data.
                   Default is: git.
 
 PROJECT_CODE    - Set Supertuxkart version code that is used in the manifest 

android/generate_assets.sh

@@ -23,9 +23,10 @@ export KARTS="all"
 export TRACKS="abyss arena_candela_city battleisland cave cornfield_crossing   \
                endcutscene featunlocked fortmagma gplose gpwin hacienda        \
                icy_soccer_field introcutscene introcutscene2 lasdunasarena     \
-               lasdunassoccer lighthouse mines olivermath overworld sandtrack  \
+               lasdunassoccer lighthouse mines minigolf olivermath overworld   \
-               scotland snowmountain snowtuxpeak soccer_field stadium temple   \
+               sandtrack scotland snowmountain snowtuxpeak soccer_field        \
-               tutorial zengarden"
+               stadium stk_enterprise temple tutorial volcano_island xr591     \
+               zengarden"
 
 export ASSETS_PATHS="../data                    \
                      ../../stk-assets           \

cmake/FindWayland.cmake

@@ -9,6 +9,20 @@
 # WAYLAND_LIBRARIES
 #     Wayland library list
 
+find_package(PkgConfig REQUIRED)
+
+if(NOT PKGCONFIG_FOUND)
+    message(FATAL_ERROR "Pkg-config not found.")
+endif()
+
+pkg_check_modules(PKG_WAYLAND QUIET wayland-client)
+
+if(PKG_WAYLAND_FOUND)
+    set(WAYLAND_VERSION ${PKG_WAYLAND_VERSION})
+else()
+    set(WAYLAND_VERSION 0)
+endif()
+
 find_path(WAYLAND_CLIENT_INCLUDE_DIR wayland-client.h)
 find_path(WAYLAND_CURSOR_INCLUDE_DIR wayland-cursor.h)
 find_path(WAYLAND_EGL_INCLUDE_DIR wayland-egl.h)

data/challenges/abyss.challenge

@@ -7,11 +7,11 @@
     
     <best>
         <karts number="7"/>
-        <requirements position="1" time="140"/>
+        <requirements position="1" time="130"/>
     </best>
     <hard>
         <karts number="6"/>
-        <requirements position="1" time="165"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="5"/>

data/challenges/cornfield_crossing.challenge

@@ -7,11 +7,11 @@
     
     <best>
         <karts number="7"/>
-        <requirements position="1" time="140"/>
+        <requirements position="1" time="132"/>
     </best>
     <hard>
         <karts number="6"/>
-        <requirements position="1" time="165"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="5"/>

data/challenges/lighthouse.challenge

@@ -11,11 +11,11 @@
     </best>
     <hard>
         <karts number="9"/>
-        <requirements position="1"  time="145"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="8"/>
-        <requirements position="1" time="190"/>
+        <requirements position="1"/>
     </medium>
     <easy>
         <karts number="7"/>

data/challenges/mines.challenge

@@ -7,11 +7,11 @@
      
     <best>
         <karts number="10"/>
-        <requirements position="1" time="135"/>
+        <requirements position="1" time="122"/>
     </best>
     <hard>
         <karts number="9"/>
-        <requirements position="1" time="160"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="8"/>

data/challenges/minigolf.challenge

@@ -7,7 +7,7 @@
     
     <best>
         <karts number="10"/>
-        <requirements position="1" time="128"/>
+        <requirements position="1" time="122"/>
     </best>
     <hard>
         <karts number="9"/>

data/challenges/olivermath.challenge

@@ -7,11 +7,11 @@
 
     <best>
         <karts number="7"/>
-        <requirements position="1" time="95"/>
+        <requirements position="1" time="80"/>
     </best>
     <hard>
         <karts number="6"/>
-        <requirements position="1" time="110"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="5"/>

data/challenges/snowmountain.challenge

@@ -7,11 +7,11 @@
 
     <best>
         <karts number="10"/>
-        <requirements position="1" time="120"/>
+        <requirements position="1" time="112"/>
     </best>
     <hard>
         <karts number="9"/>
-        <requirements position="2" time="145"/>
+        <requirements position="1"/>
     </hard>
     <medium>
         <karts number="8"/>

data/challenges/snowpeak.challenge

@@ -7,7 +7,7 @@
     
     <best>
         <karts number="8"/>
-        <requirements position="1" time="110"/>
+        <requirements position="1" time="108"/>
     </best>
     <hard>
         <karts number="7"/>

data/challenges/stk_enterprise.challenge

@@ -7,7 +7,7 @@
     
     <best>
         <karts number="9"/>
-        <requirements position="1" time="140"/>
+        <requirements position="1" time="135"/>
     </best>
     <hard>
         <karts number="8"/>

data/challenges/volcano_island.challenge

@@ -7,7 +7,7 @@
     
     <best>
         <karts number="8"/>
-        <requirements position="1" time="165"/>
+        <requirements position="1" time="145"/>
     </best>
     <hard>
         <karts number="7"/>

data/challenges/xr591.challenge

@@ -7,11 +7,11 @@
     
     <best>
         <karts number="1"/>
-        <requirements energy="20" time="95"/>
+        <requirements energy="20" time="92"/>
     </best>
     <hard>
         <karts number="1"/>
-        <requirements energy="18" time="115"/>
+        <requirements energy="18" time="112"/>
     </hard>
     <medium>
         <karts number="1"/>

data/challenges/zengarden.challenge

@@ -7,7 +7,7 @@
     
     <best>
         <karts number="5"/>
-        <requirements position="1" time="102"/>
+        <requirements position="1" time="98"/>
     </best>
     <hard>
         <karts number="4"/>

data/grandprix/3_tothemoonandback.grandprix

@@ -4,7 +4,7 @@
     <track id="gran_paradiso_island" laps="3" reverse="false" />
     <track id="greenvalley"          laps="3" reverse="false" />
     <track id="mansion"              laps="3" reverse="false" />
-    <track id="lighthouse"           laps="3" reverse="false" />
+    <track id="lighthouse"           laps="4" reverse="false" />
     <track id="candela_city"         laps="3" reverse="false" />
     
 </supertuxkart_grand_prix>

data/grandprix/4_atworldsend.grandprix

@@ -1,7 +1,7 @@
 
 <supertuxkart_grand_prix name="At World's End">
 
-    <track id="stk_enterprise" laps="4" reverse="false" />
+    <track id="stk_enterprise" laps="3" reverse="false" />
     <track id="snowmountain"   laps="3" reverse="false" />
     <track id="minigolf"       laps="4" reverse="false" />
     <track id="xr591"          laps="3" reverse="false" />

data/gui/dialogs/online/server_configuration_dialog.stkgui

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
+        <header id="title" text_align="center" width="80%" align="center" I18N="In the server configuration screen" text="Server Configuration"/>
+        <box proportion="1" width="90%" layout="vertical-row" align="center">
+
+            <label width="100%" height="8%" text_align="left" I18N="In the server configuration screen" text="Difficulty"/>
+            <ribbon id="difficulty" height="25%" width="90%" align="center">
+                <icon-button id="novice" width="128" height="128" icon="gui/icons/difficulty_easy.png"
+                        I18N="Difficulty" text="Novice"/>
+                <icon-button id="intermediate" width="128" height="128" icon="gui/icons/difficulty_medium.png"
+                        I18N="Difficulty" text="Intermediate"/>
+                <icon-button id="expert" width="128" height="128" icon="gui/icons/difficulty_hard.png"
+                        I18N="Difficulty"  text="Expert"/>
+                <icon-button id="best" width="128" height="128" icon="gui/icons/difficulty_best.png"
+                        I18N="Difficulty"  text="SuperTux"/>
+            </ribbon>
+
+            <spacer height="1%" width="20"/>
+
+            <label width="100%" height="8%" text_align="left" I18N="In the server configuration screen" text="Game mode"/>
+            <ribbon id="gamemode" height="25%" width="90%" align="center">
+                <icon-button id="normal" width="128" height="128" icon="gui/icons/mode_normal.png"
+                        I18N="Multiplayer game mode" text="Normal Race"/>
+                <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
+                        I18N="Multiplayer game mode" text="Time Trial"/>
+                <icon-button id="3strikes" width="128" height="128" icon="gui/icons/weapons.png"
+                        I18N="Multiplayer game mode" text="Battle"/>
+                <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
+                        I18N="Multiplayer game mode" text="Soccer"/>
+            </ribbon>
+
+            <spacer height="1%" width="20"/>
+
+            <div width="100%" height="10%" layout="horizontal-row" >
+                <label id="more-options"  proportion="1" text_align="left"/>
+                <spinner id="more-options-spinner" proportion="1" wrap_around="true"/>
+            </div>
+
+            <spacer height="1%" width="20"/>
+
+            <buttonbar id="options" x="0" y="0" width="40%" height="18%" align="center">
+                <icon-button id="ok" width="64" height="64" icon="gui/icons/green_check.png"
+                             I18N="In the server configuration screen" text="OK" label_location="bottom"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
+                             I18N="In the server configuration screen" text="Cancel" label_location="bottom"/>
+            </buttonbar>
+
+            <spacer height="3%" width="20"/>
+        </box>
+    </div>
+</stkgui>

data/gui/icons/License.txt

@@ -41,6 +41,7 @@ crown.png by glitch, from https://openclipart.org/detail/210257/misc-game-crown,
 ghost_plus.png by Alayan, based on https://openclipart.org/detail/17847/cartoon-ghost by lemmling, released under CC-O
 
 options_language.png by Alayan, based on http://www.languageicon.org/, released under CC-BY-SA 3+
+options_general.png by Alayan, released under CC-BY-SA 4
 
 blue_flag.png, heart.png and red_flag.png by Benau, released under CC-BY-SA 4
 

data/gui/screens/addons_screen.stkgui

@@ -34,7 +34,7 @@
         </tabs>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-            <list id="list_addons" x="0" y="0" width="100%" height="100%" word_wrap="true"/>
+            <list id="list_addons" x="0" y="0" width="100%" height="100%" word_wrap="true" alternate_bg="true"/>
         </box>
     </div>
 </stkgui>

data/gui/screens/ghost_replay_selection.stkgui

@@ -10,7 +10,7 @@
 
         <!-- This is filled in programmatically -->
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-            <list id="replay_list" x="0" y="0" width="100%" height="100%"/>
+            <list id="replay_list" x="0" y="0" width="100%" height="100%" alternate_bg="true"/>
         </box>
 
         <tabs id="race_mode" height="6%" max_height="110" x="1%" width="98%" align="center">

data/gui/screens/karts.stkgui

@@ -2,11 +2,13 @@
 <stkgui>
     <div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
 
-        <header width="80%"
+        <header width="80%" height="7%"
                I18N="In the kart selection (player setup) screen"
                text="Choose a Kart"
                align="center" text_align="center" />
 
+        <spacer height="1%" width="25"/>
+
         <placeholder id="playerskarts" width="100%" align="center" proportion="4">
             <!-- Contents is added programatically -->
         </placeholder>

data/gui/screens/online/create_server.stkgui

@@ -56,7 +56,7 @@
 
             <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
 
-            <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
+            <buttonbar id="options" x="0" y="0" width="40%" height="12%" align="center">
                 <icon-button id="create" width="64" height="64" icon="gui/icons/green_check.png"
                              I18N="In the server creation screen" text="Create" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"

data/gui/screens/online/networking_lobby.stkgui

@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
-        <header id="lobby-text" text_align="center" width="80%" align="center" I18N="In networking lobby" text="Lobby"/>
+        <header id="lobby-text" text_align="center" width="80%" height="7%" align="center" I18N="In networking lobby" text="Lobby"/>
-        <spacer height="1%" width="10"/>
+        <spacer height="2%" width="10"/>
         <div proportion="9" x="2%" width="96%" layout="vertical-row">
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
                     <label word_wrap="true" id="text" proportion="3" width="100%" height="100%" text_valign="top"/>
                 </box>
-                <spacer width="3%" height="20"/>
+                <spacer width="3%" height="10"/>
                 <box proportion="1" height="100%" layout="vertical-row">
                     <list id="players" width="100%" height="100%"/>
                 </box>
             </div>
         </div>
         <spacer height="2%"/>
-        <div x="2%" width="96%" height="fit" layout="horizontal-row">
+        <div x="2%" width="96%" height="20%" layout="horizontal-row">
-            <box proportion="4" height="fit" layout="vertical-row">
+            <box proportion="2" height="100%" layout="vertical-row">
-                <textbox id="chat" width="100%"/>
+                <div x="1%" width="98%" height="fit" layout="horizontal-row">
-                <spacer height="10"/>
+                    <textbox id="chat" proportion="1"/>
-                <div width="100%" height="fit" layout="horizontal-row">
+                    <spacer width="3%" height="10"/>
-                    <button id="send" width="20%" height="fit" I18N="In the network lobby" text="Send" />
+                    <button id="send" width="20%" height="fit" align="center" I18N="In the network lobby" text="Send"/>
-                    <spacer width="1%"/>
-                    <label id="timeout-message" width="79%" height="fit"/>
                 </div>
+                <spacer height="5%" width="10"/>
+                <label id="timeout-message" x="1%" width="98%" proportion="1" text="" word_wrap="true" align="center"/>
             </box>
             <spacer width="3%"/>
-            <icon-button id="start" proportion="1" width="64" height="64" icon="gui/icons/green_check.png" align="top"
+            <div proportion="1" height="100%" layout="vertical-row">
-                I18N="In the network lobby" text="Start race"/>
+                <spacer height="20%" width="10"/>
-            <icon-button id="exit" proportion="1" width="64" height="64" icon="gui/icons/main_quit.png" align="top"
+                <div width="100%" proportion="1" layout="horizontal-row">
-                I18N="In the network lobby" text="Exit"/>
+                    <icon-button id="start" proportion="1" height="60%" icon="gui/icons/green_check.png" align="top"
+                        I18N="In the network lobby" text="Start race"/>
+                    <icon-button id="config" proportion="1" height="60%" icon="gui/icons/main_options.png" align="top"
+                        I18N="In the network lobby" text="Configuration"/>
+                </div>
+            </div>
         </div>
-        <spacer height="1%"/>
+        <spacer height="2%"/>
     </div>
     <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
 </stkgui>

data/gui/screens/online/server_selection.stkgui

@@ -9,7 +9,8 @@
         </div>
 
         <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
-            <list id="server_list" x="0" y="0" width="100%" height="93%"/>
+            <list id="server_list" x="0" y="0" width="100%" height="93%" word_wrap="true"
+                  alternate_bg="true" line_height="small"/>
             <textbox id="searcher" width="100%" height="7%"/>
         </box>
         <div width="99%" align="center" layout="vertical-row" height="fit">

data/gui/screens/options_audio.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"

data/gui/screens/options_device.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"

data/gui/screens/options_general.stkgui

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
+    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
+        <header width="80%" height="7%" align="center" text="SuperTuxKart Options" text_align="center"/>
+        <spacer width="100%" height="1%"/>
+
+        <div width="100%" height="92%" layout="horizontal-row" >
+
+            <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
+                <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
+                        I18N="Section in the settings menu" text="Graphics"/>
+                <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
+                        I18N="Section in the settings menu" text="Audio"/>
+                <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
+                        I18N="Section in the settings menu" text="User Interface"/>
+                <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
+                        I18N="Section in the settings menu" text="Players"/>
+                <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
+                        I18N="Section in the settings menu" text="Controls"/>
+                <icon-button id="tab_language" width="128" height="128" icon="gui/icons/options_language.png"
+                        I18N="Section in the settings menu" text="Language"/>
+            </vertical-tabs>
+
+            <spacer width="2%" height="100%"/>
+
+            <div width="100%" height="100%" layout="vertical-row" >
+                <box width="80%" height="49%" layout="vertical-row">
+
+                    <spacer width="5" height="2%"/>
+
+                    <label width="80%" height="fit" align="center" I18N="In the general settings" text="Internet options" text_align="center"/>
+
+                    <spacer width="5" height="4%"/>
+
+                    <div layout="horizontal-row" width="100%" height="fit">
+                        <checkbox id="enable-internet"/>
+                        <spacer width="1%" height="100%" />
+                        <label height="100%" I18N="In the general settings" text="Connect to the Internet" word_wrap="true"/>
+                    </div>
+
+                    <spacer width="5" height="4%"/>
+                    
+                    <div layout="horizontal-row" width="100%" height="fit">
+                        <checkbox id="enable-hw-report"/>
+                        <spacer width="1%" height="100%" />
+                        <label height="100%" id="label-hw-report" I18N="In the general settings"
+                               text="Send anonymous hardware statistics" word_wrap="true"/>
+                    </div>
+
+                    <spacer width="5" height="4%"/>
+
+                    <div layout="horizontal-row" width="100%" height="fit">
+                        <checkbox id="show-login"/>
+                        <spacer width="1%" height="100%" />
+                        <label height="100%" I18N="In the general settings" text="Always show login screen" word_wrap="true"/>
+                    </div>
+
+                    <spacer width="5" height="4%"/>
+
+                    <div layout="horizontal-row" width="100%" height="fit">
+                        <checkbox id="enable-lobby-chat"/>
+                        <spacer width="1%" height="100%" />
+                        <label height="100%" id="label-lobby-chat" I18N="In the general settings" text="Enable chatting in networking lobby" word_wrap="true"/>
+                    </div>
+
+                    <spacer width="5" height="4%"/>
+                </box>
+
+                <spacer width="5" height="2%"/>
+
+                <box width="80%" height="49%" layout="vertical-row">
+
+                   <spacer width="5" height="2%"/>
+
+                   <label width="80%" height="fit" align="center" I18N="In the general settings" text="Miscellaneous options" text_align="center"/>
+
+                   <spacer width="5" height="4%"/>
+
+                   <div layout="horizontal-row" width="100%" height="fit">
+                       <checkbox id="perPlayerDifficulty"/>
+                       <spacer width="1%" height="100%" />
+                       <label height="100%" I18N="In the general settings" text="Enable per-player handicaps" word_wrap="true"/>
+                   </div>
+
+                   <spacer width="5" height="4%"/>
+               </box>
+            </div>
+        </div>
+    </div>
+</stkgui>

data/gui/screens/options_input.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"

data/gui/screens/options_language.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"

data/gui/screens/options_players.stkgui

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<stkgui>
-    <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
-
-        <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
-        <spacer height="15" width="10"/>
-
-        <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
-            <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"/>
-            <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"/>
-            <icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"/>
-            <icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
-                    I18N="Section in the settings menu" text="Players"/>
-            <icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"/>
-        </tabs>
-
-        <box proportion="1" width="100%" layout="vertical-row">
-
-            <spacer width="5" height="5"/>
-
-            <div layout="horizontal-row" width="75%" height="fit" align="center">
-                <spacer proportion="1"/>
-                <label text="You are playing as" height="100%"/>
-                <spacer width="2%" height="1"/>
-                <button id="playername" width="27%" align="center"/>
-                <spacer proportion="1"/>
-            </div>
-
-            <spacer width="5" height="10"/>
-
-            <label width="100%"
-                I18N="In the player configuration screen"
-                text="Press enter or double-click on a player to edit their settings"
-                text_align="center" />
-
-            <spacer width="5" height="20"/>
-            <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
-                <list id="players" x="0" y="0" width="100%" height="100%"/>
-            </box>
-            <spacer width="20" height="25"/>
-
-            <button id="addplayer" x="20"
-                    I18N="In the player configuration screen"
-                    text="Add Player" align="center"/>
-
-            <spacer width="20" height="15"/>
-        </box>
-    </div>
-
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/icons/back.png"/>
-</stkgui>

data/gui/screens/options_ui.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
@@ -64,47 +66,6 @@
                 </div>
 
                 <spacer width="5" height="2%"/>
-
-                <div layout="horizontal-row" width="100%" height="fit">
-                    <checkbox id="perPlayerDifficulty"/>
-                    <spacer width="1%" height="100%" />
-                    <label height="100%" I18N="In the ui settings" text="Enable per-player handicaps" word_wrap="true"/>
-                </div>
-
-                <spacer width="5" height="2%"/>
-
-                <div layout="horizontal-row" width="100%" height="fit">
-                    <checkbox id="enable-internet"/>
-                    <spacer width="1%" height="100%" />
-                    <label height="100%" I18N="In the ui settings" text="Connect to the Internet" word_wrap="true"/>
-                </div>
-
-                <spacer width="5" height="2%"/>
-                    
-                <div layout="horizontal-row" width="100%" height="fit">
-                    <checkbox id="enable-hw-report"/>
-                    <spacer width="1%" height="100%" />
-                    <label height="100%" id="label-hw-report" I18N="In the ui settings"
-                           text="Send anonymous hardware statistics" word_wrap="true"/>
-                </div>
-
-                <spacer width="5" height="2%"/>
-
-                <div layout="horizontal-row" width="100%" height="fit">
-                    <checkbox id="show-login"/>
-                    <spacer width="1%" height="100%" />
-                    <label height="100%" I18N="In the ui settings" text="Always show login screen" word_wrap="true"/>
-                </div>
-
-                <spacer width="5" height="2%"/>
-
-                <div layout="horizontal-row" width="100%" height="fit">
-                    <checkbox id="enable-lobby-chat"/>
-                    <spacer width="1%" height="100%" />
-                    <label height="100%" id="label-lobby-chat" I18N="In the ui settings" text="Enable chatting in networking lobby" word_wrap="true"/>
-                </div>
-
-                <spacer width="5" height="2%"/>
             </box>
         </div>
     </div>

data/gui/screens/options_video.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"
@@ -66,14 +68,14 @@
                     <spacer width="40" height="100%" />
                     <checkbox id="fullscreen"/>
                     <spacer width="20" height="100%" />
-                    <label height="100%" I18N="In the video settings" text="Fullscreen"/>
+                    <label id="fullscreenText" height="100%" I18N="In the video settings" text="Fullscreen"/>
                 </div>
 
                 <div width="75%" layout="horizontal-row" height="fit">
                     <spacer width="40" height="100%" />
                     <checkbox id="rememberWinpos"/>
                     <spacer width="20" height="100%" />
-                    <label I18N="In the video settings" text="Remember window location"/>
+                    <label id="rememberWinposText" I18N="In the video settings" text="Remember window location"/>
                 </div>
 
                 <spacer width="5" height="1%"/>

data/gui/screens/user_screen_tab.stkgui

@@ -8,6 +8,8 @@
         <div width="100%" height="92%" layout="horizontal-row" >
 
             <vertical-tabs id="options_choice" height="100%" width="18%">
+                <icon-button id="tab_general" width="128" height="128" icon="gui/icons/options_general.png"
+                        I18N="Section in the settings menu" text="General"/>
                 <icon-button id="tab_video" width="128" height="128" icon="gui/icons/options_video.png"
                         I18N="Section in the settings menu" text="Graphics"/>
                 <icon-button id="tab_audio" width="128" height="128" icon="gui/icons/options_audio.png"

data/items.xml

@@ -8,7 +8,7 @@
        isn't an item, it is internally 
        handled as one, so list it here    -->
   <bubblegum   model="bubblegum.spm"       lowmodel="bubblegum-low.spm"       glow="246 150 209"/>
-  <bubblegum-nolok   model="bubblegum-nolok.spm" lowmodel="bubblegum-nolok-low.spm"/>
+  <bubblegum-nolok   model="bubblegum-nolok.spm" lowmodel="bubblegum-nolok-low.spm" glow="20 190 0"/>
   <easter-egg  model="easter_egg.spm" glow="0 60 120" />
 </items>
 

data/kart_characteristics.xml

@@ -35,7 +35,7 @@
                 for details.
             max-force: Maximum suspension force -->
         <suspension stiffness="280" rest="0.3" travel="0.29"
-            exp-spring-response="false" max-force="12000" />
+            exp-spring-response="false" max-force="32000" />
 
         <!-- Values related to stability of the chassis: damping, and reduced
                 impact of roll.
@@ -66,7 +66,7 @@
                 speed 10 the radius is 7.5 etc.
                 The actual turn radius is piece-wise linearly interpolated. This
                 allows for tighter turning at lower speeds, and also avoids that
-                the kart becomes too hard to control at high speed (speeds of
+                the kart becomes too hard to control at high speed (speeds
                 higher than 25 can only be reached with powerups).
             time-full-steer: This is the amount of change in steering depending
                 on current steering. So if the steering is between 0 and 0.5,
@@ -84,8 +84,12 @@
               time-reset-steer="0.1" />
 
         <!-- Speed and acceleration
-            power: The power of the kart
+            power: The power of the kart (the engine power needed to accelerate
+                   at a given pace is proportional to mass)
             max-speed: The base maximum speed of the kart in m/s
+            generic-max-speed: Must have the same value as max-speed. This
+                       is the max speed independently of kart type and
+                       of handicap, which is used by basket balls.
             brake-factor: Value used when braking.
             brake-time-increase: The brake force is multiplied by
                 (1 + brake_time) * brake_time_increase - i.e. the longer the
@@ -93,18 +97,19 @@
             max-speed-reverse-ratio is the percentage of max speed for reverse
                 gear.
           -->
-        <engine power="875" max-speed="25" brake-factor="15"
+        <engine power="950" max-speed="25" generic-max-speed="25" brake-factor="15"
                 brake-time-increase="6" max-speed-reverse-ratio="0.65" />
 
         <!-- Simulated gears
             switch-ratio defines at what ratio of the maximum
                 speed what gear is selected, e.g. 0.25 means that if the speed is
-                bigger or equal to 0.25 * maxSpeed then use gear 1, 0.5 means if
+                inferior or equal to 0.25 * maxSpeed then use gear 1, 0.5 means if
-                the speed is bigger or equal to 0.5 x maxSpeed then gear 2.
+                the speed is inferior or equal to 0.5 x maxSpeed then gear 2.
                 gear-power-increase contains the increase in max power (to simulate
                 different gears), e.g. 2.5 as first entry means: 2.5 * maxPower in gear 1
                 | first  | second |  third | . -->
-        <gear switch-ratio="0.25 0.7 1.0" power-increase="2.2 1.7 1.3" />
+        <gear switch-ratio="0.2 0.45 0.7 1 1.25"
+              power-increase="2.5 2.1 1.7 1.4 1.2" />
 
         <!-- Mass of a kart -->
         <mass value="350" />
@@ -117,7 +122,7 @@
                 position of the physics raycast wheels relative to the center of
                 gravity. Default is to use the corners of the chassis to attach
                 the wheels to. -->
-        <wheels damping-relaxation="35"  damping-compression="5">
+        <wheels damping-relaxation="35"  damping-compression="15">
             <front-right position="0.38 0 0.6"   />
             <front-left  position="-0.38 0 0.6"  />
             <rear-right  position="0.38 0 -0.6"  />
@@ -205,9 +210,9 @@
         <anvil duration="2.0" weight="150"  speed-factor="0.2" />
 
         <!-- Parachute
-            friction: The friction increase when a parachute is attached.
+            friction: The friction factor when a parachute is attached.
             duration: The time an attached parachute is active
-            duration-other: The time a parachute attached from other kart works
+            duration-other: Used when the parachute results from item use
             duration-rank-mult: The multiplier applied to the duration of the
             parachute on the 1st kart when affected by the item. Scale for
             intermediary ranks to 1.0 for the last affected.
@@ -220,9 +225,9 @@
                 detach parachute. E.g. at max-speed 50% of speed must be lost.
             max-speed: A factor that decides the impact of rate of speed
                 (distance between bounds) -->
-        <parachute friction="2.0" duration="2.0" duration-other="2.6"
+        <parachute friction="5.0" duration="3" duration-other="2.5"
-                   duration-rank-mult="1.35" duration-speed-mult="2.0"
+                   duration-rank-mult="1.5" duration-speed-mult="1.35"
-                   lbound-fraction="0.8" ubound-fraction="0.5" max-speed="23" />
+                   lbound-fraction="0.5" ubound-fraction="0.3" max-speed="30" />
         <!-- Bubblegum
             duration: How long the bubblegum lasts.
             speed-fraction: To what fraction of top-speed the speed is reduced.
@@ -273,7 +278,7 @@
             fields must have the same size, and must be sorted by
             increasing times. -->
         <startup time="0.3 0.5"
-                 boost="6 3" />
+                 boost="8 4" />
 
         <!-- Rescue
             duration: How long it takes the kart to be raised.
@@ -292,11 +297,12 @@
                 after being hit by an explosion.
             radius: Kart closer to this value will be affected by
                 an explosion as well.  -->
-        <explosion duration="2" radius="5"
+        <explosion duration="1.5" radius="6"
-                   invulnerability-time="6" />
+                   invulnerability-time="7" />
 
         <!-- Nitro
             engine-force: additional engine power
+            engine-mult: multiply the total engine power by this
             consumption: nitro consumption - heavier characters can be set
                 to need more nitro than lighter character.
             small-container: how much energy a small container gives.
@@ -308,8 +314,9 @@
             fade-out-time: Duration during which the increased maximum
                 speed due to nitro fades out.
             max: How much nitro a kart can store. -->
-        <nitro engine-force="600" consumption="1" small-container="1" big-container="3"
+        <nitro engine-force="300" engine-mult="1.2" consumption="1"
-               max-speed-increase="5" duration="1" fade-out-time="2" max="20" />
+               small-container="1" big-container="3"
+               max-speed-increase="5" duration="1" fade-out-time="2.4" max="20" />
 
         <!-- Slipstream
             base-speed: the speed for which length and width are valid.
@@ -331,22 +338,22 @@
             fade-out-time: How long the slip stream speed increase will
                 gradually be reduced.  -->
         <slipstream base-speed="20" length="8" width="4" inner-factor="0.5"
-                    min-collect-time="3" max-collect-time="8" add-power="300" min-speed="8"
+                    min-collect-time="2.5" max-collect-time="8" add-power="300" min-speed="8"
-                    max-speed-increase="5" duration-factor="1" fade-out-time="2" />
+                    max-speed-increase="3" duration-factor="1" fade-out-time="2" />
     </characteristic>
 
     <!-- The different difficulties (like easy, medium, hard) -->
     <difficulties>
         <characteristic name="easy">
-            <engine power="*0.66" max-speed="*0.6" />
+            <engine power="*0.7" max-speed="*0.6" generic-max-speed="*0.6" />
             <plunger in-face-time="3" />
         </characteristic>
         <characteristic name="medium">
-            <engine power="*0.77" max-speed="*0.8" />
+            <engine power="*0.83" max-speed="*0.8" generic-max-speed="*0.8" />
             <plunger in-face-time="4" />
         </characteristic>
         <characteristic name="hard">
-            <engine power="*0.89" max-speed="*0.92" />
+            <engine power="*0.92" max-speed="*0.92" generic-max-speed="*0.92" />
         </characteristic>
         <!-- This doesn't need to be changed because the most fast/heavy/extreme
             values should also be the default ones. -->
@@ -356,44 +363,40 @@
     <!-- The different kart types, that can be specified in the kart.xml file -->
     <kart-types>
         <characteristic name="light">
-            <engine power="*0.46" max-speed="*0.92" brake-factor="*1"
+            <turn radius="0:2.0 10:7.5 25:15 45:30" />
-                 max-speed-reverse-ratio="*0.77" />
+            <engine power="*0.8" max-speed="*0.95" brake-factor="*1"
-            <gear switch-ratio="0.20 0.55 1" power-increase="5 4 3" />
+                 max-speed-reverse-ratio="*0.8" />
-            <mass value="*0.56" />
+            <gear switch-ratio="0.1 0.25 0.45 0.7 1.0 4.0"
-            <startup time="0.3 0.5"
+                  power-increase="2.8 2.3 1.9 1.5 1.25 1.0" />
-                     boost="8.5 4.5" />
+            <mass value="*0.6" />
-            <explosion time="2.1" radius="5.5"
+            <startup boost="*1 *1" />
-                       invulnerability-time="7" />
+            <explosion time="*1" radius="*1" />
-            <nitro engine-force="350" max-speed-increase="4.5" duration="1.5"
+            <nitro engine-force="*0.6" max-speed-increase="*0.9" duration="*1" />
-                   fade-out-time="2.5" />
             <slipstream length="*0.9" collect-time="*0.9"
                         duration-factor="*1" fade-out-time="*1" />
         </characteristic>
         <characteristic name="medium">
-            <engine power="*0.63" max-speed="*1" brake-factor="*0.73"
+            <turn radius="0:2.3 10:8.625 25:17.25 45:34.5" />
-                    max-speed-reverse-ratio="*0.62" />
+            <engine power="*0.875" max-speed="*1" brake-factor="*0.8"
-            <gear switch-ratio="0.30 0.7 1.0" power-increase="2.2 2.2 2.5" />
+                    max-speed-reverse-ratio="*0.75" />
-            <mass value="*0.71" />
+            <gear switch-ratio="0.1 0.25 0.45 0.7 1 4"
-            <startup time="0.3 0.5"
+                  power-increase="2.4 2 1.7 1.4 1.2 1" />
-                     boost="4.2 2.6" />
+            <mass value="*0.75" />
-            <explosion time="1.8" radius="5"
+            <startup boost="*0.8 *0.8" />
-                       invulnerability-time="6" />
+            <explosion time="*0.8" radius="*0.8" />
-            <nitro engine-force="425" consumption="1.4" duration="1" />
+            <nitro engine-force="*0.75" consumption="*1.25" />
             <slipstream duration-factor="*0.8" fade-out-time="*1" />
         </characteristic>
         <characteristic name="heavy">
-            <engine power="*1" max-speed="*1" brake-factor="*0.66"
+            <turn radius="0:2.6 10:9.75 25:19.5 45:39" />
-                    max-speed-reverse-ratio="*1" />
+            <engine power="*1" max-speed="*1.05" brake-factor="*0.6"
-            <gear switch-ratio="0.45 0.70 1" power-increase="1.5 1.7 2.5" />
+                    max-speed-reverse-ratio="*0.7" />
+            <gear switch-ratio="0.1 0.25 0.45 0.7 1 4"
+                  power-increase="2 1.7 1.5 1.3 1.15 1" />
             <mass value="*1" />
-            <swatter duration="10" distance="3" squash-duration="5"
+            <startup boost="*0.6 *0.6" />
-                     squash-slowdown="0.5" />
+            <explosion time="*0.6" radius="*0.6" />
-            <startup time="0.3 0.5"
+            <nitro engine-force="*1" consumption="*1.67" max-speed-increase="*1.1" />
-                     boost="3.8 2" />
-            <explosion time="1.5" radius="4"
-                       invulnerability-time="6" />
-            <nitro engine-force="600" consumption="2" max-speed-increase="8"
-                   duration="0.7" fade-out-time="1.3" />
             <slipstream length="*1.1" collect-time="*1.1"
                    duration-factor="*0.6" fade-out-time="*1" />
         </characteristic>