diff options
author | shennetsind <shennetsind@users.noreply.github.com> | 2014-01-16 08:51:57 -0800 |
---|---|---|
committer | shennetsind <shennetsind@users.noreply.github.com> | 2014-01-16 08:51:57 -0800 |
commit | 6d827f5821900b16a37c899e413bf0b4fe8d1300 (patch) | |
tree | 6f6a3550f7d09c9eaf7e62bdcc1fde6c8f6fd9e2 | |
parent | d4d37e6a8675a805c574b2bfbff46b2114141f47 (diff) | |
parent | 7ed885a1411aec8e368bbf9c59c0715542045bd0 (diff) | |
download | hercules-6d827f5821900b16a37c899e413bf0b4fe8d1300.tar.gz hercules-6d827f5821900b16a37c899e413bf0b4fe8d1300.tar.bz2 hercules-6d827f5821900b16a37c899e413bf0b4fe8d1300.tar.xz hercules-6d827f5821900b16a37c899e413bf0b4fe8d1300.zip |
Merge pull request #253 from ossi0110/master
Added 2 Missing Costumes
-rw-r--r-- | db/const.txt | 2 | ||||
-rw-r--r-- | db/re/item_db.conf | 24 | ||||
-rw-r--r-- | db/sc_config.txt | 2 | ||||
-rw-r--r-- | src/map/status.c | 6 | ||||
-rw-r--r-- | src/map/status.h | 3 |
5 files changed, 37 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt index ab14afca2..9a590ac50 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1258,6 +1258,8 @@ SC_MTF_CRIDAMAGE 570 SC_MOONSTAR 571 SC_SUPER_STAR 572 SC_OKTOBERFEST 573 +SC_STRANGELIGHTS 574 +SC_DECORATION_OF_MUSIC 575 e_gasp 0 e_what 1 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 6c6e429b4..229deb776 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -96593,6 +96593,18 @@ item_db: ( View: 879 }, { + Id: 18741 + AegisName: "C_WillOWisp_Accessory" + Name: "Will O Wisp" + Type: 5 + Buy: 20 + Loc: 1024 + Refine: false + View: 880 + OnEquipScript: <" sc_start SC_STRANGELIGHTS,-1,0; "> + OnUnequipScript: <" sc_end SC_STRANGELIGHTS; "> +}, +{ Id: 18742 AegisName: "C_MoonStar_Accessory" Name: "Moon and Stars" @@ -98285,4 +98297,16 @@ item_db: ( Upper: 63 Script: <" itemskill RK_LUXANIMA,1; "> }, +{ + Id: 19871 + AegisName: "C_DecorationOfMusic_Accessory" + Name: "Decoration of Music" + Type: 5 + Buy: 20 + Loc: 2048 + Refine: false + View: 1074 + OnEquipScript: <" sc_start SC_DECORATION_OF_MUSIC,-1,0; "> + OnUnequipScript: <" sc_end SC_DECORATION_OF_MUSIC; "> +}, ) diff --git a/db/sc_config.txt b/db/sc_config.txt index 682fd060c..5d276f036 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -423,6 +423,8 @@ SC_INCHIT, 77 SC_PUSH_CART, 205 SC_MOONSTAR, 207 SC_SUPER_STAR, 207 +SC_STRANGELIGHTS, 207 +SC_DECORATION_OF_MUSIC, 207 //Cant Clear SC_ALL_RIDING, 128
\ No newline at end of file diff --git a/src/map/status.c b/src/map/status.c index 782f31780..e89f8d331 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -908,6 +908,8 @@ void initChangeTables(void) { status->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM; status->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; status->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; + status->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; + status->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; //Other SC which are not necessarily associated to skills. status->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD; @@ -999,6 +1001,8 @@ void initChangeTables(void) { status->ChangeFlagTable[SC_MOONSTAR] |= SCB_NONE; status->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE; + status->ChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE; + status->ChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE; /* status->DisplayType Table [Ind/Hercules] */ status->DisplayType[SC_ALL_RIDING] = true; @@ -1026,6 +1030,8 @@ void initChangeTables(void) { status->DisplayType[SC_MONSTER_TRANSFORM] = true; status->DisplayType[SC_MOONSTAR] = true; status->DisplayType[SC_SUPER_STAR] = true; + status->DisplayType[SC_STRANGELIGHTS] = true; + status->DisplayType[SC_DECORATION_OF_MUSIC] = true; #ifdef RENEWAL_EDP // renewal EDP increases your weapon atk diff --git a/src/map/status.h b/src/map/status.h index 44cc3b0a1..f319b1506 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -697,6 +697,8 @@ typedef enum sc_type { SC_SUPER_STAR, SC_OKTOBERFEST, + SC_STRANGELIGHTS, + SC_DECORATION_OF_MUSIC, SC_MAX, //Automatically updated max, used in for's to check we are within bounds. } sc_type; @@ -1458,6 +1460,7 @@ enum si_type { SI_PACKING_ENVELOPE10 = 775, SI_GLASTHEIM_TRANS = 776, SI_HEAT_BARREL_AFTER = 778, + SI_DECORATION_OF_MUSIC = 779, SI_MAX, }; // JOINTBEAT stackable ailments |