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

Commit b89b5e0

Browse files
zach2goodzach2good
committed
Merge branch 'feature/enm' into canary
# Conflicts: # sql/mob_spell_lists.sql
2 parents 30ae0d4 + c31d30c commit b89b5e0

File tree

6 files changed

+231
-89
lines changed

6 files changed

+231
-89
lines changed

‎scripts/globals/status.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1548,6 +1548,7 @@ tpz.mod =
15481548
SAVETP = 880, -- SAVETP Effect for Miser's Roll / ATMA / Hagakure.
15491549
SMITE = 898, -- Att increase with H2H or 2H weapons
15501550
TACTICAL_GUARD = 899, -- Tp gain increase when guarding
1551+
GUARD_PERCENT = 976, -- Guard Percent
15511552
FENCER_TP_BONUS = 903, -- TP Bonus to weapon skills from Fencer Trait
15521553
FENCER_CRITHITRATE = 904, -- Increased Crit chance from Fencer Trait
15531554
SHIELD_DEF_BONUS = 905, -- Shield Defense Bonus
@@ -1573,9 +1574,9 @@ tpz.mod =
15731574

15741575
-- The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring.
15751576
-- 570 - 825 used by WS DMG mods these are not spares.
1576-
-- SPARE = 976, -- stuff
15771577
-- SPARE = 977, -- stuff
15781578
-- SPARE = 978, -- stuff
1579+
-- SPARE = 979, -- stuff
15791580
}
15801581

15811582
tpz.latent =

‎sql/item_latents.sql‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,18 +3002,45 @@ INSERT INTO `item_latents` VALUES(18958, 8, 1, 16, 6); -- STR +1~4, party s
30023002
INSERT INTO `item_latents` VALUES(18991, 165, 5, 13, 56); -- Crit Rate +5% if Berserk Active
30033003
INSERT INTO `item_latents` VALUES(18991, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
30043004

3005+
-- -------------------------------------------------------
3006+
-- Glanzfaust 75
3007+
-- -------------------------------------------------------
3008+
INSERT INTO `item_latents` VALUES(18992, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3009+
INSERT INTO `item_latents` VALUES(18992, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3010+
INSERT INTO `item_latents` VALUES(18992, 25, 5, 13, 59); -- ACC +5 if Focus Active
3011+
INSERT INTO `item_latents` VALUES(18992, 68, 5, 13, 60); -- EVA +5 if Dodge Active
3012+
INSERT INTO `item_latents` VALUES(18992, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3013+
30053014
-- -------------------------------------------------------
30063015
-- Conqueror 80
30073016
-- -------------------------------------------------------
30083017
INSERT INTO `item_latents` VALUES(19060, 165, 7, 13, 56); -- Crit Rate +7% if Berserk Active
30093018
INSERT INTO `item_latents` VALUES(19060, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
30103019

3020+
-- -------------------------------------------------------
3021+
-- Glanzfaust 80
3022+
-- -------------------------------------------------------
3023+
INSERT INTO `item_latents` VALUES(19061, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3024+
INSERT INTO `item_latents` VALUES(19061, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3025+
INSERT INTO `item_latents` VALUES(19061, 25, 10, 13, 59); -- ACC +10 if Focus Active
3026+
INSERT INTO `item_latents` VALUES(19061, 68, 10, 13, 60); -- EVA +10 if Dodge Active
3027+
INSERT INTO `item_latents` VALUES(19061, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3028+
30113029
-- -------------------------------------------------------
30123030
-- Conqueror 85
30133031
-- -------------------------------------------------------
30143032
INSERT INTO `item_latents` VALUES(19080, 165, 9, 13, 56); -- Crit Rate +9% if Berserk Active
30153033
INSERT INTO `item_latents` VALUES(19080, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
30163034

3035+
-- -------------------------------------------------------
3036+
-- Glanzfaust 85
3037+
-- -------------------------------------------------------
3038+
INSERT INTO `item_latents` VALUES(19081, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3039+
INSERT INTO `item_latents` VALUES(19081, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3040+
INSERT INTO `item_latents` VALUES(19081, 25, 20, 13, 59); -- ACC +20 if Focus Active
3041+
INSERT INTO `item_latents` VALUES(19081, 68, 20, 13, 60); -- EVA +20 if Dodge Active
3042+
INSERT INTO `item_latents` VALUES(19081, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3043+
30173044
-- -------------------------------------------------------
30183045
-- Zareehkl Jambiya
30193046
-- -------------------------------------------------------
@@ -3100,24 +3127,60 @@ INSERT INTO `item_latents` VALUES(19306, 23, 2, 16, 6); -- ATT +2~8, party s
31003127
INSERT INTO `item_latents` VALUES(19612, 165, 11, 13, 56); -- Crit Rate +11% if Berserk Active
31013128
INSERT INTO `item_latents` VALUES(19612, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31023129

3130+
-- -------------------------------------------------------
3131+
-- Glanzfaust 90
3132+
-- -------------------------------------------------------
3133+
INSERT INTO `item_latents` VALUES(19613, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3134+
INSERT INTO `item_latents` VALUES(19613, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3135+
INSERT INTO `item_latents` VALUES(19613, 25, 25, 13, 59); -- ACC +25 if Focus Active
3136+
INSERT INTO `item_latents` VALUES(19613, 68, 25, 13, 60); -- EVA +25 if Dodge Active
3137+
INSERT INTO `item_latents` VALUES(19613, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3138+
31033139
-- -------------------------------------------------------
31043140
-- Conqueror 95
31053141
-- -------------------------------------------------------
31063142
INSERT INTO `item_latents` VALUES(19710, 165, 11, 13, 56); -- Crit Rate +11% if Berserk Active
31073143
INSERT INTO `item_latents` VALUES(19710, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31083144

3145+
-- -------------------------------------------------------
3146+
-- Glanzfaust 95
3147+
-- -------------------------------------------------------
3148+
INSERT INTO `item_latents` VALUES(19711, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3149+
INSERT INTO `item_latents` VALUES(19711, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3150+
INSERT INTO `item_latents` VALUES(19711, 25, 25, 13, 59); -- ACC +25 if Focus Active
3151+
INSERT INTO `item_latents` VALUES(19711, 68, 25, 13, 60); -- EVA +25 if Dodge Active
3152+
INSERT INTO `item_latents` VALUES(19711, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3153+
31093154
-- -------------------------------------------------------
31103155
-- Conqueror 99
31113156
-- -------------------------------------------------------
31123157
INSERT INTO `item_latents` VALUES(19819, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active
31133158
INSERT INTO `item_latents` VALUES(19819, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31143159

3160+
-- -------------------------------------------------------
3161+
-- Glanzfaust 99
3162+
-- -------------------------------------------------------
3163+
INSERT INTO `item_latents` VALUES(19820, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3164+
INSERT INTO `item_latents` VALUES(19820, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3165+
INSERT INTO `item_latents` VALUES(19820, 25, 30, 13, 59); -- ACC +30 if Focus Active
3166+
INSERT INTO `item_latents` VALUES(19820, 68, 30, 13, 60); -- EVA +30 if Dodge Active
3167+
INSERT INTO `item_latents` VALUES(19820, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3168+
31153169
-- -------------------------------------------------------
31163170
-- Conqueror 99 AG
31173171
-- -------------------------------------------------------
31183172
INSERT INTO `item_latents` VALUES(19948, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active
31193173
INSERT INTO `item_latents` VALUES(19948, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31203174

3175+
-- -------------------------------------------------------
3176+
-- Glanzfaust 99 AG
3177+
-- -------------------------------------------------------
3178+
INSERT INTO `item_latents` VALUES(19949, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3179+
INSERT INTO `item_latents` VALUES(19949, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3180+
INSERT INTO `item_latents` VALUES(19949, 25, 30, 13, 59); -- ACC +30 if Focus Active
3181+
INSERT INTO `item_latents` VALUES(19949, 68, 30, 13, 60); -- EVA +30 if Dodge Active
3182+
INSERT INTO `item_latents` VALUES(19949, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3183+
31213184
-- -------------------------------------------------------
31223185
-- Eminent Baghnakhs
31233186
-- -------------------------------------------------------
@@ -3139,12 +3202,30 @@ INSERT INTO `item_latents` VALUES(20726,366,6,6,1000); -- Dmg+6 TP>1000
31393202
INSERT INTO `item_latents` VALUES(20837, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active
31403203
INSERT INTO `item_latents` VALUES(20837, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31413204

3205+
-- -------------------------------------------------------
3206+
-- Glanzfaust 119
3207+
-- -------------------------------------------------------
3208+
INSERT INTO `item_latents` VALUES(20482, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3209+
INSERT INTO `item_latents` VALUES(20482, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3210+
INSERT INTO `item_latents` VALUES(20482, 25, 30, 13, 59); -- ACC +30 if Focus Active
3211+
INSERT INTO `item_latents` VALUES(20482, 68, 30, 13, 60); -- EVA +30 if Dodge Active
3212+
INSERT INTO `item_latents` VALUES(20482, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3213+
31423214
-- -------------------------------------------------------
31433215
-- Conqueror 119 AG
31443216
-- -------------------------------------------------------
31453217
INSERT INTO `item_latents` VALUES(20838, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active
31463218
INSERT INTO `item_latents` VALUES(20838, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
31473219

3220+
-- -------------------------------------------------------
3221+
-- Glanzfaust 119 AG
3222+
-- -------------------------------------------------------
3223+
INSERT INTO `item_latents` VALUES(20483, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3224+
INSERT INTO `item_latents` VALUES(20483, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3225+
INSERT INTO `item_latents` VALUES(20483, 25, 30, 13, 59); -- ACC +30 if Focus Active
3226+
INSERT INTO `item_latents` VALUES(20483, 68, 30, 13, 60); -- EVA +30 if Dodge Active
3227+
INSERT INTO `item_latents` VALUES(20483, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3228+
31483229
-- INSERT INTO `item_latents` VALUES(21521, 25, 10, ??, 0); -- Melee fists: Dynamis (D): Accuracy+10
31493230
-- INSERT INTO `item_latents` VALUES(21521, 30, 10, ??, 0); -- Melee fists: Dynamis (D): Magic Accuracy+10
31503231
-- INSERT INTO `item_latents` VALUES(21522, 25, 10, ??, 0); -- Hesychast's fists: Dynamis (D): Accuracy+10
@@ -3210,6 +3291,15 @@ INSERT INTO `item_latents` VALUES(21661, 840, 1, 56, 0); -- Rune Algol: Laten
32103291
INSERT INTO `item_latents` VALUES(21757, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active
32113292
INSERT INTO `item_latents` VALUES(21757, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active
32123293

3294+
-- -------------------------------------------------------
3295+
-- Glanzfaust 119 AG v3
3296+
-- -------------------------------------------------------
3297+
INSERT INTO `item_latents` VALUES(20510, 62, 5, 13, 59); -- Attack +5% if Focus is Active
3298+
INSERT INTO `item_latents` VALUES(20510, 165, 3, 13, 59); -- Crit rate +3% if Focus Active
3299+
INSERT INTO `item_latents` VALUES(20510, 25, 30, 13, 59); -- ACC +30 if Focus Active
3300+
INSERT INTO `item_latents` VALUES(20510, 68, 30, 13, 60); -- EVA +30 if Dodge Active
3301+
INSERT INTO `item_latents` VALUES(20510, 976, 5, 13, 60); -- Guard +5% if Dodge Active
3302+
32133303
-- INSERT INTO `item_latents` VALUES(21772, 25, 10, ??, 0); -- Warrior's Chopper: (D): Accuracy+10
32143304
-- INSERT INTO `item_latents` VALUES(21772, 30, 10, ??, 0); -- Warrior's Chopper: (D): Magic Accuracy+10
32153305
-- INSERT INTO `item_latents` VALUES(21773, 25, 10, ??, 0); -- Agoge Chopper: (D): Accuracy+10

0 commit comments

Comments
 (0)