summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt2
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/battleground/flavius/flavius02.txt11
-rw-r--r--npc/battleground/kvm/kvm01.txt4
-rw-r--r--npc/battleground/kvm/kvm02.txt4
-rw-r--r--npc/battleground/kvm/kvm03.txt4
-rw-r--r--npc/battleground/tierra/tierra01.txt16
-rw-r--r--npc/battleground/tierra/tierra02.txt17
-rw-r--r--npc/guild2/arug_cas05.txt7
-rw-r--r--sql-files/item_db.sql2
11 files changed, 27 insertions, 46 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 668c84103..c4521f3c4 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,8 @@
1475 Equestrian's Spear: NEED INFO.
13005 Angelic Wing Dagger: NEED INFO.
=======================
+2010/08/20
+ * Rev. 13485 Fixed kRO Name for Women's Bundle. (bugreport:4398) [L0ne_W0lf]
2010/08/18
* Rev. 14381 Updated Asprika to use new bonus3 bSubEle. [L0ne_W0lf]
2010/08/16
diff --git a/db/item_db.txt b/db/item_db.txt
index bb5cfa7cf..0bfb1e327 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -4307,7 +4307,7 @@
12133,Ice_Cream_,McDonald's Ice Cone,0,0,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(5) != MDiceCone) { set MDiceCone,gettime(5); percentheal 50,50; } },{},{}
12134,Red_Envelope,Red Envelope,2,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); },{},{}
12135,Green_Ale,Green Ale,2,20,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; if(rand(100) >= 90)sc_start SC_Confusion,10000,0; },{},{}
-12136,Womení»s_Bundle,Women's Bundle,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem callfunc("F_RandMes",4,558,529,2668,7518),1; },{},{}
+12136,Women's_Bundle,Women's Bundle,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem callfunc("F_RandMes",4,558,529,2668,7518),1; },{},{}
12137,1st_Stage_Prize,First Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12138,2nd_Stage_Prize,Second Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12139,3rd_Stage_Prize,Third Stage Prize,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 5d3ce50c7..be5974fdb 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2010/08/20
+ * Rev. 14385 Fixed wrong events being called for flavius02 BG waiting rooms. (bugreport:4395) [L0ne_W0lf]
+ * Fixed the setwalls in Tierra gorge, again. Removed extra mapflags.
+ * Moved overlapping guild flags outside arug_cas05 to proper points.
2010/08/18
* Rev. 14380 Fixed level 4 weapon quest deleting wrong items. (bugreport:4390) [L0ne_W0lf]
2010/08/16
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 4dd47b7af..b1e6a085b 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= - Losing Team: 3 badge
//===== Additional Comments: =================================
//= 1.0 First Version.
+//= 1.1 Fixed NPCs being called for waiting rooms. (bugreport:4395)
//============================================================
// Waiting Room NPCs
@@ -76,8 +77,8 @@ OnInit:
OnReadyCheck:
if( $@FlaviusBG2 )
end;
- set .@Guillaume, getwaitingroomstate(0,"Lieutenant Ator");
- set .@Croix, getwaitingroomstate(0,"Lieutenant Thelokus");
+ set .@Guillaume, getwaitingroomstate(0,"Lieutenant Huvas");
+ set .@Croix, getwaitingroomstate(0,"Lieutenant Yukon");
if( !.@Guillaume && !.@Croix ) {
donpcevent "#bat_b02_timer::OnStop";
end;
@@ -90,8 +91,8 @@ OnReadyCheck:
set $@Guill_ScoreBG2, 0;
bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2;
- donpcevent "Lieutenant Ator::OnEnterBG";
- donpcevent "Lieutenant Thelokus::OnEnterBG";
+ donpcevent "Lieutenant Huvas::OnEnterBG";
+ donpcevent "Lieutenant Yukon::OnEnterBG";
donpcevent "OBJ#bat_b02_a::Onkill";
donpcevent "OBJ#bat_b02_a::OnEnable";
donpcevent "OBJ#bat_b02_b::Onkill";
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 1b8f3cb6c..f58e34f04 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -430,7 +430,3 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 415,{
}
end;
}
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index 11a1c3d47..273ff8c78 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -427,7 +427,3 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 415,{
}
end;
}
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index ab30a6708..c01b0162b 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -429,7 +429,3 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 415,{
}
end;
}
-
-// MapFlags
-//============================================================
-
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index bd351b7ea..5c911605d 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= - Losing Team: 1 badge
//===== Additional Comments: =================================
//= 1.0 First Version.
+//= 1.1 Corrected setwalls for barricades. [L0ne_W0lf]
//============================================================
// Waiting Room NPCs
@@ -197,7 +198,7 @@ bat_a01,15,18,3 script barricade#bat_a01_a 844,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
- setwall "bat_a01",185,265,16,6,1,"bat_a01_c1";
+ setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
end;
Onkill:
@@ -219,7 +220,7 @@ bat_a01,15,19,3 script barricade#bat_a01_b 844,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
- setwall "bat_a01",169,130,16,6,1,"bat_a01_g1";
+ setwall "bat_a01",170,129,16,6,1,"bat_a01_g1";
end;
Onkill:
@@ -943,12 +944,3 @@ bat_a01,1,1,3 script Release all#a01 81,{
}
*/
-bat_a01 mapflag battleground
-bat_a01 mapflag nomemo
-bat_a01 mapflag nosave SavePoint
-bat_a01 mapflag noteleport
-bat_a01 mapflag nowarp
-bat_a01 mapflag nowarpto
-bat_a01 mapflag noreturn
-bat_a01 mapflag nobranch
-bat_a01 mapflag nopenalty
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index d09aa492f..0fb3c631e 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -197,7 +197,7 @@ bat_a02,15,18,3 script barricade#bat_a02_a 844,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
- setwall "bat_a02",185,265,16,6,1,"bat_a02_c1";
+ setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
end;
Onkill:
@@ -219,7 +219,7 @@ bat_a02,15,19,3 script barricade#bat_a02_b 844,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
- setwall "bat_a02",169,130,16,6,1,"bat_a02_g1";
+ setwall "bat_a02",170,129,16,6,1,"bat_a02_g1";
end;
Onkill:
@@ -762,6 +762,7 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 419,{
}
}
}
+ bg_leave;
warp "bat_room",154,150;
end;
@@ -855,6 +856,7 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 415,{
}
}
}
+ bg_leave;
warp "bat_room",154,150;
end;
@@ -940,13 +942,4 @@ bat_a02,1,1,3 script Release all#a02 81,{
}
}
*/
-
-bat_a02 mapflag battleground
-bat_a02 mapflag nomemo
-bat_a02 mapflag nosave SavePoint
-bat_a02 mapflag noteleport
-bat_a02 mapflag nowarp
-bat_a02 mapflag nowarpto
-bat_a02 mapflag noreturn
-bat_a02 mapflag nobranch
-bat_a02 mapflag nopenalty
+ \ No newline at end of file
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 0ff49830e..4c4f4334d 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -25,6 +25,7 @@
//= 2.0 Fixed eco/def not actually incrementing. [L0ne_W0lf]
//= Can no longer gain eco/def higher than 100.
//= 2.1 Fixed setcell extending more than it should on 3rd barricade. (bugreport:4323) [L0ne_W0lf]
+//= 2.2 Fixed exterior flag placements. [L0ne_W0lf]
//============================================================
arug_cas05,1,1,0 script Manager#aru05_02 111,{
@@ -2921,7 +2922,7 @@ OnRecvCastlear05:
aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 722
-aru_gld,289,103,6 script Banadis#flag_ar05_3::ar05_Flag2 722,{
+aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 722,{
set .@GID, GetCastleData("arug_cas05",1);
if (.@GID == 0) {
mes "[ Arunafeltz Royal Edict ]";
@@ -2955,4 +2956,4 @@ OnRecvCastlear05:
end;
}
-aru_gld,289,112,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 722
+aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 722
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 0bcaf8d55..d080f38b9 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -4338,7 +4338,7 @@ REPLACE INTO `item_db` VALUES (12132,'Red_Bag','Santa\'s Bag',2,0,NULL,200,NULL,
REPLACE INTO `item_db` VALUES (12133,'Ice_Cream_','McDonald\'s Ice Cone',0,0,NULL,80,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(gettime(5) != MDiceCone) { set MDiceCone,gettime(5); percentheal 50,50; }',NULL,NULL);
REPLACE INTO `item_db` VALUES (12134,'Red_Envelope','Red Envelope',2,1,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'set Zeny,Zeny+rand(1000,10000);',NULL,NULL);
REPLACE INTO `item_db` VALUES (12135,'Green_Ale','Green Ale',2,20,NULL,30,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'percentheal 50,50; if(rand(100) >= 90)sc_start SC_Confusion,10000,0;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12136,'Womení»s_Bundle','Women\'s Bundle',2,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc(\"F_RandMes\",4,558,529,2668,7518),1;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12136,'Women\'s_Bundle','Women\'s Bundle',2,0,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc(\"F_RandMes\",4,558,529,2668,7518),1;',NULL,NULL);
REPLACE INTO `item_db` VALUES (12137,'1st_Stage_Prize','First Stage Prize',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12138,'2nd_Stage_Prize','Second Stage Prize',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (12139,'3rd_Stage_Prize','Third Stage Prize',2,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-03 23:38:02 +0000