diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-02-10 01:48:46 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-02-10 01:48:46 -0200 |
| commit | 317872bbb29326bc96ca4fb1db8cb91dd498c0e5 (patch) | |
| tree | 09ac4f46fbe4d80a9016ade47d92a5c37bec4b3d /npc | |
| parent | b76aa9a8c409754b310a464a6314d7f15abf88df (diff) | |
| download | serverdata-317872bbb29326bc96ca4fb1db8cb91dd498c0e5.tar.gz serverdata-317872bbb29326bc96ca4fb1db8cb91dd498c0e5.tar.bz2 serverdata-317872bbb29326bc96ca4fb1db8cb91dd498c0e5.tar.xz serverdata-317872bbb29326bc96ca4fb1db8cb91dd498c0e5.zip | |
[skip ci] several bugfixes based on debug
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/005-1-1/main.txt | 3 | ||||
| -rw-r--r-- | npc/005-5/nylo.txt | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/npc/005-1-1/main.txt b/npc/005-1-1/main.txt index 43fa5f2cc..99b17a51f 100644 --- a/npc/005-1-1/main.txt +++ b/npc/005-1-1/main.txt @@ -133,7 +133,7 @@ OnInteract: if (array_find(@DESTROYED, .@cropId$) == -1) { array_push(@DESTROYED, .@cropId$); debugmes("[LOGIC] -------------------------- crop destroyed"); - hideonnpc instance_npcname("#Marggo"+.@cropId$); + hideonnpc instance_npcname("#Marggo"+.@cropId$, MARGGO_ID); } // Tell the Maggot to walk to a random coordinate @@ -187,6 +187,7 @@ OnFinish: deltimer("Nylo#Marggo::OnInteract"); deltimer("Nylo#Marggo::OnSpawn"); deltimer("Nylo#Marggo::OnFinish"); + MARGGO_ID=0; .@trueratio=100*getarraysize(@DESTROYED)/169; .@ratio=100-.@trueratio; debugmes("Player lost %d crops", getarraysize(@DESTROYED)); diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt index 701501304..e6233a055 100644 --- a/npc/005-5/nylo.txt +++ b/npc/005-5/nylo.txt @@ -198,8 +198,9 @@ L_Main: // Create the Marggo .@INSTID = instance_create("MRGX@"+(.@ID), 0, IOT_NONE); + .@instanceMapName$ = instance_attachmap("005-1-1", .@INSTID, 0, .@MAP$); // Instance already exists - if (.@INSTID < 0) { + if (.@instanceMapName$ == "") { mesn; mesq l("Wait. I remember you. You ruined my crops a few seconds ago!!"); next; @@ -208,10 +209,12 @@ L_Main: close; } // It was just created, so begin Marggo Quest - .@instanceMapName$ = instance_attachmap("005-1-1", .@INSTID, 0, .@MAP$); instance_set_timeout(300, 300, .@INSTID); instance_init(.@INSTID); warp .@MAP$, 29, 20; + + // We'll need instance ID later and @vars are unreliable + MARGGO_ID=.@INSTID; doevent("Nylo#Marggo::OnStart"); closeclientdialog; close; |