Skip to content

Commit

Permalink
further improvements to rendering of event code
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrCheeze
MrCheeze committed Oct 28, 2018
1 parent 1b32b71 commit 226fbc8
Show file tree
Hide file tree
Showing 521 changed files with 17,634 additions and 21,548 deletions.
25 changes: 11 additions & 14 deletions event/100enemy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,16 @@ void Start() {

if EventSystemActor.CheckFlag({'FlagName': '100enemy_Finish'}) {
EventSystemActor.Demo_AdvanceQuest({'IsWaitFinish': True, 'ForceRunTelop': False, 'StepName': 'Battle', 'QuestName': 'MiniGame100enemy'})
Event286:
if EventSystemActor.CheckGameDataInt({'GameDataIntName': '100enemy_CurrentCourse', 'Operator': 'Equal', 'Value': 2}) {
EventSystemActor.Demo_ChangeScene({'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'WarpDestMapName': 'AocField/B-2', 'WarpDestPosName': 'Night_1', 'EvflName': 'Demo202_3', 'EntryPointName': 'Demo202_3'})
} else
if EventSystemActor.CheckGameDataInt({'GameDataIntName': '100enemy_CurrentCourse', 'Operator': 'Equal', 'Value': 1}) {
EventSystemActor.Demo_ChangeScene({'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'WarpDestMapName': 'AocField/A-1', 'WarpDestPosName': 'Air_2', 'EvflName': 'Demo202_2', 'EntryPointName': 'Demo202_2'})
} else {
EventSystemActor.Demo_ChangeScene({'WarpDestPosName': 'Entrance_1', 'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'EvflName': 'Demo202_1', 'EntryPointName': 'Demo202_1', 'WarpDestMapName': 'AocField/A-1'})
}
} else {
EventSystemActor.Demo_AdvanceQuest({'IsWaitFinish': True, 'ForceRunTelop': False, 'StepName': 'Battle', 'QuestName': '100enemy'})
goto Event286
}
if EventSystemActor.CheckGameDataInt({'GameDataIntName': '100enemy_CurrentCourse', 'Operator': 'Equal', 'Value': 2}) {
EventSystemActor.Demo_ChangeScene({'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'WarpDestMapName': 'AocField/B-2', 'WarpDestPosName': 'Night_1', 'EvflName': 'Demo202_3', 'EntryPointName': 'Demo202_3'})
} else
if EventSystemActor.CheckGameDataInt({'GameDataIntName': '100enemy_CurrentCourse', 'Operator': 'Equal', 'Value': 1}) {
EventSystemActor.Demo_ChangeScene({'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'WarpDestMapName': 'AocField/A-1', 'WarpDestPosName': 'Air_2', 'EvflName': 'Demo202_2', 'EntryPointName': 'Demo202_2'})
} else {
EventSystemActor.Demo_ChangeScene({'WarpDestPosName': 'Entrance_1', 'IsWaitFinish': True, 'FadeType': 0, 'StartType': -1, 'EvflName': 'Demo202_1', 'EntryPointName': 'Demo202_1', 'WarpDestMapName': 'AocField/A-1'})
}
}

Expand All @@ -71,12 +69,11 @@ void Active_Talk() {
if EventSystemActor.CheckFlag({'FlagName': 'Open_MasterSword_FullPower'}) {
if EventSystemActor.CheckGameDataInt({'Operator': 'GreaterThanOrEqualTo', 'GameDataIntName': 'MsterSword_TalkLv', 'Value': 4}) {
TwnObj_Village_Korok_DekuTree_A_01.Demo_Talk({'IsWaitFinish': True, 'IsOverWriteLabelActorName': False, 'MessageId': 'EventFlowMsg/TwnObj_Village_Korok_DekuTree_A_01:DekuTree_A_01_Talk030', 'ASName': 'Face_C_Talk', 'CloseDialogOption': 0, 'IsWaitAS': False, 'MessageOpenDelayTime': 0, 'IsCloseMessageDialog': True, 'IsBecomingSpeaker': True})
Event258:
GameRomCamera.Demo_ReturnSavePoint_1({'IsWaitFinish': True, 'CollisionInterpolateSkip': False, 'Count': 0.0, 'ReviseMode': 1})
} else {
TwnObj_Village_Korok_DekuTree_A_01.Demo_Talk({'IsWaitFinish': True, 'IsOverWriteLabelActorName': False, 'MessageId': 'EventFlowMsg/TwnObj_Village_Korok_DekuTree_A_01:DekuTree_A_01_Talk020', 'ASName': 'Face_C_Talk', 'CloseDialogOption': 0, 'IsWaitAS': False, 'MessageOpenDelayTime': 0, 'IsCloseMessageDialog': True, 'IsBecomingSpeaker': True})
goto Event258
}
Event258:
GameRomCamera.Demo_ReturnSavePoint_1({'IsWaitFinish': True, 'CollisionInterpolateSkip': False, 'Count': 0.0, 'ReviseMode': 1})
} else {
TwnObj_Village_Korok_DekuTree_A_01.Demo_Talk({'IsWaitFinish': True, 'IsOverWriteLabelActorName': False, 'ASName': 'Face_C_Talk', 'CloseDialogOption': 0, 'IsWaitAS': False, 'MessageOpenDelayTime': 0, 'IsCloseMessageDialog': True, 'IsBecomingSpeaker': True, 'MessageId': 'EventFlowMsg/100enemy:talk14'})
goto Event258
Expand Down Expand Up @@ -116,8 +113,8 @@ void RetireBattle() {
goto Event331
} else {
EventSystemActor.Demo_RollbackQuest({'IsWaitFinish': True, 'QuestName': '100enemy', 'StepName': 'Active2'})
goto Event189
}
goto Event189
} else {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': '100enemy_Clear_Junior'})
EventSystemActor.Demo_SetGameDataInt({'GameDataIntName': 'MasterSword_Add_Power', 'IsWaitFinish': True, 'Value': 10})
Expand Down
22 changes: 9 additions & 13 deletions event/Animal_Forest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,16 @@ void Ready_Npc_Musician_014_Talk() {

call Sing()

if EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Activated'}) {
Event40:
if EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Act'}) {
if !EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Finish'}) {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': 'Animal_Forest_Finish'})
EventSystemActor.Demo_WaitFrame({'IsWaitFinish': True, 'Frame': 1})

call BloodyMoonRelief.Musician_Check()

}
}
} else {
if !EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Activated'}) {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': 'Animal_Forest_Activated'})
goto Event40
}
if EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Act'})
&& !EventSystemActor.CheckFlag({'FlagName': 'Animal_Forest_Finish'}) {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': 'Animal_Forest_Finish'})
EventSystemActor.Demo_WaitFrame({'IsWaitFinish': True, 'Frame': 1})

call BloodyMoonRelief.Musician_Check()

}
} else {
Npc_Musician_014.Demo_Talk({'IsWaitFinish': True, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False, 'IsCloseMessageDialog': True, 'MessageId': 'EventFlowMsg/Animal_Forest:Text005'})
Expand Down
49 changes: 23 additions & 26 deletions event/Animal_SunazarashiSP_C.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,37 @@ void EatEnd() {
GameRomCamera.Demo_MovePosFlow({'IsWaitFinish': True, 'Cushion': 0.0, 'MotionMode': 0, 'UniqueName2': '', 'Pattern1AtX': 0.0, 'Pattern1AtZ': 0.0, 'CollisionInterpolateSkip': True, 'LatShiftRange': 0.0, 'LngShiftRange': 0.0, 'ReviseModeEnd': 0, 'TargetActor1': 3, 'ActorName1': 'Npc_oasis047', 'Pattern1PosZ': 3.0, 'FovyAppendMode': 0, 'Pattern1Fovy': 0.0, 'ActorName2': '', 'AtAppendMode': 2, 'Pattern1AtY': 1.5, 'Pattern1PosY': 2.5, 'PosAppendMode': 2, 'Pattern1PosX': 0.0, 'Count': 45.0, 'StartCalcOnly': True, 'TargetActor2': -1, 'UniqueName1': 'town', 'ActorIgnoringCollision': -1, 'Accept1FrameDelay': True, 'GameDataVec3fCameraPos': '', 'GameDataVec3fCameraAt': ''})
if Npc_oasis047[town].IsNeedEquipWeapon() {
Npc_oasis047[town].Demo_PlayASForDemo({'ASName': 'GuardUnequip', 'IsWaitFinish': True, 'SeqBank': 0, 'IsEnabledAnimeDriven': -1, 'ClothWarpMode': -2, 'MorphingFrame': -1.0, 'TargetIndex': 0, 'IsIgnoreSame': True})
Event20:
Npc_oasis047[town].Demo_TurnAndLookToObject({'IsWaitFinish': True, 'TurnDirection': 0.0, 'ActorName': '', 'ObjectId': 0, 'UniqueName': '', 'PosOffset': [0.0, 0.0, 0.0], 'TurnPosition': [0.0, 0.0, 0.0], 'IsValid': True, 'FaceId': 2, 'IsConfront': False})
if Animal_SunazarashiSP_C[town].CheckEatActor({'ActorName': 'Item_Fruit_B'}) {
switch EventSystemActor.RandomChoice4() {
case 0:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk05', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
Event32:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk04', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
case 1:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk06', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 2:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk07', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 3:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk08', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
}
} else
}
Npc_oasis047[town].Demo_TurnAndLookToObject({'IsWaitFinish': True, 'TurnDirection': 0.0, 'ActorName': '', 'ObjectId': 0, 'UniqueName': '', 'PosOffset': [0.0, 0.0, 0.0], 'TurnPosition': [0.0, 0.0, 0.0], 'IsValid': True, 'FaceId': 2, 'IsConfront': False})
if Animal_SunazarashiSP_C[town].CheckEatActor({'ActorName': 'Item_Fruit_B'}) {
switch EventSystemActor.RandomChoice4() {
case 0:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk00', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk05', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
Event32:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk04', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
case 1:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk01', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk06', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 2:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk02', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk07', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 3:
Npc_oasis047[town].Demo_Talk({'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False, 'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk03'})
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk08', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
}
} else {
goto Event20
} else
switch EventSystemActor.RandomChoice4() {
case 0:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk00', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 1:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk01', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 2:
Npc_oasis047[town].Demo_Talk({'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk02', 'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False})
goto Event32
case 3:
Npc_oasis047[town].Demo_Talk({'IsWaitFinish': True, 'IsCloseMessageDialog': False, 'ASName': '', 'IsBecomingSpeaker': True, 'IsOverWriteLabelActorName': False, 'MessageId': 'EventFlowMsg/Animal_SunazarashiSP_C:talk03'})
goto Event32
}
}
49 changes: 21 additions & 28 deletions event/Aoc2Resident.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,35 @@ void CheckBalladOfHeroRun() {
}

void CheckAoc2TreasureRun() {
if EventSystemActor.CheckFlag({'FlagName': 'HasAoCVer3'}) {
if !EventSystemActor.CheckFlag({'FlagName': 'TreasureHunt_Aoc2_RunAutoOrder'}) {
if EventSystemActor.IsCurrentMainFieldStage() {
if EventSystemActor.CheckFlag({'FlagName': 'FirstTouchdown'}) {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': 'TreasureHunt_Aoc2_RunAutoOrder'})
EventSystemActor.Demo_WaitFrame({'IsWaitFinish': True, 'Frame': 10})
EventSystemActor.Demo_DisableAutoSavePausing({'IsWaitFinish': True})
EventSystemActor.Demo_AutoSave({'IsWaitFinish': True})
if EventSystemActor.CheckFlag({'FlagName': 'HasAoCVer3'})
&& !EventSystemActor.CheckFlag({'FlagName': 'TreasureHunt_Aoc2_RunAutoOrder'})
&& EventSystemActor.IsCurrentMainFieldStage()
&& EventSystemActor.CheckFlag({'FlagName': 'FirstTouchdown'}) {
EventSystemActor.Demo_FlagON({'IsWaitFinish': True, 'FlagName': 'TreasureHunt_Aoc2_RunAutoOrder'})
EventSystemActor.Demo_WaitFrame({'IsWaitFinish': True, 'Frame': 10})
EventSystemActor.Demo_DisableAutoSavePausing({'IsWaitFinish': True})
EventSystemActor.Demo_AutoSave({'IsWaitFinish': True})

call RunTreasureChallenge({'FlagReady': 'TreasureHunt03_Ready', 'FlagActivated': 'TreasureHunt03_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt03_Ready', 'FlagActivated': 'TreasureHunt03_Activated'})


call RunTreasureChallenge({'FlagReady': 'TreasureHunt04_Ready', 'FlagActivated': 'TreasureHunt04_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt04_Ready', 'FlagActivated': 'TreasureHunt04_Activated'})


call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku05_Ready', 'FlagActivated': 'TreasureHunt_touzoku05_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku05_Ready', 'FlagActivated': 'TreasureHunt_touzoku05_Activated'})


call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku06_Ready', 'FlagActivated': 'TreasureHunt_touzoku06_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku06_Ready', 'FlagActivated': 'TreasureHunt_touzoku06_Activated'})


call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku07_Ready', 'FlagActivated': 'TreasureHunt_touzoku07_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku07_Ready', 'FlagActivated': 'TreasureHunt_touzoku07_Activated'})


call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku08_Ready', 'FlagActivated': 'TreasureHunt_touzoku08_Activated'})
call RunTreasureChallenge({'FlagReady': 'TreasureHunt_touzoku08_Ready', 'FlagActivated': 'TreasureHunt_touzoku08_Activated'})


call RunTreasureChallenge({'FlagReady': 'bf2_collabo_Ready', 'FlagActivated': 'bf2_collabo_Activated'})
call RunTreasureChallenge({'FlagReady': 'bf2_collabo_Ready', 'FlagActivated': 'bf2_collabo_Activated'})

}
}
}
}
}

Expand All @@ -69,16 +66,12 @@ void RunTreasureChallenge() {
}

void CheckDeadlyQuestEscape() {
if EventSystemActor.CheckFlag({'FlagName': 'HasAoCVer3'}) {
if EventSystemActor.CheckFlag({'FlagName': 'BalladOfHeroes_Step02'}) {
if !EventSystemActor.CheckFlag({'FlagName': 'BalladOfHeroes_Step03'}) {
if !EventSystemActor.IsCurrentCDungeonStage() {
if EventSystemActor.CheckDeadlyQuestEscapeTiming() {
EventSystemActor.Demo_CallDemo({'IsWaitFinish': True, 'EndFade': 0, 'DemoName': 'Demo605_0', 'EntryPointName': 'Demo605_0'})
}
}
}
}
if EventSystemActor.CheckFlag({'FlagName': 'HasAoCVer3'})
&& EventSystemActor.CheckFlag({'FlagName': 'BalladOfHeroes_Step02'})
&& !EventSystemActor.CheckFlag({'FlagName': 'BalladOfHeroes_Step03'})
&& !EventSystemActor.IsCurrentCDungeonStage()
&& EventSystemActor.CheckDeadlyQuestEscapeTiming() {
EventSystemActor.Demo_CallDemo({'IsWaitFinish': True, 'EndFade': 0, 'DemoName': 'Demo605_0', 'EntryPointName': 'Demo605_0'})
}
}

Expand Down
Loading

0 comments on commit 226fbc8

Please sign in to comment.