Merge pull request #394 from SynthSy/master

reflect changes with #392
Arks-Layer · Sep 14, 2018 · 333b65d · 333b65d
2 parents 603592d + e066c5a
commit 333b65d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/csv/NpcBaseParameter.csv b/csv/NpcBaseParameter.csv
@@ -6,7 +6,7 @@ key5004,5004,TRUE,,np5004a_Juno,0,,,,,,,,,,,,,,force,human,2,149,,213,,Juna,5304
 key5005,5005,TRUE,,np5005a_Fieldea,0,,,,np5005b_Fieldea,99999999,,,,,,,,,hunter,human,2,140,,212,,Fildia,530005,FD_fieldea,ico06020500,ico06020501,ico06010500,408060,408730,408080,408150,408270,408540,408610,408670,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,277500,,,,185,30004
 key5006,5006,TRUE,,np5006a_Reven,0,,,,np5006b_Reven,99999999,,,,,,,,,force,newman,1,141,,201,,Raven,530006,FD_reven,ico06020600,ico06020601,ico06010600,408040,408940,408750,408170,408360,408450,408710,,305301,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,369100,,,,188,30005
 key5007,5007,TRUE,,np5007a_YoungReven,0,,,,,,,,,,,,,,force,newman,1,141,,,,Young Raven,530000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,0,,,,160,
-key5008,5008,TRUE,,np5008a_Magnas,0,,,,,,,,,,,,,,hunter,human,1,148,,203,,Magnas,530000,FD_magnas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,322400,,,,185,30014
+key5008,5008,TRUE,,np5008a_Magnas,0,,,,,,,,,,,,,,hunter,human,1,148,,203,,Magnus,530000,FD_magnas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,322400,,,,185,30014
 key5009,5009,TRUE,,np5009a_Callisto,0,,,,,,,,,,,,,,force,newman,1,146,,204,,Callisto,530009,FD_callisto,ico06020700,,ico06010700,408020,408950,,408170,408310,408410,,,305301,305401,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,119800,,,,182,30006
 key5010,5010,TRUE,,np5010a_Kisara,0,,,,np5010b_Kisara,99999999,,,,,,,,,ranger,human,2,142,,214,,Kisara,530010,FD_kisara,ico06020800,ico06020801,ico06010800,408030,409030,,408740,408150,408420,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,126100,,,,178,30007
 key5011,5011,TRUE,,np5011a_Rietheia,0,,,,np5011b_Rietheia,99999999,,,,,,,,,force,human,2,143,,215,,Rietheia,530011,FD_rietheia,ico06020900,ico06020901,ico06010900,408010,409020,,408130,408330,,,,305301,305401,301401,302401,,,,,,,,,,,,,,,,,,,,,,,,,,,TRUE,360300,,,,170,30008

diff --git a/rmd/Weapons.json b/rmd/Weapons.json
@@ -2846,8 +2846,8 @@
   },
   "100256": {
     "OriginalText": "オルターの技術により新規開発された撃杭。\nブースターの力で遠距離に向けて\n杭を射出する。パワフルな大型武器。",
-    "Text": "",
-    "Enabled": false
+    "Text": "A newly developed weapon created by Alter.\nA powerful weapon that is capable of injecting\na pile over long distances using a booster.",
+    "Enabled": true
   },
   "100257": {
     "OriginalText": "オルターの技術により新規開発された撃杭。\nロケット機構を補助的に制御する機器を\n組み込み、理想的な推進速度を実現。",