From 64846a45ed55989dd9b85e46e81deb982173b118 Mon Sep 17 00:00:00 2001 From: teascade Date: Wed, 14 Aug 2019 18:11:59 +0300 Subject: [PATCH] Tweak PlayerFun values and add multiplier for boredom --- Assets/Prefabs/Player.prefab | 2 +- Assets/Scripts/Player/PlayerFun.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 1497239..c050d5a 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -529,7 +529,7 @@ MonoBehaviour: MaxFun: 100 FunDegradeSpeed: 4 StandingStillMultiplier: 1.5 - WeaponFun: 20 + WeaponFun: 12 EnemyExplosionFun: 6 FurnitureExplosionFun: 4 ShootingFunAmount: 0.2 diff --git a/Assets/Scripts/Player/PlayerFun.cs b/Assets/Scripts/Player/PlayerFun.cs index a175d58..f36bef9 100644 --- a/Assets/Scripts/Player/PlayerFun.cs +++ b/Assets/Scripts/Player/PlayerFun.cs @@ -63,7 +63,8 @@ namespace Saltosion.OneWeapon.Player { } private void AddFun(float fun) { - float NewFun = CurrentFun + fun; + float FunAdded = fun * (2 - (CurrentFun / MaxFun)); + float NewFun = CurrentFun + FunAdded; CurrentFun = Mathf.Min(MaxFun, NewFun); }