Merge branch 'master' into master

bspconvar_whitelist/bspconvar_custom_whitelist.txt

@@ -432,7 +432,7 @@
 	{
 		sm_gravity										1
 	}
-	"ze_shrek_swamp_v3"
+	"ze_shrek_ultimate_b3"
 	{
 		sv_enablebunnyhopping							1
 	}

stripper/ze_aot_trost_v8_3.cfg

@@ -0,0 +1,13 @@
+;workaround for missing buyzone
+modify:
+{
+	match:
+	{
+		"classname" "logic_auto"
+	}
+	insert:
+	{
+		"OnMapSpawn" "cmdCommandmp_buy_anywhere 10-1"
+		"OnMapSpawn" "cmdCommandmp_buy_anywhere 020-1"
+	}
+}

stripper/ze_ffxiv_wanderers_palace_v6_2z1.cfg

@@ -9,9 +9,27 @@ modify:
 	}
 	insert:
 	{
+		"OnUser1" "!self,Command,sv_airaccelerate 12,0,1"
 		"OnUser1" "!self,Command,say < Map fixed >,10,1"
 	}
 }
+modify:
+{
+	match:
+	{
+		"targetname" "L_Relay"
+	}
+	delete:
+	{
+		"OnTrigger" "!activatorAddOutputOnUser2 Map_SpeedMod:ModifySpeed:1.05:0:-10-1"
+		"OnTrigger" "!activatorAddOutputOnUser3 Map_SpeedMod:ModifySpeed:1.25:0:-10-1"
+	}
+	insert:
+	{
+		"OnTrigger" "!activatorAddOutputOnUser2 Map_SpeedMod:ModifySpeed:1.02:0:-10-1"
+		"OnTrigger" "!activatorAddOutputOnUser3 Map_SpeedMod:ModifySpeed:1.23:0:-10-1"
+	}
+}
 
 ;---------------------
 ;[Map_NukeZone] Fixes
@@ -151,3 +169,213 @@ modify:
 		"OnUser2" "Map_Tone,SetBloomScale,1.00,5,1"
 	}
 }
+
+;--------------------
+;[Dreamland] Changes
+;--------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Trigger_Castle"
+	}
+	delete:
+	{
+		"OnTrigger" "Dreamland_FallInto_CasePickRandom01"
+	}
+}
+modify:
+{
+	match:
+	{
+		"targetname" "Template_Dreamland"
+	}
+	delete:
+	{
+		"OnUser1" "ServerCommandsv_enablebunnyhopping 1121"
+	}
+	insert:
+	{
+		"OnUser1" "ServerCommandsv_airaccelerate 120121"
+	}
+}
+modify:
+{
+	match:
+	{
+		"targetname" "Dream_Breaker_Hurt"
+	}
+	replace:
+	{
+		"damage" "100000"
+	}
+}
+modify:
+{
+	match:
+	{
+		"targetname" "Dreamland_FallInto_Counter"
+	}
+	delete:
+	{
+		"OnUser4" "Temp_Dream_*Kill01"
+	}
+}
+modify:
+{
+	match:
+	{
+		"targetname" "Dream_Chaser2_Main_Hitbox"
+	}
+	delete:
+	{
+		"OnUser4" "Dream_Chaser2_Target_TrainKill01"
+	}
+	insert:
+	{
+		"OnUser4" "Dream_Chaser2_Target_TrainKill0.051"
+	}
+}
+
+;------------------------------
+;[Suzaku_Temp_Interlude] Fixes
+;------------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Suzaku_Temp_Interlude"
+	}
+	delete:
+	{
+		"OnUser1" "!selfKill0.141"
+	}
+	insert:
+	{
+		"OnUser1" "!selfKill131"
+	}
+}
+
+;--------------------------------------
+;[Item_Thunder_Particle_2] Map Balance
+;--------------------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Item_Thunder_Particle_2"
+	}
+	delete:
+	{
+		"OnUser2" "Item_Thunder_HurtDisable301"
+		"OnUser2" "!selfKill30.031"
+	}
+	insert:
+	{
+		"OnUser2" "Item_Thunder_HurtDisable181"
+		"OnUser2" "!selfKill18.031"
+	}
+}
+
+;--------------------------------------
+;[Final_Bahamut_Dive_Push] Map Balance
+;--------------------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Final_Bahamut_Dive_Push"
+	}
+	insert:
+	{
+		"filtername" "Filter_Team_Human"
+	}
+}
+
+
+;--------------------------------
+;[MiniBoss Plume - Garuda] Fixes
+;--------------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Trigger_Hard"
+	}
+	insert:
+	{
+		"OnUser1" "Temp_Maker,AddOutput,targetname Garuda_Rollcall_Maker,1,1"
+	}
+}
+
+;--------------------------
+;[Laser MagicDebuff] Fixes
+;--------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Final_Ultima_Weapon_Laser_Debuff"
+	}
+	delete:
+	{
+		"OnFail" "!activatorAddContextMagicDebuff:10-1"
+	}
+	insert:
+	{
+		"OnFail" "!activatorAddContextMagicDebuff:11-1"
+	}
+}
+
+;------------------------
+;[Light Trigger] Changes
+;------------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Item_Light_Trigger"
+	}
+	delete:
+	{
+		"OnStartTouch" "!activatorSetDamageFilter5-1"
+	}
+	insert:
+	{
+		"OnStartTouch" "!activatorSetDamageFilter3-1"
+	}
+}
+
+;----------------------
+;[Chaos_Water] Changes
+;----------------------
+modify:
+{
+	match:
+	{
+		"targetname" "Chaos_Water"
+	}
+	replace:
+	{
+		"damage" "1000"
+	}
+	delete:
+	{
+		"filtername" "Filter_Team_Human"
+		"OnHurtPlayer" "Boss_Health*Add500-1"
+	}
+}
+modify:
+{
+	match:
+	{
+		"targetname" "Trigger_Refrain"
+		"classname" "trigger_push"
+	}
+	insert:
+	{
+		"OnUser1" "Chaos_Water,AddOutput,OnHurtPlayer Filter_Team_Human:TestActivator::0:-1,5,1"
+		"OnUser1" "Filter_Team_Human,AddOutput,OnFail !activator:AddOutput:origin 0 -10880 336:0:-1,5,1"
+		"OnUser1" "Filter_Team_Human,AddOutput,OnPass Boss_Health*:Add:50:0:-1,5,1"
+	}
+}