diff options
Diffstat (limited to 'world/map/npc/052-2')
| -rw-r--r-- | world/map/npc/052-2/chest.txt | 28 | ||||
| -rw-r--r-- | world/map/npc/052-2/janitor.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/052-2/partyroom.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/052-2/storage.txt | 2 |
4 files changed, 22 insertions, 18 deletions
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 7ba0d2df..03b08b82 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -30,8 +30,10 @@ L_ShouldNotBeHere: end; OnInit: - setarray $@illia_item_common_rewards, 601, 636, 637, 638, 639, 625, 626, 658, 571, 579, 876, 782, 545, 758, 4028, 602, 536, 720, 532, 570, 642; - setarray $@illia_item_unique_rewards, 877, 878, 879, 880; + setarray $@illia_common_rewards$, "SteelShield", "WarlordHelmet", "KnightsHelmet", "InfantryHelmet", "CrusadeHelmet", "ChainmailShirt", "LightPlatemail", "WarlordPlate", "Setzer", "RockKnife", "WarlordBoots", "ForestArmor", "ForestBow", "WoodenStaff", "WizardHat", "WoodenShield", "ShortSword", "SilkRobe", "LeatherGloves", "BoneKnife", "JeansChaps"; + setarray $@illia_common_rewards_n$, "Steel Shield", "Warlord Helmet", "Knights Helmet", "Infantry Helmet", "Crusade Helmet", "Chainmail Shirt", "Light Platemail", "Warlord Plate", "Setzer", "Rock Knife", "Warlord Boots", "Forest Armor", "Forest Bow", "Wooden Staff", "Wizard Hat", "Wooden Shield", "Short Sword", "Silk Robe", "Leather Gloves", "Bone Knife", "Jeans Chaps"; + setarray $@illia_unique_rewards$, "BullHelmet", "BansheeBow", "HeartOfIsis", "LazuriteRobe"; + setarray $@illia_unique_rewards_n$, "Bull Helmet", "Banshee Bow", "Heart of Isis", "Lazurite Robe"; end; L_ResumePick: @@ -58,13 +60,14 @@ L_GetCommonReward: if (@illia_current_num_rewards == $@illia_num_common_reward_items) goto L_RewardDone; getinventorylist; - set @reward, $@illia_item_common_rewards[rand(getarraysize($@illia_item_common_rewards))]; - if ((checkweight(@reward, 1) == 0) || (@inventorylist_count == 100)) + set @index, rand(getarraysize($@illia_common_rewards$)); + set @reward$, $@illia_common_rewards$[@index]; + if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) goto L_InventoryNoSpace; set @illia_current_num_rewards, @illia_current_num_rewards + 1; - getitem @reward, 1; - mes "You found a " + getitemname(@reward) + "!"; - set @reward, 0; + getitem @reward$, 1; + mes "You found a " + $@illia_common_rewards_n$[@index] + "!"; + set @reward$, ""; goto L_GetCommonReward; L_GetUniqueReward: @@ -73,17 +76,18 @@ L_GetUniqueReward: if (Illia_Uniques_Count >= 2) goto L_GetUniqueReward2; getinventorylist; - set @reward, $@illia_item_unique_rewards[rand(getarraysize($@illia_item_unique_rewards))]; - if ((checkweight(@reward, 1) == 0) || (@inventorylist_count == 100)) + set @index, rand(getarraysize($@illia_unique_rewards$)); + set @reward$, $@illia_unique_rewards$[@index]; + if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) goto L_InventoryNoSpace; next; mes "You notice an interesting shape hidden under a cover..."; next; set @illia_current_num_rewards, @illia_current_num_rewards + 1; - getitem @reward, 1; - mes "You found a " + getitemname(@reward) + "!"; + getitem @reward$, 1; + mes "You found a " + $@illia_unique_rewards_n$[@index] + "!"; set Illia_Uniques_Count, Illia_Uniques_Count + 1; - set @reward, 0; + set @reward$, ""; goto L_GetUniqueReward; L_GetUniqueReward2: diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index 7435f005..73858ce4 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,5 +1,5 @@ // Lobby janitor -052-2,1,1,0|script|#IlliaJanitor5|127 +052-2,1,1,0|script|#IlliaJanitor5|32767 { end; @@ -12,7 +12,7 @@ OnCommandClean: } // Storage janitor -052-2,1,1,0|script|#IlliaJanitor6|127 +052-2,1,1,0|script|#IlliaJanitor6|32767 { end; @@ -24,7 +24,7 @@ OnCommandClean: } // Final boss janitor -052-2,1,1,0|script|#IlliaJanitor7|127 +052-2,1,1,0|script|#IlliaJanitor7|32767 { end; diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt index ce9c9f7d..83bb51ee 100644 --- a/world/map/npc/052-2/partyroom.txt +++ b/world/map/npc/052-2/partyroom.txt @@ -83,7 +83,7 @@ OnTimer15000: } -052-2,88,15,0|script|#LuviaDaemon|127 +052-2,88,15,0|script|#LuviaDaemon|32767 { end; @@ -214,7 +214,7 @@ OnDeath: end; set $@illia_level_7_progress, 4; killmonster "052-2", "#LuviaDaemon::OnWGD"; - mapannounce "052-2", "Luvia:* How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; + mapannounce "052-2", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0; set $@illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120; areatimer "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; diff --git a/world/map/npc/052-2/storage.txt b/world/map/npc/052-2/storage.txt index 62f9cd46..4ddfdc09 100644 --- a/world/map/npc/052-2/storage.txt +++ b/world/map/npc/052-2/storage.txt @@ -27,7 +27,7 @@ L_StartItemInvoker: } -052-2,1,1,0|script|#ItemsInvoker|127 +052-2,1,1,0|script|#ItemsInvoker|32767 { end; |