diff options
| -rw-r--r-- | conf-tmpl/battle_athena.conf | 6 | ||||
| -rw-r--r-- | db/Changelog.txt | 6 | ||||
| -rw-r--r-- | db/item_db.txt | 42 | ||||
| -rw-r--r-- | db/mob_db.txt | 2 | ||||
| -rw-r--r-- | npc/cities/valkyrie.txt | 13 | ||||
| -rw-r--r-- | src/map/mob.c | 5 |
6 files changed, 47 insertions, 27 deletions
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf index a36792ec4..2b5114f95 100644 --- a/conf-tmpl/battle_athena.conf +++ b/conf-tmpl/battle_athena.conf @@ -837,5 +837,11 @@ bone_drop: 0 // The rate of monsters dropping ores by the skill Ore Discovery (Default is 100) finding_ore_rate: 100 +//Method of calculating earned experience when defeating a monster: +//0 - jAthena's +//1 - eAthena's, using damage given / max_hp as damage ratio +//2 - eAthena's, using damage given / total damage as damage ratio +exp_calc_type: 1 + import: conf/import/battle_conf.txt diff --git a/db/Changelog.txt b/db/Changelog.txt index e6f60e31a..3edb35f42 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -5,6 +5,12 @@ Ayathoya items == Added but no effect ( all are "ect" itens) Skill databases == celest working on them i believe. +02/05 + * item_db.txt Added prices to all Magic Scrolls and to Horse Crest, + added +100-1000 Zeny effect to Gold Coin (it's used in st.Patric event) + not sure in Zeny amount, tough. [Lupus] + * mob_db.txt Kind of Beetle -> Beetle King. [Lupus] + 01/26 * Updated Counter dagger's attack, thanks to Poki#3 * Added ayo_fild02 to nomemo mapflag list diff --git a/db/item_db.txt b/db/item_db.txt index d7440724e..02956b3a8 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -134,7 +134,7 @@ 661,Sky_Apron,Soft Apron,2,20,0,50,,,,,10477567,2,,,,,{ pet 1275; },{} // Newer Items -662,Horse_Crest,Crest of the Horse,2,2,0,30,0,0,0,0,10477567,2,0,0,0,0,{ skilleffect 29,5; sc_start SC_SpeedUp0,240000,0; },{} +662,Horse_Crest,Crest of the Horse,2,2,3000,30,0,0,0,0,10477567,2,0,0,0,0,{ skilleffect 29,5; sc_start SC_SpeedUp0,240000,0; },{} 664,Gift_Box_,Gift Box,2,20,0,200,,,,,10477567,2,,,,,{ getitem -4,1; },{}, 665,Gift_Box__,Gift Box,2,20,0,200,,,,,10477567,2,,,,,{ getitem -4,1; },{}, 666,Gift_Box___,Gift Box,2,20,0,200,,,,,10477567,2,,,,,{ getitem -4,1; },{}, @@ -142,7 +142,7 @@ 668,Angpow,Angpow,0,1,0,2,,,,,10477567,2,,,,,{ set Zeny,Zeny+rand(100,10000); },{} 669,Rice_Cake_Soup,Rice Cake Soup,2,20,0,100,,,,,,,,,,,{},{} 670,Gold_Coin_Pouch,Gold Coin Pouch,2,20,0,400,,,,,,,,,,,{},{} -671,Gold_Coin,Gold Coin,2,20,0,40,,,,,,,,,,,{},{} +671,Gold_Coin,Gold Coin,2,20,0,40,,,,,10477567,2,,,,,{ set Zeny,Zeny+rand(100,1000); },{} 672,Copper_Coin_Pouch,Copper Coin Pouch,2,20,0,400,,,,,,,,,,,{},{} 673,Copper_Coin,Copper Coin,2,20,0,40,,,,,,,,,,,{},{} 674,Mysterious_Ore_Coin,Mysterious Ore Coin,2,20,0,40,,,,,0,3,,,,,{},{} @@ -159,21 +159,21 @@ 685,Ramadan,Ramadan,2,20,10,300,,,,,0,3,,,,,{},{} // Scrolls -686,Earth_Spike_3,Earth Spike Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 90,3,"Earth Spike Level 3"; },{} -687,Earth_Spike_5,Earth Spike Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 90,5,"Earth Spike Level 5"; },{} -688,Cold_Bolt_3,Cold Bolt Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 14,3,"Cold Bolt Level 3"; },{} -689,Cold_Bolt_5,Cold Bolt Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 14,5,"Cold Bolt Level 5"; },{} -690,Fire_Bolt_3,Fire Bolt Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 19,3,"Fire Bolt Level 3"; },{} -691,Fire_Bolt_5,Fire Bolt Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 19,5,"Fire bolt Level 5"; },{} -692,Lightning_Bolt_3,Lightning Bolt Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 20,3,"Lightning Bolt Level 3"; },{} -693,Lightning_Bolt_5,Lightning Bolt Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 20,5,"Lightning Bolt Level 5"; },{} -694,Soul_Strike_3,Soul Strike Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 13,3,"Soul Strike Level 3"; },{} -695,Soul_Strike_5,Soul Strike Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 13,5,"Soul Strike Level 5"; },{} -696,Fire_Ball_1,Fire Ball Level 1,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 17,1,"Fire Ball Level 1"; },{} -697,Fire_Ball_5,Fire Ball Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 17,5,"Fire Ball Level 5"; },{} -698,Fire_Wall_1,Fire Wall Level 1,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 18,1,"Fire Wall Level 1"; },{} -699,Fire_Wall_5,Fire Wall Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 18,5,"Fire Wall Level 5"; },{} -700,Frost_Diver_1,Frost Diver Level 1,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 15,1,"Frost Diver Level 1"; },{} +686,Earth_Spike_3,Earth Spike Level 3,2,650,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 90,3,"Earth Spike Level 3"; },{} +687,Earth_Spike_5,Earth Spike Level 5,2,1300,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 90,5,"Earth Spike Level 5"; },{} +688,Cold_Bolt_3,Cold Bolt Level 3,2,500,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 14,3,"Cold Bolt Level 3"; },{} +689,Cold_Bolt_5,Cold Bolt Level 5,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 14,5,"Cold Bolt Level 5"; },{} +690,Fire_Bolt_3,Fire Bolt Level 3,2,500,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 19,3,"Fire Bolt Level 3"; },{} +691,Fire_Bolt_5,Fire Bolt Level 5,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 19,5,"Fire bolt Level 5"; },{} +692,Lightning_Bolt_3,Lightning Bolt Level 3,2,500,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 20,3,"Lightning Bolt Level 3"; },{} +693,Lightning_Bolt_5,Lightning Bolt Level 5,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 20,5,"Lightning Bolt Level 5"; },{} +694,Soul_Strike_3,Soul Strike Level 3,2,500,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 13,3,"Soul Strike Level 3"; },{} +695,Soul_Strike_5,Soul Strike Level 5,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 13,5,"Soul Strike Level 5"; },{} +696,Fire_Ball_1,Fire Ball Level 1,2,500,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 17,1,"Fire Ball Level 1"; },{} +697,Fire_Ball_5,Fire Ball Level 5,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 17,5,"Fire Ball Level 5"; },{} +698,Fire_Wall_1,Fire Wall Level 1,2,350,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 18,1,"Fire Wall Level 1"; },{} +699,Fire_Wall_5,Fire Wall Level 5,2,700,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 18,5,"Fire Wall Level 5"; },{} +700,Frost_Diver_1,Frost Diver Level 1,2,350,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 15,1,"Frost Diver Level 1"; },{} 701,Ora_Ora,Ora Ora,3,55000,0,200,,,,,,,,,,,{},{} 702,Animal_Gore,Animal Gore,3,2,0,100,,,,,,,,,,,{},{} @@ -1719,10 +1719,10 @@ 11020,Louyang_History_Book,Louyang History Book,3,20,0,0,,,,,,,,,,,{},{} // More Scrolls -12000,Frost_Diver_5,Frost Diver Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 15,5,"Frost Diver Level 5"; },{} -12001,Heal_3,Heal Level 3,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 28,3,"Heal Level 3"; },{} -12002,Heal_5,Heal Level 5,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 28,5,"Heal Level 5"; },{} -12003,Teleport_1,Teleport Level 1,2,0,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 26,1,"Teleport Level 1"; },{} +12000,Frost_Diver_5,Frost Diver Level 5,2,700,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 15,5,"Frost Diver Level 5"; },{} +12001,Heal_3,Heal Level 3,2,1000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 28,3,"Heal Level 3"; },{} +12002,Heal_5,Heal Level 5,2,2000,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 28,5,"Heal Level 5"; },{} +12003,Teleport_1,Teleport Level 1,2,100,0,10,0,0,0,0,10477567,2,0,0,0,0,{ itemskill 26,1,"Teleport Level 1"; },{} // Arrow Quivers 12004,Arrow_Quiver,Arrow Quiver,2,500,,250,,,,,10477567,2,,,,,{ getitem 1750,500; },{} diff --git a/db/mob_db.txt b/db/mob_db.txt index d3c72e5af..b50dcb25e 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -489,7 +489,7 @@ 1491,G_DOKEBI,Dokebi,33,2697,0,0,0,1,197,249,0,10,1,50,40,35,69,40,10,12,0,6,27,145,250,1156,456,384,512,0,512,0,512,0,512,0,512,0,512,0,512,0,512,0,0,0,0,0,0,0,0,0 1492,INCANTATION_SAMURAI,Incantation Samurai,71,218652,0,53600,5000,1,1219,2169,10,51,1,85,78,85,150,60,10,12,2,7,67,181,200,1152,1152,480,512,0,1165,1,999,5000,984,3500,985,1000,607,5000,512,0,504,5000,5000,1000,607,500,608,1000,985,2000,607,6000 1493,DRYAD,Dryad,50,8791,0,2763,1493,3,499,589,15,33,1,75,55,1,78,45,10,12,1,3,64,149,200,1152,1152,384,7188,3000,7198,1100,7197,6000,1951,200,2269,2,1964,1,7100,3200,512,0,0,0,0,0,0,0,0,0 -1494,KIND_OF_BEETLE,Kind of Beetle,34,1874,0,679,442,1,191,243,45,12,1,34,10,1,50,1,10,12,0,4,22,149,200,1152,1152,384,7190,9000,7202,6000,928,600,955,600,2102,15,512,0,512,0,512,0,0,0,0,0,0,0,0,0 +1494,BEETLE_KING,Beetle King,34,1874,0,679,442,1,191,243,45,12,1,34,10,1,50,1,10,12,0,4,22,149,200,1152,1152,384,7190,9000,7202,6000,928,600,955,600,2102,15,512,0,512,0,512,0,0,0,0,0,0,0,0,0 1495,STONE_SHOOTER,Stone Shooter,42,4104,0,1238,752,9,309,350,12,45,1,40,20,79,92,20,10,12,1,3,63,133,150,1872,1248,428,7203,8000,7188,6000,7201,3000,7049,1500,1019,1000,756,197,0,0,0,0,0,0,0,0,0,0,0,0 1497,WOODEN_GOLEM,Wooden Golem,51,9200,0,1926,1353,1,570,657,32,36,1,41,69,5,85,41,10,12,2,3,42,149,200,1152,1584,400,7188,6500,7189,5000,757,120,604,100,2270,3,921,1000,7201,900,0,0,0,0,0,0,0,0,0,0 1498,WOOTAN_SHOOTER,Wootan Shooter,39,3977,0,886,453,9,224,271,10,28,1,35,29,15,120,42,10,12,1,7,42,133,200,1152,1152,384,7049,1000,513,1000,7195,4500,7200,3500,512,100,512,0,512,0,512,0,0,0,0,0,0,0,0,0 diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 6c0c4a67c..94f41920b 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -1,7 +1,7 @@ // Valkyrie Replacement after kRO. // The Jobquest from kRO on how to advance to a Reborn class. // Made by: Nana -// 1.01 bugfixex by Lupus +// 1.0.2 bugfixex by Lupus // -== Warp's needed! ==- @@ -44,15 +44,15 @@ L_Start: mes "[Book of Ymir]"; mes "And only after then, the decended ones will aprove you to the highest obedience.. Into the warmth of Valkyrie, you will be welcomed by the gods themself."; next; - mes "[Book og Ymir]"; + mes "[Book of Ymir]"; mes "*As you close the book a strange ray of light sourounds you and you suddently feel light. Everything around you fades away and all you can see left is white before you pass out.*"; warp "valkyrie",48,9; - set valkyrie_Q,0; close; } // -== The Librarian that watches the "Book of Ymir" ==- yuno_in02.gat,91,176,5 script Librarian 754,{ + if (valkyrie_Q>0) goto L_DONE; if(readparam(19) >= 7) goto L_Pay; mes "[Librarian]"; mes "Have a look around, but dont touch the book. Only a few chosen one can read its wise words."; @@ -87,6 +87,13 @@ accurate_z: mes "You didnt bring me the accurate number of zeny i wanted. Bring me back only 1,285,000 zeny!"; mes "Not more, nor less."; close; + +L_DONE: + mes "[Librarian]"; + mes "Why? You have already paid me."; + mes "Now go and look for the Book of Ymir."; + close; + } // -== The Heart of Ymir ==- diff --git a/src/map/mob.c b/src/map/mob.c index b381a4407..b8eac5d67 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -237,12 +237,13 @@ int mob_once_spawn_area(struct map_session_data *sd,char *mapname, x=rand()%(x1-x0+1)+x0; y=rand()%(y1-y0+1)+y0; } while (map_getcell(m,x,y,CELL_CHKNOPASS) && (++j)<max); + // freya }while( ( (c=map_getcell(m,x,y))==1 || c==5)&& (++j)<max ); if(j>=max){ - if(lx>=0){ // 検索に失敗したので以前に沸いた場所を使う + if(lx>=0){ // Since reference went wrong, the place which boiled before is used. x=lx; y=ly; }else - return 0; // 最初に沸く場所の検索を失敗したのでやめる + return 0; // Since reference of the place which boils first went wrong, it stops. } if(x==0||y==0) printf("xory=0, x=%d,y=%d,x0=%d,y0=%d\n",x,y,x0,y0); id=mob_once_spawn(sd,mapname,x,y,mobname,class_,1,event); |