Skip to content

Commit

Permalink
Adjusted instance scripts to new format
Browse files Browse the repository at this point in the history
* Follow up to c97be60.
* Adjusted script command instance_create to include owner ID.
  • Loading branch information
aleos89 committed May 14, 2016
1 parent c97be60 commit 8f7d220
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion npc/instances/EndlessTower.txt
Expand Up @@ -220,7 +220,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
next;
switch(select("Generate dungeon "+.@md_name$+":Enter the dungeon:Return to Alberta:Cancel")) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "Party Name: "+ getpartyname(.@party_id);
mes "Party Leader: "+strcharinfo(0);
mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
Expand Down
2 changes: 1 addition & 1 deletion npc/instances/NydhoggsNest.txt
Expand Up @@ -114,7 +114,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper 111,8,8,{
next;
switch(select("Please allow me to enter.:I want to go in.:I want to leave.")) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Yggdrasil Gatekeeper]";
mes "The Guardian seems to wish to be alone. I will go in and check, please wait out here.";
close;
Expand Down
2 changes: 1 addition & 1 deletion npc/instances/OrcsMemory.txt
Expand Up @@ -52,7 +52,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 406,{
next;
switch(select("Reserve the "+.@md_name$+":Enter the Dungeon:Cancel")) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "Party Name: "+ getpartyname(.@party_id);
mes "Party Leader: "+strcharinfo(0);
mes "^0000ff"+.@md_name$+" ^000000 - Reservation Failed.";
Expand Down
2 changes: 1 addition & 1 deletion npc/instances/SealedShrine.txt
Expand Up @@ -113,7 +113,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
mes "Name of the leader is "+strcharinfo(0)+"...";
if (instance_create("Sealed Catacomb") < 0) {
if (instance_create("Sealed Catacomb", .@party_id) < 0) {
mes "Umm... But it seems that there is a problem here... I'll check quickly. Please wait.";
}
else {
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/BakonawaLake.txt
Expand Up @@ -65,7 +65,7 @@ ma_scene01,174,179,4 script Taho 541,{
}
switch(.@i) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Taho]";
mes "Oh, the rope got dropped. I have to make a new one.";
close;
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/BangungotHospital.txt
Expand Up @@ -258,7 +258,7 @@ L_Enter:
next;
switch(select(((getarg(0))?"Prepare to enter the second floor.":"")+":Enter the second floor.:Do not enter.")) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Nurse Maenne]";
mes "A critical situation has happened.";
mes "You can't go up to the 2nd floor.";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/BuwayaCave.txt
Expand Up @@ -75,7 +75,7 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 570,{
erasequest 4229;
// fall through
}
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Guard]";
mes "Party name is... "+getpartyname(.@party_id)+".";;
mes "Party leader is... "+strcharinfo(0);
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/EclageInterior.txt
Expand Up @@ -31,7 +31,7 @@ ecl_hub01,132,12,3 script Chief of Staff#tl02 435,{
next;
switch (select("Enter it.:Forget it.")) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Shenime]";
mes "There are some soldiers dispatched by Mayor not too long ago.";
mes "I should sure hope that you aren't the disturbance they're looking for, right?";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/HazyForest.txt
Expand Up @@ -83,7 +83,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 447,{
mes "[Laphine Soldier]";
mes "Party Name "+getpartyname(.@party_id)+"...";
mes "Party Leader "+strcharinfo(0)+"...";
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "Hmm...";
next;
mes "[Laphine Soldier]";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/MalangdoCulvert.txt
Expand Up @@ -402,7 +402,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 545,{
mes "What a rookie.";
close;
case 2:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "Party name: "+getpartyname(.@party_id);
mes "Party leader: "+strcharinfo(0);
mes "^0000ff"+.@md_name$+"^000000 - Reservation Failed!";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/OctopusCave.txt
Expand Up @@ -84,7 +84,7 @@ mal_dun01,151,235,5 script Starfish 551,{
}
if (.@playtime == 2) erasequest 4197;
if (countitem(6442)) {
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "[Starfish]";
mes "Party name is... "+getpartyname(.@party_id)+".";
mes "Party leader is... "+strcharinfo(0)+".";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/OldGlastHeim.txt
Expand Up @@ -41,7 +41,7 @@ glast_01,204,273,6 script Hugin#ghinstance 755,{
set .@menu$, ":Enter the Old Glast Heim.:Cancel.";
switch(select(.@menu$)) {
case 1:
if (instance_create(.@md_name$) < 0) {
if (instance_create(.@md_name$, .@party_id) < 0) {
mes "Party Name: "+.@p_name$;
mes "Party Leader: "+strcharinfo(0);
mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
Expand Down
2 changes: 1 addition & 1 deletion npc/re/instances/WolfchevLaboratory.txt
Expand Up @@ -819,7 +819,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{
}
}
if (getpartyleader(getcharid(1),2) == getcharid(0)) {
if (instance_create("Wolfchev's Laboratory") < 0) {
if (instance_create("Wolfchev's Laboratory", getcharid(1)) < 0) {
mes "[Wolfchev]";
mes "Hmm.. Lab entering system is a bit weird. Would wait for me to check the system?";
close;
Expand Down

0 comments on commit 8f7d220

Please sign in to comment.