X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=d0a8f6bc76a199ca49e1091fd1a4351b0f38f2e2;hb=2c3d9f6a5a8c286aac7ca0d5192225d39532297f;hp=a2d7bc29da63b4a7667a4241704a8924883bcefd;hpb=14401d27dcc6eeb85c80331c242dcbb3e1d977d7;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 a2d7bc29d..d0a8f6bc7 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -7,7 +7,7 @@ CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog) 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) @@ -54,7 +54,7 @@ string WeaponArenaString() } } s = sprintf(_("%s Arena"), substring(s, 3, strlen(s) - 3)); - + weaponarenastring = strzone(s); return weaponarenastring; @@ -102,65 +102,14 @@ 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")) @@ -183,7 +132,21 @@ float checkCompatibility_newtoys(entity me) return 1; if(cvar_string("g_weaponarena") == "all") return 1; - if(cvar_string("g_weaponarena") != "") + if(cvar_string("g_weaponarena") != "0") + return 0; + return 1; +} +float checkCompatibility_weaponarena_weapon(entity 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; } @@ -192,72 +155,78 @@ 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, 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.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_grappling_hook", _("Grappling hook"))); 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_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.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_new_toys", _("New Toys"))); + 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", _("Piñata"))); + 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 = makeXonoticCheckBox(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.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 2, e = makeXonoticRadioButton(1, string_null, string_null, _("Regular (no arena)"))); + me.TR(me); + 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); @@ -265,47 +234,38 @@ void XonoticMutatorsDialog_fill(entity me) continue; 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.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, 2, e = makeXonoticRadioButton(1, "g_minstagib", string_null, _("MinstaGib"))); + me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", "1", _("MinstaGib"))); + e.cvarOffValue = "0"; 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_nix", "1", _("NIX"))); + 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"))); + 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_weaponarena", "most", _("Most weapons"))); - e.cvarOffValue = "0"; - 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_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_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"); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));