Assets/Art/Sprites/UI/HUD/hud_monsterCore_background.png.meta

@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 6ac775d3d669c124fbbb2032dde07b62
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: 1
-    mipBias: 0
-    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}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Design/Levels/WaveConfig_1_1.asset

@@ -20,20 +20,16 @@ MonoBehaviour:
     - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
       _count: 2
     triggerTime: 0.25
-    dropsMonsterCore: 1
   - groupSpawn:
     - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
       _count: 9
     triggerTime: 1.5
-    dropsMonsterCore: 1
   - groupSpawn:
     - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
       _count: 7
     triggerTime: 2
-    dropsMonsterCore: 0
   - groupSpawn:
     - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
       _count: 14
     triggerTime: 3
-    dropsMonsterCore: 0
   _gameDuration: 3

Assets/Design/UnitCards/Archer.asset

@@ -16,4 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 2
-  _tooltipString: "Archer\nAttaque longue port\xE9e"
+  _tooltipString: 

Assets/Design/UnitCards/Blacksmith.asset

@@ -16,6 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 10
-  _tooltipString: 'Forgerie
+  _tooltipString: 
-
-    +5 population | +15% vitesse production de roches'

Assets/Design/UnitCards/Bolas.asset

@@ -16,6 +16,3 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 1
-  _tooltipString: 'Lanceur de bolas
-
-    Ralentit les ennemis'

Assets/Design/UnitCards/Castle.asset

@@ -16,4 +16,4 @@ MonoBehaviour:
   _rock: 350
   _food: 0
   _cooldownInSeconds: 30
-  _tooltipString: "Ch\xE2teau sentinelle\nTire une rafale de projectiles d\xE9vastatrices"
+  _tooltipString: 

Assets/Design/UnitCards/Farm.asset

@@ -16,5 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 0
-  _tooltipString: "Plantation de nourriture\nPermet \xE0 un fermier de r\xE9colter
+  _tooltipString: 
-    de la nourriture"

Assets/Design/UnitCards/Farmer.asset

@@ -16,5 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 10
   _cooldownInSeconds: 0
-  _tooltipString: "Agriculteur de ressources\nR\xE9colte tout type de ressources
+  _tooltipString: 
-    (Nourriture / Bois / Roche)"

Assets/Design/UnitCards/FarmerMob.asset

@@ -16,5 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 20
   _cooldownInSeconds: 1
-  _tooltipString: "MOB agressive de l'association des fermiers\nFournissent un mur
+  _tooltipString: Agressive farmer's association MOB
-    d\xE9fensif efficace"

Assets/Design/UnitCards/House.asset

@@ -16,6 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 1
-  _tooltipString: 'Maison
+  _tooltipString: 
-
-    +10 population'

Assets/Design/UnitCards/Knight.asset

@@ -16,6 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 100
   _cooldownInSeconds: 15
-  _tooltipString: 'Chevalier
+  _tooltipString: 
-
-    Fournis un mur imbattable'

Assets/Design/UnitCards/KnightOnHorse.asset

@@ -16,5 +16,3 @@ MonoBehaviour:
   _rock: 0
   _food: 10
   _cooldownInSeconds: 1
-  _tooltipString: "Chevalier jouteur\nAttaque m\xEAl\xE9e + attaque per\xE7ante dans
-    la rang\xE9e"

Assets/Design/UnitCards/Mill.asset

@@ -16,6 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 10
-  _tooltipString: 'Moulin
+  _tooltipString: 
-
-    +5 population | +15% vitesse production de nourriture'

Assets/Design/UnitCards/Scorpion.asset

@@ -16,4 +16,3 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 2
-  _tooltipString: "Scorpion\nAttaque per\xE7ante longue port\xE9e"

Assets/Design/UnitCards/Slinger.asset

@@ -16,4 +16,3 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 1
-  _tooltipString: "Lanceur de pierres\nAttaques longue port\xE9e"

Assets/Design/UnitCards/Swordsman.asset

@@ -16,6 +16,3 @@ MonoBehaviour:
   _rock: 0
   _food: 30
   _cooldownInSeconds: 4
-  _tooltipString: 'Apprenti chevalier
-
-    Fournis un mur durable'

Assets/Design/UnitCards/Workshop.asset

@@ -16,6 +16,4 @@ MonoBehaviour:
   _rock: 0
   _food: 0
   _cooldownInSeconds: 10
-  _tooltipString: 'Workshop
+  _tooltipString: 
-
-    +5 population | +15% vitesse production de bois'

Assets/Prefabs/Yield/TestMonsterCore.asset

@@ -1,15 +0,0 @@
-%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: f431d5fa196e5ea4da69343642d10d2f, type: 3}
-  m_Name: TestMonsterCore
-  m_EditorClassIdentifier: 
-  _monsterCorePrefab: {fileID: 6962989255644195630, guid: 1130702cca945b542bec6c5cd7ff859b, type: 3}

Assets/Prefabs/Yield/TestMonsterCore.asset.meta

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

Assets/Prefabs/Yield/yieldMonsterCore.prefab

@@ -1,221 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &6962989255644195630
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6962989255644195631}
-  - component: {fileID: 6072713849781841816}
-  - component: {fileID: -1491803373025033585}
-  - component: {fileID: 2238237770060079311}
-  - component: {fileID: 3600016298306940116}
-  m_Layer: 0
-  m_Name: yieldMonsterCore
-  m_TagString: Resource
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6962989255644195631
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989255644195630}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -6.61, y: -0.638, z: 1.8112363}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6962989256011107500}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1839735485 &6072713849781841816
-Tilemap:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989255644195630}
-  m_Enabled: 0
-  m_Tiles: {}
-  m_AnimatedTiles: {}
-  m_TileAssetArray: []
-  m_TileSpriteArray: []
-  m_TileMatrixArray: []
-  m_TileColorArray: []
-  m_TileObjectToInstantiateArray: []
-  m_AnimationFrameRate: 1
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Origin: {x: 0, y: 0, z: 0}
-  m_Size: {x: 0, y: 0, z: 1}
-  m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
-  m_TileOrientation: 0
-  m_TileOrientationMatrix:
-    e00: 1
-    e01: 0
-    e02: 0
-    e03: 0
-    e10: 0
-    e11: 1
-    e12: 0
-    e13: 0
-    e20: 0
-    e21: 0
-    e22: 1
-    e23: 0
-    e30: 0
-    e31: 0
-    e32: 0
-    e33: 1
---- !u!50 &-1491803373025033585
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989255644195630}
-  m_BodyType: 0
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 0
-  m_Material: {fileID: 0}
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 4
---- !u!61 &2238237770060079311
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989255644195630}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0.05, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.29, y: 0.25}
-  m_EdgeRadius: 0
---- !u!114 &3600016298306940116
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989255644195630}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9dd6bad38b516d64e8e23a5822ca37bb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _resourceChoice: 3
-  _animate: 1
---- !u!1 &6962989256011107503
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6962989256011107500}
-  - component: {fileID: 6962989256011107501}
-  m_Layer: 0
-  m_Name: sprite
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6962989256011107500
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989256011107503}
-  m_LocalRotation: {x: 0, y: -0, z: 0, w: -1}
-  m_LocalPosition: {x: 0.0259, y: 0.01, z: 0}
-  m_LocalScale: {x: 0.5394133, y: 0.56488746, z: 0.9686}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6962989255644195631}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 360}
---- !u!212 &6962989256011107501
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6962989256011107503}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 4
-  m_Sprite: {fileID: 21300000, guid: 8354a544f4ca3514e87d40d2de9afaee, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1.06, y: 1.69}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0

Assets/Prefabs/Yield/yieldMonsterCore.prefab.meta

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

Assets/Scripts/Ally/AllyUpgrade.cs

@@ -48,10 +48,10 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
         {
             if (_upgradeList.Count > i && _upgradeList[i] != null)
             {
-                Transform upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1));
+                GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
-                if (upgradeEnfant && upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
+                if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
                 {
-                    button.Initialize(_upgradeList[i], gameObject.gameObject, canvas);
+                    button.Initialize(_upgradeList[i], gameObject, canvas);
                 }
             }
         }

Assets/Scripts/Enum.cs

@@ -4,8 +4,7 @@ public class Enum
     {
         Rock = 0,
         Wood = 1,
-        Food = 2,
+        Food = 2
-        MonsterCore = 3
     };
     public enum ResourceNodeType
     {

Assets/Scripts/General/GlobalConfigFile.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditorInternal;
 using UnityEngine;
 
 [CreateAssetMenu(menuName = project_name + "/Global Config")]

Assets/Scripts/LevelConfig/WaveObserver.cs

@@ -29,7 +29,6 @@ public class WaveObserver : Singleton<WaveObserver>
         _copyConstantSpawn = new List<int>();
         _copyGroupSpawn = new List<List<int>>();
         _groupSpawnTimers = new List<float>();
-        _monsterCoreGroups = new List<bool>();
 
         _spawnerTiming = 0;
         _currentGroupIndex = 0;
@@ -250,34 +249,15 @@ public class WaveObserver : Singleton<WaveObserver>
     private void CycleRows(List<int> usedRows, List<EnemyType> currentGroup, int groupIndex)
     {
         System.Random rand = new System.Random();
-        bool dropsCore = _monsterCoreGroups != null && _monsterCoreGroups.Count > _currentGroupIndex && _monsterCoreGroups[_currentGroupIndex];
-        int totalToSpawn = _copyGroupSpawn[_currentGroupIndex][groupIndex];
-        int monsterCoreTarget = -1;
-        // TODO : Si spécifié, nbr fixe de core à drop
-        if (dropsCore && totalToSpawn > 0)
-        {
-            monsterCoreTarget = rand.Next(0, totalToSpawn);
-        }
-        int spawnCount = 0;
         while (usedRows.Count < _subjects.Count)
         {
             int currentRow = rand.Next(_subjects.Count);
             if (!usedRows.Contains(currentRow))  //If picked row has laready been used
             {
-                Opponent spawnedInstance = _subjects[currentRow].TriggerSpawn(currentGroup[groupIndex].GetEnemyObject()).GetComponent<Opponent>();
+                _subjects[currentRow].TriggerSpawn(currentGroup[groupIndex].GetEnemyObject());
-
-                // When Monster core time
-                if (monsterCoreTarget >= 0 && spawnCount == monsterCoreTarget)
-                {
-                    spawnedInstance.ActivateMonsterCore();
-                }
-
                 _copyGroupSpawn[_currentGroupIndex][groupIndex]--;
                 usedRows.Add(currentRow);
-                spawnCount++;
             }
-
-
             if (_copyGroupSpawn[_currentGroupIndex][groupIndex] == 0)  //If current ennemy has reached count of 0
             {
                 break;

Assets/Scripts/LevelEditor/Level.cs

@@ -23,15 +23,12 @@ namespace GatherAndDefend.LevelEditor
         [SerializeField]
         private int _startPopulation = 10;
         [SerializeField]
-        private int _startMonsterCore = 0;
-        [SerializeField]
         private int _startFood = 50;
         [SerializeField]
         private int _startWood = 0;
         [SerializeField]
         private int _startRock = 0;
         public int StartPopulation => _startPopulation;
-        public int StartMonsterCore => _startMonsterCore;
         public int StartFood => _startFood;
         public int StartWood => _startWood;
         public int StartRock => _startRock;

Assets/Scripts/Opponent/MonsterCoreDrop.cs

@@ -1,26 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 
-[CreateAssetMenu(menuName = "Gather And Defend/" + nameof(MonsterCoreDrop))]
+public class MonsterCoreDrop : Opponent
-public class MonsterCoreDrop : ScriptableObject
 {
-    [SerializeField]
+    private GameObject mosnterCorePrefab;
-    private GameObject _monsterCorePrefab;
+    public override void Death()
-    
-    public void Start()
     {
-        Debug.Log("MONSTER CORING SSO HARD");
+        Instantiate(mosnterCorePrefab, transform.position, Quaternion.identity);
-        if (_monsterCorePrefab == null)
+        base.Death();
-        {
-            Debug.LogWarning("Prefab MonsterCore non defini");
-        }
-    }
-
-    public void Death(Vector3 position)
-    {
-        if (_monsterCorePrefab != null)
-        {
-            Instantiate(_monsterCorePrefab, position, Quaternion.identity);
-        }
-        Debug.Log("MONSTER CORE DROPPEDD");
     }
 }

Assets/Scripts/Opponent/Opponent.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditorInternal;
 using UnityEngine;
 
 public class Opponent : Entity
@@ -15,7 +16,6 @@ public class Opponent : Entity
     private WaveObserver _observer;
     private int _observerIndex;
     private float _toughness;
-    private bool _dropsMonsterCore = false;
 
     public override void Start()
     {
@@ -60,17 +60,8 @@ public class Opponent : Entity
 
     public override void Death()
     {
-        if (_dropsMonsterCore)
-        {
-            // TODO: Fetch scriptable object from Dict
-        }
         _observer.NotifyDies(_observerIndex, _toughness, gameObject);
         base.Death();
     }
 
-    public void ActivateMonsterCore()
-    {
-        _dropsMonsterCore = true;
-    }
-
 }

Assets/Scripts/Resource/ResourceMaker.cs

@@ -40,9 +40,6 @@ public class ResourceMaker : MonoBehaviour
             case Enum.ResourceChoice.Food:
                 _destination = GameObject.FindWithTag("Food");
                 break;
-            case Enum.ResourceChoice.MonsterCore:
-                _destination = GameObject.FindWithTag("MonsterCore");
-                break;
             default:
                 _destination = GameObject.FindWithTag("Food");
                 break;
@@ -103,9 +100,6 @@ public class ResourceMaker : MonoBehaviour
             case Enum.ResourceChoice.Food:
                 _resourceManagerInstance.FoodAmount += amount;
                 break;
-            case Enum.ResourceChoice.MonsterCore:
-                _resourceManagerInstance.MonsterCoreAmount += amount;
-                break;
         }
     }
 

Assets/Scripts/Resource/ResourceManager.cs

@@ -11,7 +11,6 @@ public class ResourceManager : Singleton<ResourceManager>
     private int _rockAmount = 0;
     private int _woodAmount = 0;
     private int _foodAmount = 0;
-    private int _monsterCoreAmount = 0;
 
     private float _currentPopulation;
     private float _maximumPopulation;
@@ -30,7 +29,6 @@ public class ResourceManager : Singleton<ResourceManager>
         _rockAmount = 0;
         _woodAmount = 0;
         _foodAmount = 0;
-        _monsterCoreAmount = 0;
         _currentPopulation = 0;
         _maximumPopulation = 0;
     }
@@ -39,7 +37,6 @@ public class ResourceManager : Singleton<ResourceManager>
         RockAmount = level.StartRock;
         WoodAmount = level.StartWood;
         FoodAmount = level.StartFood;
-        MonsterCoreAmount = level.StartMonsterCore;
         CurrentPopulation = 0;
         MaximumPopulation = level.StartPopulation;
     }
@@ -80,18 +77,6 @@ public class ResourceManager : Singleton<ResourceManager>
         }
         get { return _foodAmount; }
     }
-    public int MonsterCoreAmount
-    {
-        set
-        {
-            if (value != _monsterCoreAmount)
-            {
-                _monsterCoreAmount = value;
-                EventAggregator.Instance.GetEvent<ResourcesChangedEvent>().Invoke();
-            }
-        }
-        get { return _monsterCoreAmount; }
-    }
 
     public float CurrentPopulation
     {
@@ -127,26 +112,24 @@ public class ResourceManager : Singleton<ResourceManager>
         }
     }
 
-    public void Remove(int rock, int wood, int food, int monsterCore = 0)
+    public void Remove(int rock, int wood, int food)
     {
-        int oldRock = _rockAmount, oldWood = _woodAmount, oldFood = _foodAmount, oldMonsterCore = _monsterCoreAmount;
+        int oldRock = _rockAmount, oldWood = _woodAmount, oldFood = _foodAmount;
         _rockAmount = (_rockAmount - rock) < MIN ? MIN : _rockAmount - rock;
         _woodAmount = (_woodAmount - wood) < MIN ? MIN : _woodAmount - wood;
         _foodAmount = (_foodAmount - food) < MIN ? MIN : _foodAmount - food;
-        _monsterCoreAmount = (_monsterCoreAmount - monsterCore) < MIN ? MIN : _monsterCoreAmount - monsterCore;
 
-        if (oldRock != _rockAmount || oldFood != _foodAmount || oldWood != _woodAmount || oldMonsterCore != _monsterCoreAmount)
+        if (oldRock != _rockAmount || oldFood != _foodAmount || oldWood != _woodAmount)
         {
             EventAggregator.Instance.GetEvent<ResourcesChangedEvent>().Invoke();
         }
     }
 
-    public bool EnoughFor(int rock, int wood, int food = 0, int monsterCore = 0)
+    public bool EnoughFor(int rock, int wood, int food = 0)
     {
         return _rockAmount >= rock
             && _woodAmount >= wood
-            && _foodAmount >= food
+            && _foodAmount >= food;
-            && _monsterCoreAmount >= monsterCore;
     }
     public bool EnoughPopulationFor(int population = 1) 
     {

Assets/Scripts/Resource/ResourceRemover.cs

@@ -20,9 +20,6 @@ public class ResourceRemover : MonoBehaviour
     [SerializeField] 
     private int _food;
 
-    [SerializeField]
-    private int _monsterCore;
-
     [SerializeField]
     private TextMeshProUGUI _text;
 
@@ -43,7 +40,7 @@ public class ResourceRemover : MonoBehaviour
     private void ChangeAvailability()
     {
         //checks if player has enough resources then changes the state of button's availability
-        if (_resourceManager.EnoughFor(_rock, _wood, _food, _monsterCore))
+        if (_resourceManager.EnoughFor(_rock, _wood, _food))
         {
             if (_text.color != Color.green)
             {
@@ -63,7 +60,7 @@ public class ResourceRemover : MonoBehaviour
         if (_text.color == Color.green)
         {
             Debug.Log("Removed items...");
-            _resourceManager.Remove(_rock, _wood, _food, _monsterCore);
+            _resourceManager.Remove(_rock, _wood, _food);
         }
     }
 

Assets/Scripts/Resource/ResourceText.cs

@@ -21,8 +21,6 @@ public class ResourceText : MonoBehaviour
     [SerializeField]
     private TextMeshProUGUI _foodText;
     [SerializeField]
-    private TextMeshProUGUI _monsterCoreText;
-    [SerializeField]
     private TextMeshProUGUI _populationText;
     [SerializeField]
     private Image _populationCriticalIndicator;
@@ -45,7 +43,6 @@ public class ResourceText : MonoBehaviour
         _rockText.text = _resourceManager.RockAmount.ToString();
         _woodText.text = _resourceManager.WoodAmount.ToString();
         _foodText.text = _resourceManager.FoodAmount.ToString();
-        _monsterCoreText.text = _resourceManager.MonsterCoreAmount.ToString();
     }
     void RefreshPopulation()
     {

Assets/Scripts/Status/Slow.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting.YamlDotNet.Core.Tokens;
 using UnityEngine;
 
 public class Slow : Status

Assets/Scripts/Tiles/SpawnerTile.cs

@@ -138,9 +138,9 @@ public class SpawnerTile : LevelTile
      * Instantly spawns an enemy.
      * Used for GroupSpawn
      */
-    public GameObject TriggerSpawn(GameObject enemy)
+    public void TriggerSpawn(GameObject enemy)
     {
-        return enemy.Create(Position, parent: LevelManager.Instance.LevelTransform);
+        enemy.Create(Position, parent: LevelManager.Instance.LevelTransform);
     }
 
 #if UNITY_EDITOR

Assets/Scripts/UnitTree/UpgradePlacementButton.cs

@@ -3,6 +3,7 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using static PlasticGui.LaunchDiffParameters;
 
 public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler
 {

ProjectSettings/TagManager.asset

@@ -11,7 +11,6 @@ TagManager:
   - Wood
   - Rock
   - Upgrade
-  - MonsterCore
   layers:
   - Default
   - TransparentFX