From 98e2415c65ba40871fb8cfdec60fa06757620d50 Mon Sep 17 00:00:00 2001
From: Biscuit Boy <lachlan.roughley@gmail.com>
Date: Fri, 5 Jan 2018 23:33:41 +1100
Subject: [PATCH] Fixed The Formatting Again

Please be the last time
---
 .../quest/subquest/gridania/SubFst002.cpp     | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/scripts/native/quest/subquest/gridania/SubFst002.cpp b/scripts/native/quest/subquest/gridania/SubFst002.cpp
index 82109e64..238101e0 100644
--- a/scripts/native/quest/subquest/gridania/SubFst002.cpp
+++ b/scripts/native/quest/subquest/gridania/SubFst002.cpp
@@ -26,6 +26,7 @@ private:
          {
             player.updateQuest( getId(), SEQ_1 );
          }
+<<<<<<< HEAD
       };
 
       player.eventPlay( getId (), 0, NONE, callback );
@@ -33,6 +34,15 @@ private:
 
    void Scene00001(Entity::Player& player)
    {
+=======
+      };
+
+      player.eventPlay( getId (), 0, NONE, callback );
+   }
+
+   void Scene00001(Entity::Player& player)
+   {
+>>>>>>> 8dc9faa... Fixed The Formatting Again
       auto callback = [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
       {
          if( param2 == 1 ) // finish quest
@@ -40,6 +50,7 @@ private:
             if( player.giveQuestRewards( getId(), 0 ) )
                player.finishQuest( getId() );
          }
+<<<<<<< HEAD
       };
 
       player.eventPlay( getId (), 1, NONE, callback );
@@ -58,6 +69,26 @@ public:
          Scene00001( player );
    }
 
+=======
+      };
+
+      player.eventPlay( getId (), 1, NONE, callback );
+   }
+
+public:
+   SubFst002() : EventScript( "SubFst002", 65561 ) {}
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >(actorId) );
+
+      if( actor == ACTOR0 && !player.hasQuest( getId() ) )
+         Scene00000( player );
+      else if( actor == ACTOR0 && player.getQuestSeq( getId() ) == SEQ_FINISH )
+         Scene00001( player );
+   }
+
+>>>>>>> 8dc9faa... Fixed The Formatting Again
    void onNpcKill( uint32_t npcId, Entity::Player& player ) override
    {
       if( npcId != ENEMY0 )