X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=179a95bb917cbcae12ae83a8095c6028b6548c97;hb=e449f70197479ad384431f4cd1a23d994a8eb928;hp=e4128235f2aece53fd9eb666c84db928668381c1;hpb=c5121d69899c57253362a5a8d98d6a1435a5fb47;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 e4128235f..179a95bb9 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -29,7 +29,7 @@ string WeaponArenaString()
 	s = cvar_string("g_weaponarena");
 	if(s == "0")
 		return "";
-	if(s == "all")
+	if(s == "all" || s == "1")
 		return _("All Weapons Arena");
 	if(s == "most")
 		return _("Most Weapons Arena");
@@ -66,8 +66,8 @@ string XonoticMutatorsDialog_toString(entity me)
 	s = "";
 	if(cvar("g_dodging"))
 		s = strcat(s, ", ", _("Dodging"));
-	if(cvar("g_minstagib"))
-		s = strcat(s, ", ", _("MinstaGib"));
+	if(cvar("g_instagib"))
+		s = strcat(s, ", ", _("InstaGib"));
 	if(cvar("g_new_toys"))
 		s = strcat(s, ", ", _("New Toys"));
 	if(cvar("g_nix"))
@@ -78,9 +78,9 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("Invincible Projectiles"));
 	if(cvar_string("g_weaponarena") != "0")
 		s = strcat(s, ", ", WeaponArenaString());
-	if(cvar("g_start_weapon_laser") == 0)
+	if(cvar("g_balance_blast_weaponstart") == 0)
 		s = strcat(s, ", ", _("No start weapons"));
-	if(cvar("sv_gravity") < 800)
+	if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
 		s = strcat(s, ", ", _("Low gravity"));
 	if(cvar("g_cloaked"))
 		s = strcat(s, ", ", _("Cloaked"));
@@ -102,68 +102,17 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("No powerups"));
 	if(cvar("g_powerups") > 0)
 		s = strcat(s, ", ", _("Powerups"));
+	if(cvar("g_touchexplode") > 0)
+		s = strcat(s, ", ", _("Touch explode"));
 	if(s == "")
 		return ZCTX(_("MUT^None"));
 	else
 		return substring(s, 2, strlen(s) - 2);
 }
 
-
-
-// WARNING: dirty hack. TODO clean this up by putting this behaviour in extra classes.
-void loadCvarsLaserWeaponArenaWeaponButton(entity me)
-{
-	tokenize_console(cvar_string("g_weaponarena"));
-	me.checked = (argv(0) == me.cvarValue);
-}
-
-void saveCvarsLaserWeaponArenaWeaponButton(entity me)
-{
-	string suffix;
-
-	suffix = "";
-	if(me.cvarValue != "laser" && me.cvarValue != "most")
-		if(cvar("menu_weaponarena_with_laser"))
-			suffix = " laser";
-	if(me.checked)
-		cvar_set("g_weaponarena", strcat(me.cvarValue, suffix));
-	else
-		cvar_set("g_weaponarena", me.cvarOffValue);
-}
-
-.void(entity) draw_weaponarena;
-.void(entity) saveCvars_weaponarena;
-void saveCvarsLaserWeaponArenaLaserButton(entity me)
-{
-	// run the old function
-	me.saveCvars_weaponarena(me);
-
-	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser") || (cvar_string("g_weaponarena") == "most"));
-
-	if not(me.disabled)
-	{
-		// check for the laser suffix
-		string s;
-		s = cvar_string("g_weaponarena");
-		if(me.checked && substring(s, strlen(s) - 6, 6) != " laser")
-			s = strcat(s, " laser");
-		else if(!me.checked && substring(s, strlen(s) - 6, 6) == " laser")
-			s = substring(s, 0, strlen(s) - 6);
-		cvar_set("g_weaponarena", s);
-	}
-}
-
-void preDrawLaserWeaponArenaLaserButton(entity me)
-{
-	me.disabled = ((cvar_string("g_weaponarena") == "0") || (cvar_string("g_weaponarena") == "laser") || (cvar_string("g_weaponarena") == "most"));
-	// run the old function
-	me.draw_weaponarena(me);
-}
-// WARNING: end of dirty hack. Do not try this at home.
-
 float checkCompatibility_pinata(entity me)
 {
-	if(cvar("g_minstagib"))
+	if(cvar("g_instagib"))
 		return 0;
 	if(cvar("g_nix"))
 		return 0;
@@ -177,27 +126,43 @@ float checkCompatibility_weaponstay(entity me)
 }
 float checkCompatibility_newtoys(entity me)
 {
-	if(cvar("g_minstagib"))
+	if(cvar("g_instagib"))
 		return 0;
 	if(cvar_string("g_weaponarena") == "most")
 		return 1;
-	if(cvar_string("g_weaponarena") == "all")
+	if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
 		return 1;
 	if(cvar_string("g_weaponarena") != "0")
 		return 0;
 	return 1;
 }
+float checkCompatibility_weaponarena_weapon(entity me)
+{
+	if(cvar("g_instagib"))
+		return 0;
+	if(cvar_string("g_weaponarena") == "most")
+		return 0;
+	if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
+		return 0;
+	if(cvar_string("g_weaponarena") == "0")
+		return 0;
+	if(cvar_string("g_balance_blaster_weaponstart") == "0")
+		return 0;
+	return 1;
+}
 
 void XonoticMutatorsDialog_fill(entity me)
 {
 	entity e, s, w;
 	float i, j;
-	string str, hstr;
 	me.TR(me);
 		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Gameplay mutators:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_dodging", _("Dodging")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_touchexplode", _("Touch explode")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_cloaked", _("Cloaked")));
@@ -207,11 +172,12 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticSlider(10, 50, 1, "g_bloodloss");
 		me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
-			setDependent(e, "g_minstagib", 0, 0);
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.6, s);
@@ -236,6 +202,7 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
@@ -243,6 +210,7 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
@@ -254,58 +222,50 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 
 	me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Weapon arenas:")));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)")));
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)")));
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", "menu_weaponarena", _("Weapon arenas:")));
+			e.getCvarValueFromCvar = TRUE;
+			e.cvarOffValue = "0";
 	for(i = WEP_FIRST, j = 0; i <= WEP_LAST; ++i)
 	{
 		w = get_weaponinfo(i);
 		if(w.spawnflags & WEP_FLAG_HIDDEN)
 			continue;
-		if(j & 1 == 0)
+		if((j & 1) == 0)
 			me.TR(me);
-		str = w.netname;
-		hstr = w.message;
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", strzone(str), strzone(hstr)));
-			e.cvarOffValue = "0";
-			// custom load/save logic that ignores a " laser" suffix, or adds it 
-			e.loadCvars = loadCvarsLaserWeaponArenaWeaponButton;
-			e.saveCvars = saveCvarsLaserWeaponArenaWeaponButton;
-			e.loadCvars(e);
+		me.TD(me, 1, 1.8, e = makeXonoticWeaponarenaCheckBox(strzone(w.netname), strzone(w.message)));
+			setDependentWeird(e, checkCompatibility_weaponarena_weapon);
 		++j;
 	}
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "menu_weaponarena_with_laser", _("with laser")));
-			// hook the draw function to gray it out
-			e.draw_weaponarena = e.draw;
-			e.draw = preDrawLaserWeaponArenaLaserButton;
-			// hook the save function to notify about the cvar
-			e.saveCvars_weaponarena = e.saveCvars;
-			e.saveCvars = saveCvarsLaserWeaponArenaLaserButton;
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", "most", _("Most weapons")));
+			e.cvarOffValue = "0";
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", "all", _("All weapons")));
+			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Special arenas:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", string_null, _("MinstaGib")));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_instagib", "1", _("InstaGib")));
+			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_nix", string_null, _("NIX")));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_nix", "1", _("NIX")));
+			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.6, e = makeXonoticCheckBox(0, "g_nix_with_laser", _("with laser")));
 			setDependent(e, "g_nix", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_weaponarena", "most", _("Most weapons")));
-			e.cvarOffValue = "0";
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", _("No start weapons")));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_balance_blaster_weaponstart", "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_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");
+			makeMulti(e, "g_balance_shotgun_weaponstart g_balance_machinegun_weaponstart g_balance_devastator_weaponstart g_balance_minelayer_weaponstart g_balance_electro_weaponstart g_balance_crylink_weaponstart g_balance_hagar_weaponstart g_balance_porto_weaponstart g_balance_vaporizer_weaponstart g_balance_hook_weaponstart g_balance_rifle_weaponstart g_balance_fireball_weaponstart g_balance_seeker_weaponstart g_balance_tuba_weaponstart g_balance_shockwave_weaponstart g_balance_arc_weaponstart g_balance_vortex_weaponstart g_balance_mortar_weaponstart");
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));