1.5 dev1

marble/client/init.cs

@@ -56,7 +56,7 @@ function initClient()
    // The canvas needs to be constructed before the gui scripts are
    // run because many of the controls assume the canvas exists at
    // load time.
-   initCanvas(" Kevin Blast 1.4.2-dev - Created by KevinSoftware");
+   initCanvas(" Kevin Blast 1.5 Dev Build 1 - Created by KevinSoftware");
 
    /// Load client-side Audio Profiles/Descriptions
    exec("./scripts/audioProfiles.cs");

marble/client/scripts/version.cs

@@ -1,5 +1,5 @@
-$THIS_VERSION = "1.4.2-dev";
+$THIS_VERSION = "1.5";
-$SERVER_VERSION = "1.4.2-dev";
+$SERVER_VERSION = "1.5";
 $BUILD_VERSION = 1;
 $VERSION_MESSAGE = "";
 

marble/client/ui/playGui.gui

@@ -269,7 +269,7 @@ new GameTSCtrl(PlayGUI) {
          profile = "GuiDefaultProfile";
          horizSizing = "right";
          vertSizing = "bottom";
-         position = "127 0";
+         position = "135 0";
          extent = "43 55";
          minExtent = "8 8";
          visible = "1";

marble/data/missions/intermediate/Unexpected.mis

@@ -1,17 +1,18 @@
+// UT Tip: You can escape the club!
 //--- OBJECT WRITE BEGIN ---
 new SimGroup(MissionGroup) {
 
    new ScriptObject(MissionInfo) {
          type = "Intermediate";
-         startHelpText = "And get the gem.";
+         desc = "Pass the ice-covered challenges!";
-         desc = "Yarrrr";
-         goldTime = "20000";
          artist = "Kevin";
-         name = "Walk the Plank";
+         goldTime = "17000";
+         name = "Marble Putt";
          level = "20";
+         startHelpText = "Aim carefully into the tunnel!";
    };
    new MissionArea(MissionArea) {
-      Area = "-360 -648 720 1296";
+      area = "-360 -648 720 1296";
       flightCeiling = "300";
       flightCeilingRange = "20";
          locked = "true";
@@ -20,90 +21,49 @@ new SimGroup(MissionGroup) {
       position = "336 136 0";
       rotation = "1 0 0 0";
       scale = "1 1 1";
-      materialList = "~/data/skies/intermediate/sky_day.dml";
+      cloudHeightPer[0] = "0";
-      cloudHeightPer[0] = "0.349971";
+      cloudHeightPer[1] = "0";
-      cloudHeightPer[1] = "0.3";
+      cloudHeightPer[2] = "0";
-      cloudHeightPer[2] = "0.199973";
+      cloudSpeed1 = "0.0001";
-      cloudSpeed1 = "0.0005";
+      cloudSpeed2 = "0.0002";
-      cloudSpeed2 = "0.001";
       cloudSpeed3 = "0.0003";
       visibleDistance = "500";
-      fogDistance = "300";
-      fogColor = "0.600000 0.600000 0.600000 1.000000";
-      fogStorm1 = "0";
-      fogStorm2 = "0";
-      fogStorm3 = "0";
-      fogVolume1 = "0 0 0";
-      fogVolume2 = "0 0 0";
-      fogVolume3 = "0 0 0";
-      fogVolumeColor1 = "128.000000 128.000000 128.000000 -222768174765569861149077900047473967104.000000";
-      fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000000";
-      fogVolumeColor3 = "128.000000 128.000000 128.000000 -170698929442160049016675429178998259712.000000";
-      windVelocity = "1 1 0";
-      windEffectPrecipitation = "1";
-      SkySolidColor = "0.900000 0.900000 0.900000 1.000000";
       useSkyTextures = "1";
       renderBottomTexture = "1";
+      SkySolidColor = "0.600000 0.600000 0.600000 1.000000";
+      fogDistance = "300";
+      fogColor = "0.600000 0.600000 0.600000 1.000000";
+      fogVolume1 = "-1 7.45949e-31 1.3684e-38";
+      fogVolume2 = "-1 1.07208e-14 8.756e-14";
+      fogVolume3 = "-1 5.1012e-10 2.05098e-08";
+      materialList = "~/data/skies/intermediate/sky_day.dml";
+      windVelocity = "1 0 0";
+      windEffectPrecipitation = "0";
       noRenderBans = "1";
-         locked = "true";
+      fogVolumeColor1 = "128.000000 128.000000 128.000000 0.000000";
+      fogVolumeColor2 = "128.000000 128.000000 128.000000 0.000004";
+      fogVolumeColor3 = "128.000000 128.000000 128.000000 14435505.000000";
    };
    new Sun() {
-      direction = "0.544508 0.439467 -0.714409";
+      direction = "0.638261 0.459006 -0.61801";
-      color = "1.000000 1.000000 0.400000 1.000000";
+      color = "1.400000 1.200000 0.400000 1.000000";
       ambient = "0.300000 0.300000 0.400000 1.000000";
-         scale = "1 1 1";
-         position = "0 0 0";
-         locked = "true";
-         rotation = "1 0 0 0";
-   };
-   new SimGroup(CheckPoints) {
-
-      new StaticShape(StartPoint) {
-         position = "0.0682294 0.50582 499.353";
-         rotation = "1 0 0 0";
-         scale = "1 1 1";
-         dataBlock = "StartPad";
-      };
-      new StaticShape(EndPoint) {
-         position = "-0.00422919 34.7512 499.455";
-         rotation = "1 0 0 0";
-         scale = "1 1 1";
-         dataBlock = "EndPad";
-      };
    };
    new InteriorInstance() {
-      position = "1.77 4.63291 498.555";
+      position = "0 0 0";
       rotation = "1 0 0 0";
       scale = "1 1 1";
-      interiorFile = "~/data/interiors/t_high_ropes.dif";
+      interiorFile = "~/data/interiors/mmg_icichole.dif";
       showTerrainInside = "0";
    };
-   new ScriptObject() {
+   new StaticShape() {
-         time = "0";
+      position = "1 34 7";
-         gemCount = "0";
+      rotation = "1 0 0 89.99999";
-         powerUp = "0";
+      scale = "1 1 1";
-         penaltyTime = "0";
+      dataBlock = "DuctFan";
-         bonusTime = "0";
-         pad = "2137";
-   };
-   new ScriptObject() {
-         time = "0";
-         gemCount = "0";
-         powerUp = "0";
-         penaltyTime = "0";
-         bonusTime = "0";
-         pad = "1588";
-   };
-   new ScriptObject() {
-         time = "0";
-         gemCount = "0";
-         powerUp = "0";
-         penaltyTime = "0";
-         bonusTime = "0";
-         pad = "2477";
    };
    new Item() {
-      position = "-24.1149 16.1744 504.792";
+      position = "-2 39 3";
       rotation = "1 0 0 0";
       scale = "1 1 1";
       dataBlock = "GemItem";
@@ -112,33 +72,65 @@ new SimGroup(MissionGroup) {
       rotate = "1";
    };
    new Item() {
-      position = "-23.9804 13.3836 499.536";
+      position = "1 62 2";
       rotation = "1 0 0 0";
       scale = "1 1 1";
-      dataBlock = "SuperJumpItem";
+      dataBlock = "GemItem";
       collideable = "0";
       static = "1";
       rotate = "1";
    };
    new Item() {
-      position = "0.0372384 40.272 489.86";
+      position = "26 58 7.5";
       rotation = "1 0 0 0";
       scale = "1 1 1";
-      dataBlock = "EasterEgg";
+      dataBlock = "GemItem";
       collideable = "0";
       static = "1";
       rotate = "1";
    };
-   new ScriptObject() {
+   new Item() {
-         time = "0";
+      position = "34 38 7.5";
-         gemCount = "0";
+      rotation = "1 0 0 0";
-         powerUp = "0";
+      scale = "1 1 1";
-         penaltyTime = "0";
+      dataBlock = "GemItem";
-         bonusTime = "0";
+      collideable = "0";
-         pad = "14130";
+      static = "1";
+      rotate = "1";
+   };
+   new StaticShape(StartPoint) {
+      position = "-4 4 -0.5";
+      rotation = "1 0 0 0";
+      scale = "1 1 1";
+      dataBlock = "StartPad";
+   };
+   new StaticShape(EndPoint) {
+      position = "-46 38 4";
+      rotation = "0 0 -1 89.99999";
+      scale = "0.5 0.5 0.5";
+      dataBlock = "EndPad";
+   };
+   new Item() {
+      position = "-1 27 2";
+      rotation = "1 0 0 0";
+      scale = "0.5 0.5 0.5";
+      dataBlock = "TimeTravelItem";
+      collideable = "0";
+      static = "1";
+      rotate = "1";
+         timeBonus = "5000";
+   };
+   new Item() {
+      position = "34 50 11.2";
+      rotation = "1 0 0 0";
+      scale = "0.7 0.7 1";
+      dataBlock = "easterEgg";
+      collideable = "0";
+      static = "1";
+      rotate = "1";
    };
    new AudioProfile(MusicProfile) {
-      fileName = "~/data/sound/Shell.ogg";
+      fileName = "~/data/sound/music/shell.ogg";
       description = "AudioMusic";
       preload = "0";
    };