Merge pull request #444 from KinglyKrab/master

Files changed: ruletypes.h, client.cpp
This commit is contained in:
Alex 2015-07-22 19:39:32 -07:00
commit 26e153727e
3 changed files with 10 additions and 3 deletions

View File

@ -116,6 +116,9 @@ RULE_INT(Character, TradeskillUpResearch, 1) // Research skillup rate adjust. Lo
RULE_INT(Character, TradeskillUpTinkering, 2) // Tinkering skillup rate adjust. Lower is faster.
RULE_BOOL(Character, SpamHPUpdates, false) // if your server has stupid amounts of HP that causes client display issues, turn this on!
RULE_BOOL(Character, MarqueeHPUpdates, false) // Will show Health % in center of screen < 100%
RULE_INT(Character, IksarCommonTongue, 95) // 95 By default (live-like?)
RULE_INT(Character, OgreCommonTongue, 95) // 95 By default (live-like?)
RULE_INT(Character, TrollCommonTongue, 95) // 95 By default (live-like?)
RULE_CATEGORY_END()
RULE_CATEGORY(Mercs)

View File

@ -0,0 +1,4 @@
INSERT INTO `rule_values` VALUES
('1', 'Character:IksarCommonTongue', '95', ''),
('1', 'Character:OgreCommonTongue', '95', ''),
('1', 'Character:TrollCommonTongue', '95', '');

View File

@ -1948,21 +1948,21 @@ void Client::SetRacialLanguages( PlayerProfile_Struct *pp )
}
case IKSAR:
{
pp->languages[LANG_COMMON_TONGUE] = 95;
pp->languages[LANG_COMMON_TONGUE] = RuleI(Character, IksarCommonTongue);
pp->languages[LANG_DARK_SPEECH] = 100;
pp->languages[LANG_LIZARDMAN] = 100;
break;
}
case OGRE:
{
pp->languages[LANG_COMMON_TONGUE] = 95;
pp->languages[LANG_COMMON_TONGUE] = RuleI(Character, OgreCommonTongue);
pp->languages[LANG_DARK_SPEECH] = 100;
pp->languages[LANG_OGRE] = 100;
break;
}
case TROLL:
{
pp->languages[LANG_COMMON_TONGUE] = 95;
pp->languages[LANG_COMMON_TONGUE] = RuleI(Character, TrollCommonTongue);
pp->languages[LANG_DARK_SPEECH] = 100;
pp->languages[LANG_TROLL] = 100;
break;