diff options
author | shennetsind <ind@henn.et> | 2014-01-16 17:11:54 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2014-01-16 17:11:54 -0200 |
commit | 4874a3cf8b107457b703d0ece8d5102b08ef7702 (patch) | |
tree | 3755fe96388b6d922c5544281f27d1576aabfa43 /db | |
parent | 4a2794bbe3d4d1a0e9866b0a5d3459c75cd59ecb (diff) | |
parent | 56c54542b7e444010a6287a426680044c6756db6 (diff) | |
download | hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.gz hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.bz2 hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.xz hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'db')
-rw-r--r-- | db/const.txt | 2 | ||||
-rw-r--r-- | db/re/item_db.conf | 24 | ||||
-rw-r--r-- | db/sc_config.txt | 2 |
3 files changed, 28 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 |