Pārlūkot izejas kodu

Fixed #1114
Made Rhydo rune undispellable.
Correct variable type in Old Glast Heim script.
Thanks to @nehpetskie

Jittapan Pluemsumran 9 gadi atpakaļ
vecāks
revīzija
6f0ed156f4
3 mainītis faili ar 10 papildinājumiem un 7 dzēšanām
  1. 6 6
      npc/re/instances/OldGlastHeim.txt
  2. 3 1
      src/map/skill.c
  3. 1 0
      src/map/status.c

+ 6 - 6
npc/re/instances/OldGlastHeim.txt

@@ -1475,12 +1475,12 @@ OnEnable:
 	areamonster .@map$,124,20,31,162,"Fallen Abyss Knight",2470,8,.@label$;
 	areamonster .@map$,124,20,31,162,"Suffering Khalitzburg",2471,8,.@label$;
 	areamonster .@map$,124,20,31,162,"Swollen Knight",2472,8,.@label$;
-	set .MyMobs,80;
+	set 'MyMobs,80;
 	end;
 OnMyMobDead:
 	set .@map$, instance_mapname("2@gl_k");
-	set .MyMobs, .MyMobs-1;
-	if (.MyMobs == 0) {
+	set 'MyMobs, 'MyMobs-1;
+	if ('MyMobs == 0) {
 		mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
 		donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable2";
 		donpcevent instance_npcname("#ghmemorialmob07")+"::OnEnable";
@@ -1584,12 +1584,12 @@ OnEnable:
 	areamonster .@map$,175,163,265,18,"Fallen Abyss Knight",2470,7,.@label$;
 	areamonster .@map$,175,163,265,18,"Suffering Khalitzburg",2471,7,.@label$;
 	areamonster .@map$,175,163,265,18,"Swollen Knight",2472,7,.@label$;
-	set .MyMobs,35;
+	set 'MyMobs,35;
 	end;
 OnMyMobDead:
 	set .@map$, instance_mapname("2@gl_k");
-	set .MyMobs, .MyMobs-1;
-	if (.MyMobs == 0) {
+	set 'MyMobs, 'MyMobs-1;
+	if ('MyMobs == 0) {
 		mapannounce .@map$, "A being with an evil aura seems to be appearing in this region.",bc_map,"0xFFFF00";
 		donpcevent instance_npcname("#ghmemorialmob09")+"::OnEnable";
 		donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";

+ 3 - 1
src/map/skill.c

@@ -7713,7 +7713,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					case SC_REUSE_LIMIT_G:	case SC_REUSE_LIMIT_H:	case SC_REUSE_LIMIT_MTF:
 					case SC_REUSE_LIMIT_ASPD_POTION:	case SC_REUSE_MILLENNIUMSHIELD:	case SC_REUSE_CRUSHSTRIKE:
 					case SC_REUSE_STORMBLAST:	case SC_ALL_RIDING_REUSE_LIMIT:
-					case SC_SPRITEMABLE:		case SC_BITESCAR:
+					case SC_SPRITEMABLE:		case SC_BITESCAR:	case SC_CRUSHSTRIKE:
+					case SC_QUEST_BUFF1:	case SC_QUEST_BUFF2:	case SC_QUEST_BUFF3:
 						continue;
 					//bugreport:4888 these songs may only be dispelled if you're not in their song area anymore
 					case SC_WHISTLE:
@@ -9218,6 +9219,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					case SC_REUSE_LIMIT_ASPD_POTION:	case SC_REUSE_MILLENNIUMSHIELD:	case SC_REUSE_CRUSHSTRIKE:
 					case SC_REUSE_STORMBLAST:	case SC_ALL_RIDING_REUSE_LIMIT:
 					case SC_SPRITEMABLE:
+					case SC_QUEST_BUFF1:	case SC_QUEST_BUFF2:	case SC_QUEST_BUFF3:
 					continue;
 				case SC_ASSUMPTIO:
 					if( bl->type == BL_MOB )

+ 1 - 0
src/map/status.c

@@ -12948,6 +12948,7 @@ void status_change_clear_buffs(struct block_list* bl, uint8 type)
 			case SC_VITALITYACTIVATION:
 			case SC_FIGHTINGSPIRIT:
 			case SC_ABUNDANCE:
+			case SC_CRUSHSTRIKE:
 			case SC_SAVAGE_STEAK:
 			case SC_COCKTAIL_WARG_BLOOD:
 			case SC_MINOR_BBQ: