Revert fall damage test

Core-Team-META · Mar 21, 2021 · 8bbe830 · 8bbe830
1 parent 4b74f6b
commit 8bbe830
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 36 deletions.
diff --git a/Strike Team/Data/Scripts/FallDamageServer.lua b/Strike Team/Data/Scripts/FallDamageServer.lua
@@ -52,13 +52,9 @@ function AttachPoints(player)
 	Left:AttachToPlayer(player, "left_clavicle")
     Right:AttachToPlayer(player, "right_clavicle")
 
-	print("<=6 means female >=8 means male " ..tostring((Left:GetWorldPosition() - Right:GetWorldPosition()).size))
-
 	if((Left:GetWorldPosition() - Right:GetWorldPosition()).size <= 6) then
-		print("female")
         modelGender = "Female" -- Female
     else
-		print("male")
         modelGender = "Male" -- Male
     end
 
@@ -80,7 +76,7 @@ local previousGroundedStates = {}		-- Player -> bool
 -- nil OnPlayerJoined(Player)
 -- Sets up data for a new player
 function OnPlayerJoined(player)
-	AttachPoints(player)
+	-- AttachPoints(player)
 	previousFallingSpeeds[player] = 0.0
 	previousGroundedStates[player] = true
 end

diff --git a/Strike Team/Data/Tree/Gameplay Settings/Tree.pbt b/Strike Team/Data/Tree/Gameplay Settings/Tree.pbt
@@ -11,7 +11,7 @@ Objects {
     }
   }
   ParentId: 16962308734055015238
-  ChildIds: 17062503797121474466
+  ChildIds: 3138148297700067768
   ChildIds: 15556342398574729193
   UnregisteredParameters {
     Overrides {
@@ -143,35 +143,6 @@ Objects {
     TemplateId: 8585645546693573788
   }
 }
-Objects {
-  Id: 17062503797121474466
-  Name: "ServerContext"
-  Transform {
-    Location {
-    }
-    Rotation {
-    }
-    Scale {
-      X: 1
-      Y: 1
-      Z: 1
-    }
-  }
-  ParentId: 5643621584690699170
-  ChildIds: 3138148297700067768
-  Collidable_v2 {
-    Value: "mc:ecollisionsetting:inheritfromparent"
-  }
-  Visible_v2 {
-    Value: "mc:evisibilitysetting:inheritfromparent"
-  }
-  CameraCollidable {
-    Value: "mc:ecollisionsetting:inheritfromparent"
-  }
-  NetworkContext {
-    Type: Server
-  }
-}
 Objects {
   Id: 3138148297700067768
   Name: "FallDamageServer"
@@ -186,7 +157,7 @@ Objects {
       Z: 1
     }
   }
-  ParentId: 17062503797121474466
+  ParentId: 5643621584690699170
   UnregisteredParameters {
     Overrides {
       Name: "cs:TemplateRoot"