rm'd further nex-havoc references

replace nex with xonotic in a lot of places
This commit is contained in:
Stephan Stahl 2010-03-30 20:55:57 +00:00
parent aa6f316cce
commit 2ec7592650
30 changed files with 110 additions and 185 deletions

View File

@ -1 +0,0 @@
exec defaultHavoc.cfg

View File

@ -1 +0,0 @@
nexuiz-linux-glx.sh

View File

@ -4,9 +4,9 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="author" content="Tyler Mulligan of www.detrition.net a.k.a -z- of www.nexuizninjaz.com" />
<meta name="Description" content="Nexuiz is a free open-source fast paced first person shooter (FPS) that runs on Windows, Linux and OSX. Nexuiz utilizes the darkplaces engine modeled after the Quake series." />
<meta name="Keywords" content="Nexuiz, Nexiuz, first person shooter, darkplaces, open-source game, open source game, free game, linux game, deathmatch, death match, ctf, quake, alientrap, alien trap, ninjaz" />
<title>Nexuiz - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX</title>
<meta name="Description" content="Xonotic is a free open-source fast paced first person shooter (FPS) that runs on Windows, Linux and OSX. Xonotic utilizes the darkplaces engine modeled after the Quake series." />
<meta name="Keywords" content="Xonotic, Nexiuz, first person shooter, darkplaces, open-source game, open source game, free game, linux game, deathmatch, death match, ctf, quake, alientrap, alien trap, ninjaz" />
<title>Xonotic - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX</title>
<link rel="stylesheet" href="Docs/htmlfiles/style.css" type="text/css"></link>
<link rel="shortcut icon" href="favicon.ico"></link>
</head>
@ -15,22 +15,22 @@
<div id="left">
<div id="logo">
<a href="http://www.nexuiz.com" title="Nexuiz - Simple, fast, intense and completely free"><img src="Docs/htmlfiles/img/nexuiz_logo.jpg" alt="Nexuiz is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." width="201" height="193" border="0" title="Nexuiz is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." /></a>
<a href="http://www.xonotic.org" title="Xonotic - Simple, fast, intense and completely free"><img src="Docs/htmlfiles/img/nexuiz_logo.jpg" alt="Xonotic is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." width="201" height="193" border="0" title="Xonotic is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." /></a>
</div>
<!-- Sidebar -->
<div id="sidebar">
<a href="news.php" title="Latest Nexuiz News"><img src="Docs/htmlfiles/img/headers/latest_news.gif" alt="Latest News" width="168" height="16" border="0" class="imgHeader" style="margin-top:0;" title="Latest Nexuiz News" /></a>
<a href="news.php" title="Latest Xonotic News"><img src="Docs/htmlfiles/img/headers/latest_news.gif" alt="Latest News" width="168" height="16" border="0" class="imgHeader" style="margin-top:0;" title="Latest Xonotic News" /></a>
<div id="news">
<div class="newsPost">
<h1><a href="http://nexuiz.com/news.php" title="Two Nexuiz 1v1 Tourneys">nexuiz.com/news - for nexuiz news updates</a></h1>
<h1><a href="http://xonotic.org/news.php" title="Two Xonotic 1v1 Tourneys">xonotic.org/news - for xonotic news updates</a></h1>
</div>
</div>
<!-- Downloads -->
<a href="downloads.php" title="Nexuiz Downloads (Game, Maps)"><img src="Docs/htmlfiles/img/headers/downloads.gif" alt="Downloads" width="145" height="15" border="0" class="imgHeader" title="Downloads" /></a>
<a id="download_nexuiz" href="http://www.sourceforge.net/projects/nexuiz/" title="Download Nexuiz from Source Forge - Left Click">&nbsp;</a>
<!--<a id="download_q3_mappack" href="http://downloads.sourceforge.net/nexuiz/nexmappack_r2.zip" title="Download Nexuiz Q3 Mappack from Source
<a href="downloads.php" title="Xonotic Downloads (Game, Maps)"><img src="Docs/htmlfiles/img/headers/downloads.gif" alt="Downloads" width="145" height="15" border="0" class="imgHeader" title="Downloads" /></a>
<a id="download_xonotic" href="http://www.sourceforge.net/projects/xonotic/" title="Download Xonotic from Source Forge - Left Click">&nbsp;</a>
<!--<a id="download_q3_mappack" href="http://downloads.sourceforge.net/xonotic/nexmappack_r2.zip" title="Download Xonotic Q3 Mappack from Source
Forge - Left Click">&nbsp;</a>-->
<h2 class="page"><a href="http://nexuiz.com/downloads.php" title="Nexuiz Download Mirrors">Mirrors -&gt;</a></h2>
<h2 class="page"><a href="http://xonotic.org/downloads.php" title="Xonotic Download Mirrors">Mirrors -&gt;</a></h2>
<!-- Help Wanted -->
<img src="Docs/htmlfiles/img/headers/help_wanted.gif" alt="Help Wanted" width="165" height="15" class="imgHeader" title="Help Wanted" />
@ -40,7 +40,7 @@
<!-- It not an elegant solution but I don't expect many users to arrive with JS turned off -->
<input name="submit" type="image" src="Docs/htmlfiles/img/donate_button_noscript.jpg" alt="Help this project - Donate to the aliens" width="166" height="43" />
</noscript>
<h2 class="page"><a href="http://nexuiz.com/donators.php" title="Those who have donated to Nexuiz">Donators -&gt;</a></h2>
<h2 class="page"><a href="http://xonotic.org/donators.php" title="Those who have donated to Xonotic">Donators -&gt;</a></h2>
<input name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----" type="hidden" /></form>
<!-- Created By -->
@ -50,14 +50,14 @@
<!-- end sidebar --> </div><!-- end left -->
<div id="right">
<div id="header">
<a href="http://nexuiz.com" title="Nexuiz - Simple, fast, intense and completely free"><img src="Docs/htmlfiles/img/nexuiz_header.jpg" alt="Nexuiz is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." width="766" height="107" border="0" title="Nexuiz - Simple, fast, intense and completely free" /></a>
<a href="http://xonotic.org" title="Xonotic - Simple, fast, intense and completely free"><img src="Docs/htmlfiles/img/nexuiz_header.jpg" alt="Xonotic is a free open-source fast paced first person shooter that runs on Windows, Linux and OSX." width="766" height="107" border="0" title="Xonotic - Simple, fast, intense and completely free" /></a>
</div>
<div id="menu">
<ul>
<li class="first"><a href="readme.html" title="Nexuiz - Latest News">About </a></li>
<li><a href="Docs/basics.html" title="Nexuiz - Media (Screenshots, videos and graphics)">Nexuiz Basics</a></li>
<li><a href="Docs/say-esc.html" title="Nexuiz Information (General, System Requirements)">Say Escapes</a></li>
<li class="first"><a href="readme.html" title="Xonotic - Latest News">About </a></li>
<li><a href="Docs/basics.html" title="Xonotic - Media (Screenshots, videos and graphics)">Xonotic Basics</a></li>
<li><a href="Docs/say-esc.html" title="Xonotic Information (General, System Requirements)">Say Escapes</a></li>
<li><a href="Docs/irc.html" title="Nexuiz - Downloads (Game, Maps)">IRC</a></li>
<li><a href="Docs/faq.html" title="Official Nexuiz FAQ">FAQ</a></li>
<li class="first"></li>

View File

@ -16,7 +16,7 @@ set help_cfg_prefix "^2"
// help messages
set help_msg_count 61
set help_msg_0 "Big Admin is watching you, so please be friendly or feel his almighty ban-hammer!"
set help_msg_1 "If you want to learn more about Nexuiz read Nexuiz/Docs/basics.html as it contains lots of useful tips and tricks, explains all the guns and gametes and helps to improve your game"
set help_msg_1 "If you want to learn more about Xonotic read Xonotic/Docs/basics.html as it contains lots of useful tips and tricks, explains all the guns and gametes and helps to improve your game"
set help_msg_2 "Please watch out for balanced teams and change by pressing F5 (teammenu) or F6 (auto join 'best' team)"
set help_msg_3 "When trying to bunny-hop you can re-press the jump button while you are still in the air, this will make those jumps VERY easy to time and work more reliable"
set help_msg_4 "When a vote is called you can accept it via F1 or reject it via F2 (default keys)"
@ -34,7 +34,7 @@ set help_msg_15 "Notice what is happening around you! If your base is empty in C
set help_msg_16 "You can drop the gun you currently have with backspace (default key). You can help your unarmed teammates this way."
set help_msg_17 "Learn to use the team messages! You find them in the Setting/Input menu. Try changing them to keys you can press easier than the defaults"
set help_msg_18 "Gaming should be fun! Try to have a nice time, be helpful, mindful and treat others like you want to be treated"
set help_msg_19 "Some interesting Nexuiz related webpages include the official forum on http://alientrap.org/forum/ , http://nexuizninjaz.com , http://planetnexuiz.de"
set help_msg_19 "Some interesting Xonotic related webpages include the official forum on http://alientrap.org/forum/ , http://nexuizninjaz.com , http://planetxonotic.de"
set help_msg_20 "If you already have a good gun, it's a great idea to let your teammates get something better than the shotgun too!"
set help_msg_21 "Press T to chat with others, press Y for messages to your team only, press TAB to see the scores, U for the chat history (default keys)"
set help_msg_22 "You can use 'suggestmap PART_OF_NAME' to make a map come up at the vote screen after a round was played"
@ -54,13 +54,13 @@ set help_msg_35 "The HLAC has less spread if you crouch. Secondary is a powerful
set help_msg_36 "The TAG seeker requires you to hit with the laser (primary) before it will release several target seeking rockets. Secondary is a shield or crazy flamethrower"
set help_msg_37 "The Camping Rifle shoots projectiles, so you need to lead your aim and consider gravity, but it can pierce thin walls and do headshots"
set help_msg_38 "By default, explosions go through walls. Be careful when hiding behind walls!"
set help_msg_39 "Get on IRC to chat with fellow players. #nexuiz on irc.quakenet.org is the most famous place"
set help_msg_39 "Get on IRC to chat with fellow players. #xonotic on irc.quakenet.org is the most famous place"
set help_msg_40 "Don't drink and frag"
set help_msg_41 "Don't shoot at players who are typing/chatting. You recognize those players by the keyboard symbols above their head"
set help_msg_42 "GG is shorthand for 'Good Game'"
set help_msg_43 "Players with the prefix '$bot_prefix' in their nick are bots on this server. There is also a clan named [BOT]"
set help_msg_44 "Read the help messages!"
set help_msg_45 "Visit the nexuiz ladder at http://planetnexuiz.com/ladder/ You can download demos of matches played by skilled players there. Studying these demos can help you to learn how to play this game"
set help_msg_45 "Visit the xonotic ladder at http://planetxonotic.com/ladder/ You can download demos of matches played by skilled players there. Studying these demos can help you to learn how to play this game"
set help_msg_46 "Start playing 1on1 if you want to learn fast"
set help_msg_47 "Visit http://alientrap.org/forum/ for discussion, more hints and news"
set help_msg_48 "Look for servers that have a good ping for you. You can't play this game well with a ping > 100. If there are no servers close enough to you, cooperate with your friends to setup one"

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - bans.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - bans.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
$store{plugin_bans}->{interval} = 60; #interval to displays bans

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - echo-rcon.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - echo-rcon.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
sub out($$@);

View File

@ -1,6 +1,6 @@
sub out($$@);
# chat: Nexuiz server -> IRC channel, fastest record in race and ctf
# chat: Xonotic server -> IRC channel, fastest record in race and ctf
[ dp => q{:recordset:(\d+):(.*)} => sub {
my ($id, $record) = @_;
my $nick = $store{"playernick_byid_$id"};

View File

@ -1,5 +1,5 @@
sub out($$@);
# chat: IRC channel -> Nexuiz server, nick change
# chat: IRC channel -> Xonotic server, nick change
[ irc => q{:([^! ]*)![^ ]* (?i:NICK) :(.*)} => sub {
my ($nick, $newnick) = @_;
$nick = color_dpfix $nick;

View File

@ -1,9 +1,9 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - joinmessage.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - joinmessage.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
# Do not use more than 5 lines here, as they will be cut off by the client.
my @jmtext = (
"Welcome to this Nexuiz server",
"Welcome to this Xonotic server",
"Have fun but please behave.",
);

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - joinsparts.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - joinsparts.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
# Don't forget to edit the options below to suit your needs.

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - ping-pl.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - ping-pl.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
# Don't forget to edit the options below to suit your needs.

View File

@ -1,11 +1,11 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - raw.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - raw.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
# Use this plugin with extreme caution, it allows irc-admins to modify ANYTHING on your server.
# Usage: In query with the bot the raw command directs commands to the server or irc connection.
# Example: raw dp exec server.cfg
# Example: raw irc PRIVMSG #nexuiz: YaY!
# Example: raw irc PRIVMSG #xonotic: YaY!
sub out($$@);

View File

@ -3,7 +3,7 @@ sub out($$@);
sub markmap($$$$;$)
{
my ($state, $map, $pro, $total, $who) = @_;
open my $fh, '>>', "$ENV{HOME}/.nexuiz/__votelog.$config{irc_nick}.txt"
open my $fh, '>>', "$ENV{HOME}/.xonotic/__votelog.$config{irc_nick}.txt"
or die "votelog open: $!";
print $fh "@{[time()]} $config{irc_nick} $state $map $pro $total" . (defined $who ? " $who" : "") . "\n";
close $fh;
@ -104,12 +104,12 @@ sub markmap($$$$;$)
my $ip = $store{"playerip_byid_$id"};
my $slot = $store{"playerslot_byid_$id"};
my $name = $config{irc_nick};
$name =~ s/Nex//; # haggerNexCTF -> haggerCTF
$name =~ s/Xon//; # haggerXonCTF -> haggerCTF
$name =~ s/^rm/hagger/g; # rmRace -> haggerRace
my $map = $store{map};
$map =~ s/^[a-z]*_//;
$ip =~ s/\./-/g;
my $pattern = "/home/nexuiz/home-$name/data/sv_autodemos/????-??-??_??-??_${map}_${slot}_${ip}-*.dem";
my $pattern = "/home/xonotic/home-$name/data/sv_autodemos/????-??-??_??-??_${map}_${slot}_${ip}-*.dem";
if(my @result = glob $pattern)
{
for(@result)
@ -133,8 +133,8 @@ sub markmap($$$$;$)
# delete demos at the end of the match
[ dp => q{:end} => sub {
my $name = $config{irc_nick};
$name =~ s/Nex//; # haggerNexCTF -> haggerCTF
my $pattern = "/home/nexuiz/data/home-$name/data/sv_autodemos/*.dem";
$name =~ s/Xon//; # haggerXonCTF -> haggerCTF
my $pattern = "/home/xonotic/data/home-$name/data/sv_autodemos/*.dem";
print "Checking $pattern...\n";
for(glob $pattern)
{

View File

@ -4,10 +4,10 @@ dp_password = hackme
# IRC configuration
irc_server = irc.oftc.net
irc_nick = testNex
irc_nick_alternates = testNex_ testNex__
irc_nick = testXon
irc_nick_alternates = testXon_ testXon__
irc_user = banme
irc_channel = #Nexuiz-Pwayers
irc_channel = #Xonotic-Pwayers
# uncomment for server administration via IRC
#irc_admin_password = hackme
@ -25,7 +25,7 @@ irc_channel = #Nexuiz-Pwayers
#plugins =
# Alternate IRC trigger (can be used instead of nickname to send stuff to the server)
#irc_trigger = nexnexnex
#irc_trigger = xonxonxon
# Custom output options
#irc_announce_slotsfree = 1

View File

@ -729,9 +729,9 @@ our %config = (
# Nexuiz specific parsing of some server messages
# Xonotic specific parsing of some server messages
sub nex_slotsstring()
sub xon_slotsstring()
{
my $slotsstr = "";
if(defined $store{slots_max})
@ -740,7 +740,7 @@ sub nex_slotsstring()
my $slots_s = ($slots == 1) ? '' : 's';
$slotsstr = " ($slots free slot$slots_s)";
my $s = $config{dp_server_from_wan} || $config{dp_server};
$slotsstr .= "; join now: \002nexuiz +connect $s"
$slotsstr .= "; join now: \002xonotic +connect $s"
if $slots >= 1 and not $store{lms_blocked};
}
return $slotsstr;
@ -1104,7 +1104,7 @@ sub cond($)
}
else
{
my $slotsstr = nex_slotsstring();
my $slotsstr = xon_slotsstring();
out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION can be joined again$slotsstr!\001";
}
}
@ -1391,14 +1391,14 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel
# chat: Xonotic server -> IRC channel
[ dp => q{\001(.*?)\^7: (.*)} => sub {
my ($nick, $message) = map { color_dp2irc $_ } @_;
out irc => 0, "PRIVMSG $config{irc_channel} :<$nick\017> $message";
return 0;
} ],
# chat: Nexuiz server -> IRC channel, nick set
# chat: Xonotic server -> IRC channel, nick set
[ dp => q{:join:(\d+):(\d+):([^:]*):(.*)} => sub {
my ($id, $slot, $ip, $nick) = @_;
$store{"playernickraw_byid_$id"} = $nick;
@ -1410,7 +1410,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, nick change/set
# chat: Xonotic server -> IRC channel, nick change/set
[ dp => q{:name:(\d+):(.*)} => sub {
my ($id, $nick) = @_;
$store{"playernickraw_byid_$id"} = $nick;
@ -1421,7 +1421,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, vote call
# chat: Xonotic server -> IRC channel, vote call
[ dp => q{:vote:vcall:(\d+):(.*)} => sub {
my ($id, $command) = @_;
$command = color_dp2irc $command;
@ -1430,7 +1430,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, vote stop
# chat: Xonotic server -> IRC channel, vote stop
[ dp => q{:vote:vstop:(\d+)} => sub {
my ($id) = @_;
my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
@ -1438,7 +1438,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, master login
# chat: Xonotic server -> IRC channel, master login
[ dp => q{:vote:vlogin:(\d+)} => sub {
my ($id) = @_;
my $oldnick = $id ? $store{"playernick_byid_$id"} : "(console)";
@ -1446,7 +1446,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, master do
# chat: Xonotic server -> IRC channel, master do
[ dp => q{:vote:vdo:(\d+):(.*)} => sub {
my ($id, $command) = @_;
$command = color_dp2irc $command;
@ -1455,7 +1455,7 @@ sub cond($)
return 0;
} ],
# chat: Nexuiz server -> IRC channel, result
# chat: Xonotic server -> IRC channel, result
[ dp => q{:vote:v(yes|no|timeout):(\d+):(\d+):(\d+):(\d+):(-?\d+)} => sub {
my ($result, $yes, $no, $abstain, $not, $min) = @_;
my $spam = "$yes:$no" . (($min >= 0) ? " ($min needed)" : "") . ", $abstain didn't care, $not didn't vote";
@ -1463,7 +1463,7 @@ sub cond($)
return 0;
} ],
# chat: IRC channel -> Nexuiz server
# chat: IRC channel -> Xonotic server
[ irc => q{:([^! ]*)![^ ]* (?i:PRIVMSG) (?i:(??{$config{irc_channel}})) :(?i:(??{$store{irc_nick}}))(?: |: ?|, ?)(.*)} => sub {
my ($nick, $message) = @_;
$nick = color_dpfix $nick;
@ -1505,7 +1505,7 @@ sub cond($)
$store{map} = $map;
$store{map_starttime} = time();
if ($config{irc_announce_mapchange} eq 'always' || ($config{irc_announce_mapchange} eq 'notempty' && $store{slots_active} > 0)) {
my $slotsstr = nex_slotsstring();
my $slotsstr = xon_slotsstring();
out irc => 0, "PRIVMSG $config{irc_channel} :\00304" . $map . "\017 has begun$slotsstr";
}
delete $store{lms_blocked};
@ -1518,7 +1518,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel (start)
# scores: Xonotic server -> IRC channel (start)
[ dp => q{:scores:(.*):(\d+)} => sub {
my ($map, $time) = @_;
$store{scores} = {};
@ -1529,7 +1529,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel, legacy format
# scores: Xonotic server -> IRC channel, legacy format
[ dp => q{:player:(-?\d+):(\d+):(\d+):(\d+):(\d+):(.*)} => sub {
my ($frags, $deaths, $time, $team, $id, $name) = @_;
return if not exists $store{scores};
@ -1538,7 +1538,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel (CTF), legacy format
# scores: Xonotic server -> IRC channel (CTF), legacy format
[ dp => q{:teamscores:(\d+:-?\d*(?::\d+:-?\d*)*)} => sub {
my ($teams) = @_;
return if not exists $store{scores};
@ -1546,7 +1546,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel, new format
# scores: Xonotic server -> IRC channel, new format
[ dp => q{:player:see-labels:(-?\d+)[-0-9,]*:(\d+):(\d+):(\d+):(.*)} => sub {
my ($frags, $time, $team, $id, $name) = @_;
return if not exists $store{scores};
@ -1554,7 +1554,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel (CTF), new format
# scores: Xonotic server -> IRC channel (CTF), new format
[ dp => q{:teamscores:see-labels:(-?\d+)[-0-9,]*:(\d+)} => sub {
my ($frags, $team) = @_;
return if not exists $store{scores};
@ -1562,7 +1562,7 @@ sub cond($)
return 0;
} ],
# scores: Nexuiz server -> IRC channel
# scores: Xonotic server -> IRC channel
[ dp => q{:end} => sub {
return if not exists $store{scores};
my $s = $store{scores};

View File

@ -1,9 +1,9 @@
rcon2irc - IRC gateway for Nexuiz servers, using rcon authorization
rcon2irc - IRC gateway for Xonotic servers, using rcon authorization
Quick installation guide:
1. Set up rcon access on your Nexuiz server, by adding some line like
1. Set up rcon access on your Xonotic server, by adding some line like
rcon_password hackme
in your server.cfg. This password gives anyone FULL access to your server,
so do not give it away! This IRC gateway does not work with a
@ -11,7 +11,7 @@ Quick installation guide:
2. Copy rcon2irc-example.conf to another name (e.g. rcon2irc.conf), and edit
the settings to match your setup. At the very least:
- change dp_server to the IP (or IP:port) of your Nexuiz server
- change dp_server to the IP (or IP:port) of your Xonotic server
- change dp_password to the rcon password set above
- change irc_server to the IRC server to connect to
- change irc_nick to the nick name to use
@ -30,29 +30,29 @@ Features:
- Show results of matches in the IRC channel
- Act as a gateway to allow chat between Nexuiz server and IRC users, useful
- Act as a gateway to allow chat between Xonotic server and IRC users, useful
for making the server more interesting to the public, but also useful as a
mere helper for the server admin to watch what's happening in game (like, if
people complain about a problem):
- Any line written in game using say (not say_team) goes to the IRC channel.
- Any line written in the channel, prefixed by the bot's nick name and a :,
goes into the Nexuiz game.
goes into the Xonotic game.
- Example:
View in game:
XSAX LTU: GREAT WIN AHAHAHAHAHAHAHAHAH))
(RedAlert) stop teamkilling!
.ThreeHeadedMonkey.: I am behind you!
View on IRC, assuming the IRC gateway has the nick noobNex and is voiced:
<+noobNex> <XSAX LTU> GREAT WIN AHAHAHAHAHAHAHAHAH))
<+noobNex> <.ThreeHeadedMonkey.> I am behind you!
View on IRC, assuming the IRC gateway has the nick noobXon and is voiced:
<+noobXon> <XSAX LTU> GREAT WIN AHAHAHAHAHAHAHAHAH))
<+noobXon> <.ThreeHeadedMonkey.> I am behind you!
- Notify about free slots on the server. Example:
* noobNex is full!
* noobNex can be joined again (2 free slots); join now: nexuiz +connect 172.23.42.54!
<+noobNex> ctf_capturecity_v2r1 has begun (2 free slots); join now: nexuiz +connect 172.23.42.54
* noobXon is full!
* noobXon can be joined again (2 free slots); join now: xonotic +connect 172.23.42.54!
<+noobXon> ctf_capturecity_v2r1 has begun (2 free slots); join now: xonotic +connect 172.23.42.54
- Display scores at the end of a match in the IRC channel. Example:
<+noobNex> ctf_capturecity_v2r1 ended: 301:78 Nicole 115, elsteer BLD {Y} 77,
<+noobXon> ctf_capturecity_v2r1 ended: 301:78 Nicole 115, elsteer BLD {Y} 77,
CensoredNickname 57, 0grueN# 29, Bigus 23, ZeroA 36, ricer 22,
Treey@suse8 12, cZaR6RUSS7 8, BrightDev1l 0

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - rename.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - rename.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
sub out($$@);

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - showlogins.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - showlogins.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
{ my %sl = (

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - suggestmap.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - suggestmap.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
sub out($$@);

View File

@ -1,4 +1,4 @@
# Nexuiz rcon2irc plugin by Merlijn Hofstra licensed under GPL - votestop.pl
# Xonotic rcon2irc plugin by Merlijn Hofstra licensed under GPL - votestop.pl
# Place this file inside the same directory as rcon2irc.pl and add the full filename to the plugins.
# This plugin will stop an ongoing vote when the person who called it leaves. Edit the options below

View File

@ -1,22 +1,19 @@
This subdirectory contains scripts and a config file that can be used
to start a dedicated Nexuiz (default) or Nexuiz Havoc server (differs
in movement, weapon and other settings) on linux, mac or windows
systems and also some tools that help with maintaining your server.
to start a dedicated Xonotic server on linux, mac or windows systems
and also some tools that help with maintaining your server.
You will need to copy the right script into your Nexuiz main
directory, where the normal binaries are. There are two scrips for
each sytems, one to start a normal Nexuiz server and one to start a
Nexuiz 'Havoc' server. You then need to copy and ADJUST the config
file which is called server.cfg. You can copy it either into the
Nexuiz/data directory where the big data*.pk3 file is or when running
on linux or mac you can as well copy it into a special directory
called '~/.nexuiz/data'. After you have setup everything and have
adjusted the config file you can start the server by running the
server script.
You will need to copy the right script for your system into your
Xonotic main directory, where the normal binaries are. You then need
to copy and ADJUST the config file which is called server.cfg. You
can copy it either into the Xonotic/data directory where the big
data*.pk3 file is or when running on linux or mac you can as well copy
it into a special directory named '~/.xonotic/data'. After you have
setup everything and have adjusted the config file you can start the
server by running the server script.
Please make sure your server is always uptodate! Just signup the
Nexuiz release mailinglist to get informed about new releases.
https://lists.sourceforge.net/lists/listinfo/nexuiz-releases
Xonotic release mailinglist to get informed about new releases.
https://lists.sourceforge.net/lists/listinfo/xonotic-releases
An important thing is to make sure that your firewall does allow
players to connect to your server. This typicly means you will have
@ -26,7 +23,7 @@ computer running your server. How to do this does depend on your
computer and network setup.
If you plan to install custom maps on your server you should read the
file Nexuiz/Docs/mapdownload.txt to learn how to setup automatic map
file Xonotic/Docs/mapdownload.txt to learn how to setup automatic map
download.
In case you want to rename the server.cfg file, e.g. because you want
@ -45,11 +42,11 @@ variables with 'cmdlist' and 'cvarlist' in the server console.
rcon.pl is a perl script that implements rcon which can be used to
remotely control your server.
rcon2irc is a Nexuiz server to irc gateway. It allows you to watch
rcon2irc is a Xonotic server to irc gateway. It allows you to watch
and communicate with active players on your server via irc. Read its
rcon2irc.txt to learn how to setup and use it!
help.cfg is a Nexuiz config file providing a simple help message
help.cfg is a Xonotic config file providing a simple help message
system. It prints all the messages from a list, one after the other
with an configureable delay between them. Great to provide beginners
with some hints.

View File

@ -11,7 +11,7 @@
//sv_public 1 // 0 if the server should not be on the public servers list
//sv_status_privacy 1 // 1 hides IP addresses from "status" replies shown to clients, 0 shows them. Enables players to identify wellknown punks on your server OR is a thread to anonymity.. depending on your point of view :)
//hostname "Nexuiz $g_nexuizversion Server" // this name will appear on the server list (the $g_nexuizversion gets replaced with the current version)
//hostname "Xonotic $g_xonoticversion Server" // this name will appear on the server list (the $g_xonoticversion gets replaced with the current version)
//sv_motd "" // this message (unless "") is displayed to players on connect
//maxplayers 8 // number of players allowed on the server
//port 26000 // the port used by the server
@ -55,7 +55,7 @@
// select AT MOST one of these arena mutators
//g_minstagib 0 // set to 1 for MinstaGib
//g_nixnex 0 // set to 1 for No Items Nexuiz
//g_nixnex 0 // set to 1 for No Items Xonotic
//g_nixnex_with_laser 0 // set to 1 to always give players the laser in NixNex
//g_rocketarena 0 // set to 1 to make the rocket launcher the only weapon
@ -108,7 +108,7 @@
//sv_maxrate 1000000 // limits client connections to this rate in bytes/seconds
// see Docs/mapdownload.txt for more info
//sv_curl_defaulturl http://www.nexuiz.com/contentdownload/getmap.php?file= //fallback download URL
//sv_curl_defaulturl http://www.xonotic.com/contentdownload/getmap.php?file= //fallback download URL
//sv_defaultcharacter 0 // 1 will force a specific model for all players
//sv_defaultplayermodel models/player/nexus.zym // this model will be used
@ -119,5 +119,5 @@
//g_balance_teams 1 // 0 will show players the team selection menu after joining instead of automaticly putting them on the smaller team
//g_balance_teams_force 0 // 1 to automaticly balance teams even during a game
//set g_ban_sync_uri "http://94.23.21.40/~nexuiz/bans/" // sync bans using this ban list provider (disabled by default, uncomment this line to enable)
//set g_ban_sync_uri "http://94.23.21.40/~xonotic/bans/" // sync bans using this ban list provider (disabled by default, uncomment this line to enable)
//set g_ban_sync_trusted_servers "" // accept bans that were initially set on the server IPs listed here (if not set, your bans are just sent to the sync URIs, but no bans are retrieved from there)

View File

@ -1,23 +0,0 @@
#!/bin/sh
case "$(uname -m)" in
x86_64) executable="nexuiz-linux-x86_64-dedicated" ;;
*) executable="nexuiz-linux-686-dedicated" ;;
esac
cd "`dirname "${0}"`"
if ! [ -x "$executable" ]; then
if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ] || [ -f ~/.nexuiz/havoc/server.cfg ] || [ -f ../havoc/server.cfg ]; }; then
cd ..
else
echo "This script is not properly set up yet."
echo "Please refer to the instructions in readme.txt."
echo "In short:"
echo "- copy server.cfg to the data directory and adjust its settings"
echo "- move this file to the main directory of your Nexuiz installation"
exit 1
fi
fi
exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

View File

@ -1,20 +0,0 @@
#!/bin/sh
executable="nexuiz-osx-dedicated"
cd "`dirname "${0}"`"
if ! [ -x "$executable" ]; then
if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ] || [ -f ~/.nexuiz/havoc/server.cfg ] || [ -f ../havoc/server.cfg ]; }; then
cd ..
else
echo "This script is not properly set up yet."
echo "Please refer to the instructions in readme.txt."
echo "In short:"
echo "- copy server.cfg to the data directory and adjust its settings"
echo "- move this file to the main directory of your Nexuiz installation"
exit 1
fi
fi
exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

View File

@ -1,28 +0,0 @@
@echo off
setlocal
set executable=nexuiz -dedicated
%~d0
cd "%~p0"
if exist %executable% goto good
if not exist ..\%executable% goto bad
if exist ..\data\server.cfg goto halfgood
if exist ..\havoc\server.cfg goto halfgood
goto bad
:bad
echo This script is not properly set up yet.
echo Please refer to the instructions in readme.txt.
echo In short:
echo - copy server.cfg to the data directory and adjust its settings
echo - move this file to the main directory of your Nexuiz installation
pause
exit
:halfgood
cd ..
:good
.\%executable% -game havoc +serverconfig server.cfg %*

View File

@ -1,21 +1,21 @@
#!/bin/sh
case "$(uname -m)" in
x86_64) executable="nexuiz-linux-x86_64-dedicated" ;;
*) executable="nexuiz-linux-686-dedicated" ;;
x86_64) executable="xonotic-linux-x86_64-dedicated" ;;
*) executable="xonotic-linux-686-dedicated" ;;
esac
cd "`dirname "${0}"`"
if ! [ -x "$executable" ]; then
if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then
if [ -x "../$executable" ] && { [ -f ~/.xonotic/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then
cd ..
else
echo "This script is not properly set up yet."
echo "Please refer to the instructions in readme.txt."
echo "In short:"
echo "- copy server.cfg to the data directory and adjust its settings"
echo "- move this file to the main directory of your Nexuiz installation"
echo "- move this file to the main directory of your Xonotic installation"
exit 1
fi
fi

View File

@ -1,18 +1,18 @@
#!/bin/sh
executable="nexuiz-osx-dedicated"
executable="xonotic-osx-dedicated"
cd "`dirname "${0}"`"
if ! [ -x "$executable" ]; then
if [ -x "../$executable" ] && { [ -f ~/.nexuiz/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then
if [ -x "../$executable" ] && { [ -f ~/.xonotic/data/server.cfg ] || [ -f ../data/server.cfg ]; }; then
cd ..
else
echo "This script is not properly set up yet."
echo "Please refer to the instructions in readme.txt."
echo "In short:"
echo "- copy server.cfg to the data directory and adjust its settings"
echo "- move this file to the main directory of your Nexuiz installation"
echo "- move this file to the main directory of your Xonotic installation"
exit 1
fi
fi

View File

@ -1,7 +1,7 @@
@echo off
setlocal
set executable=nexuiz -dedicated
set executable=xonotic -dedicated
%~d0
cd "%~p0"
@ -16,7 +16,7 @@ echo This script is not properly set up yet.
echo Please refer to the instructions in readme.txt.
echo In short:
echo - copy server.cfg to the data directory and adjust its settings
echo - move this file to the main directory of your Nexuiz installation
echo - move this file to the main directory of your Xonotic installation
pause
exit

View File

@ -16,9 +16,9 @@ case "$(uname -m)" in
*) arch="686" ;;
esac
nexuiz="nexuiz-linux-${arch}-${mode}"
xonotic="xonotic-linux-${arch}-${mode}"
set -- ./${nexuiz} "${@}"
set -- ./${xonotic} "${@}"
xserver=
xlayout=
@ -43,14 +43,14 @@ setdisplay()
}
# now how do we execute it?
if [ -r ~/.nexuiz/data/config.cfg ]; then
if [ -r ~/.xonotic/data/config.cfg ]; then
while read -r CMD KEY VALUE; do
case "$CMD:$KEY" in
seta:vid_x11_display)
setdisplay "$VALUE"
;;
esac
done < ~/.nexuiz/data/config.cfg
done < ~/.xonotic/data/config.cfg
fi
m=0
@ -88,10 +88,10 @@ case "$xserver" in
# X server already exists
export DISPLAY=:$xserver
prefix="DISPLAY=:$xserver "
msg=$msg$lf"- Running Nexuiz on already existing display :$xserver"
msg=$msg$lf"- Running Xonotic on already existing display :$xserver"
else
set -- startx "$@" -fullscreen -- ":$xserver"
msg=$msg$lf"- Running Nexuiz on a newly created X server :$xserver."
msg=$msg$lf"- Running Xonotic on a newly created X server :$xserver."
case "$xlayout" in
'')
;;
@ -111,7 +111,7 @@ case "$xserver" in
echo "Resulting command line:"
echo " $prefix$*"
echo
echo "To undo these overrides, edit ~/.nexuiz/data/config.cfg and remove the line"
echo "To undo these overrides, edit ~/.xonotic/data/config.cfg and remove the line"
echo "starting with 'seta vid_x11_display'."
echo
echo

1
xonotic-linux-sdl.sh Symbolic link
View File

@ -0,0 +1 @@
xonotic-linux-glx.sh