diff options
author | Haru <haru@dotalux.com> | 2016-11-14 23:55:22 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2016-11-20 18:10:26 +0100 |
commit | a26eb2f858cce483cf7edac7740643abd44e0709 (patch) | |
tree | a6e6d4a224b4d14e2fbdb0b8c92c0ae8a813a07a /npc/re/instances/ghost_palace.txt | |
parent | bcb3a33c4d41c70fab3d6ecbbf4c54b54242bbac (diff) | |
download | hercules-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/instances/ghost_palace.txt')
-rw-r--r-- | npc/re/instances/ghost_palace.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 08fe3b71b..b1a8f3c10 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -318,9 +318,9 @@ OnInstanceInit: "Everything will be vanished..."); close2(); if (first_time_gpmission) - getitem Gray_Piece, 1; + getitem(Gray_Shard, 1); if (!first_time_gpmission) { - getitem Gray_Piece, 2; + getitem(Gray_Shard, 2); getexp(900000, 500000); ++first_time_gpmission; } @@ -705,9 +705,10 @@ OnInstanceInit: mes("The cursed knight...\r" "Please help me save the soul of Sakray."); next; - setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow, - Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield, - Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet; + setarray(.@items_list, + Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow, + Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray, + Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet); setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100; .@menulist$ = ""; @@ -734,7 +735,7 @@ OnInstanceInit: break; case 2: next; - if (countitem(Gray_Piece) < .@cost[.@choice]) { + if (countitem(Gray_Shard) < .@cost[.@choice]) { mes("[King]"); mes("You don't have enough Gray Shards."); mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice])); @@ -755,7 +756,7 @@ OnInstanceInit: mes("[King]"); mes("The power requires a sacrifice.\r" "Please be careful..."); - delitem Gray_Piece, .@cost[.@choice]; + delitem(Gray_Shard, .@cost[.@choice]); getitem .@items_list[.@choice], 1; close(); } |