Skip to content

closed #654

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

Closed
terminologic wants to merge 1 commit into from
Closed

closed #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion data/scripts/actions/items/potions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ end
local potions = {
[236] = { health = { 250, 350 }, vocations = { VOCATION.BASE_ID.PALADIN, VOCATION.BASE_ID.KNIGHT, VOCATION.BASE_ID.MONK }, level = 50, flask = 283, description = "Only knights, monks and paladins of level 50 or above may drink this fluid." },
[237] = { mana = { 115, 185 }, level = 50, flask = 283, description = "Only players of level 50 or above may drink this fluid." },
[238] = { mana = { 150, 250 }, vocations = { VOCATION.BASE_ID.SORCERER, VOCATION.BASE_ID.DRUID, VOCATION.BASE_ID.PALADIN, VOCATION.BASE_ID.MONK }, level = 80, flask = 284, description = "Only sorcerers, druids, monks and paladins of level 80 or above may drink this fluid." },
[238] = { mana = { 150, 250 }, vocations = { VOCATION.BASE_ID.SORCERER, VOCATION.BASE_ID.DRUID, VOCATION.BASE_ID.PALADIN, VOCATION.BASE_ID.MONK, VOCATION.BASE_ID.KNIGHT }, level = 80, flask = 284, description = "Only sorcerers, druids, knights, monks and paladins of level 80 or above may drink this fluid." },
[239] = { health = { 425, 575 }, vocations = { VOCATION.BASE_ID.KNIGHT }, level = 80, flask = 284, description = "Only knights of level 80 or above may drink this fluid." },
[266] = { health = { 125, 175 }, flask = 285 },
[268] = { mana = { 75, 125 }, flask = 285 },
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/chained_penance.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ local config = {
}

local function onGetFormulaValues(player, weaponDamage)
local basePower = 70
local basePower = 78

--[[
local helmetItem = player:getSlotItem(CONST_SLOT_HEAD)
Expand All @@ -123,7 +123,7 @@ local function onGetFormulaValues(player, weaponDamage)
local skill = player:getSkillLevel(SKILL_FIRST)
local attackValue = calculateAttackValue(player, skill, weaponDamage)

local spellFactor = 2.0
local spellFactor = 2.15
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)

local minDamage = -total * 0.9
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/devastating_knockout.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 62
local basePower = 70
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 1.0
local spellFactor = 1.1
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/double_jab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 40
local basePower = 48
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.9
local spellFactor = 1.0
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/flurry_of_blows.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_FLURRYOFBLOWS)
combatEarth:setArea(createCombatArea(AREA_WAVE))

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 55
local basePower = 60
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.6
local spellFactor = 0.7
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/forceful_uppercut.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 135
local basePower = 150
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.7
local spellFactor = 0.8
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/greater_flurry_of_blows.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_FLURRYOFBLOWS)
combatEarth:setArea(createCombatArea(AREA_WAVE))

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 86
local basePower = 95
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 3
local spellFactor = 3.25
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/greater_tiger_clash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 44
local basePower = 50
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.9
local spellFactor = 1.0
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/spiritual_outburst.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ local config = {
}

local function onGetFormulaValues(player, weaponDamage)
local basePower = 42
local basePower = 45

local skill = player:getSkillLevel(SKILL_FIRST)
local attackValue = calculateAttackValue(player, skill, weaponDamage)

local spellFactor = 2.5
local spellFactor = 2.65
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)

local minDamage = -total * 0.9
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/sweeping_takedown.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ combatEarth2:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_EXPLOSIONHIT)
combatEarth2:setArea(createCombatArea(AREA_WAVE_2))

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 48
local basePower = 52
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 1.0
local spellFactor = 1.05
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/swift_jab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 12
local basePower = 14
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.7
local spellFactor = 0.8
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/spells/attack/tiger_clash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ combatEarth:setParameter(COMBAT_PARAM_TYPE, COMBAT_EARTHDAMAGE)
combatEarth:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_GREEN_TIGERCLASH)

function onGetFormulaValues(player, skill, weaponDamage, attackFactor)
local basePower = 18
local basePower = 22
local attackValue = calculateAttackValue(player, skill, weaponDamage)
local spellFactor = 0.7
local spellFactor = 0.8
local total = (basePower * attackValue) / 100 + (spellFactor * attackValue)
return -total * 0.9, -total * 1.1
end
Expand Down
15 changes: 9 additions & 6 deletions src/creatures/combat/combat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,25 @@ static void applyImproveMonkAttackSpender(const std::shared_ptr<Player> &player,
return;
}

uint8_t baseHarmonyBonusPercent = 7; // 7, 14, 28, 56, 112
// Flat base curve by harmony points: 1->8, 2->16, 3->26, 4->38, 5->52
static constexpr uint8_t baseByHarmony[] = {0, 8, 16, 26, 38, 52};

uint8_t virtueBonus = 0;
if (player->getVirtue() == VIRTUE_HARMONY) {
baseHarmonyBonusPercent += (player->isSerene() ? 6 : 3);
virtueBonus = player->isSerene() ? 6 : 3;
}

uint8_t asceticBonus = 0;
const uint8_t stage = player->wheel()->getStage(WheelStage_t::ASCETIC);
if (stage >= 3) {
baseHarmonyBonusPercent += 3;
asceticBonus = 3;
} else if (stage >= 2) {
baseHarmonyBonusPercent += 2;
asceticBonus = 2;
} else if (stage >= 1) {
baseHarmonyBonusPercent += 1;
asceticBonus = 1;
}

const int32_t totalBonusPercent = static_cast<int32_t>(baseHarmonyBonusPercent * (1 << (harmonyPoints - 1)));
const int32_t totalBonusPercent = static_cast<int32_t>(baseByHarmony[harmonyPoints] + virtueBonus + asceticBonus);

const float multiplier = 1.0f + (totalBonusPercent / 100.0f);
damage.primary.value = static_cast<int32_t>(damage.primary.value * multiplier);
Expand Down
2 changes: 1 addition & 1 deletion src/io/io_wheel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ void IOWheel::initializePaladinSpells() {

m_wheelBonusData.spells.paladin[1].name = "Strong Ethereal Spear";
m_wheelBonusData.spells.paladin[1].grade[1].decrease.cooldown = 2;
m_wheelBonusData.spells.paladin[1].grade[2].increase.damage = 380;
m_wheelBonusData.spells.paladin[1].grade[2].increase.damage = 240;

m_wheelBonusData.spells.paladin[2].name = "Divine Dazzle";
m_wheelBonusData.spells.paladin[2].grade[1].increase.aditionalTarget = 1;
Expand Down
Loading