diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-28 14:56:39 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-28 14:56:39 +0000 |
| commit | 4c0285aaff047edeffaa7df03d24fe027153e3ac (patch) | |
| tree | 88af9f33f511546f15cf1e010e7afcaf777d2c42 | |
| parent | b7269fe1a09386e6d777c7ecf9003b37488fe15e (diff) | |
| download | hercules-4c0285aaff047edeffaa7df03d24fe027153e3ac.tar.gz hercules-4c0285aaff047edeffaa7df03d24fe027153e3ac.tar.bz2 hercules-4c0285aaff047edeffaa7df03d24fe027153e3ac.tar.xz hercules-4c0285aaff047edeffaa7df03d24fe027153e3ac.zip | |
Added missing msg_athena.conf entry for the summer outfit; name 'Summer' used for now.
Removed strange 'svn:executable' attributes from item_db2.sql and mob_db2.sql
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11325 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | conf/msg_athena.conf | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql-files/item_db2.sql | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sql-files/mob_db2.sql | 0 | ||||
| -rw-r--r-- | src/map/map.h | 4 | ||||
| -rw-r--r-- | src/map/status.c | 2 | ||||
| -rw-r--r-- | src/map/status.h | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index fa73075b7..f43014669 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -550,6 +550,7 @@ 618: Soul Linker 619: Gunslinger 620: Ninja +621: Summer //... 650: Unknown Job diff --git a/sql-files/item_db2.sql b/sql-files/item_db2.sql index c7a15306b..c7a15306b 100755..100644 --- a/sql-files/item_db2.sql +++ b/sql-files/item_db2.sql diff --git a/sql-files/mob_db2.sql b/sql-files/mob_db2.sql index 0e25f4bce..0e25f4bce 100755..100644 --- a/sql-files/mob_db2.sql +++ b/sql-files/mob_db2.sql diff --git a/src/map/map.h b/src/map/map.h index 558d7c4b1..c26b00505 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -94,8 +94,8 @@ enum { MAPID_WEDDING, MAPID_GUNSLINGER, MAPID_NINJA, - MAPID_XMAS, // [Valaris] - MAPID_SUMMER, // [Zephyrs] + MAPID_XMAS, + MAPID_SUMMER, //2_1 classes MAPID_SUPER_NOVICE = JOBL_2_1|0x0, MAPID_KNIGHT, diff --git a/src/map/status.c b/src/map/status.c index 442dcc968..8931bed98 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -164,7 +164,7 @@ void initChangeTables(void) set_sc(PR_ASPERSIO, SC_ASPERSIO, SI_ASPERSIO, SCB_ATK_ELE); set_sc(PR_BENEDICTIO, SC_BENEDICTIO, SI_BENEDICTIO, SCB_DEF_ELE); set_sc(PR_SLOWPOISON, SC_SLOWPOISON, SI_SLOWPOISON, SCB_REGEN); - set_sc(PR_KYRIE, SC_KYRIE, SI_KYRIE, SCB_NONE); + set_sc(PR_KYRIE, SC_KYRIE, SI_KYRIE, SCB_NONE); set_sc(PR_MAGNIFICAT, SC_MAGNIFICAT, SI_MAGNIFICAT, SCB_REGEN); set_sc(PR_GLORIA, SC_GLORIA, SI_GLORIA, SCB_LUK); add_sc(PR_LEXDIVINA, SC_SILENCE); diff --git a/src/map/status.h b/src/map/status.h index f5d45ba75..eb44925d4 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -510,7 +510,7 @@ enum { //Note that clientside Flying and Xmas are 0x8000 for clients prior to 2007. #define OPTION_FLYING 0x0008000 #define OPTION_XMAS 0x00010000 -#define OPTION_SUMMER 0x00040000 // [Zephyrus Summer] +#define OPTION_SUMMER 0x00040000 #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5) |