Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.

Commit 1e63855

Browse files
zach2goodzach2good
committed
Merge branch 'release' into feature/trust
# Conflicts: # scripts/globals/msg.lua # src/map/map.cpp # src/map/packets/message_basic.h
2 parents b0281f2 + c2aa517 commit 1e63855

File tree

243 files changed

+7477
-590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+7477
-590
lines changed

‎scripts/globals/abilities/arcane_crest.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Arcane Crest
3+
-- Description: Lowers accuracy, evasion, magic accuracy, magic evasion and TP gain for arcana.
4+
-- Obtained: DRK Level 87
5+
-- Recast Time: 00:05:00
6+
-- Duration: 00:03:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
target:addStatusEffect(tpz.effect.ARCANE_CREST, 8, 1, 30)
18+
end

‎scripts/globals/abilities/astral_conduit.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Astral Conduit
3+
-- Description: Reduces Blood Pact recast times.
4+
-- Obtained: SMN Level 96
5+
-- Recast Time: 01:00:00
6+
-- Duration: 00:00:30
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.ASTRAL_CONDUIT, 15, 1, 30)
18+
end

‎scripts/globals/abilities/asylum.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Asylum
3+
-- Description: Grants party members a powerful resistance to enfeebling magic and Dispel effects.
4+
-- Obtained: WHM Level 96
5+
-- Recast Time: 01:00:00
6+
-- Duration: 0:00:30
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.ASYLUM, 3, 0, 30)
18+
end

‎scripts/globals/abilities/blood_rage.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Blood Rage
3+
-- Description: Enhances critical hit rate for party members within area of effect.
4+
-- Obtained: WAR Level 87
5+
-- Recast Time: 00:05:00
6+
-- Duration: 0:00:30
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.BLOOD_RAGE, 1, 0, 30)
18+
end

‎scripts/globals/abilities/bounty_shot.lua

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----------------------------------
2+
-- Ability: Bounty Shot
3+
-- Description: Increases the rate at which the target yields treasure.
4+
-- Obtained: RNG Level 87
5+
-- Recast Time: 00:01:00
6+
-----------------------------------
7+
require("scripts/globals/settings")
8+
require("scripts/globals/status")
9+
-----------------------------------
10+
11+
function onAbilityCheck(player, target, ability)
12+
return 0, 0
13+
end
14+
15+
function onUseAbility(player, target, ability)
16+
target:addStatusEffect(tpz.effect.BOUNTY_SHOT, 11, 1, 30)
17+
end

‎scripts/globals/abilities/brazen_rush.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Brazen Rush
3+
-- Description: Increases double attack rate
4+
-- Obtained: WAR Level 96
5+
-- Recast Time: 1:00:00
6+
-- Duration: 0:00:30
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.BRAZEN_STRENGTH, 1, 368, 30)
18+
end

‎scripts/globals/abilities/caper_emissarius.lua

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
-----------------------------------
2+
-- Ability: Caper Emissarius
3+
-- Description: Transfers enmity to a party member of your choice.
4+
-- Obtained: SCH Level 96
5+
-- Recast Time: 01:00:00
6+
-- Duration: 00:00:30
7+
-- target:transferEnmity(player, 99, 20.6)
8+
-----------------------------------
9+
require("scripts/globals/settings")
10+
require("scripts/globals/status")
11+
require("scripts/globals/msg")
12+
-----------------------------------
13+
14+
function onAbilityCheck(player, target, ability)
15+
if (target == nil or target:getID() == player:getID() or not target:isPC()) then
16+
return tpz.msg.basic.CANNOT_ON_THAT_TARG, 0
17+
else
18+
return 0, 0
19+
end
20+
end
21+
22+
function onUseAbility(player, target, ability)
23+
party:transferEnmity(player, 99, 20.6)
24+
end

‎scripts/globals/abilities/cascade.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Cascade
3+
-- Description: Grants a damage bonus to the next elemental magic spell cast based on TP consumed.
4+
-- Obtained: BLM Level 85
5+
-- Recast Time: 00:01:00
6+
-- Duration: 0:01:00 or the next spell cast
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.CASCADE, 4, 0, 60)
18+
end

‎scripts/globals/abilities/clarion_call.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Clarion Call
3+
-- Description: Increases the number of songs that can affect party members by one.
4+
-- Obtained: BRD Level 96
5+
-- Recast Time: 01:00:00
6+
-- Duration: 0:03:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.CLARION_CALL, 10, 0, 180)
18+
end

‎scripts/globals/abilities/climactic_flourish.lua

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
-----------------------------------
2+
-- Ability: Climactic Flourish
3+
-- Description: Allows you to deal critical hits. Requires at least one finishing move.
4+
-- Obtained: DNC Level 80
5+
-- Recast Time: 00:01:30 (Flourishes III)
6+
-- Duration: 00:01:00
7+
-- Cost: 1-5 Finishing Move charges
8+
-----------------------------------
9+
require("scripts/globals/settings")
10+
require("scripts/globals/status")
11+
require("scripts/globals/msg")
12+
-----------------------------------
13+
function onAbilityCheck(player, target, ability)
14+
if player:hasStatusEffect(tpz.effect.FINISHING_MOVE_1) then
15+
return 0, 0
16+
elseif player:hasStatusEffect(tpz.effect.FINISHING_MOVE_2) then
17+
return 0, 0
18+
elseif player:hasStatusEffect(tpz.effect.FINISHING_MOVE_3) then
19+
return 0, 0
20+
elseif player:hasStatusEffect(tpz.effect.FINISHING_MOVE_4) then
21+
return 0, 0
22+
elseif player:hasStatusEffect(tpz.effect.FINISHING_MOVE_5) then
23+
return 0, 0
24+
else
25+
return tpz.msg.basic.NO_FINISHINGMOVES, 0
26+
end
27+
end
28+
29+
function onUseAbility(player, target, ability)
30+
for move = tpz.effect.FINISHING_MOVE_1, tpz.effect.FINISHING_MOVE_5 do
31+
player:delStatusEffect(move)
32+
player:addStatusEffect(tpz.effect.CLIMACTIC_FLOURISH, 3, 0, 60, 0, player:getMerit(tpz.merit.CLIMACTIC_FLOURISH_EFFECT))
33+
end
34+
end

‎scripts/globals/abilities/contradance.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Contradance
3+
-- Description: Increases the amount of HP restored by your next Waltz.
4+
-- Obtained: DNC Level 50
5+
-- Recast Time: 00:05:00
6+
-- Duration: 00:01:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.CONTRADANCE, 19, 1, 60)
18+
end

‎scripts/globals/abilities/cooldown.lua

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----------------------------------
2+
-- Ability: Cooldown
3+
-- Description: Reduces the strain on your automaton.
4+
-- Obtained: PUP Level 95
5+
-- Recast Time: 00:05:00
6+
-----------------------------------
7+
require("scripts/globals/settings")
8+
require("scripts/globals/status")
9+
-----------------------------------
10+
11+
function onAbilityCheck(player, target, ability)
12+
return 0, 0
13+
end
14+
15+
function onUseAbility(player, target, ability)
16+
player:addStatusEffect(tpz.effect.COOLDOWN, 18, 1, 1)
17+
end

‎scripts/globals/abilities/crooked_cards.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Crooked Cards
3+
-- Description: Increases the effects of the next phantom roll.
4+
-- Obtained: COR Level 95
5+
-- Recast Time: 0:10:00
6+
-- Duration: 0:01:00(or the next roll used)
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
target:addStatusEffect(tpz.effect.CROOKED_CARDS, 17, 0, 60)
18+
end

‎scripts/globals/abilities/cutting_cards.lua

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
-----------------------------------
2+
-- Ability: Cutting Cards
3+
-- Description: Reduces the recast times of other party members' special abilities. The degree to which they are reduced is determined by the number rolled.
4+
-- Obtained: COR Level 96
5+
-- Recast Time: 01:00:00
6+
-----------------------------------
7+
require("scripts/globals/settings")
8+
require("scripts/globals/status")
9+
-----------------------------------
10+
11+
function onUseAbility(caster, target, ability, action)
12+
if (caster:getID() == target:getID()) then
13+
local roll = math.random(1, 6)
14+
caster:setLocalVar("corsairRollTotal", roll)
15+
action:speceffect(caster:getID(), roll)
16+
end
17+
local total = caster:getLocalVar("corsairRollTotal")
18+
return applyRoll(caster, target, ability, action, total)
19+
end
20+
21+
function applyRoll(caster, target, ability, action, total)
22+
caster:doCuttingCards(target, total)
23+
ability:setMsg(435 + math.floor((total - 1) / 2) * 2)
24+
action:animation(target:getID(), 132 + (total) - 1)
25+
return total
26+
end

‎scripts/globals/abilities/decoy_shot.lua

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-----------------------------------
2+
-- Ability: Decoy Shot
3+
-- Description: Diverts enmity when launching a ranged attack from behind a party member.
4+
-- Obtained: RNG Level 95
5+
-- Recast Time: 00:05:00
6+
-- Duration: 00:03:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
require("scripts/globals/msg")
11+
-----------------------------------
12+
13+
function onAbilityCheck(player, target, ability)
14+
return 0, 0
15+
end
16+
17+
function onUseAbility(player, target, ability)
18+
target:addStatusEffect(tpz.effect.DECOY_SHOT, 11, 1, 30)
19+
end

‎scripts/globals/abilities/divine_caress.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Divine Caress
3+
-- Description: If the next spell you cast cures a status ailment, your target will gain enhanced resistance to that ailment.
4+
-- Obtained: WHM Level 83
5+
-- Recast Time: 00:01:00
6+
-- Duration: 0:01:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.DIVINE_CARESS, 3, 0, 60)
18+
end

‎scripts/globals/abilities/divine_emblem.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Divine Emblem
3+
-- Description: Enhances the accuracy of your next divine magic spell and increases enmity.
4+
-- Obtained: PLD Level 78
5+
-- Recast Time: 00:03:00
6+
-- Duration: 00:01:00 or the next spell cast
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.DIVINE_EMBLEM, 7, 0, 60)
18+
end

‎scripts/globals/abilities/dragon_breaker.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Dragon Breaker
3+
-- Description: Lowers accuracy, evasion, magic accuracy, magic evasion and TP gain for dragons.
4+
-- Obtained: DRG Level 87
5+
-- Recast Time: 00:05:00
6+
-- Duration: 00:03:00
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.DRAGON_BREAKER, 14, 0, 180)
18+
end

‎scripts/globals/abilities/efflux.lua

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-----------------------------------
2+
-- Ability: Efflux
3+
-- Description: If the next spell you cast is a "physical" Blue magic spell, a TP bonus will be granted.
4+
-- Obtained: BLU Level 83
5+
-- Recast Time: 00:03:00
6+
-- Duration: 00:01:00 or first blue magic cast
7+
-----------------------------------
8+
require("scripts/globals/settings")
9+
require("scripts/globals/status")
10+
-----------------------------------
11+
12+
function onAbilityCheck(player, target, ability)
13+
return 0, 0
14+
end
15+
16+
function onUseAbility(player, target, ability)
17+
player:addStatusEffect(tpz.effect.EFFLUX, 16, 1, 60)
18+
end

0 commit comments

Comments
 (0)