Composable upgrades (vs hardcoded) (#35)

* Add UpgradeBase class * Separate upgrading from LevelUpUI, use new upgrading classes * Delete unused classes * Add DartUpgradePath, enable by defaultt * Move weapon upgrade paths into Scripts/Weapons * Fix wrong level in level up UI * Add Schnitzel upgrade path, fix some random bugs * Fix raven cooldown being misset to 0 on lvl 2 * Hardcore initial upgrade values to be safe * Fix bug where knockback was causing dart enemies not to be hit * Add Starfish WeaponUpgradePath * Add ProjectileCount upgrade path * Add Cooldown upgradepath * Remove level 22 (one less lvl now because dart starts at 1) * Add various cleanup * Remove comment
getsentry · Sep 2, 2024 · 596e512 · 596e512
1 parent 7bc5a55
commit 596e512
Show file tree

Hide file tree

Showing 43 changed files with 1,056 additions and 894 deletions.
diff --git a/Assets/Prefabs/Characters/Player.prefab b/Assets/Prefabs/Characters/Player.prefab
@@ -181,6 +181,7 @@ Transform:
   - {fileID: 6866785369235333201}
   - {fileID: 4587633499964583152}
   - {fileID: 5339671386185366077}
+  - {fileID: 2232351024226081505}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1496229637230917705
@@ -247,9 +248,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7445bbf6e7dae43f5b79872980c8e394, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _dartPrefab: {fileID: -1238747304094502698, guid: f4b2f15faddfa43ee9ea450e341989a3, type: 3}
-  _ravenPrefab: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3}
-  _starfishPrefab: {fileID: 4760811041620966471, guid: 33fd1a5d339ac4354ba91c77597adb88, type: 3}
+  WeaponManager: {fileID: 0}
   _schnitzelPrefab: {fileID: 8194018987037890526, guid: af50a2a7f0c834ebf90a6f2724b0f298, type: 3}
   _hitPoints: 100
   _maxHitPoints: 100
@@ -700,6 +699,53 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!1 &7554083245618661203
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2232351024226081505}
+  - component: {fileID: 1700775371577408911}
+  m_Layer: 7
+  m_Name: WeaponManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2232351024226081505
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554083245618661203}
+  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: 71829853537045655}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1700775371577408911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7554083245618661203}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 91bd7a4cb211b4c32bfc08d33b3d4ccf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalDamageModifier: 1
+  GlobalCooldownModifier: 1
+  GlobalCountModifier: 1
 --- !u!1 &7619805629008050898
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Weapons/Dart.prefab b/Assets/Prefabs/Weapons/Dart.prefab
@@ -45,10 +45,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _isEnabled: 0
-  _startingCooldown: 1.8
-  _baseDamage: 10
+  BaseCooldown: 1.8
+  BaseDamage: 10
   _speed: 10
-  _rearFiringDartCount: 0
+  RearFiringDartCount: 0
   _spawnDistanceOutsidePlayer: 1.25
   _shootingInterval: 0.4
   _areaOfEffectRadius: 0.25

diff --git a/Assets/Prefabs/Weapons/Raven.prefab b/Assets/Prefabs/Weapons/Raven.prefab
@@ -45,9 +45,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _isEnabled: 0
-  _startingCooldown: 6
-  _baseDamage: 15
+  BaseCooldown: 4
+  BaseDamage: 15
   _speed: 12
-  _areaOfEffectRadius: 1
+  AreaOfEffectRadius: 1
   _spawnDistanceOutsidePlayer: 1.25
+  _detectRadius: 12
   _ravenProjectilePrefab: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3}
diff --git a/Assets/Prefabs/Weapons/Schnitzel.prefab b/Assets/Prefabs/Weapons/Schnitzel.prefab
@@ -45,10 +45,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _isEnabled: 0
-  _startingCooldown: 2.9
-  _baseDamage: 8
+  BaseCooldown: 2.8
+  BaseDamage: 8
   _speed: 5
   _spawnDistanceOutsidePlayer: 1.25
   _shootingInterval: 0.25
-  _scale: 1
+  Scale: 1
   _schnitzelProjectilePrefab: {fileID: 8194018987037890526, guid: af50a2a7f0c834ebf90a6f2724b0f298, type: 3}
diff --git a/Assets/Prefabs/Weapons/Starfish.prefab b/Assets/Prefabs/Weapons/Starfish.prefab
@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _isEnabled: 0
-  _startingCooldown: 5
-  _baseDamage: 8
+  BaseCooldown: 5
+  BaseDamage: 8
   _duration: 5
   _starfishProjectilePrefab: {fileID: 4760811041620966471, guid: 33fd1a5d339ac4354ba91c77597adb88, type: 3}