Skip to content
Permalink
Browse files
Implemented Wolfchev's Laboratory instance. (credits: Hercules 1a477c4)
Signed-off-by: Euphy <euphy.raliel@rathena.org>
  • Loading branch information
euphyy committed May 13, 2014
1 parent 82a1c70 commit dd9719de62bf0a09d7527bc9d988367ca2c675ca
Showing with 3,193 additions and 581 deletions.
  1. +1 −1 db/re/instance_db.txt
  2. +1 −1 db/re/item_db.txt
  3. +1 −2 db/re/mob_db.txt
  4. +3,185 −0 npc/re/instances/WolfchevLaboratory.txt
  5. +2 −574 npc/re/quests/quests_lighthalzen.txt
  6. +1 −0 npc/re/scripts_athena.conf
  7. +1 −1 sql-files/item_db_re.sql
  8. +1 −2 sql-files/mob_db_re.sql
@@ -13,5 +13,5 @@
7,Bangungot Hospital 2F,3600,1@ma_h,40,157,1@ma_h
8,Buwaya Cave,3600,1@ma_c,35,57,1@ma_c
9,Bakonawa Lake,7200,1@ma_b,64,51,1@ma_b
//10,Wolfchev's Laboratory,14400,1@lhz,45,148,1@lhz
10,Wolfchev's Laboratory,14400,1@lhz,45,148,1@lhz
11,Old Glast Heim,3600,1@gl_k,150,20,1@gl_k,2@gl_k
@@ -8553,7 +8553,7 @@
18567,Stretched_Nose,Stretched Nose,4,20,,100,,0,,0,0xFFFFFFFF,63,2,1,,0,0,737,{},{},{}
18568,Humming_Bird,Humming Bird,4,20,,100,,3,,0,0xFFFFFFFF,63,2,256,,10,0,702,{ bonus bMdef,6; },{},{}
18569,Soft_Sheep_Hat,Soft Sheep Hat,4,20,,1000,,0,,0,0xFFFFFFFF,63,2,256,,10,0,738,{},{},{}
18570,Ancient_Gold_Ornament,Ancient Gold Ornament,4,20,,400,,7,,1,0xFFFFFFFE,63,2,256,,100,1,739,{ if(BaseLevel >= 150) { bonus bAllStats,2; } if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief){ bonus2 bAddClass,Class_All,8; } if(BaseClass==Job_Mage||BaseClass==Job_Acolyte){ bonus bMatk,8; } if(BaseClass==Job_Archer){ bonus bDex,3; bonus bLongAtkRate,10; } },{},{}
18570,Ancient_Gold_Deco,Ancient Gold Ornament,4,20,,400,,7,,1,0xFFFFFFFE,63,2,256,,100,1,739,{ if(BaseLevel >= 150) { bonus bAllStats,2; } if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief){ bonus2 bAddClass,Class_All,8; } if(BaseClass==Job_Mage||BaseClass==Job_Acolyte){ bonus bMatk,8; } if(BaseClass==Job_Archer){ bonus bDex,3; bonus bLongAtkRate,10; } },{},{}
18571,Lucky_Hat,Lucky Hat,4,20,,1000,,0,,0,0xFFFFFFFF,63,2,256,,0,0,740,{ bonus2 bExpAddRace,RC_All,3; },{},{}
18572,Korean_Judge_Hat,Korean Judge Hat,4,20,,300,,2,,1,0xFFFFFFFF,63,2,256,,0,1,377,{ bonus bMdef,2; bonus bVariableCastrate,-6;bonus bAspdRate,6;if(getrefine()>6){bonus2 bSubRace,RC_DemiHuman,2;bonus2 bSubRace,RC_Player,2;}if(BaseClass==Job_Swordman || BaseClass==Job_Merchant || BaseClass==Job_Thief || Class==Job_Taekwon || Class==Job_Star_Gladiator || Class==Job_Star_Gladiator2 || Class==Job_Monk || Class==Job_Champion || Class==Job_Sura || Class==Job_Sura_T) bonus2 bAddClass,Class_All,(getrefine()/2);if(BaseClass==Job_Mage || BaseClass==Job_Acolyte || Class==Job_Ninja || Class==Job_Soul_Linker) bonus bMatkRate,(getrefine()/2);if(BaseClass==Job_Archer || Class==Job_Gunslinger) bonus bBaseAtk,getrefine(); },{},{}
18573,White_Feather,White Feather,4,20,,500,,2,,1,0xFFFFFFFF,63,2,256,,30,1,741,{ if(getrefine()<5){bonus bHit,20;bonus bMaxHPrate,-10;}else if(getrefine()<7){bonus bHit,10;}else if(getrefine()<9){bonus bHit,7;bonus bMaxHPrate,3;}else{bonus bHit,4;bonus bMaxHPrate,4;} },{},{}
@@ -1376,8 +1376,7 @@
2241,B_TRENTINI,Gypsy Trentini,Gypsy Trentini,160,3894278,0,4463758,2563096,1,1070,1498,181,112,176,258,155,132,309,95,10,12,1,7,84,0x37B5,100,76,384,288,2231879,0,0,0,0,0,0,12623,9000,12616,9000,616,9000,6224,9000,18103,5000,18110,5000,1963,5000,0,0,0,0,0,0
2242,MD_DESERT_WOLF,Desert Wolf,Desert Wolf,135,551578,0,0,0,1,1040,1158,151,39,93,69,63,61,82,42,10,12,1,6,20,0x37B5,200,1120,420,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2243,MD_DESERT_WOLF_B,Desert Wolf,Desert Wolf,130,274531,0,0,0,1,66,82,13,0,10,12,8,5,17,7,10,12,0,6,20,0x37B5,300,1600,900,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Fix me! 2244 needs new info.
2244,QUEST_CHEN,Champion Chen,Champion Chen,99,15000,2000,0,0,1,1700,3000,216,134,126,74,71,123,99,65,10,12,1,7,68,0x37B5,180,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2244,QUEST_CHEN,Champion Chen,Champion Chen,130,300,1,0,0,1,103,126,25,56,122,81,83,130,201,61,10,12,1,7,81,0x37B5,300,200,768,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2245,EXP_TEST,Exp Test,Exp Test,1,100,1,100,100,1,8,9,2,5,6,1,1,0,6,5,10,12,1,7,21,0x83,400,1000,480,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2246,Q_WOOTAN_FIGHTER,Wootan Fighter,Wootan Fighter,95,9000,1,1400,2000,1,255,291,103,8,63,14,36,5,62,15,10,12,1,7,43,0x83,200,912,1344,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2247,Q_INCREASE_SOIL,Increase Soil,Mi Gao,95,20000,1,1400,2000,1,365,395,112,39,67,23,41,49,94,30,10,12,1,0,62,0x83,445,106,1056,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

5 comments on commit dd9719d

@kisuka
Copy link
Contributor

@kisuka kisuka commented on dd9719d May 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change the 1.0 comment to your own name...? Add your own line...

@cydh
Copy link
Contributor

@cydh cydh commented on dd9719d May 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be
1.0 Initial Release [Kisuka]
1.1 "something" [Euphy]

@kisuka
Copy link
Contributor

@kisuka kisuka commented on dd9719d May 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is how it's supposed to be. That's how it's always been.

@euphyy
Copy link
Contributor Author

@euphyy euphyy commented on dd9719d May 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because there'd be no "1.0", if anyone tries searching for the file in git history.
You're listed as the author in the "By:" line and your commit is in my commit log.

@kisuka
Copy link
Contributor

@kisuka kisuka commented on dd9719d May 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are also no "1.0" releases of majority of the scripts and source in rAthena, since you guys are a fork of eAthena. Your argument doesn't make any sense. Please readd the original changelog to the script. You pulled this file from another project. You are modifying an existing script, add a new line to the changelog. You don't have the right to just remove the previous history because your adding it here for the first time. That goes against the spirit of open source development. The file has it's own history outside of this project, you can't overwrite that.

Please sign in to comment.