- 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://svn.code.sf.net/p/rathena/svn/trunk@14343 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
4d87e0aefe
commit
1a62609555
@ -4544,7 +4544,7 @@
|
|||||||
12372,Hell_Contract,Hell Contract,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1379; },{},{}
|
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; },{},{}
|
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; },{},{}
|
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,,,,,,{},{},{}
|
12376,Mysterious_Can2,Mysterious Can2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
|
||||||
12377,Mysterious_PET_Bottle2,Mysterious PET Bottle2,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,,,,,,{},{},{}
|
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; },{},{}
|
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,,,,,,{},{},{}
|
14599,Greed_Scroll_C,Greed Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
|
||||||
14600,Mental_Potion,Mental Potion,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; },{},{}
|
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; },{},{}
|
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; },{},{}
|
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; },{},{}
|
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,,,,,,{},{},{}
|
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; },{},{}
|
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 INC_ALLSTATUS,3600000,6; },{},{}
|
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; },{},{}
|
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; },{},{}
|
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,,,,,,{},{},{}
|
15001,Odin's_Blessing_I,Odin's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
|
||||||
|
@ -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
|
- since NPC objects cannot own items, so they have to store item data in
|
||||||
variables and recreate the items.
|
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
|
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,
|
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
|
If an event label is given, upon the monster being killed, the event label will
|
||||||
run as if by 'donpcevent'.
|
run as if by 'donpcevent'.
|
||||||
|
|
||||||
|
@ -8867,7 +8867,6 @@ himinn,48,86,5 script Valkyrie#sign 811,{
|
|||||||
mes "[Valkyrie Sandra]";
|
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.";
|
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;
|
next;
|
||||||
set name,PcName;
|
|
||||||
mes "[Valkyrie Sandra]";
|
mes "[Valkyrie Sandra]";
|
||||||
mes "Congratulations,";
|
mes "Congratulations,";
|
||||||
mes ""+ strcharinfo(0) +". Verily,";
|
mes ""+ strcharinfo(0) +". Verily,";
|
||||||
@ -11438,7 +11437,6 @@ que_sign01,45,227,4 script Queen of the Dead 856,{
|
|||||||
close;
|
close;
|
||||||
}
|
}
|
||||||
else if (sign_q == 142) {
|
else if (sign_q == 142) {
|
||||||
set name,PcName;
|
|
||||||
mes "[Lady Hell]";
|
mes "[Lady Hell]";
|
||||||
mes "^8C1717Ah.";
|
mes "^8C1717Ah.";
|
||||||
mes "You are the";
|
mes "You are the";
|
||||||
|
@ -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 "You'll be the one using this scroll. Am I right?";
|
||||||
mes "Here, please take this.";
|
mes "Here, please take this.";
|
||||||
next;
|
next;
|
||||||
mes "[" + PcName + "]";
|
mes "[" + strcharinfo(0) + "]";
|
||||||
mes "'To gather members..?'";
|
mes "'To gather members..?'";
|
||||||
mes "..Right! I remember";
|
mes "..Right! I remember";
|
||||||
mes "Rayan mentioned a gathering somewhere!";
|
mes "Rayan mentioned a gathering somewhere!";
|
||||||
|
@ -6378,7 +6378,6 @@ ein_in01,200,101,5 script Clitzer#ein 854,{
|
|||||||
mes "*Press Press Press*";
|
mes "*Press Press Press*";
|
||||||
mes "*C-c-c-c-c-c-crack!*";
|
mes "*C-c-c-c-c-c-crack!*";
|
||||||
next;
|
next;
|
||||||
set name,strcharinfo(0);
|
|
||||||
mes "["+ strcharinfo(0) +"]";
|
mes "["+ strcharinfo(0) +"]";
|
||||||
mes "Oh--";
|
mes "Oh--";
|
||||||
mes "Hell yeah!";
|
mes "Hell yeah!";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user