mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

More ARC formatting

Browse source
This commit is contained in:
dude22072 2022-01-14 01:44:35 -06:00
parent 55d212ddf6
commit cfcc29acbd
11 changed files with 148 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/scripts/quest/classquest/ARC/ClsArc000.cpp
View file

@ -63,11 +63,13 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
Scene00000( quest, player ); Scene00000( quest, player );
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00001( quest, player ); Scene00001( quest, player );
else else
@ -84,7 +86,8 @@ public:
switch( nameId ) switch( nameId )
{ {
case Enemy0: { case Enemy0:
{
auto currentKC37 = quest.getUI8AL(); auto currentKC37 = quest.getUI8AL();
if( currentKC37 + 1 >= 3 ) if( currentKC37 + 1 >= 3 )
@ -100,7 +103,8 @@ public:
break; break;
} }
case Enemy1: { case Enemy1:
{
auto currentKC49 = quest.getUI8BH(); auto currentKC49 = quest.getUI8BH();
if( currentKC49 + 1 >= 3 ) if( currentKC49 + 1 >= 3 )
@ -116,7 +120,8 @@ public:
break; break;
} }
case Enemy2: { case Enemy2:
{
auto currentKC47 = quest.getUI8BL(); auto currentKC47 = quest.getUI8BL();
if( currentKC47 + 1 >= 3 ) if( currentKC47 + 1 >= 3 )

9
src/scripts/quest/classquest/ARC/ClsArc001.cpp
View file

@ -65,7 +65,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
if( quest.getSeq() == Seq2 ) if( quest.getSeq() == Seq2 )
@ -88,7 +89,8 @@ public:
switch( nameId ) switch( nameId )
{ {
case Enemy0: { case Enemy0:
{
if( currentKC5 >= 8 ) if( currentKC5 >= 8 )
{ {
quest.setUI8AL( currentKC5 ); quest.setUI8AL( currentKC5 );
@ -103,7 +105,8 @@ public:
break; break;
} }
case Enemy1: { case Enemy1:
{
if( currentKC32 >= 8 ) if( currentKC32 >= 8 )
{ {
quest.setUI8BH( currentKC32 ); quest.setUI8BH( currentKC32 );

39
src/scripts/quest/classquest/ARC/ClsArc002.cpp
View file

@ -73,7 +73,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -81,7 +82,8 @@ public:
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00001( quest, player ); Scene00001( quest, player );
else if( quest.getSeq() == Seq3 ) else if( quest.getSeq() == Seq3 )
@ -91,7 +93,8 @@ public:
break; break;
} }
case Actor2: { case Actor2:
{
break; break;
} }
} }
@ -107,7 +110,8 @@ public:
switch( entityId ) switch( entityId )
{ {
case Enemy0: { case Enemy0:
{
if( currentKC39 >= 8 ) if( currentKC39 >= 8 )
{ {
quest.setUI8AL( currentKC39 ); quest.setUI8AL( currentKC39 );
@ -122,7 +126,8 @@ public:
break; break;
} }
case Enemy1: { case Enemy1:
{
if( currentKC12 >= 8 ) if( currentKC12 >= 8 )
{ {
quest.setUI8BH( currentKC12 ); quest.setUI8BH( currentKC12 );
@ -144,42 +149,50 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Eobject0: { case Eobject0:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00002( quest, player ); Scene00002( quest, player );
break; break;
} }
case Eobject1: { case Eobject1:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00003( quest, player ); Scene00003( quest, player );
break; break;
} }
case Eobject2: { case Eobject2:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00004( quest, player ); Scene00004( quest, player );
break; break;
} }
case Eobject3: { case Eobject3:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00005( quest, player ); Scene00005( quest, player );
break; break;
} }
case Eobject4: { case Eobject4:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00006( quest, player ); Scene00006( quest, player );
break; break;
} }
case Eobject5: { case Eobject5:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00007( quest, player ); Scene00007( quest, player );
break; break;
} }
case Eobject6: { case Eobject6:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00008( quest, player ); Scene00008( quest, player );
break; break;
} }
case Eobject7: { case Eobject7:
{
eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actorId, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00009( quest, player ); Scene00009( quest, player );
break; break;

33
src/scripts/quest/classquest/ARC/ClsArc003.cpp
View file

@ -75,7 +75,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -85,7 +86,8 @@ public:
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
{ {
Scene00001( quest, player ); Scene00001( quest, player );
@ -100,7 +102,8 @@ public:
} }
break; break;
} }
case Eobject8: { case Eobject8:
{
if( quest.getSeq() == Seq4 ) if( quest.getSeq() == Seq4 )
Scene00027( quest, player ); Scene00027( quest, player );
break; break;
@ -115,42 +118,50 @@ public:
switch( actor ) switch( actor )
{ {
case Eobject0: { case Eobject0:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00002( quest, player ); Scene00002( quest, player );
break; break;
} }
case Eobject1: { case Eobject1:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00003( quest, player ); Scene00003( quest, player );
break; break;
} }
case Eobject2: { case Eobject2:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00004( quest, player ); Scene00004( quest, player );
break; break;
} }
case Eobject3: { case Eobject3:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00005( quest, player ); Scene00005( quest, player );
break; break;
} }
case Eobject4: { case Eobject4:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00006( quest, player ); Scene00006( quest, player );
break; break;
} }
case Eobject5: { case Eobject5:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00007( quest, player ); Scene00007( quest, player );
break; break;
} }
case Eobject6: { case Eobject6:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00008( quest, player ); Scene00008( quest, player );
break; break;
} }
case Eobject7: { case Eobject7:
{
eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 ); eventMgr().eventStart( player, actor, getId(), Event::EventHandler::Nest, 0, 0 );
Scene00009( quest, player ); Scene00009( quest, player );
break; break;

33
src/scripts/quest/classquest/ARC/ClsArc004.cpp
View file

@ -75,7 +75,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -83,7 +84,8 @@ public:
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00002( quest, player ); Scene00002( quest, player );
else if( quest.getSeq() == Seq5 )//Master claims we can't talk with this NPC else if( quest.getSeq() == Seq5 )//Master claims we can't talk with this NPC
@ -91,23 +93,28 @@ public:
break; break;
} }
case Actor2: { case Actor2:
{
if( quest.getSeq() == Seq5 ) if( quest.getSeq() == Seq5 )
Scene00020( quest, player ); Scene00020( quest, player );
break; break;
} }
case Actor3: { case Actor3:
{
if( quest.getSeq() == Seq5 ) if( quest.getSeq() == Seq5 )
Scene00019( quest, player ); Scene00019( quest, player );
break; break;
} }
case Actor4: { case Actor4:
{
break; break;
} }
case Actor5: { case Actor5:
{
break; break;
} }
case Eobject0: { case Eobject0:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x07, player, getId(), 0x07,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
@ -116,7 +123,8 @@ public:
nullptr, 0 ); nullptr, 0 );
break; break;
} }
case Eobject1: { case Eobject1:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x07, player, getId(), 0x07,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
@ -125,7 +133,8 @@ public:
nullptr, 0 ); nullptr, 0 );
break; break;
} }
case Eobject2: { case Eobject2:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x07, player, getId(), 0x07,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
@ -134,7 +143,8 @@ public:
nullptr, 0 ); nullptr, 0 );
break; break;
} }
case Eobject3: { case Eobject3:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x0A, player, getId(), 0x0A,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {
@ -144,7 +154,8 @@ public:
nullptr, 0 ); nullptr, 0 );
break; break;
} }
case Eobject4: { case Eobject4:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x01, player, getId(), 0x01,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {

24
src/scripts/quest/classquest/ARC/ClsArc005.cpp
View file

@ -72,7 +72,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -80,31 +81,38 @@ public:
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00002( quest, player ); Scene00002( quest, player );
break; break;
} }
case Actor2: { case Actor2:
{
if( quest.getSeq() == Seq2 ) if( quest.getSeq() == Seq2 )
Scene00003( quest, player ); Scene00003( quest, player );
break; break;
} }
case Actor3: { case Actor3:
{
if( quest.getSeq() == Seq4 ) if( quest.getSeq() == Seq4 )
Scene00006( quest, player ); Scene00006( quest, player );
break; break;
} }
case Actor4: { case Actor4:
{
break; break;
} }
case Actor5: { case Actor5:
{
break; break;
} }
case Actor6: { case Actor6:
{
break; break;
} }
case Eobject0: { case Eobject0:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x0A, player, getId(), 0x0A,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {

33
src/scripts/quest/classquest/ARC/ClsArc006.cpp
View file

@ -76,7 +76,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( !player.hasQuest( getId() ) ) if( !player.hasQuest( getId() ) )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -84,46 +85,56 @@ public:
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00002( quest, player ); Scene00002( quest, player );
break; break;
} }
case Actor2: { case Actor2:
{
break; break;
} }
case Actor3: { case Actor3:
{
break; break;
} }
case Actor4: { case Actor4:
{
break; break;
} }
case Actor5: { case Actor5:
{
break; break;
} }
case Actor6: { case Actor6:
{
break; break;
} }
case Actor7: { case Actor7:
{
if( quest.getSeq() == SeqFinish ) if( quest.getSeq() == SeqFinish )
Scene00014( quest, player ); Scene00014( quest, player );
break; break;
} }
case Actor8: { case Actor8:
{
if( quest.getSeq() == SeqFinish ) if( quest.getSeq() == SeqFinish )
Scene00015( quest, player ); Scene00015( quest, player );
break; break;
} }
case Actor9: { case Actor9:
{
if( quest.getSeq() == SeqFinish ) if( quest.getSeq() == SeqFinish )
Scene00016( quest, player ); Scene00016( quest, player );
break; break;
} }
case Eobject1: { case Eobject1:
{
eventMgr().eventActionStart( eventMgr().eventActionStart(
player, getId(), 0x1B, player, getId(), 0x1B,
[ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) { [ & ]( Entity::Player &player, uint32_t eventId, uint64_t additional ) {

12
src/scripts/quest/classquest/ARC/ClsArc100.cpp
View file

@ -55,7 +55,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( quest.getSeq() == Seq0 ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
@ -77,7 +78,8 @@ public:
switch( nameId ) switch( nameId )
{ {
case Enemy0: { case Enemy0:
{
if( currentKC37 >= 3 ) if( currentKC37 >= 3 )
{ {
quest.setUI8AL( currentKC37 ); quest.setUI8AL( currentKC37 );
@ -92,7 +94,8 @@ public:
break; break;
} }
case Enemy1: { case Enemy1:
{
if( currentKC49 >= 3 ) if( currentKC49 >= 3 )
{ {
quest.setUI8BH( currentKC49 ); quest.setUI8BH( currentKC49 );
@ -107,7 +110,8 @@ public:
break; break;
} }
case Enemy2: { case Enemy2:
{
if( currentKC47 >= 3 ) if( currentKC47 >= 3 )
{ {
quest.setUI8BL( currentKC47 ); quest.setUI8BL( currentKC47 );

15
src/scripts/quest/classquest/ARC/ClsArc997.cpp
View file

@ -70,14 +70,16 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( quest.getSeq() == Seq0 ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
else if( quest.getSeq() == SeqFinish ) else if( quest.getSeq() == SeqFinish )
Scene00030( quest, player ); Scene00030( quest, player );
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == Seq1 ) if( quest.getSeq() == Seq1 )
Scene00001( quest, player ); Scene00001( quest, player );
else if( quest.getSeq() == Seq3 ) else if( quest.getSeq() == Seq3 )
@ -86,7 +88,8 @@ public:
Scene00029( quest, player ); Scene00029( quest, player );
break; break;
} }
case Actor2: { case Actor2:
{
break; break;
} }
} }
@ -102,7 +105,8 @@ public:
switch( nameId ) switch( nameId )
{ {
case Enemy0: { case Enemy0:
{
if( currentKC39 >= 8 ) if( currentKC39 >= 8 )
{ {
quest.setUI8AL( currentKC39 ); quest.setUI8AL( currentKC39 );
@ -117,7 +121,8 @@ public:
break; break;
} }
case Enemy1: { case Enemy1:
{
if( currentKC12 >= 8 ) if( currentKC12 >= 8 )
{ {
quest.setUI8BH( currentKC12 ); quest.setUI8BH( currentKC12 );

6
src/scripts/quest/classquest/ARC/ClsArc998.cpp
View file

@ -51,12 +51,14 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
if( quest.getSeq() == Seq0 ) if( quest.getSeq() == Seq0 )
Scene00000( quest, player ); Scene00000( quest, player );
break; break;
} }
case Actor1: { case Actor1:
{
if( quest.getSeq() == SeqFinish ) if( quest.getSeq() == SeqFinish )
Scene00001( quest, player ); Scene00001( quest, player );
break; break;

3
src/scripts/quest/classquest/ARC/ClsArc999.cpp
View file

@ -40,7 +40,8 @@ public:
{ {
switch( actorId ) switch( actorId )
{ {
case Actor0: { case Actor0:
{
Scene00000( quest, player ); Scene00000( quest, player );
break; break;
} }