summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-07 22:04:39 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-07-07 22:04:39 +0000
commit58159393df86e0bca7695cc0dbcf33f05ee4d113 (patch)
tree7b0d6b72055447fe645192f4495fc161ac68f85c
parentdca613e8133e589753148cf10a84a991ba4ed931 (diff)
downloadhercules-58159393df86e0bca7695cc0dbcf33f05ee4d113.tar.gz
hercules-58159393df86e0bca7695cc0dbcf33f05ee4d113.tar.bz2
hercules-58159393df86e0bca7695cc0dbcf33f05ee4d113.tar.xz
hercules-58159393df86e0bca7695cc0dbcf33f05ee4d113.zip
* Official Lighthalzen Gangster Alert script.
* Fixed typo in Amatsu Dungeon Entrance Quest. * Removed duplicate nomemo mapflag entries. - added changelog entries for my previous commit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14362 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/mapflag/nomemo.txt4
-rw-r--r--npc/Changelog.txt10
-rw-r--r--npc/quests/quests_amatsu.txt5
-rw-r--r--npc/quests/quests_lighthalzen.txt169
4 files changed, 86 insertions, 102 deletions
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 0f4762326..a2ffb46d6 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -7,6 +7,7 @@
//= 1.7 Added all novice maps. [L0ne_W0lf]
//= 1.8 Added nameless_i location [Lupus]
//= 1.8a Removed duplicate gef_cas nomemo mapflags [Yommy]
+//= 1.8b Removed duplicate arug_dun01 & schg_dun01 entries [Gepard]
//===== Current Version: =====================================
@@ -665,6 +666,3 @@ spl_in01 mapflag nomemo
// Nidhoggr's Instance ===========
1@nyd mapflag nomemo
2@nyd mapflag nomemo
-
-arug_dun01 mapflag nomemo
-schg_dun01 mapflag nomemo
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e797d758a..975baec5d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,15 @@
Date Added
======
+2010/07/08
+ * Rev. 14362 Official Lighthalzen Gangster Alert script. [Gepard]
+ - Fixed typo in Amatsu Dungeon Entrance Quest.
+2010/07/03
+ * Rev. 14360 Fixed KvM announcements showing during WoE:SE (bugreport:4335). [Gepard]
+ - Added missing Lighthalzen NPC (bugreport:4319).
+ - Fixed checkweights in Manuk & Splendide shops.
+ - Fixed some condition checks in Moscovia quests.
+ - Fixed some typos in Sealed Shrine and Manuk quests dialogues.
+ - Added missing global var check in Yggdrasil Dungeon Floor 2 puzzle.
2010/06/30
* Rev. 14359 Corrected some MVP spawn variances (Guild Dungeon & Veins Fields). [Gepard]
2010/06/27
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index b632b25e6..aa7251446 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena team & others? & MasterOfMuppets
//===== Current Version: =====================================
-//= 1.4
+//= 1.4a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,6 +14,7 @@
//===== Additional Comments: =================================
//= 1.3 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf]
//= 1.4 Added missing checkweight. [L0ne_W0lf]
+//= 1.4a Fixed typo in condition check [Gepard]
//============================================================
// Momotaro Event
@@ -1896,7 +1897,7 @@ ama_in01,22,111,0 script Grandma#ama2 761,{
mes "it won't harm me!! Yelp!^000000";
next;
select("Taaaah!!");
- if ((BaseJob == Job_Priest || BaseJob != Job_Acolye && BaseJob != Job_Monk) || (countitem(523) < 1 || countitem(948) < 1 || countitem(1029) < 1)) {
+ if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(523) < 1 || countitem(948) < 1 || countitem(1029) < 1)) {
if (rand(1,4) == 1)
set .@fox_kill,0;
else
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index fa86b1170..6d7e4ddb2 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
//= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
//= Lupus, Lord Gywall
//===== Current Version: =====================================
-//= 4.4
+//= 4.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -73,85 +73,34 @@
//= 4.4 Replaced effect numerics with constants. [L0ne_W0lf]
//= 4.5 Corrected an Incorrect check of the Shinokas_Quest. (bugreport:2276) [Samuray22]
//= Replaced effect numerics with constants.
+//= 4.5 Official Gangster Alert script. [Gepard]
//============================================================
-lighthalzen,1,1,7 script sneakAddSuber -1,{
-OnInit:
- set $@sneakchance, 3; // chance of successful sneak(0 = never, 10 = always)
- set $@sneakguard, 0; // numbers of people who sneaked past guard
- set $@threshold, 10; // numbers of sneakers before mob appears
- set $@mob, 50; // Max respawn numbers of "mobsters"
- set $@mobcount, 0; // current numbers of "mobsters"
- set $@lhz_alert, 0; // Alert on Lighthalzen(0 = off, 1 = on)
- set $@i, 0;
-
+// Gangster Alert [Aegis Conversion]
+//------------------------------------------------------------
+lighthalzen,1,1,0 script Law Enforcement -1,{
end;
-OnMinute00:
-OnMinute05:
-OnMinute10:
-OnMinute15:
-OnMinute20:
-OnMinute25:
-OnMinute30:
-OnMinute35:
-OnMinute40:
-OnMinute45:
-OnMinute50:
-OnMinute55:
- if($@lhz_alert == 0) set $@sneakguard, $@sneakguard + rand(1,3);
- if($@lhz_alert == 1) set $@sneakguard, $@sneakguard - 1; // Monsters will die after 5~10 min. (sneakAddSuber)
- end;
-}
-
-lighthalzen,1,1,7 script AlertChk -1,{
-OnInit:
+OnEnable:
+ mapannounce "lighthalzen","Attention, citizens. Our security has been breached and the city is in Gangster Alert status. Please find shelter immediately!",bc_map;
initnpctimer;
+ for (set .@i, 0; .@i < 30; set .@i, .@i + 1)
+ monster "lighthalzen",0,0,"Gangster",1592,1,"Law Enforcement::OnMyMobDead";
end;
-OnTimer10000:
- if($@sneakguard >= $@threshold) goto MakeMob;
- if($@sneakguard == 0) goto ClearMob; // Monsters will die after 5~10 min. (sneakAddSuber)
- setnpctimer 0;
+OnTimer220000:
+ killmonster "lighthalzen","Law Enforcement::OnMyMobDead";
+ mapannounce "lighthalzen","Attention, citizens. Our law enforcement department has successfully contained the situation. Alert status has been canceled.",bc_map;
+ set $@Lhz_Gangster_Alert, 0;
+ stopnpctimer;
end;
-
-MakeMob:
- if($@lhz_alert == 1) goto ChkEnd;
- set $@mobcount, $@mob;
- mapannounce "lighthalzen","Attention, citizens. Our security has been breached and the city is in Gangster Alert status. Please find shelter immediately!", 1;
-
- for( set $@i, 0; $@i < $@mob; set $@i, $@i + 1 ) {
- monster "lighthalzen",0,0,"Gangster",1592,1,"AlertChk::OnMobKilled";
- }
- set $@lhz_alert, 1;
- set $@sneakguard, 2; // Monsters will die after 5~10 min. (sneakAddSuber)
- setnpctimer 0;
- end;
-
-ClearMob:
- if($@lhz_alert == 0) goto ChkEnd;
- set $@mobcount, 0;
- mapannounce "lighthalzen","Attention, citizens. Our law enforcement department has successfully contained the situation. Alert status has been canceled.", 1;
- killmonster "lighthalzen","AlertChk::OnMobKilled";
- set $@lhz_alert, 0;
- set $@sneakguard, 0;
- setnpctimer 0;
+OnMyMobDead:
end;
-
-OnMobKilled:
- set $@mobcount, $@mobcount - 1;
- if($@mobcount == 0) goto ClearMob;
- setnpctimer 0;
- end;
-
-ChkEnd:
- setnpctimer 0;
- end;
}
lighthalzen,267,200,3 script Guard#lhz01 868,{
- if(countitem(7350)>0) {
+ if (countitem(7350) > 0) {
mes "[Guard]";
mes "Hold it right th--!";
mes "Oh. I'm sorry. I didn't";
@@ -161,7 +110,7 @@ lighthalzen,267,200,3 script Guard#lhz01 868,{
warp "lighthalzen",303,229;
end;
}
- else if($@lhz_alert == 1) {
+ if ($@Lhz_Gangster_Alert >= 100) {
mes "[Guard]";
mes "Recently too many people";
mes "have been traveling between";
@@ -171,16 +120,19 @@ lighthalzen,267,200,3 script Guard#lhz01 868,{
mes "so many sneak through us?";
close;
}
- else if ((gettime(2)>00 && gettime(2)<10) || (gettime(2)>30 && gettime(2)<40)) {
- if(rand(1,10) < 2) {
- mes "[Guard]";
- mes "Hold it right there!";
- mes "I can't permit anyone";
- mes "to enter the slums.";
- mes "Go back to where you";
- mes "came from, adventurer!";
- close;
- }
+ if ($@Lhz_Gangster_Alert > 14) {
+ mes "[Guard]";
+ mes "Recently too many people";
+ mes "have been traveling between";
+ mes "Uptown and the ghetto, so";
+ mes "we've heightened security";
+ mes "around here. But how can";
+ mes "so many sneak through us?";
+ donpcevent "Law Enforcement::OnEnable";
+ set $@Lhz_Gangster_Alert, 100;
+ close;
+ }
+ if (gettime(3) >= 22 || gettime(3) < 2) {
mes "[Guard]";
mes "Zzzz... Zzz...";
mes "ZZZzzzzzzzzzz...";
@@ -190,22 +142,32 @@ lighthalzen,267,200,3 script Guard#lhz01 868,{
mes "the perfect opportunity";
mes "to sneak past him.^000000";
close2;
+ set $@Lhz_Gangster_Alert, $@Lhz_Gangster_Alert + 1;
warp "lighthalzen",303,229;
end;
}
- else if(rand(1,10) < 2) {
+ if (rand(1,6) == 3) {
mes "^3355FFThe guard seems distracted";
mes "and is looking elsewhere. Now's";
mes "your chance to sneak past him!^000000";
close2;
- warp "lighthalzen",297,227;
- set $@sneakguard, $@sneakguard + 1;
+ set $@Lhz_Gangster_Alert, $@Lhz_Gangster_Alert + 1;
+ warp "lighthalzen",303,229;
end;
}
+ else {
+ mes "[Guard]";
+ mes "Hold it right there!";
+ mes "I can't permit anyone";
+ mes "to enter the slums.";
+ mes "Go back to where you";
+ mes "came from, adventurer!";
+ close;
+ }
}
lighthalzen,294,223,7 script Guard#lhz02 868,{
- if(countitem(7350)>0) {
+ if (countitem(7350) > 0) {
mes "[Guard]";
mes "Hold it right th--!";
mes "Oh. I'm sorry. I didn't";
@@ -215,7 +177,7 @@ lighthalzen,294,223,7 script Guard#lhz02 868,{
warp "lighthalzen",260,199;
end;
}
- if($@lhz_alert == 1) {
+ if ($@Lhz_Gangster_Alert >= 100) {
mes "[Guard]";
mes "Recently too many people";
mes "have been traveling between";
@@ -225,16 +187,19 @@ lighthalzen,294,223,7 script Guard#lhz02 868,{
mes "so many sneak through us?";
close;
}
- if((gettime(2)>00 && gettime(2)<10) || (gettime(2)>30 && gettime(2)<40)) {
- if(rand(1,10) < 2) {
- mes "[Guard]";
- mes "Hold it right there!";
- mes "I can't permit anyone to";
- mes "enter Uptown Lighthalzen!";
- mes "If you don't have a pass,";
- mes "then move on out of here!";
- close;
- }
+ if ($@Lhz_Gangster_Alert > 14) {
+ mes "[Guard]";
+ mes "Recently too many people";
+ mes "have been traveling between";
+ mes "Uptown and the ghetto, so";
+ mes "we've heightened security";
+ mes "around here. But how can";
+ mes "so many sneak through us?";
+ donpcevent "Law Enforcement::OnEnable";
+ set $@Lhz_Gangster_Alert, 100;
+ close;
+ }
+ if (gettime(3) >= 22 || gettime(3) < 2) {
mes "[Guard]";
mes "Zzzz... Zzz...";
mes "ZZZzzzzzzzzzz...";
@@ -244,18 +209,28 @@ lighthalzen,294,223,7 script Guard#lhz02 868,{
mes "the perfect opportunity";
mes "to sneak past him.^000000";
close2;
- warp "lighthalzen",264,200;
+ set $@Lhz_Gangster_Alert, $@Lhz_Gangster_Alert + 1;
+ warp "lighthalzen",260,199;
end;
}
- else if(rand(1,10) < 2) {
+ if (rand(1,6) == 3) {
mes "^3355FFThe guard seems distracted";
mes "and is looking elsewhere. Now's";
mes "your chance to sneak past him!^000000";
close2;
- warp "lighthalzen",264,200;
- set $@sneakguard, $@sneakguard + 1;
+ set $@Lhz_Gangster_Alert, $@Lhz_Gangster_Alert + 1;
+ warp "lighthalzen",260,199;
end;
}
+ else {
+ mes "[Guard]";
+ mes "Hold it right there!";
+ mes "I can't permit anyone to";
+ mes "enter Uptown Lighthalzen!";
+ mes "If you don't have a pass,";
+ mes "then move on out of here!";
+ close;
+ }
}
//============================================================