diff options
32 files changed, 47 insertions, 49 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt index 1dc1ae29..fabf8c54 100644 --- a/npc/000-0-0/q'onan.txt +++ b/npc/000-0-0/q'onan.txt @@ -6,7 +6,7 @@ // Sleeping and snoring NPC. 000-0-0,29,28,0 script Q'Onan#000-0-0 402,{ - Asleep; + asleep; close; OnInit: diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index a0534ce0..94c2baf0 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -10,7 +10,7 @@ 000-0,23,20,0 script Sailors 405,6,6,{ OnTouch: - CheckClientVersion; + checkclientversion; requestlang .@lang; if (.@lang >= 0 && .@lang <= 9) Lang = .@lang; diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 5509d571..54044d06 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -31,7 +31,7 @@ mesq l("Hmm... Let's see, take this one."); next; - InventoryPlace 714, 1; + inventoryplace 714, 1; setq ShipQuests_Ale, 1; getitem "AquadaBox", 1; @@ -43,7 +43,7 @@ close; L_CallFunc: - SailorFood; + sailorfood; menu rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone, diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 7648ef52..57ca18ac 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -58,7 +58,7 @@ mesq lg("You have been so nice to me. So please, take one."); next; - InventoryPlace 715, 1; + inventoryplace 715, 1; setq ShipQuests_Astapolos, 1; getitem "CroconutBox", 1; @@ -70,7 +70,7 @@ close; L_CallFunc: - SailorFood; + sailorfood; menu rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone, diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index 8871fefa..82fa2766 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -24,7 +24,7 @@ L_Give: if (.@q > 0) goto L_Close; - InventoryPlace 514, 1; + inventoryplace 514, 1; setq ShipQuests_TreasureChest, 1; diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt index 9b48ce20..0253003a 100644 --- a/npc/000-1/cookiemaster.txt +++ b/npc/000-1/cookiemaster.txt @@ -179,7 +179,7 @@ L_Reward: set .@item, 517; set .@count, 1; - InventoryPlace 517, 1; + inventoryplace 517, 1; setq General_Cookies, 1; getitem "DeliciousCookie", 1; diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index bc312a32..97f7bb51 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -43,7 +43,7 @@ mesq l("Yeye ask too much but do too little. Take this box and stop talking."); next; - InventoryPlace 713, 1; + inventoryplace 713, 1; mesn "Narrator"; mes col(l("Couwan hands you a box full of fish."), 9); diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index e2ca632c..356d1fa8 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -54,7 +54,7 @@ L_Continue2: set .@item, 715; set .@count, 1; - InventoryPlace 715, 1; + inventoryplace 715, 1; setq ShipQuests_Gulukan, 1; getitem "CroconutBox", 1; diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index a2ab8ca8..4bd1edd3 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -40,7 +40,7 @@ L_Continue: mesq l("Surely. Take this box full of @@s.", getitemlink("Plushroom")); next; - InventoryPlace 716, 1; + inventoryplace 716, 1; setq ShipQuests_Jalad, 1; getitem "PlushroomBox", 1; @@ -52,7 +52,7 @@ L_Continue: goto L_Close; L_CallFunc: - SailorFood; + sailorfood; menu rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone, @@ -117,8 +117,7 @@ L_TaskDone: mesq l("Perfect!"); L_Close: - GoodBye; - close; + goodbye; OnInit: setnpcsex G_MALE; diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index d73c08b0..6b500f8e 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -59,7 +59,7 @@ L_Sailors: close; L_Close: - GoodBye; + goodbye; close; OnInit: diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt index 36ed3db8..ea49c239 100644 --- a/npc/000-1/max.txt +++ b/npc/000-1/max.txt @@ -103,5 +103,5 @@ OnInit: end; L_Quit: - GoodBye; + goodbye; } diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index f63266d4..403556e0 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -42,7 +42,7 @@ mesq l("Well then... Take this one!"); next; - InventoryPlace 716, 1; + inventoryplace 716, 1; setq ShipQuests_QMuller, 1; getitem "PlushroomBox", 1; @@ -54,7 +54,7 @@ close; L_CallFunc: - SailorFood; + sailorfood; menu rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone, @@ -114,7 +114,7 @@ L_TaskDone: mesq l("Good to hear!"); next; - GoodBye; + goodbye; L_Quit: closedialog; diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt index 76daf906..60dee6dc 100644 --- a/npc/000-1/sapartan.txt +++ b/npc/000-1/sapartan.txt @@ -98,5 +98,5 @@ OnInit: end; L_Quit: - GoodBye; + goodbye; } diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt index 55b3cda2..ddce00fc 100644 --- a/npc/000-1/silvio.txt +++ b/npc/000-1/silvio.txt @@ -133,7 +133,7 @@ L_Artis: next; mesq l("You should look at them when we arrive at the port, they are worth it, hehe..."); - GoodBye; + goodbye; L_ForeverAlone: mes ""; diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index 31a92759..58569809 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -40,7 +40,7 @@ mesq l("Bring this box to Gugli. He will be extremely happy!"); next; - InventoryPlace 714, 1; + inventoryplace 714, 1; setq ShipQuests_Tibbo, 1; getitem "AquadaBox", 1; @@ -52,7 +52,7 @@ goto L_Close; L_CallFunc: - SailorFood; + sailorfood; menu rif(getq(ShipQuests_Gugli) > 1, l("Task is done.")), L_TaskDone, @@ -109,8 +109,7 @@ L_TaskDone: close; L_Close: - GoodBye; - close; + goodbye; OnInit: setnpcsex G_MALE; diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index 69e1b373..1bdf7ffb 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -63,7 +63,7 @@ L_Menu: goto L_ChooseLang; L_First: - CheckClientVersion; + checkclientversion; mesn; mesq l("Hi, nice to see you!"); @@ -275,5 +275,5 @@ OnInit: end; L_Quit: - GoodBye; + goodbye; } diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index ca5c1a92..a9d2903a 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -190,7 +190,7 @@ L_GiveFood: // if (.@id == item's ID) then food is correct. // Do not put any other number than -1, 0, 1, 2 or the item's ID, that'll avoid confusion. - InventoryPlace 507, 3; + inventoryplace 507, 3; delitem .@id, 1; setcamnpc; diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 16ce2f01..3663e30b 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -121,7 +121,7 @@ L_OpenCroconut: L_GotAll: mes ""; - InventoryPlace 717, 1; + inventoryplace 717, 1; delitem "PiouLegs", 2; delitem "HalfCroconut", 1; @@ -164,7 +164,7 @@ L_PoisonJulia: setq ShipQuests_ChefGado, 4; set Zeny, Zeny + 200; message strcharinfo(0), l("You receive @@ E!", 200); - InventoryPlace 502, 2; + inventoryplace 502, 2; getitem "Bread", 1; getexp 15, 0; diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index bb4d1cdf..50ff9aa1 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -25,7 +25,7 @@ L_Give: if (.@q > 1) goto L_Quit; set .@item, 1300; set .@count, 2; - InventoryPlace 1300, 2; + inventoryplace 1300, 2; setq ShipQuests_Arpan, 2; getitem "CreasedShirt", 1; diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index 01a6fae0..7de0058b 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -7,7 +7,7 @@ // Sleeping and grumbling NPC. 000-2-1,32,38,0 script Devis 410,{ - Asleep; + asleep; close; OnInit: diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt index 6ab34afc..bdb85e4a 100644 --- a/npc/000-2-1/knife.txt +++ b/npc/000-2-1/knife.txt @@ -29,7 +29,7 @@ L_Give: mes ""; set .@item, 3500; set .@count, 1; - InventoryPlace 3500, 1; + inventoryplace 3500, 1; setq ShipQuests_Knife, 1; getitem "Knife", 1; diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index 2a428d47..f5ff8ee5 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -6,7 +6,7 @@ // Sleeping and snoring NPC. 000-2-1,53,38,0 script Q'Onan#000-2-1 402,{ - Asleep; + asleep; close; OnInit: diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt index 12622152..fc5bd405 100644 --- a/npc/000-2-1/savepoint.txt +++ b/npc/000-2-1/savepoint.txt @@ -5,7 +5,7 @@ // Saves locations in 000-2-1 map. 000-2-1,40,37,0 script #name1 901,{ - SavePoint "000-2-1.gat", 40, 37; + savepoint "000-2-1.gat", 40, 37; close; OnInit: @@ -14,7 +14,7 @@ OnInit: } 000-2-1,46,37,0 script #name2 901,{ - SavePoint "000-2-1.gat", 46, 37; + savepoint "000-2-1.gat", 46, 37; close; OnInit: @@ -23,7 +23,7 @@ OnInit: } 000-2-1,50,38,0 script #name3 901,{ - SavePoint "000-2-1.gat", 50, 38; + savepoint "000-2-1.gat", 50, 38; close; OnInit: @@ -32,7 +32,7 @@ OnInit: } 000-2-1,55,40,0 script #name4 901,{ - SavePoint "000-2-1.gat", 55, 40; + savepoint "000-2-1.gat", 55, 40; close; OnInit: diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt index f4bf2d1b..185c30a2 100644 --- a/npc/000-2-3/box.txt +++ b/npc/000-2-3/box.txt @@ -74,7 +74,7 @@ L_NoQuest: mesq l("Now go outside and talk with Gugli, he'll tell you what provisions we need."); next; - InventoryPlace 718, 1; + inventoryplace 718, 1; setq ShipQuests_Nard, 1; getitem "JohanneKey", 1; @@ -86,7 +86,7 @@ L_Give: mesn "Nard"; mesq l("Congrats, you are now part of the crew. Thanks again for your help."); - InventoryPlace 2900, 1; + inventoryplace 2900, 1; setq ShipQuests_Nard, 5; getitem "Bandana", 1; diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 6836d2b0..42d7d1b3 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -101,7 +101,7 @@ L_NeedContent: mesq l("Now go outside and talk with Gugli, he'll tell you what we need."); next; - InventoryPlace 718, 1; + inventoryplace 718, 1; setq ShipQuests_Nard, 1; getitem "JohanneKey", 1; diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index de9b36f4..563d1b00 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -177,7 +177,7 @@ L_Reward: set .@item, 517; set .@count, 1; - InventoryPlace 517, 1; + inventoryplace 517, 1; setq General_Cookies, 1; getitem "DeliciousCookie", 1; @@ -242,7 +242,7 @@ L_LostCookie: set .@item, 517; set .@count, 1; - InventoryPlace 517, 1; + inventoryplace 517, 1; getitem "DeliciousCookie", 1; npctalk3 l("You receive a @@!", getitemlink("DeliciousCookie")); diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt index 42a99796..ca28669d 100644 --- a/npc/functions/asleep.txt +++ b/npc/functions/asleep.txt @@ -7,7 +7,7 @@ // Variables: // .@rand = Random number between the number of "sleeping" choice. -function script Asleep { +function script asleep { set .@rand, rand(3); if (.@rand == 0) npctalk3 l("Zzzzzzzzz..."); diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt index bd539dd4..4ecdf34b 100644 --- a/npc/functions/clientversion.txt +++ b/npc/functions/clientversion.txt @@ -4,7 +4,7 @@ // Description: // Function checking the client version and reports if it is too old. -function script CheckClientVersion { +function script checkclientversion { if (ClientVersion > 1) return; mesn "Narrator"; diff --git a/npc/functions/goodbye.txt b/npc/functions/goodbye.txt index 016822e7..ea060099 100644 --- a/npc/functions/goodbye.txt +++ b/npc/functions/goodbye.txt @@ -6,7 +6,7 @@ // Variables: // .@rand = Random number between the number of "goodbye" choice. -function script GoodBye { +function script goodbye { closedialog; set .@rand, rand(13); diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt index 02c013de..58b60754 100644 --- a/npc/functions/inventoryplace.txt +++ b/npc/functions/inventoryplace.txt @@ -10,7 +10,7 @@ // .@iteminfo = Item information type. (See doc for list of item's types) // .@countitem = Count item's number. -function script InventoryPlace { +function script inventoryplace { getinventorylist; set .@iteminfo, getiteminfo(getarg(0), 2); set .@countitem, countitemcolor(getarg(0)); diff --git a/npc/functions/sailordialogue.txt b/npc/functions/sailordialogue.txt index 7d51d995..6a2bc108 100644 --- a/npc/functions/sailordialogue.txt +++ b/npc/functions/sailordialogue.txt @@ -5,7 +5,7 @@ // Description: // Random some sailors's dialogues between two categories of NPCs. -function script SailorFood { +function script sailorfood { mesn; set .@q, rand(0, 400) / 100; diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt index bc2035a3..1957ef81 100644 --- a/npc/functions/savepoint.txt +++ b/npc/functions/savepoint.txt @@ -9,7 +9,7 @@ // getarg(1) x's value, // getarg(2) y's value. -function script SavePoint { +function script savepoint { message strcharinfo(0), "Your position has been saved."; savepoint getarg(0), getarg(1), getarg(2); |