Skip to content

Commit fc8a60f

Browse files
committed
Add missing alchemy skill
1 parent 92b7704 commit fc8a60f

File tree

11 files changed

+43
-0
lines changed

11 files changed

+43
-0
lines changed

data/locales/de.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ locale = {
405405
["HuntingSkill"] = "Hunting",
406406
["MagicCircleSkill"] = "Magic cirlce",
407407
["AcrobaticSkill"] = "Acrobatic",
408+
["AlchemySkill"] = "Alchemy",
408409
["Show all items"] = "Alle Items anzeigen",
409410
["Show an extra right panel"] = false,
410411
["Show connection ping"] = false,

data/locales/es.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ locale = {
409409
["HuntingSkill"] = "Hunting",
410410
["MagicCircleSkill"] = "Magic cirlce",
411411
["AcrobaticSkill"] = "Acrobatic",
412+
["AlchemySkill"] = "Alchemy",
412413
["Show all items"] = "Mostrar todos los objetos",
413414
["Show an extra right panel"] = "Mostrar un panel derecho extra",
414415
["Show connection ping"] = "Mostrar ping de conexión",

data/locales/pl.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ locale = {
410410
["MagicCircleSkillFull"] = "Krag Magiczny",
411411
["AcrobaticSkill"] = "Akrobatyka",
412412
["AcrobaticSkillFull"] = "Akrobatyka",
413+
["AlchemySkill"] = "Alchemia",
414+
["AlchemySkillFull"] = "Alchemia",
413415
["Show all items"] = "Pokaz wszystkie przedmioty",
414416
["Show an extra right panel"] = "Pokaz dodatkowy prawy panel",
415417
["Show connection ping"] = "Wyswietl ping",

data/locales/pt.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ locale = {
399399
["HuntingSkill"] = "Hunting",
400400
["MagicCircleSkill"] = "Magic cirlce",
401401
["AcrobaticSkill"] = "Acrobatic",
402+
["AlchemySkill"] = "Alchemy",
402403
["Show all items"] = "Exibir todos os itens",
403404
["Show an extra right panel"] = "Mostrar uma barra lateral direita extra",
404405
["Show connection ping"] = "Mostrar latência de conexão",

data/locales/sv.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ locale = {
406406
["HuntingSkill"] = "Hunting",
407407
["MagicCircleSkill"] = "Magic cirlce",
408408
["AcrobaticSkill"] = "Acrobatic",
409+
["AlchemySkill"] = "Alchemy",
409410
["Show all items"] = "Visa alla saker",
410411
["Show an extra right panel"] = "Visa en extra höger panel",
411412
["Show connection ping"] = false,

modules/game_skills/skills.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ function init()
4545
onHuntingSkillChange = onHuntingSkillChange,
4646
onMagicCircleSkillChange = onMagicCircleSkillChange,
4747
onAcrobaticSkillChange = onAcrobaticSkillChange,
48+
onAlchemySkillChange = onAlchemySkillChange ,
4849
onMagicLevelBonusChange = onMagicLevelBonusChange,
4950
onOneHandedBonusSkillChange = onOneHandedBonusSkillChange,
5051
onTwoHandedBonusSkillChange = onTwoHandedBonusSkillChange,
@@ -113,6 +114,7 @@ function terminate()
113114
onHuntingSkillChange = onHuntingSkillChange,
114115
onMagicCircleSkillChange = onMagicCircleSkillChange,
115116
onAcrobaticSkillChange = onAcrobaticSkillChange,
117+
onAlchemySkillChange = onAlchemySkillChange ,
116118
onMagicLevelBonusChange = onMagicLevelBonusChange,
117119
onOneHandedBonusSkillChange = onOneHandedBonusSkillChange,
118120
onTwoHandedBonusSkillChange = onTwoHandedBonusSkillChange,
@@ -331,6 +333,7 @@ function refresh()
331333
onHuntingSkillChange(player, player:getHuntingSkill())
332334
onMagicCircleSkillChange(player, player:getMagicCircleSkill())
333335
onAcrobaticSkillChange(player, player:getAcrobaticSkill())
336+
onAlchemySkillChange(player, player:getAlchemySkill())
334337
onMagicLevelBonusChange(player, player:getMagicLevelBonusSkill())
335338
onOneHandedBonusSkillChange(player, player:getOneHandedBonusSkill())
336339
onTwoHandedBonusSkillChange(player, player:getTwoHandedBonusSkill())
@@ -652,6 +655,15 @@ function onAcrobaticSkillChange(localPlayer, acrobaticSkill)
652655
end
653656
end
654657

658+
function onAlchemySkillChange(localPlayer, alchemySkill)
659+
local skillWidget = skillsWindow:recursiveGetChildById('alchemySkill')
660+
if skillWidget then
661+
local widget = skillWidget:getChildById('value')
662+
widget:setText(alchemySkill .. "/3")
663+
skillWidget:setTooltip(tr("AlchemySkillFull"))
664+
end
665+
end
666+
655667
function onHealthChange(localPlayer, health, maxHealth)
656668
setSkillValue('health', health)
657669
checkAlert('health', health, maxHealth, 30)

modules/game_skills/skills.otui

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,13 @@ MiniWindow
373373
!text: tr('AcrobaticSkill')
374374
SkillValueLabel
375375

376+
SkillButton
377+
id: alchemySkill
378+
height: 15
379+
SkillNameLabel
380+
!text: tr('AlchemySkill')
381+
SkillValueLabel
382+
376383
HorizontalSeparator
377384
margin-top: 5
378385
margin-bottom: 5

src/client/localplayer.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,17 @@ void LocalPlayer::setAcrobaticSkill(uint8_t acrobaticSkill)
545545
callLuaField("onAcrobaticSkillChange", acrobaticSkill, oldAcrobaticSkill);
546546
}
547547

548+
void LocalPlayer::setAlchemySkill(uint8_t alchemySkill)
549+
{
550+
if (m_alchemySkill == alchemySkill)
551+
return;
552+
553+
const uint8_t oldAlchemySkill = m_alchemySkill;
554+
m_alchemySkill = alchemySkill;
555+
556+
callLuaField("onAlchemySkillChange", alchemySkill, oldAlchemySkill);
557+
}
558+
548559
void LocalPlayer::setLevel(const uint16_t level, const uint8_t levelPercent)
549560
{
550561
if (m_level == level && m_levelPercent == levelPercent)

src/client/localplayer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class LocalPlayer final : public Player
8383
void setHuntingSkill(uint8_t huntingSkill);
8484
void setMagicCircleSkill(uint8_t magicCircleSkill);
8585
void setAcrobaticSkill(uint8_t acrobaticSkill);
86+
void setAlchemySkill(uint8_t alchemySkill);
8687

8788
uint16_t getLearningPoints() { return m_learningPoints; };
8889

@@ -101,6 +102,7 @@ class LocalPlayer final : public Player
101102
uint8_t getHuntingSkill() { return m_huntingSkill; };
102103
uint8_t getMagicCircleSkill() { return m_magicCircleSkill; };
103104
uint8_t getAcrobaticSkill() { return m_acrobaticSkill; };
105+
uint8_t getAlchemySkill() { return m_alchemySkill; };
104106

105107
uint32_t getFreeCapacity() { return m_freeCapacity; }
106108
uint32_t getTotalCapacity() { return m_totalCapacity; }
@@ -252,6 +254,7 @@ class LocalPlayer final : public Player
252254
uint8_t m_huntingSkill{ 0 };
253255
uint8_t m_magicCircleSkill{ 0 };
254256
uint8_t m_acrobaticSkill{ 0 };
257+
uint8_t m_alchemySkill{ 0 };
255258

256259
friend class Game;
257260
};

src/client/luafunctions.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,7 @@ void Client::registerLuaFunctions()
860860
g_lua.bindClassMemberFunction<LocalPlayer>("setHuntingSkill", &LocalPlayer::setHuntingSkill);
861861
g_lua.bindClassMemberFunction<LocalPlayer>("setMagicCircleSkill", &LocalPlayer::setMagicCircleSkill);
862862
g_lua.bindClassMemberFunction<LocalPlayer>("setAcrobaticSkill", &LocalPlayer::setAcrobaticSkill);
863+
g_lua.bindClassMemberFunction<LocalPlayer>("setAlchemySkill", &LocalPlayer::setAlchemySkill);
863864

864865
g_lua.bindClassMemberFunction<LocalPlayer>("setLevel", &LocalPlayer::setLevel);
865866
g_lua.bindClassMemberFunction<LocalPlayer>("setMana", &LocalPlayer::setMana);
@@ -898,6 +899,7 @@ void Client::registerLuaFunctions()
898899
g_lua.bindClassMemberFunction<LocalPlayer>("getHuntingSkill", &LocalPlayer::getHuntingSkill);
899900
g_lua.bindClassMemberFunction<LocalPlayer>("getMagicCircleSkill", &LocalPlayer::getMagicCircleSkill);
900901
g_lua.bindClassMemberFunction<LocalPlayer>("getAcrobaticSkill", &LocalPlayer::getAcrobaticSkill);
902+
g_lua.bindClassMemberFunction<LocalPlayer>("getAlchemySkill", &LocalPlayer::getAlchemySkill);
901903

902904
g_lua.bindClassMemberFunction<LocalPlayer>("getLevel", &LocalPlayer::getLevel);
903905
g_lua.bindClassMemberFunction<LocalPlayer>("getLevelPercent", &LocalPlayer::getLevelPercent);

0 commit comments

Comments
 (0)