diff --git a/html/Characters/A.html b/html/Characters/A.html index 69fb375..5249692 100644 --- a/html/Characters/A.html +++ b/html/Characters/A.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '86b7674c9c6fde0953412bf829815058c7c6e92e'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@ - + - - + +
- + - +
- + - - + + - - - @@ -763,45 +1035,32 @@ - -
-

Character Profile

- -
+

Character Profile

-
+ + +
-
- - - -
- -
- - - - -
- -
+
-

Attributes

Attributes

Strength17
Dexterity25
Vitality20
Intelligence14
Mind19

Offensive Properties

Critical Hit Rate62
Determination25
Direct Hit Rate62

Defensive Properties

Defense31
Magic Defense64

Physical Properties

Attack Power25
Skill Speed62

Mental Properties

Attack Magic Potency14
Healing Magic Potency19
Spell Speed62

Role

Tenacity62
Piety16

LEVEL 4

  • HP

    87
  • MP

    53
  • TP

    1000

DoW/DoM

Tank

  • -
    Gladiator
    - / -
  • -
    Marauder
    - / -
  • -
    Dark Knight
    - / -

Melee DPS

  • -
    Pugilist
    - / -
  • -
    Lancer
    - / -
  • 4
    Rogue
    1037 / 1700
  • -
    Samurai
    - / -

Healer

  • -
    Conjurer
    - / -
  • -
    Scholar
    - / -
  • -
    Astrologian
    - / -

Physical Ranged DPS

  • -
    Archer
    - / -
  • -
    Machinist
    - / -

Magical Ranged DPS

  • -
    Thaumaturge
    - / -
  • 10
    Arcanist
    5733 / 11800
  • -
    Red Mage
    - / -

DoH/DoL

Disciples of the Hand

  • -
    Carpenter
    - / -
  • -
    Blacksmith
    - / -
  • -
    Armorer
    - / -
  • -
    Goldsmith
    - / -
  • -
    Leatherworker
    - / -
  • -
    Weaver
    - / -
  • -
    Alchemist
    - / -
  • -
    Culinarian
    - / -

Disciples of the Land

  • -
    Miner
    - / -
  • -
    Botanist
    - / -
  • -
    Fisher
    - / -

Mounts

Minions

+

Attributes

Attributes

Strength17
Dexterity25
Vitality20
Intelligence14
Mind19

Offensive Properties

Critical Hit Rate62
Determination25
Direct Hit Rate62

Defensive Properties

Defense31
Magic Defense64

Physical Properties

Attack Power25
Skill Speed62

Mental Properties

Attack Magic Potency14
Healing Magic Potency19
Spell Speed62

Role

Tenacity62
Piety16

LEVEL 4

  • HP

    87
  • MP

    53
  • TP

    1000

DoW/DoM

Tank

  • -
    Gladiator
    - / -
  • -
    Marauder
    - / -
  • -
    Dark Knight
    - / -

Melee DPS

  • -
    Pugilist
    - / -
  • -
    Lancer
    - / -
  • 4
    Rogue
    1,037 / 1,700
  • -
    Samurai
    - / -

Healer

  • -
    Conjurer
    - / -
  • -
    Scholar
    - / -
  • -
    Astrologian
    - / -

Physical Ranged DPS

  • -
    Archer
    - / -
  • -
    Machinist
    - / -

Magical Ranged DPS

  • -
    Thaumaturge
    - / -
  • 10
    Arcanist
    5,733 / 11,800
  • -
    Red Mage
    - / -
  • -
    Blue Mage
    - / -

DoH/DoL

Disciples of the Hand

  • -
    Carpenter
    - / -
  • -
    Blacksmith
    - / -
  • -
    Armorer
    - / -
  • -
    Goldsmith
    - / -
  • -
    Leatherworker
    - / -
  • -
    Weaver
    - / -
  • -
    Alchemist
    - / -
  • -
    Culinarian
    - / -

Disciples of the Land

  • -
    Miner
    - / -
  • -
    Botanist
    - / -
  • -
    Fisher
    - / -

Mounts

Minions

- - - - + + + +
- ForumsMog StationOfficial Blog + ForumsMog StationOfficial Blog
@@ -821,21 +1080,17 @@ - - - -
- - - -
- - - -
- - - + + + +
+ + + +
+ + +
@@ -854,32 +1109,32 @@ - - - -
- - - + + +
- - - + + + +
+ + +
- - - + + +
- - - + + +
- - - - - - + + + + + +
@@ -900,48 +1155,48 @@ * Notifications for free company formations are shared for all languages.

- - + +
-
Sort by
Data Center / World
Primary language
Displaying
+
Sort by
Data Center / Home World
Primary language
Displaying
- +
@@ -1024,58 +1279,58 @@

Grand Company Standings

@@ -1083,74 +1338,79 @@

Free Company Standings

@@ -1158,103 +1418,81 @@

Frontline Standings

- - - - + + + +
- + - + - +
@@ -1341,7 +1579,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1351,12 +1589,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1366,7 +1604,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1398,4 +1636,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Characters/Duvivi.html b/html/Characters/Duvivi.html index e9b59cb..0c99cae 100644 --- a/html/Characters/Duvivi.html +++ b/html/Characters/Duvivi.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '86b7674c9c6fde0953412bf829815058c7c6e92e'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - @@ -877,14 +1155,14 @@
@@ -892,9 +1170,9 @@
@@ -903,45 +1181,32 @@ - -
-

Character Profile

- -
+

Character Profile

-
+ + +
-
- - - -
- -
- - - - -
- -
+
-

Attributes

Attributes

Strength146
Dexterity284
Vitality1216
Intelligence1716
Mind294

Offensive Properties

Critical Hit Rate878
Determination664
Direct Hit Rate809

Defensive Properties

Defense1077
Magic Defense1882

Physical Properties

Attack Power146
Skill Speed361

Mental Properties

Attack Magic Potency1716
Healing Magic Potency294
Spell Speed836

Role

Tenacity361
Piety268

LEVEL 67

  • HP

    23562
  • MP

    12672
  • TP

    1000

DoW/DoM

Tank

  • 70
    Paladin
    -- / --
  • 70
    Warrior
    -- / --
  • 70
    Dark Knight
    -- / --

Melee DPS

  • 60
    Monk
    18040 / 4470000
  • 70
    Dragoon
    -- / --
  • 70
    Ninja
    -- / --
  • 70
    Samurai
    -- / --

Healer

  • 70
    White Mage
    -- / --
  • 70
    Scholar
    -- / --
  • 70
    Astrologian
    -- / --

Physical Ranged DPS

  • 70
    Bard
    -- / --
  • 60
    Machinist
    174445 / 4470000

Magical Ranged DPS

  • 70
    Black Mage
    -- / --
  • 70
    Summoner
    -- / --
  • 67
    Red Mage
    3255278 / 8575000

DoH/DoL

Disciples of the Hand

  • 34
    Carpenter
    157003 / 217900
  • 36
    Blacksmith
    203221 / 249900
  • 28
    Armorer
    41954 / 140200
  • 34
    Goldsmith
    29799 / 217900
  • 26
    Leatherworker
    5682 / 109800
  • 39
    Weaver
    75282 / 304900
  • 20
    Alchemist
    44869 / 56600
  • 13
    Culinarian
    17114 / 23700

Disciples of the Land

  • 60
    Miner
    133774 / 4470000
  • 24
    Botanist
    70001 / 87100
  • 11
    Fisher
    700 / 15600

Mounts

Minions

+

Attributes

Attributes

Strength261
Dexterity295
Vitality2142
Intelligence356
Mind2862

Offensive Properties

Critical Hit Rate1291
Determination1947
Direct Hit Rate444

Defensive Properties

Defense2170
Magic Defense3794

Physical Properties

Attack Power261
Skill Speed364

Mental Properties

Attack Magic Potency2862
Healing Magic Potency2862
Spell Speed871

Role

Tenacity364
Piety978

LEVEL 70

  • HP

    43555
  • MP

    16537
  • TP

    1000

DoW/DoM

Tank

  • 70
    Paladin
    -- / --
  • 70
    Warrior
    -- / --
  • 70
    Dark Knight
    -- / --

Melee DPS

  • 60
    Monk
    80,815 / 4,470,000
  • 70
    Dragoon
    -- / --
  • 70
    Ninja
    -- / --
  • 70
    Samurai
    -- / --

Healer

  • 70
    White Mage
    -- / --
  • 70
    Scholar
    -- / --
  • 70
    Astrologian
    -- / --

Physical Ranged DPS

  • 70
    Bard
    -- / --
  • 63
    Machinist
    4,129,912 / 5,809,000

Magical Ranged DPS

  • 70
    Black Mage
    -- / --
  • 70
    Summoner
    -- / --
  • 70
    Red Mage
    -- / --
  • 50
    Blue Mage
    -- / --

DoH/DoL

Disciples of the Hand

  • 70
    Carpenter
    -- / --
  • 70
    Blacksmith
    -- / --
  • 70
    Armorer
    -- / --
  • 70
    Goldsmith
    -- / --
  • 70
    Leatherworker
    -- / --
  • 70
    Weaver
    -- / --
  • 70
    Alchemist
    -- / --
  • 70
    Culinarian
    -- / --

Disciples of the Land

  • 70
    Miner
    -- / --
  • 70
    Botanist
    -- / --
  • 12
    Fisher
    197 / 19,600

The Forbidden Land, Eureka

6
Elemental Level
20,967 / 36,128

Mounts

Minions

- - - - + + + +
- ForumsMog StationOfficial Blog + ForumsMog StationOfficial Blog
@@ -961,21 +1226,17 @@ - - - -
- - - -
- - - -
- - - + + + +
+ + + +
+ + +
@@ -994,32 +1255,32 @@ - - - -
- - - + + +
- - - + + + +
+ + +
- - - + + +
- - - + + +
- - - - - - + + + + + +
@@ -1040,48 +1301,48 @@ * Notifications for free company formations are shared for all languages.

- - + +
-
Sort by
Data Center / World
Primary language
Displaying
+
Sort by
Data Center / Home World
Primary language
Displaying
- +
@@ -1164,58 +1425,58 @@

Grand Company Standings

@@ -1223,74 +1484,79 @@

Free Company Standings

@@ -1298,103 +1564,81 @@

Frontline Standings

- - - - + + + +
- + - + - +
@@ -1481,7 +1725,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1491,12 +1735,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1506,7 +1750,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1538,4 +1782,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Characters/Sakae.html b/html/Characters/Sakae.html index 2b45e5e..ce22263 100644 --- a/html/Characters/Sakae.html +++ b/html/Characters/Sakae.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '86b7674c9c6fde0953412bf829815058c7c6e92e'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - @@ -847,45 +1107,32 @@ - -
-

Character Profile

- -
+

Character Profile

+ + +
-
- - -
- -
- - - - -
- -
+
-

Attributes

Attributes

Strength159
Dexterity309
Vitality2134
Intelligence308
Mind2870

Offensive Properties

Critical Hit Rate1002
Determination980
Direct Hit Rate364

Defensive Properties

Defense2177
Magic Defense3805

Physical Properties

Attack Power159
Skill Speed364

Mental Properties

Attack Magic Potency2870
Healing Magic Potency2870
Spell Speed1339

Role

Tenacity364
Piety2299

LEVEL 70

  • HP

    43383
  • MP

    21761
  • TP

    1000

DoW/DoM

Tank

  • 50
    Paladin
    0 / 864000
  • 50
    Warrior
    0 / 864000
  • 30
    Dark Knight
    2504 / 162500

Melee DPS

  • 50
    Monk
    0 / 864000
  • 50
    Dragoon
    0 / 864000
  • 68
    Ninja
    3223217 / 9593000
  • -
    Samurai
    - / -

Healer

  • 70
    White Mage
    -- / --
  • 70
    Scholar
    -- / --
  • 70
    Astrologian
    -- / --

Physical Ranged DPS

  • 70
    Bard
    -- / --
  • 30
    Machinist
    0 / 162500

Magical Ranged DPS

  • 60
    Black Mage
    0 / 4470000
  • 70
    Summoner
    -- / --
  • -
    Red Mage
    - / -

DoH/DoL

Disciples of the Hand

  • 70
    Carpenter
    -- / --
  • 70
    Blacksmith
    -- / --
  • 70
    Armorer
    -- / --
  • 70
    Goldsmith
    -- / --
  • 70
    Leatherworker
    -- / --
  • 70
    Weaver
    -- / --
  • 70
    Alchemist
    -- / --
  • 70
    Culinarian
    -- / --

Disciples of the Land

  • 70
    Miner
    -- / --
  • 70
    Botanist
    -- / --
  • 70
    Fisher
    -- / --

Mounts

Minions

+

Attributes

Attributes

Strength159
Dexterity309
Vitality2450
Intelligence308
Mind3238

Offensive Properties

Critical Hit Rate1574
Determination1312
Direct Hit Rate364

Defensive Properties

Defense2319
Magic Defense4058

Physical Properties

Attack Power159
Skill Speed364

Mental Properties

Attack Magic Potency3238
Healing Magic Potency3238
Spell Speed1360

Role

Tenacity364
Piety1845

LEVEL 70

  • HP

    50177
  • MP

    20204
  • TP

    1000

DoW/DoM

Tank

  • 50
    Paladin
    0 / 864,000
  • 50
    Warrior
    0 / 864,000
  • 30
    Dark Knight
    2,504 / 162,500

Melee DPS

  • 50
    Monk
    0 / 864,000
  • 50
    Dragoon
    0 / 864,000
  • 68
    Ninja
    3,223,217 / 9,593,000
  • -
    Samurai
    - / -

Healer

  • 70
    White Mage
    -- / --
  • 70
    Scholar
    -- / --
  • 70
    Astrologian
    -- / --

Physical Ranged DPS

  • 70
    Bard
    -- / --
  • 30
    Machinist
    0 / 162,500

Magical Ranged DPS

  • 60
    Black Mage
    0 / 4,470,000
  • 70
    Summoner
    -- / --
  • 50
    Red Mage
    61,690 / 864,000
  • -
    Blue Mage
    - / -

DoH/DoL

Disciples of the Hand

  • 70
    Carpenter
    -- / --
  • 70
    Blacksmith
    -- / --
  • 70
    Armorer
    -- / --
  • 70
    Goldsmith
    -- / --
  • 70
    Leatherworker
    -- / --
  • 70
    Weaver
    -- / --
  • 70
    Alchemist
    -- / --
  • 70
    Culinarian
    -- / --

Disciples of the Land

  • 70
    Miner
    -- / --
  • 70
    Botanist
    -- / --
  • 70
    Fisher
    -- / --

The Forbidden Land, Eureka

20
Elemental Level
0 / 315,452

Mounts

Minions

- - - - + + + +
- ForumsMog StationOfficial Blog + ForumsMog StationOfficial Blog
@@ -905,21 +1152,17 @@ - - - -
- - - -
- - - -
- - - + + + +
+ + + +
+ + +
@@ -938,32 +1181,32 @@ - - - -
- - - + + +
- - - + + + +
+ + +
- - - + + +
- - - + + +
- - - - - - + + + + + +
@@ -984,48 +1227,48 @@ * Notifications for free company formations are shared for all languages.

- - + +
-
Sort by
Data Center / World
Primary language
Displaying
+
Sort by
Data Center / Home World
Primary language
Displaying
- +
@@ -1108,58 +1351,58 @@

Grand Company Standings

@@ -1167,74 +1410,79 @@

Free Company Standings

@@ -1242,103 +1490,81 @@

Frontline Standings

- - - - + + + +
- + - + - +
@@ -1425,7 +1651,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1435,12 +1661,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1450,7 +1676,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1482,4 +1708,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/FCs/Cobra.html b/html/FCs/Cobra.html index 1229176..574d2e2 100644 --- a/html/FCs/Cobra.html +++ b/html/FCs/Cobra.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '86b7674c9c6fde0953412bf829815058c7c6e92e'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - - + + - - - - +
@@ -1194,7 +1435,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1204,12 +1445,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1250,4 +1491,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Linkshells/lala world.html b/html/Linkshells/lala world.html index f5a7689..a7ec09c 100644 --- a/html/Linkshells/lala world.html +++ b/html/Linkshells/lala world.html @@ -27,24 +27,24 @@ - + - + - + - @@ -63,6 +63,10 @@ + + + + @@ -97,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -115,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '117d324f9a1f15c419da512fadbfd85108a1e225'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1538464626', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -130,7 +135,9 @@ - + + + @@ -143,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -159,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - -
- - - - + + + +
- ForumsMog StationOfficial Blog + ForumsMog StationOfficial Blog
@@ -684,25 +941,17 @@ - - - -
- - - -
- - - -
- - - -
- - - + + + +
+ + + +
+ + +
@@ -721,32 +970,32 @@ - - - + + +
- - - + + +
- - - + + +
- - - + + +
- - - + + +
- - - - - - + + + + + +
@@ -767,48 +1016,48 @@ * Notifications for free company formations are shared for all languages.

- - + +
-
Sort by
Data Center / World
Primary language
Displaying
+
Sort by
Data Center / Home World
Primary language
Displaying
- +
@@ -891,58 +1140,58 @@

Grand Company Standings

@@ -950,74 +1199,79 @@

Free Company Standings

@@ -1025,103 +1279,81 @@

Frontline Standings

- - - - + + + +
- + - + - +
@@ -1208,7 +1440,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1218,12 +1450,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1264,4 +1496,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Searches/Character.html b/html/Searches/Character.html index 7675377..d59067b 100644 --- a/html/Searches/Character.html +++ b/html/Searches/Character.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '86b7674c9c6fde0953412bf829815058c7c6e92e'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - +
@@ -1524,7 +1771,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1534,12 +1781,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1580,4 +1827,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Searches/FreeCompany.html b/html/Searches/FreeCompany.html index e52489d..3628fa7 100644 --- a/html/Searches/FreeCompany.html +++ b/html/Searches/FreeCompany.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '56f8fd4f850624223639357447961c72f4e42d4f'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - +
@@ -1418,7 +1663,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1428,12 +1673,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1474,4 +1719,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Searches/Invalid page.html b/html/Searches/Invalid page.html index 92077ad..8b97f72 100644 --- a/html/Searches/Invalid page.html +++ b/html/Searches/Invalid page.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '3079cb500fa266a94823fba674f0a235d4772d40'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - +
@@ -1233,7 +1478,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1243,12 +1488,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1289,4 +1534,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Searches/Linkshell.html b/html/Searches/Linkshell.html index aa97489..2f1b309 100644 --- a/html/Searches/Linkshell.html +++ b/html/Searches/Linkshell.html @@ -27,24 +27,24 @@ - + - + - + - @@ -63,6 +63,10 @@ + + + + @@ -97,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -115,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '117d324f9a1f15c419da512fadbfd85108a1e225'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1538464626', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -130,7 +135,9 @@ - + + + @@ -143,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -159,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - +
@@ -1431,7 +1665,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1441,12 +1675,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1487,4 +1721,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/html/Searches/No results.html b/html/Searches/No results.html index 83a7787..117bb7f 100644 --- a/html/Searches/No results.html +++ b/html/Searches/No results.html @@ -27,24 +27,24 @@ - - - + + + - - + + - @@ -58,6 +58,14 @@ + + + + + + + + @@ -93,6 +101,7 @@ 'dateHHMM_now': 'Today %H:%M', 'dateYMDHMS': '%m/%d/%Y %\u002dI:%M:%S %p', 'dateYMDHM': '%m/%d/%Y %\u002dI:%M %p', + 'dateYMDHM_jp': '%Y/%m/%d %H:%M', 'dateHM': '%\u002dI:%M %p', 'dateYMDH': '%m/%d/%Y %\u002dI', 'dateYMD': '%m/%d/%Y', @@ -111,12 +120,12 @@ var api_uri = '/lodestone/api/'; var static_uri = 'https://img.finalfantasyxiv.com/lds/'; var subdomain = 'na'; - var csrf_token = '3079cb500fa266a94823fba674f0a235d4772d40'; + var csrf_token = '5b91fae437e35c6a181e1ec06b689e17db58ee87'; var cis_origin = 'https://secure.square\u002denix.com'; var ldst_max_image_size = 31457280; var eorzeadb = { cdn_prefix: 'https://img.finalfantasyxiv.com/lds/', - version: '1533633068', + version: '1555999870', version_js_uri: 'https://img.finalfantasyxiv.com/lds/pc/global/js/eorzeadb/version.js', dynamic_tooltip: false }; @@ -126,7 +135,9 @@ - + + + @@ -139,9 +150,9 @@ var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; - + js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.3&appId=1400886233468625"; - + fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); @@ -155,7 +166,7 @@
- + - - + +
- + - +
- +
- - + + - - - - + - +
@@ -1233,7 +1478,7 @@ ga('anotherTracker.send', 'pageview'); - + @@ -1243,12 +1488,12 @@ ga('anotherTracker.send', 'pageview'); - + - + @@ -1289,4 +1534,4 @@ ga('anotherTracker.send', 'pageview'); - \ No newline at end of file + diff --git a/src/logic/character.rs b/src/logic/character.rs index ef00b18..d3f43b2 100644 --- a/src/logic/character.rs +++ b/src/logic/character.rs @@ -96,8 +96,11 @@ pub fn parse(id: u64, html: &str) -> Result { } fn parse_world(html: &Html) -> Result { - let world_str = plain_parse(&html, &*PROFILE_WORLD)?; - World::from_str(&world_str) + let parts_str = plain_parse(html, &*PROFILE_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str) .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) } diff --git a/src/logic/free_company.rs b/src/logic/free_company.rs index 3b06cb2..768208e 100644 --- a/src/logic/free_company.rs +++ b/src/logic/free_company.rs @@ -77,10 +77,12 @@ pub fn parse(id: u64, html: &str) -> Result { } fn parse_world(html: &Html) -> Result { - let world_str = plain_parse(html, &*FC_WORLD)?; - let trimmed = world_str.trim(); - World::from_str(trimmed) - .map_err(|_| Error::invalid_content("a world", Some(trimmed))) + let parts_str = plain_parse(html, &*FC_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str.trim()) + .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) } fn parse_active_members(html: &Html) -> Result { diff --git a/src/logic/linkshell.rs b/src/logic/linkshell.rs index c1f5f51..3ab999b 100644 --- a/src/logic/linkshell.rs +++ b/src/logic/linkshell.rs @@ -40,10 +40,12 @@ pub fn parse(id: u64, html_str: &str) -> Result { } fn parse_world(html: &Html) -> Result { - let world_str = plain_parse(html, &*LS_WORLD)?; - let trimmed = world_str.trim(); - World::from_str(trimmed) - .map_err(|_| Error::invalid_content("a world", Some(trimmed))) + let parts_str = plain_parse(html, &*LS_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str) + .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) } fn parse_active_members(html: &Html) -> Result { @@ -124,11 +126,11 @@ mod test { assert_eq!(20547673299957974, ls.id); assert_eq!("lala world", ls.name); assert_eq!(World::Adamantoise, ls.world); - assert_eq!(110, ls.active_members); + assert_eq!(104, ls.active_members); assert_eq!(50, ls.members.results.len()); assert_eq!(1, ls.members.pagination.current_page); assert_eq!(3, ls.members.pagination.total_pages); - assert_eq!(110, ls.members.pagination.total_results); + assert_eq!(104, ls.members.pagination.total_results); } #[test] @@ -146,7 +148,7 @@ mod test { ); assert_eq!(Some(9233645873504743773), prinny.free_company_id); assert_eq!( - "https://img2.finalfantasyxiv.com/f/8089bddc032754e155ff2f75925c8c26_1f5fd239b885860b7c2bfc72ad1d97effc0_96x96.jpg?1539579307", + "https://img2.finalfantasyxiv.com/f/8089bddc032754e155ff2f75925c8c26_1f5fd239b885860b7c2bfc72ad1d97effc0_96x96.jpg?1556144778", prinny.face.as_str(), ); assert_eq!(Some(Role::Master), prinny.role); diff --git a/src/logic/search/character.rs b/src/logic/search/character.rs index 11a287c..7be1252 100644 --- a/src/logic/search/character.rs +++ b/src/logic/search/character.rs @@ -81,8 +81,11 @@ fn parse_id(html: ElementRef) -> Result { } fn parse_world(html: ElementRef) -> Result { - let world_str = plain_parse(html, &*ITEM_WORLD)?; - World::from_str(&world_str) + let parts_str = plain_parse(html, &*ITEM_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str) .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) } diff --git a/src/logic/search/free_company.rs b/src/logic/search/free_company.rs index 5dc1959..733e8b5 100644 --- a/src/logic/search/free_company.rs +++ b/src/logic/search/free_company.rs @@ -97,8 +97,11 @@ fn parse_grand_company(html: ElementRef) -> Result { } fn parse_world(html: ElementRef) -> Result { - let world_str = plain_parse(html, &*ITEM_WORLD)?; - World::from_str(&world_str) + let parts_str = plain_parse(html, &*ITEM_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str) .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) } diff --git a/src/logic/search/linkshell.rs b/src/logic/search/linkshell.rs index 117244e..afcc81c 100644 --- a/src/logic/search/linkshell.rs +++ b/src/logic/search/linkshell.rs @@ -68,8 +68,11 @@ fn parse_id(html: ElementRef) -> Result { } fn parse_world(html: ElementRef) -> Result { - let world_str = plain_parse(html, &*ITEM_WORLD)?; - World::from_str(&world_str) + let parts_str = plain_parse(html, &*ITEM_WORLD)?; + let mut parts = parts_str.split("\u{00a0}("); + let world_str = parts.next() + .ok_or_else(|| Error::invalid_content("world with data centre in parens", Some(&parts_str)))?; + World::from_str(world_str) .map_err(|_| Error::invalid_content("valid world", Some(&world_str))) }