From aecb9f9157f57624fefb1ec01adb15f52fb92627 Mon Sep 17 00:00:00 2001
From: misabiko <misabiko@gmail.com>
Date: Sun, 14 Jun 2020 18:59:19 -0400
Subject: [PATCH] Saved scene, added map data scriptableobject

---
 .idea/.idea.Bomberman/.idea/contentModel.xml |   1 +
 .idea/.idea.Bomberman/.idea/workspace.xml    |  91 +++++++++-
 Assets/Scenes/MainScene Movement.unity       | 180 ++++++++++++++++++-
 Assets/ScriptableObjects/Map Data.asset      |  15 ++
 Assets/ScriptableObjects/Map Data.asset.meta |   8 +
 5 files changed, 283 insertions(+), 12 deletions(-)
 create mode 100644 Assets/ScriptableObjects/Map Data.asset
 create mode 100644 Assets/ScriptableObjects/Map Data.asset.meta

diff --git a/.idea/.idea.Bomberman/.idea/contentModel.xml b/.idea/.idea.Bomberman/.idea/contentModel.xml
index cc4eac7..c1b32a0 100644
--- a/.idea/.idea.Bomberman/.idea/contentModel.xml
+++ b/.idea/.idea.Bomberman/.idea/contentModel.xml
@@ -19,6 +19,7 @@
           </e>
         </e>
         <e p="Scripts" t="Include">
+          <e p="MapData.cs" t="Include" />
           <e p="PlayerData.cs" t="Include" />
           <e p="PlayerMovement.cs" t="Include" />
           <e p="SimpleCameraController.cs" t="Include" />
diff --git a/.idea/.idea.Bomberman/.idea/workspace.xml b/.idea/.idea.Bomberman/.idea/workspace.xml
index 9d4901a..20d471a 100644
--- a/.idea/.idea.Bomberman/.idea/workspace.xml
+++ b/.idea/.idea.Bomberman/.idea/workspace.xml
@@ -13,7 +13,7 @@
     <list default="true" id="093b0649-4999-4ce7-a733-d62e04356272" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Bomberman/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,16 +30,29 @@
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/Scenes/MainScene Movement/LightingData.asset" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/Scripts/MapData.cs.meta" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///MapData.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/Scenes/MainScene Movement.unity" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Assets/Scripts/MapData.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///MapData.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///MainScene Movement.unity" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Settings/Bomberman.inputactions" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/SimpleCameraController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/Assets/Scenes/MainScene Movement/LightingData.asset" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Assets/Scripts/PlayerData.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///Documentation.meta" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///PlayerMovement.cs" root0="SKIP_HIGHLIGHTING" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/Assets/ScriptableObjects/PlayerData.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/PlayerData.cs" />
+        <option value="$PROJECT_DIR$/Assets/Scripts/MapData.cs" />
         <option value="$PROJECT_DIR$/Assets/Scripts/PlayerMovement.cs" />
       </list>
     </option>
@@ -92,7 +105,70 @@
       <option name="project" value="LOCAL" />
       <updated>1591565757829</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="Added TextMeshPro">
+      <created>1592162795800</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1592162795800</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Added TextMeshPro">
+      <created>1592162818475</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1592162818475</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Added fixed movement angles">
+      <created>1592162843238</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1592162843238</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Added MapData.cs">
+      <created>1592167255759</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1592167255759</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Added MapData.cs">
+      <created>1592167284769</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1592167284769</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Added Place button (temp?)">
+      <created>1592175422622</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1592175422622</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Set tiling option back to 2d">
+      <created>1592175437287</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1592175437287</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Added helpers to back and forth axial to world">
+      <created>1592175500345</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1592175500345</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Constrained movement to tiles">
+      <created>1592175523239</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1592175523239</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="UnityProjectConfiguration" hasMinimizedUI="true" />
@@ -113,7 +189,14 @@
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
     <MESSAGE value="Initial commit" />
     <MESSAGE value="Baked lighting + Updated Hex shader" />
-    <option name="LAST_COMMIT_MESSAGE" value="Baked lighting + Updated Hex shader" />
+    <MESSAGE value="Added TextMeshPro" />
+    <MESSAGE value="Added fixed movement angles" />
+    <MESSAGE value="Added MapData.cs" />
+    <MESSAGE value="Added Place button (temp?)" />
+    <MESSAGE value="Set tiling option back to 2d" />
+    <MESSAGE value="Added helpers to back and forth axial to world" />
+    <MESSAGE value="Constrained movement to tiles" />
+    <option name="LAST_COMMIT_MESSAGE" value="Constrained movement to tiles" />
   </component>
   <component name="WindowStateProjectService">
     <state x="938" y="326" key="RollbackChangesDialog" timestamp="1591564630636">
diff --git a/Assets/Scenes/MainScene Movement.unity b/Assets/Scenes/MainScene Movement.unity
index 44cdd88..d7a726c 100644
--- a/Assets/Scenes/MainScene Movement.unity	
+++ b/Assets/Scenes/MainScene Movement.unity	
@@ -463,7 +463,7 @@ GameObject:
   - component: {fileID: 495500299}
   - component: {fileID: 495500298}
   m_Layer: 5
-  m_Name: RoundedAngle
+  m_Name: Coords
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -476,17 +476,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 495500296}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 534886316}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -26.4}
-  m_SizeDelta: {x: 500, y: 50}
+  m_AnchoredPosition: {x: 0, y: -56.5}
+  m_SizeDelta: {x: 500, y: 321.8}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &495500298
 MonoBehaviour:
@@ -507,7 +507,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 'RoundedAngle: '
+  m_text: 'Coords: '
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -576,7 +576,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_textInfo:
     textComponent: {fileID: 495500298}
-    characterCount: 14
+    characterCount: 8
     spriteCount: 0
     spaceCount: 1
     wordCount: 1
@@ -698,6 +698,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 402713709}
+  - {fileID: 2115008406}
   - {fileID: 495500297}
   m_Father: {fileID: 0}
   m_RootOrder: 5
@@ -1294,6 +1295,10 @@ MonoBehaviour:
       m_Calls: []
     m_ActionId: 89695d39-0217-4f83-9238-c0bc13be672a
     m_ActionName: UI/TrackedDeviceOrientation
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: a64e6479-28a7-43b4-ac85-f2f7530c11ff
+    m_ActionName: Player/Place[/XInputControllerWindows/buttonSouth]
   m_NeverAutoSwitchControlSchemes: 0
   m_DefaultControlScheme: 
   m_DefaultActionMap: Player
@@ -1404,5 +1409,164 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data: {fileID: 11400000, guid: a73a31ec3bbce4148909369b855b669f, type: 2}
+  mapData: {fileID: 11400000, guid: a0c83aa9643298148a6956d2f0c1c57e, type: 2}
   freeAngleText: {fileID: 402713710}
-  roundedAngleText: {fileID: 495500298}
+  coordsText: {fileID: 495500298}
+  directionText: {fileID: 2115008407}
+  tiledDirection: 0
+--- !u!1 &2115008405
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2115008406}
+  - component: {fileID: 2115008408}
+  - component: {fileID: 2115008407}
+  m_Layer: 5
+  m_Name: Direction
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2115008406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2115008405}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 534886316}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -27.4}
+  m_SizeDelta: {x: 500, y: 50}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &2115008407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2115008405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 'Direction: '
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294901798
+  m_fontColor: {r: 0.14912081, g: 0, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_outlineColor:
+    serializedVersion: 2
+    rgba: 4278190080
+  m_fontSize: 24
+  m_fontSizeBase: 24
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_textAlignment: 257
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_firstOverflowCharacterIndex: -1
+  m_linkedTextComponent: {fileID: 0}
+  m_isLinkedTextComponent: 0
+  m_isTextTruncated: 0
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_ignoreRectMaskCulling: 0
+  m_ignoreCulling: 1
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_firstVisibleCharacter: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_textInfo:
+    textComponent: {fileID: 2115008407}
+    characterCount: 11
+    spriteCount: 0
+    spaceCount: 1
+    wordCount: 1
+    linkCount: 0
+    lineCount: 1
+    pageCount: 1
+    materialCount: 1
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_spriteAnimator: {fileID: 0}
+  m_hasFontAssetChanged: 0
+  m_subTextObjects:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &2115008408
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2115008405}
+  m_CullTransparentMesh: 0
diff --git a/Assets/ScriptableObjects/Map Data.asset b/Assets/ScriptableObjects/Map Data.asset
new file mode 100644
index 0000000..830d043
--- /dev/null
+++ b/Assets/ScriptableObjects/Map Data.asset	
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8cf68d353cd464eb80c3158efd44450, type: 3}
+  m_Name: Map Data
+  m_EditorClassIdentifier: 
+  hexSize: 1
diff --git a/Assets/ScriptableObjects/Map Data.asset.meta b/Assets/ScriptableObjects/Map Data.asset.meta
new file mode 100644
index 0000000..3288d55
--- /dev/null
+++ b/Assets/ScriptableObjects/Map Data.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a0c83aa9643298148a6956d2f0c1c57e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: