From 009d0d196a1c352a456b84962366ab0bf0aa87a4 Mon Sep 17 00:00:00 2001
From: darrelmarek <darrelmarek@tamu.edu>
Date: Thu, 7 Sep 2017 08:22:59 -0500
Subject: [PATCH] Tweaked mechanics

Added a little friction and made the player less floaty
---
 Game 1/Assets/Art/Items/rocket 1.png          | Bin 0 -> 1604 bytes
 Game 1/Assets/Art/Items/rocket 1.png.meta     |  74 ++++++++++++++++++
 Game 1/Assets/Levels/Level0.unity             |   8 +-
 Game 1/Assets/Materials.meta                  |   9 +++
 .../Friction Material.physicsMaterial2D       |  10 +++
 .../Friction Material.physicsMaterial2D.meta  |   9 +++
 Game 1/Assets/Prefabs/Rocket.prefab           |   6 +-
 Game 1/ProjectSettings/ProjectVersion.txt     |   2 +-
 8 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 Game 1/Assets/Art/Items/rocket 1.png
 create mode 100644 Game 1/Assets/Art/Items/rocket 1.png.meta
 create mode 100644 Game 1/Assets/Materials.meta
 create mode 100644 Game 1/Assets/Materials/Friction Material.physicsMaterial2D
 create mode 100644 Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta

diff --git a/Game 1/Assets/Art/Items/rocket 1.png b/Game 1/Assets/Art/Items/rocket 1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9576e2c55da380a7059c65d55b84f39db591a51a
GIT binary patch
literal 1604
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
C{NxA#

literal 0
HcmV?d00001

diff --git a/Game 1/Assets/Art/Items/rocket 1.png.meta b/Game 1/Assets/Art/Items/rocket 1.png.meta
new file mode 100644
index 0000000..ac6c1ab
--- /dev/null
+++ b/Game 1/Assets/Art/Items/rocket 1.png.meta	
@@ -0,0 +1,74 @@
+fileFormatVersion: 2
+guid: bd1747809eae5c849bf2b39b9372bd4d
+timeCreated: 1504790200
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Game 1/Assets/Levels/Level0.unity b/Game 1/Assets/Levels/Level0.unity
index 68fd809..283a398 100644
--- a/Game 1/Assets/Levels/Level0.unity	
+++ b/Game 1/Assets/Levels/Level0.unity	
@@ -20767,10 +20767,10 @@ Rigidbody2D:
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
   m_Mass: 1
-  m_LinearDrag: 0
+  m_LinearDrag: 1
   m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 0}
+  m_GravityScale: 2
+  m_Material: {fileID: 6200000, guid: 886867fcc44b5bd408a23c07d28f52e5, type: 2}
   m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 1
@@ -20852,7 +20852,7 @@ BoxCollider2D:
   m_GameObject: {fileID: 440329283}
   m_Enabled: 1
   m_Density: 1
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 886867fcc44b5bd408a23c07d28f52e5, type: 2}
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
diff --git a/Game 1/Assets/Materials.meta b/Game 1/Assets/Materials.meta
new file mode 100644
index 0000000..ae040ae
--- /dev/null
+++ b/Game 1/Assets/Materials.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: cd077729d4e44184f854e770a83e915c
+folderAsset: yes
+timeCreated: 1504790419
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Game 1/Assets/Materials/Friction Material.physicsMaterial2D b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D
new file mode 100644
index 0000000..ad85596
--- /dev/null
+++ b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D	
@@ -0,0 +1,10 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!62 &6200000
+PhysicsMaterial2D:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Friction Material
+  friction: 0.4
+  bounciness: 0
diff --git a/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta
new file mode 100644
index 0000000..474f883
--- /dev/null
+++ b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta	
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 886867fcc44b5bd408a23c07d28f52e5
+timeCreated: 1504790404
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 6200000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Game 1/Assets/Prefabs/Rocket.prefab b/Game 1/Assets/Prefabs/Rocket.prefab
index 6a58ab0..9e7774f 100644
--- a/Game 1/Assets/Prefabs/Rocket.prefab	
+++ b/Game 1/Assets/Prefabs/Rocket.prefab	
@@ -68,7 +68,7 @@ Transform:
   m_GameObject: {fileID: 1994979455912998}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.43, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_Children:
   - {fileID: 4412116788476952}
   m_Father: {fileID: 0}
@@ -110,7 +110,7 @@ BoxCollider2D:
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.046875, y: 0.390625}
+    oldSize: {x: 2.09, y: 1}
     newSize: {x: 1.5625, y: 0.390625}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
@@ -3479,7 +3479,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: f23de763eab733a4c84fe2ee17c95f32, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bd1747809eae5c849bf2b39b9372bd4d, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
diff --git a/Game 1/ProjectSettings/ProjectVersion.txt b/Game 1/ProjectSettings/ProjectVersion.txt
index 97bb79d..ca1aa05 100644
--- a/Game 1/ProjectSettings/ProjectVersion.txt	
+++ b/Game 1/ProjectSettings/ProjectVersion.txt	
@@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
\ No newline at end of file
+m_EditorVersion: 2017.1.0f3