Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated script commands 'npcshopitem', 'npcshopadditem' and 'npcshopdelitem' to support cashshops as well (bugreport:4928).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14836 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-05-29 12:41:16 +00:00
parent 8325f3518f
commit aa0bf03f74
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -1,6 +1,7 @@
Date Added Date Added
2011/05/29 2011/05/29
* Updated script commands 'npcshopitem', 'npcshopadditem' and 'npcshopdelitem' to support cashshops as well (bugreport:4928). [Ai4rei]
* Fixed players could add themselves to their friendslist through their clones or WPE (bugreport:4909). [Ai4rei] * Fixed players could add themselves to their friendslist through their clones or WPE (bugreport:4909). [Ai4rei]
* Fixed bonus 'bHPDrainValue' on left hand would work as right hand bonus, when specified with 'bonus' rather than 'bonus2' (bugreport:4939, since r6221). [Ai4rei] * Fixed bonus 'bHPDrainValue' on left hand would work as right hand bonus, when specified with 'bonus' rather than 'bonus2' (bugreport:4939, since r6221). [Ai4rei]
2011/05/23 2011/05/23

11
doc/script_commands.txt
View File

@ -4,7 +4,7 @@
//= A reference manual for the eAthena scripting language. //= A reference manual for the eAthena scripting language.
//= Commands are sorted depending on their functionality. //= Commands are sorted depending on their functionality.
//===== Version =========================================== //===== Version ===========================================
//= 3.42.20110508 //= 3.43.20110529
//========================================================= //=========================================================
//= 1.0 - First release, filled will as much info as I could //= 1.0 - First release, filled will as much info as I could
//= remember or figure out, most likely there are errors, //= remember or figure out, most likely there are errors,
@ -174,6 +174,9 @@
//= 3.42.20110508 //= 3.42.20110508
//= Updated description of all instance commands to reflect actual behavior. //= Updated description of all instance commands to reflect actual behavior.
//= [Ai4rei] //= [Ai4rei]
//= 3.43.20110529
//= Updated 'npcshopitem', 'npcshopadditem' and 'npcshopdelitem' to support
//= cashshops as well. [Ai4rei]
//========================================================= //=========================================================
This document is a reference manual for all the scripting commands and functions This document is a reference manual for all the scripting commands and functions
@ -5660,7 +5663,7 @@ npcshopitem was used. After rechecking the source, I found what caused this.
*npcshopitem "<name>",<item id>,<price>{,<item id>,<price>{,<item id>,<price>{,...}}} *npcshopitem "<name>",<item id>,<price>{,<item id>,<price>{,<item id>,<price>{,...}}}
This command lets you override the contents of an existing NPC shop. The This command lets you override the contents of an existing NPC shop or cashshop. The
current sell list will be wiped, and only the items specified with the price current sell list will be wiped, and only the items specified with the price
specified will be for sale. specified will be for sale.
@ -5673,7 +5676,7 @@ Note that you cannot use -1 to specify default selling price!
*npcshopadditem "<name>",<item id>,<price>{,<item id>,<price>{,<item id>,<price>{,...}}} *npcshopadditem "<name>",<item id>,<price>{,<item id>,<price>{,<item id>,<price>{,...}}}
This command will add more items at the end of the selling list for the This command will add more items at the end of the selling list for the
specified NPC shop. If you specify an item already for sell, that item will specified NPC shop or cashshop. If you specify an item already for sell, that item will
appear twice on the sell list. appear twice on the sell list.
The function returns 1 if shop was updated successfully, or 0 if not found. The function returns 1 if shop was updated successfully, or 0 if not found.
@ -5684,7 +5687,7 @@ Note that you cannot use -1 to specify default selling price!
*npcshopdelitem "<name>",<item id>{,<item id>{,<item id>{,...}}} *npcshopdelitem "<name>",<item id>{,<item id>{,<item id>{,...}}}
This command will remove items from the specified NPC shop. This command will remove items from the specified NPC shop or cashshop.
If the item to remove exists more than once on the shop, all instances will be If the item to remove exists more than once on the shop, all instances will be
removed. removed.

6
src/map/script.c
View File

@ -12875,7 +12875,7 @@ BUILDIN_FUNC(npcshopitem)
int n, i; int n, i;
int amount; int amount;
if( !nd || nd->subtype != SHOP ) if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) )
{ //Not found. { //Not found.
script_pushint(st,0); script_pushint(st,0);
return 0; return 0;
@ -12904,7 +12904,7 @@ BUILDIN_FUNC(npcshopadditem)
int n, i; int n, i;
int amount; int amount;
if( !nd || nd->subtype != SHOP ) if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) )
{ //Not found. { //Not found.
script_pushint(st,0); script_pushint(st,0);
return 0; return 0;
@ -12935,7 +12935,7 @@ BUILDIN_FUNC(npcshopdelitem)
int amount; int amount;
int size; int size;
if( !nd || nd->subtype != SHOP ) if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) )
{ //Not found. { //Not found.
script_pushint(st,0); script_pushint(st,0);
return 0; return 0;