From b9fb490dceaac39ed1401923b5ff4aad0deea6cf Mon Sep 17 00:00:00 2001 From: sylvermyon Date: Fri, 13 Feb 2026 00:21:59 -0800 Subject: [PATCH] you really gotta calm down, marisa... --- Assets/Prefabs/BasicProjectile.prefab | 58 ++++- Assets/Prefabs/BeamObject.prefab | 4 +- Assets/Prefabs/Marisa.prefab | 6 +- Assets/Prefabs/Nondirectional Laser.prefab | 109 +++++++++ .../Prefabs/Nondirectional Laser.prefab.meta | 7 + Assets/Prefabs/StarProjectile.prefab | 228 ++++++++++++++++++ Assets/Prefabs/StarProjectile.prefab.meta | 7 + Assets/Prefabs/Stardust.prefab | 61 +++++ Assets/Prefabs/Stardust.prefab.meta | 7 + Assets/Scenes/Game.unity | 32 +++ Assets/Scripts/Abilities.meta | 8 + .../Scripts/{ => Abilities}/AbilityManager.cs | 10 + .../{ => Abilities}/AbilityManager.cs.meta | 0 .../{ => Abilities}/AbilityUIHandler.cs | 0 .../{ => Abilities}/AbilityUIHandler.cs.meta | 0 .../{ => Abilities}/AbilityUIObject.cs | 0 .../{ => Abilities}/AbilityUIObject.cs.meta | 0 Assets/Scripts/Abilities/PlayerAbilities.meta | 8 + .../PlayerAbilities}/BeamCollider.cs | 0 .../PlayerAbilities}/BeamCollider.cs.meta | 0 .../PlayerAbilities}/FireBullet.cs | 0 .../PlayerAbilities}/FireBullet.cs.meta | 0 .../{ => Abilities/PlayerAbilities}/Laser.cs | 14 +- .../PlayerAbilities}/Laser.cs.meta | 0 .../PlayerAbilities/NondirectionalLaser.cs | 66 +++++ .../NondirectionalLaser.cs.meta | 2 + .../PlayerAbilities}/PlayerAbility.cs | 2 +- .../PlayerAbilities}/PlayerAbility.cs.meta | 0 Assets/Scripts/Abilities/Upgrades.meta | 8 + .../Upgrades}/AbilityUpgrade.cs | 0 .../Upgrades}/AbilityUpgrade.cs.meta | 0 .../Upgrades}/AttackSpeedUpgrade.cs | 0 .../Upgrades}/AttackSpeedUpgrade.cs.meta | 0 .../Upgrades}/ProjectileCountUpgrade.cs | 0 .../Upgrades}/ProjectileCountUpgrade.cs.meta | 0 .../{ => Abilities/Upgrades}/UpgradeBoxUI.cs | 0 .../Upgrades}/UpgradeBoxUI.cs.meta | 0 .../Abilities/Upgrades/UpgradePickup.cs | 10 + .../Abilities/Upgrades/UpgradePickup.cs.meta | 2 + Assets/Scripts/Entities.meta | 8 + Assets/Scripts/{ => Entities}/Enemy.cs | 0 Assets/Scripts/{ => Entities}/Enemy.cs.meta | 0 Assets/Scripts/{ => Entities}/EnemySpawner.cs | 0 .../{ => Entities}/EnemySpawner.cs.meta | 0 Assets/Scripts/{ => Entities}/Entity.cs | 0 Assets/Scripts/{ => Entities}/Entity.cs.meta | 0 Assets/Scripts/{ => Entities}/Marisa.cs | 0 Assets/Scripts/{ => Entities}/Marisa.cs.meta | 0 .../{ => Entities}/MarisaAbilityHandler.cs | 0 .../MarisaAbilityHandler.cs.meta | 0 Assets/Scripts/Items.meta | 8 + Assets/Scripts/{ => Items}/ItemPickup.cs | 7 +- Assets/Scripts/{ => Items}/ItemPickup.cs.meta | 0 Assets/Scripts/{ => Items}/ItemPickupRange.cs | 0 .../{ => Items}/ItemPickupRange.cs.meta | 0 Assets/Scripts/Items/PowerPickup.cs | 10 + Assets/Scripts/Items/PowerPickup.cs.meta | 2 + Assets/Scripts/MasterSpark.cs | 16 -- Assets/Scripts/MasterSpark.cs.meta | 2 - Assets/Scripts/Projectiles.meta | 8 + .../Scripts/{ => Projectiles}/Projectile.cs | 0 .../{ => Projectiles}/Projectile.cs.meta | 0 Assets/Scripts/Projectiles/SpinSprite.cs | 10 + Assets/Scripts/Projectiles/SpinSprite.cs.meta | 2 + Assets/Sprites/mastersparkbeam.png | Bin 0 -> 150 bytes Assets/Sprites/mastersparkbeam.png.meta | 156 ++++++++++++ Assets/Sprites/star.png | Bin 0 -> 13614 bytes Assets/Sprites/star.png.meta | 156 ++++++++++++ 68 files changed, 990 insertions(+), 44 deletions(-) create mode 100644 Assets/Prefabs/Nondirectional Laser.prefab create mode 100644 Assets/Prefabs/Nondirectional Laser.prefab.meta create mode 100644 Assets/Prefabs/StarProjectile.prefab create mode 100644 Assets/Prefabs/StarProjectile.prefab.meta create mode 100644 Assets/Prefabs/Stardust.prefab create mode 100644 Assets/Prefabs/Stardust.prefab.meta create mode 100644 Assets/Scripts/Abilities.meta rename Assets/Scripts/{ => Abilities}/AbilityManager.cs (89%) rename Assets/Scripts/{ => Abilities}/AbilityManager.cs.meta (100%) rename Assets/Scripts/{ => Abilities}/AbilityUIHandler.cs (100%) rename Assets/Scripts/{ => Abilities}/AbilityUIHandler.cs.meta (100%) rename Assets/Scripts/{ => Abilities}/AbilityUIObject.cs (100%) rename Assets/Scripts/{ => Abilities}/AbilityUIObject.cs.meta (100%) create mode 100644 Assets/Scripts/Abilities/PlayerAbilities.meta rename Assets/Scripts/{ => Abilities/PlayerAbilities}/BeamCollider.cs (100%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/BeamCollider.cs.meta (100%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/FireBullet.cs (100%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/FireBullet.cs.meta (100%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/Laser.cs (87%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/Laser.cs.meta (100%) create mode 100644 Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs create mode 100644 Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs.meta rename Assets/Scripts/{ => Abilities/PlayerAbilities}/PlayerAbility.cs (95%) rename Assets/Scripts/{ => Abilities/PlayerAbilities}/PlayerAbility.cs.meta (100%) create mode 100644 Assets/Scripts/Abilities/Upgrades.meta rename Assets/Scripts/{ => Abilities/Upgrades}/AbilityUpgrade.cs (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/AbilityUpgrade.cs.meta (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/AttackSpeedUpgrade.cs (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/AttackSpeedUpgrade.cs.meta (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/ProjectileCountUpgrade.cs (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/ProjectileCountUpgrade.cs.meta (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/UpgradeBoxUI.cs (100%) rename Assets/Scripts/{ => Abilities/Upgrades}/UpgradeBoxUI.cs.meta (100%) create mode 100644 Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs create mode 100644 Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta create mode 100644 Assets/Scripts/Entities.meta rename Assets/Scripts/{ => Entities}/Enemy.cs (100%) rename Assets/Scripts/{ => Entities}/Enemy.cs.meta (100%) rename Assets/Scripts/{ => Entities}/EnemySpawner.cs (100%) rename Assets/Scripts/{ => Entities}/EnemySpawner.cs.meta (100%) rename Assets/Scripts/{ => Entities}/Entity.cs (100%) rename Assets/Scripts/{ => Entities}/Entity.cs.meta (100%) rename Assets/Scripts/{ => Entities}/Marisa.cs (100%) rename Assets/Scripts/{ => Entities}/Marisa.cs.meta (100%) rename Assets/Scripts/{ => Entities}/MarisaAbilityHandler.cs (100%) rename Assets/Scripts/{ => Entities}/MarisaAbilityHandler.cs.meta (100%) create mode 100644 Assets/Scripts/Items.meta rename Assets/Scripts/{ => Items}/ItemPickup.cs (85%) rename Assets/Scripts/{ => Items}/ItemPickup.cs.meta (100%) rename Assets/Scripts/{ => Items}/ItemPickupRange.cs (100%) rename Assets/Scripts/{ => Items}/ItemPickupRange.cs.meta (100%) create mode 100644 Assets/Scripts/Items/PowerPickup.cs create mode 100644 Assets/Scripts/Items/PowerPickup.cs.meta delete mode 100644 Assets/Scripts/MasterSpark.cs delete mode 100644 Assets/Scripts/MasterSpark.cs.meta create mode 100644 Assets/Scripts/Projectiles.meta rename Assets/Scripts/{ => Projectiles}/Projectile.cs (100%) rename Assets/Scripts/{ => Projectiles}/Projectile.cs.meta (100%) create mode 100644 Assets/Scripts/Projectiles/SpinSprite.cs create mode 100644 Assets/Scripts/Projectiles/SpinSprite.cs.meta create mode 100644 Assets/Sprites/mastersparkbeam.png create mode 100644 Assets/Sprites/mastersparkbeam.png.meta create mode 100644 Assets/Sprites/star.png create mode 100644 Assets/Sprites/star.png.meta diff --git a/Assets/Prefabs/BasicProjectile.prefab b/Assets/Prefabs/BasicProjectile.prefab index 4c8804d..58d522e 100644 --- a/Assets/Prefabs/BasicProjectile.prefab +++ b/Assets/Prefabs/BasicProjectile.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4806008101797467748 +--- !u!1 &554774547771524288 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,40 +8,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8258649627709469250} - - component: {fileID: 6349442989841225491} - - component: {fileID: 4462715779770199878} - - component: {fileID: 4942254205620830605} - - component: {fileID: 41144518337917555} + - component: {fileID: 4845256703653450112} + - component: {fileID: 3366910313495688115} m_Layer: 7 - m_Name: BasicProjectile + m_Name: Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8258649627709469250 +--- !u!4 &4845256703653450112 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4806008101797467748} + m_GameObject: {fileID: 554774547771524288} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.2, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 8258649627709469250} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6349442989841225491 +--- !u!212 &3366910313495688115 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4806008101797467748} + m_GameObject: {fileID: 554774547771524288} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -90,6 +87,41 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4806008101797467748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8258649627709469250} + - component: {fileID: 4462715779770199878} + - component: {fileID: 4942254205620830605} + - component: {fileID: 41144518337917555} + m_Layer: 7 + m_Name: BasicProjectile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8258649627709469250 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806008101797467748} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4845256703653450112} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &4462715779770199878 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Prefabs/BeamObject.prefab b/Assets/Prefabs/BeamObject.prefab index c05dea1..5162170 100644 --- a/Assets/Prefabs/BeamObject.prefab +++ b/Assets/Prefabs/BeamObject.prefab @@ -78,7 +78,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Sprite: {fileID: -7312781290140997224, guid: 422cf2b841091f2878beffe6b9721e13, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -127,7 +127,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 0.32, y: 0.32} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 diff --git a/Assets/Prefabs/Marisa.prefab b/Assets/Prefabs/Marisa.prefab index 5c9bcbf..165f732 100644 --- a/Assets/Prefabs/Marisa.prefab +++ b/Assets/Prefabs/Marisa.prefab @@ -605,9 +605,9 @@ MonoBehaviour: inputHandler: {fileID: 4421559795750709312} thisPlayer: {fileID: 5275979051295637757} mainAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} - secondaryAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} + secondaryAttack: {fileID: 8579369158027197764, guid: fc8f0e7853997c463b72085306621f40, type: 3} spellA: {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3} - spellB: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} + spellB: {fileID: 2202756030888818067, guid: 91297fef450704432837e8de1bda05d7, type: 3} mainAttackInstance: {fileID: 0} secondaryAttackInstance: {fileID: 0} spellAInstance: {fileID: 0} @@ -834,8 +834,8 @@ MonoBehaviour: speed: 8 cam: {fileID: 0} mouseWorldPos: {x: 0, y: 0} - firingPoint: {fileID: 6266582235186827771} firingPointBase: {fileID: 1955417614592701310} + firingPoint: {fileID: 6266582235186827771} --- !u!1 &6396436912902618782 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Nondirectional Laser.prefab b/Assets/Prefabs/Nondirectional Laser.prefab new file mode 100644 index 0000000..0556e21 --- /dev/null +++ b/Assets/Prefabs/Nondirectional Laser.prefab @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3204262992054338593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6210518781829362723} + - component: {fileID: 2202756030888818067} + m_Layer: 0 + m_Name: Nondirectional Laser + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6210518781829362723 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3204262992054338593} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7779692706452483871} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2202756030888818067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3204262992054338593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2d9c1454ecf94f459c14e302b316986, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityName: Non-Directional Laser + abilityIcon: {fileID: 0} + thisPlayer: {fileID: 0} + canCooldown: 1 + cooldown: 4 + power: 0 + projectileCount: 0 + length: 10 + width: 1 + duration: 6 + beamObject: {fileID: 9142983110258810315, guid: 5c95f1061d0b0a13694b57cb8a14866c, type: 3} + turnSpeed: 90 + offset: 1 + enemyList: [] + damageDebounceTime: 1 + beamCount: 3 + beamRoot: {fileID: 7779692706452483871} +--- !u!1 &9084770363101550945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7779692706452483871} + - component: {fileID: 5508965572157376725} + m_Layer: 0 + m_Name: BeamRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7779692706452483871 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9084770363101550945} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6210518781829362723} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5508965572157376725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9084770363101550945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 367cdbe920b6609c2a25c4624980f56a, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 360 diff --git a/Assets/Prefabs/Nondirectional Laser.prefab.meta b/Assets/Prefabs/Nondirectional Laser.prefab.meta new file mode 100644 index 0000000..df3a168 --- /dev/null +++ b/Assets/Prefabs/Nondirectional Laser.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 91297fef450704432837e8de1bda05d7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/StarProjectile.prefab b/Assets/Prefabs/StarProjectile.prefab new file mode 100644 index 0000000..527ff3d --- /dev/null +++ b/Assets/Prefabs/StarProjectile.prefab @@ -0,0 +1,228 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4806008101797467748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8258649627709469250} + - component: {fileID: 4462715779770199878} + - component: {fileID: 4942254205620830605} + - component: {fileID: 41144518337917555} + m_Layer: 7 + m_Name: StarProjectile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8258649627709469250 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806008101797467748} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6967225298403824989} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &4462715779770199878 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806008101797467748} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &4942254205620830605 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806008101797467748} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.87333333, y: 0.80833334} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.8, y: 0.8} + m_EdgeRadius: 0 +--- !u!114 &41144518337917555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4806008101797467748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e66b3403d93ec8803822e3a85537224b, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 0 + speed: 0 + pierceAmount: 0 + lifetime: 0 + rb: {fileID: 4462715779770199878} +--- !u!1 &7745693115359622977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6967225298403824989} + - component: {fileID: 8600968611477201350} + - component: {fileID: 3448069185617087958} + m_Layer: 7 + m_Name: ProjectileSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6967225298403824989 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745693115359622977} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8258649627709469250} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8600968611477201350 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745693115359622977} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 4815476061570213978, guid: 04471894fe003265dad2be86950ab969, type: 3} + m_Color: {r: 1, g: 0.982556, b: 0.4009434, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3448069185617087958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745693115359622977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 367cdbe920b6609c2a25c4624980f56a, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 270 diff --git a/Assets/Prefabs/StarProjectile.prefab.meta b/Assets/Prefabs/StarProjectile.prefab.meta new file mode 100644 index 0000000..81d2db2 --- /dev/null +++ b/Assets/Prefabs/StarProjectile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8bf6ae3b3a5d1e7a784e85e314faf58a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Stardust.prefab b/Assets/Prefabs/Stardust.prefab new file mode 100644 index 0000000..37a103e --- /dev/null +++ b/Assets/Prefabs/Stardust.prefab @@ -0,0 +1,61 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3204262992054338593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6210518781829362723} + - component: {fileID: 8579369158027197764} + m_Layer: 0 + m_Name: Stardust + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6210518781829362723 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3204262992054338593} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8579369158027197764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3204262992054338593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62c2c7dce05d07c06b237843ff48ab2e, type: 3} + m_Name: + m_EditorClassIdentifier: + abilityName: Stardust + abilityIcon: {fileID: 0} + thisPlayer: {fileID: 0} + canCooldown: 1 + cooldown: 0.1 + power: 10 + projectileCount: 3 + pierceAmount: 0 + accuracy: 60 + bulletLifetime: 3 + projectileSpeed: 20 + fireMode: 1 + offset: {x: 1, y: 1} + angle: 0 + projectile: {fileID: 41144518337917555, guid: 8bf6ae3b3a5d1e7a784e85e314faf58a, type: 3} diff --git a/Assets/Prefabs/Stardust.prefab.meta b/Assets/Prefabs/Stardust.prefab.meta new file mode 100644 index 0000000..a28702e --- /dev/null +++ b/Assets/Prefabs/Stardust.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc8f0e7853997c463b72085306621f40 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index c6c53cc..0f10653 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1587,6 +1587,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641813897} m_CullTransparentMesh: 1 +--- !u!1 &689402300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689402301} + m_Layer: 0 + m_Name: Pickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &689402301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689402300} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.4307132, y: -0.1515338, z: 0.6842527} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &720841234 GameObject: m_ObjectHideFlags: 0 @@ -5958,3 +5989,4 @@ SceneRoots: - {fileID: 844020320} - {fileID: 1319590957} - {fileID: 1935311237} + - {fileID: 689402301} diff --git a/Assets/Scripts/Abilities.meta b/Assets/Scripts/Abilities.meta new file mode 100644 index 0000000..acd1f9a --- /dev/null +++ b/Assets/Scripts/Abilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce5b9aa19d661c5e2b40ef0a74d1989c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilityManager.cs b/Assets/Scripts/Abilities/AbilityManager.cs similarity index 89% rename from Assets/Scripts/AbilityManager.cs rename to Assets/Scripts/Abilities/AbilityManager.cs index 710aa2d..f6b406c 100644 --- a/Assets/Scripts/AbilityManager.cs +++ b/Assets/Scripts/Abilities/AbilityManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -19,9 +20,18 @@ public class AbilityManager : MonoBehaviour } #endregion + + public class StoredUpgrade + { + public AbilityUpgrade upgrade; + public int count; + } public MarisaAbilityHandler player; public AbilityUpgrade upgradeToAdd; public Button upgradeButton; + + [Header("Upgrades")] + public List upgradesInventory; private void Start() { upgradeButton.onClick.AddListener((() => AddUpgrade(upgradeToAdd, player.mainAttackInstance))); diff --git a/Assets/Scripts/AbilityManager.cs.meta b/Assets/Scripts/Abilities/AbilityManager.cs.meta similarity index 100% rename from Assets/Scripts/AbilityManager.cs.meta rename to Assets/Scripts/Abilities/AbilityManager.cs.meta diff --git a/Assets/Scripts/AbilityUIHandler.cs b/Assets/Scripts/Abilities/AbilityUIHandler.cs similarity index 100% rename from Assets/Scripts/AbilityUIHandler.cs rename to Assets/Scripts/Abilities/AbilityUIHandler.cs diff --git a/Assets/Scripts/AbilityUIHandler.cs.meta b/Assets/Scripts/Abilities/AbilityUIHandler.cs.meta similarity index 100% rename from Assets/Scripts/AbilityUIHandler.cs.meta rename to Assets/Scripts/Abilities/AbilityUIHandler.cs.meta diff --git a/Assets/Scripts/AbilityUIObject.cs b/Assets/Scripts/Abilities/AbilityUIObject.cs similarity index 100% rename from Assets/Scripts/AbilityUIObject.cs rename to Assets/Scripts/Abilities/AbilityUIObject.cs diff --git a/Assets/Scripts/AbilityUIObject.cs.meta b/Assets/Scripts/Abilities/AbilityUIObject.cs.meta similarity index 100% rename from Assets/Scripts/AbilityUIObject.cs.meta rename to Assets/Scripts/Abilities/AbilityUIObject.cs.meta diff --git a/Assets/Scripts/Abilities/PlayerAbilities.meta b/Assets/Scripts/Abilities/PlayerAbilities.meta new file mode 100644 index 0000000..a1d352c --- /dev/null +++ b/Assets/Scripts/Abilities/PlayerAbilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe5e49884c882fcd5b60c9d30927a02f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BeamCollider.cs b/Assets/Scripts/Abilities/PlayerAbilities/BeamCollider.cs similarity index 100% rename from Assets/Scripts/BeamCollider.cs rename to Assets/Scripts/Abilities/PlayerAbilities/BeamCollider.cs diff --git a/Assets/Scripts/BeamCollider.cs.meta b/Assets/Scripts/Abilities/PlayerAbilities/BeamCollider.cs.meta similarity index 100% rename from Assets/Scripts/BeamCollider.cs.meta rename to Assets/Scripts/Abilities/PlayerAbilities/BeamCollider.cs.meta diff --git a/Assets/Scripts/FireBullet.cs b/Assets/Scripts/Abilities/PlayerAbilities/FireBullet.cs similarity index 100% rename from Assets/Scripts/FireBullet.cs rename to Assets/Scripts/Abilities/PlayerAbilities/FireBullet.cs diff --git a/Assets/Scripts/FireBullet.cs.meta b/Assets/Scripts/Abilities/PlayerAbilities/FireBullet.cs.meta similarity index 100% rename from Assets/Scripts/FireBullet.cs.meta rename to Assets/Scripts/Abilities/PlayerAbilities/FireBullet.cs.meta diff --git a/Assets/Scripts/Laser.cs b/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs similarity index 87% rename from Assets/Scripts/Laser.cs rename to Assets/Scripts/Abilities/PlayerAbilities/Laser.cs index b696c2a..e4ae894 100644 --- a/Assets/Scripts/Laser.cs +++ b/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs @@ -9,17 +9,16 @@ public class Laser : PlayerAbility public float length; public float width; public float duration; - private float currentDuration; + protected float currentDuration; [Header("Beam")] - [SerializeField] private BeamCollider beamObject; + [SerializeField] protected BeamCollider beamObject; private BeamCollider beamObjectInstance; public float turnSpeed; public float offset; [Header("Weapon Properties")] [HideInInspector] public List enemyList = new(); public float damageDebounceTime; - private float currentDebounce; - public float damage; + protected float currentDebounce; private void Start() { CreateBeam(); @@ -36,6 +35,7 @@ public class Laser : PlayerAbility protected override void Update() { + base.Update(); if (currentDuration > 0) { Vector3 direction = (thisPlayer.mouseWorldPos - (Vector2)transform.position).normalized; @@ -54,7 +54,7 @@ public class Laser : PlayerAbility enemyList.Remove(enemy); continue; } - enemy.TakeDamage(damage); + enemy.TakeDamage(power); } currentDebounce = damageDebounceTime; } @@ -67,7 +67,7 @@ public class Laser : PlayerAbility } } - private void CreateBeam() + protected virtual void CreateBeam() { beamObjectInstance = Instantiate(beamObject, transform.position, Quaternion.identity); beamObjectInstance.transform.SetParent(transform); @@ -76,4 +76,6 @@ public class Laser : PlayerAbility beamObjectInstance.thisLaser = this; beamObjectInstance.gameObject.SetActive(false); } + //maybe we should've made this a projectile instead of an ability lol + //its ok we can work with this still } diff --git a/Assets/Scripts/Laser.cs.meta b/Assets/Scripts/Abilities/PlayerAbilities/Laser.cs.meta similarity index 100% rename from Assets/Scripts/Laser.cs.meta rename to Assets/Scripts/Abilities/PlayerAbilities/Laser.cs.meta diff --git a/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs new file mode 100644 index 0000000..561a7f6 --- /dev/null +++ b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs @@ -0,0 +1,66 @@ +using System.Collections.Generic; +using UnityEngine; + +public class NondirectionalLaser : Laser +{ + [SerializeField] private int beamCount = 1; + [SerializeField] private Transform beamRoot; + private List beamInstances = new(); + + protected override void AbilityEffects() + { + canCooldown = false; + currentDuration = duration; + currentDebounce = damageDebounceTime; + beamRoot.gameObject.SetActive(true); + } + protected override void Update() + { + //we're doing this the stupid way i guess because i am stupid + if (currentCooldown > 0) + { + currentCooldown -= Time.deltaTime; + } + if (currentDuration > 0) + { + // i think i can just put spinobject in it and that'll work lol + if (currentDebounce > 0) + { + currentDebounce -= Time.deltaTime; + if (currentDebounce <= 0) + { + foreach (Entity enemy in enemyList.ToArray()) + { + if (!enemy) + { + enemyList.Remove(enemy); + continue; + } + enemy.TakeDamage(power); + } + currentDebounce = damageDebounceTime; + } + } + if (currentDuration <= 0) + { + canCooldown = true; + beamRoot.gameObject.SetActive(false); + } + } + } + protected override void CreateBeam() + { + float rotationAmount = 360f / beamCount; + for (int i = 0; i < beamCount; i++) + { + BeamCollider newBeamObjectInstance = Instantiate(beamObject, transform.position, Quaternion.identity); + beamInstances.Add(newBeamObjectInstance); + newBeamObjectInstance.transform.SetParent(beamRoot); + newBeamObjectInstance.transform.localScale = new Vector3(length, width, 1); + newBeamObjectInstance.transform.Translate(Vector3.right * (newBeamObjectInstance.transform.localScale.x * 0.5f) + new Vector3(offset, 0, 0)); + newBeamObjectInstance.transform.RotateAround(beamRoot.position, Vector3.forward, rotationAmount * i); + newBeamObjectInstance.thisLaser = this; + } + beamRoot.gameObject.SetActive(false); + } +} diff --git a/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs.meta b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs.meta new file mode 100644 index 0000000..0e08573 --- /dev/null +++ b/Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b2d9c1454ecf94f459c14e302b316986 \ No newline at end of file diff --git a/Assets/Scripts/PlayerAbility.cs b/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs similarity index 95% rename from Assets/Scripts/PlayerAbility.cs rename to Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs index 088c3af..dce4e60 100644 --- a/Assets/Scripts/PlayerAbility.cs +++ b/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs @@ -11,7 +11,7 @@ public class PlayerAbility : MonoBehaviour [Header("Cooldown")] public bool canCooldown = true; public float cooldown; - private float currentCooldown; + protected float currentCooldown; [Header("Stats")] public float power; public float projectileCount; diff --git a/Assets/Scripts/PlayerAbility.cs.meta b/Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs.meta similarity index 100% rename from Assets/Scripts/PlayerAbility.cs.meta rename to Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs.meta diff --git a/Assets/Scripts/Abilities/Upgrades.meta b/Assets/Scripts/Abilities/Upgrades.meta new file mode 100644 index 0000000..4cebe11 --- /dev/null +++ b/Assets/Scripts/Abilities/Upgrades.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d560cfe20a1ec7b0581a0390c4d45434 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilityUpgrade.cs b/Assets/Scripts/Abilities/Upgrades/AbilityUpgrade.cs similarity index 100% rename from Assets/Scripts/AbilityUpgrade.cs rename to Assets/Scripts/Abilities/Upgrades/AbilityUpgrade.cs diff --git a/Assets/Scripts/AbilityUpgrade.cs.meta b/Assets/Scripts/Abilities/Upgrades/AbilityUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/AbilityUpgrade.cs.meta rename to Assets/Scripts/Abilities/Upgrades/AbilityUpgrade.cs.meta diff --git a/Assets/Scripts/AttackSpeedUpgrade.cs b/Assets/Scripts/Abilities/Upgrades/AttackSpeedUpgrade.cs similarity index 100% rename from Assets/Scripts/AttackSpeedUpgrade.cs rename to Assets/Scripts/Abilities/Upgrades/AttackSpeedUpgrade.cs diff --git a/Assets/Scripts/AttackSpeedUpgrade.cs.meta b/Assets/Scripts/Abilities/Upgrades/AttackSpeedUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/AttackSpeedUpgrade.cs.meta rename to Assets/Scripts/Abilities/Upgrades/AttackSpeedUpgrade.cs.meta diff --git a/Assets/Scripts/ProjectileCountUpgrade.cs b/Assets/Scripts/Abilities/Upgrades/ProjectileCountUpgrade.cs similarity index 100% rename from Assets/Scripts/ProjectileCountUpgrade.cs rename to Assets/Scripts/Abilities/Upgrades/ProjectileCountUpgrade.cs diff --git a/Assets/Scripts/ProjectileCountUpgrade.cs.meta b/Assets/Scripts/Abilities/Upgrades/ProjectileCountUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/ProjectileCountUpgrade.cs.meta rename to Assets/Scripts/Abilities/Upgrades/ProjectileCountUpgrade.cs.meta diff --git a/Assets/Scripts/UpgradeBoxUI.cs b/Assets/Scripts/Abilities/Upgrades/UpgradeBoxUI.cs similarity index 100% rename from Assets/Scripts/UpgradeBoxUI.cs rename to Assets/Scripts/Abilities/Upgrades/UpgradeBoxUI.cs diff --git a/Assets/Scripts/UpgradeBoxUI.cs.meta b/Assets/Scripts/Abilities/Upgrades/UpgradeBoxUI.cs.meta similarity index 100% rename from Assets/Scripts/UpgradeBoxUI.cs.meta rename to Assets/Scripts/Abilities/Upgrades/UpgradeBoxUI.cs.meta diff --git a/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs b/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs new file mode 100644 index 0000000..d2fc57e --- /dev/null +++ b/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +public class UpgradePickup : ItemPickup +{ + public AbilityUpgrade upgradeDropped; + protected override void PickupEffects() + { + + } +} diff --git a/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta b/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta new file mode 100644 index 0000000..83b6dba --- /dev/null +++ b/Assets/Scripts/Abilities/Upgrades/UpgradePickup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 414126e6ddc5f8085af89e294a8deb38 \ No newline at end of file diff --git a/Assets/Scripts/Entities.meta b/Assets/Scripts/Entities.meta new file mode 100644 index 0000000..213872b --- /dev/null +++ b/Assets/Scripts/Entities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6183f2d2f1a7e93008ff448fa746c3d4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Entities/Enemy.cs similarity index 100% rename from Assets/Scripts/Enemy.cs rename to Assets/Scripts/Entities/Enemy.cs diff --git a/Assets/Scripts/Enemy.cs.meta b/Assets/Scripts/Entities/Enemy.cs.meta similarity index 100% rename from Assets/Scripts/Enemy.cs.meta rename to Assets/Scripts/Entities/Enemy.cs.meta diff --git a/Assets/Scripts/EnemySpawner.cs b/Assets/Scripts/Entities/EnemySpawner.cs similarity index 100% rename from Assets/Scripts/EnemySpawner.cs rename to Assets/Scripts/Entities/EnemySpawner.cs diff --git a/Assets/Scripts/EnemySpawner.cs.meta b/Assets/Scripts/Entities/EnemySpawner.cs.meta similarity index 100% rename from Assets/Scripts/EnemySpawner.cs.meta rename to Assets/Scripts/Entities/EnemySpawner.cs.meta diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entities/Entity.cs similarity index 100% rename from Assets/Scripts/Entity.cs rename to Assets/Scripts/Entities/Entity.cs diff --git a/Assets/Scripts/Entity.cs.meta b/Assets/Scripts/Entities/Entity.cs.meta similarity index 100% rename from Assets/Scripts/Entity.cs.meta rename to Assets/Scripts/Entities/Entity.cs.meta diff --git a/Assets/Scripts/Marisa.cs b/Assets/Scripts/Entities/Marisa.cs similarity index 100% rename from Assets/Scripts/Marisa.cs rename to Assets/Scripts/Entities/Marisa.cs diff --git a/Assets/Scripts/Marisa.cs.meta b/Assets/Scripts/Entities/Marisa.cs.meta similarity index 100% rename from Assets/Scripts/Marisa.cs.meta rename to Assets/Scripts/Entities/Marisa.cs.meta diff --git a/Assets/Scripts/MarisaAbilityHandler.cs b/Assets/Scripts/Entities/MarisaAbilityHandler.cs similarity index 100% rename from Assets/Scripts/MarisaAbilityHandler.cs rename to Assets/Scripts/Entities/MarisaAbilityHandler.cs diff --git a/Assets/Scripts/MarisaAbilityHandler.cs.meta b/Assets/Scripts/Entities/MarisaAbilityHandler.cs.meta similarity index 100% rename from Assets/Scripts/MarisaAbilityHandler.cs.meta rename to Assets/Scripts/Entities/MarisaAbilityHandler.cs.meta diff --git a/Assets/Scripts/Items.meta b/Assets/Scripts/Items.meta new file mode 100644 index 0000000..e758801 --- /dev/null +++ b/Assets/Scripts/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 899dfdf2c7b4ad4718c8f5ee206bdf9a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ItemPickup.cs b/Assets/Scripts/Items/ItemPickup.cs similarity index 85% rename from Assets/Scripts/ItemPickup.cs rename to Assets/Scripts/Items/ItemPickup.cs index e084218..2a3fc65 100644 --- a/Assets/Scripts/ItemPickup.cs +++ b/Assets/Scripts/Items/ItemPickup.cs @@ -18,7 +18,12 @@ public class ItemPickup : MonoBehaviour private void OnTriggerEnter2D(Collider2D other) { - //pick up + PickupEffects(); Destroy(gameObject); } + + protected virtual void PickupEffects() + { + + } } diff --git a/Assets/Scripts/ItemPickup.cs.meta b/Assets/Scripts/Items/ItemPickup.cs.meta similarity index 100% rename from Assets/Scripts/ItemPickup.cs.meta rename to Assets/Scripts/Items/ItemPickup.cs.meta diff --git a/Assets/Scripts/ItemPickupRange.cs b/Assets/Scripts/Items/ItemPickupRange.cs similarity index 100% rename from Assets/Scripts/ItemPickupRange.cs rename to Assets/Scripts/Items/ItemPickupRange.cs diff --git a/Assets/Scripts/ItemPickupRange.cs.meta b/Assets/Scripts/Items/ItemPickupRange.cs.meta similarity index 100% rename from Assets/Scripts/ItemPickupRange.cs.meta rename to Assets/Scripts/Items/ItemPickupRange.cs.meta diff --git a/Assets/Scripts/Items/PowerPickup.cs b/Assets/Scripts/Items/PowerPickup.cs new file mode 100644 index 0000000..1e33096 --- /dev/null +++ b/Assets/Scripts/Items/PowerPickup.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +public class PowerPickup : ItemPickup +{ + [SerializeField] private float powerAmount; + protected override void PickupEffects() + { + + } +} diff --git a/Assets/Scripts/Items/PowerPickup.cs.meta b/Assets/Scripts/Items/PowerPickup.cs.meta new file mode 100644 index 0000000..fe8992a --- /dev/null +++ b/Assets/Scripts/Items/PowerPickup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dac707185c38816bbb658ebbb2885694 \ No newline at end of file diff --git a/Assets/Scripts/MasterSpark.cs b/Assets/Scripts/MasterSpark.cs deleted file mode 100644 index b40246a..0000000 --- a/Assets/Scripts/MasterSpark.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public class MasterSpark : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/MasterSpark.cs.meta b/Assets/Scripts/MasterSpark.cs.meta deleted file mode 100644 index c5adbfe..0000000 --- a/Assets/Scripts/MasterSpark.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: e3b3742e855c4c7b499ab482efa2143e \ No newline at end of file diff --git a/Assets/Scripts/Projectiles.meta b/Assets/Scripts/Projectiles.meta new file mode 100644 index 0000000..1f15778 --- /dev/null +++ b/Assets/Scripts/Projectiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edb470ba0d075ab9d88588b4dc6d02b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Projectile.cs b/Assets/Scripts/Projectiles/Projectile.cs similarity index 100% rename from Assets/Scripts/Projectile.cs rename to Assets/Scripts/Projectiles/Projectile.cs diff --git a/Assets/Scripts/Projectile.cs.meta b/Assets/Scripts/Projectiles/Projectile.cs.meta similarity index 100% rename from Assets/Scripts/Projectile.cs.meta rename to Assets/Scripts/Projectiles/Projectile.cs.meta diff --git a/Assets/Scripts/Projectiles/SpinSprite.cs b/Assets/Scripts/Projectiles/SpinSprite.cs new file mode 100644 index 0000000..aef36a7 --- /dev/null +++ b/Assets/Scripts/Projectiles/SpinSprite.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +public class SpinSprite : MonoBehaviour +{ + [SerializeField] private float rotationSpeed; + void Update() + { + transform.eulerAngles = new Vector3(0, 0, transform.eulerAngles.z + (rotationSpeed * Time.deltaTime)); + } +} diff --git a/Assets/Scripts/Projectiles/SpinSprite.cs.meta b/Assets/Scripts/Projectiles/SpinSprite.cs.meta new file mode 100644 index 0000000..c7eee25 --- /dev/null +++ b/Assets/Scripts/Projectiles/SpinSprite.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 367cdbe920b6609c2a25c4624980f56a \ No newline at end of file diff --git a/Assets/Sprites/mastersparkbeam.png b/Assets/Sprites/mastersparkbeam.png new file mode 100644 index 0000000000000000000000000000000000000000..3b5ef9fa05abe499c628642217046a1d455dfc89 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}0iG_7ArY-_ zFFEou7;vySW@s_D-f-e^`{0;*XK{Dq?3@p0VubGn_RXGIS^huvfm@4+g8qZuzrXVX o^+Lf8V`bI=hxi4nmM~N{vM*E-%t)A)Yzva~boFyt=akR{05Yd7rT_o{ literal 0 HcmV?d00001 diff --git a/Assets/Sprites/mastersparkbeam.png.meta b/Assets/Sprites/mastersparkbeam.png.meta new file mode 100644 index 0000000..e618d3e --- /dev/null +++ b/Assets/Sprites/mastersparkbeam.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 422cf2b841091f2878beffe6b9721e13 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7312781290140997224 + second: mastersparkbeam_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: mastersparkbeam_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 899e5015928c38a90800000000000000 + internalID: -7312781290140997224 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + mastersparkbeam_0: -7312781290140997224 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/star.png b/Assets/Sprites/star.png new file mode 100644 index 0000000000000000000000000000000000000000..8118b043e49016b921eb65c934cb018034d9f816 GIT binary patch literal 13614 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 G;(r0UFves6 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/star.png.meta b/Assets/Sprites/star.png.meta new file mode 100644 index 0000000..c62c672 --- /dev/null +++ b/Assets/Sprites/star.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 04471894fe003265dad2be86950ab969 +TextureImporter: + internalIDToNameTable: + - first: + 213: 4815476061570213978 + second: star_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 600 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: star_0 + rect: + serializedVersion: 2 + x: 38 + y: 57 + width: 524 + height: 485 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a582a4ae6f104d240800000000000000 + internalID: 4815476061570213978 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + star_0: 4815476061570213978 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: