diff options
Diffstat (limited to 'world/map/npc/012-1')
-rw-r--r-- | world/map/npc/012-1/_mobs.txt | 2 | ||||
-rw-r--r-- | world/map/npc/012-1/injured-mouboo.txt | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt index c8f1303c..cdcc8730 100644 --- a/world/map/npc/012-1/_mobs.txt +++ b/world/map/npc/012-1/_mobs.txt @@ -14,7 +14,7 @@ 012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055 -012-1,0,0,0|script|Mob012-1|-1 +012-1,0,0,0|script|Mob012-1|32767 { end; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 09e27c80..2aefb0f7 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -29,11 +29,13 @@ function|script|QuestMoubooHeal next; set @value, 15; callfunc "QuestSagathaHappy"; - close; + close2; + return; L_nothing: mes "Your spell has no effect."; - close; + close2; + return; S_update_var: set @Q_wr_status, @Q_status | @Q_status_upper; @@ -97,6 +99,7 @@ L_pickup_alive: L_give: set @items_nr, 12; setarray @items$, "CactusDrink", "CactusPotion", "ChocolateBar", "Milk", "OrangeCupcake", "RedApple", "Beer", "BottleOfWater", "TinyHealingPotion", "SmallHealingPotion", "MediumHealingPotion", "LargeHealingPotion"; + setarray @itemnames$, "Cactus Drink", "Cactus Potion", "Chocolate Bar", "Milk", "Orange Cupcake", "Red Apple", "Beer", "Bottle of Water", "Tiny Healing Potion", "Small Healing Potion", "Medium Healing Potion", "Large Healing Potion"; setarray @itemeat, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 0, 0; setarray @menuItems$, "", "", "", "", "", "", "", "", "", "", "", "", ""; @@ -113,8 +116,7 @@ L_nloop: if (countitem(@k$) == 0) goto L_nloop_skip; - set @name$, getitemname(@k$); - set @menuItems$[@ct], @name$; + set @menuItems$[@ct], @itemnames$[@n]; set @menuNames$[@ct], @k$; set @choice_eat[@ct], @itemeat[@n]; set @ct, @ct + 1; @@ -156,7 +158,7 @@ L_MenuItems: L_consume: mes "[Injured Mouboo]"; - mes "The mouboo " + @verb$ + " your " + getitemname(@choice$) + "."; + mes "The mouboo " + @verb$ + " your " + getitemlink(@choice$) + "."; delitem @choice$, 1; next; if (@choice$ == "LargeHealingPotion") @@ -168,7 +170,7 @@ L_consume: L_do_heal: callfunc "QuestMoubooHeal"; - goto L_kill; + end; L_kill: mes "[Injured Mouboo]"; |