pedrogomes/RiftMayhem
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Targeting system

Browse Source 
- Targetting tags can now hold more than one tag, keeping IsValidTarget, AlliesContains and HasSameTag checks available.
- Added generic target tags for enemies and players
- Optional specific targetting tags if needed for future enhanced targetting
This commit is contained in:
Pedro Gomes 2024-07-25 22:04:25 +01:00
parent 2e864c9a94
commit b16bbc3c73
66 changed files with 269 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab
View File

@ -302,7 +302,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3}
m_Name:
m_EditorClassIdentifier:
targetTag: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
targetTag:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
- {fileID: 11400000, guid: 93dd72cde2a0f904fae3c6ef79d83d65, type: 2}
--- !u!114 &457396336866213366
MonoBehaviour:
m_ObjectHideFlags: 0

8
Assets/Resources/Bosses/BossEnemyPrefab_AngrySkelly_ Variant.prefab
View File

@ -746,6 +746,14 @@ PrefabInstance:
propertyPath: sceneViewId
value: 0
objectReference: {fileID: 0}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.data[2]
value:
objectReference: {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- target: {fileID: 457396336866213367, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: Spirit.BaseValue
value: 3

8
Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab
View File

@ -1712,6 +1712,14 @@ PrefabInstance:
propertyPath: sceneViewId
value: 0
objectReference: {fileID: 0}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.data[2]
value:
objectReference: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- target: {fileID: 457396336866213365, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: maxValue
value: 500

10
Assets/Resources/Bosses/BossEnemyPrefab_VineGolem_Variant.prefab
View File

@ -93,6 +93,14 @@ PrefabInstance:
propertyPath: targetTag
value:
objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 457396336866213364, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: targetTag.Array.data[2]
value:
objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- target: {fileID: 457396336866213365, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: maxValue
value: 200
@ -167,7 +175,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2278116590711127943, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: m_Name
value: BossEnemyPrefab_VineGolem_ Variant
value: BossEnemyPrefab_VineGolem_Variant
objectReference: {fileID: 0}
- target: {fileID: 5690275390890447421, guid: d9b43fa944715a7489818765baa8fc11, type: 3}
propertyPath: m_Avatar

3
Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab
View File

@ -381,7 +381,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3}
m_Name:
m_EditorClassIdentifier:
targetTag: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
targetTag:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
--- !u!114 &1708233211970282801
MonoBehaviour:
m_ObjectHideFlags: 0

8
Assets/Resources/Enemies/BasicEnemyPrefab_AngrySkelly_Variant.prefab
View File

@ -148,6 +148,14 @@ PrefabInstance:
propertyPath: maxValue
value: 50
objectReference: {fileID: 0}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.data[1]
value:
objectReference: {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- target: {fileID: 1708233211970282806, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: sceneViewId
value: 0

8
Assets/Resources/Enemies/BasicEnemyPrefab_SkellyMage_Variant.prefab
View File

@ -55,6 +55,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.data[1]
value:
objectReference: {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- target: {fileID: 1708233211970282806, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: sceneViewId
value: 0

8
Assets/Resources/Enemies/BasicEnemyPrefab_VineGolem_Variant.prefab
View File

@ -87,6 +87,14 @@ PrefabInstance:
propertyPath: targetTag
value:
objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1708233211970282803, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: targetTag.Array.data[1]
value:
objectReference: {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- target: {fileID: 1708233211970282805, guid: 5e02787002b78154db83a830e460a4a9, type: 3}
propertyPath: m_StoppingDistance
value: 1.65

19
Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab
View File

@ -37,15 +37,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: ObservedComponents.Array.size
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: ObservedComponents.Array.data[3]
value:
objectReference: {fileID: 1240144468001624216}
objectReference: {fileID: 4586982804749702518}
- target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: ObservedComponents.Array.data[4]
value:
objectReference: {fileID: 1240144468001624216}
- target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: ObservedComponents.Array.data[5]
value:
objectReference: {fileID: 8112063480741076945}
- target: {fileID: 7726918647213528475, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: classTag
@ -116,6 +120,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6cb53fadb6be8254587f5d0ad1c57778, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4586982804749702518 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1869432520870514277, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
m_PrefabInstance: {fileID: 2763436073792215827}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b337f6af01e751c44b6fb3a810398498, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &4686711277245459575 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7445357712997283684, guid: 9c432d220280f704684a6d5b9354c782, type: 3}

3
Assets/Resources/PlayerPrefab.prefab
View File

@ -424,7 +424,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e2059e61881754b48b2b139321b72289, type: 3}
m_Name:
m_EditorClassIdentifier:
targetTag: {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2}
targetTag:
- {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2}
--- !u!114 &8273564744905798527
MonoBehaviour:
m_ObjectHideFlags: 0

1
Assets/Scriptables/Data/Abilities/Debug/NPC/-Boss/AngrySkelly/Slash/Boss_AngrySkelly_MeleeSlash.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2}
- {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2}
targettingTags_Compact: {fileID: 11400000, guid: 0f06f490ae5d3ab42a1d4159bff90df8, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}

12
Assets/Scriptables/Data/Abilities/Debug/Player/AoEAbility.asset
View File

@ -12,16 +12,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0c765e9ddb90681418e5635dc93b7716, type: 3}
m_Name: AoEAbility
m_EditorClassIdentifier:
Icon: {fileID: 0}
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags: []
abilityEffects:
- {fileID: 11400000, guid: 209c85810803863418c79e39a75c6e31, type: 2}
castTime: 0.5
manaCost: 10
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 1
aoePrefab: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3}
@ -30,4 +33,7 @@ MonoBehaviour:
m_Bits: 8
lifeSpan: 0.25
radius: 1
shouldResizeVisuals: 0
telegraphDelay: 0.5
canHitSelf: 0
spawnUnderUser: 0

2
Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/1-AxeThrow_ProjectileAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -28,6 +29,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 6
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 0

2
Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/2-WhirlingAxes_AoEOverTimeAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -25,6 +26,7 @@ MonoBehaviour:
castTime: 0.25
manaCost: 20
healthCost: 0
classResourceCost: 0
cooldown: 2
castableWhileMoving: 0
animationType: 0

2
Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -28,6 +29,7 @@ MonoBehaviour:
castTime: 0
manaCost: 50
healthCost: 0
classResourceCost: 0
cooldown: 10
castableWhileMoving: 1
animationType: 3

2
Assets/Scriptables/Data/Abilities/Debug/Player/Knight/1-ShieldThrow_ProjectileAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -25,6 +26,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 6
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 0

2
Assets/Scriptables/Data/Abilities/Debug/Player/Knight/2-ShieldWall_AntiProjectileAbility.asset
View File

@ -16,11 +16,13 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags: []
abilityEffects: []
castTime: 0.25
manaCost: 20
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 0

2
Assets/Scriptables/Data/Abilities/Debug/Player/Knight/3-ConsecrationAoEOverTimeAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -28,6 +29,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 50
healthCost: 0
classResourceCost: 0
cooldown: 3
castableWhileMoving: 0
animationType: 1

1
Assets/Scriptables/Data/Abilities/Debug/Player/Mage/0-Mage_MeleeElectroSlash_Ability.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Mage/1-IceShard_ProjectileAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Mage/2-Blizzard_AoEOverTimeAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Mage/3-GlacialBomb_AoEWithImpactEventAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Mage/C-ChargedUp_AoEOverTimeAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

2
Assets/Scriptables/Data/Abilities/Debug/Player/MeleeSlashAbility.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -25,6 +26,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 0
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 2

2
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/0-Necro_MeleeSiphonSlash_Ability.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -27,6 +28,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 0
healthCost: 0
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 2

1
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/GolemSlam.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}

2
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Golem_MeleeSlashAbility.asset
View File

@ -16,7 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}

2
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/MinionDarkMatter_ProjectileAbility.asset
View File

@ -17,6 +17,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}
@ -26,6 +27,7 @@ MonoBehaviour:
castTime: 0.75
manaCost: 5
healthCost: 5
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 1

2
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_BoneThrow.asset
View File

@ -17,6 +17,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}
@ -27,6 +28,7 @@ MonoBehaviour:
castTime: 0.5
manaCost: 2
healthCost: 5
classResourceCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 0

1
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/Minions/Minion_MeleeSlashAbility.asset
View File

@ -17,6 +17,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2}

2
Assets/Scriptables/Data/Abilities/Debug/Player/Necromancer/SoulBomb/SoulBomb.asset
View File

@ -16,6 +16,7 @@ MonoBehaviour:
targettingTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2}
@ -25,6 +26,7 @@ MonoBehaviour:
castTime: 0.75
manaCost: 20
healthCost: 10
classResourceCost: 0
cooldown: 5
castableWhileMoving: 0
animationType: 1

1
Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset
View File

@ -18,6 +18,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset
View File

@ -18,6 +18,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

1
Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset
View File

@ -18,6 +18,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2}
- {fileID: 11400000, guid: f2783698310f58b46b7f6ead6b3ff5b0, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2}

8
Assets/Scriptables/Data/Tags/TargetType/Enemies.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 496827523e87f15469bcf10c34c740f5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

16
Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset Normal file
View File

@ -0,0 +1,16 @@
%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: d69dea404b9524746b70c71ca35252de, type: 3}
m_Name: Enemy
m_EditorClassIdentifier:
AlliedTags:
- {fileID: 11400000}

8
Assets/Scriptables/Data/Tags/TargetType/Enemies/Enemy.asset.meta Normal file
View File

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

0
Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset
View File

0
Assets/Scriptables/Data/Tags/TargetType/EnemyAntiProjectile.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyAntiProjectile.asset.meta
View File

16
Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset Normal file
View File

@ -0,0 +1,16 @@
%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: d69dea404b9524746b70c71ca35252de, type: 3}
m_Name: EnemyBoss
m_EditorClassIdentifier:
AlliedTags:
- {fileID: 11400000}

8
Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemyBoss.asset.meta Normal file
View File

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

8
Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d5e135254c44f7740bc231e186b8d608
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset
View File

@ -15,3 +15,5 @@ MonoBehaviour:
AlliedTags:
- {fileID: 11400000}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}

0
Assets/Scriptables/Data/Tags/TargetType/AngrySkelly.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/AngrySkelly.asset.meta
View File

4
Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset
View File

@ -13,5 +13,7 @@ MonoBehaviour:
m_Name: SkellyMage
m_EditorClassIdentifier:
AlliedTags:
- {fileID: 11400000}
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000}
- {fileID: 11400000, guid: 3ac13d1337574174486b5f7d8879d221, type: 2}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}

0
Assets/Scriptables/Data/Tags/TargetType/SkellyMage.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/SkellyMage.asset.meta
View File

19
Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset Normal file
View File

@ -0,0 +1,19 @@
%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: d69dea404b9524746b70c71ca35252de, type: 3}
m_Name: VineGolem
m_EditorClassIdentifier:
AlliedTags:
- {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2}
- {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2}
- {fileID: 11400000}
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}

8
Assets/Scriptables/Data/Tags/TargetType/Enemies/EnemySpecificTargetTags/VineGolem.asset.meta Normal file
View File

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

8
Assets/Scriptables/Data/Tags/TargetType/Players.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3833956d3c68bc4488cbff08c63e25b0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Scriptables/Data/Tags/TargetType/Player.asset → Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset
View File

0
Assets/Scriptables/Data/Tags/TargetType/Player.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Players/Player.asset.meta
View File

0
Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset → Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset
View File

0
Assets/Scriptables/Data/Tags/TargetType/PlayerAntiProjectile.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Players/PlayerAntiProjectile.asset.meta
View File

0
Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset → Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset
View File

0
Assets/Scriptables/Data/Tags/TargetType/PlayerMinion.asset.meta → Assets/Scriptables/Data/Tags/TargetType/Players/PlayerMinion.asset.meta
View File

8
Assets/Scriptables/Data/Tags/TargetType/Players/PlayerSpecificTargetTags.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 552b0f3537ec58f489d37dc8cc85f63b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs
View File

@ -37,7 +37,8 @@ public class AbsorbEffect : StatusEffect
private bool IsAlliedTarget(Taggable user, Taggable target)
{
return user.targetTag.AlliedTags.Contains(target.targetTag);
//return user.targetTag.Contains(target.targetTag);
return user.AlliedTagsContains(target.targetTag);
}
private float CalculateFinalAmount(Taggable user)

3
Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs
View File

@ -59,7 +59,8 @@ public class InstantValueEffect : BaseEffect
stats = user.GetComponent<CharacterStats>();
GetFinalValue(stats);
return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier);
//return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier);
return user.AlliedTagsContains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier);
}
/*

3
Assets/Scripts/NPC/BossController.cs
View File

@ -257,7 +257,8 @@ public class BossController : NPCController
if (possibleTarget == null) continue;
if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) continue;
//if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) continue;
if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) continue;
if (possibleTargets.Contains(possibleTarget)) continue;

3
Assets/Scripts/NPC/NPCController.cs
View File

@ -214,7 +214,8 @@ public class NPCController : MonoBehaviour
if (possibleTarget == null) return;
if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return;
//if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return;
if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) return;
if (possibleTargets.Contains(possibleTarget)) return;

3
Assets/Scripts/NPC/NPCControllers_v2/NPCSightControllerBase.cs
View File

@ -48,7 +48,8 @@ public class NPCSightControllerBase : MonoBehaviour
if (possibleTarget == null) return;
if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return;
//if (possibleTarget.targetTag == myTag.targetTag || myTag.targetTag.AlliedTags.Contains(possibleTarget.targetTag)) return;
if (possibleTarget.HasSameTag(myTag.targetTag) || myTag.AlliedTagsContains(possibleTarget.targetTag)) return;
if (npcController.possibleTargets.Contains(possibleTarget)) return;

2
Assets/Scripts/Networking/NetworkedChanneling.cs
View File

@ -113,7 +113,7 @@ public class NetworkedChanneling : MonoBehaviour
if (target == null) continue;
Debug.Log("hit collider, targetTag: " + target.targetTag.name);
//Debug.Log("hit collider, targetTag: " + target.targetTag.name);
foreach (TargetTag tag in ability.targettingTags)
{

2
Assets/Scripts/Networking/NetworkedSlash.cs
View File

@ -117,7 +117,7 @@ public class NetworkedSlash : MonoBehaviour
if (target == null) continue;
Debug.Log("hit collider, targetTag: " + target.targetTag.name);
//Debug.Log("hit collider, targetTag: " + target.targetTag.name);
if (!target.IsValidTarget(ability.targettingTags)) continue;

29
Assets/Scripts/Taggable.cs
View File

@ -5,11 +5,36 @@ using UnityEngine;
public class Taggable : MonoBehaviour
{
public TargetTag targetTag;
public List<TargetTag> targetTag = new List<TargetTag>();
public bool IsValidTarget(List<TargetTag> tags)
{
return tags.Contains(targetTag);
for (int i = 0; i < targetTag.Count; i++)
{
if (tags.Contains(targetTag[i])) return true;
}
return false;
}
public bool AlliedTagsContains(List<TargetTag> tags)
{
for (int i = 0; i < targetTag.Count; i++)
{
for (int j = 0; j < tags.Count; j++)
{
if (targetTag[i].AlliedTags.Contains(tags[j])) return true;
}
}
return false;
}
public bool HasSameTag(List<TargetTag> tags)
{
for (int i = 0; i < targetTag.Count; i++)
{
if (tags.Contains(targetTag[i])) return true;
}
return false;
}
//private IEnumerable<TargettingTag> commonItems;
//public bool IsValidTarget(List<TargettingTag> tags)

2
Assets/Scripts/Targetting/TargetTag.cs
View File

@ -6,4 +6,4 @@ using UnityEngine;
public class TargetTag : ScriptableObject
{
public List<TargetTag> AlliedTags = new List<TargetTag>();
}
}

2
Assets/Starfield Skybox/Skybox.mat
View File

@ -94,7 +94,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotation: 7.8304377
- _Rotation: 9.476569
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1