From f310e2c747cce524c9f57055b5b36e87f3180208 Mon Sep 17 00:00:00 2001
From: Andrest07 <57931603+Andrest07@users.noreply.github.com>
Date: Sat, 30 Mar 2024 20:34:04 +0700
Subject: [PATCH] Characteristics fix
---
.../base-system/overlays/characteristics.twee | 62 +++++++++----------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/game/base-system/overlays/characteristics.twee b/game/base-system/overlays/characteristics.twee
index 1fb19225fa..5b257b08de 100644
--- a/game/base-system/overlays/characteristics.twee
+++ b/game/base-system/overlays/characteristics.twee
@@ -381,7 +381,7 @@
]
}>>
<<else>>
- <<set _physiqueConfig = { name : "Physique", icon : "ui/sym_physique", displayType : "level", currentValue : $physique, maxValue: $physiquesize * $AMCTraits.physique, modifier: 100, modTypes: { good: [], bad: [] },
+ <<set _physiqueConfig = { name : "Physique", icon : "ui/sym_physique", displayType : "level", currentValue : $physique, maxValue: $physiquesize, modifier: 100, modTypes: { good: [], bad: [] },
states : [
{ requiredValue: 0, level: 0, color: 'red', description: 'You are emaciated.'},
{ requiredValue: $physiquesize / 7, level: 1, color: 'pink', description: 'You are skinny.'},
@@ -419,26 +419,26 @@
<!--WILLPOWER-->
<<if $AMCTraits.willpower is 2>>
- <<set _willpowerConfig = { name : "Willpower", icon : "ui/redbolt", displayType : "level", currentValue : $willpower, maxValue: $willpowermax * $AMCTraits.willpower, modifier: 100, modTypes: { good: [], bad: [] },
+ <<set _willpowerConfig = { name : "Willpower", icon : "ui/redbolt", displayType : "level", currentValue : $willpower, maxValue: $willpowermax, modifier: 100, modTypes: { good: [], bad: [] },
states : [
{ requiredValue: 0, level: 0, color: 'red', description: 'You are timid.'},
- { requiredValue: $willpowermax / 7, level: 1, color: 'pink', description: 'You are fainthearted.'},
- { requiredValue: ($willpowermax / 7) * 2, level: 2, color: 'purple', description: 'You are mindful.'},
- { requiredValue: ($willpowermax / 7) * 3, level: 3, color: 'blue', description: 'You are resolved.'},
- { requiredValue: ($willpowermax / 7) * 4, level: 4, color: 'lblue', description: 'You are determined.'},
- { requiredValue: ($willpowermax / 7) * 5, level: 5, color: 'teal', description: 'You are tenacious.'},
- { requiredValue: ($willpowermax / 7) * 6, level: 6, color: 'green', description: 'Your will is iron.'},
- { requiredValue: ($willpowermax / 7) * 7, level: 7, color: 'green', description: 'You are resolute.'},
- { requiredValue: ($willpowermax / 7) * 8, level: 8, color: 'gold', description: 'You are unwavering.'},
- { requiredValue: ($willpowermax / 7) * 9, level: 9, color: 'gold', description: 'You are indomitable.'},
- { requiredValue: ($willpowermax / 7) * 10, level: 10, color: 'gold', description: 'You are unyielding.'},
- { requiredValue: ($willpowermax / 7) * 11, level: 11, color: 'gold', description: 'Your will is adamantine.'},
- { requiredValue: ($willpowermax / 7) * 12, level: 12, color: 'lustful', description: 'Your will is invincible.'},
- { requiredValue: ($willpowermax / 7) * 13, level: 13, color: 'lustful', description: 'Your will is titanic.'}
+ { requiredValue: $willpowermax / 14, level: 1, color: 'pink', description: 'You are fainthearted.'},
+ { requiredValue: ($willpowermax / 14) * 2, level: 2, color: 'purple', description: 'You are mindful.'},
+ { requiredValue: ($willpowermax / 14) * 3, level: 3, color: 'blue', description: 'You are resolved.'},
+ { requiredValue: ($willpowermax / 14) * 4, level: 4, color: 'lblue', description: 'You are determined.'},
+ { requiredValue: ($willpowermax / 14) * 5, level: 5, color: 'teal', description: 'You are tenacious.'},
+ { requiredValue: ($willpowermax / 14) * 6, level: 6, color: 'green', description: 'Your will is iron.'},
+ { requiredValue: ($willpowermax / 14) * 7, level: 7, color: 'green', description: 'You are resolute.'},
+ { requiredValue: ($willpowermax / 14) * 8, level: 8, color: 'gold', description: 'You are unwavering.'},
+ { requiredValue: ($willpowermax / 14) * 9, level: 9, color: 'gold', description: 'You are indomitable.'},
+ { requiredValue: ($willpowermax / 14) * 10, level: 10, color: 'gold', description: 'You are unyielding.'},
+ { requiredValue: ($willpowermax / 14) * 11, level: 11, color: 'gold', description: 'Your will is adamantine.'},
+ { requiredValue: ($willpowermax / 14) * 12, level: 12, color: 'lustful', description: 'Your will is invincible.'},
+ { requiredValue: ($willpowermax / 14) * 13, level: 13, color: 'lustful', description: 'Your will is titanic.'}
]
}>>
<<else>>
- <<set _willpowerConfig = { name : "Willpower", icon : "ui/redbolt", displayType : "level", currentValue : $willpower, maxValue: $willpowermax * $AMCTraits.willpower, modifier: 100, modTypes: { good: [], bad: [] },
+ <<set _willpowerConfig = { name : "Willpower", icon : "ui/redbolt", displayType : "level", currentValue : $willpower, maxValue: $willpowermax, modifier: 100, modTypes: { good: [], bad: [] },
states : [
{ requiredValue: 0, level: 0, color: 'red', description: 'You are timid.'},
{ requiredValue: $willpowermax / 7, level: 1, color: 'pink', description: 'You are fainthearted.'},
@@ -460,26 +460,26 @@
<!--BEAUTY-->
<<if $AMCTraits.beauty is 2>>
- <<set _beautyConfig = { name : "Beauty", icon : "ui/sym_beauty", displayType : "level", currentValue : $beauty, maxValue: $beautymax * $AMCTraits.beauty, modifier: 100, modTypes: { good: [], bad: [] },
+ <<set _beautyConfig = { name : "Beauty", icon : "ui/sym_beauty", displayType : "level", currentValue : $beauty, maxValue: $beautymax, modifier: 100, modTypes: { good: [], bad: [] },
states : [
{ requiredValue: 0, level: 0, color: 'red', description: 'You are plain.'},
- { requiredValue: $beautymax / 7, level: 1, color: 'pink', description: 'You are cute.'},
- { requiredValue: ($beautymax / 7) * 2, level: 2, color: 'purple', description: 'You are pretty.'},
- { requiredValue: ($beautymax / 7) * 3, level: 3, color: 'blue', description: 'You are charming.'},
- { requiredValue: ($beautymax / 7) * 4, level: 4, color: 'lblue', description: 'You are beautiful.'},
- { requiredValue: ($beautymax / 7) * 5, level: 5, color: 'teal', description: 'You are ravishing.'},
- { requiredValue: ($beautymax / 7) * 6, level: 6, color: 'green', description: 'Your beauty is divine.'},
- { requiredValue: ($beautymax / 7) * 7, level: 7, color: 'green', description: 'You are alluring.'},
- { requiredValue: ($beautymax / 7) * 8, level: 8, color: 'gold', description: 'You are stunning.'},
- { requiredValue: ($beautymax / 7) * 9, level: 9, color: 'gold', description: 'You are mesmerizing.'},
- { requiredValue: ($beautymax / 7) * 10, level: 10, color: 'gold', description: 'You are enchanting.'},
- { requiredValue: ($beautymax / 7) * 11, level: 11, color: 'gold', description: 'You are captivating.'},
- { requiredValue: ($beautymax / 7) * 12, level: 12, color: 'lustful',description: 'You are breathtaking.'},
- { requiredValue: ($beautymax / 7) * 13, level: 13, color: 'lustful',description: 'Your beauty surpasses divinity.'}
+ { requiredValue: $beautymax / 14, level: 1, color: 'pink', description: 'You are cute.'},
+ { requiredValue: ($beautymax / 14) * 2, level: 2, color: 'purple', description: 'You are pretty.'},
+ { requiredValue: ($beautymax / 14) * 3, level: 3, color: 'blue', description: 'You are charming.'},
+ { requiredValue: ($beautymax / 14) * 4, level: 4, color: 'lblue', description: 'You are beautiful.'},
+ { requiredValue: ($beautymax / 14) * 5, level: 5, color: 'teal', description: 'You are ravishing.'},
+ { requiredValue: ($beautymax / 14) * 6, level: 6, color: 'green', description: 'Your beauty is divine.'},
+ { requiredValue: ($beautymax / 14) * 7, level: 7, color: 'green', description: 'You are alluring.'},
+ { requiredValue: ($beautymax / 14) * 8, level: 8, color: 'gold', description: 'You are stunning.'},
+ { requiredValue: ($beautymax / 14) * 9, level: 9, color: 'gold', description: 'You are mesmerizing.'},
+ { requiredValue: ($beautymax / 14) * 10, level: 10, color: 'gold', description: 'You are enchanting.'},
+ { requiredValue: ($beautymax / 14) * 11, level: 11, color: 'gold', description: 'You are captivating.'},
+ { requiredValue: ($beautymax / 14) * 12, level: 12, color: 'lustful',description: 'You are breathtaking.'},
+ { requiredValue: ($beautymax / 14) * 13, level: 13, color: 'lustful',description: 'Your beauty surpasses divinity.'}
]
}>>
<<else>>
- <<set _beautyConfig = { name : "Beauty", icon : "ui/sym_beauty", displayType : "level", currentValue : $beauty, maxValue: $beautymax * $AMCTraits.beauty, modifier: 100, modTypes: { good: [], bad: [] },
+ <<set _beautyConfig = { name : "Beauty", icon : "ui/sym_beauty", displayType : "level", currentValue : $beauty, maxValue: $beautymax, modifier: 100, modTypes: { good: [], bad: [] },
states : [
{ requiredValue: 0, level: 0, color: 'red', description: 'You are plain.'},
{ requiredValue: $beautymax / 7, level: 1, color: 'pink', description: 'You are cute.'},
--
GitLab