Prechádzať zdrojové kódy

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://svn.code.sf.net/p/rathena/svn/trunk@11325 54d463be-8e91-2dee-dedb-b68131a5f0ec

ultramage 17 rokov pred
rodič
commit
2b21f97dba
4 zmenil súbory, kde vykonal 5 pridanie a 4 odobranie
  1. 1 0
      conf/msg_athena.conf
  2. 2 2
      sql-files/item_db2.sql
  3. 1 1
      src/map/status.c
  4. 1 1
      src/map/status.h

+ 1 - 0
conf/msg_athena.conf

@@ -550,6 +550,7 @@
 618: Soul Linker
 619: Gunslinger
 620: Ninja
+621: Summer
 //...
 650: Unknown Job
 

+ 2 - 2
sql-files/item_db2.sql

@@ -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,

+ 1 - 1
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);

+ 1 - 1
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)