Commit 1822c2cc authored by Ivaria's avatar Ivaria Committed by Ivaria
Browse files

Merge branch 'auto_snow_ball' into 'tbcc'

Support auto snow ball in smart cast

See merge request !58
parent d81c2755
......@@ -261,6 +261,8 @@ VUHDO_DEFAULT_SPELL_CONFIG = {
["IS_LOAD_HOTS"] = false,
["smartCastModi"] = "all",
["autoBattleRez"] = true,
["custom1Unit"] = "@player",
["custom2Unit"] = "@player",
}
......
......@@ -64,22 +64,24 @@ end
--
local tInstant, tModi2;
local tInstant, tModi2, tCustomUnit;
local function VUHDO_getInstantFireText(aSlotNum)
tInstant = VUHDO_SPELL_CONFIG["FIRE_CUSTOM_" .. aSlotNum .. "_SPELL"];
if VUHDO_SPELL_CONFIG["IS_FIRE_CUSTOM_" .. aSlotNum] and not VUHDO_strempty(tInstant) then
tCustomUnit = VUHDO_SPELL_CONFIG["custom" .. aSlotNum .. "Unit"] or ""
if VUHDO_SPELL_CONFIG["IS_FIRE_OUT_FIGHT"] then
if (VUHDO_SPELLS[tInstant] or sEmpty)["noselftarget"] then
tModi2 = " ";
else
tModi2 = " [@player] ";
tModi2 = " " .. "[" .. tCustomUnit .. ",exists]" .. " ";
end
else
if (VUHDO_SPELLS[tInstant] or sEmpty)["noselftarget"] then
tModi2 = " [combat] ";
else
tModi2 = " [combat,@player] ";
tModi2 = " " .. "[combat," .. tCustomUnit .. ",exists]" .. " ";
end
end
......
......@@ -637,6 +637,7 @@ VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1149,3 +1150,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -636,6 +636,7 @@ VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1149,3 +1150,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -644,6 +644,7 @@ VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1164,3 +1165,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -646,6 +646,7 @@ VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1165,3 +1166,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -640,6 +640,7 @@ VUHDO_I18N_TT.K578 = "아이콘 광택의 색상을 선택하십시오.";
VUHDO_I18N_TT.K579 = " 광택의 색상을 선택하십시오.";
VUHDO_I18N_TT.K580 = "디버프 아이콘을 제외목록에 표시하려면 마우스 오른쪽 버튼으로 사용할 수정 키를 선택하십시오."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "기본 프로필";
VUHDO_I18N_DEFAULT_LAYOUT = "기본 배치";
......@@ -1155,3 +1156,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -742,6 +742,8 @@ VUHDO_I18N_TT.K578 = "Выбрать цвет подсветки иконки.";
VUHDO_I18N_TT.K579 = "Выбрать цвет подсветки фрейма.";
VUHDO_I18N_TT.K580 = "Выберите модификатор для использования с ПКМ для добавления дебафов в чёрный список."
VUHDO_I18N_TT.K581 = "Отметьте, чтобы показывать ники на фреймах.";
VUHDO_I18N_TT.K582 = "Check to show incoming heal using LibHealComm-4.0.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Стандартный профиль";
VUHDO_I18N_DEFAULT_LAYOUT = "Стандартная раскладка клавиш ";
VUHDO_I18N_APPLY_TO_ALL = "Применить\nко всем";
......@@ -1327,3 +1329,19 @@ VUHDO_I18N_OVERSHIELD_BAR = "Избыточный щит";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Показывать\nАбсорб хила";
VUHDO_I18N_HEAL_ABSORB_BAR = "Абсорб хила";
<<<<<<< HEAD
=======
VUHDO_I18N_LIBHEALCOMM = "Use Lib\nHealComm";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
>>>>>>> 52a0e0c (Merge branch 'auto_snow_ball' into 'tbcc')
......@@ -638,6 +638,7 @@ VUHDO_I18N_TT.K578 = "选择图标闪光的颜色.";
VUHDO_I18N_TT.K579 = "选择技能条闪光的颜色.";
VUHDO_I18N_TT.K580 = "选择一个修改键,使用鼠标右键将debuff图标列入黑名单."
VUHDO_I18N_TT.K581 = "选中可在栏上显示玩家昵称.";
VUHDO_I18N_TT.K583 = "选择施放的目标";
VUHDO_I18N_DEFAULT_PROFILE = "预设存档";
VUHDO_I18N_DEFAULT_LAYOUT = "预设按键配置";
......@@ -1149,5 +1150,22 @@ VUHDO_I18N_DEBUFF_SHOW_ONLY_FOR_FRIENDLY_TOOLTIP = "仅为友方单位显示减
VUHDO_I18N_SHOW_OVERSHIELD = "显示\n溢余护盾";
VUHDO_I18N_OVERSHIELD_BAR = "溢余护盾";
<<<<<<< HEAD
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
=======
VUHDO_I18N_LIBHEALCOMM = "使用 Lib\nHealComm";
VUHDO_I18N_SHOW_HEAL_ABSORB = "显示\n治疗吸收";
VUHDO_I18N_HEAL_ABSORB_BAR = "治疗吸收条";
VUHDO_I18N_PLAYER = "自己";
VUHDO_I18N_FOCUS = "焦点";
VUHDO_I18N_MOUSEOVER_TARGET = "鼠标指向单位的目标";
VUHDO_I18N_MOUSEOVER = "鼠标指向单位";
VUHDO_I18N_TARGETS_HARM = "敌对目标";
VUHDO_I18N_FOCUS_HARM = "敌对焦点";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "鼠标指向单位的敌对目标";
VUHDO_I18N_MOUSEOVER_HARM = "鼠标指向敌对单位";
>>>>>>> 52a0e0c (Merge branch 'auto_snow_ball' into 'tbcc')
......@@ -638,6 +638,7 @@ VUHDO_I18N_TT.K578 = "Select a color for the icon glow.";
VUHDO_I18N_TT.K579 = "Select a color for the bar glow.";
VUHDO_I18N_TT.K580 = "Select a modifier key to use with the right mouse button to blacklist debuff icons."
VUHDO_I18N_TT.K581 = "Check to show player nickname on bars.";
VUHDO_I18N_TT.K583 = "Select the unit";
VUHDO_I18N_DEFAULT_PROFILE = "Default Profile";
VUHDO_I18N_DEFAULT_LAYOUT = "Default Layout";
......@@ -1151,3 +1152,12 @@ VUHDO_I18N_OVERSHIELD_BAR = "Overshield Bar";
VUHDO_I18N_SHOW_HEAL_ABSORB = "Show\nHeal Absorb";
VUHDO_I18N_HEAL_ABSORB_BAR = "Heal Absorb Bar";
VUHDO_I18N_PLAYER = "Player unit";
VUHDO_I18N_FOCUS = "Focus unit";
VUHDO_I18N_MOUSEOVER_TARGET = "Mouseover's target Unit";
VUHDO_I18N_MOUSEOVER = "Mouseover unit";
VUHDO_I18N_TARGETS_HARM = "Target enemy unit";
VUHDO_I18N_FOCUS_HARM = "Focus enemy unit";
VUHDO_I18N_MOUSEOVER_TARGET_HARM = "Mouseover's target enemy unit";
VUHDO_I18N_MOUSEOVER_HARM = "Mouseover enemy unit";
......@@ -16,7 +16,7 @@
<EditBox name="$parentCustom2EditBox" inherits="VuhDoEditBoxTemplate">
<Size>
<AbsDimension x="221" y="32" />
<AbsDimension x="121" y="32" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
......@@ -41,7 +41,7 @@
<EditBox name="$parentCustom1EditBox" inherits="VuhDoEditBoxTemplate">
<Size>
<AbsDimension x="221" y="32" />
<AbsDimension x="121" y="32" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
......@@ -158,6 +158,68 @@
</Layers>
</Frame>
<Button name="$parentCustom1UnitComboBox" inherits="VuhDoComboBoxTemplate">
<Size>
<AbsDimension x="100" y="32" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="253" y="-69" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_setComboModel(self, "VUHDO_SPELL_CONFIG.custom1Unit",
{
{ "@player", VUHDO_I18N_PLAYER },
{ "@target", VUHDO_I18N_TARGETS },
{ "@focus", VUHDO_I18N_FOCUS },
{ "@vdtarget", VUHDO_I18N_MOUSEOVER_TARGET },
{ "@vuhdo", VUHDO_I18N_MOUSEOVER },
{ "@target,harm", VUHDO_I18N_TARGETS_HARM },
{ "@focus,harm", VUHDO_I18N_FOCUS_HARM },
{ "@vdtarget,harm", VUHDO_I18N_MOUSEOVER_TARGET_HARM },
{ "@vuhdo,harm", VUHDO_I18N_MOUSEOVER_HARM },
}
);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K583);
</OnLoad>
</Scripts>
</Button>
<Button name="$parentCustom2UnitComboBox" inherits="VuhDoComboBoxTemplate">
<Size>
<AbsDimension x="100" y="32" />
</Size>
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
<AbsDimension x="253" y="-107" />
</Offset>
</Anchor>
</Anchors>
<Scripts>
<OnLoad>
VUHDO_setComboModel(self, "VUHDO_SPELL_CONFIG.custom2Unit",
{
{ "@player", VUHDO_I18N_PLAYER },
{ "@target", VUHDO_I18N_TARGETS },
{ "@focus", VUHDO_I18N_FOCUS },
{ "@vdtarget", VUHDO_I18N_MOUSEOVER_TARGET },
{ "@vuhdo", VUHDO_I18N_MOUSEOVER },
{ "@target,harm", VUHDO_I18N_TARGETS_HARM },
{ "@focus,harm", VUHDO_I18N_FOCUS_HARM },
{ "@vdtarget,harm", VUHDO_I18N_MOUSEOVER_TARGET_HARM },
{ "@vuhdo,harm", VUHDO_I18N_MOUSEOVER_HARM },
}
);
VUHDO_lnfSetTooltip(self, VUHDO_I18N_TT.K583);
</OnLoad>
</Scripts>
</Button>
</Frames>
</Frame>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment