diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 41c109ad..7a749a4a 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -971,6 +971,8 @@ MonoBehaviour: m_EditorClassIdentifier: StatusEffects: - {fileID: 11400000, guid: c67c3526f466b254c9dba7c2d584eb4e, type: 2} + - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} + - {fileID: 11400000, guid: a1bafe62c9b7a5b428996e45d7bd3f33, type: 2} --- !u!1 &7475116340738615313 GameObject: m_ObjectHideFlags: 0 @@ -1330,6 +1332,7 @@ MonoBehaviour: - {fileID: 11400000, guid: e75c893bb94c00f41b9bc6bbea9872d4, type: 2} - {fileID: 11400000, guid: d58ac5a6fef83a24e93311b30cc34b0d, type: 2} - {fileID: 11400000, guid: b2720497081a6e349a7988604c2376e5, type: 2} + - {fileID: 11400000, guid: f3628bf368b593d488559a00aef758a6, type: 2} - {fileID: 11400000, guid: 96c81c820f0bfe747af956cccd0f0ba4, type: 2} --- !u!1 &7475116341184709871 GameObject: diff --git a/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab b/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab new file mode 100644 index 00000000..69d2d070 --- /dev/null +++ b/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab @@ -0,0 +1,291 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6109388605376384584 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 684837414281441225, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1205021609740332654, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1289543790355709915, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_Name + value: Magic shield White Holyish + objectReference: {fileID: 0} + - target: {fileID: 1289543790355709915, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.32549024 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.99563587 + objectReference: {fileID: 0} + - target: {fileID: 1684423448260017312, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.9103774 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.99967444 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: EmissionModule.m_Bursts.Array.data[0].time + value: 0.065 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].time + value: 0.06573259 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].time + value: 0.2254326 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].value + value: 0.42026812 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].inSlope + value: 6.3359027 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope + value: 5.2681565 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].outSlope + value: 6.3359027 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope + value: 5.2681565 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[0].outWeight + value: 0.4719409 + objectReference: {fileID: 0} + - target: {fileID: 2955197092750843386, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outWeight + value: 0.20543242 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.48584908 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.9926169 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].time + value: 0.08749896 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].time + value: 0.38235033 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].value + value: 0.6497027 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope + value: 3.0584276 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope + value: 3.0584276 + objectReference: {fileID: 0} + - target: {fileID: 3906390675509293155, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outWeight + value: 0.31557903 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.32201177 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.39607844 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.39003217 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].time + value: 0.08749896 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].time + value: 0.38235033 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].value + value: 0.6497027 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[2].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope + value: 3.0584276 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope + value: 3.0584276 + objectReference: {fileID: 0} + - target: {fileID: 5135780860574305825, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outWeight + value: 0.31557903 + objectReference: {fileID: 0} + - target: {fileID: 6296318069342208415, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b99922c2f59b1a542bdd06ae8bee47ae, type: 3} diff --git a/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab.meta b/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab.meta new file mode 100644 index 00000000..7794b2fb --- /dev/null +++ b/Assets/Hovl Studio/Magic effects pack/Prefabs/Magic shields/Magic shield White Holyish Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f6ef9ed338b55be49abce7e602b3e855 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab new file mode 100644 index 00000000..b73b0dac --- /dev/null +++ b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab @@ -0,0 +1,261 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2060993993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060993994} + m_Layer: 30 + m_Name: Visuals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2060993994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060993993} + 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} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3307683014584383595} + m_Father: {fileID: 8979840876601850888} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4422069639109923867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027310239587, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891022, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: effectVisual + value: + objectReference: {fileID: 2060993993} + - target: {fileID: 4737951027918891025, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: sceneViewId + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_Name + value: BurstOfHope_AreaOfEffectPrefab Variant + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4737951027217692119, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 4737951027217692116, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 4737951027217692117, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} +--- !u!4 &8979840876601850888 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4737951027918891027, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + m_PrefabInstance: {fileID: 4422069639109923867} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7608462654639675469 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2060993994} + m_Modifications: + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime0 + value: 13107 + objectReference: {fileID: 0} + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime1 + value: 49151 + objectReference: {fileID: 0} + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1408815150312407145, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4984791751176827283, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: m_Name + value: Magic shield White Holyish + objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime0 + value: 13107 + objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime1 + value: 49151 + objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7133315941402050091, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime0 + value: 13107 + objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime1 + value: 49151 + objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.atime2 + value: 65535 + objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9064075378098246578, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.a + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} +--- !u!4 &3307683014584383595 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4931987311882313766, guid: f6ef9ed338b55be49abce7e602b3e855, type: 3} + m_PrefabInstance: {fileID: 7608462654639675469} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab.meta b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab.meta new file mode 100644 index 00000000..11db8de7 --- /dev/null +++ b/Assets/Resources/Abilities/BurstOfHope_AreaOfEffectPrefab Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da5aac032dc71764c851bcd729afd2ff +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab b/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab index 7048f16a..d20dbeb7 100644 --- a/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab +++ b/Assets/Resources/Abilities/NPC_AreaOfEffectPrefab.prefab @@ -269,6 +269,7 @@ MonoBehaviour: ownerTag: {fileID: 0} ability: {fileID: 0} radius: 0 + shouldResizeVisuals: 0 telegraphDelay: 0 lifeSpan: 0 canHitSelf: 0 diff --git a/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab b/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab index a01a2c23..afb1d000 100644 --- a/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab +++ b/Assets/Resources/Bosses/AngrySkellyPrefab_Boss.prefab @@ -555,8 +555,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c45a08abc5a43ed4e98c47959eb8aba6, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -643,8 +643,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca852ea491ac9f340b2f34820a262d84, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] diff --git a/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab b/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab index a8757730..dd1d49fc 100644 --- a/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab +++ b/Assets/Resources/Bosses/SkellyMagePrefab_Boss.prefab @@ -641,8 +641,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c45a08abc5a43ed4e98c47959eb8aba6, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -729,8 +729,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca852ea491ac9f340b2f34820a262d84, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] diff --git a/Assets/Resources/Enemies/AngrySkellyPrefab.prefab b/Assets/Resources/Enemies/AngrySkellyPrefab.prefab index b2ccda3a..4cf7764e 100644 --- a/Assets/Resources/Enemies/AngrySkellyPrefab.prefab +++ b/Assets/Resources/Enemies/AngrySkellyPrefab.prefab @@ -567,8 +567,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c45a08abc5a43ed4e98c47959eb8aba6, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -655,8 +655,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca852ea491ac9f340b2f34820a262d84, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] diff --git a/Assets/Resources/Enemies/SkellyMagePrefab.prefab b/Assets/Resources/Enemies/SkellyMagePrefab.prefab index 1bb53433..9f160792 100644 --- a/Assets/Resources/Enemies/SkellyMagePrefab.prefab +++ b/Assets/Resources/Enemies/SkellyMagePrefab.prefab @@ -653,8 +653,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c45a08abc5a43ed4e98c47959eb8aba6, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -741,8 +741,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca852ea491ac9f340b2f34820a262d84, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 - canRefresh: 0 + canStack: 1 + canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 activeStacks: [] diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab index f7e5b745..44fc13ff 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab @@ -11,6 +11,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Priest Variant objectReference: {fileID: 0} + - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: ability + value: + objectReference: {fileID: 11400000, guid: f3628bf368b593d488559a00aef758a6, type: 2} - target: {fileID: 4996700579829439174, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: maxValue value: 80 diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 6f07f5bf..06d4119c 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -514,7 +514,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c45a08abc5a43ed4e98c47959eb8aba6, type: 3} m_Name: m_EditorClassIdentifier: - canStack: 0 + canStack: 1 canRefresh: 1 owner: {fileID: 0} endEffectTime: 0 diff --git a/Assets/Scenes/Dev/Abilities.unity b/Assets/Scenes/Dev/Abilities.unity index 8778b514..c4ca2026 100644 --- a/Assets/Scenes/Dev/Abilities.unity +++ b/Assets/Scenes/Dev/Abilities.unity @@ -1612,7 +1612,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset index 88b294e3..eab0a968 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/AngrySkelly/NPC_AoEAbility.asset @@ -29,6 +29,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 0.25 radius: 1 + shouldResizeVisuals: 1 telegraphDelay: 1 canHitSelf: 0 spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset index 2a8cbd40..f5df043e 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/NPC/SkellyMage/NPC_Mage_AoEAbility.asset @@ -29,6 +29,7 @@ MonoBehaviour: m_Bits: 8 lifeSpan: 0.25 radius: 1 + shouldResizeVisuals: 1 telegraphDelay: 1 canHitSelf: 0 spawnUnderUser: 0 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset index c24440f4..fb06b245 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Barbarian/3-RageStorm_ChanneledAbility.asset @@ -19,9 +19,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} - {fileID: 11400000, guid: ff27e4f0bff17a145af826f8ade78c8a, type: 2} + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 56d85d7ff5b22aa4bb8b40e97b2e850f, type: 2} abilityEffects: - {fileID: 11400000, guid: 233a7270b002b90449bae5ed2adc8a9b, type: 2} - {fileID: 11400000, guid: aaaf405927fd4c045916d9483189c3f2, type: 2} + - {fileID: 11400000, guid: a1bafe62c9b7a5b428996e45d7bd3f33, type: 2} castTime: 0 manaCost: 50 castableWhileMoving: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset index f654ed84..a3266776 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/1-HolyBall_ProjectileAbility.asset @@ -20,14 +20,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} - - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} abilityEffects: - {fileID: 11400000, guid: c11e4e7ebf6d1844ba5825e9014ffbc9, type: 2} - {fileID: 11400000, guid: a29bc493146d99d489cd682fe8cc7b6d, type: 2} - - {fileID: 11400000, guid: c67c3526f466b254c9dba7c2d584eb4e, type: 2} castTime: 0.5 - manaCost: 15 + manaCost: 10 castableWhileMoving: 0 animationType: 1 projectilePrefab: {fileID: 6744685881493449327, guid: e8d140a8b81d1a54babce1a327614447, type: 3} diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset new file mode 100644 index 00000000..c94394a6 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset @@ -0,0 +1,41 @@ +%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: 0c765e9ddb90681418e5635dc93b7716, type: 3} + m_Name: 2-BurstOfHope_AoEAbility + m_EditorClassIdentifier: + targettingTags: + - {fileID: 11400000, guid: 9e6b298c2ce2856418b205442417a433, type: 2} + - {fileID: 11400000, guid: 6447e0730c0a07841a07ef8637e3e364, type: 2} + - {fileID: 11400000, guid: c5b634e64086ffb4496aa6cb5e299c27, type: 2} + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + abilityEffects: + - {fileID: 11400000, guid: ac1c44b70abf5934abbcb97d1fc331cf, type: 2} + - {fileID: 11400000, guid: 72f65c10a6d066541bd1d369c4f271e3, type: 2} + - {fileID: 11400000, guid: ca9eaffa6d6eecb48b1e437022dd6f35, type: 2} + castTime: 0.5 + manaCost: 30 + castableWhileMoving: 0 + animationType: 1 + aoePrefab: {fileID: 8979840876601850889, guid: da5aac032dc71764c851bcd729afd2ff, type: 3} + movementMask: + serializedVersion: 2 + m_Bits: 8 + lifeSpan: 1 + radius: 2 + telegraphDelay: 0 + canHitSelf: 1 + spawnUnderUser: 1 diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset.meta b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset.meta new file mode 100644 index 00000000..bdd18424 --- /dev/null +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/2-BurstOfHope_AoEAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3628bf368b593d488559a00aef758a6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset index 0693e14d..ee30899e 100644 --- a/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset +++ b/Assets/Scriptables/Data/Abilities/Debug/Player/Priest/3-HolyCircleAoEOverTimeAbility.asset @@ -24,7 +24,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 7c93de4abc24c6a42964968d8ed80f69, type: 2} - {fileID: 11400000, guid: f5e6781929af8c24a8719ecf59d5153e, type: 2} castTime: 1 - manaCost: 80 + manaCost: 60 castableWhileMoving: 0 animationType: 1 aoePrefab: {fileID: 7455199422598815824, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta new file mode 100644 index 00000000..6a1c51c4 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08b2a229ca6b3c94e9eacb53752445e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset new file mode 100644 index 00000000..db083c7d --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset @@ -0,0 +1,23 @@ +%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: 13153d6a33b66b1428c0d7fc4cb4bff0, type: 3} + m_Name: STR_RageStorm_DIModifierEffect_01 + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: 56d85d7ff5b22aa4bb8b40e97b2e850f, type: 2} + influencingStats: + - {fileID: 11400000, guid: 8b74e81cfcd772243b988990f4a8a634, type: 2} + duration: 1 + applyToTargetsHit: 0 + applyToSelf: 1 + damageIncomeModifierPercentage: -0.5 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta new file mode 100644 index 00000000..7f8036d5 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Barbarian/3-RageStorm/StatusEffects/STR_RageStorm_DIModifierEffect_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1bafe62c9b7a5b428996e45d7bd3f33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset index 81f97fa7..6151490c 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/INT_HolyBall_InstantEffect_02.asset @@ -18,3 +18,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} baseValue: 1 percentStatInfluence: 0.1 + AlliedTargetMultiplier: 0.5 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset index f75753d8..c98fcdf7 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/1-HolyBallEffects/SPI_HolyBall_InstantEffect_01.asset @@ -18,3 +18,5 @@ MonoBehaviour: - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} baseValue: 2 percentStatInfluence: 0.3 + AlliedTargetMultiplier: 0.5 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects.meta new file mode 100644 index 00000000..bdd2dedf --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21c20f758e0c6b744836008463583dee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset new file mode 100644 index 00000000..90eaeaf7 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset @@ -0,0 +1,22 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: INT_BurstofHope_InstantEffect_02 + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} + baseValue: 3 + percentStatInfluence: 0.1 + AlliedTargetMultiplier: 0 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset.meta new file mode 100644 index 00000000..c6b406b1 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/INT_BurstofHope_InstantEffect_02.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca9eaffa6d6eecb48b1e437022dd6f35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset new file mode 100644 index 00000000..0f3700e1 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset @@ -0,0 +1,22 @@ +%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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: SPI_BurstofHope_InstantEffect_01 + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + baseValue: 3 + percentStatInfluence: 0.2 + AlliedTargetMultiplier: 0 + EnemyTargetMultiplier: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta new file mode 100644 index 00000000..bf4a0b43 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/SPI_BurstofHope_InstantEffect_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72f65c10a6d066541bd1d369c4f271e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta new file mode 100644 index 00000000..560fb9ef --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddc0db7a105fe8f40be32ea66537fd74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset new file mode 100644 index 00000000..71f43e45 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset @@ -0,0 +1,22 @@ +%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: bbb95d10fa2aa464a84aecc6a7a7ef31, type: 3} + m_Name: SPI_BurstofHope_AbsorbEffect_01 + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: f2044d584b586454f99656097deaa52f, type: 2} + - {fileID: 11400000, guid: b48912f0531050749aaa214045f32b1d, type: 2} + influencingStats: + - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} + duration: 2 + amount: 3 + percentStatInfluence: 1 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta new file mode 100644 index 00000000..1915ce49 --- /dev/null +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/2-BurstofHopeEffects/StatusEffects/SPI_BurstofHope_AbsorbEffect_01.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac1c44b70abf5934abbcb97d1fc331cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset index 80e2faf7..9ebcd3fc 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/INT_HolyCircle_TickEffect_02.asset @@ -16,5 +16,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - {fileID: 11400000, guid: 52f094018088de54ab9507695f2913b7, type: 2} - baseValue: 3 - percentStatInfluence: 0.25 + baseValue: 4 + percentStatInfluence: 0.35 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 0.5 diff --git a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset index 2dc93076..ebe222d2 100644 --- a/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset +++ b/Assets/Scriptables/Data/Effects/Debug/Player/Priest/3-HolyCircleEffects/SPI_HolyCircle_TickEffect_01.asset @@ -16,5 +16,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} influencingStats: - {fileID: 11400000, guid: d7a9b755d873bad4f9bbd0393bc36a42, type: 2} - baseValue: 3 - percentStatInfluence: 0.25 + baseValue: 4 + percentStatInfluence: 0.35 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 0.5 diff --git a/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset b/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset new file mode 100644 index 00000000..1d06930f --- /dev/null +++ b/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset @@ -0,0 +1,14 @@ +%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: 4cc5b60241d710942888d37734f848d6, type: 3} + m_Name: DamageIncomeModifierEffect + m_EditorClassIdentifier: diff --git a/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset.meta b/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset.meta new file mode 100644 index 00000000..3ec84f91 --- /dev/null +++ b/Assets/Scriptables/Data/Tags/DamageIncomeModifierEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56d85d7ff5b22aa4bb8b40e97b2e850f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/AreaOfEffectAbility.cs b/Assets/Scripts/AbilitySystem/AreaOfEffectAbility.cs index 072db0a5..8e7b68be 100644 --- a/Assets/Scripts/AbilitySystem/AreaOfEffectAbility.cs +++ b/Assets/Scripts/AbilitySystem/AreaOfEffectAbility.cs @@ -11,6 +11,7 @@ public class AreaOfEffectAbility : BaseAbility public float lifeSpan; public float radius; + public bool shouldResizeVisuals; public float telegraphDelay; public bool canHitSelf; public bool spawnUnderUser; @@ -41,6 +42,7 @@ public class AreaOfEffectAbility : BaseAbility networkedAreaOfEffect.ownerTag = userTag; networkedAreaOfEffect.ability = this; networkedAreaOfEffect.radius = radius; + networkedAreaOfEffect.shouldResizeVisuals = shouldResizeVisuals; networkedAreaOfEffect.telegraphDelay = telegraphDelay; networkedAreaOfEffect.lifeSpan = lifeSpan; networkedAreaOfEffect.canHitSelf = canHitSelf; diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs index 8735b936..fc3498dd 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffect.cs @@ -17,14 +17,23 @@ public class AbsorbEffect : StatusEffect { base.ApplyEffect(user, targets); - foreach (Taggable target in targets) + if(applyToTargetsHit) { - if (IsAlliedTarget(user, target)) + foreach (Taggable target in targets) { - targetAbsorbEffect = target.GetComponent(); - targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + if (IsAlliedTarget(user, target)) + { + targetAbsorbEffect = target.GetComponent(); + targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + } } } + if (applyToSelf) + { + targetAbsorbEffect = user.GetComponent(); + targetAbsorbEffect.ApplyEffect(this); + //targetAbsorbEffect.owner.RPC(nameof(targetAbsorbEffect.RPC_ApplyAbsorbEffect), targetAbsorbEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + } } private bool IsAlliedTarget(Taggable user, Taggable target) diff --git a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs index 762994cc..77c6a7f9 100644 --- a/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/AbsorbEffectInstance.cs @@ -20,7 +20,7 @@ public class AbsorbEffectInstance : StatusEffectInstance { owner = GetComponent(); - if(owner.IsMine) + if (owner.IsMine) { OnEffectStackAddedEvent.AddListener(() => owner.RPC(nameof(RPC_AbsorbStarted), RpcTarget.Others)); OnEffectEnded.AddListener(() => owner.RPC(nameof(RPC_AbsorbEnded), RpcTarget.Others)); @@ -89,8 +89,15 @@ public class AbsorbEffectInstance : StatusEffectInstance protected override void AddStack(StatusEffect addedEffect) { - startingAmount = ((AbsorbEffect)addedEffect).amount; - currentAmount = startingAmount; + if (activeStacks.Count <= 0) + { + startingAmount = ((AbsorbEffect)addedEffect).amount; + currentAmount = startingAmount; + } + else if (canStack) + { + currentAmount += ((AbsorbEffect)addedEffect).amount; + } base.AddStack(addedEffect); } diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs index a2ccf8af..a780c167 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffect.cs @@ -14,10 +14,18 @@ public class DamageIncomeModifierEffect : StatusEffect { base.ApplyEffect(user, targets); - foreach (Taggable target in targets) + if (applyToTargetsHit) { - targetDamageIncomeModifierEffect = target.GetComponent(); - targetDamageIncomeModifierEffect.owner.RPC(nameof(targetDamageIncomeModifierEffect.RPC_ApplyDamageIncomeModifierEffect), targetDamageIncomeModifierEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + foreach (Taggable target in targets) + { + targetDamageIncomeModifierEffect = target.GetComponent(); + targetDamageIncomeModifierEffect.owner.RPC(nameof(targetDamageIncomeModifierEffect.RPC_ApplyDamageIncomeModifierEffect), targetDamageIncomeModifierEffect.owner.Owner, StatusEffectIndexer.Instance.StatusEffects.IndexOf(this)); + } + } + if(applyToSelf) + { + targetDamageIncomeModifierEffect = user.GetComponent(); + targetDamageIncomeModifierEffect.ApplyEffect(this); } } diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs index b7b5ee6c..a2ced2de 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageIncomeModifierEffectInstance.cs @@ -13,7 +13,7 @@ public class DamageIncomeModifierEffectInstance : StatusEffectInstance public float ModifyDamageIncome(float income) { - return income = income * (1 - currentIncomeModifierPercent); + return income = income * (1 + currentIncomeModifierPercent); } public float GetHighestAmount() @@ -41,8 +41,20 @@ public class DamageIncomeModifierEffectInstance : StatusEffectInstance protected override void AddStack(StatusEffect addedEffect) { - startingIncomeModifierPercent = ((DamageIncomeModifierEffect)addedEffect).damageIncomeModifierPercentage; - currentIncomeModifierPercent = startingIncomeModifierPercent; + if (activeStacks.Count <= 0) + { + startingIncomeModifierPercent = ((DamageIncomeModifierEffect)addedEffect).damageIncomeModifierPercentage; + currentIncomeModifierPercent = startingIncomeModifierPercent; + } + else if (canStack && !activeStacks.Contains(addedEffect)) + { + currentIncomeModifierPercent += ((DamageIncomeModifierEffect)addedEffect).damageIncomeModifierPercentage; + } + else + { + OnEffectStackAdded(); + return; + } base.AddStack(addedEffect); } diff --git a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs index d7bb93be..67b934b6 100644 --- a/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/InstantValueEffect.cs @@ -10,6 +10,10 @@ public class InstantValueEffect : BaseEffect public float baseValue; public float percentStatInfluence; + [Header("Optional Modifiers for damage / healing based on target")] + public float AlliedTargetMultiplier = 1f; + public float EnemyTargetMultiplier = 1f; + Health targetHealth; private float finalValue; @@ -32,7 +36,7 @@ public class InstantValueEffect : BaseEffect stats = user.GetComponent(); GetFinalValue(GetCorrectStat(stats)); - return user.targetTag.AlliedTags.Contains(target.targetTag) ? finalValue : -finalValue; + return user.targetTag.AlliedTags.Contains(target.targetTag) ? (finalValue * AlliedTargetMultiplier) : (-finalValue * EnemyTargetMultiplier); } private CharacterStat GetCorrectStat(CharacterStats stats) //TODO: make it use multiple stats correctly diff --git a/Assets/Scripts/AbilitySystem/Effects/StatusEffect.cs b/Assets/Scripts/AbilitySystem/Effects/StatusEffect.cs index 759c90f8..b990cbf9 100644 --- a/Assets/Scripts/AbilitySystem/Effects/StatusEffect.cs +++ b/Assets/Scripts/AbilitySystem/Effects/StatusEffect.cs @@ -6,6 +6,9 @@ using UnityEngine; public class StatusEffect : BaseEffect { public float duration; + public bool applyToTargetsHit; + [Header("Should be toggled only when you want to apply the effect ONLY to yourself")] + public bool applyToSelf; public override void ApplyEffect(Taggable user, List targets) { diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs index 042f4d28..d25f8e1a 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs @@ -17,6 +17,7 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable public Taggable ownerTag; public AreaOfEffectAbility ability; public float radius; + public bool shouldResizeVisuals; public float telegraphDelay; public float lifeSpan; public bool canHitSelf; @@ -38,11 +39,14 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable { if (photonView.IsMine) { - resizedByAbility.x = radius * 2; - resizedByAbility.z = radius * 2; + if(shouldResizeVisuals) + { + resizedByAbility.x = radius * 2; + resizedByAbility.z = radius * 2; - telegraph.transform.localScale = resizedByAbility; - effectVisual.transform.localScale = resizedByAbility; + telegraph.transform.localScale = resizedByAbility; + effectVisual.transform.localScale = resizedByAbility; + } photonView.RPC(nameof(RPC_RemoteInit), RpcTarget.Others, AbilityIndexer.Instance.Abilities.IndexOf(ability)); @@ -81,7 +85,7 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable targets.Clear(); foreach (Collider collider in hits) { - Debug.Log("hit collider " + collider.name); + // Debug.Log("hit collider " + collider.name); possibleTarget = collider.GetComponentInParent(); if (possibleTarget != null) @@ -89,16 +93,16 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable target = collider.GetComponentInParent(); - Debug.Log("hit collider, Got taggable: " + target.name); + //Debug.Log("hit collider, Got taggable: " + target.name); 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) + /*foreach (TargetTag tag in ability.targettingTags) { Debug.Log("hit collider, ability.Tags: " + tag); - } + }*/ if (!target.IsValidTarget(ability.targettingTags)) continue; Debug.Log("hit collider, added target: " + target.name); diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 571e0c1e..0cf11bd6 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 6.6555896 + - _Rotation: 7.854298 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1