diff options
| author | Ibrahem Hossam <ibrahem.h.basyone@gmail.com> | 2016-10-16 14:19:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 14:19:36 +0200 |
| commit | 8f2dace11eb6cce3fa9d4ff194db2a4b34753f91 (patch) | |
| tree | 5dd5748a4f12963b57253a6a946a583b07022e56 /db | |
| parent | 1b1682ed243ef8304bfce1be7a70626c95720d93 (diff) | |
| parent | 062f2cf4235cf07481ecaf58682f37f2ad8928f8 (diff) | |
| download | hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.gz hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.bz2 hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.tar.xz hercules-8f2dace11eb6cce3fa9d4ff194db2a4b34753f91.zip | |
Merge pull request #1472 from Asheraf/getcharid
Change *getcharid to use constants
Diffstat (limited to 'db')
| -rw-r--r-- | db/constants.conf | 7 | ||||
| -rw-r--r-- | db/pre-re/item_db.conf | 10 | ||||
| -rw-r--r-- | db/re/item_db.conf | 12 |
3 files changed, 18 insertions, 11 deletions
diff --git a/db/constants.conf b/db/constants.conf index a044aee7d..c22435a36 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3656,6 +3656,13 @@ constants_db: { NPC_NAME_HIDDEN: 2 NPC_NAME_UNIQUE: 3 NPC_MAP: 4 + + comment__: "getcharid" + CHAR_ID_CHAR: 0 + CHAR_ID_PARTY: 1 + CHAR_ID_GUILD: 2 + CHAR_ID_ACCOUNT: 3 + CHAR_ID_BG: 4 comment__: "sc_start" SCFLAG_NONE: 0x00 diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 1ba177d18..4ba5719a4 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -93445,7 +93445,7 @@ item_db: ( Name: "Chemical Protection Helm Scroll" Type: 2 Weight: 10 - Script: <" unitskilluseid getcharid(3),237,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),237,5; "> }, { Id: 14518 @@ -93453,7 +93453,7 @@ item_db: ( Name: "Chemical Protection Shield Scrol" Type: 2 Weight: 10 - Script: <" unitskilluseid getcharid(3),235,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),235,5; "> }, { Id: 14519 @@ -93461,7 +93461,7 @@ item_db: ( Name: "Chemical Protection Armor Scroll" Type: 2 Weight: 10 - Script: <" unitskilluseid getcharid(3),236,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),236,5; "> }, { Id: 14520 @@ -93469,7 +93469,7 @@ item_db: ( Name: "Chemical Protection Weapon Scroll" Type: 2 Weight: 10 - Script: <" unitskilluseid getcharid(3),234,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),234,5; "> }, { Id: 14521 @@ -93489,7 +93489,7 @@ item_db: ( Nouse: { sitting: true } - Script: <" unitskilluseid getcharid(3),108,1; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),108,1; "> }, { Id: 14522 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 3587fb4ce..34136aa5c 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -120552,7 +120552,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(3),237,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),237,5; "> }, { Id: 14518 @@ -120569,7 +120569,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(3),235,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),235,5; "> }, { Id: 14519 @@ -120586,7 +120586,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(3),236,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),236,5; "> }, { Id: 14520 @@ -120603,7 +120603,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(3),234,5; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),234,5; "> }, { Id: 14521 @@ -120623,7 +120623,7 @@ item_db: ( Nouse: { sitting: true } - Script: <" unitskilluseid getcharid(3),108,1; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT),108,1; "> }, { Id: 14522 @@ -146123,7 +146123,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(3), "AL_TELEPORT", 3; "> + Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT), "AL_TELEPORT", 3; "> }, { Id: 22514 |