From 4025d87d6263f33e7154603d9da225067eae606a Mon Sep 17 00:00:00 2001 From: Euphy Date: Wed, 17 Jul 2013 20:32:38 -0400 Subject: [PATCH 1/4] * Basic GIT integration: added .gitattributes, .gitignore, and README.md. * Edited README.txt with GIT installation instructions. Signed-off-by: Euphy --- .gitattributes | 5 ++ .gitignore | 95 +++++++++++++++++++++++++++ README.md | 171 +++++++++++++++++++++++++++++++++++++++++++++++++ README.txt | 35 ++++++++-- 4 files changed, 299 insertions(+), 7 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a839a28c99 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +* text=auto +*.c diff=cpp +*.sln merge=union +*.vcproj merge=union +*.vcxproj merge=union \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..7506b2aa81 --- /dev/null +++ b/.gitignore @@ -0,0 +1,95 @@ +#Global +.DS_Store + +# / +/*.exe +/*.ilk +/*.log +/*.ncb +/*.opensdf +/*.opt +/*.pdb +/*.pid +/*.sdf +/*.stackdump +/*.suo +/char-server_sql +/config.log +/config.status +/core +/ipch +/login-server_sql +/Makefile +/Makefile.cache +/map-server_sql +/mapcache + +# /3rdparty/libconfig/ +/3rdparty/libconfig/Makefile +/3rdparty/libconfig/*.o + +# /3rdparty/mt19937ar/ +/3rdparty/mt19937ar/Makefile +/3rdparty/mt19937ar/*.o + +# /conf/ +/conf/import + +# /log/ +/log/*.log +/log/*.leaks + +# /src/char/ +/src/char/Makefile +/src/char/obj_sql + +# /src/common/ +/src/common/Makefile +/src/common/obj_all +/src/common/obj_sql +/src/common/svnversion.h + +# /src/login/ +/src/login/Makefile +/src/login/obj_sql + +# /src/map/ +/src/map/Makefile +/src/map/obj_sql +/src/map/pcre.h + +# /src/test/ +/src/test/Makefile +/src/test/obj + +# /src/tool/ +/src/tool/Makefile +/src/tool/obj_all + +# /tools/ +/tools/convert +/tools/adduser +/tools/*.exe +/tools/*.ilk +/tools/*.pdb + +# /vcproj-12/ +/vcproj-12/char-server_sql +/vcproj-12/login-server_sql +/vcproj-12/mapcache +/vcproj-12/map-server_sql +/vcproj-12/*.user + +# /vcproj-10/ +/vcproj-10/char-server_sql +/vcproj-10/login-server_sql +/vcproj-10/mapcache +/vcproj-10/map-server_sql +/vcproj-10/*.user + +# /vcproj-9/ +/vcproj-9/*.user +/vcproj-9/char-server_sql +/vcproj-9/login-server_sql +/vcproj-9/map-server_sql +/vcproj-9/mapcache diff --git a/README.md b/README.md new file mode 100644 index 0000000000..0a2988e4bd --- /dev/null +++ b/README.md @@ -0,0 +1,171 @@ +rAthena +======= +Table of Contents +--------- +* 1 What is rAthena? +* 2 Prerequisites +* 3 Installation +* 4 Troubleshooting +* 5 Helpful Links +* 6 More Documentation + +1. What is rAthena? +--------- +rAthena is a collaborative software development project revolving around the +creation of a robust massively multiplayer online role playing game (MMORPG) +server package. Written in C, the program is very versatile and provides NPCs, +warps and modifications. The project is jointly managed by a group of volunteers +located around the world as well as a tremendous community providing QA and +support. rAthena is a continuation of the eAthena project. + +2. Prerequisites +--------- +Before installing rAthena there are certain tools and applications you will need. +This differs between the varying operating systems available, so the following +is broken down into Windows and Linux prerequisites. + +* Windows + * MySQL ( http://www.mysql.com/downloads/mysql/ ) + * MySQL Workbench ( http://www.mysql.com/downloads/workbench/ ) + * MS Visual C++ ( http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express ) + * **[svn]** TortoiseSVN ( http://tortoisesvn.net/downloads.html ) + * **[git]** TortoiseGIT ( http://code.google.com/p/tortoisegit/ ) + * **[git]** MSysGit ( http://code.google.com/p/msysgit/downloads/ ) + +* Linux (names of packages may require specific version numbers on certain distributions) + * gcc + * make + * mysql + * mysql-devel + * mysql-server + * pcre-devel + * zlib-devel + * **[svn]** subversion + * **[git]** git + +3. Installation +--------- +This section is a very brief set of installation instructions. For more concise guides +relevant to your Operation System, please refer to the Wiki (links at the end of this file). + +* Windows + * Install prerequisites + * Create a folder to download rAthena into (e.g. C:\rAthena) + * Right click this folder and select: + * **[svn]** "SVN Checkout" + * **[git]** "Git Clone" + * Paste the SVN URL into the box: + * **[svn]** https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ + * **[git]** https://github.com/rathena/rathena.git + * Open MySQL Workbench and create an instance to connect to your MySQL Server + * Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE) + and then login using the new user + * Use MySQL Workbench to run the .sql files in /sql-files/ on the new rathena database + +* Linux + * Type: + (For CentOS) + * **[svn]** yum install gcc make mysql mysql-devel mysql-server pcre-devel subversion zlib-devel + * **[git]** + * yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel + * rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm + * yum install --enablerepo=webtatic git-all + * yum install --enablerepo=webtatic --disableexcludes=main git-all + (For Debian) + * **[svn]** apt-get install subversion make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev + * **[git]** apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev + * Type: mysql_secure_installation + * Start your MySQL server + * Setup a MySQL user: + + CREATE USER 'rathena'@'localhost' IDENTIFIED BY 'password'; + * Assign permissions: + + GRANT SELECT,INSERT,UPDATE,DELETE ON `rathena\_rag`.* TO 'rathena'@'localhost'; + * Type: + * **[svn]** svn checkout https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ ~/trunk + * **[git]** git clone https://github.com/rathena/rathena.git ~/rathena + * Insert SQL files: mysql --user=root -p rathena_rag < trunk/sql-files/main.sql (and others) + * Type: cd trunk && ./configure && make clean && make sql + * When you're ready, type: ./athena-start start + + + +4. Troubleshooting +--------- +If you're having problems with starting your server, the first thing you should +do is check what's happening on your consoles. More often that not, all support issues +can be solved simply by looking at the error messages given. + +Examples: + +* You get an error on your map-server_sql that looks something like this: + + [Error]: npc_parsesrcfile: Unable to parse, probably a missing or extra TAB in + file 'npc/custom/jobmaster.txt', line '17'. Skipping line... + * w1=prontera,153,193,6 script + * w2=Job Master + * w3=123,{ + * w4= + + If you look at the error, it's telling you that you're missing (or have an extra) TAB. + This is easily fixed by looking at this part of the error: + + * w1=prontera,153,193,6 script + + If there was a TAB where it's supposed to be, that line would have prontera,153,193,6 at w1 + and 'script' at w2. As there's a space instead of a TAB, the two sections are read as a + single parameter. + +* You have a default user/password warning similar to the following: + + [Warning]: Using the default user/password s1/p1 is NOT RECOMMENDED. + [Notice]: Please edit your 'login' table to create a proper inter-server user/pa + ssword (gender 'S') + [Notice]: and then edit your user/password in conf/map_athena.conf (or conf/impo + rt/map_conf.txt) + + Relax. This is just indicating that you're using the default username and password. To + fix this, check over the part in the installation instructions relevant to the `login` table. + +* Your map-server outputs the following: + + [Error]: make_connection: connect failed (socket #2, error 10061: No connection + could be made because the target machine actively refused it. + )! + + If this shows up on the map server, it generally means that there is no Char Server available + to accept the connection. + + + +5. Helpful Links +--------- +The following list of links point to various help files within the SVN, articles or +pages on the Wiki or topics within the rAthena forum. + +* rAthena Forums + http://rathena.org/ + +* SVN Repository + https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ + +* GIT Repository + https://github.com/rathena/rathena + +* Full Installation Instructions + * Windows: http://rathena.org/wiki/Installation_on_Windows + * CentOS: http://rathena.org/wiki/Installation_(CentOS) + * Debian: http://rathena.org/wiki/Installation_(Debian) + +* rAthena IRC Channel + irc://irc.rizon.net/rathena + + +6. More Documentation +--------- +rAthena has a large collection of help files and sample NPC scripts located in the /doc/ +directory. These include detailed explanations of NPC script commands, atcommands (@), +group permissions, item bonuses, and packet structures, among many other topics. We +recommend that all users take the time to look over this directory before asking for +assistance elsewhere. diff --git a/README.txt b/README.txt index 3770fc498d..7b5b38c218 100644 --- a/README.txt +++ b/README.txt @@ -42,10 +42,12 @@ This differs between the varying operating systems available, so the following is broken down into Windows and Linux prerequisites. Windows - * TortoiseSVN (http://tortoisesvn.net/downloads.html) * MySQL (http://www.mysql.com/downloads/mysql/) * MySQL Workbench (http://www.mysql.com/downloads/workbench/) * MS Visual C++ (http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express) + * [svn] TortoiseSVN (http://tortoisesvn.net/downloads.html) + * [git] TortoiseGIT (http://code.google.com/p/tortoisegit/) + * [git] MSysGit (http://code.google.com/p/msysgit/downloads/) Linux (names of packages may require specific version numbers on certain distributions) * gcc @@ -54,8 +56,9 @@ Linux (names of packages may require specific version numbers on certain distrib * mysql-devel * mysql-server * pcre-devel - * subversion * zlib-devel + * [svn] subversion + * [git] git ============================ @@ -67,21 +70,36 @@ relevant to your Operation System, please refer to the Wiki (links at the end of Windows * Install prerequisites * Create a folder to download rAthena into (e.g. C:\rAthena) - * Right click this folder and select "SVN Checkout". - * Paste the SVN URL into the box: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ + * Right click this folder and select: + [svn] "SVN Checkout" + [git] "Git Clone" + * Paste the SVN URL into the box: + [svn] https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ + [git] https://github.com/rathena/rathena.git * Open MySQL Workbench and create an instance to connect to your MySQL Server * Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE) and then login using the new user * Use MySQL Workbench to run the .sql files in /sql-files/ on the new rathena database Linux - (For CentOS) Type: yum install gcc make mysql mysql-devel mysql-server pcre-devel subversion zlib-devel - (For Debian) Type: apt-get install subversion make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev + * Type: + (For CentOS) + [svn] yum install gcc make mysql mysql-devel mysql-server pcre-devel subversion zlib-devel + [git] + yum install gcc make mysql mysql-devel mysql-server pcre-devel zlib-devel + rpm -Uvhhttp://repo.webtatic.com/yum/centos/5/latest.rpm + yum install --enablerepo=webtatic git-all + yum install --enablerepo=webtatic --disableexcludes=main git-all + (For Debian) + [svn] apt-get install subversion make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev + [git] apt-get install git make gcc libmysqlclient-dev zlib1g-dev libpcre3-dev * Type: mysql_secure_installation * Start your MySQL server * Setup a MySQL user: CREATE USER 'rathena'@'localhost' IDENTIFIED BY 'password'; * Assign permissions: GRANT SELECT,INSERT,UPDATE,DELETE ON `rathena\_rag`.* TO 'rathena'@'localhost'; - * Type: svn checkout https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ ~/trunk + * Type: + [svn] svn checkout https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ ~/trunk + [git] git clone https://github.com/rathena/rathena.git ~/rathena * Insert SQL files: mysql --user=root -p rathena_rag < trunk/sql-files/main.sql (and others) * Type: cd trunk && ./configure && make clean && make sql * When you're ready, type: ./athena-start start @@ -144,6 +162,9 @@ pages on the Wiki or topics within the rAthena forum. * SVN Repository https://rathena.svn.sourceforge.net/svnroot/rathena/trunk/ +* GIT Repository + https://github.com/rathena/rathena + * Full Installation Instructions Windows http://rathena.org/wiki/Installation_on_Windows CentOS http://rathena.org/wiki/Installation_(CentOS) From 3beb7833f90ed4c6254c77f40167f1ea825319a5 Mon Sep 17 00:00:00 2001 From: Euphy Date: Wed, 17 Jul 2013 23:16:15 -0400 Subject: [PATCH 2/4] * Fixed Guardian Stone respawns in WOE SE. (bugreport:7849) * Fixed job checks in Falcon Flute Trader script. (bugreport:7839) * Fixed Guillotine Katar slots. (bugreport:7838) * Fixed @itembound type 4 not working. * Bossnia changes: - Monsters should not be spawned with 'boss_monster' according to official scripts; removed 'notomb' mapflags accordingly (partial revert of r17404). - Merged file into events/bossnia.txt, since the spawns and warps should be disabled by default. Signed-off-by: Euphy --- db/re/item_db.txt | 6 +- doc/script_commands.txt | 2 +- npc/events/bossnia.txt | 209 ++++++++++++++++++++++++++++++-- npc/guild2/agit_main_se.txt | 7 +- npc/jobs/novice/supernovice.txt | 3 +- npc/mapflag/notomb.txt | 19 --- npc/mobs/bossnia.txt | 187 ---------------------------- npc/mobs/citycleaners.txt | 1 + npc/quests/the_sign_quest.txt | 2 +- npc/re/merchants/flute.txt | 18 +-- npc/scripts_mapflags.conf | 1 - npc/scripts_monsters.conf | 1 - npc/scripts_warps.conf | 1 - npc/warps/other/bossnia.txt | 18 --- sql-files/item_db_re.sql | 6 +- src/map/atcommand.c | 2 +- 16 files changed, 223 insertions(+), 260 deletions(-) delete mode 100644 npc/mapflag/notomb.txt delete mode 100644 npc/mobs/bossnia.txt delete mode 100644 npc/warps/other/bossnia.txt diff --git a/db/re/item_db.txt b/db/re/item_db.txt index d1afaefc10..f6d570f14e 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -648,7 +648,7 @@ 1288,Bloody_Fear_C,Bloody Fear,4,1,,0,145,,1,0,0x00001000,7,2,34,4,1,0,16,{},{},{} 1289,P_Katar1,Eden Katar I,4,0,,0,155,,1,0,0x00001000,7,2,34,3,60,0,16,{},{},{} 1290,Agent_Katar,Agent Katar,4,41000,,1200,170,,1,1,0x00001000,7,2,34,3,100,1,16,{ bonus bHit,readparam(bLuk)/2; },{},{} -1291,Guillotine_Katar,Guillotine Katar,4,56000,,1500,200,,1,0,0x00001000,7,2,34,4,140,1,16,{ bonus bDex,2; bonus bFlee,-30; bonus2 bAddRace,RC_DemiHuman,50; bonus2 bSkillAtk,"GC_CROSSIMPACT",30; },{},{} +1291,Guillotine_Katar,Guillotine Katar,4,56000,,1500,200,,1,1,0x00001000,7,2,34,4,140,1,16,{ bonus bDex,2; bonus bFlee,-30; bonus2 bAddRace,RC_DemiHuman,50; bonus2 bSkillAtk,"GC_CROSSIMPACT",30; },{},{} 1292,Upg_Katar,Upg Katar,4,20,,1000,80,,1,1,0x00001000,7,2,34,3,1,1,16,{ bonus bBaseAtk,(getrefine()*10); bonus bCritAtkRate,(getrefine()*2); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{} 1293,Velum_Jamadhar,Vellum Jamadhar,4,20,,1200,170,,1,0,0x00001000,7,2,34,4,95,1,16,{ bonus bAspdRate,getrefine(); },{},{} 1294,Velum_Scare,Vellum Scale,4,20,,1200,50,,1,0,0x00001000,7,2,34,4,95,1,16,{ bonus2 bSPVanishRate,10000,10; },{},{} @@ -714,8 +714,8 @@ 1389,E_Tomahawk_C,Tomahawk,4,2,,0,200,,1,0,0x000444A2,7,2,34,4,0,0,7,{ bonus bAtkEle,Ele_Wind; },{},{} 1390,E_Right_Epsilon_C,Light Epsilon,4,1,,0,229,,1,0,0x000444A2,7,2,34,4,1,0,7,{ bonus bAtkEle,Ele_Holy; bonus bStr,10; },{},{} 1391,P_Two_Handed_Axe1,Eden Two-Handed Axe I,4,0,,0,195,,1,0,0x000444A2,7,2,34,3,60,0,7,{},{},{} -1392,Ignus_Steel,Ignus Steel,4,56000,,1900,250,,1,1,0x000444A2,7,2,34,4,95,1,7,{ bonus bAtkEle,Ele_Fire; bonus bUnbreakableWeapon,0; },{},{} -1393,End_Sectora,End Sectora,4,56000,,1900,250,,1,1,0x000444A2,7,2,34,4,95,1,7,{ bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,0; },{},{} +1392,Ygnus_Stale,Ignus Steel,4,56000,,1900,250,,1,1,0x000444A2,7,2,34,4,95,1,7,{ bonus bAtkEle,Ele_Fire; bonus bUnbreakableWeapon,0; },{},{} +1393,End_Sektura,End Sectora,4,56000,,1900,250,,1,1,0x000444A2,7,2,34,4,95,1,7,{ bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,0; },{},{} 1394,Upg_Two_Handed_Axe,Upg Two Handed Axe,4,20,,2000,110,,1,1,0x000444A2,7,2,34,3,1,1,7,{ bonus bBaseAtk,(getrefine()*14); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10); },{},{} 1395,Velum_Buster,Vellum Buster,4,20,,2500,50,,1,0,0x000444A2,7,2,34,4,95,1,7,{ bonus bUnbreakableWeapon,0; bonus2 bSPVanishRate,10000,10; },{},{} 1396,Velum_Guillotine,Vellum Guillotine,4,20,,5500,300,,1,0,0x000444A2,7,2,34,4,95,1,7,{ bonus bUnbreakableWeapon,0; bonus2 bAddRace,RC_DemiHuman,40; bonus2 bIgnoreDefRate,RC_DemiHuman,30; if(getrefine()>=6) { bonus2 bSkillAtk,"NC_AXEBOOMERANG",80; bonus2 bSkillAtk,"NC_POWERSWING",80; } if(getrefine()>=9) { bonus2 bAddRace,RC_DemiHuman,60; } },{},{} diff --git a/doc/script_commands.txt b/doc/script_commands.txt index d13802bf6e..ea3ce55434 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -7713,7 +7713,7 @@ current invoking character. *mercenary_create ,; This command summons a mercenary for a given time (in milliseconds). For a -list of all available classes, see 'db/mercenary_db'. +list of all available classes, see 'db/mercenary_db.txt'. This command is typically used in item scripts of mercenary scrolls. diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 514193cbd6..808588929a 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -3,18 +3,20 @@ //===== By: ================================================== //= Masao //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== -//= rAthena +//= rAthena SVN //===== Description: ========================================= -//= Bossnia Warp NPC's. +//= Bossnia MVP event. //===== Additional Comments: ================================= //= 1.0 Converted from the official script. //= 1.1 Optimized. [Euphy] +//= 1.2 Moved spawns and warps (by Masao) to this file. [Euphy] //============================================================ -prontera,132,125,4 script Bossnia Staff::bsw 908,{ - +// Entrance NPCs +//============================================================ +prontera,132,125,4 script Bossnia Staff#1 908,{ mes "[Riss]"; mes "Hello?"; mes "I found some beautiful places"; @@ -64,7 +66,7 @@ prontera,132,125,4 script Bossnia Staff::bsw 908,{ next; if (Zeny > 4999) { mes "[Riss]"; - mes "Would you really like to take the challenge??"; + mes "Would you really like to take the challenge?"; mes "Ok, just choose the course."; next; set .@i, select("First","Second","Third","Fourth"); @@ -81,9 +83,194 @@ prontera,132,125,4 script Bossnia Staff::bsw 908,{ mes "Come back when you have at least 5,000 zeny."; close; } +geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 908 +payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 908 +morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 908 +lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 908 +rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 908 -geffen,124,169,4 duplicate(bsw) Bossnia Staff#2 908 -payon,165,150,4 duplicate(bsw) Bossnia Staff#3 908 -morocc,142,100,4 duplicate(bsw) Bossnia Staff#4 908 -lighthalzen,203,140,4 duplicate(bsw) Bossnia Staff#5 908 -rachel,132,144,4 duplicate(bsw) Bossnia Staff#6 908 +// Warp Portals +//============================================================ +bossnia_01,204,204,0 warp bossnia01 1,1,prontera,155,180 +bossnia_02,204,204,0 warp bossnia02 1,1,prontera,155,180 +bossnia_03,204,204,0 warp bossnia03 1,1,prontera,155,180 +bossnia_04,204,204,0 warp bossnia04 1,1,prontera,155,180 + +// Monster Spawns +//============================================================ + +//---------------------------------------------------------------------------- +// bossnia_01 - Bossnia +//---------------------------------------------------------------------------- +bossnia_01,0,0,0,0 monster Garm 1252,5,7200000,0,1 +bossnia_01,0,0,0,0 monster Gloom Under Night 1768,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Dark Lord 1272,3,7200000,0,1 +bossnia_01,0,0,0,0 monster Doppelganger 1046,10,7200000,0,1 +bossnia_01,0,0,0,0 monster Dracula 1389,5,1800000,0,1 +bossnia_01,0,0,0,0 monster Drake 1112,10,1800000,0,1 +bossnia_01,0,0,0,0 monster Detale 1719,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Maya 1147,10,1800000,0,1 +bossnia_01,0,0,0,0 monster Mistress 1059,1,1800000,0,1 +bossnia_01,0,0,0,0 monster Baphomet 1039,10,1800000,0,1 +bossnia_01,0,0,0,0 monster Egnigem Cenia 1658,10,1800000,0,1 +bossnia_01,0,0,0,0 monster Amon Ra 1511,1,1800000,0,1 +bossnia_01,0,0,0,0 monster Atroce 1785,10,1800000,0,1 +bossnia_01,0,0,0,0 monster Vesper 1685,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Eddga 1115,1,1800000,0,1 +bossnia_01,0,0,0,0 monster Osiris 1038,10,7200000,0,1 +bossnia_01,0,0,0,0 monster Orc Lord 1190,10,7200000,0,1 +bossnia_01,0,0,0,0 monster Orc Hero 1087,2,1800000,0,1 +bossnia_01,0,0,0,0 monster Samurai Specter 1492,1,3600000,0,1 +bossnia_01,0,0,0,0 monster Moonlight Flower 1150,1,3600000,0,1 +bossnia_01,0,0,0,0 monster Lord of the Dead 1373,1,3600000,0,1 +bossnia_01,0,0,0,0 monster Ktullanux 1779,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Kiel D-01 1734,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Thanatos Phantom 1708,2,7200000,0,1 +bossnia_01,0,0,0,0 monster Lady Tanee 1688,1,3600000,0,1 +bossnia_01,0,0,0,0 monster Tao Gunka 1583,1,3600000,0,1 +bossnia_01,0,0,0,0 monster Turtle General 1312,10,7200000,0,1 +bossnia_01,0,0,0,0 monster Pharaoh 1157,2,3600000,0,1 +bossnia_01,0,0,0,0 monster Stormy Knight 1251,2,3600000,0,1 +bossnia_01,0,0,0,0 monster Falling Bishop 1871,5,7200000,0,1 +bossnia_01,0,0,0,0 monster Phreeoni 1159,10,7200000,0,1 +bossnia_01,0,0,0,0 monster Golden Thief Bug 1086,10,3600000,0,1 +bossnia_01,0,0,0,0 monster Evil Snake Lord 1418,10,7200000,0,1 +bossnia_01,0,0,0,0 monster RSX-0806 1623,5,7200000,0,1 +bossnia_01,0,0,0,0 monster Assassin Cross Eremes 1647,1,0,0,1 +bossnia_01,137,118,1,1 monster Whitesmith Howard 1648,1,0,0,1 +bossnia_01,122,195,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_01,45,118,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_01,196,122,1,1 monster Valkyrie Randgris 1751,1,0,0,1 +bossnia_01,142,61,1,1 monster Ifrit 1832,1,0,0,1 + +//---------------------------------------------------------------------------- +// bossnia_02 - Bossnia +//---------------------------------------------------------------------------- +bossnia_02,0,0,0,0 monster Garm 1252,5,7200000,0,1 +bossnia_02,0,0,0,0 monster Gloom Under Night 1768,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Dark Lord 1272,3,7200000,0,1 +bossnia_02,0,0,0,0 monster Doppelganger 1046,10,7200000,0,1 +bossnia_02,0,0,0,0 monster Dracula 1389,5,1800000,0,1 +bossnia_02,0,0,0,0 monster Drake 1112,10,1800000,0,1 +bossnia_02,0,0,0,0 monster Detale 1719,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Maya 1147,10,1800000,0,1 +bossnia_02,0,0,0,0 monster Mistress 1059,1,1800000,0,1 +bossnia_02,0,0,0,0 monster Baphomet 1039,10,1800000,0,1 +bossnia_02,0,0,0,0 monster Egnigem Cenia 1658,10,1800000,0,1 +bossnia_02,0,0,0,0 monster Amon Ra 1511,1,1800000,0,1 +bossnia_02,0,0,0,0 monster Atroce 1785,10,1800000,0,1 +bossnia_02,0,0,0,0 monster Vesper 1685,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Eddga 1115,1,1800000,0,1 +bossnia_02,0,0,0,0 monster Osiris 1038,10,7200000,0,1 +bossnia_02,0,0,0,0 monster Orc Lord 1190,10,7200000,0,1 +bossnia_02,0,0,0,0 monster Orc Hero 1087,2,1800000,0,1 +bossnia_02,0,0,0,0 monster Samurai Specter 1492,1,3600000,0,1 +bossnia_02,0,0,0,0 monster Moonlight Flower 1150,1,3600000,0,1 +bossnia_02,0,0,0,0 monster Lord of the Dead 1373,1,3600000,0,1 +bossnia_02,0,0,0,0 monster Ktullanux 1779,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Kiel D-01 1734,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Thanatos Phantom 1708,2,7200000,0,1 +bossnia_02,0,0,0,0 monster Lady Tanee 1688,1,3600000,0,1 +bossnia_02,0,0,0,0 monster Tao Gunka 1583,1,3600000,0,1 +bossnia_02,0,0,0,0 monster Turtle General 1312,10,7200000,0,1 +bossnia_02,0,0,0,0 monster Pharaoh 1157,2,3600000,0,1 +bossnia_02,0,0,0,0 monster Stormy Knight 1251,2,3600000,0,1 +bossnia_02,0,0,0,0 monster Falling Bishop 1871,5,7200000,0,1 +bossnia_02,0,0,0,0 monster Phreeoni 1159,10,7200000,0,1 +bossnia_02,0,0,0,0 monster Golden Thief Bug 1086,10,3600000,0,1 +bossnia_02,0,0,0,0 monster Evil Snake Lord 1418,10,7200000,0,1 +bossnia_02,0,0,0,0 monster RSX-0806 1623,5,7200000,0,1 +bossnia_02,0,0,0,0 monster Assassin Cross Eremes 1647,1,0,0,1 +bossnia_02,137,118,1,1 monster Whitesmith Howard 1648,1,0,0,1 +bossnia_02,122,195,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_02,45,118,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_02,196,122,1,1 monster Valkyrie Randgris 1751,1,0,0,1 +bossnia_02,142,61,1,1 monster Ifrit 1832,1,0,0,1 + +//---------------------------------------------------------------------------- +// bossnia_03 - Bossnia +//---------------------------------------------------------------------------- +bossnia_03,0,0,0,0 monster Garm 1252,5,7200000,0,1 +bossnia_03,0,0,0,0 monster Gloom Under Night 1768,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Dark Lord 1272,3,7200000,0,1 +bossnia_03,0,0,0,0 monster Doppelganger 1046,10,7200000,0,1 +bossnia_03,0,0,0,0 monster Dracula 1389,5,1800000,0,1 +bossnia_03,0,0,0,0 monster Drake 1112,10,1800000,0,1 +bossnia_03,0,0,0,0 monster Detale 1719,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Maya 1147,10,1800000,0,1 +bossnia_03,0,0,0,0 monster Mistress 1059,1,1800000,0,1 +bossnia_03,0,0,0,0 monster Baphomet 1039,10,1800000,0,1 +bossnia_03,0,0,0,0 monster Egnigem Cenia 1658,10,1800000,0,1 +bossnia_03,0,0,0,0 monster Amon Ra 1511,1,1800000,0,1 +bossnia_03,0,0,0,0 monster Atroce 1785,10,1800000,0,1 +bossnia_03,0,0,0,0 monster Vesper 1685,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Eddga 1115,1,1800000,0,1 +bossnia_03,0,0,0,0 monster Osiris 1038,10,7200000,0,1 +bossnia_03,0,0,0,0 monster Orc Lord 1190,10,7200000,0,1 +bossnia_03,0,0,0,0 monster Orc Hero 1087,2,1800000,0,1 +bossnia_03,0,0,0,0 monster Samurai Specter 1492,1,3600000,0,1 +bossnia_03,0,0,0,0 monster Moonlight Flower 1150,1,3600000,0,1 +bossnia_03,0,0,0,0 monster Lord of the Dead 1373,1,3600000,0,1 +bossnia_03,0,0,0,0 monster Ktullanux 1779,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Kiel D-01 1734,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Thanatos Phantom 1708,2,7200000,0,1 +bossnia_03,0,0,0,0 monster Lady Tanee 1688,1,3600000,0,1 +bossnia_03,0,0,0,0 monster Tao Gunka 1583,1,3600000,0,1 +bossnia_03,0,0,0,0 monster Turtle General 1312,10,7200000,0,1 +bossnia_03,0,0,0,0 monster Pharaoh 1157,2,3600000,0,1 +bossnia_03,0,0,0,0 monster Stormy Knight 1251,2,3600000,0,1 +bossnia_03,0,0,0,0 monster Falling Bishop 1871,5,7200000,0,1 +bossnia_03,0,0,0,0 monster Phreeoni 1159,10,7200000,0,1 +bossnia_03,0,0,0,0 monster Golden Thief Bug 1086,10,3600000,0,1 +bossnia_03,0,0,0,0 monster Evil Snake Lord 1418,10,7200000,0,1 +bossnia_03,0,0,0,0 monster RSX-0806 1623,5,7200000,0,1 +bossnia_03,0,0,0,0 monster Assassin Cross Eremes 1647,1,0,0,1 +bossnia_03,137,118,1,1 monster Whitesmith Howard 1648,1,0,0,1 +bossnia_03,122,195,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_03,45,118,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_03,196,122,1,1 monster Valkyrie Randgris 1751,1,0,0,1 +bossnia_03,142,61,1,1 monster Ifrit 1832,1,0,0,1 + +//---------------------------------------------------------------------------- +// bossnia_04 - Bossnia +//---------------------------------------------------------------------------- +bossnia_04,0,0,0,0 monster Garm 1252,5,7200000,0,1 +bossnia_04,0,0,0,0 monster Gloom Under Night 1768,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Dark Lord 1272,3,7200000,0,1 +bossnia_04,0,0,0,0 monster Doppelganger 1046,10,7200000,0,1 +bossnia_04,0,0,0,0 monster Dracula 1389,5,1800000,0,1 +bossnia_04,0,0,0,0 monster Drake 1112,10,1800000,0,1 +bossnia_04,0,0,0,0 monster Detale 1719,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Maya 1147,10,1800000,0,1 +bossnia_04,0,0,0,0 monster Mistress 1059,1,1800000,0,1 +bossnia_04,0,0,0,0 monster Baphomet 1039,10,1800000,0,1 +bossnia_04,0,0,0,0 monster Egnigem Cenia 1658,10,1800000,0,1 +bossnia_04,0,0,0,0 monster Amon Ra 1511,1,1800000,0,1 +bossnia_04,0,0,0,0 monster Atroce 1785,10,1800000,0,1 +bossnia_04,0,0,0,0 monster Vesper 1685,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Eddga 1115,1,1800000,0,1 +bossnia_04,0,0,0,0 monster Osiris 1038,10,7200000,0,1 +bossnia_04,0,0,0,0 monster Orc Lord 1190,10,7200000,0,1 +bossnia_04,0,0,0,0 monster Orc Hero 1087,2,1800000,0,1 +bossnia_04,0,0,0,0 monster Samurai Specter 1492,1,3600000,0,1 +bossnia_04,0,0,0,0 monster Moonlight Flower 1150,1,3600000,0,1 +bossnia_04,0,0,0,0 monster Lord of the Dead 1373,1,3600000,0,1 +bossnia_04,0,0,0,0 monster Ktullanux 1779,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Kiel D-01 1734,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Thanatos Phantom 1708,2,7200000,0,1 +bossnia_04,0,0,0,0 monster Lady Tanee 1688,1,3600000,0,1 +bossnia_04,0,0,0,0 monster Tao Gunka 1583,1,3600000,0,1 +bossnia_04,0,0,0,0 monster Turtle General 1312,10,7200000,0,1 +bossnia_04,0,0,0,0 monster Pharaoh 1157,2,3600000,0,1 +bossnia_04,0,0,0,0 monster Stormy Knight 1251,2,3600000,0,1 +bossnia_04,0,0,0,0 monster Falling Bishop 1871,5,7200000,0,1 +bossnia_04,0,0,0,0 monster Phreeoni 1159,10,7200000,0,1 +bossnia_04,0,0,0,0 monster Golden Thief Bug 1086,10,3600000,0,1 +bossnia_04,0,0,0,0 monster Evil Snake Lord 1418,10,7200000,0,1 +bossnia_04,0,0,0,0 monster RSX-0806 1623,5,7200000,0,1 +bossnia_04,0,0,0,0 monster Assassin Cross Eremes 1647,1,0,0,1 +bossnia_04,137,118,1,1 monster Whitesmith Howard 1648,1,0,0,1 +bossnia_04,122,195,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_04,45,118,1,1 monster Beelzebub 1873,1,0,0,1 +bossnia_04,196,122,1,1 monster Valkyrie Randgris 1751,1,0,0,1 +bossnia_04,142,61,1,1 monster Ifrit 1832,1,0,0,1 diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 5aa91f3ace..df95ac015b 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.4 +//= 1.4a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.2 Hopefully fixed a processing error. [Euphy] //= 1.3 Fixed barricade issue in schg_cas02. [Cookie] //= 1.4 Added OnGuildBreak event and a spawn check. [Euphy] +//= 1.4a Fixed Guardian Stone respawns. [Euphy] //============================================================ // Core, triggers all other events @@ -109,8 +110,8 @@ OnEmpSpawn: OnReset: set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); - donpcevent "df1#"+strnpcinfo(2)+"::OnEnable"; - donpcevent "df2#"+strnpcinfo(2)+"::OnEnable"; + donpcevent "df1#"+strnpcinfo(2)+"::OnDisable"; + donpcevent "df2#"+strnpcinfo(2)+"::OnDisable"; donpcevent "gard1#"+strnpcinfo(2)+"::OnReset"; donpcevent "gard2#"+strnpcinfo(2)+"::OnReset"; donpcevent "1st Guardian Stone#"+.@str$+"::OnDisable"; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index 4720d72833..febcf0a344 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -336,7 +336,8 @@ aldeba_in,216,169,5 script Esseray#sn 86,{ close; } if (BaseJob == Job_SuperNovice) { - if (is_function("Esseray_Ex")) callfunc "Esseray_Ex"; + if (checkre(0)) + callfunc "Esseray_Ex"; mes "[Esseray]"; mes "Hm? Hey, you're a member"; mes "of our great Novice Society,"; diff --git a/npc/mapflag/notomb.txt b/npc/mapflag/notomb.txt deleted file mode 100644 index ca665af991..0000000000 --- a/npc/mapflag/notomb.txt +++ /dev/null @@ -1,19 +0,0 @@ -//===== rAthena Script ======================================= -//= Mapflag: Disable MVP Tomb. -//===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= -//= Disables MVP tomb on a map. -//===== Additional Comments: ================================= -//= 1.0 Initial script. -//============================================================ - -// Bossnia ==================== -bossnia_01 mapflag notomb -bossnia_02 mapflag notomb -bossnia_03 mapflag notomb -bossnia_04 mapflag notomb diff --git a/npc/mobs/bossnia.txt b/npc/mobs/bossnia.txt deleted file mode 100644 index 31b5e25d01..0000000000 --- a/npc/mobs/bossnia.txt +++ /dev/null @@ -1,187 +0,0 @@ -//===== rAthena Script ======================================= -//= Bossnia Monster Spawn Script -//===== By: ================================================== -//= Masao -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any rAthena Version -//===== Description: ========================================= -//= Spawns boss monsters / MvP's in the Bossnia Dungeons. -//============================================================ - -//================================================== -// bossnia_01 - Bossnia -//================================================== -bossnia_01,0,0,0,0 boss_monster Garm 1252,5,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Gloom Under Night 1768,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Dark Lord 1272,3,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Doppelganger 1046,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Dracula 1389,5,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Drake 1112,10,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Detale 1719,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Maya 1147,10,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Mistress 1059,1,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Baphomet 1039,10,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Egnigem Cenia 1658,10,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Amon Ra 1511,1,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Atroce 1785,10,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Vesper 1685,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Eddga 1115,1,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Osiris 1038,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Orc Lord 1190,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Orc Hero 1087,2,1800000,0,1 -bossnia_01,0,0,0,0 boss_monster Samurai Specter 1492,1,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Moonlight Flower 1150,1,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Lord of the Dead 1373,1,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Ktullanux 1779,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Kiel D-01 1734,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Thanatos Phantom 1708,2,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Lady Tanee 1688,1,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Tao Gunka 1583,1,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Turtle General 1312,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Pharaoh 1157,2,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Stormy Knight 1251,2,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Falling Bishop 1871,5,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Phreeoni 1159,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Golden Thief Bug 1086,10,3600000,0,1 -bossnia_01,0,0,0,0 boss_monster Evil Snake Lord 1418,10,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster RSX-0806 1623,5,7200000,0,1 -bossnia_01,0,0,0,0 boss_monster Assassin Cross Eremes 1647,1,0,0,1 -bossnia_01,137,118,1,1 boss_monster Whitesmith Howard 1648,1,0,0,1 -bossnia_01,122,195,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_01,45,118,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_01,196,122,1,1 boss_monster Valkyrie Randgris 1751,1,0,0,1 -bossnia_01,142,61,1,1 boss_monster Ifrit 1832,1,0,0,1 - -//================================================== -// bossnia_02 - Bossnia -//================================================== -bossnia_02,0,0,0,0 boss_monster Garm 1252,5,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Gloom Under Night 1768,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Dark Lord 1272,3,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Doppelganger 1046,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Dracula 1389,5,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Drake 1112,10,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Detale 1719,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Maya 1147,10,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Mistress 1059,1,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Baphomet 1039,10,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Egnigem Cenia 1658,10,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Amon Ra 1511,1,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Atroce 1785,10,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Vesper 1685,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Eddga 1115,1,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Osiris 1038,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Orc Lord 1190,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Orc Hero 1087,2,1800000,0,1 -bossnia_02,0,0,0,0 boss_monster Samurai Specter 1492,1,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Moonlight Flower 1150,1,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Lord of the Dead 1373,1,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Ktullanux 1779,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Kiel D-01 1734,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Thanatos Phantom 1708,2,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Lady Tanee 1688,1,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Tao Gunka 1583,1,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Turtle General 1312,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Pharaoh 1157,2,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Stormy Knight 1251,2,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Falling Bishop 1871,5,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Phreeoni 1159,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Golden Thief Bug 1086,10,3600000,0,1 -bossnia_02,0,0,0,0 boss_monster Evil Snake Lord 1418,10,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster RSX-0806 1623,5,7200000,0,1 -bossnia_02,0,0,0,0 boss_monster Assassin Cross Eremes 1647,1,0,0,1 -bossnia_02,137,118,1,1 boss_monster Whitesmith Howard 1648,1,0,0,1 -bossnia_02,122,195,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_02,45,118,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_02,196,122,1,1 boss_monster Valkyrie Randgris 1751,1,0,0,1 -bossnia_02,142,61,1,1 boss_monster Ifrit 1832,1,0,0,1 - -//================================================== -// bossnia_03 - Bossnia -//================================================== -bossnia_03,0,0,0,0 boss_monster Garm 1252,5,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Gloom Under Night 1768,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Dark Lord 1272,3,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Doppelganger 1046,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Dracula 1389,5,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Drake 1112,10,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Detale 1719,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Maya 1147,10,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Mistress 1059,1,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Baphomet 1039,10,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Egnigem Cenia 1658,10,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Amon Ra 1511,1,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Atroce 1785,10,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Vesper 1685,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Eddga 1115,1,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Osiris 1038,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Orc Lord 1190,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Orc Hero 1087,2,1800000,0,1 -bossnia_03,0,0,0,0 boss_monster Samurai Specter 1492,1,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Moonlight Flower 1150,1,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Lord of the Dead 1373,1,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Ktullanux 1779,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Kiel D-01 1734,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Thanatos Phantom 1708,2,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Lady Tanee 1688,1,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Tao Gunka 1583,1,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Turtle General 1312,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Pharaoh 1157,2,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Stormy Knight 1251,2,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Falling Bishop 1871,5,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Phreeoni 1159,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Golden Thief Bug 1086,10,3600000,0,1 -bossnia_03,0,0,0,0 boss_monster Evil Snake Lord 1418,10,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster RSX-0806 1623,5,7200000,0,1 -bossnia_03,0,0,0,0 boss_monster Assassin Cross Eremes 1647,1,0,0,1 -bossnia_03,137,118,1,1 boss_monster Whitesmith Howard 1648,1,0,0,1 -bossnia_03,122,195,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_03,45,118,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_03,196,122,1,1 boss_monster Valkyrie Randgris 1751,1,0,0,1 -bossnia_03,142,61,1,1 boss_monster Ifrit 1832,1,0,0,1 - -//================================================== -// bossnia_04 - Bossnia -//================================================== -bossnia_04,0,0,0,0 boss_monster Garm 1252,5,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Gloom Under Night 1768,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Dark Lord 1272,3,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Doppelganger 1046,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Dracula 1389,5,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Drake 1112,10,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Detale 1719,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Maya 1147,10,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Mistress 1059,1,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Baphomet 1039,10,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Egnigem Cenia 1658,10,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Amon Ra 1511,1,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Atroce 1785,10,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Vesper 1685,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Eddga 1115,1,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Osiris 1038,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Orc Lord 1190,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Orc Hero 1087,2,1800000,0,1 -bossnia_04,0,0,0,0 boss_monster Samurai Specter 1492,1,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Moonlight Flower 1150,1,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Lord of the Dead 1373,1,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Ktullanux 1779,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Kiel D-01 1734,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Thanatos Phantom 1708,2,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Lady Tanee 1688,1,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Tao Gunka 1583,1,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Turtle General 1312,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Pharaoh 1157,2,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Stormy Knight 1251,2,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Falling Bishop 1871,5,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Phreeoni 1159,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Golden Thief Bug 1086,10,3600000,0,1 -bossnia_04,0,0,0,0 boss_monster Evil Snake Lord 1418,10,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster RSX-0806 1623,5,7200000,0,1 -bossnia_04,0,0,0,0 boss_monster Assassin Cross Eremes 1647,1,0,0,1 -bossnia_04,137,118,1,1 boss_monster Whitesmith Howard 1648,1,0,0,1 -bossnia_04,122,195,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_04,45,118,1,1 boss_monster Beelzebub 1873,1,0,0,1 -bossnia_04,196,122,1,1 boss_monster Valkyrie Randgris 1751,1,0,0,1 -bossnia_04,142,61,1,1 boss_monster Ifrit 1832,1,0,0,1 diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt index b866ce1239..3f70f9be41 100644 --- a/npc/mobs/citycleaners.txt +++ b/npc/mobs/citycleaners.txt @@ -9,6 +9,7 @@ //===== Description: ========================================= //= Spawns monsters to clean up city. Apparently spawning //= occured in iRO and kRO. Enable this if you want. +//===== Additional Comments: ================================= //= 0.1a Added a few more towns to spawn Wild rose [MasterOfMuppets] //= 0.1b And even more from Poki#3 [Komurka] //= 1.0 Removed unofficial city cleaners [Playtester] diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 7da1a4ce2e..2696d64843 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -11387,7 +11387,7 @@ niflheim,102,54,4 script Mad Man#s 739,{ next; switch(select("Pay him.:Don't pay him.")) { case 1: - if (Zeny < 60000) { + if (Zeny < 20000) { mes "[Laichin]"; mes "What is this?"; mes "You tryin to welch"; diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index a9b9c23678..90b63afc71 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Masao, Muad_Dib, Ziu //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -12,11 +12,12 @@ //= 1.0 First Version. [Masao] //= 1.1 Added Baby Hunter and Baby Ranger check. bugreport:5728 [Masao] //= 1.2 Added Wolf Flute trader, optimized. [Euphy] +//= 1.2a Fixed some conditions. [Euphy] //============================================================ - script Falcon Flute Trader::fflute -1,{ mes "[Falcon Flute Trader]"; - if (BaseJob == Job_Hunter || Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) { + if (BaseJob == Job_Hunter) { mes "Do you need a Falcon?"; mes "With a magical Flute, you can call your Falcon from anywhere!"; next; @@ -40,14 +41,13 @@ mes "[Falcon Flute Trader]"; mes "If you need a Falcon Flute I will sell them for 12,500 zeny. Or is that too expensive?"; next; - if (BaseJob == Job_Hunter) - set .@price,12500; - else { + if (eaclass()&EAJL_THIRD) { mes "[Falcon Flute Trader]"; mes "For Rangers, however, I have a special price of 10,000 zeny!"; set .@price,10000; next; - } + } else + set .@price,12500; if(select("Don't buy one:Buy a Falcon Flute") == 1) { mes "[Falcon Flute Trader]"; mes "That's too bad. If you need one, come back!"; @@ -65,7 +65,7 @@ mes "Here, take this flute."; mes "With it you can whistle for your Falcon from anywhere."; set Zeny, Zeny - .@price; - getitem 12848,1; // Falcon Flute + getitem 12848,1; //Falcon_Flute next; mes "[Falcon Flute Trader]"; mes "Just a reminder."; @@ -76,7 +76,7 @@ mes "I'm sorry but you don't have enough money to buy a Falcon Flute, please come back when you have more money!"; close; } - if (Class == Job_Baby_Archer || Class == Job_Archer) { + if (BaseJob == Job_Archer) { mes "Hello, young one!"; mes "Currently I can't help you,"; mes "but why don't you return to me when you've become a great Hunter and learned how to handle Falcons properly?"; @@ -138,4 +138,4 @@ tur_dun01,89,170,5 script Expert Flute Crafter 59,{ mes "Eeehh? You are not a Ranger?"; mes "Then this flute is totally useless for you!"; close; -} \ No newline at end of file +} diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index d709513297..25ac0476d4 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -11,7 +11,6 @@ npc: npc/mapflag/nomemo.txt npc: npc/mapflag/nopenalty.txt npc: npc/mapflag/nosave.txt npc: npc/mapflag/noteleport.txt -npc: npc/mapflag/notomb.txt npc: npc/mapflag/noreturn.txt npc: npc/mapflag/noskill.txt npc: npc/mapflag/nowarp.txt diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf index 0409db90a4..8e30628431 100644 --- a/npc/scripts_monsters.conf +++ b/npc/scripts_monsters.conf @@ -2,7 +2,6 @@ // - Monster Scripts - // -------------------------------------------------------------- -npc: npc/mobs/bossnia.txt npc: npc/mobs/citycleaners.txt npc: npc/mobs/jail.txt npc: npc/mobs/pvp.txt diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 53366d75da..38737b1a94 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -80,7 +80,6 @@ npc: npc/warps/fields/umbala_fild.txt // --------------------------- Others --------------------------- npc: npc/warps/other/airplane.txt -npc: npc/warps/other/bossnia.txt npc: npc/warps/other/god.txt npc: npc/warps/other/jobquests.txt npc: npc/warps/other/kiel.txt diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt deleted file mode 100644 index 28cfda019a..0000000000 --- a/npc/warps/other/bossnia.txt +++ /dev/null @@ -1,18 +0,0 @@ -//===== rAthena Script ======================================= -//= Bossnia Warps -//===== By: ================================================== -//= Masao -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any rAthena Version -//===== Description: ========================================= -//= Back Warp Points related to the Bossnia event. -//===== Additional Comments: ================================= -//= 1.0 First Version. -//============================================================ - -bossnia_01,204,204,0 warp bossnia01 1,1,prontera,155,180 -bossnia_02,204,204,0 warp bossnia02 1,1,prontera,155,180 -bossnia_03,204,204,0 warp bossnia03 1,1,prontera,155,180 -bossnia_04,204,204,0 warp bossnia04 1,1,prontera,155,180 diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 00ea2a1621..ade06f9107 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -679,7 +679,7 @@ REPLACE INTO `item_db_re` VALUES (1287,'Durga','Durga',4,20,NULL,1200,'190',NULL REPLACE INTO `item_db_re` VALUES (1288,'Bloody_Fear_C','Bloody Fear',4,1,NULL,0,'145',NULL,1,0,0x00001000,7,2,34,4,'1',0,16,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (1289,'P_Katar1','Eden Katar I',4,0,NULL,0,'155',NULL,1,0,0x00001000,7,2,34,3,'60',0,16,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (1290,'Agent_Katar','Agent Katar',4,41000,NULL,1200,'170',NULL,1,1,0x00001000,7,2,34,3,'100',1,16,'bonus bHit,readparam(bLuk)/2;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (1291,'Guillotine_Katar','Guillotine Katar',4,56000,NULL,1500,'200',NULL,1,0,0x00001000,7,2,34,4,'140',1,16,'bonus bDex,2; bonus bFlee,-30; bonus2 bAddRace,RC_DemiHuman,50; bonus2 bSkillAtk,"GC_CROSSIMPACT",30;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (1291,'Guillotine_Katar','Guillotine Katar',4,56000,NULL,1500,'200',NULL,1,1,0x00001000,7,2,34,4,'140',1,16,'bonus bDex,2; bonus bFlee,-30; bonus2 bAddRace,RC_DemiHuman,50; bonus2 bSkillAtk,"GC_CROSSIMPACT",30;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1292,'Upg_Katar','Upg Katar',4,20,NULL,1000,'80',NULL,1,1,0x00001000,7,2,34,3,'1',1,16,'bonus bBaseAtk,(getrefine()*10); bonus bCritAtkRate,(getrefine()*2); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1293,'Velum_Jamadhar','Vellum Jamadhar',4,20,NULL,1200,'170',NULL,1,0,0x00001000,7,2,34,4,'95',1,16,'bonus bAspdRate,getrefine();',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1294,'Velum_Scare','Vellum Scale',4,20,NULL,1200,'50',NULL,1,0,0x00001000,7,2,34,4,'95',1,16,'bonus2 bSPVanishRate,10000,10;',NULL,NULL); @@ -745,8 +745,8 @@ REPLACE INTO `item_db_re` VALUES (1388,'Two_Handed_Axe_C','Two-Handed Axe',4,0,N REPLACE INTO `item_db_re` VALUES (1389,'E_Tomahawk_C','Tomahawk',4,2,NULL,0,'200',NULL,1,0,0x000444A2,7,2,34,4,'0',0,7,'bonus bAtkEle,Ele_Wind;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1390,'E_Right_Epsilon_C','Light Epsilon',4,1,NULL,0,'229',NULL,1,0,0x000444A2,7,2,34,4,'1',0,7,'bonus bAtkEle,Ele_Holy; bonus bStr,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1391,'P_Two_Handed_Axe1','Eden Two-Handed Axe I',4,0,NULL,0,'195',NULL,1,0,0x000444A2,7,2,34,3,'60',0,7,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (1392,'Ignus_Steel','Ignus Steel',4,56000,NULL,1900,'250',NULL,1,1,0x000444A2,7,2,34,4,'95',1,7,'bonus bAtkEle,Ele_Fire; bonus bUnbreakableWeapon,0;',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (1393,'End_Sectora','End Sectora',4,56000,NULL,1900,'250',NULL,1,1,0x000444A2,7,2,34,4,'95',1,7,'bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,0;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (1392,'Ygnus_Stale','Ignus Steel',4,56000,NULL,1900,'250',NULL,1,1,0x000444A2,7,2,34,4,'95',1,7,'bonus bAtkEle,Ele_Fire; bonus bUnbreakableWeapon,0;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (1393,'End_Sektura','End Sectora',4,56000,NULL,1900,'250',NULL,1,1,0x000444A2,7,2,34,4,'95',1,7,'bonus bAtkEle,Ele_Water; bonus bUnbreakableWeapon,0;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1394,'Upg_Two_Handed_Axe','Upg Two Handed Axe',4,20,NULL,2000,'110',NULL,1,1,0x000444A2,7,2,34,3,'1',1,7,'bonus bBaseAtk,(getrefine()*14); if(BaseLevel>70) bonus bBaseAtk,(((BaseLevel-70)/10)*10);',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1395,'Velum_Buster','Vellum Buster',4,20,NULL,2500,'50',NULL,1,0,0x000444A2,7,2,34,4,'95',1,7,'bonus bUnbreakableWeapon,0; bonus2 bSPVanishRate,10000,10;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1396,'Velum_Guillotine','Vellum Guillotine',4,20,NULL,5500,'300',NULL,1,0,0x000444A2,7,2,34,4,'95',1,7,'bonus bUnbreakableWeapon,0; bonus2 bAddRace,RC_DemiHuman,40; bonus2 bIgnoreDefRate,RC_DemiHuman,30; if(getrefine()>=6) { bonus2 bSkillAtk,"NC_AXEBOOMERANG",80; bonus2 bSkillAtk,"NC_POWERSWING",80; } if(getrefine()>=9) { bonus2 bAddRace,RC_DemiHuman,60; }',NULL,NULL); diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 56ed99cc7a..0ad868caf8 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1155,7 +1155,7 @@ ACMD_FUNC(item) return -1; } - if( bound < 0 || bound > 3 ) { + if( bound < 0 || bound > 4 ) { clif_displaymessage(fd, msg_txt(sd,298)); // Invalid bound type return -1; } From 8ebb789db6c3f9416af95a5d28f605bcd0c6ac78 Mon Sep 17 00:00:00 2001 From: Akinari1087 Date: Thu, 18 Jul 2013 00:24:40 -0400 Subject: [PATCH 3/4] Fixed bonus crit_atk_rate not being applied - Fixes bugreport:7846 Weapon Perfection now modifies size damage - Fixes bugreport:7813 Water Ball now checks for obstacles - Fixes bugreport:7426 Re-added the somehow lost Banishing Point hit rate fix --- src/map/battle.c | 12 +++++++----- src/map/skill.c | 6 ++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/map/battle.c b/src/map/battle.c index 7d05975dde..2059ff0f13 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1523,10 +1523,9 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int #ifdef RENEWAL static int battle_calc_sizefix(int damage, struct map_session_data *sd, unsigned char t_size, unsigned char weapon_type, short flag) { - if (sd) - { + if (sd) { //SizeFix only for players - if (!(sd->special_state.no_sizefix) || flag) + if (!(sd->special_state.no_sizefix) && !flag) DAMAGE_RATE(weapon_type==EQI_HAND_L? sd->left_weapon.atkmods[t_size]: sd->right_weapon.atkmods[t_size]) @@ -2064,6 +2063,9 @@ static bool is_attack_hitting(struct Damage wd, struct block_list *src, struct b if( sd && pc_checkskill(sd, GN_REMODELING_CART) ) hitrate += pc_checkskill(sd, GN_REMODELING_CART) * 4; break; + case LG_BANISHINGPOINT: + hitrate += 3 * skill_lv; + break; case GC_VENOMPRESSURE: hitrate += 10 + 4 * skill_lv; break; @@ -4365,9 +4367,9 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl #ifdef RENEWAL if(is_attack_critical(wd, src, target, skill_id, skill_lv, false)) { if(sd) // check for player so we don't crash out, monsters don't have bonus crit rates [helvetica] - wd.damage = (int32)floor((double)wd.damage * 1.4 * ((100 + sd->bonus.crit_atk_rate) / 100)); + wd.damage = (int)floor((double)(wd.damage * 1.4 * (100 + sd->bonus.crit_atk_rate)) / 100); else - wd.damage = (int32)floor((double)wd.damage * 1.4); + wd.damage = (int)floor((double)wd.damage * 1.4); } #endif diff --git a/src/map/skill.c b/src/map/skill.c index c641fe15a0..fe26e0f015 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3283,9 +3283,11 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data) break; case WZ_WATERBALL: skill_toggle_magicpower(src, skl->skill_id); // only the first hit will be amplify - if (!status_isdead(target)) + // Official behaviour is to hit as long as there is a line of sight, regardless of distance + range = path_search_long(NULL,src->m,src->x,src->y,target->x,target->y,CELL_CHKNOREACH); + if (!status_isdead(target) && range) skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag); - if (skl->type>1 && !status_isdead(target) && !status_isdead(src)) { + if (skl->type>1 && !status_isdead(target) && !status_isdead(src) && range) { skill_addtimerskill(src,tick+125,target->id,0,0,skl->skill_id,skl->skill_lv,skl->type-1,skl->flag); } else { struct status_change *sc = status_get_sc(src); From f919ac05afa10ba864145452ffeffcd18b1764cb Mon Sep 17 00:00:00 2001 From: Euphy Date: Thu, 18 Jul 2013 02:30:05 -0400 Subject: [PATCH 4/4] * Added support for GIT hashes. (credits: Ind, Trojal) Signed-off-by: Euphy --- src/common/core.c | 41 ++++++++++++++++++++++++++++++++++++++--- src/common/core.h | 5 ++++- src/map/pc.c | 12 ++++++++++-- src/map/script.c | 8 ++++---- 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/common/core.c b/src/common/core.c index 89e6b67daa..7bbe3a6fb9 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -245,17 +245,49 @@ const char* get_svn_revision(void) { } // fallback - snprintf(svn_version_buffer, sizeof(svn_version_buffer), "Unknown"); + svn_version_buffer[0] = UNKNOWN_VERSION; return svn_version_buffer; } #endif +// GIT path +#define GIT_ORIGIN "refs/remotes/origin/master" + +// Grabs the hash from the last time the user updated their working copy (last pull) +const char *get_git_hash (void) { + static char GitHash[41] = ""; //Sha(40) + 1 + FILE *fp; + + if( GitHash[0] != '\0' ) + return GitHash; + + if( (fp = fopen(".git/"GIT_ORIGIN, "r")) != NULL ) { + char line[64]; + char *rev = malloc(sizeof(char) * 50); + + if( fgets(line, sizeof(line), fp) && sscanf(line, "%s", rev) ) + snprintf(GitHash, sizeof(GitHash), "%s", rev); + + free(rev); + fclose(fp); + } else { + GitHash[0] = UNKNOWN_VERSION; + } + + if ( !(*GitHash) ) { + GitHash[0] = UNKNOWN_VERSION; + } + + return GitHash; +} + /*====================================== * CORE : Display title * ASCII By CalciumKid 1/12/2011 *--------------------------------------*/ static void display_title(void) { - //ClearScreen(); // clear screen and go up/left (0, 0 position in text) + const char* svn = get_svn_revision(); + const char* git = get_git_hash(); ShowMessage("\n"); ShowMessage(""CL_PASS" "CL_BOLD" "CL_PASS""CL_CLL""CL_NORMAL"\n"); @@ -269,7 +301,10 @@ static void display_title(void) { ShowMessage(""CL_PASS" "CL_GREEN" http://rathena.org/board/ "CL_PASS""CL_CLL""CL_NORMAL"\n"); ShowMessage(""CL_PASS" "CL_BOLD" "CL_PASS""CL_CLL""CL_NORMAL"\n"); - ShowInfo("SVN Revision: '"CL_WHITE"%s"CL_RESET"'.\n", get_svn_revision()); + if( svn[0] != UNKNOWN_VERSION ) + ShowInfo("SVN Revision: '"CL_WHITE"%s"CL_RESET"'\n", svn); + else if( git[0] != UNKNOWN_VERSION ) + ShowInfo("Git Hash: '"CL_WHITE"%s"CL_RESET"'\n", git); } // Warning if executed as superuser (root) diff --git a/src/common/core.h b/src/common/core.h index f619d821f2..ab3ef3ed04 100644 --- a/src/common/core.h +++ b/src/common/core.h @@ -16,6 +16,8 @@ extern char **arg_v; extern int buildbotflag; #endif +#define UNKNOWN_VERSION '\x02' + /// @see E_CORE_ST extern int runflag; extern char *SERVER_NAME; @@ -31,7 +33,8 @@ enum { extern char SERVER_TYPE; extern int parse_console(const char* buf); -extern const char *get_svn_revision(void); +const char *get_svn_revision(void); +const char *get_git_hash(void); extern int do_init(int,char**); extern void set_server_type(void); extern void do_abort(void); diff --git a/src/map/pc.c b/src/map/pc.c index 5b0bc1819a..b363375cee 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1067,9 +1067,17 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim if( !changing_mapservers ) { - if (battle_config.display_version == 1){ + if (battle_config.display_version == 1) { + const char* svn = get_svn_revision(); + const char* git = get_git_hash(); char buf[256]; - sprintf(buf, "SVN version: %s", get_svn_revision()); + + if( svn[0] != UNKNOWN_VERSION ) + sprintf(buf,"SVN Revision: %s", svn); + else if( git[0] != UNKNOWN_VERSION ) + sprintf(buf,"Git Hash: %s", git); + else + sprintf(buf,"Unknown Version"); clif_displaymessage(sd->fd, buf); } diff --git a/src/map/script.c b/src/map/script.c index 1eb717b017..b226801f5b 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -17105,12 +17105,12 @@ BUILDIN_FUNC(is_function) { * get_revision() -> retrieves the current svn revision (if available) **/ BUILDIN_FUNC(get_revision) { - const char * revision; + const char *svn = get_svn_revision(); - if ( (revision = get_svn_revision()) != 0 ) - script_pushint(st,atoi(revision)); + if ( svn[0] != UNKNOWN_VERSION ) + script_pushint(st,atoi(svn)); else - script_pushint(st,-1);//unknown + script_pushint(st,-1); //unknown return 0; }