summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-11 20:30:08 -0800
committerStreusel <advance_me@hotmail.de>2013-02-11 20:30:08 -0800
commitf2860969d87d29b8bc0d1bfc780e8234bef8bbb4 (patch)
tree386a414bc7ef5f7c0846350d3a5d8dc13432cc83
parent33fa32fd902bb2e836b7d92441fdffe006e563ca (diff)
parent20abc4a94a4bd3a7428c042cc6d1c313272fbc28 (diff)
downloadhercules-f2860969d87d29b8bc0d1bfc780e8234bef8bbb4.tar.gz
hercules-f2860969d87d29b8bc0d1bfc780e8234bef8bbb4.tar.bz2
hercules-f2860969d87d29b8bc0d1bfc780e8234bef8bbb4.tar.xz
hercules-f2860969d87d29b8bc0d1bfc780e8234bef8bbb4.zip
Merge github.com:HerculesWS/Hercules
-rw-r--r--npc/cities/alberta.txt279
-rw-r--r--src/common/mmo.h3
2 files changed, 135 insertions, 147 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index ccfced388..7f9bbe01d 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -67,45 +67,41 @@ alberta,131,139,2 script Drunken Old Man 54,{
mes "Wh-what are you";
mes "staring at? Get lost!!";
next;
- switch(select("Say nothing.","Leave him alone.")) {
- case 1:
+ if(select("Say nothing.","Leave him alone.") ==1) {
+ mes "[Deagle]";
+ mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
+ next;
+ if(select("Never heard of it.","Really? No kidding!") ==1) {
mes "[Deagle]";
- mes "Hahahaha ^666666*hiccup*^000000... You've got some nerve. I may look worthless now, but I used to be a sailor on the 'Going Mary.'";
+ mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
next;
- switch(select("Never heard of it.","Really? No kidding!")) {
- case 1:
- mes "[Deagle]";
- mes "Never heard of it?! Everybody knows th'notorious pirate ship 'Going Mary!' ^666666*Hiccup~*^000000";
- next;
- mes "[Deagle]";
- mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
- next;
- mes "[Deagle]";
- mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
- close;
- case 2:
- mes "[Deagle]";
- mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
- next;
- mes "[Deagle]";
- mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
- next;
- mes "[Deagle]";
- mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
- next;
- mes "[Deagle]";
- mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
- next;
- mes "[Deagle]";
- mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
- close;
- }
- case 2:
mes "[Deagle]";
- mes "That's right!";
- mes "Go AWAY~";
+ mes "Ah~ The ol'days. If only... If only we hadn't run into that STORM...^666666*hiccup*^000000";
+ next;
+ mes "[Deagle]";
+ mes "AH~ Captain. I miss our cap'n more than anything... No foe survived before cap'n's sword.";
close;
+ }
+ mes "[Deagle]";
+ mes "That's right! NOBODY meshes with the crew of the 'Going Mary!' And nobody can beat out cap'n in a sword fight!";
+ next;
+ mes "[Deagle]";
+ mes "CAPTAIN~!!! ^666666*HICCUP~*^000000 He would swing his sword like this, then... THEN!!";
+ next;
+ mes "[Deagle]";
+ mes "The bastard the captain was fighting, and anyone of his friends near him, were surrounded in flame!";
+ next;
+ mes "[Deagle]";
+ mes "Man, that sword must have had some sort of mysterious power, or the captain was just that good...!";
+ next;
+ mes "[Deagle]";
+ mes "Phew~~ ^666666*Sob* *Sob...*^000000 God, I miss everyone! Now I'm depressed! Please, go away now.";
+ close;
}
+ mes "[Deagle]";
+ mes "That's right!";
+ mes "Go AWAY~";
+ close;
}
alberta,58,80,2 script Shakir 99,{
@@ -255,25 +251,22 @@ alberta,195,151,2 script Paul 86,{
mes "fee is only";
mes "200 Zeny.";
next;
- switch(select("Sign me up!","Uh, no thanks.")) {
- case 1:
- if (Zeny < 200) {
- mes "[Paul]";
- mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
- close;
- } else {
- set Zeny,Zeny - 200;
- warp "alb2trea",62,69;
- close;
- }
- case 2:
+ if(select("Sign me up!","Uh, no thanks.") ==1) {
+ if (Zeny < 200) {
mes "[Paul]";
- mes "Alright, well...";
- mes "I'll be around";
- mes "if you change";
- mes "your mind.";
+ mes "It seems you don't have the money, my friend. But please come back when you're able to pay.";
close;
+ }
+ set Zeny,Zeny - 200;
+ warp "alb2trea",62,69;
+ close;
}
+ mes "[Paul]";
+ mes "Alright, well...";
+ mes "I'll be around";
+ mes "if you change";
+ mes "your mind.";
+ close;
}
alberta,190,173,4 script Phelix 85,{
@@ -299,111 +292,107 @@ alberta,190,173,4 script Phelix 85,{
mes "If you're interested in my offer, get me the stuff I mentioned.";
set @event_zelopy,1;
close;
- } else {
- mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
+ }
+ mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?";
+ next;
+ if(select("Red Potions please.","Carrots please.") ==1) {
+ case 1:
+ mes "[Phelix]";
+ mes "Alright...";
+ mes "Let's see";
+ mes "what'cha got...";
+ next;
+ mes "[Phelix]";
+ if (countitem(909) < 10) {
+ mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
+ close;
+ }
+ set .@max,countitem(909)/10;
+ mes "Hmm, not bad...";
+ mes "How many potions";
+ mes "do you want to get?";
next;
- switch(select("Red Potions please.","Carrots please.")) {
+ switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
case 1:
+ delitem 909,.@max*10; // Jellopy
+ getitem 501,.@max; // Red_Potion
+ break;
+ case 2:
mes "[Phelix]";
- mes "Alright...";
- mes "Let's see";
- mes "what'cha got...";
+ mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
+ mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
+ input .@amount;
next;
mes "[Phelix]";
- if (countitem(909) < 10) {
- mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?";
- close;
- } else {
- set .@max,countitem(909)/10;
- mes "Hmm, not bad...";
- mes "How many potions";
- mes "do you want to get?";
- next;
- switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) {
- case 1:
- delitem 909,.@max*10; // Jellopy
- getitem 501,.@max; // Red_Potion
- break;
- case 2:
- mes "[Phelix]";
- mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
- mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
- input .@amount;
- next;
- mes "[Phelix]";
- if (.@amount <= 0) {
- mes "Much obliged, come again anytime.";
- close;
- }
- if (.@amount > 100) {
- mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
- close;
- }
- if (countitem(909) < .@amount*10) {
- mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
- close;
- }
- delitem 909,.@amount*10; // Jellopy
- getitem 501,.@amount; // Red_Potion
- break;
- case 3:
- mes "[Phelix]";
- mes "No problem,";
- mes "see you next time.";
- close;
- }
- mes "[Phelix]";
- mes "There you go! As I promised. Don't go suckin' them all down at once.";
+ if (.@amount <= 0) {
+ mes "Much obliged, come again anytime.";
close;
}
- case 2:
- mes "[Phelix]";
- mes "Alright, let's see what ya got...";
- next;
- mes "[Phelix]";
- if (countitem(909) < 3) {
- mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+ if (.@amount > 100) {
+ mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!";
close;
- } else {
- set .@max,countitem(909)/3;
- mes "Not too bad pansy...";
- mes "How many do you want?";
- next;
- switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
- case 1:
- delitem 909,.@max*3; // Jellopy
- getitem 515,.@max; // Carrot
- break;
- case 2:
- mes "[Phelix]";
- mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
- input .@amount;
- next;
- mes "[Phelix]";
- if (.@amount == 0) {
- mes "Alright then, see you next time.";
- close;
- }
- if (.@amount > 100) {
- mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
- close;
- }
- if (countitem(909) < .@amount*10) {
- mes "Seems you don't have enough. Go get some more if you want anything else.";
- close;
- }
- delitem 909,.@amount*3; // Jellopy
- getitem 515,.@amount; // Carrot
- break;
- case 3:
- mes "[Phelix]";
- mes "Catch'ya later.";
- close;
- }
- mes "[Phelix]";
- mes "There you go~! As I promised. Try not to stuff yer face.";
+ }
+ if (countitem(909) < .@amount*10) {
+ mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me.";
close;
}
+ delitem 909,.@amount*10; // Jellopy
+ getitem 501,.@amount; // Red_Potion
+ break;
+ case 3:
+ mes "[Phelix]";
+ mes "No problem,";
+ mes "see you next time.";
+ close;
}
+ mes "[Phelix]";
+ mes "There you go! As I promised. Don't go suckin' them all down at once.";
+ close;
+ }
+ mes "[Phelix]";
+ mes "Alright, let's see what ya got...";
+ next;
+ mes "[Phelix]";
+ if (countitem(909) < 3) {
+ mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?";
+ close;
}
+ set .@max,countitem(909)/3;
+ mes "Not too bad pansy...";
+ mes "How many do you want?";
+ next;
+ switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) {
+ case 1:
+ delitem 909,.@max*3; // Jellopy
+ getitem 515,.@max; // Carrot
+ break;
+ case 2:
+ mes "[Phelix]";
+ mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'.";
+ input .@amount;
+ next;
+ mes "[Phelix]";
+ if (.@amount == 0) {
+ mes "Alright then, see you next time.";
+ close;
+ }
+ if (.@amount > 100) {
+ mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!";
+ close;
+ }
+ if (countitem(909) < .@amount*10) {
+ mes "Seems you don't have enough. Go get some more if you want anything else.";
+ close;
+ }
+ delitem 909,.@amount*3; // Jellopy
+ getitem 515,.@amount; // Carrot
+ break;
+ case 3:
+ mes "[Phelix]";
+ mes "Catch'ya later.";
+ close;
+ }
+ mes "[Phelix]";
+ mes "There you go~! As I promised. Try not to stuff yer face.";
+ close;
}
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 493f87691..2ef9789f2 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -46,8 +46,7 @@
// 20120307 - 2012-03-07aRagexeRE+ - 0x970
#ifndef PACKETVER
- #define PACKETVER 20120410
- //#define PACKETVER 20111116
+ #define PACKETVER 20120418
#endif
//Remove/Comment this line to disable sc_data saving. [Skotlex]