X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=ac2d71e4811aed58b51f6954b6e6e04afd29b8e0;hb=77477d386d12b458eaa8dabb23853ef2e391a71a;hp=4390fb910e70bf582f987145fc5cb57bd0c38a67;hpb=04f7d85114bae0e592f9b0ef38d97902ed39f560;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 4390fb910..c908d82d3 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -4,10 +4,10 @@ CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog)
 	METHOD(XonoticMutatorsDialog, fill, void(entity))
 	METHOD(XonoticMutatorsDialog, showNotify, void(entity))
 	METHOD(XonoticMutatorsDialog, close, void(entity))
-	ATTRIB(XonoticMutatorsDialog, title, string, "Mutators")
+	ATTRIB(XonoticMutatorsDialog, title, string, _("Mutators"))
 	ATTRIB(XonoticMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
 	ATTRIB(XonoticMutatorsDialog, intendedWidth, float, 0.9)
-	ATTRIB(XonoticMutatorsDialog, rows, float, 17)
+	ATTRIB(XonoticMutatorsDialog, rows, float, 19)
 	ATTRIB(XonoticMutatorsDialog, columns, float, 6)
 	ATTRIB(XonoticMutatorsDialog, refilterEntity, entity, NULL)
 ENDCLASS(XonoticMutatorsDialog)
@@ -30,9 +30,9 @@ string WeaponArenaString()
 	if(s == "0")
 		return "";
 	if(s == "all")
-		return "All Weapons Arena";
+		return _("All Weapons Arena");
 	if(s == "most")
-		return "Most Weapons Arena";
+		return _("Most Weapons Arena");
 	if(s == weaponarenastring_cvar)
 		return weaponarenastring;
 	if(weaponarenastring)
@@ -53,8 +53,8 @@ string WeaponArenaString()
 				s = strcat(s, " & ", e.message);
 		}
 	}
-	s = strcat(substring(s, 3, strlen(s) - 3), " Arena");
-	
+	s = sprintf(_("%s Arena"), substring(s, 3, strlen(s) - 3));
+
 	weaponarenastring = strzone(s);
 
 	return weaponarenastring;
@@ -65,208 +65,215 @@ string XonoticMutatorsDialog_toString(entity me)
 	string s;
 	s = "";
 	if(cvar("g_dodging"))
-		s = strcat(s, ", Dodging");
+		s = strcat(s, ", ", _("Dodging"));
 	if(cvar("g_minstagib"))
-		s = strcat(s, ", MinstaGib");
+		s = strcat(s, ", ", _("MinstaGib"));
+	if(cvar("g_new_toys"))
+		s = strcat(s, ", ", _("New Toys"));
 	if(cvar("g_nix"))
-		s = strcat(s, ", NIX");
+		s = strcat(s, ", ", _("NIX"));
 	if(cvar("g_rocket_flying"))
-		s = strcat(s, ", 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)
-		s = strcat(s, ", No start weapons");
-	if(cvar("sv_gravity") < 800)
-		s = strcat(s, ", Low gravity");
+		s = strcat(s, ", ", _("No start weapons"));
+	if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
+		s = strcat(s, ", ", _("Low gravity"));
 	if(cvar("g_cloaked"))
-		s = strcat(s, ", Cloaked");
+		s = strcat(s, ", ", _("Cloaked"));
 	if(cvar("g_grappling_hook"))
-		s = strcat(s, ", Hook");
+		s = strcat(s, ", ", _("Hook"));
 	if(cvar("g_midair"))
-		s = strcat(s, ", Midair");
+		s = strcat(s, ", ", _("Midair"));
 	if(cvar("g_vampire"))
-		s = strcat(s, ", Vampire");
+		s = strcat(s, ", ", _("Vampire"));
 	if(cvar("g_pinata"))
-		s = strcat(s, ", Pinata");
+		s = strcat(s, ", ", _("Piñata"));
 	if(cvar("g_weapon_stay"))
-		s = strcat(s, ", Weapons stay");
+		s = strcat(s, ", ", _("Weapons stay"));
 	if(cvar("g_bloodloss") > 0)
-		s = strcat(s, ", Bloodloss");
+		s = strcat(s, ", ", _("Blood loss"));
 	if(cvar("g_jetpack"))
-		s = strcat(s, ", Jet pack");
+		s = strcat(s, ", ", _("Jet pack"));
+	if(cvar("g_overkill"))
+		s = strcat(s, ", ", _("Overkill"));
+	if(cvar("g_powerups") == 0)
+		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 "None";
+		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)
+float checkCompatibility_pinata(entity me)
 {
-	tokenize_console(cvar_string("g_weaponarena"));
-	me.checked = (argv(0) == me.cvarValue);
+	if(cvar("g_minstagib"))
+		return 0;
+	if(cvar("g_nix"))
+		return 0;
+	if(cvar_string("g_weaponarena") != "0")
+		return 0;
+	return 1;
 }
-
-void saveCvarsLaserWeaponArenaWeaponButton(entity me)
+float checkCompatibility_weaponstay(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);
+	return checkCompatibility_pinata(me);
 }
-
-.void(entity) draw_weaponarena;
-.void(entity) saveCvars_weaponarena;
-void saveCvarsLaserWeaponArenaLaserButton(entity me)
+float checkCompatibility_newtoys(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);
-	}
+	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 preDrawLaserWeaponArenaLaserButton(entity me)
+float checkCompatibility_weaponarena_weapon(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);
+	if(cvar("g_minstagib"))
+		return 0;
+	if(cvar_string("g_weaponarena") == "most")
+		return 0;
+	if(cvar_string("g_weaponarena") == "all")
+		return 0;
+	if(cvar_string("g_weaponarena") == "0")
+		return 0;
+	if(cvar_string("g_start_weapon_laser") == "0")
+		return 0;
+	return 1;
 }
-// WARNING: end of dirty hack. Do not try this at home.
-
-
 
 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.TD(me, 1, 2, makeXonoticTextLabel(0, _("Gameplay mutators:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_dodging", "Dodging"));
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_dodging", _("Dodging")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_cloaked", "Cloaked"));
+		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, 2, e = makeXonoticCheckBox(0, "g_midair", "Midair"));
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_cloaked", _("Cloaked")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_vampire", "Vampire"));
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_midair", _("Midair")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
+			setDependent(e, "g_minstagib", 0, 0);
 	me.TR(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"));
+		me.TD(me, 1, 1.8, 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);
+		me.TD(me, 1, 1.6, s);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticSlider(80, 400, 8, "sv_gravity");
 			s.valueDigits = 0;
 			s.valueDisplayMultiplier = 0.125; // show gravity in percent
-		me.TD(me, 1, 2, e = makeXonoticSliderCheckBox(800, 1, s, "Low gravity"));
+		me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(800, 1, s, _("Low gravity")));
 			e.savedValue = 200; // good on silvercity
 	me.TR(me);
 		me.TDempty(me, 0.4);
-		me.TD(me, 1, 1.8, s);
+		me.TD(me, 1, 1.6, s);
 	me.TR(me);
+		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Weapon & item mutators:")));
 	me.TR(me);
-		me.TD(me, 1, 2, makeXonoticTextLabel(0, "Weapon & item mutators:"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_grappling_hook", _("Grappling hook")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_jetpack", _("Jet pack")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_grappling_hook", "Grappling hook"));
+		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+			setDependent(e, "g_minstagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_jetpack", "Jet pack"));
+		me.TD(me, 1, 1.8, 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.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
+			setDependent(e, "g_minstagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_pinata", "Pinata"));
+		me.TD(me, 1, 1.8, 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, 1.8, 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);
-		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, 2, 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, 2, 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, 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.TR(me);
-		me.TD(me, 1, 4, makeXonoticTextLabel(0, "Special arenas:"));
+		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, 2, e = makeXonoticRadioButton(1, "g_minstagib", string_null, "MinstaGib"));
+		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, 2, e = makeXonoticRadioButton(1, "g_nix", string_null, "NIX"));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", "1", _("MinstaGib")));
+			e.cvarOffValue = "0";
 	me.TR(me);
-		me.TDempty(me, 0.4);
-		me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "g_nix_with_laser", "with laser"));
-			setDependent(e, "g_nix", 1, 1);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_overkill", "1", _("Overkill")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "g_weaponarena", "most", "Most weapons"));
+		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, 2, e = makeXonoticRadioButton(1, "g_start_weapon_laser", "0", "No start weapons"));
+		me.TD(me, 1, 1.8, 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_porto g_start_weapon_minstanex g_start_weapon_hook g_start_weapon_hlac g_start_weapon_rifle g_start_weapon_fireball g_start_weapon_seeker g_start_weapon_tuba g_overkill");
 
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0'));
+		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }