summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-20 18:49:51 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-04-20 18:49:51 +0000
commit75732c9f26870604b0ef7c58c5af5e53fd268ca6 (patch)
tree7f66b3b391b5f4bd5ed023f710803d879e4b89ba /npc
parent40c4dff74d460624e3de1cc0d49ce6df3ccce613 (diff)
downloadhercules-75732c9f26870604b0ef7c58c5af5e53fd268ca6.tar.gz
hercules-75732c9f26870604b0ef7c58c5af5e53fd268ca6.tar.bz2
hercules-75732c9f26870604b0ef7c58c5af5e53fd268ca6.tar.xz
hercules-75732c9f26870604b0ef7c58c5af5e53fd268ca6.zip
* Various script updates
- Removed the Acorn repeatable quest (got removed on iRO) - Re-enabled Umbala bungee jumping (bugreport:2978) - Fixed a reward in monster race (bugreport:2990) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13682 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt5
-rw-r--r--npc/cities/umbala.txt9
-rw-r--r--npc/other/monster_race.txt2
-rw-r--r--npc/quests/iRO_Exp.txt98
4 files changed, 59 insertions, 55 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 57cb6c7b6..40b8bf4e0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,10 @@
Date Added
======
+2009/04/20
+ * Various script updates [Playtester]
+ - Removed the Acorn repeatable quest (got removed on iRO)
+ - Re-enabled Umbala bungee jumping (bugreport:2978)
+ - Fixed a reward in monster race (bugreport:2990)
2009/04/17
* Fixed small typo in /battlegrounds/bg_common.txt [Jguy]
2009/04/15
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 4a7329d0b..a6da88fd0 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -22,7 +22,6 @@
//= 1.9 - Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate to npc/quests/quests_umbala.txt [Evera]
//= 2.0 - Removed duplicates, max NPC name length is 23, so Utan Tribe Young Adult#1, the 1 is skipped [Toms]
//= 2.1 - Updated to Aegis 10.3 standards. [L0ne_W0lf]
-//= - Disabled warping to Niflheim from the bungee jump, uncomment to reenable.
//============================================================
comodo,170,137,7 script La Ed#um 84,{
@@ -1021,10 +1020,10 @@ OnTouch:
mapannounce "umbala","Bungee Jump: "+strcharinfo(0)+" : Wooooooaaaaaaaaaaaaaahhhhhhhhhhhh~~~~~~!",bc_map;
end;
case 3:
- //if (rand(1,2) == 2) {
- // percentheal -99,0;
- // warp "nif_in",69,15;
- //}
+ if (rand(1,2) == 2) {
+ percentheal -99,0;
+ warp "nif_in",69,15;
+ }
end;
}
}
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index fda4f9b2b..88493c523 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -11291,7 +11291,7 @@ ein_in01,85,208,5 script Ei felle#repay01 854,{
callsub S_BonusReward,1500,1367;
end;
case 7:
- callsub S_BonusReward,1500,1395;
+ callsub S_BonusReward,1500,1305;
end;
case 8:
callsub S_BonusReward,1500,1368;
diff --git a/npc/quests/iRO_Exp.txt b/npc/quests/iRO_Exp.txt
index 6c069e165..54a3aee74 100644
--- a/npc/quests/iRO_Exp.txt
+++ b/npc/quests/iRO_Exp.txt
@@ -294,55 +294,55 @@ prt_fild04,356,148,3 script Laertes#iROExp 798,{
// Nutters - 25 Acorn
//===========================================================
-mjolnir_01,293,20,3 script Nutters#iROExp 779,{
- if((BaseLevel < 18)) {
- mes "[Nutters]";
- mes "You are just too small to fight";
- mes "these things for me. Can you get a";
- mes "little taller then return?";
- close;
- }
- else if((BaseLevel > 60)) {
- mes "[Nutters]";
- mes "You are much to strong to be";
- mes "fighting these things!";
- next;
- close;
- }
- mes "[Nutters]";
- mes "I..I just can't seem to find any.";
- mes "Pesky Coco's have hidden all the";
- mes "Acorns.";
- next;
- mes "[Nutters]";
- mes "Can you help me find ^00CE0025 Acorns^000000.";
- mes "I will reward you with much if you can.";
- next;
- if (select("I have 25 Acorns:Please come again?") == 2) {
- mes "[Nutters]";
- mes "I need ^00CE0025 Acorns^000000.";
- close;
- }
- if (countitem(1026) < 25) {
- mes "[Nutters]";
- mes "Where are my ^00CE00Acorns^000000? Hey, I'm not";
- mes "playing, you better not hold out on me.";
- close;
- }else{
- mes "[Nutters]";
- mes "Oh great you found out where they";
- mes "were hiding them. Gimme Gimme!!!";
- next;
- delitem 1026,25;
- getitem 502,5;
- getexp 3600,3905;
- mes "[Nutters]";
- mes "Oh thats right, sorry I just love";
- mes "roasting Acorns. Mmm.";
- mes "Here is what I promised you.";
- close;
- }
-}
+//mjolnir_01,293,20,3 script Nutters#iROExp 779,{
+// if((BaseLevel < 18)) {
+// mes "[Nutters]";
+// mes "You are just too small to fight";
+// mes "these things for me. Can you get a";
+// mes "little taller then return?";
+//
+// }
+// else if((BaseLevel > 60)) {
+// mes "[Nutters]";
+// mes "You are much to strong to be";
+// mes "fighting these things!";
+// next;
+// close;
+// }
+// mes "[Nutters]";
+// mes "I..I just can't seem to find any.";
+// mes "Pesky Coco's have hidden all the";
+// mes "Acorns.";
+// next;
+// mes "[Nutters]";
+// mes "Can you help me find ^00CE0025 Acorns^000000.";
+// mes "I will reward you with much if you can.";
+// next;
+// if (select("I have 25 Acorns:Please come again?") == 2) {
+// mes "[Nutters]";
+// mes "I need ^00CE0025 Acorns^000000.";
+// close;
+// }
+// if (countitem(1026) < 25) {
+// mes "[Nutters]";
+// mes "Where are my ^00CE00Acorns^000000? Hey, I'm not";
+// mes "playing, you better not hold out on me.";
+// close;
+// }else{
+// mes "[Nutters]";
+// mes "Oh great you found out where they";
+// mes "were hiding them. Gimme Gimme!!!";
+// next;
+// delitem 1026,25;
+// getitem 502,5;
+// getexp 3600,3905;
+// mes "[Nutters]";
+// mes "Oh thats right, sorry I just love";
+// mes "roasting Acorns. Mmm.";
+// mes "Here is what I promised you.";
+// close;
+// }
+//}
// Cuir - 25 Anolian Skin
//===========================================================