4.11 -> 4.2

Update diff
This commit is contained in:
Josh Freeman
2018-01-30 08:59:07 +00:00
parent 01b5e5a7f3
commit e4ef0f4400
579 changed files with 90883 additions and 64028 deletions
@@ -3,13 +3,13 @@
int32,str,str
0,"TEXT_COMARMGCARMYTRAINING_00344_MENU_YES","Yes"
1,"TEXT_COMARMGCARMYTRAINING_00344_MENU_NO","No"
2,"TEXT_COMARMGCARMYTRAINING_00344_MENU_CANCEL","Cancel."
2,"TEXT_COMARMGCARMYTRAINING_00344_MENU_CANCEL","Cancel"
3,"TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_WAITING","Current training course: None
"
4,"TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_TRAINING","Current training course: <Sheet(GcArmyTraining,IntegerParameter(1),4)/>
Training status: <If(GreaterThan(IntegerParameter(2),0))>Complete<Else/><If(GreaterThan(IntegerParameter(4),0))><Value>IntegerParameter(4)</Value> <If(Equal(IntegerParameter(4),1))>hour<Else/>hours</If><If(GreaterThan(IntegerParameter(3),0))><If(GreaterThan(IntegerParameter(4),0))> and <Else/></If><Else/></If><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/></If><Else/><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/>Less than 1 minute</If></If> remaining</If> [<Time(IntegerParameter(5))/><If(Equal(PlayerParameter(77),3))><Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(222)</Value><Else/><Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(222)</Value></If> <Value>TopLevelParameter(218)</Value>:<TwoDigitValue>TopLevelParameter(217)</TwoDigitValue>]"
5,"TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_EXPEDITION","(★未使用/削除予定★)"
6,"TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_001","Training courses."
Training status: <If(GreaterThan(IntegerParameter(2),0))>Complete<Else/><If(GreaterThan(IntegerParameter(4),0))><Value>IntegerParameter(4)</Value> <If(Equal(IntegerParameter(4),1))>hour<Else/>hours</If><If(GreaterThan(IntegerParameter(3),0))><If(GreaterThan(IntegerParameter(4),0))> and <Else/></If><Else/></If><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/></If><Else/><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/>Less than 1 minute</If></If> remaining</If> [<Time(IntegerParameter(5))/><If(Equal(PlayerParameter(77),3))><Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(222)</Value><Else/><Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(222)</Value></If> <Value>TopLevelParameter(218)</Value>:<TwoDigitValue>TopLevelParameter(217)</TwoDigitValue>]"
5,"TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_EXPEDITION","(★未使用/削除予定★)"
6,"TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_001","Training Courses"
7,"TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_002","Abort Current Training Course"
8,"TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_003","View Squadron Roster"
9,"TEXT_COMARMGCARMYTRAINING_00344_TRAINING_ABORT_000","Your squadron is not currently training."
1 key 0 1
3 int32 str str
4 0 TEXT_COMARMGCARMYTRAINING_00344_MENU_YES Yes
5 1 TEXT_COMARMGCARMYTRAINING_00344_MENU_NO No
6 2 TEXT_COMARMGCARMYTRAINING_00344_MENU_CANCEL Cancel. Cancel
7 3 TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_WAITING Current training course: None
8 4 TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_TRAINING Current training course: <Sheet(GcArmyTraining,IntegerParameter(1),4)/> Training status: <If(GreaterThan(IntegerParameter(2),0))>Complete<Else/><If(GreaterThan(IntegerParameter(4),0))><Value>IntegerParameter(4)</Value> <If(Equal(IntegerParameter(4),1))>hour<Else/>hours</If><If(GreaterThan(IntegerParameter(3),0))><If(GreaterThan(IntegerParameter(4),0))> and <Else/></If><Else/></If><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/></If><Else/><If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>minute<Else/>minutes</If><Else/>Less than 1 minute</If></If> remaining</If> [<Time(IntegerParameter(5))/><If(Equal(PlayerParameter(77),3))><Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(222)</Value><Else/><Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(222)</Value></If> <Value>TopLevelParameter(218)</Value>:<TwoDigitValue>TopLevelParameter(217)</TwoDigitValue>]
9 5 TEXT_COMARMGCARMYTRAINING_00344_MENU_TITLE_EXPEDITION (★未使用/削除予定★)
10 6 TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_001 Training courses. Training Courses
11 7 TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_002 Abort current training course. Abort Current Training Course
12 8 TEXT_COMARMGCARMYTRAINING_00344_MENU_SELECT_003 View squadron roster. View Squadron Roster
13 9 TEXT_COMARMGCARMYTRAINING_00344_TRAINING_ABORT_000 Your squadron is not currently training.
14 10 TEXT_COMARMGCARMYTRAINING_00344_TRAINING_ABORT_010 Your squadron has already completed its current training course.
15 11 TEXT_COMARMGCARMYTRAINING_00344_SELECT_ABORT <Sheet(GcArmyTraining,IntegerParameter(1),4)/> Training status: <If(GreaterThan(IntegerParameter(3),0))><Value>IntegerParameter(3)</Value> <If(Equal(IntegerParameter(3),1))>hour<Else/>hours</If><If(GreaterThan(IntegerParameter(2),0))><If(GreaterThan(IntegerParameter(3),0))> and <Else/></If><Else/></If><If(GreaterThan(IntegerParameter(2),0))><Value>IntegerParameter(2)</Value> <If(Equal(IntegerParameter(2),1))>minute<Else/>minutes</If><Else/></If><Else/><If(GreaterThan(IntegerParameter(2),0))><Value>IntegerParameter(2)</Value> <If(Equal(IntegerParameter(2),1))>minute<Else/>minutes</If><Else/>Less than 1 minute</If></If> remaining [<Time(IntegerParameter(4))/><If(Equal(PlayerParameter(77),3))><Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(222)</Value><Else/><Value>TopLevelParameter(221)</Value>/<Value>TopLevelParameter(219)</Value>/<Value>TopLevelParameter(222)</Value></If> <Value>TopLevelParameter(218)</Value>:<TwoDigitValue>TopLevelParameter(217)</TwoDigitValue>] Abort training?