Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes profile weights passed to content generators: values were alway… #199

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Fixes profile weights passed to content generators: values were alway… #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d838e2
Fixes profile weights passed to content generators: values were alway…
LeonardoTPereira Dec 4, 2022
8be1c60
fix: merge conflicts with develop
luizatvieira Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 162 additions & 0 deletions Assets/Animations/fitness/FitnessAnimation.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,24 @@ AnimationClip:
- serializedVersion: 3
time: -1
value: 0
<<<<<<< HEAD
inSlope: 4.5243287
outSlope: 4.5243287
=======
inSlope: 0.32372805
outSlope: 0.32372805
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: 4.5243287
=======
value: 0.32372805
>>>>>>> Develop
inSlope: 0.5
outSlope: 0.5
tangentMode: 0
Expand All @@ -41,14 +50,24 @@ AnimationClip:
- serializedVersion: 3
time: 1
value: 1
<<<<<<< HEAD
inSlope: -1.6243408
outSlope: -1.6243408
=======
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
<<<<<<< HEAD
value: 1.2756472
inSlope: 0.27564716
outSlope: 0.27564716
=======
value: 0.32372805
inSlope: -0.37711877
outSlope: -0.37711877
Expand Down Expand Up @@ -2702,148 +2721,287 @@ AnimationClip:
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: distanceCurve
path:
classID: 114
script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
=======
time: 45
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0
=======
time: 46
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0
=======
time: 47
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0
=======
time: 48
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: usageCurve
path:
classID: 114
script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 1.851249
outSlope: 1.851249
=======
time: 49
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 1.851249
inSlope: 0.118540764
outSlope: 0.118540764
=======
time: 50
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.2370815
inSlope: -0.8070837
outSlope: -0.8070837
=======
time: 51
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.2370815
=======
time: 52
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: sparsityCurve
path:
classID: 114
script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 0.396294
outSlope: 0.396294
=======
time: 53
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0.396294
inSlope: 0.40124807
outSlope: 0.40124807
=======
time: 54
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.80249614
inSlope: 0.20310107
outSlope: 0.20310107
=======
time: 55
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.80249614
=======
time: 56
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: enemyStandardDeviationCurve
path:
classID: 114
script: {fileID: 11500000, guid: 37ab87ce3d4646a2acf848037c5236da, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 0.7589286
outSlope: 0.7589286
=======
time: 57
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0.7589286
inSlope: 0.039344937
outSlope: 0.039344937
=======
time: 58
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.07868984
inSlope: -0.34011936
outSlope: -0.34011936
=======
time: 59
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.07868984
=======
time: 60
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
Expand Down Expand Up @@ -2871,7 +3029,11 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
<<<<<<< HEAD
m_StopTime: 2
=======
m_StopTime: 60
>>>>>>> Develop
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down
28 changes: 9 additions & 19 deletions Assets/Scripts/Game/NarrativeGenerator/EnemyRelatedNarrative/QuestEnemiesParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,16 @@ public override string ToString()
return stringBuilder.ToString();
}

public void CalculateDifficultyFromProfile(PlayerProfile playerProfile)
public void CalculateDifficultyFromProfile(float masteryPreference)
{
switch (playerProfile.MasteryPreference)
{
case < 15:
Difficulty = DifficultyLevels.VeryEasy;
break;
case < 35:
Difficulty = DifficultyLevels.Easy;
break;
case < 65:
Difficulty = DifficultyLevels.Medium;
break;
case < 85:
Difficulty = DifficultyLevels.Hard;
break;
default:
Difficulty = DifficultyLevels.VeryHard;
break;
}
Difficulty = masteryPreference switch
{
< 0.15f => DifficultyLevels.VeryEasy,
< 0.35f => DifficultyLevels.Easy,
< 0.65f => DifficultyLevels.Medium,
< 0.85f => DifficultyLevels.Hard,
_ => DifficultyLevels.VeryHard
};
}

public void CalculateMonsterFromQuests(IEnumerable<QuestLine> questLines)
Expand Down
Loading
Loading