SHOW:
|
|
- or go back to the newest paste.
1 | diff -r 2.0.0/Demo_Common_Wherearen.evfl.txt 2.0.1/Demo_Common_Wherearen.evfl.txt | |
2 | 71c71 | |
3 | < if (not System.EventFlags['cWherearenPlayer:PutAmiiboDeviceInOffice']) and (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 6): | |
4 | --- | |
5 | > if (not System.EventFlags['cWherearenPlayer:PutAmiiboDeviceInOffice']) and (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 6) and (EventFlowSystemActor.WherearenNpcOrderType() == 0): | |
6 | 306,307c306,310 | |
7 | < elif (System.EventFlags['cWherearenPlayer:NewBuildCount'] == 30) and (not System.EventFlags['cWherearenPlayer:Unlock_Faclility_Tailor']): | |
8 | < SubflowResults[16] = 7 | |
9 | --- | |
10 | > elif System.EventFlags['cWherearenPlayer:NewBuildCount'] == 30: | |
11 | > if not System.EventFlags['cWherearenPlayer:Unlock_Faclility_Tailor']: | |
12 | > SubflowResults[16] = 7 | |
13 | > elif (System.EventFlags['cWherearenPlayer:NewBuildCount'] >= 7) and (not System.EventFlags['cWherearenPlayer:Unlock_Faclility_School']): | |
14 | > SubflowResults[16] = 8 | |
15 | - | Only in 2.0.1: functions-2.0.1.csv |
15 | + | |
16 | - | Only in 2.0.0: functions.csv |
16 | + | |
17 | < if SubflowResults@8[16] == 0: | |
18 | --- | |
19 | > if SubflowResults@9[16] == 0: | |
20 | diff -r 2.0.0/Obj_WherearenAmiiboDevice.evfl.txt 2.0.1/Obj_WherearenAmiiboDevice.evfl.txt | |
21 | 114c114 | |
22 | < if SubflowResults@8[16] == 0: | |
23 | --- | |
24 | > if SubflowResults@9[16] == 0: | |
25 | Only in 2.0.0: .Player_GetDemo_20_Fishing.evfl.txt.swp | |
26 | Only in 2.0.0: .Player_GetDemo_30_Diving.evfl.txt.swp | |
27 | Only in 2.0.0: .Player_GetDemo_Recipe_Cooking.evfl.txt.swp | |
28 | diff -r 2.0.0/SNPC_boa_Wherearen.evfl.txt 2.0.1/SNPC_boa_Wherearen.evfl.txt | |
29 | 36a37,38 | |
30 | > System.EventFlags['cWherearenPlayer:BoaGetTurnipToday'] = true | |
31 | > System.EventFlags['cWherearenPlayer:BoaGiveTurnipFailed'] = false | |
32 | Only in 2.0.0: .SNPC_fox.evfl.txt.un~ | |
33 | diff -r 2.0.0/SNPC_otg_01_WherearenOffice.evfl.txt 2.0.1/SNPC_otg_01_WherearenOffice.evfl.txt | |
34 | 145a146,151 | |
35 | > flow CreateSchool(): | |
36 | > run StoryEvent_WorkModeOn() | |
37 | > run SNPC_otg_15_WherearenEvent_School::Root() | |
38 | > run OrderClose_EndTalk() | |
39 | > EventFlowSystemActor.ExitFlowchart() | |
40 | > | |
41 | 978c984 | |
42 | < switch SubflowResults@8[16]: | |
43 | --- | |
44 | > switch SubflowResults@9[16]: | |
45 | 1009a1016,1017 | |
46 | > case 8: | |
47 | > run CreateSchool() | |
48 | 1014,1017c1022 | |
49 | < run StoryEvent_WorkModeOn() | |
50 | < run SNPC_otg_15_WherearenEvent_School::Root() | |
51 | < run OrderClose_EndTalk() | |
52 | < EventFlowSystemActor.ExitFlowchart() | |
53 | --- | |
54 | > run CreateSchool() | |
55 | 1021c1026 | |
56 | < if SubflowResults@8[16] in (0, 1, 2, 3, 4, 5, 6): | |
57 | --- | |
58 | > if SubflowResults@9[16] in (0, 1, 2, 3, 4, 5, 6, 8): | |
59 | diff -r 2.0.0/SNPC_otg_31_WherearenEvent_EntryOffice.evfl.txt 2.0.1/SNPC_otg_31_WherearenEvent_EntryOffice.evfl.txt | |
60 | 34c34 | |
61 | < if SubflowResults@8[16] in (0, 1, 2, 3, 4): | |
62 | --- | |
63 | > if SubflowResults@9[16] in (0, 1, 2, 3, 4): | |
64 | diff -r 2.0.0/SNPC_rco_11_CoordinateNpcHouse_Office.evfl.txt 2.0.1/SNPC_rco_11_CoordinateNpcHouse_Office.evfl.txt | |
65 | 246,264c246,249 | |
66 | < if EventFlowSystemActor.IsSharePlay(0): | |
67 | < # I noticed you have guests over right now, and since planning out a remodel can take a while… Why don't we wait until your guests leave, hm? Rushing a… | |
68 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:101', false) | |
69 | < elif Player.HasNoAcquaintance(): | |
70 | < # Yes, we… Wait, what? How long have you lived here? And you still don't know ANYONE on the island? Naturally, leaving your home in the hands of a stra… | |
71 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:063', false) | |
72 | < elif System.EventFlags['cPlayer:NpcHouseCoordinateTodayCount'] <= 0: | |
73 | < # Oho! You'd like to pitch some new home designs to a resident? We can certainly arrange that. To get started, I'll need 9,000 Bells up front. That's a… | |
74 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001', true) | |
75 | < EventFlowSystemActor.UIMoneyAppear() | |
76 | < # What do you say, hm? Are you ready to brainstorm some ideas? | |
77 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001_01', false) | |
78 | < if EventFlowSystemActor.GeneralTalkChoice2() != 0: | |
79 | < run Cancel_First() | |
80 | < elif EventFlowSystemActor.HasBellCount(9000): | |
81 | < # Fantastic! Let's not waste any time. Who would you like to talk to about redesigning their home? | |
82 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:002', true) | |
83 | < EventFlowSystemActor.UIMoneyDisappear() | |
84 | < run Sub_Event12() | |
85 | --- | |
86 | > if EventFlowSystemActor.NetIsConnected(): | |
87 | > if EventFlowSystemActor.IsVillageGateOpened(): | |
88 | > # Actually, on second thought… a visitor could arrive at any moment. That would be inopportune, hm? If you wouldn't mind closing the gate at the airpor… | |
89 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:102', false) | |
90 | 266c251,252 | |
91 | < run Cancel_NotEnoughMoney() | |
92 | --- | |
93 | > EventFlowSystemActor.NetEndSessionVillage('cEndVillageSession', false) | |
94 | > run Sub_grp_Event89() | |
95 | 268,275c254 | |
96 | < # Oh! Did you come up with some new design ideas? Either for an existing pitch or maybe a new one? | |
97 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:011', false) | |
98 | < if EventFlowSystemActor.GeneralTalkChoice2() == 0: | |
99 | < # No problem. Who is it? | |
100 | < MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:012', true) | |
101 | < run Sub_Event12() | |
102 | < else: | |
103 | < run Cancel_First() | |
104 | --- | |
105 | > run Sub_grp_Event89() | |
106 | 402a382,413 | |
107 | > | |
108 | > local flow Sub_grp_Event89(): | |
109 | > if EventFlowSystemActor.IsSharePlay(0): | |
110 | > # I noticed you have guests over right now, and since planning out a remodel can take a while… Why don't we wait until your guests leave, hm? Rushing a… | |
111 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:101', false) | |
112 | > elif Player.HasNoAcquaintance(): | |
113 | > # Yes, we… Wait, what? How long have you lived here? And you still don't know ANYONE on the island? Naturally, leaving your home in the hands of a stra… | |
114 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:063', false) | |
115 | > elif System.EventFlags['cPlayer:NpcHouseCoordinateTodayCount'] <= 0: | |
116 | > # Oho! You'd like to pitch some new home designs to a resident? We can certainly arrange that. To get started, I'll need 9,000 Bells up front. That's a… | |
117 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001', true) | |
118 | > EventFlowSystemActor.UIMoneyAppear() | |
119 | > # What do you say, hm? Are you ready to brainstorm some ideas? | |
120 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:001_01', false) | |
121 | > if EventFlowSystemActor.GeneralTalkChoice2() != 0: | |
122 | > run Cancel_First() | |
123 | > elif EventFlowSystemActor.HasBellCount(9000): | |
124 | > # Fantastic! Let's not waste any time. Who would you like to talk to about redesigning their home? | |
125 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:002', true) | |
126 | > EventFlowSystemActor.UIMoneyDisappear() | |
127 | > run Sub_Event12() | |
128 | > else: | |
129 | > run Cancel_NotEnoughMoney() | |
130 | > else: | |
131 | > # Oh! Did you come up with some new design ideas? Either for an existing pitch or maybe a new one? | |
132 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:011', false) | |
133 | > if EventFlowSystemActor.GeneralTalkChoice2() == 0: | |
134 | > # No problem. Who is it? | |
135 | > MainNpc.OpenMessageWindow('TalkSNpc/rco/SP_rco_14_CoordinateNpcHouse:012', true) | |
136 | > run Sub_Event12() | |
137 | > else: | |
138 | > run Cancel_First() | |
139 | diff -r 2.0.0/System_CastUI_Amiibo.evfl.txt 2.0.1/System_CastUI_Amiibo.evfl.txt | |
140 | 3a4 | |
141 | > EventFlowSystemActor.CheckNfpController(NpadId) | |
142 | diff -r 2.0.0/System_WherearenGrowUp.evfl.txt 2.0.1/System_WherearenGrowUp.evfl.txt | |
143 | 32a33 | |
144 | > run Repair_EventFlag() | |
145 | 124a126 | |
146 | > run Repair_EventFlag() | |
147 | 142a145,150 | |
148 | > | |
149 | > flow Repair_EventFlag(): | |
150 | > if (System.EventFlags['cWherearenPlayer:Unlock_Faclility_School']) and (not System.EventFlags['cPlayer:WHEREAREN_Unlock_RoomSizeModeUnlock']): | |
151 | > System.EventFlags['cPlayer:WHEREAREN_Unlock_RoomSizeModeUnlock'] = true | |
152 | > System.EventFlags['cWherearenPlayer:Unlock_Item_Event_After_Facility_School'] = true | |
153 | > System.EventFlags['cPlayer:OtgTipsCompleteSchoolBuild'] = true | |
154 |