Add files via upload

ParkitectNexus · May 20, 2016 · 93ae608 · 93ae608
1 parent 9e981bd
commit 93ae608
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Depender/Objects/Shops/ShopMod.cs b/Depender/Objects/Shops/ShopMod.cs
@@ -17,6 +17,7 @@ public class ShopMod : ModdedObject
         public override void Decorate()
         {
             CustomShop shop = Object.AddComponent<CustomShop>();
+            shop.walkableFlag = Block.WalkableFlagType.FORWARD;
             List<GameObject> productsGO = new List<GameObject>();
             foreach (ProductMod P in products)
             {
@@ -42,16 +43,15 @@ public enum hand { Left, Right }
         public hand Hand = hand.Left;
         [SerializeField]
         public List<ingredient> ingredients = new List<ingredient>();
-        ingredient selected;
+        private ingredient selected;
         private Vector2 scrollPos;
         public virtual GameObject Decorate()
         {
 
             Product P = GO.GetComponent<Product>();
-
+            
             P.defaultPrice = price;
-
-
+
             switch (Hand)
             {
                 case hand.Left:
@@ -158,6 +158,8 @@ public enum temprature { none, cold, hot }
         public override GameObject Decorate()
         {
             ConsumableProduct CP = GO.AddComponent<ConsumableProductInstance>();
+
+            CP.trash = AssetManager.Instance.getPrefab(Prefabs.CandyTrash).gameObject;
 
             BindingFlags flags = BindingFlags.GetField | BindingFlags.Instance | BindingFlags.NonPublic;
             typeof(Product).GetField("displayName", flags).SetValue(CP, Name);