diff --git a/marble/data/missions/beginner/movement.mis b/marble/data/missions/beginner/movement.mis index f28cac9..6dd2b0b 100644 --- a/marble/data/missions/beginner/movement.mis +++ b/marble/data/missions/beginner/movement.mis @@ -2,13 +2,13 @@ new SimGroup(MissionGroup) { new ScriptObject(MissionInfo) { - artist = "Kevin"; name = "Kevin\'s Introduction"; + goldTime = "5000"; level = "1"; type = "Beginner"; - startHelpText = "Press to roll the marble forward and grab the gem."; - goldTime = "5000"; desc = "Roll and grab the gem to finish the level."; + artist = "Kevin"; + startHelpText = "Press to roll the marble forward and grab the gem."; }; new MissionArea(MissionArea) { Area = "-360 -648 720 1296"; @@ -116,12 +116,12 @@ new SimGroup(MissionGroup) { text = "Press to roll the marble backward!"; }; new ScriptObject() { - pad = "2137"; - bonusTime = "0"; - time = "0"; gemCount = "0"; powerUp = "0"; penaltyTime = "0"; + time = "0"; + pad = "2137"; + bonusTime = "0"; }; new Item() { position = "10.6099 24.2995 499.594"; @@ -133,7 +133,7 @@ new SimGroup(MissionGroup) { rotate = "1"; }; new Item() { - position = "-3.45824 28.5578 499.927"; + position = "-2.64332 26.1213 499.927"; rotation = "1 0 0 0"; scale = "1 1 1"; dataBlock = "TimeTravelItem"; diff --git a/marble/data/sound/gotEggVoice.wav b/marble/data/sound/gotEggVoice.wav deleted file mode 100644 index 8ac1545..0000000 Binary files a/marble/data/sound/gotEggVoice.wav and /dev/null differ diff --git a/marble/server/scripts/easterEgg.cs b/marble/server/scripts/easterEgg.cs index 5272341..ab80cd5 100644 --- a/marble/server/scripts/easterEgg.cs +++ b/marble/server/scripts/easterEgg.cs @@ -8,14 +8,14 @@ datablock AudioProfile(GotEggSfx) { - filename = "~/data/sound/gotEggVoice.wav"; + filename = "~/data/sound/easter.wav"; description = AudioDefault3d; preload = true; }; datablock AudioProfile(GotThatEggAlready) { - filename = "~/data/sound/gotpowerup.wav"; + filename = "~/data/sound/easterfound.wav"; description = AudioDefault3d; preload = true; };