From 6e5643cecfb66a8bcb8674f813626e0fefbbcde2 Mon Sep 17 00:00:00 2001 From: nyov Date: Sun, 16 Nov 2014 04:43:08 +0000 Subject: [PATCH] Renaming MinstaGib mode to InstaGib, as per xonvote (#31) --- common.ast.po | 6 +- common.be.po | 10 +- common.bg.po | 6 +- common.ca.po | 6 +- common.cs.po | 6 +- common.de.po | 12 +- common.el.po | 6 +- common.es.po | 10 +- common.fi.po | 10 +- common.fr.po | 12 +- common.hu.po | 10 +- common.it.po | 12 +- common.mk.po | 6 +- common.nl.po | 10 +- common.pl.po | 6 +- common.pot | 6 +- common.pt.po | 10 +- common.ro.po | 10 +- common.ru.po | 12 +- common.sr.po | 6 +- common.sv.po | 10 +- common.uk.po | 10 +- common.zh_CN.po | 6 +- common.zh_TW.po | 6 +- defaultXonotic.cfg | 2 +- mutators.cfg | 14 +- notifications.cfg | 6 +- qcsrc/client/scoreboard.qc | 6 +- qcsrc/common/mapinfo.qc | 2 +- qcsrc/common/mapinfo.qh | 2 +- qcsrc/common/notifications.qh | 6 +- .../dialog_multiplayer_create_mapinfo.c | 2 +- .../dialog_multiplayer_create_mutators.c | 20 +-- qcsrc/menu/xonotic/serverlist.c | 9 +- qcsrc/server/autocvars.qh | 10 +- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/defs.qh | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_world.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/mutator_buffs.qc | 6 +- ...tator_minstagib.qc => mutator_instagib.qc} | 156 +++++++++--------- qcsrc/server/mutators/mutators.qc | 18 +- qcsrc/server/mutators/mutators.qh | 2 +- qcsrc/server/mutators/mutators_include.qc | 2 +- qcsrc/server/t_plats.qc | 2 +- qcsrc/server/tturrets/units/unit_plasma.qc | 2 +- qcsrc/server/w_minstanex.qc | 8 +- tooltips.db | 2 +- tooltips.db.de | 2 +- tooltips.db.es | 2 +- tooltips.db.fr | 2 +- tooltips.db.hu | 2 +- tooltips.db.it | 2 +- tooltips.db.ru | 2 +- tooltips.db.uk | 2 +- 56 files changed, 253 insertions(+), 252 deletions(-) rename qcsrc/server/mutators/{mutator_minstagib.qc => mutator_instagib.qc} (66%) diff --git a/common.ast.po b/common.ast.po index 89e4680d3..bc99aa60a 100644 --- a/common.ast.po +++ b/common.ast.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.be.po b/common.be.po index afe2a535c..7f97286bf 100644 --- a/common.be.po +++ b/common.be.po @@ -4212,8 +4212,8 @@ msgid "Full item placement" msgstr "Са зброяй" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Толькі MinstaGib" +msgid "InstaGib only" +msgstr "Толькі InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4264,8 +4264,8 @@ msgstr "Ухіленне" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6147,7 +6147,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.bg.po b/common.bg.po index 34978b5fb..d363d0d4d 100644 --- a/common.bg.po +++ b/common.bg.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.ca.po b/common.ca.po index b47984f44..6297eaebd 100644 --- a/common.ca.po +++ b/common.ca.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.cs.po b/common.cs.po index 639a44085..f153765e6 100644 --- a/common.cs.po +++ b/common.cs.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.de.po b/common.de.po index b51d4170e..cb5a224fb 100644 --- a/common.de.po +++ b/common.de.po @@ -4332,8 +4332,8 @@ msgid "Full item placement" msgstr "Mit allen Items" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Nur MinstaGib" +msgid "InstaGib only" +msgstr "Nur InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4384,8 +4384,8 @@ msgstr "Ausweichen" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6268,8 +6268,8 @@ msgid "SLCAT^Overkill Mode" msgstr "SLCAT^Overkill Modus" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" -msgstr "SLCAT^MinstaGib Modus" +msgid "SLCAT^InstaGib Mode" +msgstr "SLCAT^InstaGib Modus" #: qcsrc/menu/xonotic/serverlist.c:156 msgid "SLCAT^Defrag Mode" diff --git a/common.el.po b/common.el.po index 6b830eab9..212df32ac 100644 --- a/common.el.po +++ b/common.el.po @@ -4202,7 +4202,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4254,7 +4254,7 @@ msgstr "Υπεκφυγή" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6134,7 +6134,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.es.po b/common.es.po index a3953b4a7..ac4675db8 100644 --- a/common.es.po +++ b/common.es.po @@ -4248,8 +4248,8 @@ msgid "Full item placement" msgstr "Con objetos" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Sólo MinstaGib" +msgid "InstaGib only" +msgstr "Sólo InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4300,8 +4300,8 @@ msgstr "Esquivar" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6185,7 +6185,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.fi.po b/common.fi.po index 17fb34727..70797fa56 100644 --- a/common.fi.po +++ b/common.fi.po @@ -4202,8 +4202,8 @@ msgid "Full item placement" msgstr "Esineiden täysi sijoittaminen" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Vain MinstaGib" +msgid "InstaGib only" +msgstr "Vain InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4254,8 +4254,8 @@ msgstr "Väistely" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6139,7 +6139,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.fr.po b/common.fr.po index a8909ffab..58ebba378 100644 --- a/common.fr.po +++ b/common.fr.po @@ -4362,8 +4362,8 @@ msgid "Full item placement" msgstr "Placement complet des objets" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "MinstaGib uniquement" +msgid "InstaGib only" +msgstr "InstaGib uniquement" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4414,8 +4414,8 @@ msgstr "Esquives" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6300,8 +6300,8 @@ msgid "SLCAT^Overkill Mode" msgstr "Mode Overkill" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" -msgstr "Mode MinstaGib" +msgid "SLCAT^InstaGib Mode" +msgstr "Mode InstaGib" #: qcsrc/menu/xonotic/serverlist.c:156 msgid "SLCAT^Defrag Mode" diff --git a/common.hu.po b/common.hu.po index 14ab01f95..7ec54de9c 100644 --- a/common.hu.po +++ b/common.hu.po @@ -4244,8 +4244,8 @@ msgid "Full item placement" msgstr "Minden tárgy elhelyezése" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Csak MinstaGib" +msgid "InstaGib only" +msgstr "Csak InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4296,8 +4296,8 @@ msgstr "Félreugrás" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6180,7 +6180,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.it.po b/common.it.po index eba61119a..307211b42 100644 --- a/common.it.po +++ b/common.it.po @@ -4358,8 +4358,8 @@ msgid "Full item placement" msgstr "Posizionamento oggetti completo" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Solo MinstaGib" +msgid "InstaGib only" +msgstr "Solo InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4410,8 +4410,8 @@ msgstr "Schivamento" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6293,8 +6293,8 @@ msgid "SLCAT^Overkill Mode" msgstr "Modo Overkill" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" -msgstr "Modo Minstagib" +msgid "SLCAT^InstaGib Mode" +msgstr "Modo InstaGib" #: qcsrc/menu/xonotic/serverlist.c:156 msgid "SLCAT^Defrag Mode" diff --git a/common.mk.po b/common.mk.po index 75c6ecde7..982a31699 100644 --- a/common.mk.po +++ b/common.mk.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.nl.po b/common.nl.po index 1ebad855b..050613e74 100644 --- a/common.nl.po +++ b/common.nl.po @@ -4241,8 +4241,8 @@ msgid "Full item placement" msgstr "Volledige item distributie" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Alleen MinstaGib" +msgid "InstaGib only" +msgstr "Alleen InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4293,8 +4293,8 @@ msgstr "Ontwijken" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6177,7 +6177,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.pl.po b/common.pl.po index 17e9eac98..21372925c 100644 --- a/common.pl.po +++ b/common.pl.po @@ -4198,7 +4198,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4250,7 +4250,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6130,7 +6130,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.pot b/common.pot index e2c6d70ac..426fb1f32 100644 --- a/common.pot +++ b/common.pot @@ -4195,7 +4195,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4247,7 +4247,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6127,7 +6127,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.pt.po b/common.pt.po index 94d564e46..6e3bbdbf1 100644 --- a/common.pt.po +++ b/common.pt.po @@ -4202,8 +4202,8 @@ msgid "Full item placement" msgstr "Colocação total dos items" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Apenas MinstaGib" +msgid "InstaGib only" +msgstr "Apenas InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4254,8 +4254,8 @@ msgstr "Desvio" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6138,7 +6138,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.ro.po b/common.ro.po index 361188773..b87bc6378 100644 --- a/common.ro.po +++ b/common.ro.po @@ -4206,8 +4206,8 @@ msgid "Full item placement" msgstr "Plasare obiecte" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Numai MinstaGib" +msgid "InstaGib only" +msgstr "Numai InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4258,8 +4258,8 @@ msgstr "Satiruta laterala" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6142,7 +6142,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.ru.po b/common.ru.po index 171d2db28..dfb8e7672 100644 --- a/common.ru.po +++ b/common.ru.po @@ -4304,8 +4304,8 @@ msgid "Full item placement" msgstr "С оружием" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Только MinstaGib" +msgid "InstaGib only" +msgstr "Только InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4356,8 +4356,8 @@ msgstr "Уклонение" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6240,8 +6240,8 @@ msgid "SLCAT^Overkill Mode" msgstr "Режим Overkill" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" -msgstr "Режим MinstaGib" +msgid "SLCAT^InstaGib Mode" +msgstr "Режим InstaGib" #: qcsrc/menu/xonotic/serverlist.c:156 msgid "SLCAT^Defrag Mode" diff --git a/common.sr.po b/common.sr.po index 1e9faed0c..9a022e15e 100644 --- a/common.sr.po +++ b/common.sr.po @@ -4213,7 +4213,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4265,7 +4265,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6145,7 +6145,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.sv.po b/common.sv.po index 677f55f77..1e45ea85a 100644 --- a/common.sv.po +++ b/common.sv.po @@ -4204,8 +4204,8 @@ msgid "Full item placement" msgstr "Fullständing sakplacering" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Endast MinstaGib" +msgid "InstaGib only" +msgstr "Endast InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4256,8 +4256,8 @@ msgstr "Undvika" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6136,7 +6136,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.uk.po b/common.uk.po index db7e4dfed..1b26d19a9 100644 --- a/common.uk.po +++ b/common.uk.po @@ -4261,8 +4261,8 @@ msgid "Full item placement" msgstr "Вся зброя" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" -msgstr "Тільки MinstaGib" +msgid "InstaGib only" +msgstr "Тільки InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 msgid "Title:" @@ -4313,8 +4313,8 @@ msgstr "Ухилення" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" -msgstr "MinstaGib" +msgid "InstaGib" +msgstr "InstaGib" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:208 @@ -6197,7 +6197,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.zh_CN.po b/common.zh_CN.po index dd2ecb619..63a5a61db 100644 --- a/common.zh_CN.po +++ b/common.zh_CN.po @@ -4198,7 +4198,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4250,7 +4250,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6130,7 +6130,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/common.zh_TW.po b/common.zh_TW.po index 079411cc6..befc34c49 100644 --- a/common.zh_TW.po +++ b/common.zh_TW.po @@ -4196,7 +4196,7 @@ msgid "Full item placement" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:49 -msgid "MinstaGib only" +msgid "InstaGib only" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c:81 @@ -4248,7 +4248,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:70 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:254 -msgid "MinstaGib" +msgid "InstaGib" msgstr "" #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:72 @@ -6128,7 +6128,7 @@ msgid "SLCAT^Overkill Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:155 -msgid "SLCAT^MinstaGib Mode" +msgid "SLCAT^InstaGib Mode" msgstr "" #: qcsrc/menu/xonotic/serverlist.c:156 diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 18af3e895..86000b66b 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1014,7 +1014,7 @@ seta menu_slist_categories_CAT_SERVERS_override "CAT_NORMAL" seta menu_slist_categories_CAT_XPM_override "CAT_NORMAL" seta menu_slist_categories_CAT_MODIFIED_override "" seta menu_slist_categories_CAT_OVERKILL_override "" -seta menu_slist_categories_CAT_MINSTAGIB_override "" +seta menu_slist_categories_CAT_INSTAGIB_override "" seta menu_slist_categories_CAT_DEFRAG_override "" seta menu_weaponarena "" diff --git a/mutators.cfg b/mutators.cfg index 4b7904867..63a4356b8 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -23,14 +23,14 @@ set sv_dodging_frozen 0 "allow dodging while frozen" // =========== -// minstagib +// instagib // =========== -set g_minstagib 0 "enable minstagib" -set g_minstagib_extralives 1 "how many extra lives you will get per powerup" -set g_minstagib_ammo_start 10 "starting ammo" -set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells" -set g_minstagib_invis_alpha 0.15 -set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup" +set g_instagib 0 "enable instagib" +set g_instagib_extralives 1 "how many extra lives you will get per powerup" +set g_instagib_ammo_start 10 "starting ammo" +set g_instagib_ammo_drop 5 "how much ammo you'll get for weapons or cells" +set g_instagib_invis_alpha 0.15 +set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup" // ========= diff --git a/notifications.cfg b/notifications.cfg index f0650653d..7454f8641 100644 --- a/notifications.cfg +++ b/notifications.cfg @@ -27,9 +27,9 @@ seta notification_ANNCE_KILLSTREAK_15 "1" "Notification control cvar: 0 = disabl seta notification_ANNCE_KILLSTREAK_20 "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" seta notification_ANNCE_KILLSTREAK_25 "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" seta notification_ANNCE_KILLSTREAK_30 "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" -seta notification_ANNCE_MINSTAGIB_LASTSECOND "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" -seta notification_ANNCE_MINSTAGIB_NARROWLY "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" -seta notification_ANNCE_MINSTAGIB_TERMINATED "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" +seta notification_ANNCE_INSTAGIB_LASTSECOND "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" +seta notification_ANNCE_INSTAGIB_NARROWLY "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" +seta notification_ANNCE_INSTAGIB_TERMINATED "1" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" seta notification_ANNCE_MULTIFRAG "0" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" seta notification_ANNCE_NUM_1 "2" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" seta notification_ANNCE_NUM_2 "2" "Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)" diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 52bf9190b..6db31ffed 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -965,7 +965,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) float fontsize = height * 1/3; float weapon_height = height * 2/3; float weapon_width = sbwidth / weapon_cnt; - float g_minstagib = 0; + float g_instagib = 0; drawstring(pos, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL); pos_y += 1.25 * hud_fontsize_y + autocvar_scoreboard_border_thickness; @@ -999,7 +999,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) pos_x += weapon_width / 2; if(switchweapon == WEP_MINSTANEX) - g_minstagib = 1; // TODO: real detection for minstagib? + g_instagib = 1; // TODO: real detection for instagib? float weapon_stats; if(autocvar_scoreboard_accuracy_nocolors) @@ -1012,7 +1012,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) self = get_weaponinfo(i); if (!self.weapon) continue; - if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA) // skip port-o-launch, nex || minstanex and tuba + if ((i == WEP_NEX && g_instagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_instagib) || i == WEP_TUBA) // skip port-o-launch, vortex || vaporizer and tuba continue; weapon_stats = weapon_accuracy[i-WEP_FIRST]; diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 1c7f7163c..84df17516 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1224,7 +1224,7 @@ float MapInfo_CurrentFeatures() { float req; req = 0; - if(!(cvar("g_lms") || cvar("g_minstagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball"))) + if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball"))) req |= MAPINFO_FEATURE_WEAPONS; return req; } diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index aa1d8fd5e..a933a6db5 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -80,7 +80,7 @@ REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit= REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,"pointlimit=50 teams=0",_("Survive against waves of monsters")); #define g_invasion IS_GAMETYPE(INVASION) -const float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps +const float MAPINFO_FEATURE_WEAPONS = 1; // not defined for instagib-only maps const float MAPINFO_FEATURE_VEHICLES = 2; const float MAPINFO_FEATURE_TURRETS = 4; const float MAPINFO_FEATURE_MONSTERS = 8; diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 2afd2987c..b45c648f7 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -248,9 +248,9 @@ void Send_Notification_WOCOVA( MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_20, CH_INFO, "20kills", VOL_BASEVOICE, ATTEN_NONE) \ MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_25, CH_INFO, "25kills", VOL_BASEVOICE, ATTEN_NONE) \ MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_30, CH_INFO, "30kills", VOL_BASEVOICE, ATTEN_NONE) \ - MSG_ANNCE_NOTIF(1, ANNCE_MINSTAGIB_LASTSECOND, CH_INFO, "lastsecond", VOL_BASEVOICE, ATTEN_NONE) \ - MSG_ANNCE_NOTIF(1, ANNCE_MINSTAGIB_NARROWLY, CH_INFO, "narrowly", VOL_BASEVOICE, ATTEN_NONE) \ - MSG_ANNCE_NOTIF(1, ANNCE_MINSTAGIB_TERMINATED, CH_INFO, "terminated", VOL_BASEVOICE, ATTEN_NONE) \ + MSG_ANNCE_NOTIF(1, ANNCE_INSTAGIB_LASTSECOND, CH_INFO, "lastsecond", VOL_BASEVOICE, ATTEN_NONE) \ + MSG_ANNCE_NOTIF(1, ANNCE_INSTAGIB_NARROWLY, CH_INFO, "narrowly", VOL_BASEVOICE, ATTEN_NONE) \ + MSG_ANNCE_NOTIF(1, ANNCE_INSTAGIB_TERMINATED, CH_INFO, "terminated", VOL_BASEVOICE, ATTEN_NONE) \ MSG_ANNCE_NOTIF(0, ANNCE_MULTIFRAG, CH_INFO, "multifrag", VOL_BASEVOICE, ATTEN_NONE) \ MSG_ANNCE_NOTIF(2, ANNCE_NUM_1, CH_INFO, "1", VOL_BASEVOICE, ATTEN_NONE) \ MSG_ANNCE_NOTIF(2, ANNCE_NUM_2, CH_INFO, "2", VOL_BASEVOICE, ATTEN_NONE) \ diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c index 8e4bc5a23..e5dec8fff 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c @@ -46,7 +46,7 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb) me.currentMapTitle = strzone(strdecolorize(MapInfo_Map_title)); me.currentMapAuthor = strzone(strdecolorize(MapInfo_Map_author)); me.currentMapDescription = strzone(MapInfo_Map_description); - me.currentMapFeaturesText = strzone((MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS) ? _("Full item placement") : _("MinstaGib only")); + me.currentMapFeaturesText = strzone((MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS) ? _("Full item placement") : _("InstaGib only")); me.currentMapPreviewImage = strzone(strcat("/maps/", MapInfo_Map_bspname)); me.frame.setText(me.frame, me.currentMapBSPName); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c index 055f5449f..3bac35305 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -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")) @@ -112,7 +112,7 @@ string XonoticMutatorsDialog_toString(entity me) float checkCompatibility_pinata(entity me) { - if(cvar("g_minstagib")) + if(cvar("g_instagib")) return 0; if(cvar("g_nix")) return 0; @@ -126,7 +126,7 @@ 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; @@ -138,7 +138,7 @@ float checkCompatibility_newtoys(entity me) } float checkCompatibility_weaponarena_weapon(entity me) { - if(cvar("g_minstagib")) + if(cvar("g_instagib")) return 0; if(cvar_string("g_weaponarena") == "most") return 0; @@ -172,12 +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_minstagib", 0, 0); + 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); @@ -202,7 +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_minstagib", 0, 0); + 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"))); @@ -210,7 +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_minstagib", 0, 0); + 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"))); @@ -251,7 +251,7 @@ void XonoticMutatorsDialog_fill(entity 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", "1", _("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); diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c index 753702751..ed68acd71 100644 --- a/qcsrc/menu/xonotic/serverlist.c +++ b/qcsrc/menu/xonotic/serverlist.c @@ -152,7 +152,7 @@ float category_draw_count; SLIST_CATEGORY(CAT_XPM, "CAT_NORMAL", "CAT_SERVERS", ZCTX(_("SLCAT^Competitive Mode"))) \ SLIST_CATEGORY(CAT_MODIFIED, "", "CAT_SERVERS", ZCTX(_("SLCAT^Modified Servers"))) \ SLIST_CATEGORY(CAT_OVERKILL, "", "CAT_SERVERS", ZCTX(_("SLCAT^Overkill Mode"))) \ - SLIST_CATEGORY(CAT_MINSTAGIB, "", "CAT_SERVERS", ZCTX(_("SLCAT^MinstaGib Mode"))) \ + SLIST_CATEGORY(CAT_INSTAGIB, "", "CAT_SERVERS", ZCTX(_("SLCAT^InstaGib Mode"))) \ SLIST_CATEGORY(CAT_DEFRAG, "", "CAT_SERVERS", ZCTX(_("SLCAT^Defrag Mode"))) #define SLIST_CATEGORY_AUTOCVAR(name) autocvar_menu_slist_categories_##name##_override @@ -361,8 +361,9 @@ float CheckCategoryForEntry(float entry) // old servers which don't report their mod name are considered modified now case "": { return CAT_MODIFIED; } - case "xpm": { return CAT_XPM; } - case "minstagib": { return CAT_MINSTAGIB; } + case "xpm": { return CAT_XPM; } + case "minstagib": + case "instagib": { return CAT_INSTAGIB; } case "overkill": { return CAT_OVERKILL; } //case "nix": { return CAT_NIX; } //case "newtoys": { return CAT_NEWTOYS; } @@ -1067,7 +1068,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float // list the mods here on which the pure server check actually works if(modname != "Xonotic") - if(modname != "MinstaGib") + if(modname != "InstaGib" || modname != "MinstaGib") if(modname != "CTS") if(modname != "NIX") if(modname != "NewToys") diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 11cf993df..4d207955c 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -886,11 +886,11 @@ float autocvar_g_maxplayers_spectator_blocktime; float autocvar_g_maxpushtime; float autocvar_g_maxspeed; float autocvar_g_midair_shieldtime; -#define autocvar_g_minstagib cvar("g_minstagib") -float autocvar_g_minstagib_ammo_drop; -float autocvar_g_minstagib_extralives; -float autocvar_g_minstagib_speed_highspeed; -float autocvar_g_minstagib_invis_alpha; +#define autocvar_g_instagib cvar("g_instagib") +float autocvar_g_instagib_ammo_drop; +float autocvar_g_instagib_extralives; +float autocvar_g_instagib_speed_highspeed; +float autocvar_g_instagib_invis_alpha; #define autocvar_g_mirrordamage cvar("g_mirrordamage") #define autocvar_g_mirrordamage_virtual cvar("g_mirrordamage_virtual") diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 84657d6f6..185c354c4 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1415,7 +1415,7 @@ void player_powerups (void) Fire_ApplyDamage(self); Fire_ApplyEffect(self); - if (!g_minstagib) + if (!g_instagib) { if (self.items & IT_STRENGTH) { diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index dd0b5c22b..7608bbeb4 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -16,7 +16,7 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi // Globals -float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib; +float g_cloaked, g_footsteps, g_grappling_hook, g_instagib; float g_warmup_limit; float g_warmup_allguns; float g_warmup_allow_timeout; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 47443e6d7..2e4c079ce 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -826,7 +826,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float self = oldself; } - if(!g_minstagib) + if(!g_instagib) { // apply strength multiplier if (attacker.items & IT_STRENGTH) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index a1460ded8..44f60eb87 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -420,7 +420,7 @@ void cvar_changes_init() BADPREFIX("sv_ready_restart_"); // mutators that announce themselves properly to the server browser - BADCVAR("g_minstagib"); + BADCVAR("g_instagib"); BADCVAR("g_new_toys"); BADCVAR("g_nix"); BADCVAR("g_grappling_hook"); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 40421bbc0..fc9e84e58 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -929,7 +929,7 @@ void readlevelcvars(void) g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow"); g_bugrigs_steer = cvar("g_bugrigs_steer"); - g_minstagib = cvar("g_minstagib"); + g_instagib = cvar("g_instagib"); sv_clones = cvar("sv_clones"); sv_foginterval = cvar("sv_foginterval"); diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc index 5aa534c33..765619df7 100644 --- a/qcsrc/server/mutators/mutator_buffs.qc +++ b/qcsrc/server/mutators/mutator_buffs.qc @@ -605,14 +605,14 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerThink) if(self.oldbuffs & BUFF_INVISIBLE) { - if(time < self.strength_finished && g_minstagib) - self.alpha = autocvar_g_minstagib_invis_alpha; + if(time < self.strength_finished && g_instagib) + self.alpha = autocvar_g_instagib_invis_alpha; else self.alpha = self.buff_invisible_prev_alpha; } else if(self.buffs & BUFF_INVISIBLE) { - if(time < self.strength_finished && g_minstagib) + if(time < self.strength_finished && g_instagib) self.buff_invisible_prev_alpha = default_player_alpha; else self.buff_invisible_prev_alpha = self.alpha; diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_instagib.qc similarity index 66% rename from qcsrc/server/mutators/mutator_minstagib.qc rename to qcsrc/server/mutators/mutator_instagib.qc index 20811ad50..e014951ce 100644 --- a/qcsrc/server/mutators/mutator_minstagib.qc +++ b/qcsrc/server/mutators/mutator_instagib.qc @@ -1,15 +1,15 @@ void spawnfunc_item_minst_cells (void) { - if (!g_minstagib) { remove(self); return; } + if (!g_instagib) { remove(self); return; } if (!self.ammo_cells) - self.ammo_cells = autocvar_g_minstagib_ammo_drop; + self.ammo_cells = autocvar_g_instagib_ammo_drop; StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", 45, 0, "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); } -void minstagib_health_mega() +void instagib_health_mega() { self.max_health = 1; StartItem ("models/items/g_h100.md3", @@ -17,33 +17,33 @@ void minstagib_health_mega() "Extralife", IT_NAILS, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_HIGH); } -.float minstagib_nextthink; -.float minstagib_needammo; -void minstagib_stop_countdown(entity e) +.float instagib_nextthink; +.float instagib_needammo; +void instagib_stop_countdown(entity e) { - if (!e.minstagib_needammo) + if (!e.instagib_needammo) return; Kill_Notification(NOTIF_ONE_ONLY, e, MSG_CENTER_CPID, CPID_MINSTA_FINDAMMO); - e.minstagib_needammo = FALSE; + e.instagib_needammo = FALSE; } -void minstagib_ammocheck() +void instagib_ammocheck() { if (!IS_PLAYER(self)) return; // not a player - if (time < self.minstagib_nextthink) + if (time < self.instagib_nextthink) return; if (self.deadflag || gameover) - minstagib_stop_countdown(self); + instagib_stop_countdown(self); else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO)) - minstagib_stop_countdown(self); + instagib_stop_countdown(self); else { - self.minstagib_needammo = TRUE; + self.instagib_needammo = TRUE; if (self.health == 5) { Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0'); - Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_MINSTAGIB_TERMINATED); + Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_INSTAGIB_TERMINATED); } else if (self.health == 10) { @@ -97,26 +97,26 @@ void minstagib_ammocheck() Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0'); } } - self.minstagib_nextthink = time + 1; + self.instagib_nextthink = time + 1; } -MUTATOR_HOOKFUNCTION(minstagib_MatchEnd) +MUTATOR_HOOKFUNCTION(instagib_MatchEnd) { entity head; FOR_EACH_PLAYER(head) - minstagib_stop_countdown(head); + instagib_stop_countdown(head); return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_MonsterLoot) +MUTATOR_HOOKFUNCTION(instagib_MonsterLoot) { other.monster_loot = spawnfunc_item_minst_cells; return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_MonsterSpawn) +MUTATOR_HOOKFUNCTION(instagib_MonsterSpawn) { // always refill ammo if(self.monsterid == MON_MAGE) @@ -125,7 +125,7 @@ MUTATOR_HOOKFUNCTION(minstagib_MonsterSpawn) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_BotShouldAttack) +MUTATOR_HOOKFUNCTION(instagib_BotShouldAttack) { if(checkentity.items & IT_STRENGTH) return TRUE; @@ -133,31 +133,31 @@ MUTATOR_HOOKFUNCTION(minstagib_BotShouldAttack) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_MakePlayerObserver) +MUTATOR_HOOKFUNCTION(instagib_MakePlayerObserver) { - minstagib_stop_countdown(self); + instagib_stop_countdown(self); return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerSpawn) +MUTATOR_HOOKFUNCTION(instagib_PlayerSpawn) { self.effects |= EF_FULLBRIGHT; return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerPreThink) +MUTATOR_HOOKFUNCTION(instagib_PlayerPreThink) { - minstagib_ammocheck(); + instagib_ammocheck(); return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerRegen) +MUTATOR_HOOKFUNCTION(instagib_PlayerRegen) { - // no regeneration in minstagib + // no regeneration in instagib return TRUE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerPowerups) +MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups) { if (!(self.effects & EF_FULLBRIGHT)) self.effects |= EF_FULLBRIGHT; @@ -177,8 +177,8 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerPowerups) { if (time < self.strength_finished) { - self.alpha = autocvar_g_minstagib_invis_alpha; - self.exteriorweaponentity.alpha = autocvar_g_minstagib_invis_alpha; + self.alpha = autocvar_g_instagib_invis_alpha; + self.exteriorweaponentity.alpha = autocvar_g_instagib_invis_alpha; self.items |= IT_STRENGTH; Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_INVISIBILITY, self.netname); Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERUP_INVISIBILITY); @@ -206,15 +206,15 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerPowerups) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerPhysics) +MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics) { if(self.items & IT_INVINCIBLE) - self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_minstagib_speed_highspeed; + self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_instagib_speed_highspeed; return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor) +MUTATOR_HOOKFUNCTION(instagib_SplitHealthArmor) { damage_save = 0; damage_take = frag_damage; @@ -222,14 +222,14 @@ MUTATOR_HOOKFUNCTION(minstagib_SplitHealthArmor) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_ForbidThrowing) +MUTATOR_HOOKFUNCTION(instagib_ForbidThrowing) { // weapon dropping on death handled by FilterItem return TRUE; } -MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage) +MUTATOR_HOOKFUNCTION(instagib_PlayerDamage) { if(autocvar_g_friendlyfire == 0 && SAME_TEAM(frag_target, frag_attacker) && IS_PLAYER(frag_target) && IS_PLAYER(frag_attacker)) frag_damage = 0; @@ -290,9 +290,9 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_SetStartItems) +MUTATOR_HOOKFUNCTION(instagib_SetStartItems) { - start_ammo_cells = cvar("g_minstagib_ammo_start"); + start_ammo_cells = cvar("g_instagib_ammo_start"); start_health = 100; start_armorvalue = 0; @@ -303,14 +303,14 @@ MUTATOR_HOOKFUNCTION(minstagib_SetStartItems) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_FilterItem) +MUTATOR_HOOKFUNCTION(instagib_FilterItem) { if(self.classname == "item_cells") return TRUE; // no normal cells? if(self.weapon == WEP_MINSTANEX && self.classname == "droppedweapon") { - self.ammo_cells = autocvar_g_minstagib_ammo_drop; + self.ammo_cells = autocvar_g_instagib_ammo_drop; return FALSE; } @@ -329,8 +329,8 @@ MUTATOR_HOOKFUNCTION(minstagib_FilterItem) if(self.flags & FL_POWERUP) return FALSE; - if(self.ammo_cells > autocvar_g_minstagib_ammo_drop && self.classname != "item_minst_cells") - self.ammo_cells = autocvar_g_minstagib_ammo_drop; + if(self.ammo_cells > autocvar_g_instagib_ammo_drop && self.classname != "item_minst_cells") + self.ammo_cells = autocvar_g_instagib_ammo_drop; if(self.ammo_cells && !self.weapon) return FALSE; @@ -338,7 +338,7 @@ MUTATOR_HOOKFUNCTION(minstagib_FilterItem) return TRUE; } -MUTATOR_HOOKFUNCTION(minstagib_CustomizeWaypoint) +MUTATOR_HOOKFUNCTION(instagib_CustomizeWaypoint) { entity e = WaypointSprite_getviewentity(other); @@ -351,7 +351,7 @@ MUTATOR_HOOKFUNCTION(minstagib_CustomizeWaypoint) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_ItemCountdown) +MUTATOR_HOOKFUNCTION(instagib_ItemCountdown) { switch(self.items) { @@ -362,7 +362,7 @@ MUTATOR_HOOKFUNCTION(minstagib_ItemCountdown) return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_ItemTouch) +MUTATOR_HOOKFUNCTION(instagib_ItemTouch) { if(self.ammo_cells) { @@ -370,9 +370,9 @@ MUTATOR_HOOKFUNCTION(minstagib_ItemTouch) if (IS_CLIENT(other)) { if(other.health <= 5) - Send_Notification(NOTIF_ONE, other, MSG_ANNCE, ANNCE_MINSTAGIB_LASTSECOND); + Send_Notification(NOTIF_ONE, other, MSG_ANNCE, ANNCE_INSTAGIB_LASTSECOND); else if(other.health < 50) - Send_Notification(NOTIF_ONE, other, MSG_ANNCE, ANNCE_MINSTAGIB_NARROWLY); + Send_Notification(NOTIF_ONE, other, MSG_ANNCE, ANNCE_INSTAGIB_NARROWLY); } if(other.health < 100) @@ -383,7 +383,7 @@ MUTATOR_HOOKFUNCTION(minstagib_ItemTouch) if(self.max_health) { - other.armorvalue = bound(other.armorvalue, 999, other.armorvalue + autocvar_g_minstagib_extralives); + other.armorvalue = bound(other.armorvalue, 999, other.armorvalue + autocvar_g_instagib_extralives); Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_EXTRALIVES); return MUT_ITEMTOUCH_PICKUP; } @@ -391,7 +391,7 @@ MUTATOR_HOOKFUNCTION(minstagib_ItemTouch) return MUT_ITEMTOUCH_CONTINUE; } -MUTATOR_HOOKFUNCTION(minstagib_OnEntityPreSpawn) +MUTATOR_HOOKFUNCTION(instagib_OnEntityPreSpawn) { if (!autocvar_g_powerups) { return FALSE; } if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.classname == "item_health_mega")) @@ -402,7 +402,7 @@ MUTATOR_HOOKFUNCTION(minstagib_OnEntityPreSpawn) if(random() < 0.3) e.think = spawnfunc_item_strength; else if(random() < 0.6) - e.think = minstagib_health_mega; + e.think = instagib_health_mega; else e.think = spawnfunc_item_invincible; @@ -414,48 +414,48 @@ MUTATOR_HOOKFUNCTION(minstagib_OnEntityPreSpawn) return TRUE; } -MUTATOR_HOOKFUNCTION(minstagib_BuildMutatorsString) +MUTATOR_HOOKFUNCTION(instagib_BuildMutatorsString) { - ret_string = strcat(ret_string, ":MinstaGib"); + ret_string = strcat(ret_string, ":instagib"); return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_BuildMutatorsPrettyString) +MUTATOR_HOOKFUNCTION(instagib_BuildMutatorsPrettyString) { - ret_string = strcat(ret_string, ", MinstaGib"); + ret_string = strcat(ret_string, ", instagib"); return FALSE; } -MUTATOR_HOOKFUNCTION(minstagib_SetModname) +MUTATOR_HOOKFUNCTION(instagib_SetModname) { - modname = "MinstaGib"; + modname = "instagib"; return TRUE; } -MUTATOR_DEFINITION(mutator_minstagib) +MUTATOR_DEFINITION(mutator_instagib) { - MUTATOR_HOOK(MatchEnd, minstagib_MatchEnd, CBC_ORDER_ANY); - MUTATOR_HOOK(MonsterDropItem, minstagib_MonsterLoot, CBC_ORDER_ANY); - MUTATOR_HOOK(MonsterSpawn, minstagib_MonsterSpawn, CBC_ORDER_ANY); - MUTATOR_HOOK(BotShouldAttack, minstagib_BotShouldAttack, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPhysics, minstagib_PlayerPhysics, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerSpawn, minstagib_PlayerSpawn, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDamage_Calculate, minstagib_PlayerDamage, CBC_ORDER_ANY); - MUTATOR_HOOK(MakePlayerObserver, minstagib_MakePlayerObserver, CBC_ORDER_ANY); - MUTATOR_HOOK(SetStartItems, minstagib_SetStartItems, CBC_ORDER_ANY); - MUTATOR_HOOK(ItemTouch, minstagib_ItemTouch, CBC_ORDER_ANY); - MUTATOR_HOOK(FilterItem, minstagib_FilterItem, CBC_ORDER_ANY); - MUTATOR_HOOK(CustomizeWaypoint, minstagib_CustomizeWaypoint, CBC_ORDER_ANY); - MUTATOR_HOOK(Item_RespawnCountdown, minstagib_ItemCountdown, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, minstagib_SplitHealthArmor, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPowerups, minstagib_PlayerPowerups, CBC_ORDER_ANY); - MUTATOR_HOOK(ForbidThrowCurrentWeapon, minstagib_ForbidThrowing, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerPreThink, minstagib_PlayerPreThink, CBC_ORDER_ANY); - MUTATOR_HOOK(PlayerRegen, minstagib_PlayerRegen, CBC_ORDER_ANY); - MUTATOR_HOOK(OnEntityPreSpawn, minstagib_OnEntityPreSpawn, CBC_ORDER_ANY); - MUTATOR_HOOK(BuildMutatorsString, minstagib_BuildMutatorsString, CBC_ORDER_ANY); - MUTATOR_HOOK(BuildMutatorsPrettyString, minstagib_BuildMutatorsPrettyString, CBC_ORDER_ANY); - MUTATOR_HOOK(SetModname, minstagib_SetModname, CBC_ORDER_ANY); + MUTATOR_HOOK(MatchEnd, instagib_MatchEnd, CBC_ORDER_ANY); + MUTATOR_HOOK(MonsterDropItem, instagib_MonsterLoot, CBC_ORDER_ANY); + MUTATOR_HOOK(MonsterSpawn, instagib_MonsterSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(BotShouldAttack, instagib_BotShouldAttack, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerPhysics, instagib_PlayerPhysics, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerSpawn, instagib_PlayerSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerDamage_Calculate, instagib_PlayerDamage, CBC_ORDER_ANY); + MUTATOR_HOOK(MakePlayerObserver, instagib_MakePlayerObserver, CBC_ORDER_ANY); + MUTATOR_HOOK(SetStartItems, instagib_SetStartItems, CBC_ORDER_ANY); + MUTATOR_HOOK(ItemTouch, instagib_ItemTouch, CBC_ORDER_ANY); + MUTATOR_HOOK(FilterItem, instagib_FilterItem, CBC_ORDER_ANY); + MUTATOR_HOOK(CustomizeWaypoint, instagib_CustomizeWaypoint, CBC_ORDER_ANY); + MUTATOR_HOOK(Item_RespawnCountdown, instagib_ItemCountdown, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, instagib_SplitHealthArmor, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerPowerups, instagib_PlayerPowerups, CBC_ORDER_ANY); + MUTATOR_HOOK(ForbidThrowCurrentWeapon, instagib_ForbidThrowing, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerPreThink, instagib_PlayerPreThink, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerRegen, instagib_PlayerRegen, CBC_ORDER_ANY); + MUTATOR_HOOK(OnEntityPreSpawn, instagib_OnEntityPreSpawn, CBC_ORDER_ANY); + MUTATOR_HOOK(BuildMutatorsString, instagib_BuildMutatorsString, CBC_ORDER_ANY); + MUTATOR_HOOK(BuildMutatorsPrettyString, instagib_BuildMutatorsPrettyString, CBC_ORDER_ANY); + MUTATOR_HOOK(SetModname, instagib_SetModname, CBC_ORDER_ANY); return FALSE; } diff --git a/qcsrc/server/mutators/mutators.qc b/qcsrc/server/mutators/mutators.qc index 71569b7f9..2f96e9e8a 100644 --- a/qcsrc/server/mutators/mutators.qc +++ b/qcsrc/server/mutators/mutators.qc @@ -7,19 +7,19 @@ void mutators_add() CHECK_MUTATOR_ADD("g_spawn_near_teammate", mutator_spawn_near_teammate, teamplay); CHECK_MUTATOR_ADD("g_physical_items", mutator_physical_items, 1); CHECK_MUTATOR_ADD("g_touchexplode", mutator_touchexplode, 1); - CHECK_MUTATOR_ADD("g_minstagib", mutator_minstagib, !g_nexball); - CHECK_MUTATOR_ADD("g_invincible_projectiles", mutator_invincibleprojectiles, !cvar("g_minstagib")); - CHECK_MUTATOR_ADD("g_new_toys", mutator_new_toys, !cvar("g_minstagib")); - CHECK_MUTATOR_ADD("g_nix", mutator_nix, !cvar("g_minstagib")); - CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_minstagib")); - CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_minstagib")); + CHECK_MUTATOR_ADD("g_instagib", mutator_instagib, !g_nexball); + CHECK_MUTATOR_ADD("g_invincible_projectiles", mutator_invincibleprojectiles, !cvar("g_instagib")); + CHECK_MUTATOR_ADD("g_new_toys", mutator_new_toys, !cvar("g_instagib")); + CHECK_MUTATOR_ADD("g_nix", mutator_nix, !cvar("g_instagib")); + CHECK_MUTATOR_ADD("g_rocket_flying", mutator_rocketflying, !cvar("g_instagib")); + CHECK_MUTATOR_ADD("g_vampire", mutator_vampire, !cvar("g_instagib")); CHECK_MUTATOR_ADD("g_superspectate", mutator_superspec, 1); - CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_minstagib")); + CHECK_MUTATOR_ADD("g_pinata", mutator_pinata, !cvar("g_instagib")); CHECK_MUTATOR_ADD("g_midair", mutator_midair, 1); - CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_minstagib")); + CHECK_MUTATOR_ADD("g_bloodloss", mutator_bloodloss, !cvar("g_instagib")); CHECK_MUTATOR_ADD("g_random_gravity", mutator_random_gravity, 1); CHECK_MUTATOR_ADD("g_multijump", mutator_multijump, 1); - CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_minstagib") && !g_nexball); + CHECK_MUTATOR_ADD("g_melee_only", mutator_melee_only, !cvar("g_instagib") && !g_nexball); CHECK_MUTATOR_ADD("g_nades", mutator_nades, 1); CHECK_MUTATOR_ADD("g_sandbox", sandbox, 1); CHECK_MUTATOR_ADD("g_campcheck", mutator_campcheck, 1); diff --git a/qcsrc/server/mutators/mutators.qh b/qcsrc/server/mutators/mutators.qh index eff44c2e3..955ba1a52 100644 --- a/qcsrc/server/mutators/mutators.qh +++ b/qcsrc/server/mutators/mutators.qh @@ -22,7 +22,7 @@ MUTATOR_DECLARATION(mutator_spawn_near_teammate); MUTATOR_DECLARATION(mutator_physical_items); MUTATOR_DECLARATION(mutator_vampire); MUTATOR_DECLARATION(mutator_superspec); -MUTATOR_DECLARATION(mutator_minstagib); +MUTATOR_DECLARATION(mutator_instagib); MUTATOR_DECLARATION(mutator_touchexplode); MUTATOR_DECLARATION(mutator_pinata); MUTATOR_DECLARATION(mutator_midair); diff --git a/qcsrc/server/mutators/mutators_include.qc b/qcsrc/server/mutators/mutators_include.qc index c1932db9d..220bd0595 100644 --- a/qcsrc/server/mutators/mutators_include.qc +++ b/qcsrc/server/mutators/mutators_include.qc @@ -24,7 +24,7 @@ #include "mutator_physical_items.qc" #include "sandbox.qc" #include "mutator_superspec.qc" -#include "mutator_minstagib.qc" +#include "mutator_instagib.qc" #include "mutator_touchexplode.qc" #include "mutator_pinata.qc" #include "mutator_midair.qc" diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index d3f72b7eb..353e5e9fe 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -788,7 +788,7 @@ When a button is touched, it moves some distance in the direction of it's angle, "speed" override the default 40 speed "wait" override the default 1 second wait (-1 = never return) "lip" override the default 4 pixel lip remaining at end of move -"health" if set, the button must be killed instead of touched. If set to -1, the button will fire on ANY attack, even damageless ones like the MinstaGib laser +"health" if set, the button must be killed instead of touched. If set to -1, the button will fire on ANY attack, even damageless ones like the InstaGib laser "sounds" 0) steam metal 1) wooden clunk diff --git a/qcsrc/server/tturrets/units/unit_plasma.qc b/qcsrc/server/tturrets/units/unit_plasma.qc index 9fce826a2..26a3dc04e 100644 --- a/qcsrc/server/tturrets/units/unit_plasma.qc +++ b/qcsrc/server/tturrets/units/unit_plasma.qc @@ -102,7 +102,7 @@ void turret_plasma_std_init() self.firecheck_flags |= TFL_FIRECHECK_AFF; // Our fireing routine - if(g_minstagib) + if(g_instagib) self.turret_firefunc = turret_plasma_minsta_attack; else self.turret_firefunc = turret_plasma_attack; diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 9fb80c6d5..becb2e8b7 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -75,7 +75,7 @@ void W_MinstaNex_Attack (void) break; } - W_DecreaseAmmo(ammo_cells, ((g_minstagib) ? 1 : autocvar_g_balance_minstanex_ammo), autocvar_g_balance_minstanex_reload_ammo); + W_DecreaseAmmo(ammo_cells, ((g_instagib) ? 1 : autocvar_g_balance_minstanex_ammo), autocvar_g_balance_minstanex_reload_ammo); } void spawnfunc_weapon_minstanex (void); // defined in t_items.qc @@ -86,7 +86,7 @@ float w_minstanex(float req) float minstanex_ammo; // now multiple WR_s use this - minstanex_ammo = ((g_minstagib) ? 1 : autocvar_g_balance_minstanex_ammo); + minstanex_ammo = ((g_instagib) ? 1 : autocvar_g_balance_minstanex_ammo); if (req == WR_AIM) { @@ -115,14 +115,14 @@ float w_minstanex(float req) if (self.jump_interval <= time) if (weapon_prepareattack(1, -1)) { - // handle refire manually, so that primary and secondary can be fired without conflictions (important for minstagib) + // handle refire manually, so that primary and secondary can be fired without conflictions (important for instagib) self.jump_interval = time + autocvar_g_balance_minstanex_laser_refire * W_WeaponRateFactor(); // decrease ammo for the laser? if(autocvar_g_balance_minstanex_laser_ammo) W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo); - // ugly minstagib hack to reuse the fire mode of the laser + // ugly instagib hack to reuse the fire mode of the laser float w; w = self.weapon; self.weapon = WEP_LASER; diff --git a/tooltips.db b/tooltips.db index 9be879536..a0c06485b 100644 --- a/tooltips.db +++ b/tooltips.db @@ -40,7 +40,7 @@ \g_pinata\Players will drop all weapons they possessed when they are killed \g_weapon_stay\Weapons stay after they are picked up \g_weaponarena\Selecting a weapon arena will give all players that weapon at spawn as well as unlimited ammo, and disable all other weapon pickups. -\g_minstagib\Players will be given the Minstanex, which is a railgun with infinite damage. If the player runs out of ammo, he will have 10 seconds to find some or if he fails to do so, face death. The secondary fire mode is a laser which does not inflict any damage and is good for doing trickjumps. +\g_instagib\Players will be given the Minstanex, which is a railgun with infinite damage. If the player runs out of ammo, he will have 10 seconds to find some or if he fails to do so, face death. The secondary fire mode is a laser which does not inflict any damage and is good for doing trickjumps. \g_nix\No items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon. \g_nix_with_laser\Always carry the laser as an additional weapon in Nix \XonoticMultiplayerDialog/Select all\Select all maps diff --git a/tooltips.db.de b/tooltips.db.de index ed455da10..7ba71e274 100644 --- a/tooltips.db.de +++ b/tooltips.db.de @@ -42,7 +42,7 @@ \g_weapon_stay\Alle Waffen bleiben liegen, auch wenn sie aufgenommen wurden \g_weaponarena\Waffen-Arenen: Die Auswahl einer Waffen-Arena führt dazu, dass jeder Spieler mit der gewählten Waffe startet. Diese hat unendlich viel Munition, andere Waffen sind nicht vorhanden - Spezielle Waffen-Arenen: Spieler starten mit allen Waffen und unendlich viel Munition \menu_weaponarena_with_laser\Aktiviere auch den Laser in der Waffen-Arena -\g_minstagib\Alle Spieler starten mit der MinstaNex, eine elektromagnetische Schienenkanone mit unendlich viel Schaden. Wenn ein Spieler keine Munition mehr hat, bleiben ihm 10 Sekunden um neue zu finden, ansonsten stirbt er. Der 2. Feuermodus ist Laser, welcher keinen Schaden hinzufügen kann. Dieser eignet sich gut für Tricksprünge +\g_instagib\Alle Spieler starten mit der MinstaNex, eine elektromagnetische Schienenkanone mit unendlich viel Schaden. Wenn ein Spieler keine Munition mehr hat, bleiben ihm 10 Sekunden um neue zu finden, ansonsten stirbt er. Der 2. Feuermodus ist Laser, welcher keinen Schaden hinzufügen kann. Dieser eignet sich gut für Tricksprünge \g_nix\Es gibt keine aufzusammelnden Gegenstände in Xonotic - Anstelle der Möglichkeit Waffen aufzusammeln, spielen alle mit der gleichen Waffe. Nach einiger Zeit startet ein Countdown, danach wechseln alle Spieler zu einer neuen gleichen Waffe \g_nix_with_laser\In Nix ist als zweite Waffe der Laser vorhanden \XonoticMultiplayerDialog/Select all\Wähle alle Maps diff --git a/tooltips.db.es b/tooltips.db.es index 17c8939df..4cab5a638 100644 --- a/tooltips.db.es +++ b/tooltips.db.es @@ -41,7 +41,7 @@ \g_weapon_stay\Las armas quedan despues de que son tomadas \g_weaponarena\Seleccionando un arma, dara a todos los jugadores cual arma se eligió asi como infinita munición, y deshabilita cualquier otra toma de arma. \menu_weaponarena_with_laser\Tambien habilita el láser en la arena -\g_minstagib\Los jugadores tendran Minstanex, el cual es un railgun con daño infinito. Si el jugador queda sin munición, tendra 10 segundos para buscar mas o morira. El modo de disparo secundario es un laser que no inflige daño y es bueno para hacer bromas. +\g_instagib\Los jugadores tendran Minstanex, el cual es un railgun con daño infinito. Si el jugador queda sin munición, tendra 10 segundos para buscar mas o morira. El modo de disparo secundario es un laser que no inflige daño y es bueno para hacer bromas. \g_nix\Xonotic sin items - en vez de recoger items, todos juegan con la misma arma. Despues de algún tiempo, comienza una cuenta regresiva, despues del cual todos juegan con otra arma. \g_nix_with_laser\Siempre lleva el láser como arma adicional en Nix \XonoticMultiplayerDialog/Select all\Seleccionar todos los mapas diff --git a/tooltips.db.fr b/tooltips.db.fr index 2fc82b5b4..3f3819e49 100644 --- a/tooltips.db.fr +++ b/tooltips.db.fr @@ -40,7 +40,7 @@ \g_pinata\Les joueurs lâchent toutes leurs armes quand ils meurent \g_weapon_stay\Les armes restent où elles sont lorsqu'elles sont ramassées \g_weaponarena\Sélectionner une arène avec une seule arme fera apparaître les joueurs avec cette arme et des munitions illimitées, et désactive toutes les autres armes -\g_minstagib\Tous les joueurs reçoivent un Minstanex, qui est un fusil de précision d'une puissance infinie. Si vous êtes à court de munition, vous mourrez dans les 10 secondes à moins de parvenir à recharger votre arme. Le tir secondaire est un laser qui n'inflige aucun dégât et qui est utile pour sauter sur de longues distances. +\g_instagib\Tous les joueurs reçoivent un Minstanex, qui est un fusil de précision d'une puissance infinie. Si vous êtes à court de munition, vous mourrez dans les 10 secondes à moins de parvenir à recharger votre arme. Le tir secondaire est un laser qui n'inflige aucun dégât et qui est utile pour sauter sur de longues distances. \g_nix\No Items Xonotic - tous les joueurs jouent avec la même arme, et celle-ci change régulièrement. \g_nix_with_laser\Autoriser le laser en plus de l'arme courante dans le mode Nix \XonoticMultiplayerDialog/Select all\Sélectionner toutes les cartes diff --git a/tooltips.db.hu b/tooltips.db.hu index 81347c757..4080f0286 100644 --- a/tooltips.db.hu +++ b/tooltips.db.hu @@ -42,7 +42,7 @@ \g_weapon_stay\A fegyverek a helyükön maradnak, még azután is, hogy valaki felvette őket \g_weaponarena\A kiválasztott fegyver aréna minden játékosnak ugyanazt a fegyvert biztosítja korlátlan lőszerrel, és letiltja minden más fegyver felvételét \menu_weaponarena_with_laser\A lézer is engedélyezett a fegyver arénában -\g_minstagib\A játékosok egy Minstanex-et kapnak, ami egy azonnal ölő mesterlövész fegyver. Ha a játékos kifogy a lőszerből, 10 másodperce van muníciót találni, vagy meghal. A másodlagos tűz mód a lézer, amely nem okoz kárt, de jól jön trükkös ugrások végrehajtásánál +\g_instagib\A játékosok egy Minstanex-et kapnak, ami egy azonnal ölő mesterlövész fegyver. Ha a játékos kifogy a lőszerből, 10 másodperce van muníciót találni, vagy meghal. A másodlagos tűz mód a lézer, amely nem okoz kárt, de jól jön trükkös ugrások végrehajtásánál \g_nix\Xonotic felvehető fegyverek nélkül – Mindenki ugyanazzal a fegyverrel játszik. Kis idő után visszaszámlálás indul, amely végén mindenki fegyvert vált \g_nix_with_laser\Mindig legyen a lézer a Nix mellett kiegészítésül diff --git a/tooltips.db.it b/tooltips.db.it index e1d1825dd..03169993c 100644 --- a/tooltips.db.it +++ b/tooltips.db.it @@ -40,7 +40,7 @@ \g_pinata\I giocatori rilasceranno tutte le armi che possedevano appena vengono uccisi \g_weapon_stay\Le armi rimangono dopo che vengono raccolte \g_weaponarena\Selezionando un'arena dedicata ad un'arma si darà a tutti i giocatori quell'arma con munizioni infinite, e disabiliterà tutti gli altri raccoglimenti delle armi. -\g_minstagib\Ai giocatori sarà dato il Minstanex, che è un railgun con danni illimitati. Se il giocatore rimane senza munizioni, avrà 10 secondi per trovarne alcune, altrimenti morirà. Il fuoco secondario è un laser che non infligge nessun danno ed è buono per effettuare vari trickjump. +\g_instagib\Ai giocatori sarà dato il Minstanex, che è un railgun con danni illimitati. Se il giocatore rimane senza munizioni, avrà 10 secondi per trovarne alcune, altrimenti morirà. Il fuoco secondario è un laser che non infligge nessun danno ed è buono per effettuare vari trickjump. \g_nix\"No items Xonotic" - invece di raccogliere oggetti, ognuno giocherà con la stessa arma. Dopo un pò di tempo, un conto alla rovescia inizierà, dopo il quale ognuno passerà ad un'altra arma. \g_nix_with_laser\Porta sempre il laser come arma aggiuntiva nella modalità "No items Xonotic" \XonoticMultiplayerDialog/Seleziona tutto\Seleziona tutte le mappe diff --git a/tooltips.db.ru b/tooltips.db.ru index 9a6d72fbc..c5b5fccf5 100644 --- a/tooltips.db.ru +++ b/tooltips.db.ru @@ -41,7 +41,7 @@ \g_weapon_stay\Всё собранное оружие остаётся после возрождений \g_weaponarena\Selecting a weapon arena will give all players that weapon at spawn as well as unlimited ammo, and disable all other weapon pickups. \menu_weaponarena_with_laser\Also enable the laser in the weapon arena -\g_minstagib\Players will be given the Minstanex, which is a railgun with infinite damage. If the player runs out of ammo, he will have 10 seconds to find some or if he fails to do so, face death. The secondary fire mode is a laser which does not inflict any damage and is good for doing trickjumps. +\g_instagib\Players will be given the Minstanex, which is a railgun with infinite damage. If the player runs out of ammo, he will have 10 seconds to find some or if he fails to do so, face death. The secondary fire mode is a laser which does not inflict any damage and is good for doing trickjumps. \g_nix\No items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon. \g_nix_with_laser\Always carry the laser as an additional weapon in Nix \XonoticMultiplayerDialog/Select all\Выбрать все карты diff --git a/tooltips.db.uk b/tooltips.db.uk index 31695a631..bece5dc11 100644 --- a/tooltips.db.uk +++ b/tooltips.db.uk @@ -41,7 +41,7 @@ \g_weapon_stay\Зброя залишається після того, як була підібраною \g_weaponarena\Вибір арени з окремою зброєю дасть гравцям цю зброю і необмежену кількість боєприпасів до неї, і прибере з мапи всю іншу зброю \menu_weaponarena_with_laser\Зробити лазер доступним на аренах -\g_minstagib\Гравці отримують МінстаНекс, рейкову гармату яка вбиває одним пострілом. Якщо гравець витратить усі боєприпаси, у нього буде десять секунд щоб поновити його, інакше він загине. Альтернативний вогонь гармати це лазер який не наносить шкоди, корисний для трюків +\g_instagib\Гравці отримують МінстаНекс, рейкову гармату яка вбиває одним пострілом. Якщо гравець витратить усі боєприпаси, у нього буде десять секунд щоб поновити його, інакше він загине. Альтернативний вогонь гармати це лазер який не наносить шкоди, корисний для трюків \g_nix\Нікс (No items Xonotic) - замість того щоб підбирати предмети, всі гравці грають з однією зброєю. Через деякий час почнеться відлік, і зброя у всіх зміниться на іншу \g_nix_with_laser\Зробити лазер доступним у Нікс \XonoticMultiplayerDialog/Обрати все\Обрати всі мапи -- 2.39.2