Browse Source

The mobs shouldn't be killed when the emperium is broken. Thanks @cydh

Atemo 8 years ago
parent
commit
bbb2945858
1 changed files with 47 additions and 49 deletions
  1. 47 49
      npc/re/woe_te/main_TE.txt

+ 47 - 49
npc/re/woe_te/main_TE.txt

@@ -23,54 +23,52 @@ OnAgitInit3:
 	if (.@guild_id == 0) {
 		killmonster .@map$, .@npc_name$ +"::OnMyMobDead";
 		donpcevent strnpcinfo(0)+"::OnEmpSpawn";
-		if (agitcheck3() == 0) {// we currently remove monsters OnAgitStart3
-			if (compare(.@map$,"te_aldecas")) {
-				monster .@map$,0,0,"Evil Druid",1117,10,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Khalitzburg",1132,4,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Abysmal Knight",1219,2,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Executioner",1205,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Penomena",1216,10,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Alarm",1193,18,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Clock",1269,9,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Raydric Archer",1276,7,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Wanderer",1208,3,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Alice",1275,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Bloody Knight",1268,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Dark Lord",1272,1,.@npc_name$ +"::OnMyMobDead";
-				if (.@map$ == "te_aldecas1") { setarray .@emproom[0],216,23; }
-				else if (.@map$ == "te_aldecas2") { setarray .@emproom[0],213,23; }
-				else if (.@map$ == "te_aldecas3") { setarray .@emproom[0],205,31; }
-				else if (.@map$ == "te_aldecas4") { setarray .@emproom[0],36,217; }
-				else if (.@map$ == "te_aldecas5") { setarray .@emproom[0],27,101; }
-				monster .@map$,.@emproom[0],.@emproom[1],"Dark Lord",1272,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Tower Keeper",1270,4,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Bloody Knight",1268,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Abysmal Knight",1219,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
-			}
-			else if (compare(.@map$,"te_prtcas")) {
-				monster .@map$,0,0,"Raydric",1163,10,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Khalitzburg",1132,10,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Abysmal Knight",1219,5,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Bloody Knight",1268,5,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Stormy Knight",1251,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Hatii",1252,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Gryphon",1259,2,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Chimera",1283,2,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Alice",1275,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,0,0,"Zealotus",1200,1,.@npc_name$ +"::OnMyMobDead";
-				if (.@map$ == "te_prtcas01") { setarray .@emproom[0],197,197; }
-				else if (.@map$ == "te_prtcas02") { setarray .@emproom[0],157,174; }
-				else if (.@map$ == "te_prtcas03") { setarray .@emproom[0],16,220; }
-				else if (.@map$ == "te_prtcas04") { setarray .@emproom[0],291,14; }
-				else if (.@map$ == "te_prtcas05") { setarray .@emproom[0],266,266; }
-				monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1268,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Chief Guardian Knight of Emperium",1251,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Hatii",1252,1,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1219,2,.@npc_name$ +"::OnMyMobDead";
-				monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
-			}
+		if (compare(.@map$,"te_aldecas")) {
+			monster .@map$,0,0,"Evil Druid",1117,10,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Khalitzburg",1132,4,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Abysmal Knight",1219,2,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Executioner",1205,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Penomena",1216,10,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Alarm",1193,18,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Clock",1269,9,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Raydric Archer",1276,7,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Wanderer",1208,3,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Alice",1275,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Bloody Knight",1268,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Dark Lord",1272,1,.@npc_name$ +"::OnMyMobDead";
+			if (.@map$ == "te_aldecas1") { setarray .@emproom[0],216,23; }
+			else if (.@map$ == "te_aldecas2") { setarray .@emproom[0],213,23; }
+			else if (.@map$ == "te_aldecas3") { setarray .@emproom[0],205,31; }
+			else if (.@map$ == "te_aldecas4") { setarray .@emproom[0],36,217; }
+			else if (.@map$ == "te_aldecas5") { setarray .@emproom[0],27,101; }
+			monster .@map$,.@emproom[0],.@emproom[1],"Dark Lord",1272,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Tower Keeper",1270,4,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Bloody Knight",1268,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Abysmal Knight",1219,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
+		}
+		else if (compare(.@map$,"te_prtcas")) {
+			monster .@map$,0,0,"Raydric",1163,10,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Khalitzburg",1132,10,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Abysmal Knight",1219,5,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Bloody Knight",1268,5,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Stormy Knight",1251,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Hatii",1252,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Gryphon",1259,2,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Chimera",1283,2,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Alice",1275,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,0,0,"Zealotus",1200,1,.@npc_name$ +"::OnMyMobDead";
+			if (.@map$ == "te_prtcas01") { setarray .@emproom[0],197,197; }
+			else if (.@map$ == "te_prtcas02") { setarray .@emproom[0],157,174; }
+			else if (.@map$ == "te_prtcas03") { setarray .@emproom[0],16,220; }
+			else if (.@map$ == "te_prtcas04") { setarray .@emproom[0],291,14; }
+			else if (.@map$ == "te_prtcas05") { setarray .@emproom[0],266,266; }
+			monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1268,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Chief Guardian Knight of Emperium",1251,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Hatii",1252,1,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1219,2,.@npc_name$ +"::OnMyMobDead";
+			monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
 		}
 		disablenpc "Kafra Staff#"+ .@map$;
 	}
@@ -115,7 +113,7 @@ OnAgitStart3:
 	.@map$ = strnpcinfo(4);
 	if (.@map$ == "") end;
 	if (agitcheck3()) {
-		maprespawnguildid .@map$, getcastledata(.@map$,1),6;// warp all non-guild members and remove monsters (like woe fe)
+		maprespawnguildid .@map$, getcastledata(.@map$,1),2;// warp all non-guild members
 		gvgon3 .@map$;
 		donpcevent strnpcinfo(0)+"::OnEmpSpawn";
 		callsub S_Message,"OnCommandOn";