diff options
32 files changed, 111 insertions, 105 deletions
diff --git a/client-data b/client-data -Subproject 166d619c7c1207ce04c3b77c15b825f357273fb +Subproject 8b2115dc950895bfec084770c45d5487320b428 diff --git a/world/map/db/const.txt b/world/map/db/const.txt index 6ecbe0ad..c00773e2 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -261,7 +261,6 @@ sc_raiseattackspeed0 37 sc_raiseattackstrength 185 // Emotions -// Note: client-data/emotes.xml uses the wrong numbers. EMOTE_DISGUST 1 EMOTE_SURPRISE 2 EMOTE_HAPPY 3 @@ -276,34 +275,35 @@ EMOTE_UPSET 11 EMOTE_PERTURBED 12 EMOTE_SPEECH 13 EMOTE_BLAH 14 -EMOTE_SWEAR 15 -EMOTE_MEOW 16 -EMOTE_LAUGH 17 -EMOTE_CHEERFUL 18 -EMOTE_LOVE 19 -EMOTE_MONEY 20 -EMOTE_SLEEP 21 -EMOTE_REST 22 -EMOTE_BOTHERED 23 -EMOTE_AFRAID 24 -EMOTE_DEAD 25 -EMOTE_SUSPICIOUS 26 -EMOTE_MELANCHOLY 27 -EMOTE_FACEPALM 28 -EMOTE_ANGRY 29 -EMOTE_HEADACHE 30 -EMOTE_BORED 31 -EMOTE_HEART 32 -EMOTE_EMPTY 33 -EMOTE_HALLOWEEN 34 -EMOTE_VICIOUS 35 -EMOTE_JOYFUL 36 -EMOTE_CLEVER 37 -EMOTE_SHY 38 -EMOTE_ALIEN 39 -EMOTE_CURIOUS 40 -EMOTE_PAIN 41 -EMOTE_TEARS 42 +// ManaPlus Emotions +EMOTE_MEOW 101 +EMOTE_LAUGH 102 +EMOTE_CHEERFUL 103 +EMOTE_LOVE 104 +EMOTE_MONEY 105 +EMOTE_SLEEP 106 +EMOTE_REST 107 +EMOTE_BOTHERED 108 +EMOTE_AFRAID 109 +EMOTE_DEAD 110 +EMOTE_SUSPICIOUS 111 +EMOTE_MELANCHOLY 112 +EMOTE_FACEPALM 113 +EMOTE_ANGRY 114 +EMOTE_HEADACHE 115 +EMOTE_BORED 116 +EMOTE_SWEAR 117 +EMOTE_HEART 118 +EMOTE_EMPTY 119 +EMOTE_HALLOWEEN 120 +EMOTE_VICIOUS 121 +EMOTE_JOYFUL 122 +EMOTE_CLEVER 123 +EMOTE_SHY 124 +EMOTE_ALIEN 125 +EMOTE_TROLL 126 +EMOTE_PAIN 127 +EMOTE_TEARS 128 sfx_skillup 1 sfx_magic_generic 2 diff --git a/world/map/db/mob_db_0_19.txt b/world/map/db/mob_db_0_19.txt index 36169593..65ae7b57 100644 --- a/world/map/db/mob_db_0_19.txt +++ b/world/map/db/mob_db_0_19.txt @@ -1,14 +1,14 @@ //ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength 1002, Maggot, Maggot, 5, 50, 0, 0, 1, 1, 5, 10, 0, 5, 1, 1, 1, 0, 6, 5, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1046, TameScorpion, TameScorpion, 5, 50, 0, 0, 2, 1, 7, 10, 0, 5, 1, 1, 1, 0, 15, 5, 1, 1, 1, 3, 20, 129, 2000, 1872, 672, 480, 507, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1050, HouseMaggot, HouseMaggot, 5, 50, 0, 0, 3, 1, 7, 7, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1050, HouseMaggot, HouseMaggot, 5, 50, 0, 0, 3, 1, 5, 7, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1003, Scorpion, Scorpion, 10, 100, 0, 0, 2, 1, 10, 15, 0, 5, 1, 1, 1, 0, 15, 5, 1, 1, 1, 3, 20, 129, 2000, 1872, 672, 480, 507, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1029, MauvePlant, MauvePlant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 680, 3000, 680, 3000, 680, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 1030, CobaltPlant, CobaltPlant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 681, 3000, 681, 3000, 681, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1031, GambogePlant, GambogePlant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 682, 3000, 682, 3000, 682, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1032, AlizarinPlant, AlizarinPlant, 1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 683, 3000, 683, 3000, 683, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1037, CloverPatch, CloverPatch, 1, 1, 0, 0, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 742, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1038, Squirrel, Squirrel, 15, 160, 1, 0, 5, 1, 15, 25, 1, 6, 1, 3, 1, 0, 15, 40, 1, 1, 1, 3, 20, 129, 800, 800, 672, 480, 743, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 807, 800, 860, 550, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15 +1038, Squirrel, Squirrel, 15, 160, 1, 0, 5, 1, 10, 20, 1, 6, 1, 3, 1, 0, 15, 40, 1, 1, 1, 3, 20, 129, 800, 800, 672, 480, 743, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 807, 800, 860, 550, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15 1056, CaveMaggot, CaveMaggot, 10, 100, 0, 0, 3, 1, 10, 10, 0, 5, 5, 5, 1, 0, 6, 5, 1, 1, 1, 3, 21, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 502, 70, 522, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1063, Pumpkin, Pumpkin, 1, 200, 0, 0, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 3000, 100, 3001, 20, 3002, 10, 3003, 15, 3011, 500, 3006, 1500, 3007, 2000, 3010, 2500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1082, Serqet, Serqet, 10, 100, 0, 0, 2, 1, 10, 15, 0, 5, 1, 1, 1, 0, 15, 5, 1, 1, 1, 3, 20, 129, 2000, 1872, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/world/map/db/mob_db_20_39.txt b/world/map/db/mob_db_20_39.txt index b0d1d096..096b1b21 100644 --- a/world/map/db/mob_db_20_39.txt +++ b/world/map/db/mob_db_20_39.txt @@ -1,8 +1,8 @@ //ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength 1011, FireGoblin, FireGoblin, 20, 220, 0, 0, 4, 1, 15, 20, 0, 5, 1, 1, 1, 0, 6, 30, 1, 1, 1, 3, 23, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1017, Bat, Bat, 20, 150, 0, 0, 3, 1, 5, 25, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 24, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 753, 3000, 754, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1131, ManaBug, ManaBug, 25, 300, 0, 0, 5, 2, 8, 15, 4, 6, 1, 4, 1, 4, 5, 4, 2, 1, 1, 3, 24, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 -1018, Pinkie, Pinkie, 30, 300, 0, 0, 7, 2, 7, 15, 0, 5, 1, 1, 1, 0, 20, 25, 2, 2, 1, 3, 20, 129, 800, 1872, 672, 480, 614, 1000, 751, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 +1131, ManaBug, ManaBug, 25, 300, 0, 0, 5, 2, 10, 17, 4, 6, 1, 4, 1, 4, 5, 4, 2, 1, 1, 3, 24, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 +1018, Pinkie, Pinkie, 30, 300, 0, 0, 7, 2, 15, 20, 0, 5, 1, 1, 1, 0, 20, 25, 2, 2, 1, 3, 20, 129, 800, 1872, 672, 480, 614, 1000, 751, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 1019, SpikyMushroom, SpikyMushroom, 30, 300, 0, 0, 5, 1, 10, 13, 0, 5, 1, 1, 1, 0, 10, 10, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 567, 800, 501, 150, 518, 50, 613, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1020, Fluffy, Fluffy, 30, 500, 0, 0, 7, 1, 6, 10, 1, 5, 1, 2, 1, 0, 20, 25, 1, 1, 1, 3, 20, 129, 800, 1600, 672, 480, 611, 800, 527, 150, 535, 400, 752, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1021, CaveSnake, CaveSnake, 30, 800, 0, 0, 13, 1, 20, 15, 1, 5, 10, 1, 1, 0, 5, 20, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 612, 1000, 610, 40, 713, 500, 717, 400, 717, 400, 641, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 @@ -11,7 +11,7 @@ 1035, Silkworm, Silkworm, 20, 1, 0, 0, 1, 1, 0, 0, 2, 10, 20, 11, 10, 10, 40, 10, 1, 1, 1, 0, 20, 129, 1300, 1100, 672, 480, 718, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 1041, Snail, Snail, 30, 900, 0, 0, 18, 1, 60, 65, 20, 15, 10, 1, 25, 0, 20, 10, 1, 1, 1, 0, 20, 129, 1800, 2500, 672, 480, 719, 500, 806, 400, 1250, 1000, 1251, 1500, 1248, 500, 1252, 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1049, Bee, Bee, 30, 600, 0, 0, 32, 1, 5, 90, 12, 4, 15, 25, 20, 3, 40, 30, 1, 1, 1, 0, 25, 137, 380, 1500, 300, 350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 -1055, Butterfly, Butterfly, 25, 250, 0, 0, 11, 2, 10, 50, 3, 5, 10, 45, 10, 15, 35, 40, 1, 1, 1, 3, 44, 129, 350, 780, 300, 800, 718, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 60 +1055, Butterfly, Butterfly, 25, 250, 0, 0, 11, 2, 10, 40, 3, 5, 10, 45, 10, 15, 35, 40, 1, 1, 1, 3, 44, 129, 350, 780, 300, 800, 718, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 60 1057, AngryScorpion, AngryScorpion, 20, 200, 0, 0, 5, 1, 15, 15, 0, 5, 5, 5, 1, 0, 15, 5, 1, 1, 1, 3, 20, 133, 1000, 1872, 672, 480, 4000, 700, 510, 100, 509, 50, 518, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 1058, IceGoblin, IceGoblin, 25, 330, 0, 0, 10, 1, 20, 25, 0, 5, 5, 5, 1, 0, 6, 30, 1, 1, 1, 3, 21, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 4026, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1060, Archant, Archant, 30, 400, 0, 0, 14, 1, 20, 30, 4, 6, 10, 5, 1, 0, 12, 10, 1, 1, 1, 0, 25, 133, 1000, 1500, 672, 480, 537, 300, 535, 100, 640, 40, 4001, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40 diff --git a/world/map/npc/001-1/dock.txt b/world/map/npc/001-1/dock.txt index 05402b94..0aacdcdb 100644 --- a/world/map/npc/001-1/dock.txt +++ b/world/map/npc/001-1/dock.txt @@ -14,7 +14,7 @@ close; } -001-1,70,70,0|script|#TulimsharDock|127 +001-1,70,70,0|script|#TulimsharDock|32767 { end; OnCommandArrive: diff --git a/world/map/npc/002-2/inya.txt b/world/map/npc/002-2/inya.txt index 7f0184f8..475c73b6 100644 --- a/world/map/npc/002-2/inya.txt +++ b/world/map/npc/002-2/inya.txt @@ -1,7 +1,7 @@ //Gemstones: Diamond (white) , Ruby (red), Emerald (green), Sapphire (blue), Topaz (yellow), Amethyst (purple) //The power of the gems is important to future balance of these rings. Are they related to stats, tiers of power, schools of magic? -002-2,116,61,0|shop|#InyaShop|127,SimpleRing:*1 +002-2,116,61,0|shop|#InyaShop|32767,SimpleRing:*1 002-2,116,61,0|script|Inya|106 { diff --git a/world/map/npc/002-2/latoy.txt b/world/map/npc/002-2/latoy.txt index 49be414e..bb818bc1 100644 --- a/world/map/npc/002-2/latoy.txt +++ b/world/map/npc/002-2/latoy.txt @@ -1,7 +1,7 @@ // A snobby store that won't sell to the player // takes part in quest given by 021-2/kylian.txt -002-2,86,93,0|shop|#LatoyShop|127,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4 +002-2,86,93,0|shop|#LatoyShop|32767,SilkHeadband:*4,SilkGloves:*4,SilkPants:*4,SilkRobe:*4 002-2,86,93,0|script|Latoy|106 { diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt index 24a1243f..f1290699 100644 --- a/world/map/npc/007-1/witch.txt +++ b/world/map/npc/007-1/witch.txt @@ -686,7 +686,7 @@ L_KillHero: } -007-1,128,100,0|script|#IlliaDaemon|127 +007-1,128,100,0|script|#IlliaDaemon|32767 { end; diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt index 4be8ad11..42763609 100644 --- a/world/map/npc/008-1/dock.txt +++ b/world/map/npc/008-1/dock.txt @@ -12,7 +12,7 @@ close; } -008-1,120,44,0|script|#Hurnscald NorthDock|127 +008-1,120,44,0|script|#Hurnscald NorthDock|32767 { end; OnCommandArrive: @@ -30,7 +30,7 @@ OnCommandWarp: close; } -008-1,65,25,0|script|#Hurnscald SouthDock|127 +008-1,65,25,0|script|#Hurnscald SouthDock|32767 { end; OnCommandArrive: diff --git a/world/map/npc/009-2/entertainer.txt b/world/map/npc/009-2/entertainer.txt index 57119894..61306b25 100644 --- a/world/map/npc/009-2/entertainer.txt +++ b/world/map/npc/009-2/entertainer.txt @@ -27,9 +27,13 @@ L_Close: close; OnTimer3000: - emotion rand(EMOTE_DISGUST, EMOTE_TEARS); - setnpctimer 0; - end; + if(rand(0,1) == 1) goto L_manaplus; + emotion rand(EMOTE_DISGUST, EMOTE_BLAH); + goto OnInit; + +L_manaplus: + emotion rand(EMOTE_MEOW, EMOTE_TEARS); + goto OnInit; OnInit: if (debug >= 2) end; diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt index 0eaf4ced..bbb336e2 100644 --- a/world/map/npc/009-2/peter.txt +++ b/world/map/npc/009-2/peter.txt @@ -1,5 +1,5 @@ // Nicholas' Apprentice and Armorsmith -009-2,183,57,0|shop|#PeterShop|127,Knife:*1,SharpKnife:*1,Dagger:*1 +009-2,183,57,0|shop|#PeterShop|32767,Knife:*1,SharpKnife:*1,Dagger:*1 009-2,183,57,0|script|Peter|157 { diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt index 135f083d..4a2055fa 100644 --- a/world/map/npc/009-4/barriers.txt +++ b/world/map/npc/009-4/barriers.txt @@ -44,7 +44,7 @@ L_Error2: // Starting Barrier / Quest Entrance -009-4,37,119,0|script|#OrumCaveStartMessage|127,0,0 +009-4,37,119,0|script|#OrumCaveStartMessage|32767,0,0 { if (OrumQuest >= 3) end; if (OrumQuest == 2) goto L_Started; @@ -58,7 +58,7 @@ L_Started: end; } -009-4,37,120,0|script|#OrumCaveStartBarrier|127,0,0 +009-4,37,120,0|script|#OrumCaveStartBarrier|32767,0,0 { if (OrumQuest >= 3) end; warp "009-4", 37, 118; @@ -66,7 +66,7 @@ L_Started: } // First Barrier -009-4,57,29,0|script|#OrumCaveFirstBarrier|127,0,0 +009-4,57,29,0|script|#OrumCaveFirstBarrier|32767,0,0 { if (OrumQuest >= 5) end; @@ -76,7 +76,7 @@ L_Started: } // Second Barrier -009-4,61,55,0|script|#OrumCaveSecondMessage|127,0,0 +009-4,61,55,0|script|#OrumCaveSecondMessage|32767,0,0 { if (OrumQuest >= 9) end; if (OrumQuest == 3) set OrumQuest, 4; @@ -104,7 +104,7 @@ L_Advance_Quest: end; } -009-4,61,54,0|script|#OrumCaveSecondBarrier|127,0,0 +009-4,61,54,0|script|#OrumCaveSecondBarrier|32767,0,0 { if (OrumQuest >= 9) end; warp "009-4", 60, 56; @@ -112,7 +112,7 @@ L_Advance_Quest: } // Third Barrier -009-4,24,65,0|script|#OrumCaveThirdMessage|127,0,0 +009-4,24,65,0|script|#OrumCaveThirdMessage|32767,0,0 { if (OrumQuest >= 10) end; if (OrumQuest == 3) set OrumQuest, 4; @@ -154,7 +154,7 @@ L_Advance_Quest: end; } -009-4,24,66,0|script|#OrumCaveThirdBarrier|127,0,0 +009-4,24,66,0|script|#OrumCaveThirdBarrier|32767,0,0 { if (OrumQuest >= 10) end; warp "009-4", 23, 64; @@ -162,7 +162,7 @@ L_Advance_Quest: } // Ending Barrier -009-4,48,37,0|script|#OrumCaveEndMessage|127,0,0 +009-4,48,37,0|script|#OrumCaveEndMessage|32767,0,0 { if (OrumQuest >= 11) end; if (OrumQuest == 3) set OrumQuest, 4; @@ -274,7 +274,7 @@ L_Advance_Quest: close; } -009-4,48,38,0|script|#OrumCaveEndBarrier|127,0,0 +009-4,48,38,0|script|#OrumCaveEndBarrier|32767,0,0 { if (OrumQuest >= 11) end; warp "009-4", 47, 36; diff --git a/world/map/npc/009-4/waric.txt b/world/map/npc/009-4/waric.txt index 29eff17b..83c1ba78 100644 --- a/world/map/npc/009-4/waric.txt +++ b/world/map/npc/009-4/waric.txt @@ -1,6 +1,6 @@ //# see detailed description at orum.txt -009-4,99,33,0|script|#WizardTrap|127,2,1 +009-4,99,33,0|script|#WizardTrap|32767,2,1 { set @gender$, "They're"; if (Sex == 0) diff --git a/world/map/npc/009-7/battlemaster.txt b/world/map/npc/009-7/battlemaster.txt index ed07eefb..33eb04d0 100644 --- a/world/map/npc/009-7/battlemaster.txt +++ b/world/map/npc/009-7/battlemaster.txt @@ -62,29 +62,29 @@ L_GoBack: message strcharinfo(0), "Thank you for participating!"; return; } -009-6,36,48,0|script|#GoBack2Duels|127,0,1 +009-6,36,48,0|script|#GoBack2Duels|32767,0,1 { callfunc "fightclub_GoBack"; end; } -009-5,53,74,0|script|#GoBack3Duels|127,3,1 +009-5,53,74,0|script|#GoBack3Duels|32767,3,1 { callfunc "fightclub_GoBack"; end; } -009-3,158,83,0|script|#GoBack5Duels|127,7,0 +009-3,158,83,0|script|#GoBack5Duels|32767,7,0 { callfunc "fightclub_GoBack"; end; } -001-2,130,22,0|script|#GoBack4Duels|127,1,1 +001-2,130,22,0|script|#GoBack4Duels|32767,1,1 { callfunc "fightclub_GoBack"; end; } -001-3,73,28,0|script|#GoBack1Duels|127,0,1 +001-3,73,28,0|script|#GoBack1Duels|32767,0,1 { callfunc "fightclub_GoBack"; end; diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt index 7104d0a7..d20fff4d 100644 --- a/world/map/npc/009-7/eventHandler.txt +++ b/world/map/npc/009-7/eventHandler.txt @@ -15,7 +15,7 @@ L_Enter: end; } -009-7,22,38,0|script|#FightClubUtils|127 +009-7,22,38,0|script|#FightClubUtils|32767 { end; @@ -44,7 +44,7 @@ OnCommandIntrusion: end; } -009-7,20,45,0|script|#FightClubTimeLimit|127,0,0 +009-7,20,45,0|script|#FightClubTimeLimit|32767,0,0 { end; @@ -76,7 +76,7 @@ OnInit: end; } -009-7,20,44,0|script|#FightClubHandler|127,0,0 +009-7,20,44,0|script|#FightClubHandler|32767,0,0 { end; diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt index b81a9ca5..6843bfcc 100644 --- a/world/map/npc/010-2/loratay.txt +++ b/world/map/npc/010-2/loratay.txt @@ -965,7 +965,7 @@ L_ChooseSRLineColor: "A " + $@DYE_color_names$[7] + " one.", L_ItemMenus2, "A " + $@DYE_color_names$[8] + " one.", L_ItemMenus2, "A " + $@DYE_color_names$[9] + " one.", L_ItemMenus2, - "A " + $@DYE_color_names$[10] + " one.", L_ItemMenus2, + "A White one.", L_ItemMenus2, "Hum. I changed my mind. Later maybe.", L_end; L_ItemMenus2: diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt index f93ec464..3620b2c9 100644 --- a/world/map/npc/012-1/shops.txt +++ b/world/map/npc/012-1/shops.txt @@ -1,6 +1,6 @@ // -012-1,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1 +012-1,36,99,0|shop|#FlowerShop|32767,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1 012-1,36,99,0|script|Blossom|163 { diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt index 5be2c99a..001b7e0a 100644 --- a/world/map/npc/013-1/flowerpentagram.txt +++ b/world/map/npc/013-1/flowerpentagram.txt @@ -1,4 +1,4 @@ -013-1,1,1,0|script|#FlowerPentagram|127 +013-1,1,1,0|script|#FlowerPentagram|32767 { end; diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt index a87cfd23..ad20257d 100644 --- a/world/map/npc/015-1/barrier.txt +++ b/world/map/npc/015-1/barrier.txt @@ -1,7 +1,7 @@ // This barrier is for checking whether the player went outside after // progressing with the cat quest. -015-1,59,32,0|script|#CatOutsideBarrier|127,1,1 +015-1,59,32,0|script|#CatOutsideBarrier|32767,1,1 { set @catNeedsAlone, 0; end; diff --git a/world/map/npc/017-9/secret.txt b/world/map/npc/017-9/secret.txt index 555d6837..4c48f0f7 100644 --- a/world/map/npc/017-9/secret.txt +++ b/world/map/npc/017-9/secret.txt @@ -1,4 +1,4 @@ -009-1,42,43,0|script|#SecretDoor|127,0,0 +009-1,42,43,0|script|#SecretDoor|32767,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9", 26, 25; @@ -8,7 +8,7 @@ L_close: close; } -020-1,60,76,0|script|#SecretDoor2|127,0,0 +020-1,60,76,0|script|#SecretDoor2|32767,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9", 22, 22; @@ -18,7 +18,7 @@ L_close: close; } -001-1,54,118,0|script|#SecretDoor3|127,0,0 +001-1,54,118,0|script|#SecretDoor3|32767,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9", 30, 22; @@ -28,7 +28,7 @@ L_close: close; } -027-2,118,111,0|script|#SecretDoor4|127,0,0 +027-2,118,111,0|script|#SecretDoor4|32767,0,0 { if (getgmlevel() < 40 && !debug) goto L_close; warp "017-9", 30, 29; diff --git a/world/map/npc/029-1/barrier.txt b/world/map/npc/029-1/barrier.txt index 78cd93cd..e6c580ad 100644 --- a/world/map/npc/029-1/barrier.txt +++ b/world/map/npc/029-1/barrier.txt @@ -10,7 +10,7 @@ L_Block: end; } -029-1,69,61,0|script|#CandorAnnouncer|127 +029-1,69,61,0|script|#CandorAnnouncer|32767 { end; OnTalk: diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt index 61f8a242..f0628440 100644 --- a/world/map/npc/029-1/dock.txt +++ b/world/map/npc/029-1/dock.txt @@ -13,7 +13,7 @@ close; } -029-1,55,110,0|script|#CandorDock|127 +029-1,55,110,0|script|#CandorDock|32767 { end; OnCommandArrive: diff --git a/world/map/npc/031-1/dock.txt b/world/map/npc/031-1/dock.txt index 37ec98ed..b19cf271 100644 --- a/world/map/npc/031-1/dock.txt +++ b/world/map/npc/031-1/dock.txt @@ -13,7 +13,7 @@ close; } -031-1,100,100,0|script|#NivalisDock|127 +031-1,100,100,0|script|#NivalisDock|32767 { end; diff --git a/world/map/npc/051-1/janitor.txt b/world/map/npc/051-1/janitor.txt index f0b8b771..623690f0 100644 --- a/world/map/npc/051-1/janitor.txt +++ b/world/map/npc/051-1/janitor.txt @@ -1,5 +1,5 @@ // Forest janitor -051-1,1,1,0|script|#IlliaJanitor1|127 +051-1,1,1,0|script|#IlliaJanitor1|32767 { end; @@ -10,7 +10,7 @@ OnCommandClean: } // Desert janitor -051-1,1,1,0|script|#IlliaJanitor3|127 +051-1,1,1,0|script|#IlliaJanitor3|32767 { end; diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt index 63b9775f..fd663f33 100644 --- a/world/map/npc/051-3/ambush.txt +++ b/world/map/npc/051-3/ambush.txt @@ -52,7 +52,7 @@ L_ShouldNotBeHere: end; } -051-3,1,1,0|script|#BndtTl|127 +051-3,1,1,0|script|#BndtTl|32767 { end; @@ -141,7 +141,7 @@ L_CaptureHelper3: } -051-3,29,94,0|script|Sneaky Bandit|127 +051-3,29,94,0|script|Sneaky Bandit|32767 { end; @@ -161,7 +161,7 @@ OnTimer3600: } -051-3,33,95,0|script|Another Sneaky Bandit|127 +051-3,33,95,0|script|Another Sneaky Bandit|32767 { end; diff --git a/world/map/npc/051-3/janitor.txt b/world/map/npc/051-3/janitor.txt index 905fe4dd..edef5856 100644 --- a/world/map/npc/051-3/janitor.txt +++ b/world/map/npc/051-3/janitor.txt @@ -1,5 +1,5 @@ // Bandit cave janitor -051-3,1,1,0|script|#IlliaJanitor2|127 +051-3,1,1,0|script|#IlliaJanitor2|32767 { end; diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt index dbbd54dc..6acd12ed 100644 --- a/world/map/npc/052-1/janitor.txt +++ b/world/map/npc/052-1/janitor.txt @@ -1,6 +1,6 @@ // Illia Island janitor -052-1,1,1,0|script|#IlliaJanitor4|127 +052-1,1,1,0|script|#IlliaJanitor4|32767 { end; diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 1551d171..03b08b82 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -60,12 +60,13 @@ L_GetCommonReward: if (@illia_current_num_rewards == $@illia_num_common_reward_items) goto L_RewardDone; getinventorylist; - set @reward$, $@illia_common_rewards$[rand(getarraysize($@illia_common_rewards$))]; + set @index, rand(getarraysize($@illia_common_rewards$)); + set @reward$, $@illia_common_rewards$[@index]; if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) goto L_InventoryNoSpace; set @illia_current_num_rewards, @illia_current_num_rewards + 1; getitem @reward$, 1; - mes "You found a " + $@illia_common_rewards_n$ + "!"; + mes "You found a " + $@illia_common_rewards_n$[@index] + "!"; set @reward$, ""; goto L_GetCommonReward; @@ -75,7 +76,8 @@ L_GetUniqueReward: if (Illia_Uniques_Count >= 2) goto L_GetUniqueReward2; getinventorylist; - set @reward$, $@illia_unique_rewards$[rand(getarraysize($@illia_unique_rewards$))]; + set @index, rand(getarraysize($@illia_unique_rewards$)); + set @reward$, $@illia_unique_rewards$[@index]; if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) goto L_InventoryNoSpace; next; @@ -83,7 +85,7 @@ L_GetUniqueReward: next; set @illia_current_num_rewards, @illia_current_num_rewards + 1; getitem @reward$, 1; - mes "You found a " + $@illia_unique_rewards_n$ + "!"; + mes "You found a " + $@illia_unique_rewards_n$[@index] + "!"; set Illia_Uniques_Count, Illia_Uniques_Count + 1; set @reward$, ""; goto L_GetUniqueReward; diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index 7435f005..73858ce4 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,5 +1,5 @@ // Lobby janitor -052-2,1,1,0|script|#IlliaJanitor5|127 +052-2,1,1,0|script|#IlliaJanitor5|32767 { end; @@ -12,7 +12,7 @@ OnCommandClean: } // Storage janitor -052-2,1,1,0|script|#IlliaJanitor6|127 +052-2,1,1,0|script|#IlliaJanitor6|32767 { end; @@ -24,7 +24,7 @@ OnCommandClean: } // Final boss janitor -052-2,1,1,0|script|#IlliaJanitor7|127 +052-2,1,1,0|script|#IlliaJanitor7|32767 { end; diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index b5bb5fdd..83bb51ee 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -83,7 +83,7 @@ OnTimer15000: } -052-2,88,15,0|script|#LuviaDaemon|127 +052-2,88,15,0|script|#LuviaDaemon|32767 { end; diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index 62f9cd46..4ddfdc09 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -27,7 +27,7 @@ L_StartItemInvoker: } -052-2,1,1,0|script|#ItemsInvoker|127 +052-2,1,1,0|script|#ItemsInvoker|32767 { end; diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index cbd4b8fb..d0b30c0d 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -78,14 +78,14 @@ L_French: goto L_End; L_Spanish: - mes "Los jugadores que infrinjan las siguientes reglas pueden ser bloqueados (incluso permanentemente) o se reiniciarán al nivel 1 sus personajes, según el criterio de los GM:"; - mes "1. No abuse de otros jugadores (esto incluye insultos, malas palabras, y similares dirigidas a una o varias personas)"; - mes "2. No utilizar programas automáticos (incluyendo CUALQUIER actividad con el usuario lejos del teclado o el seguimiento automático)"; - mes "3. No envíe mensajes publicitarios o inunde el chat de mensajes (incluyendo los mensajes de intercambio)"; + mes "Los jugadores que rompan las siguientes reglas pueden ser bloqueados (incluso permanentemente), o se les restablecerán sus personajes, según el criterio del GM:"; + mes "1. No abusar de otros jugadores (insultos, malas palabras, y similares dirigidas a una o varias personas)"; + mes "2. No utilizar programas automáticos (incluyendo el seguimiento automático y CUALQUIER otra actividad mientras el jugador está lejos del teclado)"; + mes "3. No enviar mensajes publicitarios ni inundar el chat de mensajes (incluyendo los mensajes de intercambio)"; mes "4. No mendigar."; - mes "5. Escriba únicamente en Inglés en el chat público"; - mes "6. Trate a los demás de la misma forma que le gustaría ser tratado"; - mes "El uso de programas automáticos para jugar sin estar frente al teclado se determinará hablando con los jugadores que estén moviéndose y/o atacando."; + mes "5. Hablar únicamente en Inglés en el chat público"; + mes "6. Tratar a los demás de la misma forma que le gustaría ser tratado"; + mes "El uso de programas automáticos para jugar sin estar frente al teclado será determinado al hablar con los jugadores que estén moviéndose y/o atacando."; mes "El seguimiento automático será determinado por observación."; goto L_End; @@ -125,15 +125,15 @@ L_Polish: goto L_End; L_Italian: - mes "ATTENTION: this translation is outdated. Please refer to the English version and submit a patch."; - mes "I giocatori che infrangeranno le seguenti regole saranno bannati (anche permanentemente) o saranno resettati, a discrezione dei Game Masters:"; - mes "1. Vietato abusare degli altri giocatori (insulti, imprecazioni e simili, diretti verso una particolare persona o gruppi di persone)"; - mes "2. Vietato usare bot (ossia effettuare QUALSIASI attività quando non si è presenti alla tastiera)"; - mes "3. Vietato spammare / postare ripetutamente messaggi inutili (incluso spam di richieste di scambio)"; - mes "4. Vietato implorare"; - mes "5. Parlare solo inglese nella chat pubblica"; - mes "6. Tratta gli altri giocatori come vuoi che gli altri trattino te."; - mes "I bot saranno determinati in base alle risposte e ai movimenti dei giocatori esaminati."; + mes "Gli account dei giocatori che infrangeranno le seguenti regole verranno bloccati (anche permanentemente) o i loro personaggi saranno resettati, a discrezione dei GM:"; + mes "1. Non trattare male gli altri giocatori (questo include insulti, imprecazioni, e simili, diretti verso una persona in particolare o verso gruppi di persone)"; + mes "2. Non usare bot (ossia non effettuare NESSUNA attività quando non si è al computer)"; + mes "3. Non effettuare spam o scrivere ripetutamente messaggi inutili (incluso spam con richieste di scambio)"; + mes "4. Non fare il mendicante, ovvero non importunare gli altri chiedendo soldi o oggetti"; + mes "5. Non parlare altre lingue al di fuori dell'inglese nella chat pubblica"; + mes "6. Non fare agli altri ciò che non vuoi sia fatto a te."; + mes "I bot saranno individuati scrivendo ai giocatori sospetti che attaccano o camminano, esaminandone le risposte e i movimenti."; + mes "Chiunque segua automaticamente un altro giocatore senza dimostrare di non essere un bot, verrà considerato come tale."; goto L_End; L_End: |