summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorDastgir <dastgir@users.noreply.github.com>2015-04-04 10:45:04 +0530
committerDastgir <dastgir@users.noreply.github.com>2015-04-04 10:45:04 +0530
commit85278a99b5d52e8995e4c57df51a6c3676c53e56 (patch)
treee97797d07d4eca9744f38303e88aa3cfd4797b12 /npc
parent281823a0faa46d6060e6a16fb953b61caf2193ed (diff)
parent8651ff5518f781980ed19e74c13e13b21ee53c2e (diff)
downloadhercules-85278a99b5d52e8995e4c57df51a6c3676c53e56.tar.gz
hercules-85278a99b5d52e8995e4c57df51a6c3676c53e56.tar.bz2
hercules-85278a99b5d52e8995e4c57df51a6c3676c53e56.tar.xz
hercules-85278a99b5d52e8995e4c57df51a6c3676c53e56.zip
Merge pull request #485 from zackdreaver/master
Added new items, corrected some item scripts and minor script fixes.
Diffstat (limited to 'npc')
-rw-r--r--npc/re/quests/eden/eden_quests.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index e75191c56..f9030964c 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -1862,8 +1862,8 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
}
if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
callsub S_Select,"We have a mace and a staff",
- P_Staff1,"Eden Mace I","Mace","Attack 142","", //P_Staff1
- P_Mace1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; //P_Mace1
+ P_Mace1,"Eden Mace I","Mace","Attack 142","", //P_Mace1
+ P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; //P_Staff1
}
if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
callsub S_Select,"",
@@ -1931,8 +1931,8 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
}
if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
callsub S_Select,"We have a mace and a staff",
- P_Staff2,"Eden Mace II","Mace","Attack 163","", //P_Staff2
- P_Mace2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60",""; //P_Mace2
+ P_Mace2,"Eden Mace II","Mace","Attack 163","", //P_Mace2
+ P_Staff2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60",""; //P_Staff2
}
if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
callsub S_Select,"",