All of high-score's changes have been applied to the trunk successfully.

git-svn-id: https://s.snth.net/svn/neverball/trunk@2088 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/data/map-easy/bumper.map b/data/map-easy/bumper.map
index 0838e97..51bf0cc 100644 (file)
--- a/data/map-easy/bumper.map
+++ b/data/map-easy/bumper.map
@@ -12,6 +12,7 @@
 "goal" "30"
 "time_hs" "300 2000"
 "coin_hs" "88 50"
+"goal_hs" "2000 5000"
 "message" "Try to avoid being hit by moving objects.\One bump can throw the ball\completely out of control.\"
 // brush 0
 {

diff --git a/data/map-easy/bumps.map b/data/map-easy/bumps.map
index 6227557..884f232 100644 (file)
--- a/data/map-easy/bumps.map
+++ b/data/map-easy/bumps.map
@@ -12,6 +12,7 @@
 "goal" "30"
 "time_hs" "500 3000"
 "coin_hs" "190 60"
+"goal_hs" "1500 4500"
 "message" "Learn to control a bouncing ball.\Look at the shadow to know where the\ball will land.  If you're feeling confident in\your mastery of bouncing, take a risk\for a big payoff.\"
 // brush 0
 {

diff --git a/data/map-easy/coins.map b/data/map-easy/coins.map
index 3a82e5c..173975f 100644 (file)
--- a/data/map-easy/coins.map
+++ b/data/map-easy/coins.map
@@ -12,6 +12,7 @@
 "goal" "50"
 "time_hs" "300 1000"
 "coin_hs" "112 80"
+"goal_hs" "2000 4000"
 "message" "This time you must get 50 coins to unlock the goal.\Collect 100 coins to earn an extra ball.\Red coins are worth 5, blue coins are worth 10.\Get to the goal before time expires!\\Click to begin.\"
 // brush 0
 {

diff --git a/data/map-easy/corners.map b/data/map-easy/corners.map
index f5f1873..5564aa7 100644 (file)
--- a/data/map-easy/corners.map
+++ b/data/map-easy/corners.map
@@ -3,6 +3,7 @@
 "classname" "worldspawn"
 "coin_hs" "196 146"
 "time_hs" "400 3000"
+"goal_hs" "400 4000"
 "goal" "50"
 "time" "6000"
 "song" "bgm/track4.ogg"

diff --git a/data/map-easy/curved.map b/data/map-easy/curved.map
index d336a4f..958baa5 100644 (file)
--- a/data/map-easy/curved.map
+++ b/data/map-easy/curved.map
@@ -4,6 +4,7 @@
 "message" "As before, but without the training wheels.\Keep the ball on a level floor\and maintain precise control.\Build some momentum to reach the corners.\"
 "coin_hs" "91 50"
 "time_hs" "500 2000"
+"goal_hs" "1000 3250"
 "goal" "20"
 "time" "6000"
 "song" "bgm/track5.ogg"

diff --git a/data/map-easy/easy.map b/data/map-easy/easy.map
index 734b838..5edd457 100644 (file)
--- a/data/map-easy/easy.map
+++ b/data/map-easy/easy.map
@@ -12,6 +12,7 @@
 "goal" "10"
 "time_hs" "350 1000"
 "coin_hs" "18 15"
+"goal_hs" "2000 4500"
 "message" "Move the mouse to tilt the floor.\Collect 10 coins to unlock the goal.\Guide the ball to the goal to\finish the level.\\Click to begin.\"
 // brush 0
 {

diff --git a/data/map-easy/easyhalfpipe.map b/data/map-easy/easyhalfpipe.map
index eb3245f..ad6fda2 100644 (file)
--- a/data/map-easy/easyhalfpipe.map
+++ b/data/map-easy/easyhalfpipe.map
@@ -10,8 +10,9 @@
 "song" "bgm/track3.ogg"
 "time" "12000"
 "goal" "10"
-"time_hs" " "
-"coin_hs" " "
+"time_hs" "750 2000"
+"coin_hs" "116 60"
+"goal_hs" "2500 6000"
 // brush 0
 {
 ( 72 2080 0 ) ( 72 1952 0 ) ( -56 2080 0 ) mtrl/turf-shiny 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-easy/fence.map b/data/map-easy/fence.map
index 0366814..b387765 100644 (file)
--- a/data/map-easy/fence.map
+++ b/data/map-easy/fence.map
@@ -12,6 +12,7 @@
 "goal" "20"
 "time_hs" "500 2000"
 "coin_hs" "56 35"
+"goal_hs" "750 1875"
 "message" "''Flat'' is relative.\Learn to hold the floor at an angle\so that a slope remains level.\This way, you maintain full control of the ball.\Use momentum to get up to the big coins.\"
 // brush 0
 {

diff --git a/data/map-easy/goals.map b/data/map-easy/goals.map
index 568f003..789c6e3 100644 (file)
--- a/data/map-easy/goals.map
+++ b/data/map-easy/goals.map
@@ -12,6 +12,7 @@
 "goal" "10"
 "time_hs" "100 500"
 "coin_hs" "100 50"
+"goal_hs" "500 1500"
 "message" "There are 100 coins here.\This one shouldn't be too difficult,\if you don't accidentally make a goal first.\"
 // brush 0
 {

diff --git a/data/map-easy/goslow.map b/data/map-easy/goslow.map
index 812f133..5320e9c 100644 (file)
--- a/data/map-easy/goslow.map
+++ b/data/map-easy/goslow.map
@@ -4,6 +4,7 @@
 "message" "Tilt the floor as little as possible.\Less tilt means lower speed.\Lower speed means better control.\Watch the clock and use the time wisely.\\Click to begin.\"
 "coin_hs" "50 40"
 "time_hs" "700 3000"
+"goal_hs" "2000 5250"
 "goal" "20"
 "time" "9000"
 "song" "bgm/track2.ogg"

diff --git a/data/map-easy/greed.map b/data/map-easy/greed.map
index b65756d..a9bf260 100644 (file)
--- a/data/map-easy/greed.map
+++ b/data/map-easy/greed.map
@@ -3,6 +3,7 @@
 "classname" "worldspawn"
 "coin_hs" "220 140"
 "time_hs" "550 3000"
+"goal_hs" "800 4000"
 "goal" "24"
 "time" "9000"
 "song" "bgm/track5.ogg"

diff --git a/data/map-easy/groundbreak.map b/data/map-easy/groundbreak.map
index 47332f8..3c974d2 100644 (file)
--- a/data/map-easy/groundbreak.map
+++ b/data/map-easy/groundbreak.map
@@ -10,8 +10,9 @@
 "song" "bgm/track1.ogg"
 "time" "12000"
 "goal" "10"
-"time_hs" " "
-"coin_hs" " "
+"time_hs" "500 1500"
+"coin_hs" "56 28"
+"goal_hs" "2000 5500"
 "bonus" "1"
 // brush 0
 {

diff --git a/data/map-easy/hole.map b/data/map-easy/hole.map
index e15cc4a..3367448 100644 (file)
--- a/data/map-easy/hole.map
+++ b/data/map-easy/hole.map
@@ -4,6 +4,7 @@
 "message" "Stay away from the edges!\When approaching a drop, begin slowing down\early. You need just as much room to slow\down as you did to speed up.\"
 "coin_hs" "34 28"
 "time_hs" "350 2000"
+"goal_hs" "1200 2500"
 "goal" "20"
 "time" "4500"
 "song" "bgm/track4.ogg"

diff --git a/data/map-easy/lollipop.map b/data/map-easy/lollipop.map
index f5ad9fe..8e9e740 100644 (file)
--- a/data/map-easy/lollipop.map
+++ b/data/map-easy/lollipop.map
@@ -9,6 +9,11 @@
 "grad" "back/ocean.png"
 "shot" "shot-easy/lollipop.jpg"
 "song" "bgm/track2.ogg"
+"time" "12000"
+"goal" "50"
+"time_hs" "500 3000"
+"goal_hs" "3000 4500"
+"coin_hs" "178 83"
 "bonus" "1"
 // brush 0
 {

diff --git a/data/map-easy/maze.map b/data/map-easy/maze.map
index cee392c..18a5f9e 100644 (file)
--- a/data/map-easy/maze.map
+++ b/data/map-easy/maze.map
@@ -13,6 +13,7 @@
 "goal" "10"
 "time_hs" "1600 4500"
 "coin_hs" "40 20"
+"goal_hs" "3000 6000"
 // brush 0
 {
 ( -200 520 112 ) ( -184 504 112 ) ( -184 504 64 ) mtrl/invisible 0 0 0 0.5 0.5 0 1 0

diff --git a/data/map-easy/mazebump.map b/data/map-easy/mazebump.map
index 4b27f03..872b436 100644 (file)
--- a/data/map-easy/mazebump.map
+++ b/data/map-easy/mazebump.map
@@ -11,6 +11,9 @@
 "shot" "shot-easy/mazebump.jpg"
 "time" "30000"
 "goal" "30"
+"time_hs" "7500 13500"
+"coin_hs" "120 70"
+"goal_hs" "9000 18000"
 "bonus" "1"
 // brush 0
 {

diff --git a/data/map-easy/mover.map b/data/map-easy/mover.map
index 5d3664f..3234711 100644 (file)
--- a/data/map-easy/mover.map
+++ b/data/map-easy/mover.map
@@ -3,6 +3,7 @@
 "classname" "worldspawn"
 "coin_hs" "41 25"
 "time_hs" "400 2000"
+"goal_hs" "1500 3500"
 "goal" "12"
 "time" "6000"
 "song" "bgm/track5.ogg"

diff --git a/data/map-easy/peasy.map b/data/map-easy/peasy.map
index 94a522a..5144f97 100644 (file)
--- a/data/map-easy/peasy.map
+++ b/data/map-easy/peasy.map
@@ -12,6 +12,7 @@
 "goal" "10"
 "time_hs" "600 2000"
 "coin_hs" "20 15"
+"goal_hs" "2200 5000"
 "message" "Mouse buttons rotate the view.\Press Spacebar to pause, ESC to quit.\\\\Click to begin.\"
 // brush 0
 {

diff --git a/data/map-easy/roundcoins.map b/data/map-easy/roundcoins.map
index 5d91a19..9b87bd4 100644 (file)
--- a/data/map-easy/roundcoins.map
+++ b/data/map-easy/roundcoins.map
@@ -9,9 +9,10 @@
 "shot" "shot-easy/roundcoins.jpg"
 "song" "bgm/track4.ogg"
 "time" "12000"
-"goal" "0"
-"time_hs" " "
-"coin_hs" " "
+"goal" "60"
+"time_hs" "500 2500"
+"coin_hs" "200 130"
+"goal_hs" "2000 6000"
 // brush 0
 {
 ( -96 0 0 ) ( -96 0 -4 ) ( -96 -12 -4 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-easy/roundlaby.map b/data/map-easy/roundlaby.map
index 04c1825..5e5380e 100644 (file)
--- a/data/map-easy/roundlaby.map
+++ b/data/map-easy/roundlaby.map
@@ -1,9 +1,10 @@
 // entity 0
 {
 "classname" "worldspawn"
-"coin_hs" " "
-"time_hs" " "
-"goal" "10"
+"coin_hs" "180 100"
+"time_hs" "3000 6000"
+"goal_hs" "3000 6500"
+"goal" "40"
 "time" "12000"
 "song" "bgm/track4.ogg"
 "shot" "shot-easy/roundlaby.jpg"

diff --git a/data/map-easy/slalom.map b/data/map-easy/slalom.map
index 62d1f04..d78cd85 100644 (file)
--- a/data/map-easy/slalom.map
+++ b/data/map-easy/slalom.map
@@ -2,8 +2,9 @@
 // entity 0
 {
 "classname" "worldspawn"
-"coin_hs" " "
-"time_hs" " "
+"coin_hs" "100 50"
+"time_hs" "1000 2000"
+"goal_hs" "1000 3000"
 "goal" "10"
 "time" "12000"
 "song" "bgm/track2.ogg"

diff --git a/data/map-easy/slightcurve.map b/data/map-easy/slightcurve.map
index 2d67e3b..0047a29 100644 (file)
--- a/data/map-easy/slightcurve.map
+++ b/data/map-easy/slightcurve.map
@@ -10,8 +10,9 @@
 "song" "bgm/track2.ogg"
 "time" "9000"
 "goal" "10"
-"time_hs" " "
-"coin_hs" " "
+"time_hs" "750 2000"
+"coin_hs" "66 30"
+"goal_hs" "1500 4000"
 // brush 0
 {
 ( 128 1088 -64 ) ( 128 704 -64 ) ( 128 1088 64 ) mtrl/invisible 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-easy/speedbumps.map b/data/map-easy/speedbumps.map
index b44b0d3..2e4d3f7 100644 (file)
--- a/data/map-easy/speedbumps.map
+++ b/data/map-easy/speedbumps.map
@@ -10,8 +10,9 @@
 "song" "bgm/track3.ogg"
 "time" "12000"
 "goal" "10"
-"time_hs" " "
-"coin_hs" " "
+"time_hs" "1000 2500"
+"coin_hs" "82 45"
+"goal_hs" "1500 5250"
 // brush 0
 {
 ( 160 -224 20 ) ( 160 -216 20 ) ( 144 -216 20 ) mtrl/invisible 32 -8 -90 0.5 0.5 0 0 0

diff --git a/data/map-easy/wakka.map b/data/map-easy/wakka.map
index 7aaf835..fc49cea 100644 (file)
--- a/data/map-easy/wakka.map
+++ b/data/map-easy/wakka.map
@@ -12,7 +12,8 @@
 "goal" "80"
 "time_hs" "350 3000"
 "coin_hs" "280 140"
-"message" "Here's another coin grab.\Use it to earn a free ball.\Perhaps you already know a good route.\Teleportation might come in handy.\"
+"goal_hs" "3000 6000"
+"message" "Here's another coin grab.\Perhaps you already know a good route.\Teleportation might come in handy.\"
 "bonus" "1"
 // brush 0
 {

diff --git a/data/map-medium/accordian.map b/data/map-medium/accordian.map
index ae72277..193e77e 100644 (file)
--- a/data/map-medium/accordian.map
+++ b/data/map-medium/accordian.map
@@ -9,6 +9,9 @@
 "song" "bgm/track1.ogg"
 "goal" "26"
 "time" "9000"
+"time_hs" "2000 4000"
+"coin_hs" "70 50"
+"goal_hs" "3000 6000"
 "author" "Ian Walker"
 // brush 0
 {

diff --git a/data/map-medium/locks.map b/data/map-medium/locks.map
index f8d9c1b..5fb8e4e 100644 (file)
--- a/data/map-medium/locks.map
+++ b/data/map-medium/locks.map
@@ -12,6 +12,7 @@
 "goal" "40"
 "time_hs" "1700 4500"
 "coin_hs" "78 60"
+"goal_hs" "2500 5500"
 "message" "Hit the switches to move the barriers.\"
 // brush 0
 {

diff --git a/data/map-medium/multicurves.map b/data/map-medium/multicurves.map
index 2e79fc7..12f52a2 100644 (file)
--- a/data/map-medium/multicurves.map
+++ b/data/map-medium/multicurves.map
@@ -10,8 +10,9 @@
 "song" "bgm/track1.ogg"
 "time" "12000"
 "goal" "10"
-"time_hs" " "
-"coin_hs" " "
+"time_hs" "3500 5500"
+"coin_hs" "130 80"
+"goal_hs" "4000 6000"
 // brush 0
 {
 ( 63 -124 292 ) ( 63 -252 292 ) ( -73 -124 292 ) mtrl/turf-green-dark 0 0 0 0.5 0.5 0 0 0

diff --git a/data/map-medium/telemaze.map b/data/map-medium/telemaze.map
index 92e7846..51859a2 100644 (file)
--- a/data/map-medium/telemaze.map
+++ b/data/map-medium/telemaze.map
@@ -12,6 +12,7 @@
 "goal" "50"
 "time_hs" "1000 4000"
 "coin_hs" "84 60"
+"goal_hs" "2000 4000"
 "message" "This maze has no walls.\But that doesn't make the solution\any easier to find.\"
 // brush 0
 {

diff --git a/data/map-medium/zigzag.map b/data/map-medium/zigzag.map
index 6c93f25..5f2a6ab 100644 (file)
--- a/data/map-medium/zigzag.map
+++ b/data/map-medium/zigzag.map
@@ -13,6 +13,7 @@
 "goal" "50"
 "time_hs" "700 3000"
 "coin_hs" "178 58"
+"goal_hs" "1250 4000"
 // brush 0
 {
 ( 0 320 -16 ) ( -64 320 -16 ) ( -64 256 -16 ) mtrl/turf-grey 0 0 0 0.5 0.5 0 0 0