diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs index 1f81889eab26f227d0e06863c42bb9d4f47f52b6..4fcb42cabba858172e22000dfd039ea6fe600404 100644 --- a/MrBigsock/Assets/Code/Character.cs +++ b/MrBigsock/Assets/Code/Character.cs @@ -85,7 +85,7 @@ namespace BigSock { /* The inventory of the character. */ - public Inventory Inventory { get; protected set; } = new Inventory(this); + public Inventory Inventory { get; protected set; } /* The base stats of the character. @@ -102,6 +102,8 @@ namespace BigSock { protected virtual void Start() { rb = GetComponent<Rigidbody2D>(); + Inventory = new Inventory(this); + // Set the base stats. BaseStats = new CharacterStats { MaxHP = baseMaxHP, @@ -152,7 +154,7 @@ namespace BigSock { /* Adds damage to the player if they don't have IFrames. */ - public virtual bool TakeDamage(IAttackStats attack) { + public virtual bool TakeDamage(AttackStats attack) { // Check if player has IFrames if(NextTimeCanTakeDamage > DateTime.Now) return false; diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional.meta b/MrBigsock/Assets/Code/Item/Base/Conditional.meta new file mode 100644 index 0000000000000000000000000000000000000000..a3705195a52cb2de4f0c93706a6bff235e4f2391 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e31f4d0057891f41801425a6b916ad2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnDeathItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnDeathItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..415a769c94339ba8bcdfb394ff1b11d5b91b18c5 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnDeathItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 84e953071eafa1d44a67e96cea7eaf66 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnFireItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnFireItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..9ea0f3becd39891e0c3853d075ff889389586a13 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnFireItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 69b7a27e8309b684a8ade9d41920034d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnHealItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnHealItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..59d53a19066fd1c5c0f704a3ee9cce63e5538a1f --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnHealItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 54316703ea17ea64c9babffa1b4de872 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnHitItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnHitItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..2154bf439387549d1b99bf48c6bbc2830f2f00b1 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnHitItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d00b673cdbafae9489329e3fcfd19d4a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnKillItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnKillItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..7d7153fa975ad12f00a03e6e98617909f03650be --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnKillItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 09173f95f2f51ec49b2b48f7efc13aac +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/Conditional/OnTakeDamageItemBase.cs.meta b/MrBigsock/Assets/Code/Item/Base/Conditional/OnTakeDamageItemBase.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..6c711f2b3a4027e47dd72a0a51783478ec90cf2b --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Base/Conditional/OnTakeDamageItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e6a3ceaa2b8339e4ba9e7d3ecff2b5ce +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs b/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs index 879b73c921ff96fefcb9fd148ee5bfdabc5dface..286c2b158acd8f6eef0a88ad9e0f3499be733186 100644 --- a/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs +++ b/MrBigsock/Assets/Code/Item/Base/ConditionalItemBase.cs @@ -12,7 +12,7 @@ namespace BigSock.Item { */ public abstract class ConditionalItemBase : ItemBase { - public static readonly Random RND = new Random(); + public static readonly System.Random RND = new System.Random(); /* The type of trigger this item uses. diff --git a/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs b/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs index df46c8fa38e23334904d458301a01d343e0fca09..03ae1178b541a80612118f05ff38cb5c1b01dc7e 100644 --- a/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs +++ b/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs @@ -21,9 +21,9 @@ namespace BigSock.Item { var roll = RND.NextDouble(); if(roll >= CHANCE) { attack.Damage *= 2; - MonoBehaviour.print($"[ItemFourEyes.Handler()] Hit. ({roll:P1} >= {CHANCE:P1})") + MonoBehaviour.print($"[ItemFourEyes.Handler()] Hit. ({roll:P1} >= {CHANCE:P1})"); } else { - MonoBehaviour.print($"[ItemFourEyes.Handler()] Miss. ({roll:P1} < {CHANCE:P1})") + MonoBehaviour.print($"[ItemFourEyes.Handler()] Miss. ({roll:P1} < {CHANCE:P1})"); } } diff --git a/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs.meta b/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..f3b7fff242d9f0ee7ba5ba3e7730c2fce9f96de3 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Items/ItemFourEyes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 759089648ca5eaf4083c2dcbb3a1a6e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs.meta b/MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..8578146ae3f429a42871543fb65ca7dcc40ca074 --- /dev/null +++ b/MrBigsock/Assets/Code/Item/Items/ItemRunningShoes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a1ef8ad55246f334b91ab0f52f7b5370 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Prefabs/BigSock.prefab b/MrBigsock/Assets/Prefabs/BigSock.prefab index 86c173f5381faaee7cb81b5019ee02831e9aff85..d90aa1d783867560cbe5545cae8678c09dc3d7b9 100644 --- a/MrBigsock/Assets/Prefabs/BigSock.prefab +++ b/MrBigsock/Assets/Prefabs/BigSock.prefab @@ -167,7 +167,7 @@ MonoBehaviour: baseAttackSpeed: 4 baseMovementSpeed: 10 baseDamage: 1 - knockbackForce: 150 + knockbackForce: 1 baseHP: 10 baseMaxHP: 10 hpBar: {fileID: 0} diff --git a/MrBigsock/Assets/Scenes/example.unity b/MrBigsock/Assets/Scenes/example.unity index 524e399c6bd6b06eeb0e050bd860b9bbc3bcf357..7efdbd340b59a8f89ddc76b86fc8495ea3462a4b 100644 --- a/MrBigsock/Assets/Scenes/example.unity +++ b/MrBigsock/Assets/Scenes/example.unity @@ -1298,6 +1298,10 @@ PrefabInstance: propertyPath: hpBar value: objectReference: {fileID: 651767215} + - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} + propertyPath: knockbackForce + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3} --- !u!1 &323648871