Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Pull request #57: Fix spawning for gala and fix archer atk speed

Browse Source 
Merge in CGD/gather-and-defend from design/galaFixes2 to main

* commit '8e50c6d45539b846c411f65c445eb42704690ae0':
  Fix spawning for gala and fix archer atk speed
This commit is contained in:
William Gingras 01 2023-11-14 12:55:58 +00:00 committed by Felix-gabriel Boucher-luneau
commit d31a47885b
10 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Design/Levels/WaveConfig_1_1.asset
View File

@ -14,8 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 10
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 20
_nestedGroupSpawn:
- groupSpawn:

4
Assets/Design/Levels/WaveConfig_1_2.asset
View File

@ -14,9 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 10
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 20
_count: 40
_nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}

4
Assets/Design/Levels/WaveConfig_1_3.asset
View File

@ -14,9 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 15
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 25
_count: 40
_nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}

4
Assets/Design/Levels/WaveConfig_1_4.asset
View File

@ -14,9 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 15
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 25
_count: 45
_nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}

4
Assets/Design/Levels/WaveConfig_1_5.asset
View File

@ -14,9 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 15
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 25
_count: 45
_nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}

4
Assets/Design/Levels/WaveConfig_1_6.asset
View File

@ -14,9 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 15
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 25
_count: 50
_nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}

11
Assets/GlobalConfig.asset
View File

@ -13,21 +13,26 @@ MonoBehaviour:
m_Name: GlobalConfig
m_EditorClassIdentifier:
damageFlashIntensity: 1
enemySpeedMultiplier: 1
enemySpeedMultiplier: 0.8
enemyDamageMultiplier: 1
enemyLifeMultiplier: 1
enemyRangeMultiplier: {x: 1, y: 1}
enemyAttackSpeedMultiplier: 1
groupSpawnDelay: 0.05
allyDamageMultiplier: 1
allyLifeMultiplier: 1
allyAttackSpeedMultiplier: 1
allySpeedMultiplier: 1
allyRangeMultiplier: {x: 1, y: 1}
basePopulation: 5
populationGivenPerHouse: 5
populationCostPerUnit: 1
populationWarningPercentage: 0.85
harvestDuration: 10
harvestAmount: 10
useRandomHarvestDuration: 1
randomHarvestDurationMinimum: 8
randomHarvestDurationMaximum: 12
randomHarvestDurationMinimum: 9
randomHarvestDurationMaximum: 11
loadingAddedTime: 0.2
baseTileSpawnSpeed: 33
tileSpawnAcceleration: 2

2
Assets/Prefabs/Sticks/archerStick.prefab
View File

@ -652,7 +652,7 @@ MonoBehaviour:
_hp: 10
_speed: 0
_attack_damage: 2
_attack_interval: 2
_attack_interval: 4
--- !u!82 &-6673723252830894487
AudioSource:
m_ObjectHideFlags: 0

22
Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab
View File

@ -94,7 +94,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1388419616670829464
RectTransform:
m_ObjectHideFlags: 0
@ -110,9 +110,9 @@ RectTransform:
m_Father: {fileID: 1388419617214705178}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -64, y: -58}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -23, y: 168}
m_SizeDelta: {x: 512, y: 512}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1388419616670829471
@ -196,7 +196,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1388419616670829470}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: WorldMapManager, GameAssembly
m_MethodName: WorldReinitialition
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1388419616788066155
GameObject:
m_ObjectHideFlags: 0

6
Assets/Scripts/LevelManager/LevelManagerScript.cs
View File

@ -38,6 +38,12 @@ public class LevelManagerScript : SingletonBehaviour<LevelManagerScript>
void Update()
{
updateAction?.Invoke();
// Gala hack to win level instantly
if (Input.GetKeyDown(KeyCode.Alpha0))
{
EventAggregator.Instance.GetEvent<LastWaveCompletedEvent>().Invoke();
}
}
private void Instance_LevelLoaded(Level level)