From a83445e4ee2fb875719020ba965715ecee5e6384 Mon Sep 17 00:00:00 2001
From: Andrest07 <57931603+Andrest07@users.noreply.github.com>
Date: Sun, 31 Mar 2024 11:00:45 +0700
Subject: [PATCH] Another AMC Traits fix
---
game/base-system/overlays/characteristics.twee | 17 +++++++++--------
game/base-system/widgets.twee | 3 ---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/game/base-system/overlays/characteristics.twee b/game/base-system/overlays/characteristics.twee
index 8dffb72f87..93650d4438 100644
--- a/game/base-system/overlays/characteristics.twee
+++ b/game/base-system/overlays/characteristics.twee
@@ -371,13 +371,13 @@
{ requiredValue: ($physiquesize / 7) * 4, level: 4, color: 'lblue', description: 'Your body is slim and athletic.'},
{ requiredValue: ($physiquesize / 7) * 5, level: 5, color: 'teal', description: 'Your body is toned and firm.'},
{ requiredValue: ($physiquesize / 7) * 6, level: 6, color: 'green', description: 'Your body is toned and powerful.'},
- { requiredValue: ($physiquesize / 7) * 7, level: 7, color: 'green', description: 'Your body is sculpted and athletic.'},
+ { requiredValue: ($physiquesize / 7) * 7, level: 7, color: 'green', description: 'Your body is sculpted and athletic.'},
{ requiredValue: ($physiquesize / 7) * 8, level: 8, color: 'gold', description: 'Your body is chiseled and formidable.'},
{ requiredValue: ($physiquesize / 7) * 9, level: 9, color: 'gold', description: 'Your body is honed and muscular.'},
{ requiredValue: ($physiquesize / 7) * 10, level: 10, color: 'gold', description: 'Your body is ripped and robust.'},
{ requiredValue: ($physiquesize / 7) * 11, level: 11, color: 'gold', description: 'Your body is defined and Herculean.'},
- { requiredValue: ($physiquesize / 7) * 12, level: 12, color: 'lustful', description: 'Your body is powerful and supremely fit.'},
- { requiredValue: ($physiquesize / 7) * 13, level: 13, color: 'lustful', description: 'Your body is a pinnacle of strength and vitality.'}
+ { requiredValue: ($physiquesize / 7) * 12, level: 12, color: 'lustful',description: 'Your body is powerful and supremely fit.'},
+ { requiredValue: ($physiquesize / 7) * 13, level: 13, color: 'lustful',description: 'Your body is a pinnacle of strength and vitality.'}
]
}>>
<<else>>
@@ -421,7 +421,8 @@
<<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: [] },
states : [
- { requiredValue: $willpowermax / 7, level: 1, color: 'pink', description: 'You are fainthearted.'},
+ { 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.'},
@@ -432,15 +433,15 @@
{ 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 / 7) * 12, level: 12, color: 'lustful',description: 'Your will is invincible.'},
+ { requiredValue: ($willpowermax / 7) * 13, level: 13, color: 'lustful',description: 'Your will is titanic.'}
]
}>>
<<else>>
<<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: 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.'},
diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee
index e42d590f9a..86ed6549d9 100644
--- a/game/base-system/widgets.twee
+++ b/game/base-system/widgets.twee
@@ -5734,14 +5734,11 @@
<<set $feetskillmax to 1000>>
<<if $AMCTraits.hands>>
<<set $AMCTraits.hand to $AMCTraits.hands>>
- <<unset $AMCTraits.hands>>
<</if>>
<<if $AMCTraits.buttocks>>
<<set $AMCTraits.bottom to $AMCTraits.buttocks>>
- <<unset $AMCTraits.buttocks>>
<</if>>
<<if $AMCTraits.thighs>>
<<set $AMCTraits.thigh to $AMCTraits.thighs>>
- <<unset $AMCTraits.thighs>>
<</if>>
<</widget>>
--
GitLab