diff options
| -rw-r--r-- | conf/mapflag/town.txt | 8 | ||||
| -rw-r--r-- | db/mob_db2.txt | 4 | ||||
| -rw-r--r-- | db/pre-re/skill_castnodex_db.txt | 2 | ||||
| -rw-r--r-- | db/re/skill_castnodex_db.txt | 2 | ||||
| -rw-r--r-- | npc/events/easter.txt | 202 | ||||
| -rw-r--r-- | npc/guild/agit_main.txt | 13 | ||||
| -rw-r--r-- | npc/merchants/falcon_flute.txt | 3 | ||||
| -rw-r--r-- | npc/scripts_custom.conf | 3 | ||||
| -rw-r--r-- | sql-files/mob_db2.sql | 3 |
9 files changed, 21 insertions, 219 deletions
diff --git a/conf/mapflag/town.txt b/conf/mapflag/town.txt index 8419998e2..5a4b4d74c 100644 --- a/conf/mapflag/town.txt +++ b/conf/mapflag/town.txt @@ -31,4 +31,10 @@ louyang mapflag town hugel mapflag town rachel mapflag town veins mapflag town -brasilis mapflag town
\ No newline at end of file +brasilis mapflag town +dicastes01 mapflag town +mora mapflag town +dewata mapflag town +malangdo mapflag town +malaya mapflag town +eclage mapflag town
\ No newline at end of file diff --git a/db/mob_db2.txt b/db/mob_db2.txt index a2567f33f..9e2aad976 100644 --- a/db/mob_db2.txt +++ b/db/mob_db2.txt @@ -3,10 +3,6 @@ // Structure of Database : // ID,Sprite_Name,kROName,iROName,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,MEXP,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper -// Easter Event Monsters -//1920,EASTER_EGG,Easter Egg,Easter Egg,3,300,0,4,4,0,1,2,20,20,1,1,1,1,1,20,10,12,0,0,60,128,1000,1001,1,1,0,0,0,0,0,0,0,1010,250,935,500,558,300,501,200,501,200,713,800,558,300,558,300,0,0,0,0 -//1921,EASTER_BUNNY,Easter Bunny,Easter Bunny,6,1800,0,60,55,1,20,26,0,40,1,36,6,1,11,80,10,10,0,2,60,181,200,1456,456,336,0,0,0,0,0,0,0,2250,200,515,8000,727,1200,746,1500,706,30,622,50,534,5000,0,0,0,0,4006,70 - // rAthena Dev Team //1900,VALARIS,Valaris,Valaris,99,668000,0,107250,37895,2,3220,4040,35,45,1,152,96,85,120,95,10,10,2,6,67,1973,100,1068,768,576,13000,608,1000,750,400,923,3800,1466,200,2256,200,2607,800,714,500,617,3000,984,4300,985,5600,0,0,0,0,4147,1 //1901,VALARIS_WORSHIPPER,Valaris's Worshipper,Valaris's Worshipper,50,8578,0,2706,1480,1,487,590,15,25,1,75,55,1,93,45,10,12,0,6,27,1685,100,868,480,120,0,0,0,0,0,0,0,923,500,984,63,1464,2,607,50,610,100,503,300,2405,50,0,0,0,0,4129,1 diff --git a/db/pre-re/skill_castnodex_db.txt b/db/pre-re/skill_castnodex_db.txt index 29732bef6..66b772386 100644 --- a/db/pre-re/skill_castnodex_db.txt +++ b/db/pre-re/skill_castnodex_db.txt @@ -19,7 +19,7 @@ 272,0,2 //MO_CHAINCOMBO 273,0,2 //MO_COMBOFINISH 336,1 //WE_CALLPARTNER -366,1 //HW_MAGICPOWER +366,3 //HW_MAGICPOWER 370,1 //CH_PALMSTRIKE 371,0,2 //CH_TIGERFIST 372,0,2 //CH_CHAINCRUSH diff --git a/db/re/skill_castnodex_db.txt b/db/re/skill_castnodex_db.txt index 29732bef6..66b772386 100644 --- a/db/re/skill_castnodex_db.txt +++ b/db/re/skill_castnodex_db.txt @@ -19,7 +19,7 @@ 272,0,2 //MO_CHAINCOMBO 273,0,2 //MO_COMBOFINISH 336,1 //WE_CALLPARTNER -366,1 //HW_MAGICPOWER +366,3 //HW_MAGICPOWER 370,1 //CH_PALMSTRIKE 371,0,2 //CH_TIGERFIST 372,0,2 //CH_CHAINCRUSH diff --git a/npc/events/easter.txt b/npc/events/easter.txt deleted file mode 100644 index 258988c15..000000000 --- a/npc/events/easter.txt +++ /dev/null @@ -1,202 +0,0 @@ -//===== rAthena Script ======================================= -//= Easter Egg Event -//===== By: ================================================== -//= kobra_k88 -//= fixed by Yoshimo -//===== Current Version: ===================================== -//= 1.0a -//===== Compatible With: ===================================== -//= -//===== Description: ========================================= -//= Break easter eggs in towns an cities to find chocolates. -//= Exchange the chocolates for prizes. -//= Includes Easter egg and Easter bunny mobs. -//===== Additional Comments: ================================= -//= Not sure about "Gold coin" as being one of the prizes. -//= fixed infinite gifts [Yor] (thanks to Yoshimo from Freya's forum) -//============================================================ - - -geffen,95,201,3 script Shilo 50,{ - mes "[Shilo]"; - if(easter_Q == 1) goto L_Check; - mes "*Sigh*... Where is my sister!?"; - next; - mes "[Shilo]"; - mes "Oh... Hi there! I'm extremely excited! You know why?"; - next; - mes "[Shilo]"; - mes "My favorite holiday is here... ^D2A200Easter^000000!!"; - next; - mes "[Shilo]"; - mes "I can't wait to go find some easter eggs..."; - next; - if(@talked == 1) menu "I want to look for these eggs.",sM_0, "... Eggs? Why?",M_0, "You seriously bore me... *yawn*...",M_End; - menu "... Eggs? Why?",M_0, "You seriously bore me...*yawn*..",M_End; - - M_0: - mes "[Shilo]"; - mes "You mean you've never been on an ^5533FFEaster Egg Hunt^000000 before?"; - next; - mes "[Shilo]"; - mes "They're the best! See every year, people from all over hide ^5533FFEaster eggs^000000 through out Rune Midgard."; - mes "And it's our job to go find as many as possible and collect all of the goodies inside of them."; - next; - mes "[Shilo]"; - mes "See, along time ago, the Peco Peco roamed the land free of any hostilities..."; - mes "All over Rune Midgard, they did as the pleased, and they reproduced without any fears."; - next; - mes "[Shilo]"; - mes "The Peco Peco population thrived and kept growing... Eventually their numbers got out of hand."; - mes "The people of Rune Midgard decided that they needed to do something about the overwhelming population of Peco Pecos."; - next; - mes "[Shilo]"; - mes "So they set out to destroy as many of the Peco Peco eggs they could find!!"; - next; - mes "[Shilo]"; - mes "Many children found the destruction of helpless Peco Peco eggs to be unbearable."; - mes "They were very sad about this and pleaded with their parents to stop."; - next; - mes "[Shilo]"; - mes "Unfortunately they could not stop."; - mes "If they did nothing the fertile lands of Rune Midard would be destoryed by the Peco Pecos."; - next; - mes "[Shilo]"; - mes "So they decided to try to convince the children that destroying the eggs was a good thing."; - mes "The parents starting making fake peco peco eggs that had treats in them."; - next; - mes "[Shilo]"; - mes "They hid them all over town and had the children search for them."; - mes "Once found, the children would break the eggs and find the treats. They would then feel happy about breaking Peco Peco eggs."; - next; - mes "[Shilo]"; - mes "Now the Peco Peco has natural enemies, like desert wolves, which keep the Peco Peco population in check."; - mes "Therefore the people of Rune Midgard no longer have to destroy defenseless Peco Peco eggs."; - next; - mes "[Shilo]"; - mes "But we still carry on the tradition of hiding fake eggs all over Rune Midgard every year."; - mes "And that is the story behind Easter in Rune Midgard."; - next; - mes "[Shilo]"; - mes "You know... it looks like I'm going to be here for alonge while. I'll tell you what..."; - next; - mes "[Shilo]"; - mes "If you go out and find some ^5533FFEaster eggs^000000 and bring me back their special 'treats', I will give you something for them..."; - mes "What do you say?"; - set @talked, 1; - next; - menu "What do I have to do?",sM_0, "Nah, I'm to busy.",sM_End; - - sM_0: - mes "[Shilo]"; - mes "All you have to do is go hunt for some Easter eggs which can be found in the towns and cities all over Rune Midgard."; - next; - mes "[Shilo]"; - mes "When you find them, break em. If you're lucky, there will be delicious ^D2A200'Chocolates'^000000 inside of them."; - mes "Find at least ^00950010^000000, and bring them to me and I will give you a ^FF5533prize^000000."; - next; - mes "[Shilo]"; - mes "The more you bring to me, the better my gift to you will be."; - next; - mes "[Shilo]"; - mes "I'll will give you something for:"; - mes "^00950010 ^D2A200Chocolates"; // 1 gold coin ? - mes "^5533FF50 ^D2A200Chocolates^000000"; // 1 old blue box - mes "and ^FF3355150 ^D2A200Chocolates^000000"; // 1 old purple box - next; - mes "[Shilo]"; - mes "So what do you say?"; - next; - menu "Sounds fun, I'll do it!",ssM_0, "I have better things to do",ssM_End; - - ssM_0: - mes "[Shilo]"; - mes "Great! But I must warn you..."; - next; - mes "[Shilo]"; - mes "During your hunt, you may come across the protectors of these eggs..."; - next; - mes "[Shilo]"; - mes "They have a bright, light blue color and are very 'fluffy'..."; - mes "Though I have never seen one, I've heard many stories about them."; - next; - mes "[Shilo]"; - mes "The have come to be know as... '^FF3355Easter Bunnies^000000'!!"; - mes "Be safe and good luck. I'll be waiting here."; - set easter_Q, 1; - close; - - ssM_End: - mes "[Shilo]"; - mes "Well it's your loss..."; - emotion 9; - close; - sM_End: - mes "[Shilo]"; - mes "Ahh, I understand. Farewell."; - close; - M_End: - mes "[Shilo]"; - mes "... Well, you're not all that exciting to talk with either..."; - emotion 9; - close; - - -//--------------------- -L_Check: -//---------- - mes "Find any ^D2A200Chocolate^000000 yet?"; - next; - mes "[Shilo]"; - if (countitem(558) < 10) goto L_NotEnuf; - mes "Great. You have " + countitem(558) + " ^D2A200Chocolates^000000. Here is your prize..."; - if (countitem(558) >= 150) goto L_150; - if (countitem(558) >= 50) goto L_50; - - delitem 558,10; - getitem 671,1; - goto L_Cont; - - L_50: - delitem 558,50; - getitem 603,1; - goto L_Cont; - - L_150: - delitem 558,150; - getitem 617,1; - goto L_Cont; - - L_Cont: - mes "Have fun and happy Easter!"; - close; - - L_NotEnuf: - mes "You don't have enough ^D2A200Chocolate^000000 for a prize."; - close; -} - - -// Easter Eggs -//===================================================== -alberta,0,0,0,0 monster Easter Egg 1920,100,0,0,0 -aldebaran,0,0,0,0 monster Easter Egg 1920,150,0,0,0 -amatsu,0,0,0,0 monster Easter Egg 1920,100,0,0,0 -comodo,0,0,0,0 monster Easter Egg 1920,100,0,0,0 -geffen,0,0,0,0 monster Easter Egg 1920,120,0,0,0 -gonryun,0,0,0,0 monster Easter Egg 1920,100,0,0,0 -izlude,0,0,0,0 monster Easter Egg 1920,80,0,0,0 -louyang,0,0,0,0 monster Easter Egg 1920,200,0,0,0 -morocc,0,0,0,0 monster Easter Egg 1920,250,0,0,0 -payon,0,0,0,0 monster Easter Egg 1920,150,0,0,0 -prontera,0,0,0,0 monster Easter Egg 1920,250,0,0,0 -umbala,0,0,0,0 monster Easter Egg 1920,100,0,0,0 -yuno,0,0,0,0 monster Easter Egg 1920,150,0,0,0 - -// Easter Bunny -//====================================================== -alberta,0,0,0,0 monster Easter Bunny 1921,1,1200000,900000,0 -geffen,0,0,0,0 monster Easter Bunny 1921,1,1200000,900000,0 -morocc,0,0,0,0 monster Easter Bunny 1921,2,1200000,900000,0 -payon,0,0,0,0 monster Easter Bunny 1921,1,1200000,900000,0 -prontera,0,0,0,0 monster Easter Bunny 1921,2,840000,420000,0 diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 42e7755fd..456e7eeeb 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -61,7 +61,7 @@ // War of Emperium has started. OnAgitStart: if (strnpcinfo(0) == "Gld_Agit_Manager") end; - MapRespawnGuildID strnpcinfo(2),GetCastleData(strnpcinfo(2),1),2; + MapRespawnGuildID strnpcinfo(2),GetCastleData(strnpcinfo(2),1),4; GvgOn strnpcinfo(2); // Spawn (fall through), or respawn the Emperium once it has been broken. @@ -120,7 +120,7 @@ OnAgitBreak: // Announce that the Emperium is destroyed, and respawn all but new castle-occupants. mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map|bc_woe,"0x00CCFF",FW_NORMAL,12; - MapRespawnGuildID strnpcinfo(2),.@GID,2; + MapRespawnGuildID strnpcinfo(2),.@GID,4; // Refresh castle data, disable Kafra and reset Invest information. donpcevent strnpcinfo(0)+"::OnRecvCastle"; @@ -634,6 +634,7 @@ OnRecvCastle: mes "That's all I have to report, Master."; close; case 2: + set .@Economy,GetCastleData(strnpcinfo(2),2); if (.@Economy < 6) { set .@eco_invest,5000; } else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } @@ -662,15 +663,15 @@ OnRecvCastle: mes "If you invest in commercial growth, the quantity of goods made by the guild will increase. Therfore, if you consider our future, investments will be a necessity."; mes " "; mes "Initially, you are able to invest just once but if you pay more money, you will be able to invest twice."; - if (.@Economy == 100) { + if (.@Economy >= 100) { mes " "; mes "^ff0000The commercial growth level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great economist like you, Master.^000000"; - end; + close; } if (GetCastleData(strnpcinfo(2),4) >= 2) { mes " "; mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect riches of the guild to grow at a high rate."; - end; + close; } if (GetCastleData(strnpcinfo(2),4) == 0) { mes " "; @@ -728,7 +729,7 @@ OnRecvCastle: mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required."; mes " "; mes "Originally you can invest just once but if you pay more money, you can invest twice."; - if (.@Defence == 100) { + if (.@Defence >= 100) { mes " "; mes "^ff0000But the Castle Defense level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great strategist like you, Master.^000000"; close; diff --git a/npc/merchants/falcon_flute.txt b/npc/merchants/falcon_flute.txt index f37baceaf..707fee35b 100644 --- a/npc/merchants/falcon_flute.txt +++ b/npc/merchants/falcon_flute.txt @@ -2,7 +2,8 @@ //= Falcon Flute Trader
//===== By: ==================================================
//= Masao
-//= Credits to Muad_Dib for the translation.
+//= Credits to Muad_Dib for the translation & Ziu for the
+//= Item ID of the Falcon Flute.
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index d26dcff01..50eab6f87 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -7,6 +7,9 @@ // ------------------------- My Scripts ------------------------- //npc: npc/location/to/script.txt // Your scripts go here!! +npc: npc/custom/extrablatt.txt +npc: npc/custom/ranker.txt +npc: npc/custom/emp_break_room.txt // -------------------------------------------------------------- // ----------------------- Basic Scripts ----------------------- // -- Card Remover diff --git a/sql-files/mob_db2.sql b/sql-files/mob_db2.sql index bd51f666e..42c320b8b 100644 --- a/sql-files/mob_db2.sql +++ b/sql-files/mob_db2.sql @@ -68,9 +68,6 @@ CREATE TABLE `mob_db2` ( # # Structure of Database : # REPLACE INTO `mob_db` VALUES ( ID,'Sprite_Name','kROName','iROName',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,MEXP,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper); -# Easter Event Monsters -# REPLACE INTO `mob_db2` VALUES (1920,'EASTER_EGG','Easter Egg','Easter Egg',3,300,0,4,4,0,1,2,20,20,1,1,1,1,1,20,10,12,0,0,60,128,1000,1001,1,1,0,0,0,0,0,0,0,1010,250,935,500,558,300,501,200,501,200,713,800,558,300,558,300,0,0,0,0); -# REPLACE INTO `mob_db2` VALUES (1921,'EASTER_BUNNY','Easter Bunny','Easter Bunny',6,1800,0,60,55,1,20,26,0,40,1,36,6,1,11,80,10,10,0,2,60,181,200,1456,456,336,0,0,0,0,0,0,0,2250,200,515,8000,727,1200,746,1500,706,30,622,50,534,5000,0,0,0,0,4006,70); # rAthena Dev Team # REPLACE INTO `mob_db2` VALUES (1900,'VALARIS','Valaris','Valaris',99,668000,0,107250,37895,2,3220,4040,35,45,1,152,96,85,120,95,10,10,2,6,67,1973,100,1068,768,576,13000,608,1000,750,400,923,3800,1466,200,2256,200,2607,800,714,500,617,3000,984,4300,985,5600,0,0,0,0,4147,1); # REPLACE INTO `mob_db2` VALUES (1901,'VALARIS_WORSHIPPER','Valaris\'s Worshipper','Valaris\'s Worshipper',50,8578,0,2706,1480,1,487,590,15,25,1,75,55,1,93,45,10,12,0,6,27,1685,100,868,480,120,0,0,0,0,0,0,0,923,500,984,63,1464,2,607,50,610,100,503,300,2405,50,0,0,0,0,4129,1); |