Merge branch 'woe_te-restrictions' of https://github.com/rathena/rathena into woe_te-restrictions

db/pre-re/skill_nocast_db.txt

@@ -100,26 +100,6 @@
 488,3	//CG_HERMODE
 3013,3	//KO_KYOUGAKU
 
-//----------------------------------------------------------------------------
-// Restircted in WOE:TE maps
-//----------------------------------------------------------------------------
-26,16	//AL_TELEPORT
-27,16	//AL_WARP
-87,16	//WZ_ICEWALL
-150,16	//TF_BACKSLIDING
-219,16	//RG_INTIMIDATE
-336,16	//WE_CALLPARTNER
-361,16	//HP_ASSUMPTIO
-362,16	//HP_BASILICA
-395,16	//CG_MOONLIT
-409,16	//WE_CALLPARENT
-410,16	//WE_CALLBABY
-491,16	//CR_CULTIVATION
-530,16	//NJ_KIRIKAGE
-691,16	//CASH_ASSUMPTIO
-2284,16	//SC_FATALMENACE
-2300,16	//SC_DIMENSIONDOOR
-
 //----------------------------------------------------------------------------
 // Zone 1 - Aldebaran Turbo Track
 //----------------------------------------------------------------------------

db/re/skill_nocast_db.txt

@@ -100,7 +100,7 @@
 3013,3	//KO_KYOUGAKU
 
 //----------------------------------------------------------------------------
-// Restircted in WOE:TE Castles
+// Restricted in WOE:TE Castles
 //----------------------------------------------------------------------------
 26,16	// AL_TELEPORT
 27,16	// AL_WARP

doc/script_commands.txt

@@ -4126,6 +4126,14 @@ job (for example, if you try to get the baby version of a Taekwon class).
 
 ---------------------------------------
 
+*canParticipateSiegeTE([<char_id>]);
+
+Returns 1 if player is allowed to participate in Siege/WOE TE.
+Player with 3rd classes, Kagerou/Oboro, and Rebellion cannot participate,
+the return value is 0.
+
+---------------------------------------
+
 *changebase <job ID number>{,<account ID>};
 
 This command will change a character's appearance to that of the specified job

npc/mapflag/gvg.txt

@@ -12,6 +12,7 @@
 //= gvg: Turns on GvG mode.
 //= gvg_castle: Describes castle maps for WoE.
 //= gvg_dungeon: Describes dungeon maps for WoE.
+//= gvg_te: Turns on GvG mode for WoE:TE.
 //= gvg_te_castle: Describes castle maps for WoE:TE.
 //===== Additional Comments: ================================= 
 //= 1.1 Added Novice Guild Castles.

npc/re/mapflag/gvg.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: ========================================= 
@@ -12,9 +12,11 @@
 //= gvg: Turns on GvG mode.
 //= gvg_castle: Describes castle maps for WoE.
 //= gvg_dungeon: Describes dungeon maps for WoE.
+//= gvg_te: Turns on GvG mode for WoE:TE.
 //= gvg_te_castle: Describes castle maps for WoE:TE.
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
+//= 1.1 Added GVG TE Castles. [Cydh]
 //============================================================
 
 // Guild Dungeons =========

npc/re/mapflag/nomemo.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Also disables marriage warp skills.
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
+//= 1.1 Added GVG TE Maps. [Cydh]
 //============================================================
 
 // Episode 13 ====================
@@ -137,3 +138,5 @@ te_aldecas2	mapflag	nomemo
 te_aldecas3	mapflag	nomemo
 te_aldecas4	mapflag	nomemo
 te_aldecas5	mapflag	nomemo
+teg_dun01	mapflag	nomemo
+teg_dun02	mapflag	nomemo

npc/re/mapflag/nosave.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= to the map specified in the last field, or "SavePoint".
 //===== Additional Comments: ================================= 
 //= 1.0 Renewal split. [Euphy]
+//= 1.1 Added GVG TE Guild Dungeons. [Cydh]
 //============================================================
 
 // Job Quests ====================
@@ -43,6 +44,8 @@ gld2_ald	mapflag	nosave	SavePoint
 gld2_gef	mapflag	nosave	SavePoint
 gld2_pay	mapflag	nosave	SavePoint
 gld2_prt	mapflag	nosave	SavePoint
+teg_dun01	mapflag	nosave	SavePoint
+teg_dun02	mapflag	nosave	SavePoint
 
 // Misty Forest Labyrinth =========
 1@mist	mapflag	nosave	SavePoint

npc/re/mapflag/restricted.txt

@@ -41,37 +41,3 @@ mora	mapflag	restricted	7
 // Restricted maps for WOE:TE Items ==
 teg_dun01	mapflag	restricted	8
 teg_dun02	mapflag	restricted	8
-//aldeg_cas01	mapflag	restricted	8
-//aldeg_cas02	mapflag	restricted	8
-//aldeg_cas03	mapflag	restricted	8
-//aldeg_cas04	mapflag	restricted	8
-//aldeg_cas05	mapflag	restricted	8
-//gefg_cas01	mapflag	restricted	8
-//gefg_cas02	mapflag	restricted	8
-//gefg_cas03	mapflag	restricted	8
-//gefg_cas04	mapflag	restricted	8
-//gefg_cas05	mapflag	restricted	8
-//payg_cas01	mapflag	restricted	8
-//payg_cas02	mapflag	restricted	8
-//payg_cas03	mapflag	restricted	8
-//payg_cas04	mapflag	restricted	8
-//payg_cas05	mapflag	restricted	8
-//prtg_cas01	mapflag	restricted	8
-//prtg_cas02	mapflag	restricted	8
-//prtg_cas03	mapflag	restricted	8
-//prtg_cas04	mapflag	restricted	8
-//prtg_cas05	mapflag	restricted	8
-//schg_cas01	mapflag	restricted	8
-//schg_cas02	mapflag	restricted	8
-//schg_cas03	mapflag	restricted	8
-//schg_cas04	mapflag	restricted	8
-//schg_cas05	mapflag	restricted	8
-//arug_cas01	mapflag	restricted	8
-//arug_cas02	mapflag	restricted	8
-//arug_cas03	mapflag	restricted	8
-//arug_cas04	mapflag	restricted	8
-//arug_cas05	mapflag	restricted	8
-//gld2_ald	mapflag	restricted	8
-//gld2_gef	mapflag	restricted	8
-//gld2_pay	mapflag	restricted	8
-//gld2_prt	mapflag	restricted	8

src/map/pc.c

@@ -11895,7 +11895,7 @@ void pc_show_questinfo_reinit(struct map_session_data *sd) {
 
 /**
  * Check if player can participate in WOE:TE
- * @param sd
+ * @param mapid Player's class @see enum e_mapid
  * @return True:If allowed, False:Doesn't
  **/
 bool pc_canParticipateSiegeTE(uint32 mapid) {

src/map/script.c

@@ -363,7 +363,7 @@ enum {
 	MF_NOTOMB,
 	MF_SKILL_DAMAGE,	//60
 	MF_GVG_TE_CASTLE,
-	MF_GVG_TE_DUNGEON,
+	MF_GVG_TE,
 };
 
 const char* script_op2name(int op)
@@ -11800,6 +11800,7 @@ BUILDIN_FUNC(getmapflag)
 			case MF_NOLOCKON:			script_pushint(st,map[m].flag.nolockon); break;
 			case MF_NOTOMB:				script_pushint(st,map[m].flag.notomb); break;
 			case MF_GVG_TE_CASTLE:		script_pushint(st,map[m].flag.gvg_te_castle); break;
+			case MF_GVG_TE:				script_pushint(st,map[m].flag.gvg_te); break;
 #ifdef ADJUST_SKILL_DAMAGE
 			case MF_SKILL_DAMAGE:
 				{
@@ -11924,6 +11925,16 @@ BUILDIN_FUNC(setmapflag)
 			case MF_NOLOCKON:			map[m].flag.nolockon = 1 ; break;
 			case MF_NOTOMB:				map[m].flag.notomb = 1; break;
 			case MF_GVG_TE_CASTLE:		map[m].flag.gvg_te_castle = 1; break;
+			case MF_GVG_TE:
+				{
+					struct block_list bl;
+					map[m].flag.gvg_te = 1;
+					clif_map_property_mapall(m, MAPPROPERTY_AGITZONE);
+					bl.type = BL_NUL;
+					bl.m = m;
+					clif_maptypeproperty2(&bl,ALL_SAMEMAP);
+				}
+				break;
 #ifdef ADJUST_SKILL_DAMAGE
 			case MF_SKILL_DAMAGE:
 				{
@@ -12036,6 +12047,16 @@ BUILDIN_FUNC(removemapflag)
 			case MF_NOLOCKON:			map[m].flag.nolockon = 0 ; break;
 			case MF_NOTOMB:				map[m].flag.notomb = 0; break;
 			case MF_GVG_TE_CASTLE:		map[m].flag.gvg_te_castle = 0; break;
+			case MF_GVG_TE:
+				{
+					struct block_list bl;
+					bl.type = BL_NUL;
+					bl.m = m;
+					map[m].flag.gvg_te = 0;
+					clif_map_property_mapall(m, MAPPROPERTY_NOTHING);
+					clif_maptypeproperty2(&bl,ALL_SAMEMAP);
+				}
+				break;
 #ifdef ADJUST_SKILL_DAMAGE
 			case MF_SKILL_DAMAGE:
 				{

src/map/script_constants.h

@@ -393,6 +393,8 @@
 	export_constant(MF_NOLOCKON);
 	export_constant(MF_NOTOMB);
 	export_constant(MF_SKILL_DAMAGE);
+	export_constant(MF_GVG_TE_CASTLE);
+	export_constant(MF_GVG_TE);
 
 	/* setcell types */
 	export_constant(CELL_WALKABLE);