From a26eb2f858cce483cf7edac7740643abd44e0709 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 14 Nov 2016 23:55:22 +0100 Subject: Propageted the AegisName fix to scripts and pre-re database This commit just propagates the AegisName changes to the pre-re database and to the (re) scripts. Two issues are fixed as a side-effect: - The ghost_palace script was referring the non-existing constant(s): Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0. Paired with the script engine's inability to differentiate between constants and player variables, that produced a very subtle issue. - The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a pair of swapped AegisName constants (RAG203 and RAG203_), the slotted version was sold by the NPC instead of hte non-slotted one (the issue was actually fixed in the previous commit, although the description of the fix is here - these two commits are only split for legibility purposes but they're to be considered indivisible). Signed-off-by: Haru --- db/pre-re/item_packages.conf | 100 +++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'db/pre-re/item_packages.conf') diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf index 3c952e258..808addc58 100644 --- a/db/pre-re/item_packages.conf +++ b/db/pre-re/item_packages.conf @@ -4745,8 +4745,8 @@ July7_Scroll: { Named: true Rate: 1 } -//unsupported/unknown item 'Hair_Of_The_Strong' -// Hair_Of_The_Strong: { +//unsupported/unknown item 'C_Hair_Of_The_Strong' +// C_Hair_Of_The_Strong: { // Random: 1 // Announce: true // Named: true @@ -5283,7 +5283,7 @@ Buddah_Scroll: { Rate: 1 } } -Evil_Incarnation: { +Evil_Incarnation_Disable: { Dead_Tree_Branch_Box2: { Random: 1 Named: true @@ -5791,8 +5791,8 @@ Premium_Reset_Stone_Box: { Random: 0 } } -/* unsupported/unknown item 'FPr_Reset_Stone_Box' -FPr_Reset_Stone_Box: { +/* unsupported/unknown item 'FPremium_Reset_Stone_Box' +FPremium_Reset_Stone_Box: { Premium_Reset_Stone: { Random: 0 } @@ -5881,8 +5881,8 @@ Majestic_Devil_Scroll: { } } */ -/* unsupported/unknown item 'Life_Ribbon_Box' -Life_Ribbon_Box: { +/* unsupported/unknown item 'Ribbon_Of_Life_Box' +Ribbon_Of_Life_Box: { //unsupported/unknown item 'Life_Ribbon' // Life_Ribbon: { // Random: 0 @@ -5890,8 +5890,8 @@ Life_Ribbon_Box: { // } } */ -/* unsupported/unknown item 'Life_Ribbon_Box2' -Life_Ribbon_Box2: { +/* unsupported/unknown item 'Ribbon_Of_Life_Box2' +Ribbon_Of_Life_Box2: { //unsupported/unknown item 'Life_Ribbon' // Life_Ribbon: { // Random: 0 @@ -5900,8 +5900,8 @@ Life_Ribbon_Box2: { // } } */ -/* unsupported/unknown item 'Life_Ribbon_Box3' -Life_Ribbon_Box3: { +/* unsupported/unknown item 'Ribbon_Of_Life_Box3' +Ribbon_Of_Life_Box3: { //unsupported/unknown item 'Life_Ribbon' // Life_Ribbon: { // Random: 0 @@ -6896,8 +6896,8 @@ Pisces_Diadem_Scroll: { Named: true Rate: 130 } -//unsupported/unknown item 'Life_Ribbon_Box3' -// Life_Ribbon_Box3: { +//unsupported/unknown item 'Ribbon_Of_Life_Box3' +// Ribbon_Of_Life_Box3: { // Random: 1 // Named: true // Rate: 160 @@ -6920,8 +6920,8 @@ Pisces_Diadem_Scroll: { } } */ -/* unsupported/unknown item 'Pisces_Diadem_Box' -Pisces_Diadem_Box: { +/* unsupported/unknown item 'Pisces_Diadem_Box2' +Pisces_Diadem_Box2: { //unsupported/unknown item 'Pisces_Diadem_Scroll' // Pisces_Diadem_Scroll: { // Random: 0 @@ -7105,8 +7105,8 @@ Energetic_Pisces_Box: { // } } */ -/* unsupported/unknown item 'Aries_Scroll' -Aries_Scroll: { +/* unsupported/unknown item 'Aries_Scroll_' +Aries_Scroll_: { //unsupported/unknown item 'Freyja_Boots' // Freyja_Boots: { // Random: 1 @@ -7173,53 +7173,53 @@ Aries_Scroll: { */ /* unsupported/unknown item 'Aries_Scroll_Box' Aries_Scroll_Box: { -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } -//unsupported/unknown item 'Aries_Scroll' -// Aries_Scroll: { +//unsupported/unknown item 'Aries_Scroll_' +// Aries_Scroll_: { // Random: 0 // Named: true // } @@ -8305,8 +8305,8 @@ RWC_Super_Scroll: { // Announce: true // Rate: 250 // } -//unsupported/unknown item 'Hair_Of_The_Strong' -// Hair_Of_The_Strong: { +//unsupported/unknown item 'C_Hair_Of_The_Strong' +// C_Hair_Of_The_Strong: { // Random: 1 // Announce: true // Rate: 100 @@ -8362,8 +8362,8 @@ RWC_Super_Scroll: { // } } */ -/* unsupported/unknown item 'Leo_Scroll' -Leo_Scroll: { +/* unsupported/unknown item 'Leo_Scroll3' +Leo_Scroll3: { Fallen_Bishop_Card: { Random: 1 Announce: true @@ -8493,8 +8493,8 @@ Ms_Virgo_Scroll: { Announce: true Rate: 300 } -//unsupported/unknown item 'Life_Ribbon_Box3' -// Life_Ribbon_Box3: { +//unsupported/unknown item 'Ribbon_Of_Life_Box3' +// Ribbon_Of_Life_Box3: { // Random: 1 // Rate: 800 // } @@ -9571,7 +9571,7 @@ Wind_Type_Scroll: { // } } */ -LUcky_Egg_C3: { +Lucky_Egg_C3: { Magic_Card_Album: { Random: 1 Announce: true @@ -11717,8 +11717,8 @@ Tw_Yellow_Scroll: { // Random: 1 // Rate: 450 // } -//unsupported/unknown item 'Life_Ribbon_Box3' -// Life_Ribbon_Box3: { +//unsupported/unknown item 'Ribbon_Of_Life_Box3' +// Ribbon_Of_Life_Box3: { // Random: 1 // Rate: 1000 // } @@ -12033,8 +12033,8 @@ Tw_Yellow_Scroll: { Announce: true Rate: 25 } -//unsupported/unknown item 'Devil_Whisper' -// Devil_Whisper: { +//unsupported/unknown item 'Evil_Whisper' +// Evil_Whisper: { // Random: 1 // Announce: true // Rate: 40 @@ -12395,8 +12395,8 @@ Tw_Yellow_Scroll: { // Announce: true // Rate: 150 // } -//unsupported/unknown item 'Little_Feather_Hat' -// Little_Feather_Hat: { +//unsupported/unknown item 'Little_Fhat' +// Little_Fhat: { // Random: 1 // Announce: true // Rate: 100 -- cgit v1.2.3-60-g2f50