summaryrefslogtreecommitdiff
path: root/npc/re/quests
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-14 23:55:22 +0100
committerHaru <haru@dotalux.com>2016-11-20 18:10:26 +0100
commita26eb2f858cce483cf7edac7740643abd44e0709 (patch)
treea6e6d4a224b4d14e2fbdb0b8c92c0ae8a813a07a /npc/re/quests
parentbcb3a33c4d41c70fab3d6ecbbf4c54b54242bbac (diff)
downloadhercules-a26eb2f858cce483cf7edac7740643abd44e0709.tar.gz
hercules-a26eb2f858cce483cf7edac7740643abd44e0709.tar.bz2
hercules-a26eb2f858cce483cf7edac7740643abd44e0709.tar.xz
hercules-a26eb2f858cce483cf7edac7740643abd44e0709.zip
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 <haru@dotalux.com>
Diffstat (limited to 'npc/re/quests')
-rw-r--r--npc/re/quests/eden/eden_iro.txt2
-rw-r--r--npc/re/quests/quests_eclage.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 460960d72..2d72b3541 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -709,7 +709,7 @@ OnInit:
tradertype(NST_CASH);
sellitem Blue_Potion_Box,5;
sellitem F_Neuralizer_Box,400;
- sellitem FPr_Reset_Stone_Box,100;
+ sellitem FPremium_Reset_Stone_Box,100;
sellitem F_Abrasive_Box10,75;
sellitem F_G_O_I_Box10,25;
sellitem Greed_Scroll_Box_30,30;
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index f1abf56aa..bbf074581 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -2807,7 +2807,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -2949,7 +2949,7 @@ ecl_in04,224,234,4 script Mark Esha#ep14_2in2 4_M_BLUEMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3094,7 +3094,7 @@ ecl_in04,223,234,4 script Maggi Steen#ep14_2in2 4_F_PINKWOMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3230,7 +3230,7 @@ ecl_in04,223,230,4 script Alp Ocart#ep14_2in2 4_M_BLACKMAN,{
emotion e_dots;
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;