diff options
Diffstat (limited to 'npc')
76 files changed, 279 insertions, 151 deletions
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt index 17ff1c24..a6e47793 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,5 +1,4 @@ // Map 000-0-0: La Johanne, First Deck (Sailor's room) -map: 000-0-0.gat npc: npc/000-0-0/mapflags.txt npc: npc/000-0-0/q'onan.txt npc: npc/000-0-0/sailors.txt diff --git a/npc/000-0-0/mapflags.txt b/npc/000-0-0/mapflags.txt index 93ac0bae..38c8e38a 100644 --- a/npc/000-0-0/mapflags.txt +++ b/npc/000-0-0/mapflags.txt @@ -1 +1,2 @@ -000-0-0.gat mapflag invisible +// 000-0-0.gat mapflag invisible + diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt index 01ed1cbc..f92a289e 100644 --- a/npc/000-0-0/q'onan.txt +++ b/npc/000-0-0/q'onan.txt @@ -5,7 +5,8 @@ // Description: // Sleeping and snoring NPC. -000-0-0.gat,29,28,0,1 script Q'Onan 302,{ +// Gender = 1 +000-0-0,29,28,0 script Q'Onan 302,{ callfunc "Asleep"; } diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index 53c89ea5..7dfcdc08 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -6,7 +6,8 @@ // Introduction scene where two sailors talk about how the player was found on his raft. // Elmo will handle dialogs between both NPCs. -000-0-0.gat,26,23,0,1 script Elmo 309,{ +// Gender = 1 +000-0-0,26,23,0 script Elmo 309,{ OnTalk: setcamnpc; @@ -71,12 +72,13 @@ OnTalk: restorecam; warp "000-2-1.gat", 50, 38; savepoint "000-2-1.gat", 50, 38; - setskill 1, 1; // Add Emote skill. + addtoskill 1, 1; // Add Emote skill. closedialog; close; } -000-0-0.gat,25,23,0,1 script Magic Arpan 307,{ +// Gender = 1 +000-0-0,25,23,0 script Magic Arpan 307,{ doevent "Elmo::OnTalk"; close; } diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index f963c70b..14cd8e00 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,4 +1,3 @@ // Map 000-0: Oceania -map: 000-0.gat npc: npc/000-0/mapflags.txt npc: npc/000-0/sailors.txt diff --git a/npc/000-0/mapflags.txt b/npc/000-0/mapflags.txt index 1383e37b..f8cebe45 100644 --- a/npc/000-0/mapflags.txt +++ b/npc/000-0/mapflags.txt @@ -1 +1,2 @@ -000-0.gat mapflag invisible +// 000-0.gat mapflag invisible + diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 3ba40b55..8837c3d9 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -7,7 +7,8 @@ // Description: // Starting script of Evol Online. -000-0.gat,23,20,0,1 script Sailors 305,6,6,{ +// Gender = 1 +000-0,23,20,0 script Sailors 305,6,6,{ OnTouch: callfunc "CheckClientVersion"; diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt index 54e0c6a1..6e6697eb 100644 --- a/npc/000-1/_import.txt +++ b/npc/000-1/_import.txt @@ -1,5 +1,4 @@ // Map 000-1: Desert Island -map: 000-1.gat npc: npc/000-1/_mobs.txt npc: npc/000-1/_warps.txt npc: npc/000-1/ale.txt diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 0ffeba31..a8284797 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -6,7 +6,9 @@ // Sailor part of the Gugli's quest. // Aquada box. -000-1.gat,55,23,0,1 script Ale 105;2,{ +// Size = 2 +// Gender = 1 +000-1,55,23,0 script Ale 105,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 1da7e0fa..a05b404b 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -7,7 +7,9 @@ // Sailor part of the Gugli's quest. // Croconut box. -000-1.gat,22,50,0,1 script Astapolos 107;2,{ +// Size = 2 +// Gender = 1 +000-1,22,50,0 script Astapolos 107,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index dd1d3f88..2edc5a26 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -11,7 +11,8 @@ // 0 Treasure Chest has not been opened yet. // 1 Treasure Chest has been opened. -000-1.gat,83,70,0 script #chest 316;2,{ +// Size = 2 +000-1,83,70,0 script #chest 316,{ set @q, getq(ShipQuests_TreasureChest); if (getnpcdir ("") == 4) goto L_Give; @@ -28,7 +29,7 @@ L_Give: setq ShipQuests_TreasureChest, 1; - set zeny, zeny + 100; + set Zeny, Zeny + 100; getitem "OldBook", 1; npctalk3 l("You open the treasure chest."); diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt index 242c9483..6465ccdd 100644 --- a/npc/000-1/cookiemaster.txt +++ b/npc/000-1/cookiemaster.txt @@ -6,7 +6,9 @@ // Description: // Cookie NPC, beware, if you don't take your cookie, she'll keep it! -000-1.gat,97,50,0,0 script Cookie Master 319;2,{ +// Size = 2 +// Gender = 0 +000-1,97,50,0 script Cookie Master 319,{ if (getq(GeneraL_Cookies) == 1) goto L_GetCookie; diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index 528279fa..1fad7c63 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -12,7 +12,9 @@ // 1 Spoke, and received the quest scam. // 2 Done quest scam. -000-1.gat,89,36,0,1 script Couwan 111;2,{ +// Size = 2 +// Gender = 1 +000-1,89,36,0 script Couwan 111,{ set @q, getq(ShipQuests_Couwan); if (@q == 1) goto L_QuestGiven; if (@q > 1) goto L_QuestDone; diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index 04eff9d8..ca8691e6 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -11,7 +11,9 @@ // 1 Treasure Chest has been opened. -000-1.gat,89,95,0,1 script Darlin 103;14,{ +// Size = 14 +// Gender = 1 +000-1,89,95,0 script Darlin 103,{ set @q, getq(ShipQuests_TreasureChest); mesn; diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt index fdebe560..825d6bc3 100644 --- a/npc/000-1/fexil.txt +++ b/npc/000-1/fexil.txt @@ -4,7 +4,9 @@ // Description: // Newbie merchant. -000-1.gat,83,98,0,1 script Fexil 108;2,{ +// Size = 2 +// Gender = 1 +000-1,83,98,0 script Fexil 108,{ mesn; mesq lg("Greetings traveler."); next; diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index 20b8c358..fc2bda2b 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -22,7 +22,9 @@ // 21 Gugli gives you the task. // 22 Gave all of the box to Gugli. -000-1.gat,85,108,0,1 script Gugli 313;2,{ +// Size = 2 +// Gender = 1 +000-1,85,108,0 script Gugli 313,{ OnTalk: mesn; @@ -82,7 +84,7 @@ L_TaskGiven: L_Menu: menu rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), L_Couwan, - rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some food for you.")), L_CollectSmthing, + rif(countitemcolor("AquadaBox") > 0 || countitemcolor("CroconutBox") > 0 || countitemcolor("PlushroomBox") > 0, l("I have some food for you.")), L_CollectSmthing, rif(getq(ShipQuests_Gugli) < 2, l("Who should I search for?")), L_SailorNames, rif(getq(ShipQuests_Gugli) < 2, l("Where can I find your crew?")), L_Location, l("Bye!"), L_Quit; @@ -109,12 +111,12 @@ L_CollectSmthing: mesq l("Good job!"); next; - if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2; - if (countitem("CroconutBox") == 2) delitem "CroconutBox", 2; - if (countitem("PlushroomBox") == 2) delitem "PlushroomBox", 2; - if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1; - if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1; - if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1; + if (countitemcolor("AquadaBox") == 2) delitem "AquadaBox", 2; + if (countitemcolor("CroconutBox") == 2) delitem "CroconutBox", 2; + if (countitemcolor("PlushroomBox") == 2) delitem "PlushroomBox", 2; + if (countitemcolor("AquadaBox") == 1) delitem "AquadaBox", 1; + if (countitemcolor("CroconutBox") == 1) delitem "CroconutBox", 1; + if (countitemcolor("PlushroomBox") == 1) delitem "PlushroomBox", 1; mesq l("You still need to give me boxes from: "); if (getq(ShipQuests_Astapolos) == 0) mesq l("- Astapolos"); @@ -139,9 +141,9 @@ L_Couwan: next; mesq l("May this be a lesson for you."); - if (countitem("FishBox") > 0) delitem "FishBox", 1; + if (countitemcolor("FishBox") > 0) delitem "FishBox", 1; setq ShipQuests_Couwan, 2; - set zeny, zeny+10; + set Zeny, Zeny+10; getexp 40, 0; message strcharinfo(0), l("You receive @@ E!", 10); @@ -185,15 +187,15 @@ L_Lean: close; L_TaskDone: - if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2; - if (countitem("CroconutBox") == 2) delitem "CroconutBox", 2; - if (countitem("PlushroomBox") == 2) delitem "PlushroomBox", 2; - if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1; - if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1; - if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1; + if (countitemcolor("AquadaBox") == 2) delitem "AquadaBox", 2; + if (countitemcolor("CroconutBox") == 2) delitem "CroconutBox", 2; + if (countitemcolor("PlushroomBox") == 2) delitem "PlushroomBox", 2; + if (countitemcolor("AquadaBox") == 1) delitem "AquadaBox", 1; + if (countitemcolor("CroconutBox") == 1) delitem "CroconutBox", 1; + if (countitemcolor("PlushroomBox") == 1) delitem "PlushroomBox", 1; setq ShipQuests_Gugli, 2; - set zeny, zeny+250; + set Zeny, Zeny+250; getexp 50, 0; mes ""; @@ -229,7 +231,8 @@ L_Quit: } -000-1.gat,83,107,0,1 script GugliBarrierCheck 0,2,0,{ +// Gender = 1 +000-1,83,107,0 script GugliBarrierCheck 32767,2,0,{ set @gugli, getq(ShipQuests_Gugli); if (@gugli > 0) close; doevent "Gugli::OnTalk"; diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index 4bc85b52..c7c2d8c6 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -7,7 +7,9 @@ // Sailor part of the Gugli's quest. // Croconut box. -000-1.gat,54,90,0,1 script Gulukan 113;2,{ +// Size = 2 +// Gender = 1 +000-1,54,90,0 script Gulukan 113,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index 60a6340e..31145c98 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -7,7 +7,9 @@ // Sailor part of the Gugli quest. // Plushroom box. -000-1.gat,46,35,0,1 script Jalad 112;2,{ +// Size = 2 +// Gender = 1 +000-1,46,35,0 script Jalad 112,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index b1510b09..deeb7373 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -6,7 +6,9 @@ // Description: // Sailor who gives some informations to the player. -000-1.gat,79,108,0,1 script Lean 106;2,{ +// Size = 2 +// Gender = 1 +000-1,79,108,0 script Lean 106,{ set @gugli, getq(ShipQuests_Gugli); mesn; diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt index 9037776d..3659e82d 100644 --- a/npc/000-1/max.txt +++ b/npc/000-1/max.txt @@ -6,7 +6,9 @@ // Description: // Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller. -000-1.gat,72,110,0,1 script Max 115;2,{ +// Size = 2 +// Gender = 1 +000-1,72,110,0 script Max 115,{ set @gugli, getq(ShipQuests_Gugli); set @knife, getq(ShipQuests_Knife); diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index 09cbac77..55c3199b 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -6,7 +6,9 @@ // Sailor part of the Gugli's quest. // Plushroom box. -000-1.gat,35,69,0,1 script Q'Muller 104;2,{ +// Size = 2 +// Gender = 1 +000-1,35,69,0 script Q'Muller 104,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-1/panels.txt b/npc/000-1/panels.txt index 4ea7488a..151e39d0 100644 --- a/npc/000-1/panels.txt +++ b/npc/000-1/panels.txt @@ -5,7 +5,8 @@ // Description: // Panels to give advice to the players. -000-1.gat,65,93,0 script #panel 999;2,{ +// Size = 2 +000-1,65,93,0 script #panel 999,{ mesn "Narrator"; mes col(l("Your heart quickens as your gaze focuses upon a small wooden panel, partly obscured under a layer of wind-blown sand."), 9); @@ -23,7 +24,8 @@ close; } -000-1.gat,89,51,0 script #panel 999;2,{ +// Size = 2 +000-1,89,51,0 script #panel 999,{ mesn "Narrator"; mes col(l("This panel looks in rather good shape, as though some people take care of it regularly. Maybe it has important information."), 9); diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt index d13537bb..cf89fa22 100644 --- a/npc/000-1/sapartan.txt +++ b/npc/000-1/sapartan.txt @@ -5,7 +5,9 @@ // Description: // Friend of Max, he gives some information on combat system. -000-1.gat,74,111,0,1 script Sapartan 314;2,{ +// Size = 2 +// Gender = 1 +000-1,74,111,0 script Sapartan 314,{ mesn; mesq l("Hey Max, it's @@!", strcharinfo(0)); next; diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt index eb301e94..a161788e 100644 --- a/npc/000-1/shop.txt +++ b/npc/000-1/shop.txt @@ -4,4 +4,5 @@ // Description: // Fexil's shop bag. -000-1.gat,84,98,0,1 shop Bag 109,PiouLegs :-1,Bread :-1,Croconut :-1,Aquada :-1,Armbands :-1,LousyMoccasins :-1,PiouSlayer :-1 +// Gender = 1 +000-1,84,98,0 shop Bag 109,PiouLegs :-1,Bread :-1,Croconut :-1,Aquada :-1,Armbands :-1,LousyMoccasins :-1,PiouSlayer :-1 diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt index 47c7c05f..a482aa68 100644 --- a/npc/000-1/silvio.txt +++ b/npc/000-1/silvio.txt @@ -5,7 +5,9 @@ // Description: // Pervert and arrogant sailor. -000-1.gat,86,99,0,1 script Silvio 312;2,{ +// Size = 2 +// Gender = 1 +000-1,86,99,0 script Silvio 312,{ mesn; mesq l("Hey!"); next; diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt index be0c2c92..ee1db32c 100644 --- a/npc/000-1/tarlan.txt +++ b/npc/000-1/tarlan.txt @@ -4,7 +4,9 @@ // Description: // Sailor hitting a crocotree, then being struck by a falling croconut. -000-1.gat,33,37,0,1 script Tarlan 315;2,{ +// Size = 2 +// Gender = 1 +000-1,33,37,0 script Tarlan 315,{ setnpcdir 2; mesn; diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index 62731f41..96bd91be 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -7,7 +7,9 @@ // Sailor part of the Gugli's quest. // Aquada box. -000-1.gat,34,111,0,1 script Tibbo 110;2,{ +// Size = 2 +// Gender = 1 +000-1,34,111,0 script Tibbo 110,{ set @g, getq(ShipQuests_Gugli); if (@g == 0) goto L_NoTask; diff --git a/npc/000-2-0/_import.txt b/npc/000-2-0/_import.txt index b64f95c7..832013d6 100644 --- a/npc/000-2-0/_import.txt +++ b/npc/000-2-0/_import.txt @@ -1,5 +1,4 @@ // Map 000-2-0: La Johanne, First Deck -map: 000-2-0.gat npc: npc/000-2-0/_warps.txt npc: npc/000-2-0/billybons.txt npc: npc/000-2-0/doors.txt diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt index 237e5c26..0da101d9 100644 --- a/npc/000-2-0/billybons.txt +++ b/npc/000-2-0/billybons.txt @@ -4,7 +4,9 @@ // Description: // Drunk easteregg telling about the player's past. -000-2-0.gat,20,23,0,1 script Billy Bons 311;3,{ +// Size = 3 +// Gender = 1 +000-2-0,20,23,0 script Billy Bons 311,{ if (rand(5) == 2) goto L_Hic; diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt index 7cf311a6..3bb17f4f 100644 --- a/npc/000-2-0/doors.txt +++ b/npc/000-2-0/doors.txt @@ -16,11 +16,12 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-0.gat,20,28,0,1 script AreaNPC 0,0,0,{ +// Gender = 1 +000-2-0,20,28,0 script AreaNPC 32767,0,0,{ OnTouch: set @nard, getq(ShipQuests_Nard); - if (@nard > 0 && countitem("JohanneKey") > 0) goto L_Key; + if (@nard > 0 && countitemcolor("JohanneKey") > 0) goto L_Key; // if (@nard == 2) goto L_GotoNard; // if (@nard == 3) goto L_End; @@ -54,7 +55,8 @@ L_End: close; } -000-2-0.gat,33,28,0,1 script AreaNPC 0,0,0,{ +// Gender = 1 +000-2-0,33,28,0 script AreaNPC 32767,0,0,{ OnTouch: set @julia, getq(ShipQuests_Julia); diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index b37efcab..7ed69ce3 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -32,8 +32,10 @@ // 24 ChefGado Quest completed and "Introduction" chapter finalized. // 25 Reward taken from the box. -000-2-0.gat,27,24,0,0 script Julia 304,2,10;10,{ - setskill 1, 1; // Add Emote skill. +// Size = 10 +// Gender = 0 +000-2-0,27,24,0 script Julia 304,2,10,{ + addtoskill 1, 1; // Add Emote skill. mesn; mesq lg("Hello dear!"); @@ -48,8 +50,8 @@ L_Menu: menu rif(@q3 == 3 && @q2 == 0, l("I heard rumors about some old hostilities between you and Gado. Are they true?")), L_Rumors, - rif(@q2 == 2 && countitem("PoisonedDish", 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret, - rif(@q2 == 2 && countitem("PoisonedDish", 1), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia, + rif(@q2 == 2 && countitemcolor("PoisonedDish", 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), L_Regret, + rif(@q2 == 2 && countitemcolor("PoisonedDish", 1), l("I have brought you a tasty present for your delicate mouth.")), L_PoisonJulia, lg("I made a mistake, I would like to change my language."), L_ChooseLang, l("Could you explain to me where I am?"), L_WhereIam, l("What happened to me?"), L_What, @@ -208,7 +210,7 @@ L_PoisonJulia: mesq l("Seems yummy! Let me taste it!"); next; mesq l("Hmmm, hm... *cough*, *cough*, *burp*, *cough*. What... What is that?!... *cough*, *burp*... Damn Gado... *cough*"); - if (countitem("PoisonedDish") > 0) delitem "PoisonedDish", 1; + if (countitemcolor("PoisonedDish") > 0) delitem "PoisonedDish", 1; setq ShipQuests_ChefGado, 3; close; @@ -229,7 +231,7 @@ L_Regret: mesq l("Take this money for your wise choice. But do not try it again. The open sea has been merciful with you once... Do not further tempt the fates!"); setq ShipQuests_ChefGado, 5; - set zeny, zeny + 200; + set Zeny, Zeny + 200; message strcharinfo(0), l("You receive @@ E!", 200); getexp 15, 0; @@ -264,7 +266,7 @@ L_Rumors: mesq l("Take this money as a reward for your nice words."); setq ShipQuests_ChefGado, 6; - set zeny, zeny + 100; + set Zeny, Zeny + 100; message strcharinfo(0), l("You receive @@ E!", 100); getexp 8, 0; diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt index 95f19646..22c562ff 100644 --- a/npc/000-2-0/note.txt +++ b/npc/000-2-0/note.txt @@ -6,7 +6,8 @@ // Description: // A small note presenting the 6 main rules of Evol Online. -000-2-0.gat,29,25,0 script Note 116;2,{ +// Size = 2 +000-2-0,29,25,0 script Note 116,{ mesn "Narrator"; mes col(l("There is a paper with some rules written on it."), 9); next; diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt index 5a6cf40b..d0dce865 100644 --- a/npc/000-2-1/_import.txt +++ b/npc/000-2-1/_import.txt @@ -1,5 +1,4 @@ // Map 000-2-1: La Johanne, Second Deck -map: 000-2-1.gat npc: npc/000-2-1/_mobs.txt npc: npc/000-2-1/_warps.txt npc: npc/000-2-1/alige.txt diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index bc235aa4..78526fa8 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -17,7 +17,8 @@ // 2 Accept the task. // 3 Bring first food. -000-2-1.gat,43,32,0,1 script AligeTrigger 0,1,1,{ +// Gender = 1 +000-2-1,43,32,0 script AligeTrigger 32767,1,1,{ OnTouch: if (getq(ShipQuests_Alige) > 0) close; @@ -47,7 +48,9 @@ OnTimer190: end; } -000-2-1.gat,43,31,0,1 script Alige 301;2,{ +// Size = 2 +// Gender = 1 +000-2-1,43,31,0 script Alige 301,{ set @q, getq(ShipQuests_Alige); if (@q > 1) goto L_AskForFood; @@ -165,20 +168,20 @@ L_Accepted: L_GiveFood: mes ""; menu - rif(countitem(501, 1), l(getitemname("Acorn"))), 0, - rif(countitem(502, 1), l(getitemname("Bread"))), 502, - rif(countitem(503, 1), l(getitemname("Fungus"))), 503, - rif(countitem(504, 1), l(getitemname("Cheese"))), 504, - rif(countitem(505, 1), l(getitemname("PiouLegs"))), 505, - rif(countitem(506, 1), l(getitemname("LettuceLeaf"))), 0, - rif(countitem(507, 1), l(getitemname("Piberries"))), 2, - rif(countitem(508, 1), l(getitemname("SeaDrops"))), 1, - rif(countitem(509, 1), l(getitemname("Aquada"))), 509, - rif(countitem(510, 1), l(getitemname("PinkBlobime"))), 1, - rif(countitem(512, 1), l(getitemname("HalfCroconut"))), 512, - rif(countitem(513, 1), l(getitemname("Croconut"))), 0, - rif(countitem(515, 1), l(getitemname("Plushroom"))), 515, - rif(countitem(516, 1), l(getitemname("PumpkinSeeds"))), 1, + rif(countitemcolor(501, 1), l(getitemname("Acorn"))), 0, + rif(countitemcolor(502, 1), l(getitemname("Bread"))), 502, + rif(countitemcolor(503, 1), l(getitemname("Fungus"))), 503, + rif(countitemcolor(504, 1), l(getitemname("Cheese"))), 504, + rif(countitemcolor(505, 1), l(getitemname("PiouLegs"))), 505, + rif(countitemcolor(506, 1), l(getitemname("LettuceLeaf"))), 0, + rif(countitemcolor(507, 1), l(getitemname("Piberries"))), 2, + rif(countitemcolor(508, 1), l(getitemname("SeaDrops"))), 1, + rif(countitemcolor(509, 1), l(getitemname("Aquada"))), 509, + rif(countitemcolor(510, 1), l(getitemname("PinkBlobime"))), 1, + rif(countitemcolor(512, 1), l(getitemname("HalfCroconut"))), 512, + rif(countitemcolor(513, 1), l(getitemname("Croconut"))), 0, + rif(countitemcolor(515, 1), l(getitemname("Plushroom"))), 515, + rif(countitemcolor(516, 1), l(getitemname("PumpkinSeeds"))), 1, l("I don't have anything good for you today."), -1; set @id, @menuret; @@ -186,7 +189,7 @@ L_GiveFood: if (@id == 0) goto L_NoReward; // In case of wrong food. if (@id == 1) goto L_Poison; // In case of poisoned food. if (@id == 2) goto L_NoMore; // In case of Piberries. - if (countitem(@id) == 0) goto L_Quit; + if (countitemcolor(@id) == 0) goto L_Quit; // 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. diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 091f0e84..22c3f03e 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -16,21 +16,24 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-1.gat,49,36,0,1 script LeftDoorCheck 0,0,0,{ +// Gender = 1 +000-2-1,49,36,0 script LeftDoorCheck 32767,0,0,{ set @q, getq(ShipQuests_Arpan); if (@q == 0) doevent "Magic Arpan::OnTalk"; close; } -000-2-1.gat,54,36,0,1 script RightDoorCheck 0,0,0,{ +// Gender = 1 +000-2-1,54,36,0 script RightDoorCheck 32767,0,0,{ set @q, getq(ShipQuests_Arpan); if (@q == 0) doevent "Magic Arpan::OnTalk"; close; } -000-2-1.gat,47,32,0,1 script LeftBarrierCheck 0,0,2,{ +// Gender = 1 +000-2-1,47,32,0 script LeftBarrierCheck 32767,0,2,{ set @q, getq(ShipQuests_Arpan); if (@q > 2) close; if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; @@ -57,7 +60,8 @@ L_EquipDone: close; } -000-2-1.gat,56,32,0,1 script RightBarrierCheck 0,0,2,{ +// Gender = 1 +000-2-1,56,32,0 script RightBarrierCheck 32767,0,2,{ set @q, getq(ShipQuests_Arpan); if (@q > 2) close; if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; @@ -84,7 +88,9 @@ L_EquipDone: close; } -000-2-1.gat,49,33,0,1 script Magic Arpan 307;5,{ +// Size = 5 +// Gender = 1 +000-2-1,49,33,0 script Magic Arpan 307,{ set @q, getq(ShipQuests_Arpan); set @q_julia, getq(ShipQuests_Julia); if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; @@ -198,7 +204,7 @@ L_WhereOldClothes: setq ShipQuests_ArpanMoney, 1; set @q, getq(ShipQuests_Arpan); - set zeny, zeny+10; + set Zeny, Zeny+10; message strcharinfo(0), l("You receive @@ E!", 10); goto L_BeforeMenu; diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 53664db5..c1143557 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -16,14 +16,16 @@ // 5 Quest complete. Julia wins (poison dish returned). // 6 Quest complete. Julia wins. -000-2-1.gat,27,28,0,1 script Chef Gado 318;2,{ +// Size = 2 +// Gender = 1 +000-2-1,27,28,0 script Chef Gado 318,{ set @q, getq(ShipQuests_ChefGado); set @n, getq(ShipQuests_Nard); if (@q == 1) goto L_QuestAccepted; if (@q == 2) goto L_PoisonAccepted; if (@q == 3) goto L_PoisonJulia; if (@q == 4) goto L_QuestComplete; - if (@q == 5 && countitem("PoisonedDish") > 0) goto L_Aborting; + if (@q == 5 && countitemcolor("PoisonedDish") > 0) goto L_Aborting; if (@q > 4) goto L_QuestAborted; if (@n == 3) goto L_QuestStart; @@ -103,7 +105,7 @@ L_QuestAccepted: next; menu - rif(countitem("PiouLegs") > 1 && countitem("HalfCroconut") > 0 && countitem("Aquada") > 0 && countitem("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll, + rif(countitemcolor("PiouLegs") > 1 && countitemcolor("HalfCroconut") > 0 && countitemcolor("Aquada") > 0 && countitemcolor("SeaDrops") > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll, l("What are your needs?"), L_Need, l("Where can I find a half croconut?"), L_OpenCroconut, l("Not yet. I will be back soon."), L_Quit; @@ -162,7 +164,7 @@ L_PoisonJulia: mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!"); setq ShipQuests_ChefGado, 4; - set zeny, zeny + 200; + set Zeny, Zeny + 200; message strcharinfo(0), l("You receive @@ E!", 200); callfunc "InventoryPlace", 502, 2; getitem "Bread", 1; @@ -190,7 +192,7 @@ L_Aborting: next; mesq lg("Give me back this dish, you dirty liar!"); - if (countitem("PoisonedDish") > 0) delitem "PoisonedDish", 1; + if (countitemcolor("PoisonedDish") > 0) delitem "PoisonedDish", 1; next; mesq l("You're like the rest of this filthy crew, I can't trust you!"); diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index 6071157f..21055aab 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -10,7 +10,8 @@ // 1 Talked to Arpan and needs to get clothes. // 2 Has the clothes. -000-2-1.gat,51,37,0 script Chest 317;2,{ +// Size = 2 +000-2-1,51,37,0 script Chest 317,{ set @q, getq(ShipQuests_Arpan); if (@q == 0) goto L_Talk; diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index 248c2761..e0aeb650 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -6,7 +6,9 @@ // There are two kinds of dialogues in this script. // Dan will randomly choose between a useless sentence, and a quest in Artis. -000-2-1.gat, 32,31,0,1 script Dan 101;2,{ +// Size = 2 +// Gender = 1 +000-2-1,32,31,0 script Dan 101,{ mesn; set @q, rand(3); if (@q == 0) goto L_QuestStory; diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index c6066f8d..a7b09fdb 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -6,7 +6,9 @@ // Description: // Sleeping and grumbling NPC. -000-2-1.gat,32,38,0,1 script Devis 310;2,{ +// Size = 2 +// Gender = 1 +000-2-1,32,38,0 script Devis 310,{ callfunc "Asleep"; } diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt index 60463916..8b9e20fa 100644 --- a/npc/000-2-1/hammock.txt +++ b/npc/000-2-1/hammock.txt @@ -4,7 +4,7 @@ // Description: // Animated hammock at the mid level of the ship. -000-2-1.gat,32,27,0 script #hammock1 904,1,0{ +000-2-1,32,27,0 script #hammock1 904,1,0,{ OnTouchFirst: setnpcdir 0; @@ -21,7 +21,7 @@ OnTimer5440: end; } -000-2-1.gat,32,25,0 script #hammock2 904,1,0{ +000-2-1,32,25,0 script #hammock2 904,1,0,{ OnTouchFirst: setnpcdir 0; @@ -38,7 +38,7 @@ OnTimer5440: end; } -000-2-1.gat,37,25,0 script #hammock3 905,1,0{ +000-2-1,37,25,0 script #hammock3 905,1,0,{ OnTouchFirst: setnpcdir 0; @@ -55,7 +55,7 @@ OnTimer5440: end; } -000-2-1.gat,37,27,0 script #hammock4 905,1,0{ +000-2-1,37,27,0 script #hammock4 905,1,0,{ OnTouchFirst: setnpcdir 0; @@ -72,7 +72,7 @@ OnTimer5440: end; } -000-2-1.gat,37,29,0 script #hammock5 905,1,0{ +000-2-1,37,29,0 script #hammock5 905,1,0,{ OnTouchFirst: setnpcdir 0; @@ -89,7 +89,7 @@ OnTimer5440: end; } -000-2-1.gat,37,34,0 script #hammock6 905,1,0{ +000-2-1,37,34,0 script #hammock6 905,1,0,{ OnTouchFirst: setnpcdir 0; @@ -106,7 +106,7 @@ OnTimer5440: end; } -000-2-1.gat,37,36,0 script #hammock7 905,1,0{ +000-2-1,37,36,0 script #hammock7 905,1,0,{ OnTouchFirst: setnpcdir 0; @@ -123,7 +123,7 @@ OnTimer5440: end; } -000-2-1.gat,37,38,0 script #hammock8 905,1,0{ +000-2-1,37,38,0 script #hammock8 905,1,0,{ OnTouchFirst: setnpcdir 0; diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt index 41bfab3b..2ed92c0b 100644 --- a/npc/000-2-1/knife.txt +++ b/npc/000-2-1/knife.txt @@ -10,7 +10,9 @@ // 0 Default, not taken. // 1 Knife taken. -000-2-1.gat,50,24,0,2 script #knife 100;2,{ +// Size = 2 +// Gender = 2 +000-2-1,50,24,0 script #knife 100,{ set @q, getq(ShipQuests_Knife); if (@q) close; diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 741d670e..8266e5f1 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -39,7 +39,8 @@ // [9] = Shows how many seconds passed since the player started the quest. // [10] = Shows how many seconds passed since the player done the quest. -000-2-1.gat,72,34,0,1 script AreaNPC 0,0,1,{ +// Gender = 1 +000-2-1,72,34,0 script AreaNPC 32767,0,1,{ OnTouch: if (BaseLevel < 5) goto L_Stop; @@ -87,7 +88,9 @@ L_NoGoodTick: close; } -000-2-1.gat,70,35,0,1 script Peter 303;3,{ +// Size = 3 +// Gender = 1 +000-2-1,70,35,0 script Peter 303,{ if (BaseLevel < 5) goto OnTooWeak; if ($@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown; if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick; @@ -300,7 +303,7 @@ L_Reward: mesn; mesq l("Good job!") + " " + l("Here's your reward!"); getexp 100, 0; - set zeny, zeny + 1000; + set Zeny, Zeny + 1000; message strcharinfo(0), l("You receive @@ E!", 1000); goto L_CleaningClose; diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index 7f7f183d..bef1ecc5 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -5,7 +5,9 @@ // Description: // Sleeping and snoring NPC. -000-2-1.gat,53,38,0,1 script Q'Onan 302;2,{ +// Size = 2 +// Gender = 1 +000-2-1,53,38,0 script Q'Onan 302,{ callfunc "Asleep"; } diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt index d9e30641..15b5e5d2 100644 --- a/npc/000-2-1/savepoint.txt +++ b/npc/000-2-1/savepoint.txt @@ -4,22 +4,30 @@ // Description: // Saves locations in 000-2-1 map. -000-2-1.gat,40,37,0,2 script #name 901;2,{ +// Size = 2 +// Gender = 2 +000-2-1,40,37,0 script #name 901,{ callfunc "SavePoint", "000-2-1.gat", 40, 37; close; } -000-2-1.gat,46,37,0,2 script #name 901;2,{ +// Size = 2 +// Gender = 2 +000-2-1,46,37,0 script #name 901,{ callfunc "SavePoint", "000-2-1.gat", 46, 37; close; } -000-2-1.gat,50,38,0,2 script #name 901;2,{ +// Size = 2 +// Gender = 2 +000-2-1,50,38,0 script #name 901,{ callfunc "SavePoint", "000-2-1.gat", 50, 38; close; } -000-2-1.gat,55,40,0,2 script #name 901;2,{ +// Size = 2 +// Gender = 2 +000-2-1,55,40,0 script #name 901,{ callfunc "SavePoint", "000-2-1.gat", 55, 40; close; } diff --git a/npc/000-2-2/_import.txt b/npc/000-2-2/_import.txt index 81eca12e..5dcd9f0d 100644 --- a/npc/000-2-2/_import.txt +++ b/npc/000-2-2/_import.txt @@ -1,5 +1,4 @@ // Map 000-2-2: La Johanne, Hold -map: 000-2-2.gat npc: npc/000-2-2/doors.txt npc: npc/000-2-2/mapflags.txt npc: npc/000-2-2/ratto.txt diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt index 0cb55416..dab5c6b1 100644 --- a/npc/000-2-2/doors.txt +++ b/npc/000-2-2/doors.txt @@ -6,10 +6,11 @@ // Description: // Doors NPCs. -000-2-2.gat,48,29,0,1 script DoorUpwards 0,0,0,{ +// Gender = 1 +000-2-2,48,29,0 script DoorUpwards 32767,0,0,{ OnTouch: - if (getmapmobs("000-2-2.gat") > 0) goto L_Warn; + if (mobcount("000-2-2.gat","all") > 0) goto L_Warn; goto L_Warp; @@ -35,7 +36,8 @@ L_Warp: close; } -000-2-2.gat,24,31,0,1 script LeftDoor 0,0,0,{ +// Gender = 1 +000-2-2,24,31,0 script LeftDoor 32767,0,0,{ OnTouch: mesn "Narrator"; @@ -45,7 +47,7 @@ OnTouch: next; menu - rif(countitem("JohanneKey") > 0, l("Use the key.")), L_Warp, + rif(countitemcolor("JohanneKey") > 0, l("Use the key.")), L_Warp, l("Break the door."), L_Break, l("Go away."), -; diff --git a/npc/000-2-2/mapflags.txt b/npc/000-2-2/mapflags.txt index 94dd619e..7c2293e9 100644 --- a/npc/000-2-2/mapflags.txt +++ b/npc/000-2-2/mapflags.txt @@ -1 +1 @@ -000-2-2.gat mapflag nosave 000-2-1,61,36 +000-2-2 mapflag nosave 000-2-1,61,36 diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt index c950f28b..1daca2e4 100644 --- a/npc/000-2-2/ratto.txt +++ b/npc/000-2-2/ratto.txt @@ -17,7 +17,8 @@ // [8] = Shows how many seconds passed since ratto number 4 died. // [9] = Shows how many seconds passed since the player started the quest. -000-2-2.gat,47,30,0,1 script RattosControl 32767,{ +// Gender = 1 +000-2-2,47,30,0 script RattosControl 32767,{ OnSpawn: areamonster "000-2-2.gat", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; diff --git a/npc/000-2-3/_import.txt b/npc/000-2-3/_import.txt index 146a2df8..94ee8b34 100644 --- a/npc/000-2-3/_import.txt +++ b/npc/000-2-3/_import.txt @@ -1,5 +1,4 @@ // Map 000-2-3: La Johanne, Nard's Room -map: 000-2-3.gat npc: npc/000-2-3/_warps.txt npc: npc/000-2-3/box.txt npc: npc/000-2-3/elmo.txt diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt index 5e7b78fc..1ba6c493 100644 --- a/npc/000-2-3/box.txt +++ b/npc/000-2-3/box.txt @@ -18,7 +18,8 @@ // 4 ChefGado Quest completed and "Introduction" chapter finalized. // 5 Reward taken from the box. -000-2-3.gat,25,24,0 script Box 102;1,{ +// Size = 1 +000-2-3,25,24,0 script Box 102,{ set @q, getq(ShipQuests_Nard); mesn "Narrator"; diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt index ec8017a9..0b67eb17 100644 --- a/npc/000-2-3/elmo.txt +++ b/npc/000-2-3/elmo.txt @@ -5,7 +5,9 @@ // Description: // Elmo's second dialog. -000-2-3.gat,27,27,0,1 script Elmo 309;5,{ +// Size = 5 +// Gender = 1 +000-2-3,27,27,0 script Elmo 309,{ set @q, getq(ShipQuests_ArpanMoney); if (@q == 1) goto L_GotMoney; diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt index 7a3bdbed..60c2d31b 100644 --- a/npc/000-2-3/hammock.txt +++ b/npc/000-2-3/hammock.txt @@ -4,7 +4,8 @@ // Description: // Animated hammock at the top level of the ship. -000-2-3.gat,28,24,0,2 script #name 904,1,0{ +// Gender = 2 +000-2-3,28,24,0 script #name 904,1,0,{ OnTouchFirst: setnpcdir 4; diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 48488b39..ba9ac381 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -23,7 +23,9 @@ // 11 Gugli gives you the task. // 12 Gave all of the boxes to Gugli. -000-2-3.gat,25,26,0,1 script Nard 306;5,{ +// Size = 5 +// Gender = 1 +000-2-3,25,26,0 script Nard 306,{ set @nard, getq(ShipQuests_Nard); set @gugli, getq(ShipQuests_Gugli); set @gado, getq(ShipQuests_ChefGado); diff --git a/npc/000-2-3/piourocket.txt b/npc/000-2-3/piourocket.txt index 97e183e2..0f038dba 100644 --- a/npc/000-2-3/piourocket.txt +++ b/npc/000-2-3/piourocket.txt @@ -4,7 +4,9 @@ // Description: // Jumping piou. -000-2-3.gat,27,23,4,2 script #piourocket 308;3,{ +// Size = 3 +// Gender = 2 +000-2-3,27,23,4 script #piourocket 308,{ setnpcdir 2; stopnpctimer; initnpctimer; diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt index 99f1717c..c7205868 100644 --- a/npc/000-2-3/sailors.txt +++ b/npc/000-2-3/sailors.txt @@ -6,7 +6,8 @@ // Description: // End of introduction with Nard and Elmo talking about the player. -000-2-3.gat,21,28,0,0 script AreaTop 0,0,5,{ +// Gender = 0 +000-2-3,21,28,0 script AreaTop 32767,0,5,{ OnTouch: if (getq(ShipQuests_Door) == 1) end; diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index 642efaed..bca9e92e 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -1,5 +1,4 @@ // Map 001-1: Artis City -map: 001-1.gat npc: npc/001-1/_mobs.txt npc: npc/001-1/_warps.txt npc: npc/001-1/artaxe.txt diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt index 91b17a56..7eafe98c 100644 --- a/npc/001-1/artaxe.txt +++ b/npc/001-1/artaxe.txt @@ -5,7 +5,9 @@ // Description: // Helping NPC. -000-1.gat,27,55,0,1 script Artaxe 109;2,{ +// Size = 2 +// Gender = 1 +000-1,27,55,0 script Artaxe 109,{ mesn; mesq l("Do you feel too weak even if trying to hit the surrounding wildlife?"); next; diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index 38fe3460..73ac8d72 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -10,8 +10,10 @@ // 0 Default, didn't get a cookie. // 1 Get a cookie. -001-1.gat,39,38,0,0 script Cookie Master 319;2,{ - if ((countitem("DeliciousCookie") == 0) && (getq(GeneraL_Cookies) == 1)) +// Size = 2 +// Gender = 0 +001-1,39,38,0 script Cookie Master 319,{ + if ((countitemcolor("DeliciousCookie") == 0) && (getq(GeneraL_Cookies) == 1)) goto L_LostCookie; if (getq(GeneraL_Cookies) == 1) goto L_GetCookie; diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt index 05afe3e4..212f4763 100644 --- a/npc/001-1/doors.txt +++ b/npc/001-1/doors.txt @@ -5,7 +5,7 @@ // Doors warp and animations in map 001-1 // -001-1.gat,55,71,0 script #Door1 906,1,1{ +001-1,55,71,0 script #Door1 906,1,1,{ close; OnTouchFirst: @@ -31,7 +31,7 @@ OnTimer340: end; } -001-1.gat,51,65,0 script #Door2 906,1,1{ +001-1,51,65,0 script #Door2 906,1,1,{ close; OnTouchFirst: @@ -57,7 +57,7 @@ OnTimer340: end; } -001-1.gat,69,77,0 script #Door3 906,1,1{ +001-1,69,77,0 script #Door3 906,1,1,{ close; OnTouchFirst: @@ -84,7 +84,7 @@ OnTimer340: } -001-1.gat,51,80,0 script #Door4 906,1,1{ +001-1,51,80,0 script #Door4 906,1,1,{ close; OnTouchFirst: diff --git a/npc/001-2-0/_import.txt b/npc/001-2-0/_import.txt index 0be05cc1..a8056119 100644 --- a/npc/001-2-0/_import.txt +++ b/npc/001-2-0/_import.txt @@ -1,3 +1,2 @@ -map: 001-2-0.gat npc: npc/001-2-0/_warps.txt npc: npc/001-2-0/resa.txt diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt index 61e70d0b..583e334f 100644 --- a/npc/001-2-0/resa.txt +++ b/npc/001-2-0/resa.txt @@ -4,7 +4,9 @@ // Description: // Light Armor shop keeper. -001-2-0.gat,37,28,0,0 script Resa 117;2,{ +// Size = 2 +// Gender = 0 +001-2-0,37,28,0 script Resa 117,{ mesn; mesq l("Hi."); diff --git a/npc/001-2-2/_import.txt b/npc/001-2-2/_import.txt index 8528d67c..9c2e2443 100644 --- a/npc/001-2-2/_import.txt +++ b/npc/001-2-2/_import.txt @@ -1,2 +1 @@ -map: 001-2-2.gat npc: npc/001-2-2/_warps.txt diff --git a/npc/001-2-3/_import.txt b/npc/001-2-3/_import.txt index 8a6e470a..710afef4 100644 --- a/npc/001-2-3/_import.txt +++ b/npc/001-2-3/_import.txt @@ -1,2 +1 @@ -map: 001-2-3.gat npc: npc/001-2-3/_warps.txt diff --git a/npc/001-2-4/_import.txt b/npc/001-2-4/_import.txt index 10a8e77b..a8d536d1 100644 --- a/npc/001-2-4/_import.txt +++ b/npc/001-2-4/_import.txt @@ -1,3 +1,2 @@ -map: 001-2-4.gat npc: npc/001-2-4/_warps.txt npc: npc/001-2-4/doors.txt diff --git a/npc/001-2-4/doors.txt b/npc/001-2-4/doors.txt index f4aacb94..05efc185 100644 --- a/npc/001-2-4/doors.txt +++ b/npc/001-2-4/doors.txt @@ -5,7 +5,7 @@ // Doors warp and animations in map 001-2-4 // -001-2-4.gat,52,27,0 script #LibraryDoor 907,1,1{ +001-2-4,52,27,0 script #LibraryDoor 907,1,1,{ close; OnTouchFirst: diff --git a/npc/001-2-5/_import.txt b/npc/001-2-5/_import.txt index 2eb01ef9..3587280f 100644 --- a/npc/001-2-5/_import.txt +++ b/npc/001-2-5/_import.txt @@ -1,2 +1 @@ -map: 001-2-5.gat npc: npc/001-2-5/_warps.txt diff --git a/npc/001-2-6/_import.txt b/npc/001-2-6/_import.txt index a62a2748..1f3bb419 100644 --- a/npc/001-2-6/_import.txt +++ b/npc/001-2-6/_import.txt @@ -1,2 +1 @@ -map: 001-2-6.gat npc: npc/001-2-6/_warps.txt diff --git a/npc/001-2-7/_import.txt b/npc/001-2-7/_import.txt index ff3353a5..71e67ed9 100644 --- a/npc/001-2-7/_import.txt +++ b/npc/001-2-7/_import.txt @@ -1,2 +1 @@ -map: 001-2-7.gat npc: npc/001-2-7/_warps.txt diff --git a/npc/001-2-8/_import.txt b/npc/001-2-8/_import.txt index 176224f6..d731319c 100644 --- a/npc/001-2-8/_import.txt +++ b/npc/001-2-8/_import.txt @@ -1,2 +1 @@ -map: 001-2-8.gat npc: npc/001-2-8/_warps.txt diff --git a/npc/001-2-9/_import.txt b/npc/001-2-9/_import.txt index 4def6a90..b3a8304d 100644 --- a/npc/001-2-9/_import.txt +++ b/npc/001-2-9/_import.txt @@ -1,2 +1 @@ -map: 001-2-9.gat npc: npc/001-2-9/_warps.txt diff --git a/npc/functions/inventoryplace.txt b/npc/functions/inventoryplace.txt index b2bae19c..c2f95c5c 100644 --- a/npc/functions/inventoryplace.txt +++ b/npc/functions/inventoryplace.txt @@ -13,7 +13,7 @@ function script InventoryPlace { getinventorylist; set @iteminfo, getiteminfo(getarg(0), 2); - set @countitem, countitem(getarg(0)); + set @countitem, countitemcolor(getarg(0)); if (checkweight(getarg(0), getarg(1)) == 0) goto L_Warn; if ((@iteminfo < 4) && (@countitem == 0) && (@inventorylist_count < 100)) return; diff --git a/npc/functions/main.txt b/npc/functions/main.txt new file mode 100644 index 00000000..67677d1a --- /dev/null +++ b/npc/functions/main.txt @@ -0,0 +1,44 @@ +// Evol functions. +// Authors: +// 4144 +// Description: +// Build in functions. + +function script menuimage { + return getarg(0) + "|" + getarg(1); +} + +function script mesn { + if (getargcount() > 0) + { + .@s$ = "[" + getarg(0) + "]"; + } + else + { + .@s$ = "[" + strnpcinfo(1) + "]"; + } + mes .@s$; + return; +} + +function script mesq { + mes "\"" + getarg(0)+ "\""; + return; +} + +function script g { + mes Sex == 0 ? getarg(0) : getarg(1); + return; +} + +function script lg { + mes Sex == 0 ? l(getarg(0)) : l(getarg(1)); + return; +} + +function script col { + .@color = getarg(1); + if (.@color < 0) .@color = 0; + if (.@color > 9) .@color = 9; + return "##" + .@color + getarg(0) + "##0"; +} diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt index 5e8838fa..20785708 100644 --- a/npc/functions/savepoint.txt +++ b/npc/functions/savepoint.txt @@ -13,5 +13,5 @@ function script SavePoint { message strcharinfo(0), "Your position has been saved."; savepoint getarg(0), getarg(1), getarg(2); - misceffect 4, getcharid(3); + misceffect2 4, getcharid(3); } diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt index b41d8e82..f7057461 100644 --- a/npc/items/croconut.txt +++ b/npc/items/croconut.txt @@ -6,10 +6,10 @@ // Allows to cut a Croconut in multiple parts. // // Possible choices for L_Weapon: -// rif(countitem(35xx, 1), l(getitemname("xx"))), L_Weak, -// rif(countitem(35yy, 1), l(getitemname("yy"))), L_Good, +// rif(countitemcolor(35xx, 1), l(getitemname("xx"))), L_Weak, +// rif(countitemcolor(35yy, 1), l(getitemname("yy"))), L_Good, -000-2-1.gat,0,0,0 script Croconut 0,{ +000-2-1,0,0,0 script Croconut 32767,{ close; OnUse: @@ -31,8 +31,8 @@ L_Weapon: next; menu - rif(countitem("Knife") > 0, l(getitemname("Knife"))), L_Weak, - rif(countitem("PiouSlayer") > 0, l(getitemname("PiouSlayer"))), L_Weak, + rif(countitemcolor("Knife") > 0, l(getitemname("Knife"))), L_Weak, + rif(countitemcolor("PiouSlayer") > 0, l(getitemname("PiouSlayer"))), L_Weak, l("Bare Hands"), -; L_TooWeak: diff --git a/npc/items/oldbook.txt b/npc/items/oldbook.txt index 484b1e60..91ad46b2 100644 --- a/npc/items/oldbook.txt +++ b/npc/items/oldbook.txt @@ -6,7 +6,7 @@ // Description: // Reading the Old Book. -000-2-1.gat,0,0,1 script OldBook 0,{ +000-2-1,0,0,1 script OldBook 32767,{ OnUse: mesn "Narrator"; diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf new file mode 100644 index 00000000..4dd3e77c --- /dev/null +++ b/npc/re/scripts_main.conf @@ -0,0 +1,2 @@ +npc: npc/functions/main.txt +import: npc/scripts.conf |