teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Removed 100 skill caps #1

Open
krageon wants to merge 2 commits from krageon/openmw-tes3coop:fix/skillcap into 0.7.0
pull from: krageon/openmw-tes3coop:fix/skillcap
merge into: teamnwah:0.7.0
Conversation 0 Commits 2 Files changed 3 +14 -33
3 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwclass/npc.cpp
View file

@ -133,9 +133,9 @@ namespace
} }
modifierSum += add; modifierSum += add;
} }
creatureStats.setAttribute(attribute, std::min(
round_ieee_754(creatureStats.getAttribute(attribute).getBase() creatureStats.setAttribute(attribute,
+ (level-1) * modifierSum), 100) ); round_ieee_754(creatureStats.getAttribute(attribute).getBase() + (level-1) * modifierSum) );
} }
// initial health // initial health
@ -230,13 +230,12 @@ namespace
} }
npcStats.getSkill(skillIndex).setBase( npcStats.getSkill(skillIndex).setBase(
std::min(
round_ieee_754( round_ieee_754(
npcStats.getSkill(skillIndex).getBase() npcStats.getSkill(skillIndex).getBase()
+ 5 + 5
+ raceBonus + raceBonus
+ specBonus + specBonus
+(int(level)-1) * (majorMultiplier + specMultiplier)), 100)); // Must gracefully handle level 0 +(int(level)-1) * (majorMultiplier + specMultiplier))); // Must gracefully handle level 0
} }
int skills[ESM::Skill::Length]; int skills[ESM::Skill::Length];

35
apps/openmw/mwgui/statswindow.cpp
View file

@ -244,33 +244,18 @@ namespace MWGui
nameWidget->setSize(nameWidget->getWidth() - (widthAfter-widthBefore), nameWidget->getHeight()); nameWidget->setSize(nameWidget->getWidth() - (widthAfter-widthBefore), nameWidget->getHeight());
} }
if (value.getBase() < 100) nameWidget->setUserString("Visible_SkillMaxed", "false");
{ nameWidget->setUserString("UserData^Hidden_SkillMaxed", "true");
nameWidget->setUserString("Visible_SkillMaxed", "false"); nameWidget->setUserString("Visible_SkillProgressVBox", "true");
nameWidget->setUserString("UserData^Hidden_SkillMaxed", "true"); nameWidget->setUserString("UserData^Hidden_SkillProgressVBox", "false");
nameWidget->setUserString("Visible_SkillProgressVBox", "true");
nameWidget->setUserString("UserData^Hidden_SkillProgressVBox", "false");
valueWidget->setUserString("Visible_SkillMaxed", "false"); valueWidget->setUserString("Visible_SkillMaxed", "false");
valueWidget->setUserString("UserData^Hidden_SkillMaxed", "true"); valueWidget->setUserString("UserData^Hidden_SkillMaxed", "true");
valueWidget->setUserString("Visible_SkillProgressVBox", "true"); valueWidget->setUserString("Visible_SkillProgressVBox", "true");
valueWidget->setUserString("UserData^Hidden_SkillProgressVBox", "false"); valueWidget->setUserString("UserData^Hidden_SkillProgressVBox", "false");
setSkillProgress(nameWidget, value.getProgress(), parSkill); setSkillProgress(nameWidget, value.getProgress(), parSkill);
setSkillProgress(valueWidget, value.getProgress(), parSkill); setSkillProgress(valueWidget, value.getProgress(), parSkill);
}
else
{
nameWidget->setUserString("Visible_SkillMaxed", "true");
nameWidget->setUserString("UserData^Hidden_SkillMaxed", "false");
nameWidget->setUserString("Visible_SkillProgressVBox", "false");
nameWidget->setUserString("UserData^Hidden_SkillProgressVBox", "true");
valueWidget->setUserString("Visible_SkillMaxed", "true");
valueWidget->setUserString("UserData^Hidden_SkillMaxed", "false");
valueWidget->setUserString("Visible_SkillProgressVBox", "false");
valueWidget->setUserString("UserData^Hidden_SkillProgressVBox", "true");
}
} }
} }

3
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -218,9 +218,6 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
{ {
int base = getSkill (skillIndex).getBase(); int base = getSkill (skillIndex).getBase();
if (base >= 100)
return;
base += 1; base += 1;
const MWWorld::Store<ESM::GameSetting> &gmst = const MWWorld::Store<ESM::GameSetting> &gmst =