diff options
| author | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-07 17:06:41 -0200 |
| commit | 951b18c97a09426e2f14801263c2fd07efbd46bb (patch) | |
| tree | 94303465410557176454305aeeab76a13ca8514d /npc/re/quests | |
| parent | 8083daec0d94f78510411c9b225abcfa7e829e95 (diff) | |
| parent | 9f32aa958f86a228290c43544c8b9bbf3f1c2cc0 (diff) | |
| download | hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.gz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.bz2 hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.tar.xz hercules-951b18c97a09426e2f14801263c2fd07efbd46bb.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/re/quests')
| -rw-r--r-- | npc/re/quests/quests_brasilis.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_mora.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 306a19cdb..5276fafe5 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -814,7 +814,7 @@ brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{ mes "[Mage Paje]"; mes "Abracadabra~"; specialeffect EF_POISONHIT,AREA,"Poring#bra"; - setarray .@display[0],800,876,909; + setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING; setnpcdisplay "Poring#bra",.@display[rand(3)]; if (brazil_gua != 5) close; next; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 9acebd207..1d7e9bbd0 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -2461,14 +2461,14 @@ bif_fild01,132,338,3 script Lope#pa 4_M_FAIRYSOLDIER2,2,2,{ } end; OnEnable: - setnpcdisplay "Lope#pa",999; + setnpcdisplay "Lope#pa", 4_M_MUT1; end; OnDisable: disablenpc "Lope#pa"; initnpctimer; end; OnReset: - setnpcdisplay "Lope#pa",461; + setnpcdisplay "Lope#pa", 4_M_FAIRYSOLDIER2; enablenpc "Lope#pa"; end; OnTimer2000: |