X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=2d642728e6be854dcdce36c9aa29ec83a077b1a3;hb=b47667e4835b470b10ac1875c5dddb766ddd16a3;hp=640c28a348242e28290883f6246a8bec7b01e042;hpb=a2aac26e6d660e5e70e65d7639a669bced3de9e2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 640c28a34..2d642728e 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -68,10 +68,14 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("Dodging"));
 	if(cvar("g_minstagib"))
 		s = strcat(s, ", ", _("MinstaGib"));
+	if(cvar("g_new_toys"))
+		s = strcat(s, ", ", _("New Toys"));
 	if(cvar("g_nix"))
 		s = strcat(s, ", ", _("NIX"));
 	if(cvar("g_rocket_flying"))
 		s = strcat(s, ", ", _("Rocket Flying"));
+	if(cvar("g_invincible_projectiles"))
+		s = strcat(s, ", ", _("Invincible Projectiles"));
 	if(cvar_string("g_weaponarena") != "0")
 		s = strcat(s, ", ", WeaponArenaString());
 	if(cvar("g_start_weapon_laser") == 0)
@@ -94,6 +98,10 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("Blood loss"));
 	if(cvar("g_jetpack"))
 		s = strcat(s, ", ", _("Jet pack"));
+	if(cvar("g_powerups") == 0)
+		s = strcat(s, ", ", _("No powerups"));
+	if(cvar("g_powerups") > 0)
+		s = strcat(s, ", ", _("Powerups"));
 	if(s == "")
 		return ZCTX(_("MUT^None"));
 	else
@@ -153,7 +161,32 @@ void preDrawLaserWeaponArenaLaserButton(entity me)
 }
 // WARNING: end of dirty hack. Do not try this at home.
 
-
+float checkCompatibility_pinata(entity me)
+{
+	if(cvar("g_minstagib"))
+		return 0;
+	if(cvar("g_nix"))
+		return 0;
+	if(cvar_string("g_weaponarena") != "0")
+		return 0;
+	return 1;
+}
+float checkCompatibility_weaponstay(entity me)
+{
+	return checkCompatibility_pinata(me);
+}
+float checkCompatibility_newtoys(entity me)
+{
+	if(cvar("g_minstagib"))
+		return 0;
+	if(cvar_string("g_weaponarena") == "most")
+		return 1;
+	if(cvar_string("g_weaponarena") == "all")
+		return 1;
+	if(cvar_string("g_weaponarena") != "0")
+		return 0;
+	return 1;
+}
 
 void XonoticMutatorsDialog_fill(entity me)
 {
@@ -178,6 +211,7 @@ void XonoticMutatorsDialog_fill(entity me)
 		me.TDempty(me, 0.2);
 		s = makeXonoticSlider(10, 50, 1, "g_bloodloss");
 		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
+			setDependent(e, "g_minstagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.8, s);
@@ -191,7 +225,6 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.8, s);
-	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Weapon & item mutators:")));
 	me.TR(me);
@@ -200,15 +233,24 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
+			setDependentWeird(e, checkCompatibility_newtoys);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
+			setDependentWeird(e, checkCompatibility_pinata);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(2, 0, "g_weapon_stay", _("Weapons stay")));
+		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_weapon_stay", _("Weapons stay")));
+			setDependentWeird(e, checkCompatibility_weaponstay);
 	me.TR(me);
 
 	me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
@@ -263,7 +305,7 @@ void XonoticMutatorsDialog_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", _("No start weapons")));
 			e.cvarOffValue = "-1";
-			makeMulti(e, "g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_minelayer g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_sniperrifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba g_start_weapon_minelayer");
+			makeMulti(e, "g_start_weapon_shotgun g_start_weapon_uzi g_start_weapon_grenadelauncher g_start_weapon_minelayer g_start_weapon_electro g_start_weapon_crylink g_start_weapon_nex g_start_weapon_hagar g_start_weapon_rocketlauncher g_start_weapon_rifle g_start_weapon_hlac g_start_weapon_seeker g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_porto g_start_weapon_tuba g_start_weapon_minelayer");
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));