Bullet colors according to characters

Assets/3rd/D2D_Scripts/Gameplay/Data/GameplaySettings.cs

@@ -27,6 +27,8 @@ namespace D2D.Gameplay
         [TabGroup("Common")] public List<GameObject> levels;
         [TabGroup("Common")] public Material[] groundMaterials;
         [TabGroup("Common")] public PoolType pistolProjectile;
+        [TabGroup("Common")] public List<PoolType> pistolProjectiles;
+
         [TabGroup("Common")] public PoolType laserProjectile;
         [TabGroup("Common")] public float xpModifierIncrease;
 

Assets/3rd/D2D_Scripts/Gameplay/Pool/Pool.cs

@@ -20,6 +20,7 @@ namespace D2D
         [SerializeField] private PoolType _poolType;
 
         public PoolType Type => _poolType;
+        public List<PoolType> poolTypes;
 
         private Queue<PoolMember> _instances = new Queue<PoolMember>();
 
@@ -32,7 +33,6 @@ namespace D2D
         {
             Init();
         }*/
-
         public void Init(PoolType t = null)
         {
             /*if (_isInited)
@@ -45,6 +45,7 @@ namespace D2D
                 _poolType = t;
 
             FillPoolWithEmpties();
+            //ParticleSetter();
         }
 
         private void FillPoolWithEmpties()
@@ -57,6 +58,7 @@ namespace D2D
 
         private void SpawnPoolMember()
         {
+            //var newEffect = Instantiate(poolTypes[PlayerPrefs.GetInt(Constants.PlayerSelectionKey, 0)].prefab, transform.position, Quaternion.identity, transform);
             var newEffect = Instantiate(_poolType.prefab, transform.position, Quaternion.identity, transform);
             newEffect.gameObject.Off();
             _instances.Enqueue(newEffect);

Assets/3rd/D2D_Scripts/Gameplay/Pool/PoolHub.cs

@@ -17,7 +17,7 @@ namespace D2D
     {
         [SerializeField] private List<Pool> _manualSetupPools;
 
-        private List<PoolType> _poolTypes = new List<PoolType>();
+        [SerializeField] private List<PoolType> _poolTypes = new List<PoolType>();
 
         private Dictionary<PoolType, Pool> _pools = 
             new Dictionary<PoolType, Pool>();
@@ -65,6 +65,7 @@ namespace D2D
         {
             if (!_pools.ContainsKey(t))
             {
+                Debug.Log("_poolTypes");
                 _poolTypes.Add(t);
                 CreatePool(t);
                 

Assets/Materials/Colors/Orange.mat

@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Orange
+  m_Shader: {fileID: 4800000, guid: 7c34a1326c46c354593443d0fc6e0b38, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - OUTLINES
+  - TCP2_RIM
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Ramp:
+        m_Texture: {fileID: 2800000, guid: abc83c21d57d4a74cabe12065fa1a8b2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Offset1: 0
+    - _Offset2: 0
+    - _Outline: 1.57
+    - _Parallax: 0.02
+    - _RampSmooth: 1
+    - _RampThreshold: 0.62
+    - _RimMax: 1
+    - _RimMin: 0.2
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _TexLod: 5
+    - _UVSec: 0
+    - _ZSmooth: -0.5
+    - _ZWrite: 1
+    - __dummy__: 0
+    m_Colors:
+    - _Color: {r: 1, g: 0.58057725, b: 0.25, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _HColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 0.49019608, g: 0.03983662, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 0.6}
+    - _RimDir: {r: 0, g: 0, b: 1, a: 0}
+    - _SColor: {r: 0.2835436, g: 0.02883584, b: 0.5660378, a: 1}
+  m_BuildTextureStacks: []

Assets/Materials/Colors/Orange.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2da7bc35f893d6749bfe2c5b4b148132
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/Colors/Red.mat

@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Red
+  m_Shader: {fileID: 4800000, guid: 7c34a1326c46c354593443d0fc6e0b38, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - OUTLINES
+  - TCP2_RIM
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Ramp:
+        m_Texture: {fileID: 2800000, guid: abc83c21d57d4a74cabe12065fa1a8b2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Offset1: 0
+    - _Offset2: 0
+    - _Outline: 1.57
+    - _Parallax: 0.02
+    - _RampSmooth: 1
+    - _RampThreshold: 0.62
+    - _RimMax: 1
+    - _RimMin: 0.2
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _TexLod: 5
+    - _UVSec: 0
+    - _ZSmooth: -0.5
+    - _ZWrite: 1
+    - __dummy__: 0
+    m_Colors:
+    - _Color: {r: 1, g: 0.35298142, b: 0.28773582, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _HColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 0.49019608, g: 0.03983662, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 0.6}
+    - _RimDir: {r: 0, g: 0, b: 1, a: 0}
+    - _SColor: {r: 0.2835436, g: 0.02883584, b: 0.5660378, a: 1}
+  m_BuildTextureStacks: []

Assets/Materials/Colors/Red.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 60a595bfa8aec9b4bb3fbd87cbb4e1fe
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/Colors/Yellow.mat

@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Yellow
+  m_Shader: {fileID: 4800000, guid: 7c34a1326c46c354593443d0fc6e0b38, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - OUTLINES
+  - TCP2_RIM
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Ramp:
+        m_Texture: {fileID: 2800000, guid: abc83c21d57d4a74cabe12065fa1a8b2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Offset1: 0
+    - _Offset2: 0
+    - _Outline: 1.57
+    - _Parallax: 0.02
+    - _RampSmooth: 1
+    - _RampThreshold: 0.62
+    - _RimMax: 1
+    - _RimMin: 0.2
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _TexLod: 5
+    - _UVSec: 0
+    - _ZSmooth: -0.5
+    - _ZWrite: 1
+    - __dummy__: 0
+    m_Colors:
+    - _Color: {r: 1, g: 0.8931731, b: 0.48627448, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _HColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 0.49019608, g: 0.03983662, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 0.6}
+    - _RimDir: {r: 0, g: 0, b: 1, a: 0}
+    - _SColor: {r: 0.2835436, g: 0.02883584, b: 0.5660378, a: 1}
+  m_BuildTextureStacks: []

Assets/Materials/Colors/Yellow.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02312ff549bab6649a662b22d74656ca
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MemberInitializer.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using D2D;
 using Sirenix.OdinInspector;
 using UnityEngine;
+using static D2D.Utilities.CommonGameplayFacade;
+
 
 public class MemberInitializer : Unit
 {
@@ -11,6 +13,7 @@ public class MemberInitializer : Unit
     [SerializeField] private SquadMember squadMember;
     private SquadComponent squadComponent;
     [SerializeField] private NeutralsSpawn neutralsSpawn;
+    public List<PoolMember> bulletParticleSystems;
     private void Awake()
     {
     }
@@ -21,8 +24,12 @@ public class MemberInitializer : Unit
         squadMember = GetInitialSquadMember();
         neutralsSpawn.neutralMember = GetInitialNeutralMember();
         AddMember();
+        BulletPrefabSetter();
+    }
+    void BulletPrefabSetter()
+    {
+        _gameData.pistolProjectile.prefab = bulletParticleSystems[GetIDFromPlayerPrefs()];
     }
-
     private SquadMember GetInitialSquadMember()
     {
         int selectedPlayerId = GetIDFromPlayerPrefs();

Assets/Other/Presets/Gameplay_Punch.preset

@@ -220,6 +220,10 @@ Preset:
     propertyPath: autoKill
     value: 0
     objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: autoGenerate
+    value: 1
+    objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: isActive
     value: 1
@@ -320,6 +324,10 @@ Preset:
     propertyPath: optionalBool0
     value: 0
     objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: optionalBool1
+    value: 0
+    objectReference: {fileID: 0}
   - target: {fileID: 0}
     propertyPath: optionalFloat0
     value: 1

Assets/Prefabs/Core/UI/RewardBar.prefab

@@ -32,7 +32,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523703767657001}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -210,7 +209,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523703767657001}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -364,7 +362,6 @@ RectTransform:
   - {fileID: 4620523703053787686}
   - {fileID: 4620523703073077340}
   m_Father: {fileID: 4620523703767657001}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -437,7 +434,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523702908997057}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -590,7 +586,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523702908997057}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -667,7 +662,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523703767657001}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -850,7 +844,6 @@ RectTransform:
   - {fileID: 4620523702413618235}
   - {fileID: 7995921201966881552}
   m_Father: {fileID: 0}
-  m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -947,7 +940,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4620523703767657001}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

Assets/Resources/GameplaySettings.asset

@@ -16,7 +16,11 @@ MonoBehaviour:
   - {fileID: 0}
   groundMaterials:
   - {fileID: 2100000, guid: ebf7e8ea2b948a34ca46b0d32ce8d667, type: 2}
-  pistolProjectile: {fileID: 11400000, guid: eee42d13775b33643be3ec5187ac0ef9, type: 2}
+  pistolProjectile: {fileID: 11400000, guid: 288604cc4d8cbea48a12e74bb3dff30d, type: 2}
+  pistolProjectiles:
+  - {fileID: 11400000, guid: 288604cc4d8cbea48a12e74bb3dff30d, type: 2}
+  - {fileID: 11400000, guid: eee42d13775b33643be3ec5187ac0ef9, type: 2}
+  - {fileID: 11400000, guid: 2b1d168fd8d0f814aba62d1d20a0e37d, type: 2}
   laserProjectile: {fileID: 11400000, guid: eae28334244aed447b0c6524a6bf0eee, type: 2}
   xpModifierIncrease: 1.33
   grayDeathColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 1}

Assets/Resources/Pools/Bullets Orange.asset

@@ -0,0 +1,18 @@
+%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: 22786269e1814403a869355246193a12, type: 3}
+  m_Name: Bullets Orange
+  m_EditorClassIdentifier: 
+  poolName: Bullet
+  prefab: {fileID: 1458536708126384592, guid: 1f9c5df64930ab242a8376eab8be8e2e, type: 3}
+  size: 100
+  lifetime: 2

Assets/Resources/Pools/Bullets Orange.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b1d168fd8d0f814aba62d1d20a0e37d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Pools/Bullets White.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 22786269e1814403a869355246193a12, type: 3}
-  m_Name: Bullets
+  m_Name: Bullets White
   m_EditorClassIdentifier: 
   poolName: Bullet
   prefab: {fileID: 1458536708126384592, guid: ce55757173933984cb374e6fdbabad7a, type: 3}

Assets/Resources/Pools/Bullets White.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 288604cc4d8cbea48a12e74bb3dff30d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Pools/Bullets Yellow.asset

@@ -0,0 +1,18 @@
+%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: 22786269e1814403a869355246193a12, type: 3}
+  m_Name: Bullets Yellow
+  m_EditorClassIdentifier: 
+  poolName: Bullet
+  prefab: {fileID: 1458536708126384592, guid: 1e5d350b49c4fe54199e4b5c92274e0a, type: 3}
+  size: 100
+  lifetime: 2

Assets/Scenes/Gameplay.unity

@@ -562,6 +562,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 728512456452248507, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
+      propertyPath: poolTypes.Array.size
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 728512456452248507, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
+      propertyPath: poolTypes.Array.data[0]
+      value: 
+      objectReference: {fileID: 11400000, guid: 288604cc4d8cbea48a12e74bb3dff30d, type: 2}
+    - target: {fileID: 728512456452248507, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
+      propertyPath: poolTypes.Array.data[1]
+      value: 
+      objectReference: {fileID: 11400000, guid: eee42d13775b33643be3ec5187ac0ef9, type: 2}
+    - target: {fileID: 728512456452248507, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
+      propertyPath: poolTypes.Array.data[2]
+      value: 
+      objectReference: {fileID: 11400000, guid: 2b1d168fd8d0f814aba62d1d20a0e37d, type: 2}
     - target: {fileID: 1279323786998748574, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
       propertyPath: m_LocalPosition.x
       value: 1.37
@@ -774,6 +790,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8587655899641222027, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3}
+      propertyPath: m_Name
+      value: Fire
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -963,10 +983,26 @@ PrefabInstance:
       propertyPath: listOfCharacters.Array.data[2]
       value: 
       objectReference: {fileID: 3460800547581703749, guid: f9ca4ae6a7994ba41933ac5f230a8308, type: 3}
+    - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
+      propertyPath: bulletParticleSystems.Array.size
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
       propertyPath: listOfNeutralCharacters.Array.size
       value: 3
       objectReference: {fileID: 0}
+    - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
+      propertyPath: bulletParticleSystems.Array.data[0]
+      value: 
+      objectReference: {fileID: 1458536708126384592, guid: ce55757173933984cb374e6fdbabad7a, type: 3}
+    - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
+      propertyPath: bulletParticleSystems.Array.data[1]
+      value: 
+      objectReference: {fileID: 1458536708126384592, guid: 1e5d350b49c4fe54199e4b5c92274e0a, type: 3}
+    - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
+      propertyPath: bulletParticleSystems.Array.data[2]
+      value: 
+      objectReference: {fileID: 1458536708126384592, guid: 1f9c5df64930ab242a8376eab8be8e2e, type: 3}
     - target: {fileID: 9047639334381627271, guid: a0a15effcaf7f2f4bbfd493b6593fdcb, type: 3}
       propertyPath: listOfNeutralCharacters.Array.data[0]
       value: 

Assets/Source/Prefabs/New Members/Mysto/1024 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 1024
+      value: 1024 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/128 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 128
+      value: 128 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/16 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 16
+      value: 16 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/2 Mysto.prefab

@@ -406,6 +406,7 @@ MonoBehaviour:
   currentTarget: {fileID: 0}
   evolveTarget: {fileID: 0}
   memberColor: {r: 0.18823531, g: 0.7019608, b: 0.87843144, a: 1}
+  bulletColor: {r: 0, g: 0, b: 0, a: 1}
   IsEvolving: 0
   projectileForce: 10
 --- !u!195 &873183754724297475

Assets/Source/Prefabs/New Members/Mysto/2048 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 2048
+      value: 2048 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/256 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 256
+      value: 256 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/32 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 32
+      value: 32 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/4 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 4
+      value: 4 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects:

Assets/Source/Prefabs/New Members/Mysto/512 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 512
+      value: 512 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/64 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 64
+      value: 64 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/8 Mysto.prefab

@@ -74,7 +74,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: bdc203e2aefbe054d88fbc005e7e2628, type: 3}
       propertyPath: m_Name
-      value: 8
+      value: 8 Mysto
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Source/Prefabs/New Members/Mysto/Neutral Members/2 Mysto Neutral.prefab

@@ -23,13 +23,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 340691081484241106}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.23907265, y: -0.7843558, z: -0.27205345, w: 0.5036042}
   m_LocalPosition: {x: -0.001, y: 0.156, z: 0.356}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9070112972996542030}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4856952654374467452
 GameObject:
@@ -55,13 +55,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4856952654374467452}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: -1, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 9050083822853589759}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!212 &6574628272202191640
 SpriteRenderer:
@@ -140,6 +140,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7487264222203943165}
+  serializedVersion: 2
   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}
@@ -148,7 +149,6 @@ Transform:
   - {fileID: 7915514404433997700}
   - {fileID: 3823749933919243059}
   m_Father: {fileID: 7491453008988252748}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4585953005747127823
 MonoBehaviour:
@@ -565,9 +565,25 @@ PrefabInstance:
       propertyPath: NextEvolution
       value: 
       objectReference: {fileID: 3452663665387872993, guid: 7c97424ff2f9e2043a110986a5099441, type: 3}
+    - target: {fileID: 873183754724297474, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
+      propertyPath: bulletColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 873183754724297474, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
+      propertyPath: bulletColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 873183754724297474, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
+      propertyPath: bulletColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 873183754724297474, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
+      propertyPath: bulletColor.r
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
       propertyPath: m_Name
-      value: 2 Neutral 1
+      value: 2 Mysto Neutral
       objectReference: {fileID: 0}
     - target: {fileID: 873183754724297478, guid: 559c40fc91d73514997bf2450e855e89, type: 3}
       propertyPath: m_Layer

Assets/Source/Prefabs/New Members/Nova/2 Nova.prefab

@@ -1851,6 +1851,7 @@ MonoBehaviour:
   currentTarget: {fileID: 0}
   evolveTarget: {fileID: 0}
   memberColor: {r: 0.18823531, g: 0.7019608, b: 0.87843144, a: 1}
+  bulletColor: {r: 1, g: 0.33942905, b: 0.25098038, a: 1}
   IsEvolving: 0
   projectileForce: 10
 --- !u!195 &750539828899075702

Assets/Source/Prefabs/New Members/Wizard/2 Wizard.prefab

@@ -124,6 +124,7 @@ MonoBehaviour:
   currentTarget: {fileID: 0}
   evolveTarget: {fileID: 0}
   memberColor: {r: 0.18823531, g: 0.7019608, b: 0.87843144, a: 1}
+  bulletColor: {r: 0.1882353, g: 0.7019608, b: 0.8784314, a: 1}
   IsEvolving: 0
   projectileForce: 10
 --- !u!195 &873183754724297475

Assets/Source/Prefabs/Projectiles/Pistol Bullet Orange.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1f9c5df64930ab242a8376eab8be8e2e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Source/Prefabs/Projectiles/Pistol Bullet Yellow.prefab

@@ -9908,7 +9908,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationX:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 1
       minScalar: 0
       maxCurve:
@@ -9961,7 +9961,7 @@ ParticleSystem:
         m_RotationOrder: 4
     startRotationY:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 1
       minScalar: 0
       maxCurve:
@@ -10762,7 +10762,7 @@ ParticleSystem:
       maxColor: {r: 1, g: 1, b: 1, a: 1}
       maxGradient:
         serializedVersion: 2
-        key0: {r: 0, g: 1, b: 1, a: 1}
+        key0: {r: 0.97146004, g: 1, b: 0.2971698, a: 1}
         key1: {r: 0, g: 0.25490198, b: 1, a: 0}
         key2: {r: 0, g: 0.09803922, b: 1, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
@@ -10787,7 +10787,7 @@ ParticleSystem:
         atime6: 0
         atime7: 0
         m_Mode: 0
-        m_ColorSpace: -1
+        m_ColorSpace: 0
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
       minGradient:
@@ -23875,7 +23875,7 @@ MeshRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3191205011612838216}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -23888,7 +23888,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 7b0bb99e69597402aa766dbca3f05120, type: 2}
+  - {fileID: 2100000, guid: 02312ff549bab6649a662b22d74656ca, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -23925,7 +23925,7 @@ GameObject:
   - component: {fileID: -5215053911588457516}
   - component: {fileID: 1458536708126384592}
   m_Layer: 14
-  m_Name: Pistol Bullet
+  m_Name: Pistol Bullet Yellow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Source/Prefabs/Projectiles/Pistol Bullet Yellow.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1e5d350b49c4fe54199e4b5c92274e0a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Source/Prefabs/VFX/FireballMissileFireMysto.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7f2fc63a4079e95439ab073b6f213951
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Source/Prefabs/VFX/FireballMissileFire_Nova.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd1af71d1994aa94fa330a8393edeeea
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Source/Scripts/SO/Soldiers/PistolMember.cs

@@ -24,7 +24,7 @@ public class PistolMember : SquadMember
 
             var projectile = bullet.GetComponent<ProjectileComponent>();
 
-            projectile.SetColor(memberColor);
+            projectile.SetColor(bulletColor);
 
             projectile.rb.velocity = Vector3.zero;
 

Assets/Source/Scripts/SquadComponent.cs

@@ -57,8 +57,9 @@ public class SquadComponent : GameStateMachineUser
 
         _formation.RecreateFormation(Vector3.zero, squadMembersCount <= 4 ? _formationRadius - .3f : _formationRadius, squadMembersCount - 1);
         SetMembersToCinemachineGroup();
+        _gameData.SetProjectilePrefab(_gameData.pistolProjectiles[PlayerPrefs.GetInt(Constants.PlayerSelectionKey, 0)]);
 
-        _gameData.SetProjectilePrefab(_gameData.pistolProjectile);
+        //_gameData.SetProjectilePrefab(_gameData.pistolProjectile);
         _gameData.SetSideProjectiles(0);
 
         currentSpeed = _speed;

Assets/Source/Scripts/SquadMember.cs

@@ -32,6 +32,7 @@ public class SquadMember : Unit
     public SquadMember evolveTarget;
 
     [SerializeField] internal Color memberColor;
+    [SerializeField] internal Color bulletColor;
 
     private CharacterCanvas canvas;
     private Camera currentCamera;