From 6a0b647fdd2bc8415db7b294cd5e36c18e5c675b Mon Sep 17 00:00:00 2001
From: Anonymous Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com>
Date: Mon, 13 Aug 2018 12:01:21 +0200
Subject: [PATCH] Salut

---
 Assets/Cactus.png                 | Bin 0 -> 1810 bytes
 Assets/Cactus.png.meta            |  88 ++++++++++++++++++++++++++++++
 Assets/Scenes/SampleScene.unity   |  34 +++++++++++-
 Assets/Script/InventoryManager.cs |  38 +++++++------
 Assets/Script/TreeItem.cs         |   2 +
 5 files changed, 144 insertions(+), 18 deletions(-)
 create mode 100644 Assets/Cactus.png
 create mode 100644 Assets/Cactus.png.meta

diff --git a/Assets/Cactus.png b/Assets/Cactus.png
new file mode 100644
index 0000000000000000000000000000000000000000..a40dcfd53f8a07396212238cf6c64d5fe0d4a003
GIT binary patch
literal 1810
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
Cc0Tn0

literal 0
HcmV?d00001

diff --git a/Assets/Cactus.png.meta b/Assets/Cactus.png.meta
new file mode 100644
index 0000000..16d81ca
--- /dev/null
+++ b/Assets/Cactus.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 15e9c50c00f46904e9b25a24bfaa07e7
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 11a932e..ce268b6 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -13089,7 +13089,7 @@ MonoBehaviour:
   - {fileID: 292199874}
   - {fileID: 798873072}
   items:
-  - type: 1
+  - type: 3
     description: LE POKETEXTE OUIIIIIIIII
     icon: {fileID: 21300000, guid: 1a3fcd6f2906efa41923bcca16b00933, type: 3}
     tiles:
@@ -13109,6 +13109,8 @@ MonoBehaviour:
     - {fileID: 11400000, guid: ca64649711c32e045acc87a7b826744b, type: 2}
     - {fileID: 11400000, guid: 802eedf913287cc4596701ec2a9c034e, type: 2}
     - {fileID: 0}
+    canOverrideTree: 0
+    canBePlacedOn: 1
     count: 0
   - type: 0
     description: 
@@ -13130,8 +13132,10 @@ MonoBehaviour:
     - {fileID: 11400000, guid: c2990fc2c1e85b84b8bb7b8ce8e0a1c6, type: 2}
     - {fileID: 11400000, guid: af72725ced11a594f8d5bc859c9a25f0, type: 2}
     - {fileID: 11400000, guid: b37f3e5d6ce1f044dbdc9fa665c7041a, type: 2}
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
-  - type: 0
+  - type: 4
     description: 
     icon: {fileID: 21300000, guid: ea8d23bb37b53c9459b9d37b980d9ebf, type: 3}
     tiles:
@@ -13151,6 +13155,8 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 9cb1415fe0889b34b85613c01a46b855, type: 2}
     - {fileID: 11400000, guid: f9daa4e1889a5c94eb3bc185cb5f6fb3, type: 2}
     - {fileID: 0}
+    canOverrideTree: 8
+    canBePlacedOn: 3
     count: 0
   - type: 0
     description: 
@@ -13172,6 +13178,8 @@ MonoBehaviour:
     - {fileID: 11400000, guid: e1695f67b739bf443b93716fadeb206e, type: 2}
     - {fileID: 11400000, guid: 55c50fef1803b224d9b32a7a3ed9fb86, type: 2}
     - {fileID: 0}
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
@@ -13193,6 +13201,8 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 2f5bb6339b119ee47930776f411ce4e3, type: 2}
     - {fileID: 11400000, guid: e4aa9d2fd8a0726488dc847599ec3991, type: 2}
     - {fileID: 0}
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
@@ -13214,6 +13224,8 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 119c16f591540494f873ab8c65a59a0a, type: 2}
     - {fileID: 11400000, guid: 77555c2999367d9428a207ba9b2cddd4, type: 2}
     - {fileID: 0}
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
@@ -13235,46 +13247,64 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 243ae876f400f2c42a3ba557e0a451ef, type: 2}
     - {fileID: 11400000, guid: fd076919d896a0e458ac9a145833807b, type: 2}
     - {fileID: 0}
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   - type: 0
     description: 
     icon: {fileID: 0}
     tiles: []
+    canOverrideTree: 0
+    canBePlacedOn: 0
     count: 0
   plots:
   - type: 17
diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs
index a80dba5..dc9aa63 100644
--- a/Assets/Script/InventoryManager.cs
+++ b/Assets/Script/InventoryManager.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Tilemaps;
 
 public class InventoryManager : MonoBehaviour
@@ -26,13 +25,13 @@ public class InventoryManager : MonoBehaviour
             if (draggedPosition != -1)
             {
                 slots[draggedPosition].transform.GetChild(1).position = Input.mousePosition;
-                DisplaySelector(cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, selectorMap.transform.parent.position.z)));
+                DisplaySelector(cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, selectorMap.transform.parent.position.z)), items[draggedPosition]);
             }
         }
         else if(draggedPosition != -1)
         {
             HideSelector(selectorPos);
-            if (CanPlantAt(cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, treeMap.transform.parent.position.z))))
+            if (CanPlantAt(cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, treeMap.transform.parent.position.z)), items[draggedPosition]))
             {
                 PlaceTree(items[draggedPosition], cam.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, treeMap.transform.parent.position.z)));
                 items[draggedPosition].count -= 1;
@@ -46,12 +45,12 @@ public class InventoryManager : MonoBehaviour
         }
     }
 
-    private bool CanPlantAt(Vector3 position)
+    private bool CanPlantAt(Vector3 position, TreeItem item)
     {
         Vector3Int pos = treeMap.WorldToCell(position);
         if (-8 <= pos.x && pos.x <= 11 && -15 <= pos.y && pos.y <= 4)
         {
-            if (GetPlotIndex(pos) != -1 && plots[GetPlotIndex(pos)].treePlaced == TreeType.Nothing && (plots[GetPlotIndex(pos)].type & PlotType.Normal) != 0)
+            if (GetPlotIndex(pos) != -1 && plots[GetPlotIndex(pos)].treePlaced == TreeType.Nothing && (plots[GetPlotIndex(pos)].type & item.canBePlacedOn) != 0)
             {
                 return true;
             }
@@ -80,15 +79,22 @@ public class InventoryManager : MonoBehaviour
                 i++;
             }
         }
-        
 
-        //switch (item.type)
-        //{
-        //    case TreeType.AppleTree:
-        //        break;
-        //    default:
-        //        break;
-        //}
+
+        switch (item.type)
+        {
+            case TreeType.AppleTree:
+                break;
+            default:
+                break;
+        }
+
+        CallPowers();
+    }
+
+    private void CallPowers()
+    {
+
     }
 
     public void StartDraggin(int index)
@@ -107,7 +113,7 @@ public class InventoryManager : MonoBehaviour
     //    }
     //}
 
-    private void DisplaySelector(Vector3 position)
+    private void DisplaySelector(Vector3 position, TreeItem item)
     {
         Vector3Int pos = selectorMap.WorldToCell(position);
         Vector2Int plotPos = GetPlotPosition(pos);
@@ -123,7 +129,7 @@ public class InventoryManager : MonoBehaviour
         if (plotPos.x == 999 || plotPos.y == 999)
             return;
 
-        bool canPlant = CanPlantAt(position);
+        bool canPlant = CanPlantAt(position, item);
         selectorPos = plotPos;
         int i = -1;
         for (int y = 0; y > -4; y--)
diff --git a/Assets/Script/TreeItem.cs b/Assets/Script/TreeItem.cs
index c492bc9..44e7a93 100644
--- a/Assets/Script/TreeItem.cs
+++ b/Assets/Script/TreeItem.cs
@@ -8,6 +8,8 @@ public class TreeItem
     public string description;
     public Sprite icon;
     public TileBase[] tiles = new TileBase[16];
+    [EnumFlags] public TreeType canOverrideTree;
+    [EnumFlags] public PlotType canBePlacedOn;
     public int count;
 }