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

* Corrected warnings (and errors on some compilers) from r14327.

Browse Source 
* Actually added Manul/Splendide shop files from r14327.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14329 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-06-02 01:47:39 +00:00
parent 1552a1841c
commit 52ebde00b8
6 changed files with 240 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/06/01
* Rev. 14329 Corrected warnings (and errors on some compilers) from r14327. [L0ne_W0lf]
* Rev. 14327 Implemented the Manuk and Splendide item status effects, thanks to Epoque. [L0ne_W0lf]
2010/05/31
* Added support for using 'town', 'autotrade', 'allowks', 'monster_noteleport', 'pvp_nocalcrank' and 'battleground' mapflags in scripts (bugreport:4226). [Paradox924X]

1
npc/Changelog.txt
View File

@ -1,6 +1,7 @@
Date Added
======
2010/06/01
* Rev. 14329 Actually added Manul/Splendide shop files from r14327. [L0ne_W0lf]
* Rev. 14327 Added Splendide and Manuk merchants. [L0ne_W0lf]
2010/05/30
* Rev. 14315 Shop update, and added Wanderer pet food maker NPC. [L0ne_W0lf]

117
npc/merchants/manuk.txt Normal file
View File

@ -0,0 +1,117 @@
//===== eAthena Script =======================================
//= Manuk Merchant
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= Manuk coin redemption NPC.
//===== Additional Comments: =================================
//= 1.0 First version
//============================================================
man_in01,286,16,1 script Merchant of Manuk 454,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
set .@anrp_test,1201;
if (anrp_test == 1) {
mes "[Merchant of Manuk]";
mes "It looks like you're carrying too many things.";
mes "Why not put some of your items in storage and come back?";
close;
}
mes "[Merchant of Manuk]";
mes "Hello.";
mes "What are you looking for?";
next;
switch(select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel")) {
case 1:
mes "[Merchant of Manuk]";
mes "Here are the item descriptions.";
close2;
ReadBook 11019,1;
end;
case 2:
mes "[Merchant of Manuk]";
mes "I can sell you 3 Manuk's Opportunity for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6080) > 0) {
mes "[Merchant of Manuk]";
mes "Thank you for coming.";
delitem 6080,1; //Manuk_Coin
getitem 12342,3; //Manuk's_Opportunity
close;
}
else {
mes "[Merchant of Manuk]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Manuk]";
mes "Come again if you change your mind.";
close;
}
case 3:
mes "[Merchant of Manuk]";
mes "I can sell you 3 Manuk's Courage for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6080) > 0) {
mes "[Merchant of Manuk]";
mes "Thank you for coming.";
delitem 6080,1; //Manuk_Coin
getitem 12343,3; //Manuk's_Courage
close;
}
else {
mes "[Merchant of Manuk]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Manuk]";
mes "Come again if you change your mind.";
close;
}
case 4:
mes "[Merchant of Manuk]";
mes "I can sell you 3 Manuk's Faith for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6080) > 0) {
mes "[Merchant of Manuk]";
mes "Thank you for coming.";
delitem 6080,1; //Manuk_Coin
getitem 12348,3; //Manuk's_Faith
close;
}
else {
mes "[Merchant of Manuk]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Manuk]";
mes "Come again if you change your mind.";
close;
}
case 5:
mes "[Merchant of Manuk]";
mes "Come again if you change your mind.";
close;
}
}
else {
mes "[Merchant of Manuk]";
mes "Rtt od d";
mes "Qwo hd is d irr";
close;
}
}

117
npc/merchants/splendide.txt Normal file
View File

@ -0,0 +1,117 @@
//===== eAthena Script =======================================
//= Splendide Merchant
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= Splendide coin redemption NPC.
//===== Additional Comments: =================================
//= 1.0 First version
//============================================================
spl_in01,110,326,5 script Merchant of Splendide 439,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
set .@anrp_test,1201;
if (anrp_test == 1) {
mes "[Merchant of Splendide]";
mes "It looks like you're carrying too many things.";
mes "Why not put some of your items in storage and come back?";
close;
}
mes "[Merchant of Splendide]";
mes "Hello.";
mes "What are you looking for?";
next;
switch(select("View item description:Buy Pinguicula's fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing")) {
case 1:
mes "[Merchant of Splendide]";
mes "Would you like to see the item description?";
close2;
ReadBook 11018,1;
end;
case 2:
mes "[Merchant of Splendide]";
mes "I can sell you 3 Pinguicula's fruit Jam for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6081) > 0) {
mes "[Merchant of Splendide]";
mes "Thank you for coming.";
delitem 6081,1; //Splendide_Coin
getitem 12344,3; //Pinguicula's_fruit_Jam
close;
}
else {
mes "[Merchant of Splendide]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Splendide]";
mes "Come again if you change your mind.";
close;
}
case 3:
mes "[Merchant of Splendide]";
mes "I can sell you 3 Luciola's Honey Jam for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6081) > 0) {
mes "[Merchant of Splendide]";
mes "Thank you for coming.";
delitem 6081,1; //Splendide_Coin
getitem 12345,3; //Luciola's_Honey_Jam
close;
}
else {
mes "[Merchant of Splendide]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Splendide]";
mes "Come again if you change your mind.";
close;
}
case 4:
mes "[Merchant of Splendide]";
mes "I can sell you 3 Cornus' Tears for^3131FF 1 coin^000000";
next;
switch(select("Purchase:Do not purchase.")) {
case 1:
if (countitem(6081) > 0) {
mes "[Merchant of Splendide]";
mes "Thank you for coming.";
delitem 6081,1; //Splendide_Coin
getitem 12349,3; //Cornus'_Tears
close;
}
else {
mes "[Merchant of Splendide]";
mes "You don't have enough coins.";
close;
}
case 2:
mes "[Merchant of Splendide]";
mes "Come again if you change your mind.";
close;
}
case 5:
mes "[Merchant of Splendide]";
mes "Come again if you change your mind.";
close;
}
}
else {
mes "[Merchant of Splendide]";
mes "BurWehAla";
mes "tasnarAndu Ie Ru";
close;
}
}

4
src/map/mob.c
View File

@ -74,8 +74,8 @@ static struct {
#define CLASSCHANGE_BOSS_NUM 21
//Defines the Manuk/Splendide mob groups for the status reductions [Epoque]
const int mob_manuk[] = { 1986, 1987, 1988, 1989, 1990, 1997, 1998, 1999 };
const int mob_splendide[] = { 1991, 1992, 1993, 1994, 1995 };
const int mob_manuk[8] = { 1986, 1987, 1988, 1989, 1990, 1997, 1998, 1999 };
const int mob_splendide[5] = { 1991, 1992, 1993, 1994, 1995 };
/*==========================================
* Local prototype declaration (only required thing)

4
src/map/mob.h
View File

@ -39,8 +39,8 @@
#define DEFAULT_ENEMY_TYPE(md) (md->special_state.ai?BL_CHAR:BL_PC|BL_HOM|BL_MER)
//Externals for the status effects. [Epoque]
extern const int mob_manuk[];
extern const int mob_splendide[];
extern const int mob_manuk[8];
extern const int mob_splendide[5];
//Mob skill states.
enum MobSkillState {