Merge pull request #207 from HaileyEira/master

Added Pumpkin & Eyeball marble skins from MBO
MBU-Team · Mar 11, 2024 · 3e14f77 · 3e14f77
2 parents 611d7d9 + c5e678f
commit 3e14f77
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 6 deletions.
diff --git a/game/marble/client/ui/marblePickerGui.gui b/game/marble/client/ui/marblePickerGui.gui
@@ -39,7 +39,7 @@ function marblePickerGui::onWake( %this )
 function marblePickerGui::show(%this, %backGui)
 {
    // Change THIS variable to add/remove marbles
-   %numMarbles = 35;
+   %numMarbles = 37;
 
    %marbleString = "";
    for( %i = 0; %i < %numMarbles; %i++ )

diff --git a/game/marble/data/marbleMat.cs b/game/marble/data/marbleMat.cs
@@ -175,7 +175,8 @@ function defineBasicMarbleMaterial(%id, %shader, %bump, %diff, %mapTo, %specular
 defineBasicMarbleMaterial("33", "ClassicMarbMetal", "marble18.normal",   "marble33.skin", "marble33.skin", "0.6 0.6 0.6 0.6", 12 );
 defineBasicMarbleMaterial("34", "ClassicMarb2", "marble.normal",   "marble34.skin", "marble34.skin", "0.6 0.6 0.6 0.6", 12 );
 defineBasicMarbleMaterial("35", "ClassicMarb3", "marble.normal",   "marble35.skin", "marble35.skin", "0.6 0.6 0.6 0.6", 12 );
-
+defineBasicMarbleMaterial("36", "ClassicMarb3", "marble36.normal",   "marble36.skin", "marble36.skin", "0.6 0.6 0.6 0.6", 12 );
+defineBasicMarbleMaterial("37", "ClassicMarbGlassPureSphere", "marble01.normal",   "marble37.skin", "marble37.skin", "0.6 0.6 0.6 0.6", 12 );
 
 //-----------------------------------------------------------------------------------------------------------------------
 // CUSTOM MARBLES

diff --git a/game/marble/data/shapes/balls/marble36.dts b/game/marble/data/shapes/balls/marble36.dts
diff --git a/game/marble/data/shapes/balls/marble36.normal.png b/game/marble/data/shapes/balls/marble36.normal.png
diff --git a/game/marble/data/shapes/balls/marble36.skin.jng b/game/marble/data/shapes/balls/marble36.skin.jng
diff --git a/game/marble/data/shapes/balls/marble37.dts b/game/marble/data/shapes/balls/marble37.dts
diff --git a/game/marble/data/shapes/balls/marble37.skin.jng b/game/marble/data/shapes/balls/marble37.skin.jng
diff --git a/game/marble/server/scripts/game.cs b/game/marble/server/scripts/game.cs
@@ -1644,12 +1644,16 @@ function restartLevel()
          return MarbleThirtyOne;
       case 31:
          return MarbleThirtyTwo;
-	  case 32:
+	   case 32:
          return MarbleThirtyThree;         
       case 33:
          return MarbleThirtyFour;
       case 34:
          return MarbleThirtyFive;
+      case 35:
+         return MarbleThirtySix;
+      case 36:
+         return MarbleThirtySeven;
    }
 
    return MarbleOne;

diff --git a/game/marble/server/scripts/marble.cs b/game/marble/server/scripts/marble.cs
@@ -476,10 +476,15 @@ datablock MarbleData(MarbleThirtyFive : DefaultMarble)
    shapeFile = "~/data/shapes/balls/marble35.dts";
 };
 
+datablock MarbleData(MarbleThirtySix : DefaultMarble)
+{
+   shapeFile = "~/data/shapes/balls/marble36.dts";
+};
 
-
-
-
+datablock MarbleData(MarbleThirtySeven : DefaultMarble)
+{
+   shapeFile = "~/data/shapes/balls/marble37.dts";
+};
 
 //-----------------------------------------------------------------------------