diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-06-15 16:34:44 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-06-15 16:34:44 +0000 |
commit | 2d20b3feef8a0985b84108736d53f6ebc512d5dd (patch) | |
tree | bf0258442802776194bce1be70706c85b23aa330 | |
parent | 9b6c71e9f53861a0e35ad1842e695e789e21204f (diff) | |
download | hercules-2d20b3feef8a0985b84108736d53f6ebc512d5dd.tar.gz hercules-2d20b3feef8a0985b84108736d53f6ebc512d5dd.tar.bz2 hercules-2d20b3feef8a0985b84108736d53f6ebc512d5dd.tar.xz hercules-2d20b3feef8a0985b84108736d53f6ebc512d5dd.zip |
- Fixed some item script typos from r14332. (bugreport:4312)
- Removed an extra tab from r14342. (bugreport:4314)
- Clarified documentation about 'getinventorylist' (bugreport:4279) and fixed a small typo. (bugreport:4300)
- Fixed occurances of PcName in quests_13_1, quests_ein, and The_Sign_Quest. (bugreport:4302).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14343 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | db/item_db.txt | 8 | ||||
-rw-r--r-- | db/mob_db.txt | 2 | ||||
-rw-r--r-- | doc/script_commands.txt | 9 | ||||
-rw-r--r-- | npc/quests/The_Sign_Quest.txt | 2 | ||||
-rw-r--r-- | npc/quests/quests_13_1.txt | 2 | ||||
-rw-r--r-- | npc/quests/quests_ein.txt | 1 |
6 files changed, 13 insertions, 11 deletions
diff --git a/db/item_db.txt b/db/item_db.txt index cedc4da33..9de80bb94 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -4544,7 +4544,7 @@ 12372,Hell_Contract,Hell Contract,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1379; },{},{} 12373,Boy's_Naivety,Boy's Pure Heart,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1370; },{},{} 12374,Flaming_Ice,Ice Fireworks,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1837; },{},{} -12375,Acaraje,Akaraje,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INHITHATE,120000,5; },{},{} +12375,Acaraje,Akaraje,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INCHITRATE,120000,5; },{},{} 12376,Mysterious_Can2,Mysterious Can2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12377,Mysterious_PET_Bottle2,Mysterious PET Bottle2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12378,2009_Rice_Cake_Soup,Rice Cake Soup,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} @@ -5784,14 +5784,14 @@ 14598,GhostringS,Ghostring Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,60000,4047; },{},{} 14599,Greed_Scroll_C,Greed Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 14600,Mental_Potion,Mental Potion,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14601,Tyr's_Blessing,Tyr's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,300000,30; sc_start SC_INHIT,300000,30; sc_start SC_ATKPOTION,300000,20; sc_start SC_MATKPOTION,300000,20; },{},{} +14601,Tyr's_Blessing,Tyr's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,300000,30; sc_start SC_INCHIT,300000,30; sc_start SC_ATKPOTION,300000,20; sc_start SC_MATKPOTION,300000,20; },{},{} 14602,TaogunkaS,Tao Gunka Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,180000,4302; },{},{} 14603,MistressS,Mistress Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,180000,4132; },{},{} 14604,Orc_HeroS,Orc Hero Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,60000,4143; },{},{} 14605,Orc_LoadS,Orc Lord Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,180000,4135; },{},{} 14606,Job_Manual25,JOB Battle Manual,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} -14607,Luxurious_Dinner_W,Luxurious Western Food,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start INC_ALLSTATUS,3600000,3; },{},{} -14608,Luxurious_Dinner_E,Manchu-Han Imperial Feast,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start INC_ALLSTATUS,3600000,6; },{},{} +14607,Luxurious_Dinner_W,Luxurious Western Food,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,3600000,3; },{},{} +14608,Luxurious_Dinner_E,Manchu-Han Imperial Feast,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,3600000,6; },{},{} 14609,Spoiled_Cuisine,Spoiled Cuisine,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,10; },{},{} 15000,Bone_Plate,Bone Plate,5,20,,1000,,7,,1,0x00021040,2,2,16,,85,1,0,{ bonus bStr,1; bonus bMDef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{} 15001,Odin's_Blessing_I,Odin's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} diff --git a/db/mob_db.txt b/db/mob_db.txt index 8735dd7b3..34f0a343c 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -273,7 +273,7 @@ 1269,CLOCK,Clock,Clock,60,11050,0,3410,2904,1,720,909,15,10,1,70,50,25,90,50,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,0,1095,5335,1019,800,509,1900,568,320,7026,30,7027,30,985,163,0,0,0,0,4299,1 1270,C_TOWER_MANAGER,Clock Tower Manager,Clock Tower Manager,63,18600,0,4378,2850,3,880,1180,35,30,1,75,20,64,75,60,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,0,1095,5335,7054,5335,999,500,520,850,2109,1,7026,2000,7027,2000,0,0,0,0,4229,1 1271,ALLIGATOR,Alligator,Alligator,42,6962,0,1379,866,1,315,360,2,5,1,45,50,10,69,65,10,12,1,2,21,0x91,200,1100,900,480,0,0,0,0,0,0,0,0,912,1000,1099,600,7003,2000,608,50,0,0,0,0,756,129,0,0,0,0,4252,1 -1272,DARK_LORD,Dark Lord,Dark Lord,80,720000,0,65780,45045,2,2800,3320,30,70,1,120,30,118,99,60,10,12,2,6,89,0x37B5,100,868,768,480,32890,10000,7005,6000,5093,500,617,2000,1615,800,5017,550,1237,300,2334,300,2507,100,2004,1 0,5162,10,0,0,0,0,4168,1 +1272,DARK_LORD,Dark Lord,Dark Lord,80,720000,0,65780,45045,2,2800,3320,30,70,1,120,30,118,99,60,10,12,2,6,89,0x37B5,100,868,768,480,32890,10000,7005,6000,5093,500,617,2000,1615,800,5017,550,1237,300,2334,300,2507,100,2004,10,5162,10,0,0,0,0,4168,1 1273,ORC_LADY,Orc Lady,Orc Lady,31,2000,0,644,407,1,135,170,10,10,35,42,25,15,69,55,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,7053,4656,998,300,2602,1,2206,1,12127,10,7477,3,2338,1,0,0,0,0,4255,1 1274,MEGALITH,Megalith,Megalith,45,5300,0,1758,1075,9,264,314,50,25,1,45,60,5,95,5,10,12,2,0,80,0x84,200,1332,1332,672,0,0,0,0,0,0,0,0,912,100,7049,1000,617,1,0,0,0,0,985,61,757,207,0,0,0,0,4200,1 1275,ALICE,Alice,Alice,62,10000,0,3583,2400,1,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,0x91,200,502,2304,480,0,0,0,0,0,0,0,0,7047,2500,637,40,2407,3,739,30,5085,1,12128,10,12002,100,0,0,0,0,4253,1 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index fe6f1663d..d8d9f51e7 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -2531,7 +2531,12 @@ correctly handle an NPC trader for carded and named items who could resell them - since NPC objects cannot own items, so they have to store item data in variables and recreate the items. -Notice that the variables this command generates are all local and numeric. +Notice that the variables this command generates are all temporary, attached to +the character, and integer. + +Be sure to use @inventorylist_count to go through these arrays, and not +'getarraysize', because the arrays are not automatically cleared between runs +of 'getinventorylist'. --------------------------------------- @@ -4977,7 +4982,7 @@ invoking character. Timeout is the time in milliseconds the summon lives, and is set default to 60000 (1 minute). Note that also the value 0 will set the timer to default, -and it is not possible to create a spawn that lastst forever. +and it is not possible to create a spawn that lasts forever. If an event label is given, upon the monster being killed, the event label will run as if by 'donpcevent'. diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt index d88cb118f..6fcc4c0ab 100644 --- a/npc/quests/The_Sign_Quest.txt +++ b/npc/quests/The_Sign_Quest.txt @@ -8867,7 +8867,6 @@ himinn,48,86,5 script Valkyrie#sign 811,{ mes "[Valkyrie Sandra]"; mes "As a symbol of this promise to invite you to Valhalla, you shall be rewarded with 'The Sign' which will show all others that you are a great warrior whose courage was tested by the gods themselves."; next; - set name,PcName; mes "[Valkyrie Sandra]"; mes "Congratulations,"; mes ""+ strcharinfo(0) +". Verily,"; @@ -11438,7 +11437,6 @@ que_sign01,45,227,4 script Queen of the Dead 856,{ close; } else if (sign_q == 142) { - set name,PcName; mes "[Lady Hell]"; mes "^8C1717Ah."; mes "You are the"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 8e8a24c6a..0058a76a9 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -15219,7 +15219,7 @@ mid_camp,256,272,3 script Defaria#moc2 897,{ mes "You'll be the one using this scroll. Am I right?"; mes "Here, please take this."; next; - mes "[" + PcName + "]"; + mes "[" + strcharinfo(0) + "]"; mes "'To gather members..?'"; mes "..Right! I remember"; mes "Rayan mentioned a gathering somewhere!"; diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 8833f29bc..8d330f747 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -6378,7 +6378,6 @@ ein_in01,200,101,5 script Clitzer#ein 854,{ mes "*Press Press Press*"; mes "*C-c-c-c-c-c-crack!*"; next; - set name,strcharinfo(0); mes "["+ strcharinfo(0) +"]"; mes "Oh--"; mes "Hell yeah!"; |