Permalink
1 comment
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Initial release of the clan system
Thanks to @cydh, @RagnarokNova and @aleos89 for their help.
- Loading branch information
Showing
with
1,906 additions
and 9 deletions.
- +2 −0 conf/inter_athena.conf
- +3 −0 conf/msg_conf/map_msg.conf
- +4 −0 conf/msg_conf/map_msg_chn.conf
- +3 −0 conf/msg_conf/map_msg_frn.conf
- +3 −0 conf/msg_conf/map_msg_grm.conf
- +3 −0 conf/msg_conf/map_msg_idn.conf
- +3 −0 conf/msg_conf/map_msg_por.conf
- +3 −0 conf/msg_conf/map_msg_rus.conf
- +3 −0 conf/msg_conf/map_msg_spn.conf
- +3 −0 conf/msg_conf/map_msg_tha.conf
- +6 −0 db/const.txt
- +6 −0 db/packet_db.txt
- +80 −0 doc/packet_interserv.txt
- +17 −0 doc/script_commands.txt
- +600 −0 npc/re/other/clans.txt
- +1 −0 npc/re/scripts_athena.conf
- +45 −0 sql-files/main.sql
- +46 −0 sql-files/upgrades/upgrade_20161116.sql
- +2 −0 src/char/CMakeLists.txt
- +26 −6 src/char/char.c
- +2 −0 src/char/char.h
- +244 −0 src/char/int_clan.c
- +10 −0 src/char/int_clan.h
- +5 −0 src/char/inter.c
- +19 −1 src/common/mmo.h
- +2 −0 src/map/CMakeLists.txt
- +5 −0 src/map/atcommand.c
- +2 −0 src/map/chrif.c
- +200 −0 src/map/clan.c
- +23 −0 src/map/clan.h
- +168 −1 src/map/clif.c
- +9 −0 src/map/clif.h
- +90 −0 src/map/intif.c
- +5 −0 src/map/intif.h
- +1 −0 src/map/log.h
- +6 −0 src/map/map.c
- +3 −0 src/map/pc.c
- +3 −0 src/map/pc.h
- +41 −0 src/map/script.c
- +7 −0 src/map/script_constants.h
- +11 −0 src/map/skill.c
- +104 −1 src/map/status.c
- +7 −0 src/map/status.h
- +2 −0 vcproj-10/char-server.vcxproj
- +6 −0 vcproj-10/char-server.vcxproj.filters
- +2 −0 vcproj-10/map-server.vcxproj
- +6 −0 vcproj-10/map-server.vcxproj.filters
- +2 −0 vcproj-12/char-server.vcxproj
- +6 −0 vcproj-12/char-server.vcxproj.filters
- +2 −0 vcproj-12/map-server.vcxproj
- +6 −0 vcproj-12/map-server.vcxproj.filters
- +2 −0 vcproj-13/char-server.vcxproj
- +6 −0 vcproj-13/char-server.vcxproj.filters
- +2 −0 vcproj-13/map-server.vcxproj
- +6 −0 vcproj-13/map-server.vcxproj.filters
- +2 −0 vcproj-14/char-server.vcxproj
- +6 −0 vcproj-14/char-server.vcxproj.filters
- +2 −0 vcproj-14/map-server.vcxproj
- +6 −0 vcproj-14/map-server.vcxproj.filters
- +8 −0 vcproj-9/char-server.vcproj
- +8 −0 vcproj-9/map-server.vcproj
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -590,5 +590,8 @@ | ||
| 696: Oktoberfest | ||
| 697: Summoner | ||
|
|
||
| // @guild | ||
| 1498: You cannot create a guild because you are in a clan. | ||
|
|
||
| //Custom translations | ||
| import: conf/msg_conf/import/map_msg_grm_conf.txt | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -2726,3 +2726,9 @@ THANATOS_KEEP 10009 | ||
| 4_ELDER 10205 | ||
| 4_LUNATIC 10206 | ||
| 4_F_NOVICE2 10207 | ||
|
|
||
| SWORDCLAN 1 | ||
| ARCWANDCLAN 2 | ||
| GOLDENMACECLAN 3 | ||
| CROSSBOWCLAN 4 | ||
| JUMPINGCLAN 5 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
ecc8cf9There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forgot to add: Merged #1511