diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-09-02 22:38:20 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-09-17 08:41:52 -0300 |
| commit | 0df3fed429ce39358ee782a91eeabfa6ff08c5af (patch) | |
| tree | aad2541b4e9b0b389b71a66107422533ea30e491 | |
| parent | 13c68bb1a8527896dcd3a0b2df5ecc699d99c2d1 (diff) | |
| download | serverdata-0df3fed429ce39358ee782a91eeabfa6ff08c5af.tar.gz serverdata-0df3fed429ce39358ee782a91eeabfa6ff08c5af.tar.bz2 serverdata-0df3fed429ce39358ee782a91eeabfa6ff08c5af.tar.xz serverdata-0df3fed429ce39358ee782a91eeabfa6ff08c5af.zip | |
Update MR to use npcwalkto() extension.
This means it is now ready for testing before code cleanup
| -rw-r--r-- | npc/008-1-1/cutscene.txt | 11 | ||||
| -rw-r--r-- | npc/008-1-1/morcant.txt | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/npc/008-1-1/cutscene.txt b/npc/008-1-1/cutscene.txt index f36432cb..21d190c5 100644 --- a/npc/008-1-1/cutscene.txt +++ b/npc/008-1-1/cutscene.txt @@ -34,7 +34,6 @@ OnTouch: } getmapxy(.@m$, .@x, .@y, 0); warp .@mapn$, .@x, .@y; - consolemes CONSOLEMES_DEBUG, "Warped"; addtimer(500, instance_npcname(.name$, @mainquestinst)+"::OnBegin"); end; @@ -53,12 +52,12 @@ OnBegin: getmapxy(.@ma$, .@xa, .@ya, UNITTYPE_NPC, .@mc$); // FIXME consolemes CONSOLEMES_DEBUG, "%s (ID %d) (%s %d,%d)", .@mc$, getnpcid(.@mc$), .@ma$, .@xa, .@ya; // FIXME - unitwalk(getnpcid(.@mc$), 58, 64); + npcwalkto(58, 64, .@mc$); sleep2(3000); getmapxy(.@ma$, .@xa, .@ya, UNITTYPE_NPC, .@mc$); // FIXME consolemes CONSOLEMES_DEBUG, "%s (%s %d,%d)", .@mc$, .@ma$, .@xa, .@ya; // FIXME getmapxy(.@m$, .@x, .@y, 0); - unitwalk(getnpcid(.@mc$), .@x+1, .@y); + npcwalkto(.@x+1, .@y, .@mc$); sleep2(1000); unitwarp(getnpcid(.@mc$), .@m$, .@x+1, .@y); // FIXME PLACEHOLDER npctalk l("Hoho!"), .@mc$; @@ -75,7 +74,7 @@ OnBegin: sleep2(3000); getmapxy(.@ma$, .@xa, .@ya, UNITTYPE_NPC, .@mc$); consolemes CONSOLEMES_DEBUG, "%s (%s %d,%d)", .@mc$, .@ma$, .@xa, .@ya; - unitwalk(getnpcid(.@mc$), 51, 57); + npcwalkto(51, 57, .@mc$); sleep2(1000); sc_end(SC_STUN); setpcblock(PCBLOCK_ATTACK|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_MOVE, false); @@ -142,7 +141,7 @@ OnBegin: sleep2(2500); //atcommand("@refresh"); // FIXME -> Hercules upstream broke @refresh getmapxy(.@m$, .@x, .@y, 0); - unitwalk(getnpcid(.@mc$), .@x-1, .@y); + npcwalkto(.@x-1, .@y, .@mc$); sleep2(1000); unitwarp(getnpcid(.@mc$), .@m$, .@x-1, .@y); // FIXME PLACEHOLDER npctalk col(l("*Hey, psst.*"), 9), .@mc$; @@ -160,7 +159,7 @@ OnBegin: npctalk l("Anyway, that's it. Here, have a bowl of stew, Morcant special!"), .@mc$; sleep2(2500); npctalk l("I'll be back to the port, so see you later!"), .@mc$; - unitwalk(getnpcid(.@mc$), 40, 38); + npcwalkto(40, 38, .@mc$); sleep2(2000); .@mapx$="m021@"+getcharid(0); unitwarp(getnpcid(.@mc$), .@mapx$, 51, 58); diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt index da9eb897..b0e36db1 100644 --- a/npc/008-1-1/morcant.txt +++ b/npc/008-1-1/morcant.txt @@ -49,6 +49,6 @@ OnInstanceInit: .bodytype = BODYTYPE_3; .distance = 4; .speed=150; - .alwaysVisible=true; + //.alwaysVisible=true; end; } |