Skip to content

Commit e4ef0f4

Browse files
committed
4.11 -> 4.2
Update diff
1 parent 01b5e5a commit e4ef0f4

File tree

579 files changed

+90883
-64028
lines changed

Some content is hidden

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

579 files changed

+90883
-64028
lines changed

csv/Achievement.csv

+970-924
Large diffs are not rendered by default.

csv/AchievementCategory.csv

+37-37
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ int32,str,AchievementKind,bit&01,bit&02
66
2,"Dungeons",1,True,False
77
3,"Trials",1,True,False
88
4,"Raids",1,True,False
9-
5,"The Wolves' Den",1,True,False
10-
6,"Frontline",1,True,False
11-
7,"Rival Wings",1,True,False
12-
8,"Ranked PvP",1,True,True
13-
9,"The Hunt",1,True,False
14-
10,"Treasure Hunt",1,True,False
15-
11,"Class",2,True,False
16-
12,"Disciples of War",2,True,False
17-
13,"Disciples of Magic",2,True,False
18-
14,"Disciples of the Hand",2,True,False
19-
15,"Disciples of the Land",2,True,False
20-
16,"PvP",2,True,False
21-
17,"Commendation",2,True,False
22-
18,"Gold Saucer",2,True,False
9+
5,"The Hunt",1,True,False
10+
6,"Treasure Hunt",1,True,False
11+
7,"General",2,True,False
12+
8,"Ranking",2,True,True
13+
9,"The Wolves' Den",2,True,False
14+
10,"Frontline",2,True,False
15+
11,"Rival Wings",2,True,False
16+
12,"Class",3,True,False
17+
13,"Disciples of War",3,True,False
18+
14,"Disciples of Magic",3,True,False
19+
15,"Disciples of the Hand",3,True,False
20+
16,"Disciples of the Land",3,True,False
21+
17,"Commendation",3,True,False
22+
18,"Gold Saucer",3,True,False
2323
19,"Items",4,True,False
2424
20,"Currency",4,True,False
2525
21,"Desynthesis",4,True,False
@@ -40,29 +40,29 @@ int32,str,AchievementKind,bit&01,bit&02
4040
36,"Levequests",8,True,False
4141
37,"Beast Tribe Quests",8,True,False
4242
38,"Seasonal Events",8,True,True
43-
39,"La Noscea",11,True,False
44-
40,"The Black Shroud",11,True,False
45-
41,"Thanalan",11,True,False
46-
42,"Coerthas",11,True,False
47-
43,"Mor Dhona",11,True,False
48-
44,"Abalathia's Spine",11,True,False
49-
45,"Dravania",11,True,False
50-
46,"Gyr Abania",11,True,False
51-
47,"Othard",11,True,False
52-
48,"Grand Company",12,True,False
53-
49,"Maelstrom",12,True,False
54-
50,"Order of the Twin Adder",12,True,False
55-
51,"Immortal Flames",12,True,False
56-
52,"Battle",13,True,False
57-
53,"Currency",13,True,False
58-
54,"Gathering",13,True,False
59-
55,"Quests",13,True,False
60-
56,"Seasonal Events",13,True,False
61-
57,"Dungeons",13,True,False
62-
58,"Exploration",13,True,False
63-
59,"Grand Company",13,True,False
64-
60,"",0,False,False
65-
61,"",0,False,False
43+
39,"Sightseeing Log",11,True,False
44+
40,"La Noscea",11,True,False
45+
41,"The Black Shroud",11,True,False
46+
42,"Thanalan",11,True,False
47+
43,"Coerthas",11,True,False
48+
44,"Mor Dhona",11,True,False
49+
45,"Abalathia's Spine",11,True,False
50+
46,"Dravania",11,True,False
51+
47,"Gyr Abania",11,True,False
52+
48,"Othard",11,True,False
53+
49,"Duty",11,True,False
54+
50,"Grand Company",12,True,False
55+
51,"Maelstrom",12,True,False
56+
52,"Order of the Twin Adder",12,True,False
57+
53,"Immortal Flames",12,True,False
58+
54,"Battle",13,True,False
59+
55,"Currency",13,True,False
60+
56,"Gathering",13,True,False
61+
57,"Quests",13,True,False
62+
58,"Seasonal Events",13,True,False
63+
59,"Dungeons",13,True,False
64+
60,"Exploration",13,True,False
65+
61,"Grand Company",13,True,False
6666
62,"",0,False,False
6767
63,"",0,False,False
6868
64,"",0,False,False

csv/AchievementKind.csv

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
int32,str
44
0,""
55
1,"Battle"
6-
2,"Character"
7-
3,""
6+
2,"PvP"
7+
3,"Character"
88
4,"Items"
99
5,"Crafting"
1010
6,"Gathering"

csv/Action.csv

+11,104-9,899
Large diffs are not rendered by default.

csv/ActionCastTimeline.csv

+1
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ int32,uint16,uint16
6868
64,211,0
6969
65,6129,0
7070
66,6136,0
71+
67,6393,0

csv/ActionCastVFX.csv

+7
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,10 @@ int32,uint16
5757
53,535
5858
54,547
5959
55,550
60+
56,562
61+
57,567
62+
58,568
63+
59,569
64+
60,570
65+
61,571
66+
62,581

csv/ActionComboRouteTransient.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ int32,str
2020
16,"Executes the following weaponskills in succession:1. <Color(-34022)>Heavy Shot</Color>2. <Color(-34022)>Straight Shot</Color>If any of the weaponskills are not ready, the combo will start again."
2121
17,"Executes the following weaponskills in succession:1. <Color(-34022)>Caustic Bite</Color>2. <Color(-34022)>Stormbite</Color>If any of the weaponskills are not ready, the combo will start again."
2222
18,"Executes the following weaponskills in succession:1. <Color(-34022)>Split Shot</Color> (<Color(-34022)>Heated Split Shot</Color>)2. <Color(-34022)>Slug Shot</Color> (<Color(-34022)>Heated Slug Shot</Color>)3. <Color(-34022)>Clean Shot</Color> (<Color(-34022)>Heated Clean Shot</Color>)Executing with <Color(-154)>Gauss Barrel</Color> attached or with <Color(-34022)>Heat Gauge</Color> at 50 or more will trigger the <Color(-34022)>Heated</Color> versions of the weaponskills. If any of the weaponskills are not ready, the combo will start again."
23-
19,"Executes the following weaponskills in succession:1. <Color(-34022)>Enhanced Riposte</Color>2. <Color(-34022)>Enchanted Zwerchhau</Color>3. <Color(-34022)>Enchanted Redoublement</Color>Both <Color(-154)>Black Mana</Color> and <Color(-154)>White Mana</Color> must be 75 or higher. If any of the weaponskills are not ready, the combo will start again."
23+
19,"Executes the following weaponskills in succession:1. <Color(-34022)>Enchanted Riposte</Color>2. <Color(-34022)>Enchanted Zwerchhau</Color>3. <Color(-34022)>Enchanted Redoublement</Color>Both <Color(-154)>Black Mana</Color> and <Color(-154)>White Mana</Color> must be 75 or higher. If any of the weaponskills are not ready, the combo will start again."

csv/ActionIndirection.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ int32,Action,sbyte
4444
40,8324,-1
4545
41,3549,21
4646
42,3550,21
47-
43,7389,21
47+
43,0,-1

csv/ActionParam.csv

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ int32,int16,int16
88
4,10,5
99
5,-5,-5
1010
6,160,150
11-
7,20,25
11+
7,20,20
1212
8,10,-32768
1313
9,10,-32768
1414
10,100,100
@@ -61,7 +61,7 @@ int32,int16,int16
6161
57,-50,-32768
6262
58,0,-32768
6363
59,20,-32768
64-
60,30,-32768
65-
61,50,-32768
64+
60,30,0
65+
61,50,100
6666
62,0,-32768
6767
63,0,-32768

0 commit comments

Comments
 (0)