[nexuiz-commits] r6887 - in branches/nexuiz-2.0: . data data/gfx/menu/blueplastic data/gfx/menu/default data/gfx/menu/silver data/gfx/menu/simplygray data/gfx/menu/wickedblack data/gfx/menu/wickedblue data/gfx/menu/wickedgreen data/gfx/menu/wickedred data/gfx/menu/wickedwhite data/gfx/menu/wickedyellow data/gfx/menu/wickedz data/gfx/menu/xaw data/maps data/models/player data/qcsrc/client data/qcsrc/menu data/qcsrc/menu/nexuiz data/qcsrc/server data/sound/announcer/male data/sound/cdtracks data/sound/misc data/sound/player data/sound/player/pyria-skadi/coms data/sound/weapons server/rcon2irc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jun 6 11:32:09 EDT 2009
Author: div0
Date: 2009-06-06 11:32:09 -0400 (Sat, 06 Jun 2009)
New Revision: 6887
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/effectinfo.txt
branches/nexuiz-2.0/data/gfx/menu/blueplastic/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/silver/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/simplygray/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedblack/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedblue/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedgreen/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedred/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedwhite/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedyellow/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt
branches/nexuiz-2.0/data/gfx/menu/xaw/skinvalues.txt
branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints
branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints.cache
branches/nexuiz-2.0/data/models/player/pyria.zym.sounds
branches/nexuiz-2.0/data/models/player/skadi.zym.sounds
branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc
branches/nexuiz-2.0/data/qcsrc/menu/item.c
branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/button.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qh
branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
branches/nexuiz-2.0/data/qcsrc/server/portals.qc
branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc
branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc
branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc
branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
branches/nexuiz-2.0/data/sound/announcer/male/airshot.ogg
branches/nexuiz-2.0/data/sound/announcer/male/headshot.ogg
branches/nexuiz-2.0/data/sound/announcer/male/impressive.ogg
branches/nexuiz-2.0/data/sound/announcer/male/yoda.ogg
branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
branches/nexuiz-2.0/data/sound/misc/armor1.wav
branches/nexuiz-2.0/data/sound/misc/armor10.wav
branches/nexuiz-2.0/data/sound/misc/armor17_5.wav
branches/nexuiz-2.0/data/sound/misc/powerup.ogg
branches/nexuiz-2.0/data/sound/player/lava.wav
branches/nexuiz-2.0/data/sound/player/pyria-skadi/coms/needhelp1.ogg
branches/nexuiz-2.0/data/sound/weapons/brass1.ogg
branches/nexuiz-2.0/data/sound/weapons/brass2.ogg
branches/nexuiz-2.0/data/sound/weapons/brass3.ogg
branches/nexuiz-2.0/data/sound/weapons/campingrifle_fire2.ogg
branches/nexuiz-2.0/data/sound/weapons/campingrifle_reload.ogg
branches/nexuiz-2.0/data/sound/weapons/crylink_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/crylink_fire2.ogg
branches/nexuiz-2.0/data/sound/weapons/electro_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/grenade_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/grenade_impact.ogg
branches/nexuiz-2.0/data/sound/weapons/hagar_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/hagexp1.ogg
branches/nexuiz-2.0/data/sound/weapons/hagexp2.ogg
branches/nexuiz-2.0/data/sound/weapons/hagexp3.ogg
branches/nexuiz-2.0/data/sound/weapons/minstanexfire.ogg
branches/nexuiz-2.0/data/sound/weapons/nexfire.ogg
branches/nexuiz-2.0/data/sound/weapons/rocket_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/rocket_impact.ogg
branches/nexuiz-2.0/data/sound/weapons/shotgun_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/tag_rocket_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/tagexp1.ogg
branches/nexuiz-2.0/data/sound/weapons/tagexp2.ogg
branches/nexuiz-2.0/data/sound/weapons/tagexp3.ogg
branches/nexuiz-2.0/data/sound/weapons/uzi_fire.ogg
branches/nexuiz-2.0/server/rcon2irc/rcon2irc-example.conf
branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl
Log:
r6813 | mand1nga | 2009-05-30 14:59:51 -0400 (Sat, 30 May 2009) | 1 line
Make bots find their ctf base
r6814 | div0 | 2009-05-30 15:04:31 -0400 (Sat, 30 May 2009) | 2 lines
make seeker missile twice its normal collision box size, to make it easier to hit
r6815 | mand1nga | 2009-05-30 16:49:08 -0400 (Sat, 30 May 2009) | 1 line
New waypoints for bloodprisonctf
r6816 | div0 | 2009-05-31 06:25:22 -0400 (Sun, 31 May 2009) | 10 lines
tooltip support for the menu (only the credits dialog has a tooltip as of now)
To assign a tooltip to a class, add:
ATTRIB(CLASSNAMEGOESHERE, tooltip, string, "Information about who was involved in making this game.")
to the class declaration
To assign a tooltip to a button or label or other item, add:
e.tooltip = "Information about who was involved in making this game.";
behind the "e = make......" function call.
r6817 | div0 | 2009-05-31 06:39:04 -0400 (Sun, 31 May 2009) | 2 lines
automatic tooltips from cvar descriptions
r6818 | div0 | 2009-05-31 06:45:28 -0400 (Sun, 31 May 2009) | 2 lines
fix maxplayers handlignj of menu
r6819 | div0 | 2009-05-31 06:53:26 -0400 (Sun, 31 May 2009) | 2 lines
only show tooltips for not engine owned cvars
r6820 | div0 | 2009-05-31 06:54:45 -0400 (Sun, 31 May 2009) | 2 lines
cleanup
r6821 | div0 | 2009-05-31 06:58:06 -0400 (Sun, 31 May 2009) | 2 lines
fix campaign welcome msg really
r6822 | div0 | 2009-05-31 08:12:01 -0400 (Sun, 31 May 2009) | 2 lines
simplify waypointsprites code, assuming cs_*project are working
r6823 | div0 | 2009-05-31 08:12:20 -0400 (Sun, 31 May 2009) | 2 lines
less leaks for everyone
r6824 | greenmarine | 2009-05-31 09:40:00 -0400 (Sun, 31 May 2009) | 1 line
documented a couple of cvars, removed the g_shocknex variable (does that mean someone has to update that cvar count funny script thing again?)
r6825 | mrbougo | 2009-05-31 09:43:19 -0400 (Sun, 31 May 2009) | 1 line
yes it does
r6826 | mrbougo | 2009-05-31 09:59:26 -0400 (Sun, 31 May 2009) | 1 line
Previous commit also tweaked colors for robot blood. This one removes a dupe newline :P
r6827 | div0 | 2009-05-31 12:36:26 -0400 (Sun, 31 May 2009) | 2 lines
overridable tooltips (see tooltips.db)
r6828 | div0 | 2009-05-31 12:41:27 -0400 (Sun, 31 May 2009) | 2 lines
fix a tooltip related warning message spam
r6829 | div0 | 2009-05-31 13:10:57 -0400 (Sun, 31 May 2009) | 2 lines
when teleporting, prevent unsticking by oldorigin restoring
r6830 | mand1nga | 2009-05-31 13:25:40 -0400 (Sun, 31 May 2009) | 1 line
Added teamcount() function, will be used to improve the ctf ai
r6831 | mand1nga | 2009-05-31 13:32:01 -0400 (Sun, 31 May 2009) | 1 line
Reverted change commited accidentaly
r6832 | mand1nga | 2009-05-31 14:36:34 -0400 (Sun, 31 May 2009) | 1 line
Improved rating of items
r6833 | div0 | 2009-05-31 15:06:22 -0400 (Sun, 31 May 2009) | 2 lines
new cvars: g_weaponspeedfactor, g_weapondamagefactor (mimicking UT's "game style" setting)
r6834 | mand1nga | 2009-05-31 16:29:20 -0400 (Sun, 31 May 2009) | 1 line
Better sighting of enemies
r6835 | div0 | 2009-06-01 11:21:41 -0400 (Mon, 01 Jun 2009) | 2 lines
rcon2irc enhancements by merlijn
r6836 | div0 | 2009-06-01 11:32:54 -0400 (Mon, 01 Jun 2009) | 2 lines
wickedz tooltip image
r6837 | div0 | 2009-06-01 11:39:48 -0400 (Mon, 01 Jun 2009) | 2 lines
fix CP rotation
r6838 | div0 | 2009-06-01 12:32:04 -0400 (Mon, 01 Jun 2009) | 2 lines
tenshihan 6.1
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/.patchsets 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6812
+revisions_applied = 1-6838
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-06-06 15:32:09 UTC (rev 6887)
@@ -24,7 +24,7 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 300f2d03c037b68c7254fe52a47575f8
+set cvar_check_default c120fa8ce7b9f4b1b86b922d65249573
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -224,24 +224,24 @@
cl_autodemo_nameformat demos/%Y-%m-%d_%H-%M
// taunts and voices
-seta cl_autotaunt 0
+seta cl_autotaunt 0 "automatically taunt enemies when fragging them"
seta cl_voice_directional 1 "0 = all voices are non-directional, 1 = all voices are directional, 2 = only taunts are directional"
-seta cl_voice_directional_taunt_attenuation 0.5
+seta cl_voice_directional_taunt_attenuation 0.5 "this defines the distance from which taunts can be heared"
// server settings
hostname "Nexuiz $g_nexuizversion Server"
set sv_mapchange_delay 5
-set minplayers 0
+set minplayers 0 "number of players playing at the same time (if not enough real players are there the remaining slots are filled with bots)"
sv_cullentities_trace 1
r_cullentities_trace 1
// restart server if all players hit "ready"-button
-set sv_ready_restart 0
+set sv_ready_restart 0 "if set to 1 allow a map to be restarted once all players pressed the \"ready\" button'"
set sv_ready_restart_after_countdown 0 "if set to 1 the players and map items are reset after the countdown ended, otherwise they're reset already at the beginning of the countdown"
set sv_ready_restart_repeatable 0 "allows the players to restart the game as often as needed"
//nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
-set teamplay_lockonrestart 0
+set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are locked once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"
set g_maxplayers 0 "maximum number of players allowed to play at the same time, set to 0 to allow all players to join the game"
set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectators\" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked"
@@ -252,12 +252,12 @@
set g_warmup_allow_timeout 0 "if set to 0 you cannot use the calltimeout command during the warmup-stage but only during the match stage"
set g_warmup_allguns 0 "if set players start with all guns in warmup mode"
set g_warmup_start_health 250 "starting values when being in warmup-stage"
-set g_warmup_start_armor 100
-set g_warmup_start_ammo_shells 50
-set g_warmup_start_ammo_nails 150
-set g_warmup_start_ammo_rockets 50
-set g_warmup_start_ammo_cells 50
-set g_warmup_start_ammo_fuel 0
+set g_warmup_start_armor 100 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
+set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage"
set sv_vote_nospectators 0 "if set only players can call a vote (thus spectators and observers can't call a vote)"
@@ -286,20 +286,20 @@
seta sv_precacheweapons 0
seta sv_precacheitems 0
set sv_spectator_speed_multiplier 1.5
-seta sv_spectate 1
-seta sv_defaultcharacter 0
-seta sv_defaultplayermodel models/player/nexus.zym
-seta sv_defaultplayerskin 0
+seta sv_spectate 1 "if set to 1, new clients are allowed to spectate or observe the game, if set to 0 joining clients spawn as players immediately (no specating)"
+seta sv_defaultcharacter 0 "master switch, if set to 1 the further configuration for replacing all player models, skins and colors is taken from the sv_defaultplayermodel, sv_defaultplayerskin and sv_defaultplayercolors variables"
+seta sv_defaultplayermodel "models/player/nexus.zym" "default model selection, only works if sv_defaultcharacter is set to 1"
+seta sv_defaultplayerskin 0 "each model has 1 or more skins (combination of model and skin = character), set which skin of the model you wish the default character to have, only works if sv_defaultcharacter is set to 1"
seta sv_defaultplayermodel_red "" "\"\" means see sv_defaultplayermodel"
seta sv_defaultplayerskin_red 0
-seta sv_defaultplayermodel_blue ""
+seta sv_defaultplayermodel_blue "" "\"\" means see sv_defaultplayermodel"
seta sv_defaultplayerskin_blue 0
-seta sv_defaultplayermodel_yellow ""
+seta sv_defaultplayermodel_yellow "" "\"\" means see sv_defaultplayermodel"
seta sv_defaultplayerskin_yellow 0
-seta sv_defaultplayermodel_pink ""
+seta sv_defaultplayermodel_pink "" "\"\" means see sv_defaultplayermodel"
seta sv_defaultplayerskin_pink 0
seta sv_defaultplayercolors "" "set to 16*shirt+pants to force a color, note: it does NOT depend on defaultcharacter! Set to \"\" to disable"
-set sv_autoscreenshot 0
+set sv_autoscreenshot 0 "if set to 1, the server forces all clients to create a local screenshot once the map ended"
net_messagetimeout 300
net_connecttimeout 30
sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
@@ -327,7 +327,7 @@
cl_movement_wateraccelerate $sv_wateraccelerate
cl_movement_waterfriction $sv_waterfriction
-seta cl_autoswitch 1
+seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"
alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1"
seta cl_playerdetailreduction 0 "the higher, the less detailed"
@@ -396,50 +396,48 @@
pausable 0
set g_antilag 2 "AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)"
set g_antilag_bullets 1 "Bullets AntiLag (0 = no AntiLag, 1 = server side hit scan in the past) - DO NOT TOUCH (severely changes weapon balance)"
-set g_shootfromeye 0
-set g_shootfromcenter 0
+set g_shootfromeye 0 "shots are fired from your eye/crosshair"
+set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon"
set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used"
-set g_pinata 0
-set g_weapon_stay 0
-set g_powerup_superhealth 1
-set g_powerup_strength 1
-set g_powerup_shield 1
-set g_use_ammunition 1
-set g_pickup_items 1
+set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed"
+set g_weapon_stay 0 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default)"
+set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map"
+set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map"
+set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map"
+set g_use_ammunition 1 "if set to 0 all weapons you pick up have unlimited ammunition"
+set g_pickup_items 1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map"
set g_minstagib 0 "enable minstagib"
set g_minstagib_extralives 2 "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_jumpheight 1.8
-set g_minstagib_speed_moverate 1.25
-set g_vampire 0
+set g_minstagib_speed_jumpheight 1.8 "jump height multiplier that applies while you carry the invincibility powerup"
+set g_minstagib_speed_moverate 1.25 "speed-multiplier that applies while you carry the invincibility powerup"
+set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
-set g_shocknex 0
-set g_laserguided_missile 0
-set g_midair 0
-set g_midair_shieldtime 0.3
-set g_spawnshieldtime 0
-set g_spawnsound 1
-set g_spawnpoints_autodrop 0
-set g_spawnpoints_auto_move_out_of_solid 0
-set g_forced_respawn 0
-set g_fullbrightplayers 0
-set g_fullbrightitems 0
-set g_casings 2
-set g_norecoil 0
-set g_throughfloor 1
-set g_maplist_mostrecent ""
+set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can be steered using a laserpointer"
+set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
+set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
+set g_spawnshieldtime 0 "number of seconds you are invincible after you spawned, this shield is lost after you fire"
+set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"
+set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high"
+set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
+set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
+set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
+set g_fullbrightitems 0 "brightens up items"
+set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: shotgun and machine gun casings) are sent to the client"
+set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
+set g_throughfloor 1 "set to 0 to disable damage through floor"
+set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
seta g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again"
seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone desertfactory dieselpower dismal downer eggandbacon evilspace farewell final_rage ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
seta g_maplist_index 0 "this is used internally for saving position in maplist cycle"
seta g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
-// timeout for kill credit when your damage knocks someone into a death trap
set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
-set g_maxpushtime 8.0
+set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
-set g_cloaked 0
+set g_cloaked 0 "display all players mostly invisible"
set g_player_alpha 1
set g_player_brightness 0 "set to 2 for brighter players"
seta g_balance_cloaked_alpha 0.25
@@ -448,7 +446,7 @@
alias clearmap "disconnect"
-set g_grappling_hook 0
+set g_grappling_hook 0 "let players spawn with the grappling hook which allows them to pull themselves up"
set g_balance_grapplehook_health 130
exec newhook.cfg
@@ -469,7 +467,7 @@
// 50% of the spawns shall be far away from any players
set g_spawn_furthest 0.5
// respawn delay
-set g_respawn_delay 2
+set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
set g_respawn_waves 0
// when variables are set to 0, they take over the global setting...
// to force disable delay or waves, set them to 0.125
@@ -494,7 +492,7 @@
seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all overtimes were added and still no winner was found"
// common team values
-set g_tdm 0
+set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
seta g_mirrordamage 0.3 "for teamplay 4: mirror damage factor"
@@ -512,11 +510,11 @@
set g_changeteam_fragtransfer 0 "% of frags you get to keep when you change teams (rounded down)"
// dm
-set g_dm 1
+set g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins"
set gamecfg 1 // "deathmatch"
// ctf
-set g_ctf 0
+set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
set g_ctf_flag_returntime 30
set g_ctf_flagcarrier_selfdamage 1
set g_ctf_flagcarrier_selfforce 1
@@ -542,7 +540,7 @@
exec ctfscoring-div0.cfg
// runematch
-set g_runematch 0
+set g_runematch 0 "Runematch: pick up and hold the runes, special items that give you points, a special power (rune) and a disadvantage (curse)"
set g_runematch_pointrate 5
set g_runematch_fixedspawns 1 "use fixed runematch spawns if available"
set g_runematch_pointamt 1
@@ -599,7 +597,7 @@
set g_balance_rune_speed_combo_jumpheight 1.0
// domination
-set g_domination 0
+set g_domination 0 "Domination: capture and hold control points to gain points"
set g_domination_default_teams 2 "default number of teams for maps that aren't domination-specific"
set g_domination_disable_frags 0 "players can't get frags normally, only get points from kills"
set g_domination_point_amt 0 "override: how many points to get per ping"
@@ -610,7 +608,7 @@
//set g_domination_balance_team_points 1 "# of points received is based on team sizes"
// last man standing
-set g_lms 0
+set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
set g_lms_lives_override -1
set g_lms_start_health 250
set g_lms_start_armor 100
@@ -628,22 +626,22 @@
set g_lms_join_anytime 1 "if true, new players can join, but get same amount of lives as the worst player"
// arena
-set g_arena 0
+set g_arena 0 "Arena: many one-on-one rounds are played to find the winner"
set g_arena_maxspawned 2 "maximum number of players to spawn at once (the rest is spectating, waiting for their turn)"
set g_arena_roundbased 1 "if disabled, the next player will spawn as soon as someone dies"
set g_arena_warmup 5 "time, newly spawned players have to prepare themselves in round based matches"
set g_arena_powerups 0 "enables powerups (superhealth, strength and shield), which are removed by default"
// onslaught
-set g_onslaught 0
+set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
set g_onslaught_gen_health 5000
set g_onslaught_cp_health 1000
// assault
-set g_assault 0
+set g_assault 0 "Assault: attack the enemy base as fast as you can, then defend the base against the enemy for that time to win"
// race
-set g_race 0
+set g_race 0 "Race: be faster than your opponents"
set g_race_qualifying 2
// Qualifying uses timelimit, and the one with the best time wins. Fraglimit is nonfunctional then.
// Normal race uses fraglimit as a limit for the laps.
@@ -652,7 +650,7 @@
set g_race_teams 0 "when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)"
// nexball
-set g_nexball 0
+set g_nexball 0 "Nexball: Basketball and Soccer go Nexuiz"
set g_nexball_basketball_effects_default 8 "default: dim light. The original version used 1024 (fire) but it gives bad performance"
set g_balance_nexball_primary_speed 1000 "launching speed"
@@ -757,7 +755,7 @@
seta r_ambient 4
cl_decals_fadetime 1
cl_decals_time 2
-seta cl_nogibs 0
+seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
seta cl_gibs_damageforcescale 3.5 "force to push around gibs"
seta cl_gibs_lifetime 14 "average lifetime of gibs"
seta cl_gibs_velocity_scale 1 "gib throw velocity force scale"
@@ -795,7 +793,7 @@
sv_sound_watersplash ""
seta cl_sound_maptime_warning "1" "play announcer sound telling you the remaining maptime - 0: do not play at all, 1: play at one minute, 2: play at five minutes, 3: play both"
-seta cl_hitsound 1
+seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy"
// startmap_dm is used when running with the -listen or -dedicated commandline options
set serverconfig server.cfg
@@ -992,8 +990,8 @@
// NixNex (No-Items x Nexuiz) - at each time, everyone uses the same weapon,
// and in regular intervals, this weapon is cycled
-set g_nixnex 0
-set g_nixnex_with_laser 0
+set g_nixnex 0 "No Items Nexuiz - 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, and so on"
+set g_nixnex_with_laser 0 "always carry the laser as an additional weapon in NixNex"
// TODO these need balancing:
set g_balance_nixnex_roundtime 25
set g_balance_nixnex_incrtime 1.6
@@ -1074,9 +1072,9 @@
// 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
// 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
-seta g_maplist_votable 6
+seta g_maplist_votable 6 "number of maps that are shown in the map voting at the end of a match"
seta g_maplist_votable_keeptwotime 15
-seta g_maplist_votable_timeout 30 "note: must be below 50 seconds!"
+seta g_maplist_votable_timeout 30 "timeout for the map voting; must be below 50 seconds!"
seta g_maplist_votable_suggestions 2
seta g_maplist_votable_suggestions_override_mostrecent 0
seta g_maplist_votable_nodetail 1 "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much"
@@ -1126,7 +1124,7 @@
alias "g_waypointsprite_clear" "impulse 48"
alias "g_waypointsprite_toggle" "impulse 49"
// key for that?
-seta cl_hidewaypoints 0
+seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
// command extension
alias qc_cmd "sv_cmd $*" // menu QC will override this to menu_cmd
@@ -1144,7 +1142,7 @@
alias addvote "qc_cmd addtolist sv_vote_commands $*"
// key hunt
-set g_keyhunt 0
+set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
set g_balance_keyhunt_delay_return 60
set g_balance_keyhunt_delay_round 5
set g_balance_keyhunt_delay_tracking 10
@@ -1249,12 +1247,12 @@
seta sbar_ballstatus_right 0
// for menu server list (eventually make them have engine support?)
-seta menu_slist_showfull 1
-seta menu_slist_showempty 1
+seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
+seta menu_slist_showempty 1 "show servers even if they are no empty and have no opponents to play against"
set menu_slist_modfilter "!havoc"
// for menu weapon arena
-set menu_weaponarena_with_laser 0
+set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena"
// Q3A
set sv_q3acompat_machineshotgunswap 0 "settemp this in mapinfo for instant Q3A map conversion"
@@ -1263,7 +1261,8 @@
// command executed before loading a map by the menu
// makes sure maxplayers is at least minplayers or bot_number + 1
-alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; maxplayers $_menu_loadmap_maxplayers; g_maplist_shufflenow"
+alias _menu_loadmap_prepare_setmaxplayers "maxplayers $_menu_loadmap_maxplayers"
+alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_setmaxplayers; g_maplist_shufflenow"
// useful vote aliases
set timelimit_increment 5
@@ -1324,7 +1323,7 @@
gl_texturecompression_sky 1
set menu_mouse_absolute 0 "TODO make this seta if the engine understands this right"
-seta menu_mouse_speed 1
+seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)"
set menu_use_default_hostname 1
alias sethostname "set menu_use_default_hostname 0; hostname $*"
@@ -1368,7 +1367,7 @@
// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
seta cl_weaponpriority "11 9 7 4 13 8 6 15 3 5 14 2 1 12 10" "weapon priority list (edit it using the menu, numbers see constants.qh)"
-seta cl_weaponpriority_useforcycling 0
+seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list"
seta cl_weaponpriority0 "9 4 13 8 14" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives"
seta cl_weaponpriority1 "11 7 6 5 1" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy"
seta cl_weaponpriority2 "11 7 15 3" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact"
@@ -1385,9 +1384,9 @@
seta cl_teamradar 1 "show radar in teammatches when available"
seta cl_teamradar_background_alpha 0.4 "set to -1 to disable"
seta cl_teamradar_foreground_alpha 0.8 "alpha of the map"
-seta cl_teamradar_scale 4096
+seta cl_teamradar_scale 4096 "distance you can see on the team radar"
seta cl_teamradar_rotation 0 "rotation mode: you set what points up. 0 = player, 1 = west, 2 = south, 3 = east, 4 = north"
-seta cl_teamradar_size "128 128"
+seta cl_teamradar_size "128 128" "size of the team radar in pixels"
seta cl_teamradar_position "0 0" "1 0 would be upper right corner, 0.5 0.5 the center"
seta cl_teamradar_zoommode 0 "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
alias cl_teamradar_rotate "toggle cl_teamradar_rotation 0 1 2 3 4"
@@ -1529,6 +1528,9 @@
set g_balance_pause_fuel_rot 5
set g_balance_pause_fuel_rot_spawn 10
+set g_weaponspeedfactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+
set cl_effects_lightningarc_simple 0
set cl_effects_lightningarc_segmentlength 64
set cl_effects_lightningarc_drift_start 0.45
Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/effectinfo.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1530,7 +1530,7 @@
velocitymultiplier 0.01
lightradius 200
lightradiusfade 2000
-lightcolor 2 1.5 0.2
+lightcolor 1.6 0.2 2
effect crylink_muzzleflash
count 10
type spark
@@ -3281,6 +3281,7 @@
tex 24 32
size 3 8
alpha 256 256 64
+color 0xC0D890 0xC0D890
bounce -1
airfriction 1
liquidfriction 4
@@ -3293,7 +3294,7 @@
tex 0 8
size 25 30
alpha 100 256 400
-color 0x000000 0x321964
+color 0x000000 0x301860
originjitter 11 11 11
@@ -3349,7 +3350,6 @@
velocityjitter 64 64 64
velocitymultiplier 0.5
-
// flare particle and light
// used in qcsrc/server/t_items.qc: pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1)
effect item_pickup
Modified: branches/nexuiz-2.0/data/gfx/menu/blueplastic/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/blueplastic/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/blueplastic/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -9,6 +9,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 1 1'
COLOR_DIALOG_SETTINGS '1 1 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/default/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '0.7 0.7 1'
COLOR_DIALOG_SETTINGS '0.7 0.7 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/silver/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/silver/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/silver/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 1 1'
COLOR_DIALOG_SETTINGS '0.95 0.95 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/simplygray/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/simplygray/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/simplygray/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE 0
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '0.7 0.7 0.7'
COLOR_DIALOG_SETTINGS '0.7 0.7 0.7'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedblack/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedblack/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedblack/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 1 1'
COLOR_DIALOG_SETTINGS '1 1 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedblue/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedblue/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedblue/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '0.5 0.75 1'
COLOR_DIALOG_SETTINGS '0.5 0.75 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedgreen/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedgreen/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedgreen/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '0.5 1 0'
COLOR_DIALOG_SETTINGS '0.5 1 0'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedred/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedred/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedred/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 0 0'
COLOR_DIALOG_SETTINGS '1 0 0'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedwhite/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedwhite/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedwhite/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 1 1'
COLOR_DIALOG_SETTINGS '1 1 1'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedyellow/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedyellow/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedyellow/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE -1
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 0.875 0'
COLOR_DIALOG_SETTINGS '1 0.875 0'
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -22,6 +22,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE 0
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '16 16 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '0.4 0.8 0.9'
COLOR_DIALOG_SETTINGS '0.5 0.65 0.7'
Modified: branches/nexuiz-2.0/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/xaw/skinvalues.txt 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/gfx/menu/xaw/skinvalues.txt 2009-06-06 15:32:09 UTC (rev 6887)
@@ -8,6 +8,15 @@
HEIGHT_TITLE 1.5
HEIGHT_ZOOMEDTITLE 0
+// tooltips
+// uses "tooltip" images
+MARGIN_TOOLTIP '5 5 0'
+BORDER_TOOLTIP '8 8 0'
+FONTSIZE_TOOLTIP 12
+ALPHA_TOOLTIP 0.7
+WIDTH_TOOLTIP 0.3
+AVOID_TOOLTIP '8 8 0'
+
// the individual dialog background colors
COLOR_DIALOG_MULTIPLAYER '1 1 1'
COLOR_DIALOG_SETTINGS '1 1 1'
Modified: branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints
===================================================================
--- branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1,171 +1,186 @@
-'3808.0 1922.6 408.0'
-'3808.0 1922.6 408.0'
+'1790.2 2698.8 254.5'
+'1790.2 2698.8 254.5'
0
-'2798.5 1925.7 408.0'
-'2798.5 1925.7 408.0'
+'2061.0 2654.0 254.5'
+'2061.0 2654.0 254.5'
0
-'3205.4 2295.7 292.8'
-'3205.4 2295.7 292.8'
+'2451.5 2181.0 254.5'
+'2451.5 2181.0 254.5'
0
-'3396.8 1522.0 292.8'
-'3396.8 1522.0 292.8'
+'2696.2 2779.1 254.5'
+'2696.2 2779.1 254.5'
0
-'3180.9 1920.0 408.0'
-'3180.9 1920.0 408.0'
+'3022.8 2763.5 254.5'
+'3022.8 2763.5 254.5'
0
-'1142.4 2716.8 259.4'
-'1142.4 2716.8 259.4'
+'3570.2 1093.3 254.5'
+'3570.2 1093.3 254.5'
0
-'4571.6 1411.0 254.4'
-'4571.6 1411.0 254.4'
+'1282.5 2264.2 254.5'
+'1282.5 2264.2 254.5'
0
-'4192.3 2275.9 306.0'
-'4192.3 2275.9 306.0'
+'1610.3 2244.7 254.5'
+'1610.3 2244.7 254.5'
0
-'4674.3 1828.1 -62.4'
-'4674.3 1828.1 -62.4'
+'1201.5 2449.9 254.5'
+'1201.5 2449.9 254.5'
0
-'5043.2 1591.1 254.4'
-'5043.2 1591.1 254.4'
+'1738.7 1721.6 408.1'
+'1738.7 1721.6 408.1'
0
-'4059.9 1804.3 339.0'
-'4959.9 1804.3 339.0'
+'2042.7 1861.5 408.1'
+'2042.7 1861.5 408.1'
0
-'4826.6 2109.8 408.0'
-'4826.6 2109.8 408.0'
+'2269.4 1914.7 408.1'
+'2269.4 1914.7 408.1'
0
-'4005.4 1220.1 254.4'
-'4005.4 1220.1 254.4'
+'1955.3 1219.4 408.1'
+'1955.3 1219.4 408.1'
0
-'4002.9 1468.2 254.4'
-'4002.9 1468.2 254.4'
+'2461.6 1739.6 254.5'
+'2461.6 1739.6 254.5'
0
-'4949.9 1930.0 406.0'
-'4949.9 1930.0 406.0'
+'2130.4 1847.4 -52.7'
+'2130.4 1847.4 -52.7'
0
-'4011.1 1818.1 254.4'
-'4011.1 1818.1 254.4'
+'2340.1 1846.5 24.1'
+'2340.1 1846.5 24.1'
0
-'4211.8 1653.1 254.4'
-'4211.8 1653.1 254.4'
+'2786.7 1877.2 14.5'
+'2786.7 1877.2 14.5'
0
-'4153.4 2164.4 254.4'
-'4153.4 2164.4 254.4'
+'2797.4 1959.7 14.5'
+'2797.4 1959.7 14.5'
0
-'4172.3 2385.9 361.0'
-'4172.3 2385.9 361.0'
+'4882.7 2109.3 408.1'
+'4882.7 2109.3 408.1'
0
-'4187.9 2546.3 408.0'
-'4187.9 2546.3 408.0'
+'5430.2 1372.5 254.5'
+'5430.2 1372.5 254.5'
0
-'4589.6 1642.8 335.0'
-'4589.6 1642.8 335.0'
+'3777.6 1877.9 14.5'
+'3777.6 1877.9 14.5'
0
-'4555.8 1834.7 408.0'
-'4555.8 1834.7 408.0'
+'3776.9 1961.3 14.5'
+'3776.9 1961.3 14.5'
0
-'3587.5 1238.5 254.4'
-'3587.5 1238.5 254.4'
+'4266.8 1965.1 14.5'
+'4266.8 1965.1 14.5'
0
-'3579.4 1550.6 120.7'
-'3579.4 1550.6 120.7'
+'4272.9 1831.0 24.1'
+'4272.9 1831.0 24.1'
0
-'3574.0 1782.2 24.0'
-'3574.0 1782.2 24.0'
+'4699.0 1642.0 -62.3'
+'4699.0 1642.0 -62.3'
0
-'3963.1 2433.3 339.0'
-'3963.1 2433.3 339.0'
+'5251.9 1655.9 -52.7'
+'5251.9 1655.9 -52.7'
0
-'4550.4 1593.6 -47.8'
-'4550.4 1593.6 -47.8'
+'4532.7 1796.2 -52.7'
+'4532.7 1796.2 -52.7'
0
-'4045.3 2534.9 408.0'
-'4045.3 2534.9 408.0'
+'2134.4 1992.8 -52.7'
+'2134.4 1992.8 -52.7'
0
-'3837.4 2305.3 254.4'
-'3837.4 2305.3 254.4'
+'2315.4 1983.6 24.1'
+'2315.4 1983.6 24.1'
0
-'4938.8 1578.9 -52.8'
-'4938.8 1578.9 -52.8'
+'1691.2 2146.0 -52.7'
+'1691.2 2146.0 -52.7'
0
-'3582.7 1924.9 24.0'
-'3582.7 1924.9 24.0'
+'1326.3 2200.6 -52.7'
+'1326.3 2200.6 -52.7'
0
-'2033.2 2429.0 254.4'
-'2033.2 2429.0 254.4'
+'5380.9 1385.8 -52.7'
+'5380.9 1385.8 -52.7'
0
-'2412.5 1564.1 306.0'
-'2412.5 1564.1 306.0'
+'5024.4 1524.4 -52.7'
+'5024.4 1524.4 -52.7'
0
-'1930.5 2011.9 -62.4'
-'1930.5 2011.9 -62.4'
+'1254.0 2446.7 -52.7'
+'1254.0 2446.7 -52.7'
0
-'1561.6 2248.9 254.4'
-'1561.6 2248.9 254.4'
+'1731.4 2282.5 -52.7'
+'1731.4 2282.5 -52.7'
0
-'1644.9 2035.7 339.0'
-'1644.9 2035.7 339.0'
+'1541.6 2313.1 -52.7'
+'1541.6 2313.1 -52.7'
0
-'1778.2 1730.2 408.0'
-'1778.2 1730.2 408.0'
+'1696.4 2009.7 350.5'
+'1696.4 2009.7 350.5'
0
-'2599.4 2619.9 254.4'
-'2599.4 2619.9 254.4'
+'4979.5 1804.1 331.3'
+'4979.5 1804.1 331.3'
0
-'2601.9 2371.8 254.4'
-'2601.9 2371.8 254.4'
+'2527.6 1298.9 408.1'
+'2527.6 1298.9 408.1'
0
-'1654.9 1910.0 406.0'
-'1654.9 1910.0 406.0'
+'2900.6 1579.1 254.5'
+'2900.6 1579.1 254.5'
0
-'2593.7 2021.9 254.4'
-'2593.7 2021.9 254.4'
+'3195.3 1870.2 14.5'
+'3195.3 1870.2 14.5'
0
-'2393.0 2186.9 254.4'
-'2393.0 2186.9 254.4'
+'3204.2 1958.0 14.5'
+'3204.2 1958.0 14.5'
0
-'2451.4 1675.6 254.4'
-'2451.4 1675.6 254.4'
+'5349.9 1578.7 254.5'
+'5349.9 1578.7 254.5'
0
-'2432.5 1454.1 361.0'
-'2432.5 1454.1 361.0'
+'5032.8 1638.9 254.5'
+'5032.8 1638.9 254.5'
0
-'2416.9 1293.7 408.0'
-'2416.9 1293.7 408.0'
+'4334.2 1907.8 408.1'
+'4334.2 1907.8 408.1'
0
-'2015.2 2197.2 335.0'
-'2015.2 2197.2 335.0'
+'4140.9 2102.5 254.5'
+'4140.9 2102.5 254.5'
0
-'2049.0 2005.3 408.0'
-'2049.0 2005.3 408.0'
+'4615.8 2699.2 408.1'
+'4615.8 2699.2 408.1'
0
-'3017.3 2601.5 254.4'
-'3017.3 2601.5 254.4'
+'4130.7 2551.0 408.1'
+'4130.7 2551.0 408.1'
0
-'3025.4 2289.4 120.7'
-'3025.4 2289.4 120.7'
+'3700.7 2230.5 254.5'
+'3700.7 2230.5 254.5'
0
-'3030.8 2057.8 24.0'
-'3030.8 2057.8 24.0'
+'3432.1 1877.9 14.5'
+'3432.1 1877.9 14.5'
0
-'2641.7 1406.7 339.0'
-'2641.7 1406.7 339.0'
+'3434.4 1953.5 14.5'
+'3434.4 1953.5 14.5'
0
-'2054.4 2246.4 -47.8'
-'2054.4 2246.4 -47.8'
+'2672.0 1916.2 408.1'
+'2672.0 1916.2 408.1'
0
-'2559.5 1305.1 408.0'
-'2559.5 1305.1 408.0'
+'3163.1 1914.7 408.1'
+'3163.1 1914.7 408.1'
0
-'2767.4 1534.7 254.4'
-'2767.4 1534.7 254.4'
+'3442.8 1901.9 408.1'
+'3442.8 1901.9 408.1'
0
-'1666.0 2261.1 -52.8'
-'1666.0 2261.1 -52.8'
+'3961.4 1912.9 408.1'
+'3961.4 1912.9 408.1'
0
-'3022.1 1915.1 24.0'
-'3022.1 1915.1 24.0'
+'1398.5 2595.1 -129.5'
+'1398.5 2595.1 -129.5'
0
-'3430.2 1915.6 408.0'
-'3430.2 1915.6 408.0'
+'5038.5 1244.9 -129.5'
+'5038.5 1244.9 -129.5'
0
+'3959.0 1096.9 254.5'
+'3959.0 1096.9 254.5'
+0
+'4545.1 1250.1 254.5'
+'4545.1 1250.1 254.5'
+0
+'4084.6 1599.9 254.5'
+'4084.6 1599.9 254.5'
+0
+'4813.8 1148.7 254.5'
+'4813.8 1148.7 254.5'
+0
+'4526.2 1942.3 -62.3'
+'4526.2 1942.3 -62.3'
+0
Modified: branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints.cache
===================================================================
--- branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints.cache 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/maps/bloodprisonctf.waypoints.cache 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1,1030 +1,1254 @@
-'3430.2 1915.6 408.1'*'3628.8 1920.0 429.2'
-'3430.2 1915.6 408.1'*'3808.0 1922.6 408.1'
-'3430.2 1915.6 408.1'*'3302.4 1920.0 45.2'
-'3430.2 1915.6 408.1'*'3022.1 1915.1 14.5'
-'3430.2 1915.6 408.1'*'4137.6 1920.0 45.2'
-'3430.2 1915.6 408.1'*'2457.6 1920.0 45.2'
-'3022.1 1915.1 14.5'*'3033.6 1440.0 96.0'
-'3022.1 1915.1 14.5'*'3030.8 2057.8 24.1'
-'3022.1 1915.1 14.5'*'3302.4 1920.0 45.2'
-'3022.1 1915.1 14.5'*'3025.4 2289.4 120.1'
-'3022.1 1915.1 14.5'*'3582.7 1924.9 14.5'
-'3022.1 1915.1 14.5'*'2457.6 1920.0 45.2'
-'3022.1 1915.1 14.5'*'3017.3 2601.5 254.5'
-'3022.1 1915.1 14.5'*'3072.0 2860.8 294.8'
-'1666.0 2261.1 -52.7'*'1574.4 2112.0 -12.4'
-'1666.0 2261.1 -52.7'*'1497.6 2112.0 -12.4'
-'1666.0 2261.1 -52.7'*'1420.8 2112.0 -12.4'
-'1666.0 2261.1 -52.7'*'2016.0 2208.0 -31.6'
-'1666.0 2261.1 -52.7'*'1930.5 2011.9 -62.3'
-'1666.0 2261.1 -52.7'*'2054.4 2246.4 -52.7'
-'2767.4 1534.7 254.5'*'2841.6 1440.0 294.8'
-'2767.4 1534.7 254.5'*'2841.6 1382.4 294.8'
-'2767.4 1534.7 254.5'*'2641.7 1406.7 331.3'
-'2767.4 1534.7 254.5'*'2451.4 1675.6 254.5'
-'2767.4 1534.7 254.5'*'2432.5 1454.1 350.5'
-'2767.4 1534.7 254.5'*'2412.5 1564.1 292.9'
-'2767.4 1534.7 254.5'*'2457.6 1920.0 45.2'
-'2559.5 1305.1 408.1'*'2630.4 1190.4 448.4'
-'2559.5 1305.1 408.1'*'2416.9 1293.7 408.1'
-'2559.5 1305.1 408.1'*'2641.7 1406.7 331.3'
-'2559.5 1305.1 408.1'*'2432.5 1454.1 350.5'
-'2559.5 1305.1 408.1'*'2630.4 1113.6 448.4'
-'2559.5 1305.1 408.1'*'2457.6 1075.2 448.4'
-'2559.5 1305.1 408.1'*'2841.6 1382.4 294.8'
-'2559.5 1305.1 408.1'*'2412.5 1564.1 292.9'
-'2559.5 1305.1 408.1'*'2841.6 1440.0 294.8'
-'2559.5 1305.1 408.1'*'2767.4 1534.7 254.5'
-'2559.5 1305.1 408.1'*'2451.4 1675.6 254.5'
-'2559.5 1305.1 408.1'*'2016.0 1209.6 448.4'
-'2559.5 1305.1 408.1'*'2457.6 1920.0 45.2'
-'2559.5 1305.1 408.1'*'1833.6 1238.4 448.4'
-'2054.4 2246.4 -52.7'*'2016.0 2208.0 -31.6'
-'2054.4 2246.4 -52.7'*'1930.5 2011.9 -62.3'
-'2054.4 2246.4 -52.7'*'1666.0 2261.1 -52.7'
-'2054.4 2246.4 -52.7'*'1574.4 2112.0 -12.4'
-'2054.4 2246.4 -52.7'*'1497.6 2112.0 -12.4'
-'2054.4 2246.4 -52.7'*'1420.8 2112.0 -12.4'
-'2641.7 1406.7 331.3'*'2559.5 1305.1 408.1'
-'2641.7 1406.7 331.3'*'2767.4 1534.7 254.5'
-'2641.7 1406.7 331.3'*'2841.6 1382.4 294.8'
-'2641.7 1406.7 331.3'*'2841.6 1440.0 294.8'
-'2641.7 1406.7 331.3'*'2432.5 1454.1 350.5'
-'2641.7 1406.7 331.3'*'2416.9 1293.7 408.1'
-'2641.7 1406.7 331.3'*'2412.5 1564.1 292.9'
-'2641.7 1406.7 331.3'*'2451.4 1675.6 254.5'
-'2641.7 1406.7 331.3'*'2457.6 1075.2 448.4'
-'2641.7 1406.7 331.3'*'2457.6 1920.0 45.2'
-'3030.8 2057.8 24.1'*'3033.6 1440.0 96.0'
-'3030.8 2057.8 24.1'*'3022.1 1915.1 14.5'
-'3030.8 2057.8 24.1'*'3025.4 2289.4 120.1'
-'3030.8 2057.8 24.1'*'3017.3 2601.5 254.5'
-'3030.8 2057.8 24.1'*'3072.0 2860.8 294.8'
-'3025.4 2289.4 120.1'*'3030.8 2057.8 24.1'
-'3025.4 2289.4 120.1'*'3017.3 2601.5 254.5'
-'3025.4 2289.4 120.1'*'3022.1 1915.1 14.5'
-'3025.4 2289.4 120.1'*'3072.0 2860.8 294.8'
-'3017.3 2601.5 254.5'*'3072.0 2860.8 294.8'
-'3017.3 2601.5 254.5'*'3025.4 2289.4 120.1'
-'3017.3 2601.5 254.5'*'2841.6 2918.4 294.8'
-'3017.3 2601.5 254.5'*'2630.4 2860.8 275.6'
-'3017.3 2601.5 254.5'*'3030.8 2057.8 24.1'
-'3017.3 2601.5 254.5'*'3022.1 1915.1 14.5'
-'2049.0 2005.3 408.1'*'2227.2 1920.0 429.2'
-'2049.0 2005.3 408.1'*'2015.2 2197.2 331.3'
-'2049.0 2005.3 408.1'*'2073.6 1708.8 448.4'
-'2049.0 2005.3 408.1'*'2033.2 2429.0 254.5'
-'2049.0 2005.3 408.1'*'1785.6 1440.0 448.4'
-'2015.2 2197.2 331.3'*'2049.0 2005.3 408.1'
-'2015.2 2197.2 331.3'*'2033.2 2429.0 254.5'
-'2015.2 2197.2 331.3'*'2265.6 2572.8 275.6'
-'2015.2 2197.2 331.3'*'2073.6 1708.8 448.4'
-'2015.2 2197.2 331.3'*'1843.2 1382.4 448.4'
-'2416.9 1293.7 408.1'*'2559.5 1305.1 408.1'
-'2416.9 1293.7 408.1'*'2432.5 1454.1 350.5'
-'2416.9 1293.7 408.1'*'2457.6 1075.2 448.4'
-'2416.9 1293.7 408.1'*'2630.4 1190.4 448.4'
-'2416.9 1293.7 408.1'*'2641.7 1406.7 331.3'
-'2416.9 1293.7 408.1'*'2630.4 1113.6 448.4'
-'2416.9 1293.7 408.1'*'2412.5 1564.1 292.9'
-'2416.9 1293.7 408.1'*'2016.0 1209.6 448.4'
-'2416.9 1293.7 408.1'*'2451.4 1675.6 254.5'
-'2416.9 1293.7 408.1'*'2841.6 1382.4 294.8'
-'2416.9 1293.7 408.1'*'2767.4 1534.7 254.5'
-'2416.9 1293.7 408.1'*'2841.6 1440.0 294.8'
-'2416.9 1293.7 408.1'*'1833.6 1238.4 448.4'
-'2416.9 1293.7 408.1'*'2457.6 1920.0 45.2'
-'2432.5 1454.1 350.5'*'2412.5 1564.1 292.9'
-'2432.5 1454.1 350.5'*'2416.9 1293.7 408.1'
-'2432.5 1454.1 350.5'*'2559.5 1305.1 408.1'
-'2432.5 1454.1 350.5'*'2641.7 1406.7 331.3'
-'2432.5 1454.1 350.5'*'2451.4 1675.6 254.5'
-'2432.5 1454.1 350.5'*'2630.4 1190.4 448.4'
-'2432.5 1454.1 350.5'*'2767.4 1534.7 254.5'
-'2432.5 1454.1 350.5'*'2457.6 1075.2 448.4'
-'2432.5 1454.1 350.5'*'2630.4 1113.6 448.4'
-'2432.5 1454.1 350.5'*'2841.6 1440.0 294.8'
-'2432.5 1454.1 350.5'*'2841.6 1382.4 294.8'
-'2432.5 1454.1 350.5'*'2457.6 1920.0 45.2'
-'2451.4 1675.6 254.5'*'2412.5 1564.1 292.9'
-'2451.4 1675.6 254.5'*'2432.5 1454.1 350.5'
-'2451.4 1675.6 254.5'*'2457.6 1920.0 45.2'
-'2451.4 1675.6 254.5'*'2641.7 1406.7 331.3'
-'2451.4 1675.6 254.5'*'2767.4 1534.7 254.5'
-'2451.4 1675.6 254.5'*'2416.9 1293.7 408.1'
-'2451.4 1675.6 254.5'*'2559.5 1305.1 408.1'
-'2451.4 1675.6 254.5'*'2841.6 1440.0 294.8'
-'2451.4 1675.6 254.5'*'2841.6 1382.4 294.8'
-'2451.4 1675.6 254.5'*'2630.4 1190.4 448.4'
-'2451.4 1675.6 254.5'*'2630.4 1113.6 448.4'
-'2451.4 1675.6 254.5'*'2457.6 1075.2 448.4'
-'2393.0 2186.9 254.5'*'2593.7 2021.9 254.5'
-'2393.0 2186.9 254.5'*'2601.9 2371.8 254.5'
-'2393.0 2186.9 254.5'*'2457.6 1920.0 45.2'
-'2393.0 2186.9 254.5'*'2265.6 2572.8 275.6'
-'2593.7 2021.9 254.5'*'2393.0 2186.9 254.5'
-'2593.7 2021.9 254.5'*'2457.6 1920.0 45.2'
-'2593.7 2021.9 254.5'*'2265.6 2572.8 275.6'
-'2593.7 2021.9 254.5'*'1930.5 2011.9 -62.3'
-'1654.9 1910.0 388.9'*'1644.9 2035.7 331.3'
-'1654.9 1910.0 388.9'*'1778.2 1730.2 408.1'
-'1654.9 1910.0 388.9'*'1561.6 2248.9 254.5'
-'1654.9 1910.0 388.9'*'1785.6 1440.0 448.4'
-'1654.9 1910.0 388.9'*'1843.2 1382.4 448.4'
-'1654.9 1910.0 388.9'*'1776.0 1296.0 448.4'
-'1654.9 1910.0 388.9'*'1900.8 1324.8 448.4'
-'1654.9 1910.0 388.9'*'1833.6 1238.4 448.4'
-'1654.9 1910.0 388.9'*'1958.4 1267.2 448.4'
-'1654.9 1910.0 388.9'*'1150.1 2457.6 254.4'
-'2601.9 2371.8 254.5'*'2599.4 2619.9 254.5'
-'2601.9 2371.8 254.5'*'2393.0 2186.9 254.5'
-'2601.9 2371.8 254.5'*'2630.4 2860.8 275.6'
-'2601.9 2371.8 254.5'*'2457.6 1920.0 45.2'
-'2601.9 2371.8 254.5'*'2033.2 2429.0 254.5'
-'2599.4 2619.9 254.5'*'2630.4 2860.8 275.6'
-'2599.4 2619.9 254.5'*'2601.9 2371.8 254.5'
-'2599.4 2619.9 254.5'*'2841.6 2918.4 294.8'
-'2599.4 2619.9 254.5'*'3072.0 2860.8 294.8'
-'2599.4 2619.9 254.5'*'2457.6 1920.0 45.2'
-'1778.2 1730.2 408.1'*'1654.9 1910.0 388.9'
-'1778.2 1730.2 408.1'*'1785.6 1440.0 448.4'
-'1778.2 1730.2 408.1'*'2073.6 1708.8 448.4'
-'1778.2 1730.2 408.1'*'1644.9 2035.7 331.3'
-'1778.2 1730.2 408.1'*'1843.2 1382.4 448.4'
-'1778.2 1730.2 408.1'*'1900.8 1324.8 448.4'
-'1778.2 1730.2 408.1'*'1776.0 1296.0 448.4'
-'1778.2 1730.2 408.1'*'2227.2 1920.0 429.2'
-'1778.2 1730.2 408.1'*'1833.6 1238.4 448.4'
-'1778.2 1730.2 408.1'*'1561.6 2248.9 254.5'
-'1778.2 1730.2 408.1'*'1150.1 2457.6 254.4'
-'1644.9 2035.7 331.3'*'1654.9 1910.0 388.9'
-'1644.9 2035.7 331.3'*'1561.6 2248.9 254.5'
-'1644.9 2035.7 331.3'*'1778.2 1730.2 408.1'
-'1644.9 2035.7 331.3'*'1785.6 1440.0 448.4'
-'1644.9 2035.7 331.3'*'1150.1 2457.6 254.4'
-'1644.9 2035.7 331.3'*'1843.2 1382.4 448.4'
-'1644.9 2035.7 331.3'*'1776.0 1296.0 448.4'
-'1644.9 2035.7 331.3'*'1900.8 1324.8 448.4'
-'1644.9 2035.7 331.3'*'1833.6 1238.4 448.4'
-'1561.6 2248.9 254.5'*'1644.9 2035.7 331.3'
-'1561.6 2248.9 254.5'*'1654.9 1910.0 388.9'
-'1561.6 2248.9 254.5'*'1132.8 2208.0 275.6'
-'1561.6 2248.9 254.5'*'1132.8 2457.6 -12.4'
-'1561.6 2248.9 254.5'*'1778.2 1730.2 408.1'
-'1561.6 2248.9 254.5'*'1785.6 1440.0 448.4'
-'1561.6 2248.9 254.5'*'1843.2 1382.4 448.4'
-'1561.6 2248.9 254.5'*'1776.0 1296.0 448.4'
-'1561.6 2248.9 254.5'*'1900.8 1324.8 448.4'
-'1561.6 2248.9 254.5'*'1833.6 1238.4 448.4'
-'1930.5 2011.9 -62.3'*'2016.0 2208.0 -31.6'
-'1930.5 2011.9 -62.3'*'2054.4 2246.4 -52.7'
-'1930.5 2011.9 -62.3'*'1666.0 2261.1 -52.7'
-'1930.5 2011.9 -62.3'*'2457.6 1920.0 45.2'
-'2412.5 1564.1 292.9'*'2451.4 1675.6 254.5'
-'2412.5 1564.1 292.9'*'2432.5 1454.1 350.5'
-'2412.5 1564.1 292.9'*'2641.7 1406.7 331.3'
-'2412.5 1564.1 292.9'*'2416.9 1293.7 408.1'
-'2412.5 1564.1 292.9'*'2559.5 1305.1 408.1'
-'2412.5 1564.1 292.9'*'2767.4 1534.7 254.5'
-'2412.5 1564.1 292.9'*'2457.6 1920.0 45.2'
-'2412.5 1564.1 292.9'*'2841.6 1440.0 294.8'
-'2412.5 1564.1 292.9'*'2630.4 1190.4 448.4'
-'2412.5 1564.1 292.9'*'2841.6 1382.4 294.8'
-'2412.5 1564.1 292.9'*'2457.6 1075.2 448.4'
-'2412.5 1564.1 292.9'*'2630.4 1113.6 448.4'
-'2033.2 2429.0 254.5'*'2015.2 2197.2 331.3'
-'2033.2 2429.0 254.5'*'2265.6 2572.8 275.6'
-'2033.2 2429.0 254.5'*'2049.0 2005.3 408.1'
-'2033.2 2429.0 254.5'*'2601.9 2371.8 254.5'
-'2033.2 2429.0 254.5'*'2073.6 1708.8 448.4'
-'3582.7 1924.9 14.5'*'3571.2 2400.0 96.0'
-'3582.7 1924.9 14.5'*'3574.0 1782.2 24.1'
-'3582.7 1924.9 14.5'*'3302.4 1920.0 45.2'
-'3582.7 1924.9 14.5'*'3579.4 1550.6 120.1'
-'3582.7 1924.9 14.5'*'4137.6 1920.0 45.2'
-'3582.7 1924.9 14.5'*'3022.1 1915.1 14.5'
-'3582.7 1924.9 14.5'*'3587.5 1238.5 254.5'
-'3582.7 1924.9 14.5'*'3532.8 979.2 294.8'
-'4938.8 1578.9 -52.7'*'5030.4 1728.0 -12.4'
-'4938.8 1578.9 -52.7'*'5107.2 1728.0 -12.4'
-'4938.8 1578.9 -52.7'*'5184.0 1728.0 -12.4'
-'4938.8 1578.9 -52.7'*'4588.8 1632.0 -31.6'
-'4938.8 1578.9 -52.7'*'4674.3 1828.1 -62.3'
-'4938.8 1578.9 -52.7'*'4550.4 1593.6 -52.7'
-'3837.4 2305.3 254.5'*'3763.2 2400.0 294.8'
-'3837.4 2305.3 254.5'*'3763.2 2457.6 294.8'
-'3837.4 2305.3 254.5'*'3963.1 2433.3 331.3'
-'3837.4 2305.3 254.5'*'4153.4 2164.4 254.5'
-'3837.4 2305.3 254.5'*'4172.3 2385.9 350.5'
-'3837.4 2305.3 254.5'*'4192.3 2275.9 292.9'
-'4045.3 2534.9 408.1'*'3974.4 2649.6 448.4'
-'4045.3 2534.9 408.1'*'4187.9 2546.3 408.1'
-'4045.3 2534.9 408.1'*'3963.1 2433.3 331.3'
-'4045.3 2534.9 408.1'*'4172.3 2385.9 350.5'
-'4045.3 2534.9 408.1'*'3974.4 2726.4 448.4'
-'4045.3 2534.9 408.1'*'4147.2 2764.8 448.4'
-'4045.3 2534.9 408.1'*'3763.2 2457.6 294.8'
-'4045.3 2534.9 408.1'*'4192.3 2275.9 292.9'
-'4045.3 2534.9 408.1'*'3763.2 2400.0 294.8'
-'4045.3 2534.9 408.1'*'3837.4 2305.3 254.5'
-'4045.3 2534.9 408.1'*'4153.4 2164.4 254.5'
-'4045.3 2534.9 408.1'*'4588.8 2630.4 448.4'
-'4045.3 2534.9 408.1'*'4137.6 1920.0 45.2'
-'4045.3 2534.9 408.1'*'4771.2 2601.6 448.4'
-'4550.4 1593.6 -52.7'*'4588.8 1632.0 -31.6'
-'4550.4 1593.6 -52.7'*'4674.3 1828.1 -62.3'
-'4550.4 1593.6 -52.7'*'4938.8 1578.9 -52.7'
-'4550.4 1593.6 -52.7'*'5030.4 1728.0 -12.4'
-'4550.4 1593.6 -52.7'*'5107.2 1728.0 -12.4'
-'4550.4 1593.6 -52.7'*'5184.0 1728.0 -12.4'
-'3963.1 2433.3 331.3'*'4045.3 2534.9 408.1'
-'3963.1 2433.3 331.3'*'3837.4 2305.3 254.5'
-'3963.1 2433.3 331.3'*'3763.2 2457.6 294.8'
-'3963.1 2433.3 331.3'*'3763.2 2400.0 294.8'
-'3963.1 2433.3 331.3'*'4172.3 2385.9 350.5'
-'3963.1 2433.3 331.3'*'4187.9 2546.3 408.1'
-'3963.1 2433.3 331.3'*'4192.3 2275.9 292.9'
-'3963.1 2433.3 331.3'*'4153.4 2164.4 254.5'
-'3963.1 2433.3 331.3'*'4147.2 2764.8 448.4'
-'3574.0 1782.2 24.1'*'3571.2 2400.0 96.0'
-'3574.0 1782.2 24.1'*'3582.7 1924.9 14.5'
-'3574.0 1782.2 24.1'*'3579.4 1550.6 120.1'
-'3574.0 1782.2 24.1'*'3587.5 1238.5 254.5'
-'3574.0 1782.2 24.1'*'3532.8 979.2 294.8'
-'3579.4 1550.6 120.1'*'3574.0 1782.2 24.1'
-'3579.4 1550.6 120.1'*'3587.5 1238.5 254.5'
-'3579.4 1550.6 120.1'*'3582.7 1924.9 14.5'
-'3579.4 1550.6 120.1'*'3532.8 979.2 294.8'
-'3587.5 1238.5 254.5'*'3532.8 979.2 294.8'
-'3587.5 1238.5 254.5'*'3579.4 1550.6 120.1'
-'3587.5 1238.5 254.5'*'3763.2 921.6 294.8'
-'3587.5 1238.5 254.5'*'3974.4 979.2 275.6'
-'3587.5 1238.5 254.5'*'3574.0 1782.2 24.1'
-'3587.5 1238.5 254.5'*'3582.7 1924.9 14.5'
-'4555.8 1834.7 408.1'*'4377.6 1920.0 429.2'
-'4555.8 1834.7 408.1'*'4589.6 1642.8 331.3'
-'4555.8 1834.7 408.1'*'4531.2 2131.2 448.4'
-'4555.8 1834.7 408.1'*'4571.6 1411.0 254.5'
-'4555.8 1834.7 408.1'*'4819.2 2400.0 448.4'
-'4589.6 1642.8 331.3'*'4555.8 1834.7 408.1'
-'4589.6 1642.8 331.3'*'4571.6 1411.0 254.5'
-'4589.6 1642.8 331.3'*'4339.2 1267.2 275.6'
-'4589.6 1642.8 331.3'*'4531.2 2131.2 448.4'
-'4589.6 1642.8 331.3'*'4761.6 2457.6 448.4'
-'4187.9 2546.3 408.1'*'4045.3 2534.9 408.1'
-'4187.9 2546.3 408.1'*'4172.3 2385.9 350.5'
-'4187.9 2546.3 408.1'*'4147.2 2764.8 448.4'
-'4187.9 2546.3 408.1'*'3974.4 2649.6 448.4'
-'4187.9 2546.3 408.1'*'3963.1 2433.3 331.3'
-'4187.9 2546.3 408.1'*'3974.4 2726.4 448.4'
-'4187.9 2546.3 408.1'*'4192.3 2275.9 292.9'
-'4187.9 2546.3 408.1'*'4588.8 2630.4 448.4'
-'4187.9 2546.3 408.1'*'4153.4 2164.4 254.5'
-'4187.9 2546.3 408.1'*'3763.2 2457.6 294.8'
-'4187.9 2546.3 408.1'*'3837.4 2305.3 254.5'
-'4187.9 2546.3 408.1'*'3763.2 2400.0 294.8'
-'4187.9 2546.3 408.1'*'4771.2 2601.6 448.4'
-'4187.9 2546.3 408.1'*'4137.6 1920.0 45.2'
-'4172.3 2385.9 350.5'*'4192.3 2275.9 292.9'
-'4172.3 2385.9 350.5'*'4187.9 2546.3 408.1'
-'4172.3 2385.9 350.5'*'4045.3 2534.9 408.1'
-'4172.3 2385.9 350.5'*'3963.1 2433.3 331.3'
-'4172.3 2385.9 350.5'*'4153.4 2164.4 254.5'
-'4172.3 2385.9 350.5'*'3974.4 2649.6 448.4'
-'4172.3 2385.9 350.5'*'3837.4 2305.3 254.5'
-'4172.3 2385.9 350.5'*'4147.2 2764.8 448.4'
-'4172.3 2385.9 350.5'*'3974.4 2726.4 448.4'
-'4172.3 2385.9 350.5'*'3763.2 2400.0 294.8'
-'4172.3 2385.9 350.5'*'3763.2 2457.6 294.8'
-'4172.3 2385.9 350.5'*'4137.6 1920.0 45.2'
-'4153.4 2164.4 254.5'*'4192.3 2275.9 292.9'
-'4153.4 2164.4 254.5'*'4172.3 2385.9 350.5'
-'4153.4 2164.4 254.5'*'4137.6 1920.0 45.2'
-'4153.4 2164.4 254.5'*'3963.1 2433.3 331.3'
-'4153.4 2164.4 254.5'*'3837.4 2305.3 254.5'
-'4153.4 2164.4 254.5'*'4187.9 2546.3 408.1'
-'4153.4 2164.4 254.5'*'4045.3 2534.9 408.1'
-'4153.4 2164.4 254.5'*'3763.2 2400.0 294.8'
-'4153.4 2164.4 254.5'*'3763.2 2457.6 294.8'
-'4153.4 2164.4 254.5'*'3974.4 2649.6 448.4'
-'4153.4 2164.4 254.5'*'3974.4 2726.4 448.4'
-'4153.4 2164.4 254.5'*'4147.2 2764.8 448.4'
-'4211.8 1653.1 254.5'*'4011.1 1818.1 254.5'
-'4211.8 1653.1 254.5'*'4002.9 1468.2 254.5'
-'4211.8 1653.1 254.5'*'4137.6 1920.0 45.2'
-'4211.8 1653.1 254.5'*'4339.2 1267.2 275.6'
-'4011.1 1818.1 254.5'*'4211.8 1653.1 254.5'
-'4011.1 1818.1 254.5'*'4137.6 1920.0 45.2'
-'4011.1 1818.1 254.5'*'4339.2 1267.2 275.6'
-'4011.1 1818.1 254.5'*'4674.3 1828.1 -62.3'
-'4949.9 1930.0 388.9'*'4826.6 2109.8 408.1'
-'4949.9 1930.0 388.9'*'5043.2 1591.1 254.5'
-'4949.9 1930.0 388.9'*'4509.9 1804.3 339.0'
-'4949.9 1930.0 388.9'*'4819.2 2400.0 448.4'
-'4949.9 1930.0 388.9'*'4761.6 2457.6 448.4'
-'4949.9 1930.0 388.9'*'4828.8 2544.0 448.4'
-'4949.9 1930.0 388.9'*'4704.0 2515.2 448.4'
-'4949.9 1930.0 388.9'*'4771.2 2601.6 448.4'
-'4949.9 1930.0 388.9'*'4646.4 2572.8 448.4'
-'4949.9 1930.0 388.9'*'5484.2 1382.4 254.4'
-'4002.9 1468.2 254.5'*'4005.4 1220.1 254.5'
-'4002.9 1468.2 254.5'*'4211.8 1653.1 254.5'
-'4002.9 1468.2 254.5'*'3974.4 979.2 275.6'
-'4002.9 1468.2 254.5'*'4137.6 1920.0 45.2'
-'4002.9 1468.2 254.5'*'4571.6 1411.0 254.5'
-'4005.4 1220.1 254.5'*'3974.4 979.2 275.6'
-'4005.4 1220.1 254.5'*'4002.9 1468.2 254.5'
-'4005.4 1220.1 254.5'*'3763.2 921.6 294.8'
-'4005.4 1220.1 254.5'*'3532.8 979.2 294.8'
-'4005.4 1220.1 254.5'*'4137.6 1920.0 45.2'
-'4826.6 2109.8 408.1'*'4949.9 1930.0 388.9'
-'4826.6 2109.8 408.1'*'4819.2 2400.0 448.4'
-'4826.6 2109.8 408.1'*'4531.2 2131.2 448.4'
-'4826.6 2109.8 408.1'*'4509.9 1804.3 339.0'
-'4826.6 2109.8 408.1'*'4761.6 2457.6 448.4'
-'4826.6 2109.8 408.1'*'4704.0 2515.2 448.4'
-'4826.6 2109.8 408.1'*'4828.8 2544.0 448.4'
-'4826.6 2109.8 408.1'*'4377.6 1920.0 429.2'
-'4826.6 2109.8 408.1'*'4771.2 2601.6 448.4'
-'4826.6 2109.8 408.1'*'5043.2 1591.1 254.5'
-'5043.2 1591.1 254.5'*'4949.9 1930.0 388.9'
-'5043.2 1591.1 254.5'*'5472.0 1632.0 275.6'
-'5043.2 1591.1 254.5'*'4509.9 1804.3 339.0'
-'5043.2 1591.1 254.5'*'5472.0 1382.4 -12.4'
-'5043.2 1591.1 254.5'*'4826.6 2109.8 408.1'
-'5043.2 1591.1 254.5'*'4819.2 2400.0 448.4'
-'5043.2 1591.1 254.5'*'4761.6 2457.6 448.4'
-'5043.2 1591.1 254.5'*'4828.8 2544.0 448.4'
-'5043.2 1591.1 254.5'*'4704.0 2515.2 448.4'
-'5043.2 1591.1 254.5'*'4771.2 2601.6 448.4'
-'4674.3 1828.1 -62.3'*'4588.8 1632.0 -31.6'
-'4674.3 1828.1 -62.3'*'4550.4 1593.6 -52.7'
-'4674.3 1828.1 -62.3'*'4938.8 1578.9 -52.7'
-'4674.3 1828.1 -62.3'*'4137.6 1920.0 45.2'
-'4192.3 2275.9 292.9'*'4153.4 2164.4 254.5'
-'4192.3 2275.9 292.9'*'4172.3 2385.9 350.5'
-'4192.3 2275.9 292.9'*'3963.1 2433.3 331.3'
-'4192.3 2275.9 292.9'*'4187.9 2546.3 408.1'
-'4192.3 2275.9 292.9'*'4045.3 2534.9 408.1'
-'4192.3 2275.9 292.9'*'3837.4 2305.3 254.5'
-'4192.3 2275.9 292.9'*'4137.6 1920.0 45.2'
-'4192.3 2275.9 292.9'*'3763.2 2400.0 294.8'
-'4192.3 2275.9 292.9'*'3974.4 2649.6 448.4'
-'4192.3 2275.9 292.9'*'3763.2 2457.6 294.8'
-'4192.3 2275.9 292.9'*'4147.2 2764.8 448.4'
-'4192.3 2275.9 292.9'*'3974.4 2726.4 448.4'
-'4571.6 1411.0 254.5'*'4589.6 1642.8 331.3'
-'4571.6 1411.0 254.5'*'4339.2 1267.2 275.6'
-'4571.6 1411.0 254.5'*'4555.8 1834.7 408.1'
-'4571.6 1411.0 254.5'*'4002.9 1468.2 254.5'
-'4571.6 1411.0 254.5'*'4531.2 2131.2 448.4'
-'1142.4 2716.8 254.5'*'1324.8 2707.2 275.6'
-'1142.4 2716.8 254.5'*'1150.1 2457.6 254.4'
-'1142.4 2716.8 254.5'*'1132.8 2208.0 275.6'
-'1142.4 2716.8 254.5'*'1420.8 2112.0 -12.4'
-'1142.4 2716.8 254.5'*'1497.6 2112.0 -12.4'
-'3180.9 1920.0 408.1'*'2966.4 1920.0 429.2'
-'3180.9 1920.0 408.1'*'2798.5 1925.7 408.1'
-'3180.9 1920.0 408.1'*'3302.4 1920.0 45.2'
-'3180.9 1920.0 408.1'*'3582.7 1924.9 14.5'
-'3180.9 1920.0 408.1'*'4137.6 1920.0 45.2'
-'3396.8 1522.0 292.9'*'3379.2 1536.0 314.0'
-'3396.8 1522.0 292.9'*'3168.0 1536.0 285.2'
-'3396.8 1522.0 292.9'*'3579.4 1550.6 120.1'
-'3205.4 2295.7 292.9'*'3436.8 2304.0 285.2'
-'3205.4 2295.7 292.9'*'3025.4 2289.4 120.1'
-'2798.5 1925.7 408.1'*'2966.4 1920.0 429.2'
-'2798.5 1925.7 408.1'*'2803.2 2150.4 448.4'
-'2798.5 1925.7 408.1'*'2803.2 2208.0 448.4'
-'2798.5 1925.7 408.1'*'2803.2 2265.6 448.4'
-'2798.5 1925.7 408.1'*'3180.9 1920.0 408.1'
-'2798.5 1925.7 408.1'*'2803.2 2323.2 448.4'
-'2798.5 1925.7 408.1'*'2803.2 2380.8 448.4'
-'2798.5 1925.7 408.1'*'2457.6 1920.0 45.2'
-'2798.5 1925.7 408.1'*'2803.2 2438.4 448.4'
-'2798.5 1925.7 408.1'*'3302.4 1920.0 45.2'
-'2798.5 1925.7 408.1'*'2803.2 2553.6 448.4'
-'2798.5 1925.7 408.1'*'3582.7 1924.9 14.5'
-'2798.5 1925.7 408.1'*'1930.5 2011.9 -62.3'
-'2798.5 1925.7 408.1'*'2841.6 2918.4 294.8'
-'3808.0 1922.6 408.1'*'3628.8 1920.0 429.2'
-'3808.0 1922.6 408.1'*'3801.6 1689.6 448.4'
-'3808.0 1922.6 408.1'*'3801.6 1632.0 448.4'
-'3808.0 1922.6 408.1'*'3801.6 1574.4 448.4'
-'3808.0 1922.6 408.1'*'3430.2 1915.6 408.1'
-'3808.0 1922.6 408.1'*'3801.6 1516.8 448.4'
-'3808.0 1922.6 408.1'*'3801.6 1459.2 448.4'
-'3808.0 1922.6 408.1'*'4137.6 1920.0 45.2'
-'3808.0 1922.6 408.1'*'3801.6 1401.6 448.4'
-'3808.0 1922.6 408.1'*'3801.6 1286.4 448.4'
-'3808.0 1922.6 408.1'*'4674.3 1828.1 -62.3'
-'3808.0 1922.6 408.1'*'3763.2 921.6 294.8'
-'3801.6 1920.0 460.8'*'3808.0 1922.6 408.1'
-'3801.6 1920.0 460.8'*'3628.8 1920.0 429.2'
-'3801.6 1920.0 460.8'*'3801.6 1689.6 448.4'
-'3801.6 1920.0 460.8'*'3801.6 1632.0 448.4'
-'3801.6 1920.0 460.8'*'3801.6 1574.4 448.4'
-'3801.6 1920.0 460.8'*'3430.2 1915.6 408.1'
-'3801.6 1920.0 460.8'*'3801.6 1516.8 448.4'
-'3801.6 1920.0 460.8'*'3801.6 1459.2 448.4'
-'3801.6 1920.0 460.8'*'3801.6 1401.6 448.4'
-'3801.6 1920.0 460.8'*'4137.6 1920.0 45.2'
-'3801.6 1920.0 460.8'*'3801.6 1286.4 448.4'
-'3801.6 1920.0 460.8'*'3763.2 921.6 294.8'
-'3801.6 1920.0 460.8'*'4674.3 1828.1 -62.3'
-'2803.2 1920.0 460.8'*'2798.5 1925.7 408.1'
-'2803.2 1920.0 460.8'*'2966.4 1920.0 429.2'
-'2803.2 1920.0 460.8'*'2803.2 2150.4 448.4'
-'2803.2 1920.0 460.8'*'2803.2 2208.0 448.4'
-'2803.2 1920.0 460.8'*'2803.2 2265.6 448.4'
-'2803.2 1920.0 460.8'*'3180.9 1920.0 408.1'
-'2803.2 1920.0 460.8'*'2803.2 2323.2 448.4'
-'2803.2 1920.0 460.8'*'2803.2 2380.8 448.4'
-'2803.2 1920.0 460.8'*'2803.2 2438.4 448.4'
-'2803.2 1920.0 460.8'*'2457.6 1920.0 45.2'
-'2803.2 1920.0 460.8'*'2803.2 2553.6 448.4'
-'2803.2 1920.0 460.8'*'3302.4 1920.0 45.2'
-'2803.2 1920.0 460.8'*'3582.7 1924.9 14.5'
-'2803.2 1920.0 460.8'*'2841.6 2918.4 294.8'
-'2803.2 1920.0 460.8'*'1930.5 2011.9 -62.3'
-'3628.8 1920.0 429.2'*'3808.0 1922.6 408.1'
-'3628.8 1920.0 429.2'*'3430.2 1915.6 408.1'
-'3628.8 1920.0 429.2'*'3302.4 1920.0 45.2'
-'3628.8 1920.0 429.2'*'4137.6 1920.0 45.2'
-'3628.8 1920.0 429.2'*'3022.1 1915.1 14.5'
-'3628.8 1920.0 429.2'*'4674.3 1828.1 -62.3'
-'2966.4 1920.0 429.2'*'2798.5 1925.7 408.1'
-'2966.4 1920.0 429.2'*'3180.9 1920.0 408.1'
-'2966.4 1920.0 429.2'*'3302.4 1920.0 45.2'
-'2966.4 1920.0 429.2'*'3582.7 1924.9 14.5'
-'2966.4 1920.0 429.2'*'1930.5 2011.9 -62.3'
-'3379.2 1536.0 314.0'*'3396.8 1522.0 292.9'
-'3379.2 1536.0 314.0'*'3168.0 1536.0 285.2'
-'3379.2 1536.0 314.0'*'3579.4 1550.6 120.1'
+'1790.2 2698.8 254.5'*'1766.4 2688.0 299.4'
+'1790.2 2698.8 254.5'*'1843.2 2457.6 -110.4'
+'1790.2 2698.8 254.5'*'2061.0 2654.0 254.5'
+'1790.2 2698.8 254.5'*'2265.6 2572.8 299.4'
+'2061.0 2654.0 254.5'*'2265.6 2572.8 299.4'
+'2061.0 2654.0 254.5'*'1790.2 2698.8 254.5'
+'2061.0 2654.0 254.5'*'1766.4 2688.0 299.4'
+'2061.0 2654.0 254.5'*'2451.5 2181.0 254.5'
+'2061.0 2654.0 254.5'*'2042.7 1861.5 408.1'
+'2061.0 2654.0 254.5'*'2073.6 1708.8 453.0'
+'2451.5 2181.0 254.5'*'2457.6 1920.0 59.4'
+'2451.5 2181.0 254.5'*'2340.1 1846.5 24.1'
+'2451.5 2181.0 254.5'*'2265.6 2572.8 299.4'
+'2451.5 2181.0 254.5'*'2061.0 2654.0 254.5'
+'2451.5 2181.0 254.5'*'2696.2 2779.1 254.5'
+'2696.2 2779.1 254.5'*'2630.4 2860.8 299.4'
+'2696.2 2779.1 254.5'*'2841.6 2918.4 299.4'
+'2696.2 2779.1 254.5'*'3022.8 2763.5 254.5'
+'2696.2 2779.1 254.5'*'3072.0 2860.8 299.4'
+'2696.2 2779.1 254.5'*'2451.5 2181.0 254.5'
+'2696.2 2779.1 254.5'*'2457.6 1920.0 59.4'
+'2696.2 2779.1 254.5'*'2340.1 1846.5 24.1'
+'3022.8 2763.5 254.5'*'3072.0 2860.8 299.4'
+'3022.8 2763.5 254.5'*'2841.6 2918.4 299.4'
+'3022.8 2763.5 254.5'*'2696.2 2779.1 254.5'
+'3022.8 2763.5 254.5'*'2630.4 2860.8 299.4'
+'3570.2 1093.3 254.5'*'3532.8 979.2 299.4'
+'3570.2 1093.3 254.5'*'3763.2 921.6 299.4'
+'3570.2 1093.3 254.5'*'3959.0 1096.9 254.5'
+'3570.2 1093.3 254.5'*'3974.4 979.2 299.4'
+'1282.5 2264.2 254.5'*'1132.8 2208.0 299.4'
+'1282.5 2264.2 254.5'*'1201.5 2449.9 254.5'
+'1282.5 2264.2 254.5'*'1150.1 2457.6 254.4'
+'1282.5 2264.2 254.5'*'1610.3 2244.7 254.5'
+'1282.5 2264.2 254.5'*'1254.0 2446.7 -52.7'
+'1282.5 2264.2 254.5'*'1516.8 2457.6 -84.6'
+'1282.5 2264.2 254.5'*'1696.4 2009.7 350.5'
+'1282.5 2264.2 254.5'*'1398.5 2595.1 -129.5'
+'1610.3 2244.7 254.5'*'1696.4 2009.7 350.5'
+'1610.3 2244.7 254.5'*'1282.5 2264.2 254.5'
+'1610.3 2244.7 254.5'*'1516.8 2457.6 -84.6'
+'1610.3 2244.7 254.5'*'1132.8 2208.0 299.4'
+'1610.3 2244.7 254.5'*'1738.7 1721.6 408.1'
+'1610.3 2244.7 254.5'*'1398.5 2595.1 -129.5'
+'1610.3 2244.7 254.5'*'1785.6 1440.0 453.0'
+'1610.3 2244.7 254.5'*'1843.2 1382.4 453.0'
+'1610.3 2244.7 254.5'*'1776.0 1296.0 453.0'
+'1610.3 2244.7 254.5'*'1900.8 1324.8 453.0'
+'1610.3 2244.7 254.5'*'1833.6 1238.4 453.0'
+'1201.5 2449.9 254.5'*'1150.1 2457.6 254.4'
+'1201.5 2449.9 254.5'*'1282.5 2264.2 254.5'
+'1201.5 2449.9 254.5'*'1132.8 2208.0 299.4'
+'1201.5 2449.9 254.5'*'1324.8 2707.2 299.4'
+'1201.5 2449.9 254.5'*'1254.0 2446.7 -52.7'
+'1201.5 2449.9 254.5'*'1398.5 2595.1 -129.5'
+'1201.5 2449.9 254.5'*'1516.8 2457.6 -84.6'
+'1201.5 2449.9 254.5'*'1574.4 2112.0 -7.8'
+'1201.5 2449.9 254.5'*'1691.2 2146.0 -52.7'
+'1201.5 2449.9 254.5'*'1738.7 1721.6 408.1'
+'1738.7 1721.6 408.1'*'1785.6 1440.0 453.0'
+'1738.7 1721.6 408.1'*'1696.4 2009.7 350.5'
+'1738.7 1721.6 408.1'*'2042.7 1861.5 408.1'
+'1738.7 1721.6 408.1'*'2073.6 1708.8 453.0'
+'1738.7 1721.6 408.1'*'1843.2 1382.4 453.0'
+'1738.7 1721.6 408.1'*'1776.0 1296.0 453.0'
+'1738.7 1721.6 408.1'*'1900.8 1324.8 453.0'
+'1738.7 1721.6 408.1'*'1833.6 1238.4 453.0'
+'1738.7 1721.6 408.1'*'1958.4 1267.2 453.0'
+'1738.7 1721.6 408.1'*'2227.2 1920.0 453.0'
+'1738.7 1721.6 408.1'*'1955.3 1219.4 408.1'
+'1738.7 1721.6 408.1'*'1610.3 2244.7 254.5'
+'1738.7 1721.6 408.1'*'1516.8 2457.6 -84.6'
+'1738.7 1721.6 408.1'*'1201.5 2449.9 254.5'
+'1738.7 1721.6 408.1'*'1398.5 2595.1 -129.5'
+'2042.7 1861.5 408.1'*'2073.6 1708.8 453.0'
+'2042.7 1861.5 408.1'*'2227.2 1920.0 453.0'
+'2042.7 1861.5 408.1'*'2269.4 1914.7 408.1'
+'2042.7 1861.5 408.1'*'1738.7 1721.6 408.1'
+'2042.7 1861.5 408.1'*'1785.6 1440.0 453.0'
+'2042.7 1861.5 408.1'*'2061.0 2654.0 254.5'
+'2042.7 1861.5 408.1'*'2786.7 1877.2 14.5'
+'2042.7 1861.5 408.1'*'2797.4 1959.7 14.5'
+'2269.4 1914.7 408.1'*'2227.2 1920.0 453.0'
+'2269.4 1914.7 408.1'*'2042.7 1861.5 408.1'
+'2269.4 1914.7 408.1'*'2786.7 1877.2 14.5'
+'2269.4 1914.7 408.1'*'2797.4 1959.7 14.5'
+'1955.3 1219.4 408.1'*'1958.4 1267.2 453.0'
+'1955.3 1219.4 408.1'*'2016.0 1209.6 453.0'
+'1955.3 1219.4 408.1'*'1900.8 1324.8 453.0'
+'1955.3 1219.4 408.1'*'1833.6 1238.4 453.0'
+'1955.3 1219.4 408.1'*'1776.0 1296.0 453.0'
+'1955.3 1219.4 408.1'*'1843.2 1382.4 453.0'
+'1955.3 1219.4 408.1'*'1785.6 1440.0 453.0'
+'1955.3 1219.4 408.1'*'2457.6 1075.2 453.0'
+'1955.3 1219.4 408.1'*'1738.7 1721.6 408.1'
+'1955.3 1219.4 408.1'*'2527.6 1298.9 408.1'
+'1955.3 1219.4 408.1'*'2630.4 1190.4 453.0'
+'1955.3 1219.4 408.1'*'2630.4 1113.6 453.0'
+'1955.3 1219.4 408.1'*'1696.4 2009.7 350.5'
+'1955.3 1219.4 408.1'*'2841.6 1382.4 299.4'
+'2461.6 1739.6 254.5'*'2457.6 1920.0 59.4'
+'2461.6 1739.6 254.5'*'2315.4 1983.6 24.1'
+'2461.6 1739.6 254.5'*'2900.6 1579.1 254.5'
+'2461.6 1739.6 254.5'*'2527.6 1298.9 408.1'
+'2461.6 1739.6 254.5'*'2841.6 1440.0 299.4'
+'2461.6 1739.6 254.5'*'2841.6 1382.4 299.4'
+'2461.6 1739.6 254.5'*'2630.4 1190.4 453.0'
+'2461.6 1739.6 254.5'*'2630.4 1113.6 453.0'
+'2461.6 1739.6 254.5'*'2457.6 1075.2 453.0'
+'2130.4 1847.4 -52.7'*'2134.4 1992.8 -52.7'
+'2130.4 1847.4 -52.7'*'2340.1 1846.5 24.1'
+'2130.4 1847.4 -52.7'*'2315.4 1983.6 24.1'
+'2130.4 1847.4 -52.7'*'2457.6 1920.0 59.4'
+'2130.4 1847.4 -52.7'*'2016.0 2208.0 -17.4'
+'2130.4 1847.4 -52.7'*'1731.4 2282.5 -52.7'
+'2130.4 1847.4 -52.7'*'2786.7 1877.2 14.5'
+'2130.4 1847.4 -52.7'*'2797.4 1959.7 14.5'
+'2130.4 1847.4 -52.7'*'1541.6 2313.1 -52.7'
+'2130.4 1847.4 -52.7'*'1516.8 2457.6 -84.6'
+'2130.4 1847.4 -52.7'*'1398.5 2595.1 -129.5'
+'2340.1 1846.5 24.1'*'2315.4 1983.6 24.1'
+'2340.1 1846.5 24.1'*'2457.6 1920.0 59.4'
+'2340.1 1846.5 24.1'*'2130.4 1847.4 -52.7'
+'2340.1 1846.5 24.1'*'2134.4 1992.8 -52.7'
+'2340.1 1846.5 24.1'*'2786.7 1877.2 14.5'
+'2340.1 1846.5 24.1'*'2797.4 1959.7 14.5'
+'2340.1 1846.5 24.1'*'1691.2 2146.0 -52.7'
+'2340.1 1846.5 24.1'*'1731.4 2282.5 -52.7'
+'2340.1 1846.5 24.1'*'3204.2 1958.0 14.5'
+'2340.1 1846.5 24.1'*'1541.6 2313.1 -52.7'
+'2340.1 1846.5 24.1'*'3302.4 1920.0 59.4'
+'2340.1 1846.5 24.1'*'1516.8 2457.6 -84.6'
+'2786.7 1877.2 14.5'*'2797.4 1959.7 14.5'
+'2786.7 1877.2 14.5'*'2457.6 1920.0 59.4'
+'2786.7 1877.2 14.5'*'3195.3 1870.2 14.5'
+'2786.7 1877.2 14.5'*'3204.2 1958.0 14.5'
+'2786.7 1877.2 14.5'*'2340.1 1846.5 24.1'
+'2786.7 1877.2 14.5'*'2315.4 1983.6 24.1'
+'2786.7 1877.2 14.5'*'3302.4 1920.0 59.4'
+'2786.7 1877.2 14.5'*'3432.1 1877.9 14.5'
+'2786.7 1877.2 14.5'*'3434.4 1953.5 14.5'
+'2786.7 1877.2 14.5'*'2130.4 1847.4 -52.7'
+'2786.7 1877.2 14.5'*'2134.4 1992.8 -52.7'
+'2786.7 1877.2 14.5'*'3777.6 1877.9 14.5'
+'2786.7 1877.2 14.5'*'3776.9 1961.3 14.5'
+'2797.4 1959.7 14.5'*'2786.7 1877.2 14.5'
+'2797.4 1959.7 14.5'*'2457.6 1920.0 59.4'
+'2797.4 1959.7 14.5'*'3204.2 1958.0 14.5'
+'2797.4 1959.7 14.5'*'3195.3 1870.2 14.5'
+'2797.4 1959.7 14.5'*'2340.1 1846.5 24.1'
+'2797.4 1959.7 14.5'*'2315.4 1983.6 24.1'
+'2797.4 1959.7 14.5'*'3302.4 1920.0 59.4'
+'2797.4 1959.7 14.5'*'3434.4 1953.5 14.5'
+'2797.4 1959.7 14.5'*'3432.1 1877.9 14.5'
+'2797.4 1959.7 14.5'*'2134.4 1992.8 -52.7'
+'2797.4 1959.7 14.5'*'2130.4 1847.4 -52.7'
+'2797.4 1959.7 14.5'*'3776.9 1961.3 14.5'
+'2797.4 1959.7 14.5'*'3777.6 1877.9 14.5'
+'4882.7 2109.3 408.1'*'4819.2 2400.0 453.0'
+'4882.7 2109.3 408.1'*'4979.5 1804.1 331.3'
+'4882.7 2109.3 408.1'*'4531.2 2131.2 453.0'
+'4882.7 2109.3 408.1'*'4761.6 2457.6 453.0'
+'4882.7 2109.3 408.1'*'4828.8 2544.0 453.0'
+'4882.7 2109.3 408.1'*'4704.0 2515.2 453.0'
+'4882.7 2109.3 408.1'*'4771.2 2601.6 453.0'
+'4882.7 2109.3 408.1'*'5032.8 1638.9 254.5'
+'4882.7 2109.3 408.1'*'4646.4 2572.8 453.0'
+'4882.7 2109.3 408.1'*'4377.6 1920.0 453.0'
+'4882.7 2109.3 408.1'*'4334.2 1907.8 408.1'
+'4882.7 2109.3 408.1'*'4588.8 2630.4 453.0'
+'4882.7 2109.3 408.1'*'4615.8 2699.2 408.1'
+'4882.7 2109.3 408.1'*'5380.9 1385.8 -52.7'
+'5430.2 1372.5 254.5'*'5484.2 1382.4 254.4'
+'5430.2 1372.5 254.5'*'5349.9 1578.7 254.5'
+'5430.2 1372.5 254.5'*'5472.0 1632.0 299.4'
+'5430.2 1372.5 254.5'*'5280.0 1132.8 299.4'
+'5430.2 1372.5 254.5'*'5078.4 1382.4 -84.6'
+'5430.2 1372.5 254.5'*'5038.5 1244.9 -129.5'
+'5430.2 1372.5 254.5'*'5030.4 1728.0 -7.8'
+'3777.6 1877.9 14.5'*'3776.9 1961.3 14.5'
+'3777.6 1877.9 14.5'*'3432.1 1877.9 14.5'
+'3777.6 1877.9 14.5'*'3434.4 1953.5 14.5'
+'3777.6 1877.9 14.5'*'4137.6 1920.0 59.4'
+'3777.6 1877.9 14.5'*'3302.4 1920.0 59.4'
+'3777.6 1877.9 14.5'*'4266.8 1965.1 14.5'
+'3777.6 1877.9 14.5'*'4272.9 1831.0 24.1'
+'3777.6 1877.9 14.5'*'3204.2 1958.0 14.5'
+'3777.6 1877.9 14.5'*'3195.3 1870.2 14.5'
+'3777.6 1877.9 14.5'*'4526.2 1942.3 -62.3'
+'3777.6 1877.9 14.5'*'4532.7 1796.2 -52.7'
+'3777.6 1877.9 14.5'*'2797.4 1959.7 14.5'
+'3777.6 1877.9 14.5'*'2786.7 1877.2 14.5'
+'3776.9 1961.3 14.5'*'3777.6 1877.9 14.5'
+'3776.9 1961.3 14.5'*'3434.4 1953.5 14.5'
+'3776.9 1961.3 14.5'*'3432.1 1877.9 14.5'
+'3776.9 1961.3 14.5'*'4137.6 1920.0 59.4'
+'3776.9 1961.3 14.5'*'3302.4 1920.0 59.4'
+'3776.9 1961.3 14.5'*'4266.8 1965.1 14.5'
+'3776.9 1961.3 14.5'*'4272.9 1831.0 24.1'
+'3776.9 1961.3 14.5'*'3204.2 1958.0 14.5'
+'3776.9 1961.3 14.5'*'3195.3 1870.2 14.5'
+'3776.9 1961.3 14.5'*'4526.2 1942.3 -62.3'
+'3776.9 1961.3 14.5'*'4532.7 1796.2 -52.7'
+'3776.9 1961.3 14.5'*'2797.4 1959.7 14.5'
+'3776.9 1961.3 14.5'*'2786.7 1877.2 14.5'
+'4266.8 1965.1 14.5'*'4272.9 1831.0 24.1'
+'4266.8 1965.1 14.5'*'4137.6 1920.0 59.4'
+'4266.8 1965.1 14.5'*'4526.2 1942.3 -62.3'
+'4266.8 1965.1 14.5'*'4532.7 1796.2 -52.7'
+'4266.8 1965.1 14.5'*'3776.9 1961.3 14.5'
+'4266.8 1965.1 14.5'*'3777.6 1877.9 14.5'
+'4266.8 1965.1 14.5'*'4699.0 1642.0 -62.3'
+'4266.8 1965.1 14.5'*'3434.4 1953.5 14.5'
+'4266.8 1965.1 14.5'*'3432.1 1877.9 14.5'
+'4266.8 1965.1 14.5'*'5024.4 1524.4 -52.7'
+'4266.8 1965.1 14.5'*'3302.4 1920.0 59.4'
+'4266.8 1965.1 14.5'*'5078.4 1382.4 -84.6'
+'4272.9 1831.0 24.1'*'4266.8 1965.1 14.5'
+'4272.9 1831.0 24.1'*'4137.6 1920.0 59.4'
+'4272.9 1831.0 24.1'*'4532.7 1796.2 -52.7'
+'4272.9 1831.0 24.1'*'4526.2 1942.3 -62.3'
+'4272.9 1831.0 24.1'*'3777.6 1877.9 14.5'
+'4272.9 1831.0 24.1'*'3776.9 1961.3 14.5'
+'4272.9 1831.0 24.1'*'3434.4 1953.5 14.5'
+'4272.9 1831.0 24.1'*'3302.4 1920.0 59.4'
+'4272.9 1831.0 24.1'*'5251.9 1655.9 -52.7'
+'4699.0 1642.0 -62.3'*'4588.8 1632.0 -17.4'
+'4699.0 1642.0 -62.3'*'4532.7 1796.2 -52.7'
+'4699.0 1642.0 -62.3'*'5024.4 1524.4 -52.7'
+'4699.0 1642.0 -62.3'*'4526.2 1942.3 -62.3'
+'4699.0 1642.0 -62.3'*'5030.4 1728.0 -7.8'
+'4699.0 1642.0 -62.3'*'5107.2 1728.0 -7.8'
+'4699.0 1642.0 -62.3'*'5078.4 1382.4 -84.6'
+'4699.0 1642.0 -62.3'*'5184.0 1728.0 -7.8'
+'4699.0 1642.0 -62.3'*'5038.5 1244.9 -129.5'
+'4699.0 1642.0 -62.3'*'4266.8 1965.1 14.5'
+'4699.0 1642.0 -62.3'*'5251.9 1655.9 -52.7'
+'5251.9 1655.9 -52.7'*'5184.0 1728.0 -7.8'
+'5251.9 1655.9 -52.7'*'5107.2 1728.0 -7.8'
+'5251.9 1655.9 -52.7'*'5030.4 1728.0 -7.8'
+'5251.9 1655.9 -52.7'*'5024.4 1524.4 -52.7'
+'5251.9 1655.9 -52.7'*'5380.9 1385.8 -52.7'
+'5251.9 1655.9 -52.7'*'5078.4 1382.4 -84.6'
+'5251.9 1655.9 -52.7'*'5472.0 1382.4 -7.8'
+'5251.9 1655.9 -52.7'*'5038.5 1244.9 -129.5'
+'5251.9 1655.9 -52.7'*'4699.0 1642.0 -62.3'
+'5251.9 1655.9 -52.7'*'4588.8 1632.0 -17.4'
+'5251.9 1655.9 -52.7'*'4272.9 1831.0 24.1'
+'4532.7 1796.2 -52.7'*'4526.2 1942.3 -62.3'
+'4532.7 1796.2 -52.7'*'4588.8 1632.0 -17.4'
+'4532.7 1796.2 -52.7'*'4699.0 1642.0 -62.3'
+'4532.7 1796.2 -52.7'*'4272.9 1831.0 24.1'
+'4532.7 1796.2 -52.7'*'4266.8 1965.1 14.5'
+'4532.7 1796.2 -52.7'*'4137.6 1920.0 59.4'
+'4532.7 1796.2 -52.7'*'5024.4 1524.4 -52.7'
+'4532.7 1796.2 -52.7'*'5078.4 1382.4 -84.6'
+'4532.7 1796.2 -52.7'*'5038.5 1244.9 -129.5'
+'4532.7 1796.2 -52.7'*'3777.6 1877.9 14.5'
+'4532.7 1796.2 -52.7'*'3776.9 1961.3 14.5'
+'2134.4 1992.8 -52.7'*'2130.4 1847.4 -52.7'
+'2134.4 1992.8 -52.7'*'2315.4 1983.6 24.1'
+'2134.4 1992.8 -52.7'*'2340.1 1846.5 24.1'
+'2134.4 1992.8 -52.7'*'2457.6 1920.0 59.4'
+'2134.4 1992.8 -52.7'*'1691.2 2146.0 -52.7'
+'2134.4 1992.8 -52.7'*'1731.4 2282.5 -52.7'
+'2134.4 1992.8 -52.7'*'2786.7 1877.2 14.5'
+'2134.4 1992.8 -52.7'*'2797.4 1959.7 14.5'
+'2134.4 1992.8 -52.7'*'1541.6 2313.1 -52.7'
+'2134.4 1992.8 -52.7'*'1516.8 2457.6 -84.6'
+'2134.4 1992.8 -52.7'*'1398.5 2595.1 -129.5'
+'2315.4 1983.6 24.1'*'2340.1 1846.5 24.1'
+'2315.4 1983.6 24.1'*'2457.6 1920.0 59.4'
+'2315.4 1983.6 24.1'*'2134.4 1992.8 -52.7'
+'2315.4 1983.6 24.1'*'2130.4 1847.4 -52.7'
+'2315.4 1983.6 24.1'*'2797.4 1959.7 14.5'
+'2315.4 1983.6 24.1'*'2786.7 1877.2 14.5'
+'2315.4 1983.6 24.1'*'1691.2 2146.0 -52.7'
+'2315.4 1983.6 24.1'*'3195.3 1870.2 14.5'
+'2315.4 1983.6 24.1'*'3204.2 1958.0 14.5'
+'2315.4 1983.6 24.1'*'3302.4 1920.0 59.4'
+'1691.2 2146.0 -52.7'*'1574.4 2112.0 -7.8'
+'1691.2 2146.0 -52.7'*'1731.4 2282.5 -52.7'
+'1691.2 2146.0 -52.7'*'1497.6 2112.0 -7.8'
+'1691.2 2146.0 -52.7'*'1541.6 2313.1 -52.7'
+'1691.2 2146.0 -52.7'*'1420.8 2112.0 -7.8'
+'1691.2 2146.0 -52.7'*'2016.0 2208.0 -17.4'
+'1691.2 2146.0 -52.7'*'1516.8 2457.6 -84.6'
+'1691.2 2146.0 -52.7'*'1326.3 2200.6 -52.7'
+'1691.2 2146.0 -52.7'*'2134.4 1992.8 -52.7'
+'1691.2 2146.0 -52.7'*'1398.5 2595.1 -129.5'
+'1691.2 2146.0 -52.7'*'1132.8 2457.6 -7.8'
+'1691.2 2146.0 -52.7'*'2315.4 1983.6 24.1'
+'1691.2 2146.0 -52.7'*'2340.1 1846.5 24.1'
+'1691.2 2146.0 -52.7'*'2457.6 1920.0 59.4'
+'1326.3 2200.6 -52.7'*'1420.8 2112.0 -7.8'
+'1326.3 2200.6 -52.7'*'1497.6 2112.0 -7.8'
+'1326.3 2200.6 -52.7'*'1541.6 2313.1 -52.7'
+'1326.3 2200.6 -52.7'*'1254.0 2446.7 -52.7'
+'1326.3 2200.6 -52.7'*'1574.4 2112.0 -7.8'
+'1326.3 2200.6 -52.7'*'1516.8 2457.6 -84.6'
+'1326.3 2200.6 -52.7'*'1132.8 2457.6 -7.8'
+'1326.3 2200.6 -52.7'*'1691.2 2146.0 -52.7'
+'1326.3 2200.6 -52.7'*'1398.5 2595.1 -129.5'
+'1326.3 2200.6 -52.7'*'1731.4 2282.5 -52.7'
+'1326.3 2200.6 -52.7'*'2016.0 2208.0 -17.4'
+'5380.9 1385.8 -52.7'*'5472.0 1382.4 -7.8'
+'5380.9 1385.8 -52.7'*'5251.9 1655.9 -52.7'
+'5380.9 1385.8 -52.7'*'5078.4 1382.4 -84.6'
+'5380.9 1385.8 -52.7'*'5038.5 1244.9 -129.5'
+'5380.9 1385.8 -52.7'*'5184.0 1728.0 -7.8'
+'5380.9 1385.8 -52.7'*'5107.2 1728.0 -7.8'
+'5380.9 1385.8 -52.7'*'5030.4 1728.0 -7.8'
+'5024.4 1524.4 -52.7'*'5078.4 1382.4 -84.6'
+'5024.4 1524.4 -52.7'*'5030.4 1728.0 -7.8'
+'5024.4 1524.4 -52.7'*'5107.2 1728.0 -7.8'
+'5024.4 1524.4 -52.7'*'5184.0 1728.0 -7.8'
+'5024.4 1524.4 -52.7'*'5251.9 1655.9 -52.7'
+'5024.4 1524.4 -52.7'*'5038.5 1244.9 -129.5'
+'5024.4 1524.4 -52.7'*'4699.0 1642.0 -62.3'
+'5024.4 1524.4 -52.7'*'4588.8 1632.0 -17.4'
+'5024.4 1524.4 -52.7'*'4532.7 1796.2 -52.7'
+'5024.4 1524.4 -52.7'*'4526.2 1942.3 -62.3'
+'5024.4 1524.4 -52.7'*'4266.8 1965.1 14.5'
+'1254.0 2446.7 -52.7'*'1132.8 2457.6 -7.8'
+'1254.0 2446.7 -52.7'*'1398.5 2595.1 -129.5'
+'1254.0 2446.7 -52.7'*'1326.3 2200.6 -52.7'
+'1254.0 2446.7 -52.7'*'1516.8 2457.6 -84.6'
+'1254.0 2446.7 -52.7'*'1420.8 2112.0 -7.8'
+'1254.0 2446.7 -52.7'*'1497.6 2112.0 -7.8'
+'1254.0 2446.7 -52.7'*'1574.4 2112.0 -7.8'
+'1731.4 2282.5 -52.7'*'1691.2 2146.0 -52.7'
+'1731.4 2282.5 -52.7'*'1541.6 2313.1 -52.7'
+'1731.4 2282.5 -52.7'*'1574.4 2112.0 -7.8'
+'1731.4 2282.5 -52.7'*'1516.8 2457.6 -84.6'
+'1731.4 2282.5 -52.7'*'1497.6 2112.0 -7.8'
+'1731.4 2282.5 -52.7'*'2016.0 2208.0 -17.4'
+'1731.4 2282.5 -52.7'*'1420.8 2112.0 -7.8'
+'1731.4 2282.5 -52.7'*'1326.3 2200.6 -52.7'
+'1731.4 2282.5 -52.7'*'1398.5 2595.1 -129.5'
+'1731.4 2282.5 -52.7'*'2134.4 1992.8 -52.7'
+'1731.4 2282.5 -52.7'*'2130.4 1847.4 -52.7'
+'1731.4 2282.5 -52.7'*'2340.1 1846.5 24.1'
+'1541.6 2313.1 -52.7'*'1516.8 2457.6 -84.6'
+'1541.6 2313.1 -52.7'*'1731.4 2282.5 -52.7'
+'1541.6 2313.1 -52.7'*'1574.4 2112.0 -7.8'
+'1541.6 2313.1 -52.7'*'1497.6 2112.0 -7.8'
+'1541.6 2313.1 -52.7'*'1691.2 2146.0 -52.7'
+'1541.6 2313.1 -52.7'*'1420.8 2112.0 -7.8'
+'1541.6 2313.1 -52.7'*'1326.3 2200.6 -52.7'
+'1541.6 2313.1 -52.7'*'1398.5 2595.1 -129.5'
+'1541.6 2313.1 -52.7'*'2016.0 2208.0 -17.4'
+'1541.6 2313.1 -52.7'*'2134.4 1992.8 -52.7'
+'1541.6 2313.1 -52.7'*'2130.4 1847.4 -52.7'
+'1541.6 2313.1 -52.7'*'2340.1 1846.5 24.1'
+'1696.4 2009.7 350.5'*'1610.3 2244.7 254.5'
+'1696.4 2009.7 350.5'*'1738.7 1721.6 408.1'
+'1696.4 2009.7 350.5'*'1282.5 2264.2 254.5'
+'1696.4 2009.7 350.5'*'1785.6 1440.0 453.0'
+'1696.4 2009.7 350.5'*'1516.8 2457.6 -84.6'
+'1696.4 2009.7 350.5'*'1843.2 1382.4 453.0'
+'1696.4 2009.7 350.5'*'1150.1 2457.6 254.4'
+'1696.4 2009.7 350.5'*'1900.8 1324.8 453.0'
+'1696.4 2009.7 350.5'*'1776.0 1296.0 453.0'
+'1696.4 2009.7 350.5'*'1254.0 2446.7 -52.7'
+'1696.4 2009.7 350.5'*'1833.6 1238.4 453.0'
+'1696.4 2009.7 350.5'*'1398.5 2595.1 -129.5'
+'1696.4 2009.7 350.5'*'1955.3 1219.4 408.1'
+'4979.5 1804.1 331.3'*'5032.8 1638.9 254.5'
+'4979.5 1804.1 331.3'*'4882.7 2109.3 408.1'
+'4979.5 1804.1 331.3'*'5349.9 1578.7 254.5'
+'4979.5 1804.1 331.3'*'5078.4 1382.4 -84.6'
+'4979.5 1804.1 331.3'*'4819.2 2400.0 453.0'
+'4979.5 1804.1 331.3'*'5484.2 1382.4 254.4'
+'4979.5 1804.1 331.3'*'5380.9 1385.8 -52.7'
+'4979.5 1804.1 331.3'*'4761.6 2457.6 453.0'
+'4979.5 1804.1 331.3'*'5038.5 1244.9 -129.5'
+'4979.5 1804.1 331.3'*'4828.8 2544.0 453.0'
+'4979.5 1804.1 331.3'*'4704.0 2515.2 453.0'
+'4979.5 1804.1 331.3'*'4771.2 2601.6 453.0'
+'4979.5 1804.1 331.3'*'4646.4 2572.8 453.0'
+'4979.5 1804.1 331.3'*'4615.8 2699.2 408.1'
+'2527.6 1298.9 408.1'*'2630.4 1190.4 453.0'
+'2527.6 1298.9 408.1'*'2630.4 1113.6 453.0'
+'2527.6 1298.9 408.1'*'2457.6 1075.2 453.0'
+'2527.6 1298.9 408.1'*'2841.6 1382.4 299.4'
+'2527.6 1298.9 408.1'*'2841.6 1440.0 299.4'
+'2527.6 1298.9 408.1'*'2461.6 1739.6 254.5'
+'2527.6 1298.9 408.1'*'2900.6 1579.1 254.5'
+'2527.6 1298.9 408.1'*'2016.0 1209.6 453.0'
+'2527.6 1298.9 408.1'*'1955.3 1219.4 408.1'
+'2527.6 1298.9 408.1'*'1833.6 1238.4 453.0'
+'2527.6 1298.9 408.1'*'2457.6 1920.0 59.4'
+'2527.6 1298.9 408.1'*'2315.4 1983.6 24.1'
+'2900.6 1579.1 254.5'*'2841.6 1440.0 299.4'
+'2900.6 1579.1 254.5'*'2841.6 1382.4 299.4'
+'2900.6 1579.1 254.5'*'2461.6 1739.6 254.5'
+'2900.6 1579.1 254.5'*'3204.2 1958.0 14.5'
+'3195.3 1870.2 14.5'*'3204.2 1958.0 14.5'
+'3195.3 1870.2 14.5'*'3302.4 1920.0 59.4'
+'3195.3 1870.2 14.5'*'3432.1 1877.9 14.5'
+'3195.3 1870.2 14.5'*'3434.4 1953.5 14.5'
+'3195.3 1870.2 14.5'*'2797.4 1959.7 14.5'
+'3195.3 1870.2 14.5'*'2786.7 1877.2 14.5'
+'3195.3 1870.2 14.5'*'3777.6 1877.9 14.5'
+'3195.3 1870.2 14.5'*'3776.9 1961.3 14.5'
+'3195.3 1870.2 14.5'*'2457.6 1920.0 59.4'
+'3195.3 1870.2 14.5'*'2315.4 1983.6 24.1'
+'3195.3 1870.2 14.5'*'4137.6 1920.0 59.4'
+'3204.2 1958.0 14.5'*'3195.3 1870.2 14.5'
+'3204.2 1958.0 14.5'*'3302.4 1920.0 59.4'
+'3204.2 1958.0 14.5'*'3434.4 1953.5 14.5'
+'3204.2 1958.0 14.5'*'3432.1 1877.9 14.5'
+'3204.2 1958.0 14.5'*'2797.4 1959.7 14.5'
+'3204.2 1958.0 14.5'*'2786.7 1877.2 14.5'
+'3204.2 1958.0 14.5'*'3776.9 1961.3 14.5'
+'3204.2 1958.0 14.5'*'3777.6 1877.9 14.5'
+'3204.2 1958.0 14.5'*'2457.6 1920.0 59.4'
+'3204.2 1958.0 14.5'*'2340.1 1846.5 24.1'
+'3204.2 1958.0 14.5'*'2315.4 1983.6 24.1'
+'3204.2 1958.0 14.5'*'4137.6 1920.0 59.4'
+'5349.9 1578.7 254.5'*'5472.0 1632.0 299.4'
+'5349.9 1578.7 254.5'*'5430.2 1372.5 254.5'
+'5349.9 1578.7 254.5'*'5484.2 1382.4 254.4'
+'5349.9 1578.7 254.5'*'5032.8 1638.9 254.5'
+'5349.9 1578.7 254.5'*'4979.5 1804.1 331.3'
+'5349.9 1578.7 254.5'*'5078.4 1382.4 -84.6'
+'5349.9 1578.7 254.5'*'5038.5 1244.9 -129.5'
+'5032.8 1638.9 254.5'*'4979.5 1804.1 331.3'
+'5032.8 1638.9 254.5'*'5349.9 1578.7 254.5'
+'5032.8 1638.9 254.5'*'5078.4 1382.4 -84.6'
+'5032.8 1638.9 254.5'*'5472.0 1632.0 299.4'
+'5032.8 1638.9 254.5'*'4882.7 2109.3 408.1'
+'5032.8 1638.9 254.5'*'5380.9 1385.8 -52.7'
+'5032.8 1638.9 254.5'*'5038.5 1244.9 -129.5'
+'5032.8 1638.9 254.5'*'4819.2 2400.0 453.0'
+'5032.8 1638.9 254.5'*'4761.6 2457.6 453.0'
+'5032.8 1638.9 254.5'*'4828.8 2544.0 453.0'
+'5032.8 1638.9 254.5'*'4704.0 2515.2 453.0'
+'5032.8 1638.9 254.5'*'4771.2 2601.6 453.0'
+'4334.2 1907.8 408.1'*'4377.6 1920.0 453.0'
+'4334.2 1907.8 408.1'*'4266.8 1965.1 14.5'
+'4334.2 1907.8 408.1'*'4882.7 2109.3 408.1'
+'4334.2 1907.8 408.1'*'3777.6 1877.9 14.5'
+'4334.2 1907.8 408.1'*'3776.9 1961.3 14.5'
+'4334.2 1907.8 408.1'*'3434.4 1953.5 14.5'
+'4334.2 1907.8 408.1'*'3432.1 1877.9 14.5'
+'4140.9 2102.5 254.5'*'4137.6 1920.0 59.4'
+'4140.9 2102.5 254.5'*'4266.8 1965.1 14.5'
+'4140.9 2102.5 254.5'*'4272.9 1831.0 24.1'
+'4140.9 2102.5 254.5'*'4130.7 2551.0 408.1'
+'4140.9 2102.5 254.5'*'3763.2 2400.0 299.4'
+'4140.9 2102.5 254.5'*'3763.2 2457.6 299.4'
+'4140.9 2102.5 254.5'*'3974.4 2649.6 453.0'
+'4140.9 2102.5 254.5'*'3974.4 2726.4 453.0'
+'4140.9 2102.5 254.5'*'4147.2 2764.8 453.0'
+'4615.8 2699.2 408.1'*'4588.8 2630.4 453.0'
+'4615.8 2699.2 408.1'*'4646.4 2572.8 453.0'
+'4615.8 2699.2 408.1'*'4771.2 2601.6 453.0'
+'4615.8 2699.2 408.1'*'4704.0 2515.2 453.0'
+'4615.8 2699.2 408.1'*'4828.8 2544.0 453.0'
+'4615.8 2699.2 408.1'*'4761.6 2457.6 453.0'
+'4615.8 2699.2 408.1'*'4819.2 2400.0 453.0'
+'4615.8 2699.2 408.1'*'4147.2 2764.8 453.0'
+'4615.8 2699.2 408.1'*'4130.7 2551.0 408.1'
+'4615.8 2699.2 408.1'*'3974.4 2726.4 453.0'
+'4615.8 2699.2 408.1'*'3974.4 2649.6 453.0'
+'4615.8 2699.2 408.1'*'4882.7 2109.3 408.1'
+'4615.8 2699.2 408.1'*'3763.2 2457.6 299.4'
+'4615.8 2699.2 408.1'*'3763.2 2400.0 299.4'
+'4615.8 2699.2 408.1'*'4979.5 1804.1 331.3'
+'4130.7 2551.0 408.1'*'3974.4 2649.6 453.0'
+'4130.7 2551.0 408.1'*'4147.2 2764.8 453.0'
+'4130.7 2551.0 408.1'*'3974.4 2726.4 453.0'
+'4130.7 2551.0 408.1'*'3763.2 2457.6 299.4'
+'4130.7 2551.0 408.1'*'3763.2 2400.0 299.4'
+'4130.7 2551.0 408.1'*'4588.8 2630.4 453.0'
+'4130.7 2551.0 408.1'*'4140.9 2102.5 254.5'
+'4130.7 2551.0 408.1'*'4615.8 2699.2 408.1'
+'4130.7 2551.0 408.1'*'3700.7 2230.5 254.5'
+'4130.7 2551.0 408.1'*'4771.2 2601.6 453.0'
+'4130.7 2551.0 408.1'*'4266.8 1965.1 14.5'
+'4130.7 2551.0 408.1'*'4137.6 1920.0 59.4'
+'4130.7 2551.0 408.1'*'4272.9 1831.0 24.1'
+'3700.7 2230.5 254.5'*'3763.2 2400.0 299.4'
+'3700.7 2230.5 254.5'*'3763.2 2457.6 299.4'
+'3700.7 2230.5 254.5'*'3432.1 1877.9 14.5'
+'3432.1 1877.9 14.5'*'3434.4 1953.5 14.5'
+'3432.1 1877.9 14.5'*'3302.4 1920.0 59.4'
+'3432.1 1877.9 14.5'*'3195.3 1870.2 14.5'
+'3432.1 1877.9 14.5'*'3204.2 1958.0 14.5'
+'3432.1 1877.9 14.5'*'3777.6 1877.9 14.5'
+'3432.1 1877.9 14.5'*'3776.9 1961.3 14.5'
+'3432.1 1877.9 14.5'*'2797.4 1959.7 14.5'
+'3432.1 1877.9 14.5'*'2786.7 1877.2 14.5'
+'3432.1 1877.9 14.5'*'4137.6 1920.0 59.4'
+'3432.1 1877.9 14.5'*'4266.8 1965.1 14.5'
+'3432.1 1877.9 14.5'*'2457.6 1920.0 59.4'
+'3434.4 1953.5 14.5'*'3432.1 1877.9 14.5'
+'3434.4 1953.5 14.5'*'3302.4 1920.0 59.4'
+'3434.4 1953.5 14.5'*'3204.2 1958.0 14.5'
+'3434.4 1953.5 14.5'*'3195.3 1870.2 14.5'
+'3434.4 1953.5 14.5'*'3776.9 1961.3 14.5'
+'3434.4 1953.5 14.5'*'3777.6 1877.9 14.5'
+'3434.4 1953.5 14.5'*'2797.4 1959.7 14.5'
+'3434.4 1953.5 14.5'*'2786.7 1877.2 14.5'
+'3434.4 1953.5 14.5'*'4137.6 1920.0 59.4'
+'3434.4 1953.5 14.5'*'4266.8 1965.1 14.5'
+'3434.4 1953.5 14.5'*'4272.9 1831.0 24.1'
+'3434.4 1953.5 14.5'*'2457.6 1920.0 59.4'
+'2672.0 1916.2 408.1'*'2966.4 1920.0 453.0'
+'2672.0 1916.2 408.1'*'3163.1 1914.7 408.1'
+'2672.0 1916.2 408.1'*'2340.1 1846.5 24.1'
+'2672.0 1916.2 408.1'*'2315.4 1983.6 24.1'
+'2672.0 1916.2 408.1'*'2134.4 1992.8 -52.7'
+'2672.0 1916.2 408.1'*'2130.4 1847.4 -52.7'
+'2672.0 1916.2 408.1'*'3432.1 1877.9 14.5'
+'2672.0 1916.2 408.1'*'3434.4 1953.5 14.5'
+'2672.0 1916.2 408.1'*'1691.2 2146.0 -52.7'
+'3163.1 1914.7 408.1'*'2966.4 1920.0 453.0'
+'3163.1 1914.7 408.1'*'3204.2 1958.0 14.5'
+'3163.1 1914.7 408.1'*'3432.1 1877.9 14.5'
+'3163.1 1914.7 408.1'*'3434.4 1953.5 14.5'
+'3163.1 1914.7 408.1'*'2672.0 1916.2 408.1'
+'3163.1 1914.7 408.1'*'3776.9 1961.3 14.5'
+'3163.1 1914.7 408.1'*'3777.6 1877.9 14.5'
+'3442.8 1901.9 408.1'*'3628.8 1920.0 453.0'
+'3442.8 1901.9 408.1'*'3204.2 1958.0 14.5'
+'3442.8 1901.9 408.1'*'3195.3 1870.2 14.5'
+'3442.8 1901.9 408.1'*'3961.4 1912.9 408.1'
+'3442.8 1901.9 408.1'*'2797.4 1959.7 14.5'
+'3442.8 1901.9 408.1'*'2786.7 1877.2 14.5'
+'3442.8 1901.9 408.1'*'4266.8 1965.1 14.5'
+'3961.4 1912.9 408.1'*'3628.8 1920.0 453.0'
+'3961.4 1912.9 408.1'*'4266.8 1965.1 14.5'
+'3961.4 1912.9 408.1'*'4272.9 1831.0 24.1'
+'3961.4 1912.9 408.1'*'3442.8 1901.9 408.1'
+'3961.4 1912.9 408.1'*'4526.2 1942.3 -62.3'
+'3961.4 1912.9 408.1'*'4532.7 1796.2 -52.7'
+'1398.5 2595.1 -129.5'*'1843.2 2457.6 -110.4'
+'1398.5 2595.1 -129.5'*'1516.8 2457.6 -84.6'
+'5038.5 1244.9 -129.5'*'4761.6 1382.4 -110.4'
+'5038.5 1244.9 -129.5'*'5078.4 1382.4 -84.6'
+'3959.0 1096.9 254.5'*'3974.4 979.2 299.4'
+'3959.0 1096.9 254.5'*'3763.2 921.6 299.4'
+'3959.0 1096.9 254.5'*'3570.2 1093.3 254.5'
+'3959.0 1096.9 254.5'*'3532.8 979.2 299.4'
+'3959.0 1096.9 254.5'*'4084.6 1599.9 254.5'
+'3959.0 1096.9 254.5'*'4137.6 1920.0 59.4'
+'4545.1 1250.1 254.5'*'4339.2 1267.2 299.4'
+'4545.1 1250.1 254.5'*'4813.8 1148.7 254.5'
+'4545.1 1250.1 254.5'*'4838.4 1152.0 299.4'
+'4545.1 1250.1 254.5'*'4084.6 1599.9 254.5'
+'4545.1 1250.1 254.5'*'4531.2 2131.2 453.0'
+'4084.6 1599.9 254.5'*'4137.6 1920.0 59.4'
+'4084.6 1599.9 254.5'*'4266.8 1965.1 14.5'
+'4084.6 1599.9 254.5'*'3959.0 1096.9 254.5'
+'4084.6 1599.9 254.5'*'4545.1 1250.1 254.5'
+'4084.6 1599.9 254.5'*'3974.4 979.2 299.4'
+'4813.8 1148.7 254.5'*'4838.4 1152.0 299.4'
+'4813.8 1148.7 254.5'*'4761.6 1382.4 -110.4'
+'4813.8 1148.7 254.5'*'4545.1 1250.1 254.5'
+'4813.8 1148.7 254.5'*'4339.2 1267.2 299.4'
+'4813.8 1148.7 254.5'*'4699.0 1642.0 -62.3'
+'4526.2 1942.3 -62.3'*'4532.7 1796.2 -52.7'
+'4526.2 1942.3 -62.3'*'4266.8 1965.1 14.5'
+'4526.2 1942.3 -62.3'*'4272.9 1831.0 24.1'
+'4526.2 1942.3 -62.3'*'4588.8 1632.0 -17.4'
+'4526.2 1942.3 -62.3'*'4699.0 1642.0 -62.3'
+'4526.2 1942.3 -62.3'*'4137.6 1920.0 59.4'
+'4526.2 1942.3 -62.3'*'5024.4 1524.4 -52.7'
+'4526.2 1942.3 -62.3'*'3776.9 1961.3 14.5'
+'4526.2 1942.3 -62.3'*'3777.6 1877.9 14.5'
+'4526.2 1942.3 -62.3'*'5078.4 1382.4 -84.6'
+'4526.2 1942.3 -62.3'*'5038.5 1244.9 -129.5'
+'3801.6 1920.0 460.8'*'3961.4 1912.9 408.1'
+'3801.6 1920.0 460.8'*'3628.8 1920.0 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1689.6 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1632.0 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1574.4 453.0'
+'3801.6 1920.0 460.8'*'3442.8 1901.9 408.1'
+'3801.6 1920.0 460.8'*'3801.6 1516.8 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1459.2 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1401.6 453.0'
+'3801.6 1920.0 460.8'*'3801.6 1286.4 453.0'
+'3801.6 1920.0 460.8'*'4266.8 1965.1 14.5'
+'3801.6 1920.0 460.8'*'4272.9 1831.0 24.1'
+'3801.6 1920.0 460.8'*'4526.2 1942.3 -62.3'
+'3801.6 1920.0 460.8'*'4532.7 1796.2 -52.7'
+'3801.6 1920.0 460.8'*'3763.2 921.6 299.4'
+'3801.6 1920.0 460.8'*'2797.4 1959.7 14.5'
+'3801.6 1920.0 460.8'*'2786.7 1877.2 14.5'
+'2803.2 1920.0 460.8'*'2672.0 1916.2 408.1'
+'2803.2 1920.0 460.8'*'2966.4 1920.0 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2150.4 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2208.0 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2265.6 453.0'
+'2803.2 1920.0 460.8'*'3163.1 1914.7 408.1'
+'2803.2 1920.0 460.8'*'2803.2 2323.2 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2380.8 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2438.4 453.0'
+'2803.2 1920.0 460.8'*'2803.2 2553.6 453.0'
+'2803.2 1920.0 460.8'*'2340.1 1846.5 24.1'
+'2803.2 1920.0 460.8'*'2315.4 1983.6 24.1'
+'2803.2 1920.0 460.8'*'3432.1 1877.9 14.5'
+'2803.2 1920.0 460.8'*'3434.4 1953.5 14.5'
+'2803.2 1920.0 460.8'*'2134.4 1992.8 -52.7'
+'2803.2 1920.0 460.8'*'2130.4 1847.4 -52.7'
+'2803.2 1920.0 460.8'*'2696.2 2779.1 254.5'
+'2803.2 1920.0 460.8'*'2841.6 2918.4 299.4'
+'2803.2 1920.0 460.8'*'3776.9 1961.3 14.5'
+'2803.2 1920.0 460.8'*'3777.6 1877.9 14.5'
+'3628.8 1920.0 453.0'*'3442.8 1901.9 408.1'
+'3628.8 1920.0 453.0'*'3961.4 1912.9 408.1'
+'3628.8 1920.0 453.0'*'3204.2 1958.0 14.5'
+'3628.8 1920.0 453.0'*'3195.3 1870.2 14.5'
+'3628.8 1920.0 453.0'*'4266.8 1965.1 14.5'
+'3628.8 1920.0 453.0'*'4272.9 1831.0 24.1'
+'3628.8 1920.0 453.0'*'2797.4 1959.7 14.5'
+'3628.8 1920.0 453.0'*'2786.7 1877.2 14.5'
+'3628.8 1920.0 453.0'*'4526.2 1942.3 -62.3'
+'3628.8 1920.0 453.0'*'4532.7 1796.2 -52.7'
+'2966.4 1920.0 453.0'*'3163.1 1914.7 408.1'
+'2966.4 1920.0 453.0'*'2672.0 1916.2 408.1'
+'2966.4 1920.0 453.0'*'3204.2 1958.0 14.5'
+'2966.4 1920.0 453.0'*'3432.1 1877.9 14.5'
+'2966.4 1920.0 453.0'*'3434.4 1953.5 14.5'
+'2966.4 1920.0 453.0'*'3776.9 1961.3 14.5'
+'2966.4 1920.0 453.0'*'3777.6 1877.9 14.5'
+'3379.2 1536.0 337.8'*'3168.0 1536.0 299.4'
+'1516.8 2457.6 -84.6'*'1843.2 2457.6 -110.4'
+'1516.8 2457.6 -84.6'*'1398.5 2595.1 -129.5'
+'5078.4 1382.4 -84.6'*'4761.6 1382.4 -110.4'
+'5078.4 1382.4 -84.6'*'5038.5 1244.9 -129.5'
'3571.2 2400.0 96.0'*'3801.6 1920.0 460.8'
'3033.6 1440.0 96.0'*'2803.2 1920.0 460.8'
-'5484.2 1382.4 254.4'*'5472.0 1632.0 275.6'
-'5484.2 1382.4 254.4'*'5280.0 1132.8 275.6'
-'5484.2 1382.4 254.4'*'4509.9 1804.3 339.0'
-'5484.2 1382.4 254.4'*'4949.9 1930.0 388.9'
-'3302.4 1920.0 45.2'*'3582.7 1924.9 14.5'
-'3302.4 1920.0 45.2'*'3022.1 1915.1 14.5'
-'3302.4 1920.0 45.2'*'4137.6 1920.0 45.2'
-'3302.4 1920.0 45.2'*'2457.6 1920.0 45.2'
-'1766.4 2688.0 275.6'*'2265.6 2572.8 275.6'
-'1766.4 2688.0 275.6'*'1930.5 2011.9 -62.3'
-'1132.8 2457.6 -12.4'*'1420.8 2112.0 -12.4'
-'1132.8 2457.6 -12.4'*'1497.6 2112.0 -12.4'
-'1132.8 2457.6 -12.4'*'1574.4 2112.0 -12.4'
-'2457.6 1075.2 448.4'*'2630.4 1113.6 448.4'
-'2457.6 1075.2 448.4'*'2630.4 1190.4 448.4'
-'2457.6 1075.2 448.4'*'2416.9 1293.7 408.1'
-'2457.6 1075.2 448.4'*'2559.5 1305.1 408.1'
-'2457.6 1075.2 448.4'*'2432.5 1454.1 350.5'
-'2457.6 1075.2 448.4'*'2641.7 1406.7 331.3'
-'2457.6 1075.2 448.4'*'2016.0 1209.6 448.4'
-'2457.6 1075.2 448.4'*'2412.5 1564.1 292.9'
-'2457.6 1075.2 448.4'*'1958.4 1267.2 448.4'
-'2457.6 1075.2 448.4'*'2767.4 1534.7 254.5'
-'2457.6 1075.2 448.4'*'1900.8 1324.8 448.4'
-'2457.6 1075.2 448.4'*'2451.4 1675.6 254.5'
-'2457.6 1075.2 448.4'*'1833.6 1238.4 448.4'
-'2457.6 1075.2 448.4'*'1776.0 1296.0 448.4'
-'2457.6 1075.2 448.4'*'2457.6 1920.0 45.2'
-'3168.0 1536.0 285.2'*'3379.2 1536.0 314.0'
-'3168.0 1536.0 285.2'*'3396.8 1522.0 292.9'
-'3168.0 1536.0 285.2'*'3579.4 1550.6 120.1'
-'1785.6 1440.0 448.4'*'1843.2 1382.4 448.4'
-'1785.6 1440.0 448.4'*'1776.0 1296.0 448.4'
-'1785.6 1440.0 448.4'*'1900.8 1324.8 448.4'
-'1785.6 1440.0 448.4'*'1833.6 1238.4 448.4'
-'1785.6 1440.0 448.4'*'1958.4 1267.2 448.4'
-'1785.6 1440.0 448.4'*'1778.2 1730.2 408.1'
-'1785.6 1440.0 448.4'*'2016.0 1209.6 448.4'
-'1785.6 1440.0 448.4'*'1654.9 1910.0 388.9'
-'1785.6 1440.0 448.4'*'1644.9 2035.7 331.3'
-'1785.6 1440.0 448.4'*'2049.0 2005.3 408.1'
-'1785.6 1440.0 448.4'*'1561.6 2248.9 254.5'
-'1843.2 1382.4 448.4'*'1785.6 1440.0 448.4'
-'1843.2 1382.4 448.4'*'1900.8 1324.8 448.4'
-'1843.2 1382.4 448.4'*'1776.0 1296.0 448.4'
-'1843.2 1382.4 448.4'*'1833.6 1238.4 448.4'
-'1843.2 1382.4 448.4'*'1958.4 1267.2 448.4'
-'1843.2 1382.4 448.4'*'2016.0 1209.6 448.4'
-'1843.2 1382.4 448.4'*'1778.2 1730.2 408.1'
-'1843.2 1382.4 448.4'*'1654.9 1910.0 388.9'
-'1843.2 1382.4 448.4'*'1644.9 2035.7 331.3'
-'1843.2 1382.4 448.4'*'2015.2 2197.2 331.3'
-'1843.2 1382.4 448.4'*'1561.6 2248.9 254.5'
-'1900.8 1324.8 448.4'*'1843.2 1382.4 448.4'
-'1900.8 1324.8 448.4'*'1958.4 1267.2 448.4'
-'1900.8 1324.8 448.4'*'1833.6 1238.4 448.4'
-'1900.8 1324.8 448.4'*'1776.0 1296.0 448.4'
-'1900.8 1324.8 448.4'*'1785.6 1440.0 448.4'
-'1900.8 1324.8 448.4'*'2016.0 1209.6 448.4'
-'1900.8 1324.8 448.4'*'1778.2 1730.2 408.1'
-'1900.8 1324.8 448.4'*'2457.6 1075.2 448.4'
-'1900.8 1324.8 448.4'*'1654.9 1910.0 388.9'
-'1900.8 1324.8 448.4'*'1644.9 2035.7 331.3'
-'1900.8 1324.8 448.4'*'1561.6 2248.9 254.5'
-'1958.4 1267.2 448.4'*'1900.8 1324.8 448.4'
-'1958.4 1267.2 448.4'*'2016.0 1209.6 448.4'
-'1958.4 1267.2 448.4'*'1833.6 1238.4 448.4'
-'1958.4 1267.2 448.4'*'1843.2 1382.4 448.4'
-'1958.4 1267.2 448.4'*'1776.0 1296.0 448.4'
-'1958.4 1267.2 448.4'*'1785.6 1440.0 448.4'
-'1958.4 1267.2 448.4'*'2457.6 1075.2 448.4'
-'1958.4 1267.2 448.4'*'2630.4 1190.4 448.4'
-'1958.4 1267.2 448.4'*'2630.4 1113.6 448.4'
-'1958.4 1267.2 448.4'*'1654.9 1910.0 388.9'
-'2016.0 1209.6 448.4'*'1958.4 1267.2 448.4'
-'2016.0 1209.6 448.4'*'1900.8 1324.8 448.4'
-'2016.0 1209.6 448.4'*'1833.6 1238.4 448.4'
-'2016.0 1209.6 448.4'*'1843.2 1382.4 448.4'
-'2016.0 1209.6 448.4'*'1776.0 1296.0 448.4'
-'2016.0 1209.6 448.4'*'1785.6 1440.0 448.4'
-'2016.0 1209.6 448.4'*'2416.9 1293.7 408.1'
-'2016.0 1209.6 448.4'*'2457.6 1075.2 448.4'
-'2016.0 1209.6 448.4'*'2559.5 1305.1 408.1'
-'2016.0 1209.6 448.4'*'2630.4 1190.4 448.4'
-'2016.0 1209.6 448.4'*'2630.4 1113.6 448.4'
-'2016.0 1209.6 448.4'*'2841.6 1382.4 294.8'
-'3072.0 2860.8 294.8'*'2841.6 2918.4 294.8'
-'3072.0 2860.8 294.8'*'3017.3 2601.5 254.5'
-'3072.0 2860.8 294.8'*'2630.4 2860.8 275.6'
-'3072.0 2860.8 294.8'*'2599.4 2619.9 254.5'
-'3072.0 2860.8 294.8'*'3025.4 2289.4 120.1'
-'3072.0 2860.8 294.8'*'3030.8 2057.8 24.1'
-'3072.0 2860.8 294.8'*'3022.1 1915.1 14.5'
-'2630.4 2860.8 275.6'*'2841.6 2918.4 294.8'
-'2630.4 2860.8 275.6'*'2599.4 2619.9 254.5'
-'2630.4 2860.8 275.6'*'3072.0 2860.8 294.8'
-'2630.4 2860.8 275.6'*'3017.3 2601.5 254.5'
-'2630.4 2860.8 275.6'*'2601.9 2371.8 254.5'
-'2630.4 2860.8 275.6'*'2457.6 1920.0 45.2'
-'2073.6 1708.8 448.4'*'1778.2 1730.2 408.1'
-'2073.6 1708.8 448.4'*'2049.0 2005.3 408.1'
-'2073.6 1708.8 448.4'*'2015.2 2197.2 331.3'
-'2073.6 1708.8 448.4'*'2033.2 2429.0 254.5'
-'2016.0 2208.0 -31.6'*'2054.4 2246.4 -52.7'
-'2016.0 2208.0 -31.6'*'1930.5 2011.9 -62.3'
-'2016.0 2208.0 -31.6'*'1666.0 2261.1 -52.7'
-'2016.0 2208.0 -31.6'*'1574.4 2112.0 -12.4'
-'2016.0 2208.0 -31.6'*'1497.6 2112.0 -12.4'
-'2016.0 2208.0 -31.6'*'1420.8 2112.0 -12.4'
-'2457.6 1920.0 45.2'*'1930.5 2011.9 -62.3'
-'2457.6 1920.0 45.2'*'3022.1 1915.1 14.5'
-'2457.6 1920.0 45.2'*'3302.4 1920.0 45.2'
-'1776.0 1296.0 448.4'*'1833.6 1238.4 448.4'
-'1776.0 1296.0 448.4'*'1843.2 1382.4 448.4'
-'1776.0 1296.0 448.4'*'1900.8 1324.8 448.4'
-'1776.0 1296.0 448.4'*'1785.6 1440.0 448.4'
-'1776.0 1296.0 448.4'*'1958.4 1267.2 448.4'
-'1776.0 1296.0 448.4'*'2016.0 1209.6 448.4'
-'1776.0 1296.0 448.4'*'1778.2 1730.2 408.1'
-'1776.0 1296.0 448.4'*'1654.9 1910.0 388.9'
-'1776.0 1296.0 448.4'*'2457.6 1075.2 448.4'
-'1776.0 1296.0 448.4'*'1644.9 2035.7 331.3'
-'1776.0 1296.0 448.4'*'2630.4 1190.4 448.4'
-'1776.0 1296.0 448.4'*'2630.4 1113.6 448.4'
-'1776.0 1296.0 448.4'*'1561.6 2248.9 254.5'
-'1833.6 1238.4 448.4'*'1776.0 1296.0 448.4'
-'1833.6 1238.4 448.4'*'1900.8 1324.8 448.4'
-'1833.6 1238.4 448.4'*'1958.4 1267.2 448.4'
-'1833.6 1238.4 448.4'*'1843.2 1382.4 448.4'
-'1833.6 1238.4 448.4'*'2016.0 1209.6 448.4'
-'1833.6 1238.4 448.4'*'1785.6 1440.0 448.4'
-'1833.6 1238.4 448.4'*'1778.2 1730.2 408.1'
-'1833.6 1238.4 448.4'*'2416.9 1293.7 408.1'
-'1833.6 1238.4 448.4'*'2457.6 1075.2 448.4'
-'1833.6 1238.4 448.4'*'1654.9 1910.0 388.9'
-'1833.6 1238.4 448.4'*'2559.5 1305.1 408.1'
-'1833.6 1238.4 448.4'*'2630.4 1190.4 448.4'
-'1833.6 1238.4 448.4'*'2630.4 1113.6 448.4'
-'1833.6 1238.4 448.4'*'1644.9 2035.7 331.3'
-'1833.6 1238.4 448.4'*'1561.6 2248.9 254.5'
-'2841.6 1440.0 294.8'*'2841.6 1382.4 294.8'
-'2841.6 1440.0 294.8'*'2767.4 1534.7 254.5'
-'2841.6 1440.0 294.8'*'2641.7 1406.7 331.3'
-'2841.6 1440.0 294.8'*'2432.5 1454.1 350.5'
-'2841.6 1440.0 294.8'*'2412.5 1564.1 292.9'
-'2841.6 1440.0 294.8'*'2451.4 1675.6 254.5'
-'2841.6 1440.0 294.8'*'2416.9 1293.7 408.1'
-'2841.6 1440.0 294.8'*'2457.6 1920.0 45.2'
-'2841.6 1382.4 294.8'*'2841.6 1440.0 294.8'
-'2841.6 1382.4 294.8'*'2767.4 1534.7 254.5'
-'2841.6 1382.4 294.8'*'2641.7 1406.7 331.3'
-'2841.6 1382.4 294.8'*'2432.5 1454.1 350.5'
-'2841.6 1382.4 294.8'*'2416.9 1293.7 408.1'
-'2841.6 1382.4 294.8'*'2412.5 1564.1 292.9'
-'2841.6 1382.4 294.8'*'2451.4 1675.6 254.5'
-'2841.6 1382.4 294.8'*'3022.1 1915.1 14.5'
-'2841.6 1382.4 294.8'*'2457.6 1920.0 45.2'
-'2841.6 1382.4 294.8'*'2016.0 1209.6 448.4'
-'2227.2 1920.0 429.2'*'2049.0 2005.3 408.1'
-'2227.2 1920.0 429.2'*'2457.6 1920.0 45.2'
-'2227.2 1920.0 429.2'*'1778.2 1730.2 408.1'
-'2227.2 1920.0 429.2'*'3022.1 1915.1 14.5'
-'2265.6 2572.8 275.6'*'2033.2 2429.0 254.5'
-'2265.6 2572.8 275.6'*'2393.0 2186.9 254.5'
-'2265.6 2572.8 275.6'*'2015.2 2197.2 331.3'
-'2265.6 2572.8 275.6'*'1766.4 2688.0 275.6'
-'2265.6 2572.8 275.6'*'2593.7 2021.9 254.5'
-'2265.6 2572.8 275.6'*'2457.6 1920.0 45.2'
-'1324.8 2707.2 275.6'*'1142.4 2716.8 254.5'
-'1324.8 2707.2 275.6'*'1150.1 2457.6 254.4'
-'1324.8 2707.2 275.6'*'1132.8 2208.0 275.6'
-'1324.8 2707.2 275.6'*'1420.8 2112.0 -12.4'
-'1132.8 2208.0 275.6'*'1150.1 2457.6 254.4'
-'1132.8 2208.0 275.6'*'1561.6 2248.9 254.5'
-'1132.8 2208.0 275.6'*'1142.4 2716.8 254.5'
-'1132.8 2208.0 275.6'*'1324.8 2707.2 275.6'
-'1420.8 2112.0 -12.4'*'1497.6 2112.0 -12.4'
-'1420.8 2112.0 -12.4'*'1574.4 2112.0 -12.4'
-'1420.8 2112.0 -12.4'*'1666.0 2261.1 -52.7'
-'1420.8 2112.0 -12.4'*'1132.8 2457.6 -12.4'
-'1420.8 2112.0 -12.4'*'2016.0 2208.0 -31.6'
-'1420.8 2112.0 -12.4'*'2054.4 2246.4 -52.7'
-'1497.6 2112.0 -12.4'*'1574.4 2112.0 -12.4'
-'1497.6 2112.0 -12.4'*'1420.8 2112.0 -12.4'
-'1497.6 2112.0 -12.4'*'1666.0 2261.1 -52.7'
-'1497.6 2112.0 -12.4'*'1132.8 2457.6 -12.4'
-'1497.6 2112.0 -12.4'*'2016.0 2208.0 -31.6'
-'1497.6 2112.0 -12.4'*'2054.4 2246.4 -52.7'
-'1574.4 2112.0 -12.4'*'1497.6 2112.0 -12.4'
-'1574.4 2112.0 -12.4'*'1420.8 2112.0 -12.4'
-'1574.4 2112.0 -12.4'*'1666.0 2261.1 -52.7'
-'1574.4 2112.0 -12.4'*'2016.0 2208.0 -31.6'
-'1574.4 2112.0 -12.4'*'2054.4 2246.4 -52.7'
-'1574.4 2112.0 -12.4'*'1132.8 2457.6 -12.4'
-'2630.4 1113.6 448.4'*'2630.4 1190.4 448.4'
-'2630.4 1113.6 448.4'*'2457.6 1075.2 448.4'
-'2630.4 1113.6 448.4'*'2559.5 1305.1 408.1'
-'2630.4 1113.6 448.4'*'2416.9 1293.7 408.1'
-'2630.4 1113.6 448.4'*'2641.7 1406.7 331.3'
-'2630.4 1113.6 448.4'*'2432.5 1454.1 350.5'
-'2630.4 1113.6 448.4'*'2412.5 1564.1 292.9'
-'2630.4 1113.6 448.4'*'2451.4 1675.6 254.5'
-'2630.4 1113.6 448.4'*'2016.0 1209.6 448.4'
-'2630.4 1113.6 448.4'*'1958.4 1267.2 448.4'
-'2630.4 1113.6 448.4'*'1833.6 1238.4 448.4'
-'2630.4 1113.6 448.4'*'1776.0 1296.0 448.4'
-'2630.4 1113.6 448.4'*'2457.6 1920.0 45.2'
-'2630.4 1190.4 448.4'*'2630.4 1113.6 448.4'
-'2630.4 1190.4 448.4'*'2559.5 1305.1 408.1'
-'2630.4 1190.4 448.4'*'2457.6 1075.2 448.4'
-'2630.4 1190.4 448.4'*'2416.9 1293.7 408.1'
-'2630.4 1190.4 448.4'*'2641.7 1406.7 331.3'
-'2630.4 1190.4 448.4'*'2432.5 1454.1 350.5'
-'2630.4 1190.4 448.4'*'2412.5 1564.1 292.9'
-'2630.4 1190.4 448.4'*'2451.4 1675.6 254.5'
-'2630.4 1190.4 448.4'*'2016.0 1209.6 448.4'
-'2630.4 1190.4 448.4'*'1958.4 1267.2 448.4'
-'2630.4 1190.4 448.4'*'1833.6 1238.4 448.4'
-'2630.4 1190.4 448.4'*'2457.6 1920.0 45.2'
-'2630.4 1190.4 448.4'*'1776.0 1296.0 448.4'
-'2803.2 2553.6 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2553.6 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2553.6 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2553.6 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2553.6 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2553.6 448.4'*'2630.4 2860.8 275.6'
-'2803.2 2553.6 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2553.6 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2553.6 448.4'*'3072.0 2860.8 294.8'
-'2803.2 2553.6 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2438.4 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2438.4 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2438.4 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2438.4 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2438.4 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2438.4 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2438.4 448.4'*'2630.4 2860.8 275.6'
-'2803.2 2438.4 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2438.4 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2438.4 448.4'*'2033.2 2429.0 254.5'
-'2803.2 2380.8 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2380.8 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2380.8 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2380.8 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2380.8 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2380.8 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2380.8 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2380.8 448.4'*'2630.4 2860.8 275.6'
-'2803.2 2380.8 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2323.2 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2323.2 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2323.2 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2323.2 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2323.2 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2323.2 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2323.2 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2323.2 448.4'*'2630.4 2860.8 275.6'
-'2803.2 2323.2 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2265.6 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2265.6 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2265.6 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2265.6 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2265.6 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2265.6 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2265.6 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2265.6 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2208.0 448.4'*'2803.2 2150.4 448.4'
-'2803.2 2208.0 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2208.0 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2208.0 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2208.0 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2208.0 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2208.0 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2208.0 448.4'*'2841.6 2918.4 294.8'
-'2803.2 2150.4 448.4'*'2803.2 2208.0 448.4'
-'2803.2 2150.4 448.4'*'2803.2 2265.6 448.4'
-'2803.2 2150.4 448.4'*'2803.2 2323.2 448.4'
-'2803.2 2150.4 448.4'*'2798.5 1925.7 408.1'
-'2803.2 2150.4 448.4'*'2803.2 2380.8 448.4'
-'2803.2 2150.4 448.4'*'2803.2 2438.4 448.4'
-'2803.2 2150.4 448.4'*'2803.2 2553.6 448.4'
-'2803.2 2150.4 448.4'*'2841.6 2918.4 294.8'
-'2841.6 2918.4 294.8'*'2630.4 2860.8 275.6'
-'2841.6 2918.4 294.8'*'3072.0 2860.8 294.8'
-'2841.6 2918.4 294.8'*'3017.3 2601.5 254.5'
-'2841.6 2918.4 294.8'*'2599.4 2619.9 254.5'
+'5484.2 1382.4 254.4'*'5430.2 1372.5 254.5'
+'5484.2 1382.4 254.4'*'5349.9 1578.7 254.5'
+'5484.2 1382.4 254.4'*'5472.0 1632.0 299.4'
+'5484.2 1382.4 254.4'*'5280.0 1132.8 299.4'
+'5484.2 1382.4 254.4'*'5078.4 1382.4 -84.6'
+'5484.2 1382.4 254.4'*'5038.5 1244.9 -129.5'
+'5484.2 1382.4 254.4'*'4979.5 1804.1 331.3'
+'3302.4 1920.0 59.4'*'3204.2 1958.0 14.5'
+'3302.4 1920.0 59.4'*'3195.3 1870.2 14.5'
+'3302.4 1920.0 59.4'*'3434.4 1953.5 14.5'
+'3302.4 1920.0 59.4'*'3432.1 1877.9 14.5'
+'3302.4 1920.0 59.4'*'3776.9 1961.3 14.5'
+'3302.4 1920.0 59.4'*'3777.6 1877.9 14.5'
+'3302.4 1920.0 59.4'*'2797.4 1959.7 14.5'
+'3302.4 1920.0 59.4'*'2786.7 1877.2 14.5'
+'3302.4 1920.0 59.4'*'4137.6 1920.0 59.4'
+'3302.4 1920.0 59.4'*'2457.6 1920.0 59.4'
+'3302.4 1920.0 59.4'*'2340.1 1846.5 24.1'
+'3302.4 1920.0 59.4'*'4266.8 1965.1 14.5'
+'3302.4 1920.0 59.4'*'4272.9 1831.0 24.1'
+'3302.4 1920.0 59.4'*'2315.4 1983.6 24.1'
+'1766.4 2688.0 299.4'*'1790.2 2698.8 254.5'
+'1766.4 2688.0 299.4'*'2061.0 2654.0 254.5'
+'1766.4 2688.0 299.4'*'2265.6 2572.8 299.4'
+'1132.8 2457.6 -7.8'*'1254.0 2446.7 -52.7'
+'1132.8 2457.6 -7.8'*'1398.5 2595.1 -129.5'
+'1132.8 2457.6 -7.8'*'1326.3 2200.6 -52.7'
+'1132.8 2457.6 -7.8'*'1516.8 2457.6 -84.6'
+'1132.8 2457.6 -7.8'*'1420.8 2112.0 -7.8'
+'1132.8 2457.6 -7.8'*'1497.6 2112.0 -7.8'
+'1132.8 2457.6 -7.8'*'1574.4 2112.0 -7.8'
+'1132.8 2457.6 -7.8'*'1691.2 2146.0 -52.7'
+'2457.6 1075.2 453.0'*'2630.4 1113.6 453.0'
+'2457.6 1075.2 453.0'*'2630.4 1190.4 453.0'
+'2457.6 1075.2 453.0'*'2527.6 1298.9 408.1'
+'2457.6 1075.2 453.0'*'2016.0 1209.6 453.0'
+'2457.6 1075.2 453.0'*'1955.3 1219.4 408.1'
+'2457.6 1075.2 453.0'*'1958.4 1267.2 453.0'
+'2457.6 1075.2 453.0'*'1900.8 1324.8 453.0'
+'2457.6 1075.2 453.0'*'1833.6 1238.4 453.0'
+'2457.6 1075.2 453.0'*'2461.6 1739.6 254.5'
+'2457.6 1075.2 453.0'*'1776.0 1296.0 453.0'
+'2457.6 1075.2 453.0'*'2457.6 1920.0 59.4'
+'2457.6 1075.2 453.0'*'2315.4 1983.6 24.1'
+'3168.0 1536.0 299.4'*'3379.2 1536.0 337.8'
+'1785.6 1440.0 453.0'*'1843.2 1382.4 453.0'
+'1785.6 1440.0 453.0'*'1776.0 1296.0 453.0'
+'1785.6 1440.0 453.0'*'1900.8 1324.8 453.0'
+'1785.6 1440.0 453.0'*'1833.6 1238.4 453.0'
+'1785.6 1440.0 453.0'*'1958.4 1267.2 453.0'
+'1785.6 1440.0 453.0'*'1955.3 1219.4 408.1'
+'1785.6 1440.0 453.0'*'1738.7 1721.6 408.1'
+'1785.6 1440.0 453.0'*'2016.0 1209.6 453.0'
+'1785.6 1440.0 453.0'*'2042.7 1861.5 408.1'
+'1785.6 1440.0 453.0'*'1696.4 2009.7 350.5'
+'1785.6 1440.0 453.0'*'1610.3 2244.7 254.5'
+'1843.2 1382.4 453.0'*'1785.6 1440.0 453.0'
+'1843.2 1382.4 453.0'*'1900.8 1324.8 453.0'
+'1843.2 1382.4 453.0'*'1776.0 1296.0 453.0'
+'1843.2 1382.4 453.0'*'1833.6 1238.4 453.0'
+'1843.2 1382.4 453.0'*'1958.4 1267.2 453.0'
+'1843.2 1382.4 453.0'*'1955.3 1219.4 408.1'
+'1843.2 1382.4 453.0'*'2016.0 1209.6 453.0'
+'1843.2 1382.4 453.0'*'1738.7 1721.6 408.1'
+'1843.2 1382.4 453.0'*'1696.4 2009.7 350.5'
+'1843.2 1382.4 453.0'*'1610.3 2244.7 254.5'
+'1900.8 1324.8 453.0'*'1843.2 1382.4 453.0'
+'1900.8 1324.8 453.0'*'1958.4 1267.2 453.0'
+'1900.8 1324.8 453.0'*'1833.6 1238.4 453.0'
+'1900.8 1324.8 453.0'*'1955.3 1219.4 408.1'
+'1900.8 1324.8 453.0'*'1776.0 1296.0 453.0'
+'1900.8 1324.8 453.0'*'1785.6 1440.0 453.0'
+'1900.8 1324.8 453.0'*'2016.0 1209.6 453.0'
+'1900.8 1324.8 453.0'*'1738.7 1721.6 408.1'
+'1900.8 1324.8 453.0'*'2457.6 1075.2 453.0'
+'1900.8 1324.8 453.0'*'1696.4 2009.7 350.5'
+'1900.8 1324.8 453.0'*'1610.3 2244.7 254.5'
+'1958.4 1267.2 453.0'*'1955.3 1219.4 408.1'
+'1958.4 1267.2 453.0'*'1900.8 1324.8 453.0'
+'1958.4 1267.2 453.0'*'2016.0 1209.6 453.0'
+'1958.4 1267.2 453.0'*'1833.6 1238.4 453.0'
+'1958.4 1267.2 453.0'*'1843.2 1382.4 453.0'
+'1958.4 1267.2 453.0'*'1776.0 1296.0 453.0'
+'1958.4 1267.2 453.0'*'1785.6 1440.0 453.0'
+'1958.4 1267.2 453.0'*'1738.7 1721.6 408.1'
+'1958.4 1267.2 453.0'*'2457.6 1075.2 453.0'
+'1958.4 1267.2 453.0'*'2630.4 1190.4 453.0'
+'1958.4 1267.2 453.0'*'2630.4 1113.6 453.0'
+'2016.0 1209.6 453.0'*'1955.3 1219.4 408.1'
+'2016.0 1209.6 453.0'*'1958.4 1267.2 453.0'
+'2016.0 1209.6 453.0'*'1900.8 1324.8 453.0'
+'2016.0 1209.6 453.0'*'1833.6 1238.4 453.0'
+'2016.0 1209.6 453.0'*'1843.2 1382.4 453.0'
+'2016.0 1209.6 453.0'*'1776.0 1296.0 453.0'
+'2016.0 1209.6 453.0'*'1785.6 1440.0 453.0'
+'2016.0 1209.6 453.0'*'2457.6 1075.2 453.0'
+'2016.0 1209.6 453.0'*'2527.6 1298.9 408.1'
+'2016.0 1209.6 453.0'*'2630.4 1190.4 453.0'
+'2016.0 1209.6 453.0'*'2630.4 1113.6 453.0'
+'2016.0 1209.6 453.0'*'2841.6 1382.4 299.4'
+'3072.0 2860.8 299.4'*'3022.8 2763.5 254.5'
+'3072.0 2860.8 299.4'*'2841.6 2918.4 299.4'
+'3072.0 2860.8 299.4'*'2696.2 2779.1 254.5'
+'3072.0 2860.8 299.4'*'2630.4 2860.8 299.4'
+'2630.4 2860.8 299.4'*'2696.2 2779.1 254.5'
+'2630.4 2860.8 299.4'*'2841.6 2918.4 299.4'
+'2630.4 2860.8 299.4'*'3022.8 2763.5 254.5'
+'2630.4 2860.8 299.4'*'3072.0 2860.8 299.4'
+'2630.4 2860.8 299.4'*'2457.6 1920.0 59.4'
+'2073.6 1708.8 453.0'*'2042.7 1861.5 408.1'
+'2073.6 1708.8 453.0'*'1738.7 1721.6 408.1'
+'2073.6 1708.8 453.0'*'2061.0 2654.0 254.5'
+'2016.0 2208.0 -17.4'*'1731.4 2282.5 -52.7'
+'2016.0 2208.0 -17.4'*'1691.2 2146.0 -52.7'
+'2016.0 2208.0 -17.4'*'2130.4 1847.4 -52.7'
+'2016.0 2208.0 -17.4'*'1574.4 2112.0 -7.8'
+'2016.0 2208.0 -17.4'*'1541.6 2313.1 -52.7'
+'2016.0 2208.0 -17.4'*'1497.6 2112.0 -7.8'
+'2016.0 2208.0 -17.4'*'1516.8 2457.6 -84.6'
+'2016.0 2208.0 -17.4'*'1420.8 2112.0 -7.8'
+'2016.0 2208.0 -17.4'*'1326.3 2200.6 -52.7'
+'2016.0 2208.0 -17.4'*'1398.5 2595.1 -129.5'
+'2457.6 1920.0 59.4'*'2340.1 1846.5 24.1'
+'2457.6 1920.0 59.4'*'2315.4 1983.6 24.1'
+'2457.6 1920.0 59.4'*'2786.7 1877.2 14.5'
+'2457.6 1920.0 59.4'*'2797.4 1959.7 14.5'
+'2457.6 1920.0 59.4'*'2134.4 1992.8 -52.7'
+'2457.6 1920.0 59.4'*'2130.4 1847.4 -52.7'
+'2457.6 1920.0 59.4'*'3195.3 1870.2 14.5'
+'2457.6 1920.0 59.4'*'3204.2 1958.0 14.5'
+'2457.6 1920.0 59.4'*'1691.2 2146.0 -52.7'
+'2457.6 1920.0 59.4'*'3302.4 1920.0 59.4'
+'2457.6 1920.0 59.4'*'3432.1 1877.9 14.5'
+'2457.6 1920.0 59.4'*'3434.4 1953.5 14.5'
+'1776.0 1296.0 453.0'*'1833.6 1238.4 453.0'
+'1776.0 1296.0 453.0'*'1843.2 1382.4 453.0'
+'1776.0 1296.0 453.0'*'1900.8 1324.8 453.0'
+'1776.0 1296.0 453.0'*'1785.6 1440.0 453.0'
+'1776.0 1296.0 453.0'*'1958.4 1267.2 453.0'
+'1776.0 1296.0 453.0'*'1955.3 1219.4 408.1'
+'1776.0 1296.0 453.0'*'2016.0 1209.6 453.0'
+'1776.0 1296.0 453.0'*'1738.7 1721.6 408.1'
+'1776.0 1296.0 453.0'*'2457.6 1075.2 453.0'
+'1776.0 1296.0 453.0'*'1696.4 2009.7 350.5'
+'1776.0 1296.0 453.0'*'2630.4 1190.4 453.0'
+'1776.0 1296.0 453.0'*'2630.4 1113.6 453.0'
+'1776.0 1296.0 453.0'*'1610.3 2244.7 254.5'
+'1833.6 1238.4 453.0'*'1776.0 1296.0 453.0'
+'1833.6 1238.4 453.0'*'1900.8 1324.8 453.0'
+'1833.6 1238.4 453.0'*'1958.4 1267.2 453.0'
+'1833.6 1238.4 453.0'*'1955.3 1219.4 408.1'
+'1833.6 1238.4 453.0'*'1843.2 1382.4 453.0'
+'1833.6 1238.4 453.0'*'2016.0 1209.6 453.0'
+'1833.6 1238.4 453.0'*'1785.6 1440.0 453.0'
+'1833.6 1238.4 453.0'*'1738.7 1721.6 408.1'
+'1833.6 1238.4 453.0'*'2457.6 1075.2 453.0'
+'1833.6 1238.4 453.0'*'2527.6 1298.9 408.1'
+'1833.6 1238.4 453.0'*'1696.4 2009.7 350.5'
+'1833.6 1238.4 453.0'*'2630.4 1190.4 453.0'
+'1833.6 1238.4 453.0'*'2630.4 1113.6 453.0'
+'1833.6 1238.4 453.0'*'1610.3 2244.7 254.5'
+'2841.6 1440.0 299.4'*'2841.6 1382.4 299.4'
+'2841.6 1440.0 299.4'*'2900.6 1579.1 254.5'
+'2841.6 1440.0 299.4'*'2461.6 1739.6 254.5'
+'2841.6 1440.0 299.4'*'2457.6 1920.0 59.4'
+'2841.6 1440.0 299.4'*'2315.4 1983.6 24.1'
+'2841.6 1382.4 299.4'*'2841.6 1440.0 299.4'
+'2841.6 1382.4 299.4'*'2900.6 1579.1 254.5'
+'2841.6 1382.4 299.4'*'2461.6 1739.6 254.5'
+'2841.6 1382.4 299.4'*'2457.6 1920.0 59.4'
+'2841.6 1382.4 299.4'*'2315.4 1983.6 24.1'
+'2841.6 1382.4 299.4'*'2016.0 1209.6 453.0'
+'2841.6 1382.4 299.4'*'1955.3 1219.4 408.1'
+'2227.2 1920.0 453.0'*'2269.4 1914.7 408.1'
+'2227.2 1920.0 453.0'*'2042.7 1861.5 408.1'
+'2227.2 1920.0 453.0'*'1738.7 1721.6 408.1'
+'2227.2 1920.0 453.0'*'2786.7 1877.2 14.5'
+'2227.2 1920.0 453.0'*'2797.4 1959.7 14.5'
+'2265.6 2572.8 299.4'*'2061.0 2654.0 254.5'
+'2265.6 2572.8 299.4'*'2451.5 2181.0 254.5'
+'2265.6 2572.8 299.4'*'1790.2 2698.8 254.5'
+'2265.6 2572.8 299.4'*'1766.4 2688.0 299.4'
+'2265.6 2572.8 299.4'*'2457.6 1920.0 59.4'
+'1324.8 2707.2 299.4'*'1201.5 2449.9 254.5'
+'1324.8 2707.2 299.4'*'1150.1 2457.6 254.4'
+'1324.8 2707.2 299.4'*'1254.0 2446.7 -52.7'
+'1324.8 2707.2 299.4'*'1132.8 2208.0 299.4'
+'1324.8 2707.2 299.4'*'1326.3 2200.6 -52.7'
+'1324.8 2707.2 299.4'*'1420.8 2112.0 -7.8'
+'1132.8 2208.0 299.4'*'1282.5 2264.2 254.5'
+'1132.8 2208.0 299.4'*'1150.1 2457.6 254.4'
+'1132.8 2208.0 299.4'*'1201.5 2449.9 254.5'
+'1132.8 2208.0 299.4'*'1254.0 2446.7 -52.7'
+'1132.8 2208.0 299.4'*'1610.3 2244.7 254.5'
+'1132.8 2208.0 299.4'*'1324.8 2707.2 299.4'
+'1132.8 2208.0 299.4'*'1516.8 2457.6 -84.6'
+'1132.8 2208.0 299.4'*'1398.5 2595.1 -129.5'
+'1420.8 2112.0 -7.8'*'1497.6 2112.0 -7.8'
+'1420.8 2112.0 -7.8'*'1326.3 2200.6 -52.7'
+'1420.8 2112.0 -7.8'*'1574.4 2112.0 -7.8'
+'1420.8 2112.0 -7.8'*'1541.6 2313.1 -52.7'
+'1420.8 2112.0 -7.8'*'1691.2 2146.0 -52.7'
+'1420.8 2112.0 -7.8'*'1731.4 2282.5 -52.7'
+'1420.8 2112.0 -7.8'*'1516.8 2457.6 -84.6'
+'1420.8 2112.0 -7.8'*'1254.0 2446.7 -52.7'
+'1420.8 2112.0 -7.8'*'1132.8 2457.6 -7.8'
+'1420.8 2112.0 -7.8'*'1398.5 2595.1 -129.5'
+'1420.8 2112.0 -7.8'*'2016.0 2208.0 -17.4'
+'1497.6 2112.0 -7.8'*'1574.4 2112.0 -7.8'
+'1497.6 2112.0 -7.8'*'1420.8 2112.0 -7.8'
+'1497.6 2112.0 -7.8'*'1326.3 2200.6 -52.7'
+'1497.6 2112.0 -7.8'*'1691.2 2146.0 -52.7'
+'1497.6 2112.0 -7.8'*'1541.6 2313.1 -52.7'
+'1497.6 2112.0 -7.8'*'1731.4 2282.5 -52.7'
+'1497.6 2112.0 -7.8'*'1516.8 2457.6 -84.6'
+'1497.6 2112.0 -7.8'*'1254.0 2446.7 -52.7'
+'1497.6 2112.0 -7.8'*'1132.8 2457.6 -7.8'
+'1497.6 2112.0 -7.8'*'1398.5 2595.1 -129.5'
+'1497.6 2112.0 -7.8'*'2016.0 2208.0 -17.4'
+'1574.4 2112.0 -7.8'*'1497.6 2112.0 -7.8'
+'1574.4 2112.0 -7.8'*'1691.2 2146.0 -52.7'
+'1574.4 2112.0 -7.8'*'1420.8 2112.0 -7.8'
+'1574.4 2112.0 -7.8'*'1541.6 2313.1 -52.7'
+'1574.4 2112.0 -7.8'*'1731.4 2282.5 -52.7'
+'1574.4 2112.0 -7.8'*'1326.3 2200.6 -52.7'
+'1574.4 2112.0 -7.8'*'1516.8 2457.6 -84.6'
+'1574.4 2112.0 -7.8'*'2016.0 2208.0 -17.4'
+'1574.4 2112.0 -7.8'*'1254.0 2446.7 -52.7'
+'1574.4 2112.0 -7.8'*'1398.5 2595.1 -129.5'
+'1574.4 2112.0 -7.8'*'1132.8 2457.6 -7.8'
+'2630.4 1113.6 453.0'*'2630.4 1190.4 453.0'
+'2630.4 1113.6 453.0'*'2457.6 1075.2 453.0'
+'2630.4 1113.6 453.0'*'2527.6 1298.9 408.1'
+'2630.4 1113.6 453.0'*'2016.0 1209.6 453.0'
+'2630.4 1113.6 453.0'*'2461.6 1739.6 254.5'
+'2630.4 1113.6 453.0'*'1955.3 1219.4 408.1'
+'2630.4 1113.6 453.0'*'1958.4 1267.2 453.0'
+'2630.4 1113.6 453.0'*'1833.6 1238.4 453.0'
+'2630.4 1113.6 453.0'*'1776.0 1296.0 453.0'
+'2630.4 1113.6 453.0'*'2457.6 1920.0 59.4'
+'2630.4 1113.6 453.0'*'2315.4 1983.6 24.1'
+'2630.4 1190.4 453.0'*'2630.4 1113.6 453.0'
+'2630.4 1190.4 453.0'*'2527.6 1298.9 408.1'
+'2630.4 1190.4 453.0'*'2457.6 1075.2 453.0'
+'2630.4 1190.4 453.0'*'2461.6 1739.6 254.5'
+'2630.4 1190.4 453.0'*'2016.0 1209.6 453.0'
+'2630.4 1190.4 453.0'*'1958.4 1267.2 453.0'
+'2630.4 1190.4 453.0'*'1955.3 1219.4 408.1'
+'2630.4 1190.4 453.0'*'1833.6 1238.4 453.0'
+'2630.4 1190.4 453.0'*'2457.6 1920.0 59.4'
+'2630.4 1190.4 453.0'*'1776.0 1296.0 453.0'
+'2630.4 1190.4 453.0'*'2315.4 1983.6 24.1'
+'2803.2 2553.6 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2553.6 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2553.6 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2553.6 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2553.6 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2553.6 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2553.6 453.0'*'3022.8 2763.5 254.5'
+'2803.2 2553.6 453.0'*'2630.4 2860.8 299.4'
+'2803.2 2553.6 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2553.6 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2553.6 453.0'*'3072.0 2860.8 299.4'
+'2803.2 2438.4 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2438.4 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2438.4 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2438.4 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2438.4 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2438.4 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2438.4 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2438.4 453.0'*'2630.4 2860.8 299.4'
+'2803.2 2438.4 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2380.8 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2380.8 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2380.8 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2380.8 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2380.8 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2380.8 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2380.8 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2380.8 453.0'*'2630.4 2860.8 299.4'
+'2803.2 2380.8 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2323.2 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2323.2 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2323.2 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2323.2 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2323.2 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2323.2 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2323.2 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2323.2 453.0'*'2630.4 2860.8 299.4'
+'2803.2 2323.2 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2265.6 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2265.6 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2265.6 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2265.6 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2265.6 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2265.6 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2265.6 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2265.6 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2208.0 453.0'*'2803.2 2150.4 453.0'
+'2803.2 2208.0 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2208.0 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2208.0 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2208.0 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2208.0 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2208.0 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2208.0 453.0'*'2841.6 2918.4 299.4'
+'2803.2 2150.4 453.0'*'2803.2 2208.0 453.0'
+'2803.2 2150.4 453.0'*'2803.2 2265.6 453.0'
+'2803.2 2150.4 453.0'*'2803.2 2323.2 453.0'
+'2803.2 2150.4 453.0'*'2803.2 2380.8 453.0'
+'2803.2 2150.4 453.0'*'2672.0 1916.2 408.1'
+'2803.2 2150.4 453.0'*'2803.2 2438.4 453.0'
+'2803.2 2150.4 453.0'*'2803.2 2553.6 453.0'
+'2803.2 2150.4 453.0'*'2696.2 2779.1 254.5'
+'2803.2 2150.4 453.0'*'2841.6 2918.4 299.4'
+'2841.6 2918.4 299.4'*'2696.2 2779.1 254.5'
+'2841.6 2918.4 299.4'*'2630.4 2860.8 299.4'
+'2841.6 2918.4 299.4'*'3072.0 2860.8 299.4'
+'2841.6 2918.4 299.4'*'3022.8 2763.5 254.5'
'4761.6 1382.4 -110.4'*'5484.2 1382.4 254.4'
-'4819.2 2400.0 448.4'*'4761.6 2457.6 448.4'
-'4819.2 2400.0 448.4'*'4761.6 1382.4 -110.4'
-'4819.2 2400.0 448.4'*'4828.8 2544.0 448.4'
-'4819.2 2400.0 448.4'*'4704.0 2515.2 448.4'
-'4819.2 2400.0 448.4'*'4771.2 2601.6 448.4'
-'4819.2 2400.0 448.4'*'4646.4 2572.8 448.4'
-'4819.2 2400.0 448.4'*'4826.6 2109.8 408.1'
-'4819.2 2400.0 448.4'*'4509.9 1804.3 339.0'
-'4819.2 2400.0 448.4'*'4588.8 2630.4 448.4'
-'4819.2 2400.0 448.4'*'4949.9 1930.0 388.9'
-'4819.2 2400.0 448.4'*'4555.8 1834.7 408.1'
-'4819.2 2400.0 448.4'*'5043.2 1591.1 254.5'
-'4761.6 2457.6 448.4'*'4819.2 2400.0 448.4'
-'4761.6 2457.6 448.4'*'4704.0 2515.2 448.4'
-'4761.6 2457.6 448.4'*'4828.8 2544.0 448.4'
-'4761.6 2457.6 448.4'*'4771.2 2601.6 448.4'
-'4761.6 2457.6 448.4'*'4646.4 2572.8 448.4'
-'4761.6 2457.6 448.4'*'4588.8 2630.4 448.4'
-'4761.6 2457.6 448.4'*'4826.6 2109.8 408.1'
-'4761.6 2457.6 448.4'*'4949.9 1930.0 388.9'
-'4761.6 2457.6 448.4'*'4589.6 1642.8 331.3'
-'4761.6 2457.6 448.4'*'5043.2 1591.1 254.5'
-'4704.0 2515.2 448.4'*'4646.4 2572.8 448.4'
-'4704.0 2515.2 448.4'*'4761.6 2457.6 448.4'
-'4704.0 2515.2 448.4'*'4771.2 2601.6 448.4'
-'4704.0 2515.2 448.4'*'4828.8 2544.0 448.4'
-'4704.0 2515.2 448.4'*'4588.8 2630.4 448.4'
-'4704.0 2515.2 448.4'*'4819.2 2400.0 448.4'
-'4704.0 2515.2 448.4'*'4826.6 2109.8 408.1'
-'4704.0 2515.2 448.4'*'4147.2 2764.8 448.4'
-'4704.0 2515.2 448.4'*'4949.9 1930.0 388.9'
-'4704.0 2515.2 448.4'*'5043.2 1591.1 254.5'
-'4646.4 2572.8 448.4'*'4704.0 2515.2 448.4'
-'4646.4 2572.8 448.4'*'4588.8 2630.4 448.4'
-'4646.4 2572.8 448.4'*'4771.2 2601.6 448.4'
-'4646.4 2572.8 448.4'*'4761.6 2457.6 448.4'
-'4646.4 2572.8 448.4'*'4828.8 2544.0 448.4'
-'4646.4 2572.8 448.4'*'4819.2 2400.0 448.4'
-'4646.4 2572.8 448.4'*'4147.2 2764.8 448.4'
-'4646.4 2572.8 448.4'*'3974.4 2649.6 448.4'
-'4646.4 2572.8 448.4'*'3974.4 2726.4 448.4'
-'4646.4 2572.8 448.4'*'4949.9 1930.0 388.9'
-'4588.8 2630.4 448.4'*'4646.4 2572.8 448.4'
-'4588.8 2630.4 448.4'*'4704.0 2515.2 448.4'
-'4588.8 2630.4 448.4'*'4771.2 2601.6 448.4'
-'4588.8 2630.4 448.4'*'4761.6 2457.6 448.4'
-'4588.8 2630.4 448.4'*'4828.8 2544.0 448.4'
-'4588.8 2630.4 448.4'*'4819.2 2400.0 448.4'
-'4588.8 2630.4 448.4'*'4187.9 2546.3 408.1'
-'4588.8 2630.4 448.4'*'4147.2 2764.8 448.4'
-'4588.8 2630.4 448.4'*'4045.3 2534.9 408.1'
-'4588.8 2630.4 448.4'*'3974.4 2649.6 448.4'
-'4588.8 2630.4 448.4'*'3974.4 2726.4 448.4'
-'4588.8 2630.4 448.4'*'3763.2 2457.6 294.8'
-'3532.8 979.2 294.8'*'3763.2 921.6 294.8'
-'3532.8 979.2 294.8'*'3587.5 1238.5 254.5'
-'3532.8 979.2 294.8'*'3974.4 979.2 275.6'
-'3532.8 979.2 294.8'*'4005.4 1220.1 254.5'
-'3532.8 979.2 294.8'*'3579.4 1550.6 120.1'
-'3532.8 979.2 294.8'*'3574.0 1782.2 24.1'
-'3532.8 979.2 294.8'*'3582.7 1924.9 14.5'
-'3974.4 979.2 275.6'*'3763.2 921.6 294.8'
-'3974.4 979.2 275.6'*'4005.4 1220.1 254.5'
-'3974.4 979.2 275.6'*'3532.8 979.2 294.8'
-'3974.4 979.2 275.6'*'3587.5 1238.5 254.5'
-'3974.4 979.2 275.6'*'4002.9 1468.2 254.5'
-'3974.4 979.2 275.6'*'4137.6 1920.0 45.2'
-'4531.2 2131.2 448.4'*'4826.6 2109.8 408.1'
-'4531.2 2131.2 448.4'*'4555.8 1834.7 408.1'
-'4531.2 2131.2 448.4'*'4589.6 1642.8 331.3'
-'4531.2 2131.2 448.4'*'4571.6 1411.0 254.5'
-'4588.8 1632.0 -31.6'*'4550.4 1593.6 -52.7'
-'4588.8 1632.0 -31.6'*'4674.3 1828.1 -62.3'
-'4588.8 1632.0 -31.6'*'4938.8 1578.9 -52.7'
-'4588.8 1632.0 -31.6'*'5030.4 1728.0 -12.4'
-'4588.8 1632.0 -31.6'*'5107.2 1728.0 -12.4'
-'4588.8 1632.0 -31.6'*'5184.0 1728.0 -12.4'
-'4137.6 1920.0 45.2'*'4674.3 1828.1 -62.3'
-'4137.6 1920.0 45.2'*'3582.7 1924.9 14.5'
-'4137.6 1920.0 45.2'*'3302.4 1920.0 45.2'
-'4828.8 2544.0 448.4'*'4771.2 2601.6 448.4'
-'4828.8 2544.0 448.4'*'4761.6 2457.6 448.4'
-'4828.8 2544.0 448.4'*'4704.0 2515.2 448.4'
-'4828.8 2544.0 448.4'*'4819.2 2400.0 448.4'
-'4828.8 2544.0 448.4'*'4646.4 2572.8 448.4'
-'4828.8 2544.0 448.4'*'4588.8 2630.4 448.4'
-'4828.8 2544.0 448.4'*'4509.9 1804.3 339.0'
-'4828.8 2544.0 448.4'*'4826.6 2109.8 408.1'
-'4828.8 2544.0 448.4'*'4949.9 1930.0 388.9'
-'4828.8 2544.0 448.4'*'4147.2 2764.8 448.4'
-'4828.8 2544.0 448.4'*'3974.4 2649.6 448.4'
-'4828.8 2544.0 448.4'*'3974.4 2726.4 448.4'
-'4828.8 2544.0 448.4'*'5043.2 1591.1 254.5'
-'4771.2 2601.6 448.4'*'4828.8 2544.0 448.4'
-'4771.2 2601.6 448.4'*'4704.0 2515.2 448.4'
-'4771.2 2601.6 448.4'*'4646.4 2572.8 448.4'
-'4771.2 2601.6 448.4'*'4761.6 2457.6 448.4'
-'4771.2 2601.6 448.4'*'4588.8 2630.4 448.4'
-'4771.2 2601.6 448.4'*'4819.2 2400.0 448.4'
-'4771.2 2601.6 448.4'*'4826.6 2109.8 408.1'
-'4771.2 2601.6 448.4'*'4187.9 2546.3 408.1'
-'4771.2 2601.6 448.4'*'4147.2 2764.8 448.4'
-'4771.2 2601.6 448.4'*'4949.9 1930.0 388.9'
-'4771.2 2601.6 448.4'*'4045.3 2534.9 408.1'
-'4771.2 2601.6 448.4'*'3974.4 2649.6 448.4'
-'4771.2 2601.6 448.4'*'3974.4 2726.4 448.4'
-'4771.2 2601.6 448.4'*'5043.2 1591.1 254.5'
-'3763.2 2400.0 294.8'*'3763.2 2457.6 294.8'
-'3763.2 2400.0 294.8'*'3837.4 2305.3 254.5'
-'3763.2 2400.0 294.8'*'3963.1 2433.3 331.3'
-'3763.2 2400.0 294.8'*'4172.3 2385.9 350.5'
-'3763.2 2400.0 294.8'*'4192.3 2275.9 292.9'
-'3763.2 2400.0 294.8'*'4153.4 2164.4 254.5'
-'3763.2 2400.0 294.8'*'4187.9 2546.3 408.1'
-'3763.2 2457.6 294.8'*'3763.2 2400.0 294.8'
-'3763.2 2457.6 294.8'*'3837.4 2305.3 254.5'
-'3763.2 2457.6 294.8'*'3963.1 2433.3 331.3'
-'3763.2 2457.6 294.8'*'4172.3 2385.9 350.5'
-'3763.2 2457.6 294.8'*'4187.9 2546.3 408.1'
-'3763.2 2457.6 294.8'*'4192.3 2275.9 292.9'
-'3763.2 2457.6 294.8'*'4153.4 2164.4 254.5'
-'3763.2 2457.6 294.8'*'3582.7 1924.9 14.5'
-'3763.2 2457.6 294.8'*'4588.8 2630.4 448.4'
-'4377.6 1920.0 429.2'*'4555.8 1834.7 408.1'
-'4377.6 1920.0 429.2'*'4137.6 1920.0 45.2'
-'4377.6 1920.0 429.2'*'4826.6 2109.8 408.1'
-'4377.6 1920.0 429.2'*'3582.7 1924.9 14.5'
-'4339.2 1267.2 275.6'*'4571.6 1411.0 254.5'
-'4339.2 1267.2 275.6'*'4211.8 1653.1 254.5'
-'4339.2 1267.2 275.6'*'4589.6 1642.8 331.3'
-'4339.2 1267.2 275.6'*'4838.4 1152.0 275.6'
-'4339.2 1267.2 275.6'*'4011.1 1818.1 254.5'
-'4339.2 1267.2 275.6'*'4137.6 1920.0 45.2'
-'5280.0 1132.8 275.6'*'5484.2 1382.4 254.4'
-'5280.0 1132.8 275.6'*'5472.0 1632.0 275.6'
-'5280.0 1132.8 275.6'*'5184.0 1728.0 -12.4'
-'5472.0 1632.0 275.6'*'5484.2 1382.4 254.4'
-'5472.0 1632.0 275.6'*'5043.2 1591.1 254.5'
-'5472.0 1632.0 275.6'*'5280.0 1132.8 275.6'
-'5184.0 1728.0 -12.4'*'5107.2 1728.0 -12.4'
-'5184.0 1728.0 -12.4'*'5030.4 1728.0 -12.4'
-'5184.0 1728.0 -12.4'*'4938.8 1578.9 -52.7'
-'5184.0 1728.0 -12.4'*'5472.0 1382.4 -12.4'
-'5184.0 1728.0 -12.4'*'4588.8 1632.0 -31.6'
-'5184.0 1728.0 -12.4'*'4550.4 1593.6 -52.7'
-'5107.2 1728.0 -12.4'*'5184.0 1728.0 -12.4'
-'5107.2 1728.0 -12.4'*'5030.4 1728.0 -12.4'
-'5107.2 1728.0 -12.4'*'4938.8 1578.9 -52.7'
-'5107.2 1728.0 -12.4'*'5472.0 1382.4 -12.4'
-'5107.2 1728.0 -12.4'*'4588.8 1632.0 -31.6'
-'5107.2 1728.0 -12.4'*'4550.4 1593.6 -52.7'
-'5030.4 1728.0 -12.4'*'5107.2 1728.0 -12.4'
-'5030.4 1728.0 -12.4'*'5184.0 1728.0 -12.4'
-'5030.4 1728.0 -12.4'*'4938.8 1578.9 -52.7'
-'5030.4 1728.0 -12.4'*'4588.8 1632.0 -31.6'
-'5030.4 1728.0 -12.4'*'4550.4 1593.6 -52.7'
-'5030.4 1728.0 -12.4'*'5472.0 1382.4 -12.4'
-'3974.4 2726.4 448.4'*'3974.4 2649.6 448.4'
-'3974.4 2726.4 448.4'*'4147.2 2764.8 448.4'
-'3974.4 2726.4 448.4'*'4045.3 2534.9 408.1'
-'3974.4 2726.4 448.4'*'4187.9 2546.3 408.1'
-'3974.4 2726.4 448.4'*'3963.1 2433.3 331.3'
-'3974.4 2726.4 448.4'*'4172.3 2385.9 350.5'
-'3974.4 2726.4 448.4'*'4192.3 2275.9 292.9'
-'3974.4 2726.4 448.4'*'4153.4 2164.4 254.5'
-'3974.4 2726.4 448.4'*'4588.8 2630.4 448.4'
-'3974.4 2726.4 448.4'*'4646.4 2572.8 448.4'
-'3974.4 2726.4 448.4'*'4771.2 2601.6 448.4'
-'3974.4 2726.4 448.4'*'4828.8 2544.0 448.4'
-'3974.4 2726.4 448.4'*'4137.6 1920.0 45.2'
-'3974.4 2649.6 448.4'*'3974.4 2726.4 448.4'
-'3974.4 2649.6 448.4'*'4045.3 2534.9 408.1'
-'3974.4 2649.6 448.4'*'4147.2 2764.8 448.4'
-'3974.4 2649.6 448.4'*'4187.9 2546.3 408.1'
-'3974.4 2649.6 448.4'*'3963.1 2433.3 331.3'
-'3974.4 2649.6 448.4'*'4172.3 2385.9 350.5'
-'3974.4 2649.6 448.4'*'4192.3 2275.9 292.9'
-'3974.4 2649.6 448.4'*'4153.4 2164.4 254.5'
-'3974.4 2649.6 448.4'*'4588.8 2630.4 448.4'
-'3974.4 2649.6 448.4'*'4646.4 2572.8 448.4'
-'3974.4 2649.6 448.4'*'4771.2 2601.6 448.4'
-'3974.4 2649.6 448.4'*'4137.6 1920.0 45.2'
-'3974.4 2649.6 448.4'*'4828.8 2544.0 448.4'
-'3801.6 1286.4 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1286.4 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1286.4 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1286.4 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1286.4 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1286.4 448.4'*'3974.4 979.2 275.6'
-'3801.6 1286.4 448.4'*'3763.2 921.6 294.8'
-'3801.6 1286.4 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1286.4 448.4'*'3532.8 979.2 294.8'
-'3801.6 1286.4 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1401.6 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1401.6 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1401.6 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1401.6 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1401.6 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1401.6 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1401.6 448.4'*'3974.4 979.2 275.6'
-'3801.6 1401.6 448.4'*'3763.2 921.6 294.8'
-'3801.6 1401.6 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1401.6 448.4'*'4571.6 1411.0 254.5'
-'3801.6 1459.2 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1459.2 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1459.2 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1459.2 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1459.2 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1459.2 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1459.2 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1459.2 448.4'*'3974.4 979.2 275.6'
-'3801.6 1459.2 448.4'*'3763.2 921.6 294.8'
-'3801.6 1516.8 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1516.8 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1516.8 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1516.8 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1516.8 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1516.8 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1516.8 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1516.8 448.4'*'3974.4 979.2 275.6'
-'3801.6 1516.8 448.4'*'3763.2 921.6 294.8'
-'3801.6 1574.4 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1574.4 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1574.4 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1574.4 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1574.4 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1574.4 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1574.4 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1574.4 448.4'*'3763.2 921.6 294.8'
-'3801.6 1632.0 448.4'*'3801.6 1689.6 448.4'
-'3801.6 1632.0 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1632.0 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1632.0 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1632.0 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1632.0 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1632.0 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1632.0 448.4'*'3763.2 921.6 294.8'
-'3801.6 1689.6 448.4'*'3801.6 1632.0 448.4'
-'3801.6 1689.6 448.4'*'3801.6 1574.4 448.4'
-'3801.6 1689.6 448.4'*'3801.6 1516.8 448.4'
-'3801.6 1689.6 448.4'*'3801.6 1459.2 448.4'
-'3801.6 1689.6 448.4'*'3808.0 1922.6 408.1'
-'3801.6 1689.6 448.4'*'3801.6 1401.6 448.4'
-'3801.6 1689.6 448.4'*'3801.6 1286.4 448.4'
-'3801.6 1689.6 448.4'*'3763.2 921.6 294.8'
-'3763.2 921.6 294.8'*'3974.4 979.2 275.6'
-'3763.2 921.6 294.8'*'3532.8 979.2 294.8'
-'3763.2 921.6 294.8'*'3587.5 1238.5 254.5'
-'3763.2 921.6 294.8'*'4005.4 1220.1 254.5'
-'4838.4 1152.0 275.6'*'4339.2 1267.2 275.6'
-'4838.4 1152.0 275.6'*'4674.3 1828.1 -62.3'
-'5472.0 1382.4 -12.4'*'5184.0 1728.0 -12.4'
-'5472.0 1382.4 -12.4'*'5107.2 1728.0 -12.4'
-'5472.0 1382.4 -12.4'*'5030.4 1728.0 -12.4'
-'4147.2 2764.8 448.4'*'3974.4 2726.4 448.4'
-'4147.2 2764.8 448.4'*'3974.4 2649.6 448.4'
-'4147.2 2764.8 448.4'*'4187.9 2546.3 408.1'
-'4147.2 2764.8 448.4'*'4045.3 2534.9 408.1'
-'4147.2 2764.8 448.4'*'4172.3 2385.9 350.5'
-'4147.2 2764.8 448.4'*'3963.1 2433.3 331.3'
-'4147.2 2764.8 448.4'*'4588.8 2630.4 448.4'
-'4147.2 2764.8 448.4'*'4192.3 2275.9 292.9'
-'4147.2 2764.8 448.4'*'4646.4 2572.8 448.4'
-'4147.2 2764.8 448.4'*'3837.4 2305.3 254.5'
-'4147.2 2764.8 448.4'*'4704.0 2515.2 448.4'
-'4147.2 2764.8 448.4'*'4153.4 2164.4 254.5'
-'4147.2 2764.8 448.4'*'4771.2 2601.6 448.4'
-'4147.2 2764.8 448.4'*'4828.8 2544.0 448.4'
-'4147.2 2764.8 448.4'*'4137.6 1920.0 45.2'
-'3436.8 2304.0 285.2'*'3205.4 2295.7 292.9'
-'3436.8 2304.0 285.2'*'3025.4 2289.4 120.1'
-'1150.1 2457.6 254.4'*'1132.8 2208.0 275.6'
-'1150.1 2457.6 254.4'*'1142.4 2716.8 254.5'
-'1150.1 2457.6 254.4'*'1324.8 2707.2 275.6'
-'1150.1 2457.6 254.4'*'1644.9 2035.7 331.3'
-'1150.1 2457.6 254.4'*'1654.9 1910.0 388.9'
-'1150.1 2457.6 254.4'*'1778.2 1730.2 408.1'
+'4819.2 2400.0 453.0'*'4761.6 2457.6 453.0'
+'4819.2 2400.0 453.0'*'4761.6 1382.4 -110.4'
+'4819.2 2400.0 453.0'*'4828.8 2544.0 453.0'
+'4819.2 2400.0 453.0'*'4704.0 2515.2 453.0'
+'4819.2 2400.0 453.0'*'4771.2 2601.6 453.0'
+'4819.2 2400.0 453.0'*'4646.4 2572.8 453.0'
+'4819.2 2400.0 453.0'*'4882.7 2109.3 408.1'
+'4819.2 2400.0 453.0'*'4588.8 2630.4 453.0'
+'4819.2 2400.0 453.0'*'4615.8 2699.2 408.1'
+'4819.2 2400.0 453.0'*'4979.5 1804.1 331.3'
+'4819.2 2400.0 453.0'*'5032.8 1638.9 254.5'
+'4761.6 2457.6 453.0'*'4819.2 2400.0 453.0'
+'4761.6 2457.6 453.0'*'4704.0 2515.2 453.0'
+'4761.6 2457.6 453.0'*'4828.8 2544.0 453.0'
+'4761.6 2457.6 453.0'*'4771.2 2601.6 453.0'
+'4761.6 2457.6 453.0'*'4646.4 2572.8 453.0'
+'4761.6 2457.6 453.0'*'4588.8 2630.4 453.0'
+'4761.6 2457.6 453.0'*'4615.8 2699.2 408.1'
+'4761.6 2457.6 453.0'*'4882.7 2109.3 408.1'
+'4761.6 2457.6 453.0'*'4979.5 1804.1 331.3'
+'4761.6 2457.6 453.0'*'5032.8 1638.9 254.5'
+'4704.0 2515.2 453.0'*'4646.4 2572.8 453.0'
+'4704.0 2515.2 453.0'*'4761.6 2457.6 453.0'
+'4704.0 2515.2 453.0'*'4771.2 2601.6 453.0'
+'4704.0 2515.2 453.0'*'4828.8 2544.0 453.0'
+'4704.0 2515.2 453.0'*'4588.8 2630.4 453.0'
+'4704.0 2515.2 453.0'*'4819.2 2400.0 453.0'
+'4704.0 2515.2 453.0'*'4615.8 2699.2 408.1'
+'4704.0 2515.2 453.0'*'4882.7 2109.3 408.1'
+'4704.0 2515.2 453.0'*'4147.2 2764.8 453.0'
+'4704.0 2515.2 453.0'*'4979.5 1804.1 331.3'
+'4704.0 2515.2 453.0'*'5032.8 1638.9 254.5'
+'4646.4 2572.8 453.0'*'4704.0 2515.2 453.0'
+'4646.4 2572.8 453.0'*'4588.8 2630.4 453.0'
+'4646.4 2572.8 453.0'*'4771.2 2601.6 453.0'
+'4646.4 2572.8 453.0'*'4615.8 2699.2 408.1'
+'4646.4 2572.8 453.0'*'4761.6 2457.6 453.0'
+'4646.4 2572.8 453.0'*'4828.8 2544.0 453.0'
+'4646.4 2572.8 453.0'*'4819.2 2400.0 453.0'
+'4646.4 2572.8 453.0'*'4882.7 2109.3 408.1'
+'4646.4 2572.8 453.0'*'4147.2 2764.8 453.0'
+'4646.4 2572.8 453.0'*'3974.4 2649.6 453.0'
+'4646.4 2572.8 453.0'*'3974.4 2726.4 453.0'
+'4646.4 2572.8 453.0'*'4979.5 1804.1 331.3'
+'4588.8 2630.4 453.0'*'4646.4 2572.8 453.0'
+'4588.8 2630.4 453.0'*'4615.8 2699.2 408.1'
+'4588.8 2630.4 453.0'*'4704.0 2515.2 453.0'
+'4588.8 2630.4 453.0'*'4771.2 2601.6 453.0'
+'4588.8 2630.4 453.0'*'4761.6 2457.6 453.0'
+'4588.8 2630.4 453.0'*'4828.8 2544.0 453.0'
+'4588.8 2630.4 453.0'*'4819.2 2400.0 453.0'
+'4588.8 2630.4 453.0'*'4147.2 2764.8 453.0'
+'4588.8 2630.4 453.0'*'4130.7 2551.0 408.1'
+'4588.8 2630.4 453.0'*'4882.7 2109.3 408.1'
+'4588.8 2630.4 453.0'*'3974.4 2649.6 453.0'
+'4588.8 2630.4 453.0'*'3974.4 2726.4 453.0'
+'4588.8 2630.4 453.0'*'3763.2 2457.6 299.4'
+'3532.8 979.2 299.4'*'3570.2 1093.3 254.5'
+'3532.8 979.2 299.4'*'3763.2 921.6 299.4'
+'3532.8 979.2 299.4'*'3974.4 979.2 299.4'
+'3532.8 979.2 299.4'*'3959.0 1096.9 254.5'
+'3974.4 979.2 299.4'*'3959.0 1096.9 254.5'
+'3974.4 979.2 299.4'*'3763.2 921.6 299.4'
+'3974.4 979.2 299.4'*'3570.2 1093.3 254.5'
+'3974.4 979.2 299.4'*'3532.8 979.2 299.4'
+'3974.4 979.2 299.4'*'4084.6 1599.9 254.5'
+'3974.4 979.2 299.4'*'4137.6 1920.0 59.4'
+'4531.2 2131.2 453.0'*'4882.7 2109.3 408.1'
+'4531.2 2131.2 453.0'*'4545.1 1250.1 254.5'
+'4588.8 1632.0 -17.4'*'4699.0 1642.0 -62.3'
+'4588.8 1632.0 -17.4'*'4532.7 1796.2 -52.7'
+'4588.8 1632.0 -17.4'*'4526.2 1942.3 -62.3'
+'4588.8 1632.0 -17.4'*'5024.4 1524.4 -52.7'
+'4588.8 1632.0 -17.4'*'5030.4 1728.0 -7.8'
+'4588.8 1632.0 -17.4'*'5107.2 1728.0 -7.8'
+'4588.8 1632.0 -17.4'*'5078.4 1382.4 -84.6'
+'4588.8 1632.0 -17.4'*'5184.0 1728.0 -7.8'
+'4588.8 1632.0 -17.4'*'5251.9 1655.9 -52.7'
+'4137.6 1920.0 59.4'*'4266.8 1965.1 14.5'
+'4137.6 1920.0 59.4'*'4272.9 1831.0 24.1'
+'4137.6 1920.0 59.4'*'3777.6 1877.9 14.5'
+'4137.6 1920.0 59.4'*'3776.9 1961.3 14.5'
+'4137.6 1920.0 59.4'*'4526.2 1942.3 -62.3'
+'4137.6 1920.0 59.4'*'4532.7 1796.2 -52.7'
+'4137.6 1920.0 59.4'*'3434.4 1953.5 14.5'
+'4137.6 1920.0 59.4'*'3432.1 1877.9 14.5'
+'4137.6 1920.0 59.4'*'3302.4 1920.0 59.4'
+'4137.6 1920.0 59.4'*'3204.2 1958.0 14.5'
+'4137.6 1920.0 59.4'*'3195.3 1870.2 14.5'
+'4828.8 2544.0 453.0'*'4771.2 2601.6 453.0'
+'4828.8 2544.0 453.0'*'4761.6 2457.6 453.0'
+'4828.8 2544.0 453.0'*'4704.0 2515.2 453.0'
+'4828.8 2544.0 453.0'*'4819.2 2400.0 453.0'
+'4828.8 2544.0 453.0'*'4646.4 2572.8 453.0'
+'4828.8 2544.0 453.0'*'4588.8 2630.4 453.0'
+'4828.8 2544.0 453.0'*'4615.8 2699.2 408.1'
+'4828.8 2544.0 453.0'*'4882.7 2109.3 408.1'
+'4828.8 2544.0 453.0'*'4147.2 2764.8 453.0'
+'4828.8 2544.0 453.0'*'4979.5 1804.1 331.3'
+'4828.8 2544.0 453.0'*'3974.4 2649.6 453.0'
+'4828.8 2544.0 453.0'*'3974.4 2726.4 453.0'
+'4828.8 2544.0 453.0'*'5032.8 1638.9 254.5'
+'4771.2 2601.6 453.0'*'4828.8 2544.0 453.0'
+'4771.2 2601.6 453.0'*'4704.0 2515.2 453.0'
+'4771.2 2601.6 453.0'*'4646.4 2572.8 453.0'
+'4771.2 2601.6 453.0'*'4761.6 2457.6 453.0'
+'4771.2 2601.6 453.0'*'4588.8 2630.4 453.0'
+'4771.2 2601.6 453.0'*'4615.8 2699.2 408.1'
+'4771.2 2601.6 453.0'*'4819.2 2400.0 453.0'
+'4771.2 2601.6 453.0'*'4882.7 2109.3 408.1'
+'4771.2 2601.6 453.0'*'4130.7 2551.0 408.1'
+'4771.2 2601.6 453.0'*'4147.2 2764.8 453.0'
+'4771.2 2601.6 453.0'*'3974.4 2649.6 453.0'
+'4771.2 2601.6 453.0'*'3974.4 2726.4 453.0'
+'4771.2 2601.6 453.0'*'4979.5 1804.1 331.3'
+'4771.2 2601.6 453.0'*'5032.8 1638.9 254.5'
+'3763.2 2400.0 299.4'*'3763.2 2457.6 299.4'
+'3763.2 2400.0 299.4'*'3700.7 2230.5 254.5'
+'3763.2 2400.0 299.4'*'4140.9 2102.5 254.5'
+'3763.2 2400.0 299.4'*'3432.1 1877.9 14.5'
+'3763.2 2400.0 299.4'*'4615.8 2699.2 408.1'
+'3763.2 2457.6 299.4'*'3763.2 2400.0 299.4'
+'3763.2 2457.6 299.4'*'3700.7 2230.5 254.5'
+'3763.2 2457.6 299.4'*'4140.9 2102.5 254.5'
+'3763.2 2457.6 299.4'*'3432.1 1877.9 14.5'
+'3763.2 2457.6 299.4'*'4588.8 2630.4 453.0'
+'4377.6 1920.0 453.0'*'4334.2 1907.8 408.1'
+'4377.6 1920.0 453.0'*'4266.8 1965.1 14.5'
+'4377.6 1920.0 453.0'*'4882.7 2109.3 408.1'
+'4377.6 1920.0 453.0'*'3777.6 1877.9 14.5'
+'4377.6 1920.0 453.0'*'3776.9 1961.3 14.5'
+'4377.6 1920.0 453.0'*'3434.4 1953.5 14.5'
+'4377.6 1920.0 453.0'*'3432.1 1877.9 14.5'
+'4339.2 1267.2 299.4'*'4545.1 1250.1 254.5'
+'4339.2 1267.2 299.4'*'4813.8 1148.7 254.5'
+'4339.2 1267.2 299.4'*'4838.4 1152.0 299.4'
+'4339.2 1267.2 299.4'*'4137.6 1920.0 59.4'
+'5280.0 1132.8 299.4'*'5430.2 1372.5 254.5'
+'5280.0 1132.8 299.4'*'5484.2 1382.4 254.4'
+'5280.0 1132.8 299.4'*'5472.0 1632.0 299.4'
+'5280.0 1132.8 299.4'*'5251.9 1655.9 -52.7'
+'5280.0 1132.8 299.4'*'5184.0 1728.0 -7.8'
+'5472.0 1632.0 299.4'*'5349.9 1578.7 254.5'
+'5472.0 1632.0 299.4'*'5484.2 1382.4 254.4'
+'5472.0 1632.0 299.4'*'5430.2 1372.5 254.5'
+'5472.0 1632.0 299.4'*'5032.8 1638.9 254.5'
+'5472.0 1632.0 299.4'*'5280.0 1132.8 299.4'
+'5472.0 1632.0 299.4'*'5078.4 1382.4 -84.6'
+'5472.0 1632.0 299.4'*'5038.5 1244.9 -129.5'
+'5184.0 1728.0 -7.8'*'5107.2 1728.0 -7.8'
+'5184.0 1728.0 -7.8'*'5251.9 1655.9 -52.7'
+'5184.0 1728.0 -7.8'*'5030.4 1728.0 -7.8'
+'5184.0 1728.0 -7.8'*'5024.4 1524.4 -52.7'
+'5184.0 1728.0 -7.8'*'5078.4 1382.4 -84.6'
+'5184.0 1728.0 -7.8'*'5380.9 1385.8 -52.7'
+'5184.0 1728.0 -7.8'*'5472.0 1382.4 -7.8'
+'5184.0 1728.0 -7.8'*'4699.0 1642.0 -62.3'
+'5184.0 1728.0 -7.8'*'5038.5 1244.9 -129.5'
+'5184.0 1728.0 -7.8'*'4588.8 1632.0 -17.4'
+'5107.2 1728.0 -7.8'*'5184.0 1728.0 -7.8'
+'5107.2 1728.0 -7.8'*'5030.4 1728.0 -7.8'
+'5107.2 1728.0 -7.8'*'5251.9 1655.9 -52.7'
+'5107.2 1728.0 -7.8'*'5024.4 1524.4 -52.7'
+'5107.2 1728.0 -7.8'*'5078.4 1382.4 -84.6'
+'5107.2 1728.0 -7.8'*'4699.0 1642.0 -62.3'
+'5107.2 1728.0 -7.8'*'5380.9 1385.8 -52.7'
+'5107.2 1728.0 -7.8'*'5472.0 1382.4 -7.8'
+'5107.2 1728.0 -7.8'*'5038.5 1244.9 -129.5'
+'5107.2 1728.0 -7.8'*'4588.8 1632.0 -17.4'
+'5030.4 1728.0 -7.8'*'5107.2 1728.0 -7.8'
+'5030.4 1728.0 -7.8'*'5184.0 1728.0 -7.8'
+'5030.4 1728.0 -7.8'*'5024.4 1524.4 -52.7'
+'5030.4 1728.0 -7.8'*'5251.9 1655.9 -52.7'
+'5030.4 1728.0 -7.8'*'4699.0 1642.0 -62.3'
+'5030.4 1728.0 -7.8'*'5078.4 1382.4 -84.6'
+'5030.4 1728.0 -7.8'*'4588.8 1632.0 -17.4'
+'5030.4 1728.0 -7.8'*'5380.9 1385.8 -52.7'
+'5030.4 1728.0 -7.8'*'5038.5 1244.9 -129.5'
+'5030.4 1728.0 -7.8'*'5472.0 1382.4 -7.8'
+'3974.4 2726.4 453.0'*'3974.4 2649.6 453.0'
+'3974.4 2726.4 453.0'*'4147.2 2764.8 453.0'
+'3974.4 2726.4 453.0'*'4130.7 2551.0 408.1'
+'3974.4 2726.4 453.0'*'4588.8 2630.4 453.0'
+'3974.4 2726.4 453.0'*'4615.8 2699.2 408.1'
+'3974.4 2726.4 453.0'*'4140.9 2102.5 254.5'
+'3974.4 2726.4 453.0'*'4646.4 2572.8 453.0'
+'3974.4 2726.4 453.0'*'4771.2 2601.6 453.0'
+'3974.4 2726.4 453.0'*'4828.8 2544.0 453.0'
+'3974.4 2726.4 453.0'*'4137.6 1920.0 59.4'
+'3974.4 2726.4 453.0'*'4266.8 1965.1 14.5'
+'3974.4 2726.4 453.0'*'4272.9 1831.0 24.1'
+'3974.4 2649.6 453.0'*'3974.4 2726.4 453.0'
+'3974.4 2649.6 453.0'*'4130.7 2551.0 408.1'
+'3974.4 2649.6 453.0'*'4147.2 2764.8 453.0'
+'3974.4 2649.6 453.0'*'4140.9 2102.5 254.5'
+'3974.4 2649.6 453.0'*'4588.8 2630.4 453.0'
+'3974.4 2649.6 453.0'*'4615.8 2699.2 408.1'
+'3974.4 2649.6 453.0'*'4646.4 2572.8 453.0'
+'3974.4 2649.6 453.0'*'4771.2 2601.6 453.0'
+'3974.4 2649.6 453.0'*'4137.6 1920.0 59.4'
+'3974.4 2649.6 453.0'*'4828.8 2544.0 453.0'
+'3974.4 2649.6 453.0'*'4266.8 1965.1 14.5'
+'3974.4 2649.6 453.0'*'4272.9 1831.0 24.1'
+'3801.6 1286.4 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1286.4 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1286.4 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1286.4 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1286.4 453.0'*'3959.0 1096.9 254.5'
+'3801.6 1286.4 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1286.4 453.0'*'3570.2 1093.3 254.5'
+'3801.6 1286.4 453.0'*'3974.4 979.2 299.4'
+'3801.6 1286.4 453.0'*'3763.2 921.6 299.4'
+'3801.6 1286.4 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1286.4 453.0'*'3532.8 979.2 299.4'
+'3801.6 1401.6 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1401.6 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1401.6 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1401.6 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1401.6 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1401.6 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1401.6 453.0'*'3959.0 1096.9 254.5'
+'3801.6 1401.6 453.0'*'3974.4 979.2 299.4'
+'3801.6 1401.6 453.0'*'3763.2 921.6 299.4'
+'3801.6 1459.2 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1459.2 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1459.2 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1459.2 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1459.2 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1459.2 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1459.2 453.0'*'3974.4 979.2 299.4'
+'3801.6 1459.2 453.0'*'3763.2 921.6 299.4'
+'3801.6 1516.8 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1516.8 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1516.8 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1516.8 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1516.8 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1516.8 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1516.8 453.0'*'3974.4 979.2 299.4'
+'3801.6 1516.8 453.0'*'3763.2 921.6 299.4'
+'3801.6 1574.4 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1574.4 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1574.4 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1574.4 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1574.4 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1574.4 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1574.4 453.0'*'3763.2 921.6 299.4'
+'3801.6 1632.0 453.0'*'3801.6 1689.6 453.0'
+'3801.6 1632.0 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1632.0 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1632.0 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1632.0 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1632.0 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1632.0 453.0'*'3763.2 921.6 299.4'
+'3801.6 1689.6 453.0'*'3801.6 1632.0 453.0'
+'3801.6 1689.6 453.0'*'3801.6 1574.4 453.0'
+'3801.6 1689.6 453.0'*'3801.6 1516.8 453.0'
+'3801.6 1689.6 453.0'*'3801.6 1459.2 453.0'
+'3801.6 1689.6 453.0'*'3801.6 1401.6 453.0'
+'3801.6 1689.6 453.0'*'3801.6 1286.4 453.0'
+'3801.6 1689.6 453.0'*'3763.2 921.6 299.4'
+'3763.2 921.6 299.4'*'3974.4 979.2 299.4'
+'3763.2 921.6 299.4'*'3532.8 979.2 299.4'
+'3763.2 921.6 299.4'*'3570.2 1093.3 254.5'
+'3763.2 921.6 299.4'*'3959.0 1096.9 254.5'
+'4838.4 1152.0 299.4'*'4813.8 1148.7 254.5'
+'4838.4 1152.0 299.4'*'4545.1 1250.1 254.5'
+'4838.4 1152.0 299.4'*'4339.2 1267.2 299.4'
+'4838.4 1152.0 299.4'*'4699.0 1642.0 -62.3'
+'5472.0 1382.4 -7.8'*'5380.9 1385.8 -52.7'
+'5472.0 1382.4 -7.8'*'5251.9 1655.9 -52.7'
+'5472.0 1382.4 -7.8'*'5078.4 1382.4 -84.6'
+'5472.0 1382.4 -7.8'*'5184.0 1728.0 -7.8'
+'5472.0 1382.4 -7.8'*'5038.5 1244.9 -129.5'
+'5472.0 1382.4 -7.8'*'5107.2 1728.0 -7.8'
+'5472.0 1382.4 -7.8'*'5030.4 1728.0 -7.8'
+'4147.2 2764.8 453.0'*'3974.4 2726.4 453.0'
+'4147.2 2764.8 453.0'*'3974.4 2649.6 453.0'
+'4147.2 2764.8 453.0'*'4130.7 2551.0 408.1'
+'4147.2 2764.8 453.0'*'4588.8 2630.4 453.0'
+'4147.2 2764.8 453.0'*'4615.8 2699.2 408.1'
+'4147.2 2764.8 453.0'*'4646.4 2572.8 453.0'
+'4147.2 2764.8 453.0'*'4704.0 2515.2 453.0'
+'4147.2 2764.8 453.0'*'4771.2 2601.6 453.0'
+'4147.2 2764.8 453.0'*'4140.9 2102.5 254.5'
+'4147.2 2764.8 453.0'*'4828.8 2544.0 453.0'
+'4147.2 2764.8 453.0'*'3700.7 2230.5 254.5'
+'4147.2 2764.8 453.0'*'4266.8 1965.1 14.5'
+'4147.2 2764.8 453.0'*'4137.6 1920.0 59.4'
+'4147.2 2764.8 453.0'*'4272.9 1831.0 24.1'
+'1150.1 2457.6 254.4'*'1201.5 2449.9 254.5'
+'1150.1 2457.6 254.4'*'1282.5 2264.2 254.5'
+'1150.1 2457.6 254.4'*'1132.8 2208.0 299.4'
+'1150.1 2457.6 254.4'*'1324.8 2707.2 299.4'
+'1150.1 2457.6 254.4'*'1254.0 2446.7 -52.7'
+'1150.1 2457.6 254.4'*'1398.5 2595.1 -129.5'
+'1150.1 2457.6 254.4'*'1516.8 2457.6 -84.6'
+'1150.1 2457.6 254.4'*'1691.2 2146.0 -52.7'
+'1150.1 2457.6 254.4'*'1696.4 2009.7 350.5'
'1843.2 2457.6 -110.4'*'1150.1 2457.6 254.4'
Modified: branches/nexuiz-2.0/data/models/player/pyria.zym.sounds
===================================================================
--- branches/nexuiz-2.0/data/models/player/pyria.zym.sounds 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/models/player/pyria.zym.sounds 2009-06-06 15:32:09 UTC (rev 6887)
@@ -12,7 +12,7 @@
//getflag sound/player/carni-lycan/player/getflag 0
//incoming sound/player/pyria-skadi/coms/incoming 0
meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 1
+needhelp sound/player/pyria-skadi/coms/needhelp 2
//negative sound/player/carni-lycan/player/negative 0
//onmyway sound/player/carni-lycan/player/onmyway 0
//roaming sound/player/carni-lycan/player/roaming 0
Modified: branches/nexuiz-2.0/data/models/player/skadi.zym.sounds
===================================================================
--- branches/nexuiz-2.0/data/models/player/skadi.zym.sounds 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/models/player/skadi.zym.sounds 2009-06-06 15:32:09 UTC (rev 6887)
@@ -12,7 +12,7 @@
//getflag sound/player/carni-lycan/player/getflag 0
//incoming sound/player/pyria-skadi/coms/incoming 0
meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 1
+needhelp sound/player/pyria-skadi/coms/needhelp 2
//negative sound/player/carni-lycan/player/negative 0
//onmyway sound/player/carni-lycan/player/onmyway 0
//roaming sound/player/carni-lycan/player/roaming 0
Modified: branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/projectile.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/client/projectile.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -313,10 +313,14 @@
self.move_movetype = MOVETYPE_BOUNCE;
self.move_touch = SUB_Null;
break;
- case PROJECTILE_SEEKER:
+ case PROJECTILE_FLAC:
self.mins = '-2 -2 -2';
self.maxs = '2 2 2';
break;
+ case PROJECTILE_SEEKER:
+ self.mins = '-4 -4 -4';
+ self.maxs = '4 4 4';
+ break;
case PROJECTILE_PORTO_RED:
self.colormod = '2 1 1';
self.alpha = 0.5;
Modified: branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/client/waypointsprites.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -132,11 +132,13 @@
float f1, f2;
// get the waypoint angle vector
+ /*
d_x = view_right * (self.origin - view_origin) * vid_conwidth / vid_width;
d_y = -view_up * (self.origin - view_origin) * vid_conheight / (vid_height * vid_pixelheight);
d_z = 0;
+ */
- //d = o - '0.5 0 0' * vid_conwidth - '0 0.5 0' * vid_conheight;
+ d = o - '0.5 0 0' * vid_conwidth - '0 0.5 0' * vid_conheight;
if(cvar("v_flipped"))
d_x = -d_x;
Modified: branches/nexuiz-2.0/data/qcsrc/menu/item.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/item.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/item.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -21,6 +21,7 @@
ATTRIB(Item, preferredFocusPriority, float, 0)
ATTRIB(Item, origin, vector, '0 0 0')
ATTRIB(Item, size, vector, '0 0 0')
+ ATTRIB(Item, tooltip, string, string_null)
ENDCLASS(Item)
#endif
@@ -41,6 +42,7 @@
{
me.origin = absOrigin;
me.size = absSize;
+ // me.tooltip = "The quick brown fox jumped over the lazy sleeping dog's back then sat on a tack. Franz jagt im komplett verwahrlosten Taxi quer durch Bayern.";
}
void drawItem(entity me)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/menu.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/menu.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -111,7 +111,11 @@
conwidth = conheight = -1;
draw_reset();
UpdateConWidthHeight();
+
+ loadTooltips();
main = spawnMainWindow(); main.configureMainWindow(main);
+ unloadTooltips();
+
main.resizeNotify(main, '0 0 0', eX * conwidth + eY * conheight, '0 0 0', eX * conwidth + eY * conheight);
main.focused = 1;
menuShiftState = 0;
@@ -206,6 +210,233 @@
draw_Picture('0.5 0.5 0' - 0.5 * isz, img, isz, '1 1 1', a);
}
+
+vector menuTooltipAveragedMousePos;
+entity menuTooltipItem;
+vector menuTooltipOrigin;
+vector menuTooltipSize;
+float menuTooltipAlpha;
+float menuTooltipState; // 0: no tooltip, 1: fading in, 2: displaying, 3: fading out
+float m_testmousetooltipbox(vector pos)
+{
+ if(pos_x >= menuTooltipOrigin_x && pos_x < menuTooltipOrigin_x + menuTooltipSize_x)
+ if(pos_y >= menuTooltipOrigin_y && pos_y < menuTooltipOrigin_y + menuTooltipSize_y)
+ return FALSE;
+ return TRUE;
+}
+float m_testtooltipbox(vector tooltippos)
+{
+ if(tooltippos_x < 0)
+ return FALSE;
+ if(tooltippos_y < 0)
+ return FALSE;
+ if(tooltippos_x + menuTooltipSize_x > 1)
+ return FALSE;
+ if(tooltippos_y + menuTooltipSize_y > 1)
+ return FALSE;
+ /*
+ menuTooltipOrigin_x = rint(tooltippos_x * cvar("vid_width")) / cvar("vid_width");
+ menuTooltipOrigin_y = rint(tooltippos_y * cvar("vid_height")) / cvar("vid_height");
+ menuTooltipOrigin_z = 0;
+ */
+ menuTooltipOrigin = tooltippos;
+ return TRUE;
+}
+float m_allocatetooltipbox(vector pos)
+{
+ vector avoidplus, avoidminus;
+ vector v;
+
+ avoidplus_x = (SKINAVOID_TOOLTIP_x + SKINSIZE_CURSOR_x - SKINOFFSET_CURSOR_x) / conwidth;
+ avoidplus_y = (SKINAVOID_TOOLTIP_y + SKINSIZE_CURSOR_y - SKINOFFSET_CURSOR_y) / conheight;
+ avoidplus_z = 0;
+
+ avoidminus_x = (SKINAVOID_TOOLTIP_x + SKINOFFSET_CURSOR_x) / conwidth + menuTooltipSize_x;
+ avoidminus_y = (SKINAVOID_TOOLTIP_y + SKINOFFSET_CURSOR_y) / conheight + menuTooltipSize_y;
+ avoidminus_z = 0;
+
+ // bottom right
+ v = pos + avoidplus;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ // bottom center
+ v_x = pos_x - menuTooltipSize_x * 0.5;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ // bottom left
+ v_x = pos_x - avoidminus_x;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ // top left
+ v_y = pos_y - avoidminus_y;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ // top center
+ v_x = pos_x - menuTooltipSize_x * 0.5;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ // top right
+ v_x = pos_x + avoidplus_x;
+ if(m_testtooltipbox(v))
+ return TRUE;
+
+ return FALSE;
+}
+entity m_findtooltipitem(entity root, vector pos)
+{
+ entity it;
+ entity best;
+
+ best = world;
+ it = root;
+
+ while(it.instanceOfContainer)
+ {
+ if(it.instanceOfNexposee)
+ {
+ if(it.focusedChild)
+ {
+ it = it.focusedChild;
+ pos = globalToBox(pos, it.Container_origin, it.Container_size);
+ continue; // don't show dialog tooltips when the dialog is open
+ }
+ else
+ {
+ it = it.itemFromPoint(it, pos);
+ if(it.tooltip)
+ best = it;
+ break;
+ }
+ }
+ else if(it.instanceOfModalController)
+ it = it.focusedChild;
+ else
+ it = it.itemFromPoint(it, pos);
+ if(!it)
+ break;
+ if(it.tooltip)
+ best = it;
+ pos = globalToBox(pos, it.Container_origin, it.Container_size);
+ }
+
+ return best;
+}
+void m_tooltip(vector pos)
+{
+ float f, i, w;
+ entity it;
+ vector fontsize, p;
+ string s;
+
+ fontsize = '1 0 0' * (SKINFONTSIZE_TOOLTIP / conwidth) + '0 1 0' * (SKINFONTSIZE_TOOLTIP / conheight);
+
+ f = bound(0, frametime * 2, 1);
+ menuTooltipAveragedMousePos = menuTooltipAveragedMousePos * (1 - f) + pos * f;
+ f = vlen(pos - menuTooltipAveragedMousePos);
+
+ if(f < 0.01)
+ it = m_findtooltipitem(main, pos);
+ else
+ it = world;
+
+ // float menuTooltipState; // 0: static, 1: fading in, 2: fading out
+ if(it != menuTooltipItem)
+ {
+ switch(menuTooltipState)
+ {
+ case 0:
+ if(menuTooltipItem)
+ {
+ // another item: fade out first
+ menuTooltipState = 2;
+ }
+ else
+ {
+ // new item: fade in
+ menuTooltipState = 1;
+ menuTooltipItem = it;
+
+ menuTooltipOrigin_x = -1; // unallocated
+ i = 0;
+ w = 0;
+ getWrappedLine_remaining = it.tooltip;
+ while(getWrappedLine_remaining)
+ {
+ s = getWrappedLine(SKINWIDTH_TOOLTIP / fontsize_x, draw_TextWidth_WithoutColors);
+ ++i;
+ f = draw_TextWidth(s, FALSE);
+ if(f > w)
+ w = f;
+ }
+ menuTooltipSize_x = w * fontsize_x + 2 * (SKINMARGIN_TOOLTIP_x / conwidth);
+ menuTooltipSize_y = i * fontsize_y + 2 * (SKINMARGIN_TOOLTIP_y / conheight);
+ menuTooltipSize_z = 0;
+ }
+ break;
+ case 1:
+ // changing item while fading in: fade out first
+ menuTooltipState = 2;
+ break;
+ case 2:
+ // changing item while fading out: can't
+ break;
+ }
+ }
+ else if(menuTooltipState == 2) // re-fade in?
+ menuTooltipState = 1;
+
+ if(menuTooltipItem)
+ if(!m_testmousetooltipbox(pos))
+ menuTooltipState = 2; // fade out if mouse touches it
+
+ switch(menuTooltipState)
+ {
+ case 1:
+ menuTooltipAlpha = bound(0, menuTooltipAlpha + 5 * frametime, 1);
+ if(menuTooltipAlpha == 1)
+ menuTooltipState = 0;
+ break;
+ case 2:
+ menuTooltipAlpha = bound(0, menuTooltipAlpha - 2 * frametime, 1);
+ if(menuTooltipAlpha == 0)
+ {
+ menuTooltipState = 0;
+ menuTooltipItem = world;
+ }
+ break;
+ }
+
+ if(menuTooltipItem)
+ {
+ if(menuTooltipOrigin_x < 0) // unallocated?
+ m_allocatetooltipbox(pos);
+
+ if(menuTooltipOrigin_x >= 0)
+ {
+ // draw the tooltip!
+ p = SKINBORDER_TOOLTIP;
+ p_x *= 1 / conwidth;
+ p_y *= 1 / conheight;
+ draw_BorderPicture(menuTooltipOrigin, SKINGFX_TOOLTIP, menuTooltipSize, '1 1 1', menuTooltipAlpha, p);
+ p = menuTooltipOrigin;
+ p_x += SKINMARGIN_TOOLTIP_x / conwidth;
+ p_y += SKINMARGIN_TOOLTIP_y / conheight;
+ getWrappedLine_remaining = menuTooltipItem.tooltip;
+ while(getWrappedLine_remaining)
+ {
+ s = getWrappedLine(SKINWIDTH_TOOLTIP / fontsize_x, draw_TextWidth_WithoutColors);
+ draw_Text(p, s, fontsize, '1 1 1', SKINALPHA_TOOLTIP * menuTooltipAlpha, FALSE);
+ p_y += fontsize_y;
+ }
+ }
+ }
+}
+
void() m_draw =
{
float t;
@@ -356,6 +587,9 @@
}
}
main.draw(main);
+
+ m_tooltip(menuMousePos);
+
draw_alpha = max(draw_alpha, SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1));
draw_drawMousePointer(menuMousePos);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/button.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/button.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/button.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -36,5 +36,6 @@
me.colorC = theColor;
me.colorF = theColor;
}
+ me.tooltip = getZonedTooltipForIdentifier(strcat(currentDialog.classname, "/", me.text));
}
#endif
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -64,6 +64,7 @@
if(theCvar)
{
me.cvarName = theCvar;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
me.loadCvars(me);
}
me.configureCheckBox(me, theText, me.fontSize, me.image);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -41,6 +41,7 @@
me.savedValue = theControlledSlider.valueMin;
me.controlledSlider = theControlledSlider;
me.configureCheckBox(me, theText, me.fontSize, me.image);
+ me.tooltip = theControlledSlider.tooltip;
}
void drawNexuizSliderCheckBox(entity me)
{
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -26,8 +26,17 @@
ATTRIB(NexuizDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0)
ATTRIB(NexuizDialog, alpha, float, SKINALPHA_TEXT)
+
+ METHOD(NexuizDialog, configureDialog, void(entity))
ENDCLASS(NexuizDialog)
+entity currentDialog;
#endif
#ifdef IMPLEMENTATION
+void configureDialogNexuizDialog(entity me)
+{
+ currentDialog = me;
+ configureDialogDialog(me);
+ me.tooltip = getZonedTooltipForIdentifier(me.classname);
+}
#endif
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/gametypebutton.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -35,6 +35,7 @@
if(theCvar)
{
me.cvarName = theCvar;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
me.loadCvars(me);
}
me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/inputbox.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -39,6 +39,7 @@
if(theCvar)
{
me.cvarName = theCvar;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
me.loadCvars(me);
}
me.cursorPos = strlen(me.text);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/radiobutton.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -36,6 +36,7 @@
{
me.cvarName = theCvar;
me.cvarValue = theValue;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
me.loadCvars(me);
}
me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/slider.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -44,6 +44,7 @@
if(theCvar)
{
me.cvarName = theCvar;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
me.loadCvars(me);
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/textslider.c 2009-06-06 15:32:09 UTC (rev 6887)
@@ -36,8 +36,11 @@
{
me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image);
if(theCvar)
+ {
me.cvarName = theCvar;
+ me.tooltip = getZonedTooltipForIdentifier(theCvar);
// don't load it yet
+ }
}
void setValueNexuizTextSlider(entity me, float val)
{
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1,3 +1,30 @@
+float tooltipdb;
+void loadTooltips()
+{
+ tooltipdb = db_load("tooltips.db");
+}
+void unloadTooltips()
+{
+ db_close(tooltipdb);
+ tooltipdb = -1;
+}
+string getZonedTooltipForIdentifier(string s)
+{
+ string t;
+ if(s == "")
+ return string_null;
+ t = db_get(tooltipdb, s);
+ if(t == "-")
+ return string_null;
+ if(t != "")
+ return strzone(t);
+ t = cvar_description(s);
+ if(t != "" && t != "custom cvar")
+ return strzone(t);
+ dprint("WARNING: no tooltip set for ", s, "\n");
+ return string_null;
+}
+
void forAllDescendants(entity root, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass)
{
depthfirst(root, parent, firstChild, nextSibling, funcPre, funcPost, pass);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qh 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/util.qh 2009-06-06 15:32:09 UTC (rev 6887)
@@ -9,3 +9,7 @@
void setDependentOR(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max);
void setDependentAND3(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max, string theCvar3Name, float theCvar3Min, float theCvar3Max);
void setDependentStringNotEqual(entity e, string theCvarName, string theCvarValue);
+
+void loadTooltips();
+void unloadTooltips();
+string getZonedTooltipForIdentifier(string s);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/menu/skin-customizables.inc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -40,6 +40,15 @@
SKINFLOAT(HEIGHT_TITLE, 1.5);
SKINFLOAT(HEIGHT_ZOOMEDTITLE, -1);
+ // tooltips
+ SKINSTRING(GFX_TOOLTIP, "tooltip");
+ SKINVECTOR(MARGIN_TOOLTIP, '5 5 0');
+ SKINVECTOR(BORDER_TOOLTIP, '8 8 0');
+ SKINFLOAT(FONTSIZE_TOOLTIP, 12);
+ SKINFLOAT(ALPHA_TOOLTIP, 0.7);
+ SKINFLOAT(WIDTH_TOOLTIP, 0.3);
+ SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+
// the individual dialog background colors
SKINVECTOR(COLOR_DIALOG_MULTIPLAYER, '0.7 0.7 1');
SKINVECTOR(COLOR_DIALOG_SETTINGS, '0.7 0.7 1');
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1874,6 +1874,8 @@
entity bot_list;
.entity nextbot;
.string netname_freeme;
+.string playermodel_freeme;
+.string playerskin_freeme;
float sv_maxspeed;
.float createdtime;
@@ -1972,13 +1974,13 @@
name = bot_name;
// pick the model and skin
- self.playermodel = strzone(strcat("models/player/", bot_model, ".zym"));
- self.playerskin = strzone(bot_skin);
+ self.playermodel = self.playermodel_freeme = strzone(strcat("models/player/", bot_model, ".zym"));
+ self.playerskin = self.playerskin_freeme = strzone(bot_skin);
if(!cvar("g_campaign"))
self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
else
- self.netname = name;
+ self.netname = self.netname_freeme = strzone(name);
};
float bot_custom_weapon;
@@ -2459,7 +2461,13 @@
return;
if(self.netname_freeme)
strunzone(self.netname_freeme);
+ if(self.playermodel_freeme)
+ strunzone(self.playermodel_freeme);
+ if(self.playerskin_freeme)
+ strunzone(self.playerskin_freeme);
self.netname_freeme = string_null;
+ self.playermodel_freeme = string_null;
+ self.playerskin_freeme = string_null;
}
void bot_clientconnect()
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1453,6 +1453,8 @@
if(self.netname_previous)
strunzone(self.netname_previous);
+ if(self.clientstatus)
+ strunzone(self.clientstatus);
ClearPlayerSounds();
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -7,6 +7,29 @@
===========================================================================
*/
+float W_WeaponSpeedFactor()
+{
+ float t;
+ t = 1.0 / g_weaponspeedfactor;
+
+ if(g_runematch)
+ {
+ if(self.runes & RUNE_SPEED)
+ {
+ if(self.runes & CURSE_SLOW)
+ t = t * cvar("g_balance_rune_speed_combo_atkrate");
+ else
+ t = t * cvar("g_balance_rune_speed_atkrate");
+ }
+ else if(self.runes & CURSE_SLOW)
+ {
+ t = t * cvar("g_balance_curse_slow_atkrate");
+ }
+ }
+
+ return t;
+}
+
void W_SwitchWeapon_Force(entity e, float w)
{
e.cnt = e.switchweapon;
@@ -602,7 +625,7 @@
f = 0;
if (self.state == WS_RAISE)
{
- f = (self.owner.weapon_nextthink - time) / cvar("g_balance_weaponswitchdelay");
+ f = (self.owner.weapon_nextthink - time) * g_weaponspeedfactor / cvar("g_balance_weaponswitchdelay");
self.angles_x = -90 * f * f;
if (qcweaponanimation)
{
@@ -612,7 +635,7 @@
}
else if (self.state == WS_DROP)
{
- f = 1 - (self.owner.weapon_nextthink - time) / cvar("g_balance_weaponswitchdelay");
+ f = 1 - (self.owner.weapon_nextthink - time) * g_weaponspeedfactor / cvar("g_balance_weaponswitchdelay");
self.angles_x = -90 * f * f;
if (qcweaponanimation)
{
@@ -991,7 +1014,7 @@
ATTACK_FINISHED(self) = time;
//dprint("resetting attack finished to ", ftos(time), "\n");
}
- ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime;
+ ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponSpeedFactor();
}
self.bulletcounter += 1;
//dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");
@@ -1094,6 +1117,7 @@
a = self.weaponentity.anim_fire2;
else if (fr == WFRAME_RELOAD)
a = self.weaponentity.anim_reload;
+ a_z *= g_weaponspeedfactor;
setanim(self.weaponentity, a, restartanim == FALSE, restartanim, restartanim);
}
@@ -1112,20 +1136,7 @@
backtrace("Tried to override initial weapon think function - should this really happen?");
}
- if(g_runematch)
- {
- if(self.runes & RUNE_SPEED)
- {
- if(self.runes & CURSE_SLOW)
- t = t * cvar("g_balance_rune_speed_combo_atkrate");
- else
- t = t * cvar("g_balance_rune_speed_atkrate");
- }
- else if(self.runes & CURSE_SLOW)
- {
- t = t * cvar("g_balance_curse_slow_atkrate");
- }
- }
+ t *= W_WeaponSpeedFactor();
// VorteX: haste can be added here
if (self.weapon_think == w_ready)
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "300f2d03c037b68c7254fe52a47575f8";
+string CVAR_CHECK_DEFAULT = "c120fa8ce7b9f4b1b86b922d65249573";
string CVAR_CHECK_WEAPONS = "2f93eb8481f44bb2ff744af86a75eccf";
float FALSE = 0;
Modified: branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ctf.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/ctf.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -290,6 +290,7 @@
backtrace("Flag carrier had no flag sprite?!?");
}
LogCTF("dropped", p.team, p);
+ sound (self, CHAN_TRIGGER, self.noise4, VOL_BASE, ATTN_NONE);
setattachment(e, world, "");
e.damageforcescale = cvar("g_balance_ctf_damageforcescale");
@@ -759,19 +760,22 @@
if (!self.model)
self.model = cvar_string("g_ctf_flag_red_model");
if (!self.noise)
- self.noise = "ctf/take.wav";
+ self.noise = "ctf/red_taken.wav";
if (!self.noise1)
- self.noise1 = "ctf/return.wav";
+ self.noise1 = "ctf/red_returned.wav";
if (!self.noise2)
- self.noise2 = "ctf/redcapture.wav"; // blue team scores by capturing the red flag
+ self.noise2 = "ctf/red_capture.wav"; // blue team scores by capturing the red flag
if (!self.noise3)
- self.noise3 = "ctf/respawn.wav";
+ self.noise3 = "ctf/flag_respawn.wav";
+ if (!self.noise4)
+ self.noise4 = "ctf/red_dropped.wav";
precache_model (self.model);
setmodel (self, self.model); // precision set below
precache_sound (self.noise);
precache_sound (self.noise1);
precache_sound (self.noise2);
precache_sound (self.noise3);
+ precache_sound (self.noise4);
//setsize(self, '-16 -16 -37', '16 16 37');
setsize(self, FLAG_MIN, FLAG_MAX);
setorigin(self, self.origin + '0 0 37');
@@ -860,19 +864,22 @@
if (!self.model)
self.model = cvar_string("g_ctf_flag_blue_model");
if (!self.noise)
- self.noise = "ctf/take.wav";
+ self.noise = "ctf/blue_taken.wav";
if (!self.noise1)
- self.noise1 = "ctf/return.wav";
+ self.noise1 = "ctf/blue_returned.wav";
if (!self.noise2)
- self.noise2 = "ctf/bluecapture.wav"; // red team scores by capturing the blue flag
+ self.noise2 = "ctf/blue_capture.wav"; // blue team scores by capturing the red flag
if (!self.noise3)
- self.noise3 = "ctf/respawn.wav";
+ self.noise3 = "ctf/flag_respawn.wav";
+ if (!self.noise4)
+ self.noise4 = "ctf/blue_dropped.wav";
precache_model (self.model);
setmodel (self, self.model); // precision set below
precache_sound (self.noise);
precache_sound (self.noise1);
precache_sound (self.noise2);
precache_sound (self.noise3);
+ precache_sound (self.noise4);
//setsize(self, '-16 -16 -37', '16 16 37');
setsize(self, FLAG_MIN, FLAG_MAX);
setorigin(self, self.origin + '0 0 37');
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-06-06 15:32:09 UTC (rev 6887)
@@ -589,3 +589,4 @@
string matchid;
.float hitplotfh;
+.string noise4;
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -702,6 +702,9 @@
}
}
+ if not(DEATH_ISSPECIAL(deathtype))
+ damage *= g_weapondamagefactor;
+
// apply strength multiplier
if ((attacker.items & IT_STRENGTH) && !g_minstagib)
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -713,13 +713,13 @@
if (time < self.havocbot_chooseenemy_finished)
return;
self.havocbot_chooseenemy_finished = time + cvar("bot_ai_enemydetectioninterval");
- eye = (self.origin + self.view_ofs);
+ eye = self.origin + self.view_ofs + '0 0 -25'; // lowered a bit to give room for projectiles
best = world;
bestrating = 100000000;
head = findchainfloat(bot_attack, TRUE);
while (head)
{
- v = (head.absmin + head.absmax) * 0.5;
+ v = (head.absmin + head.absmax) * 0.65;
rating = vlen(v - eye);
if (bestrating > rating)
if (bot_shouldattack(head))
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -4,11 +4,6 @@
.void() havocbot_role;
float bot_ignore_bots;
-float canreach(entity e)
-{
- return vlen(self.origin - e.origin) < 1500;
-}
-
.float max_armorvalue;
float havocbot_pickupevalfunc(entity item)
{
@@ -22,19 +17,62 @@
need_cells = self.weapons & ( WEPBIT_HOOK | WEPBIT_HLAC | WEPBIT_MINSTANEX | WEPBIT_NEX | WEPBIT_ELECTRO | WEPBIT_CRYLINK );
need_rockets = self.weapons & ( WEPBIT_ROCKET_LAUNCHER | WEPBIT_GRENADE_LAUNCHER | WEPBIT_HAGAR | WEPBIT_SEEKER );
+ // Rate ammo items
+ if (item.ammo_shells)
+ if (self.ammo_shells < g_pickup_shells_max && need_cells )
+ rating = rating + max(0, 1 - self.ammo_shells / g_pickup_shells_max);
+
+ if (item.ammo_nails)
+ if (self.ammo_nails < g_pickup_nails_max && need_nails )
+ rating = rating + max(0, 1 - self.ammo_nails / g_pickup_nails_max);
+
+ if (item.ammo_rockets)
+ if (self.ammo_rockets < g_pickup_rockets_max && need_rockets)
+ rating = rating + max(0, 1 - self.ammo_rockets / g_pickup_rockets_max);
+
+ if (item.ammo_cells)
+ if (self.ammo_cells < g_pickup_cells_max && need_cells)
+ rating = rating + max(0, 1 - self.ammo_cells / g_pickup_cells_max);
+
+ // Rate health items (aim to grab half the max capacity)
+ if (item.armorvalue)
+ if (self.armorvalue < item.max_armorvalue * 0.5)
+ rating = rating + max(0, 1 - self.armorvalue / (item.max_armorvalue * 0.5));
+
+ if (item.health)
+ if (self.health < item.max_health * 0.5)
+ {
+ rating = rating + max(0, 1 - self.health / (item.max_health * 0.5));
+ }
+
+ // Rate weapons
if( item.weapons )
{
+ // See if I have it already
if( self.weapons & item.weapons == item.weapons )
- rating = 0.5 + bound(0, skill / 20, 0.5);
+ {
+ // If I can pick it up
+ if(rating)
+ if not(cvar("g_weapon_stay"))
+ {
+ // Skilled bots will grab more
+ local float divisor = 2;
+ rating += bound(0, skill / (10*divisor), 1/divisor);
+ }
+ }
else
- rating = 1;
+ rating += 1;
- if( bot_custom_weapon )
+ // If custom weapon priorities for bots is enabled rate most wanted weapons higher
+ if( bot_custom_weapon && rating )
{
- for(i = WEP_FIRST; i < WEP_LAST ; ++i){
+ for(i = WEP_FIRST; i < WEP_LAST ; ++i)
+ {
+ // Find weapon
if( power2of(i-1) & item.weapons != item.weapons )
continue;
+ // Find the highest position on any range
position = -1;
for(j = 0; j < WEP_LAST ; ++j){
if(
@@ -48,6 +86,7 @@
}
}
+ // Rate it
if (position >= 0 )
{
position = WEP_LAST - position;
@@ -59,34 +98,7 @@
}
}
- if (item.ammo_shells)
- if (self.ammo_shells < g_pickup_shells_max && need_cells )
- rating = rating + max(0, 1 - self.ammo_shells / g_pickup_shells_max);
-
- if (item.ammo_nails)
- if (self.ammo_nails < g_pickup_nails_max && need_nails )
- rating = rating + max(0, 1 - self.ammo_nails / g_pickup_nails_max);
-
- if (item.ammo_rockets)
- if (self.ammo_rockets < g_pickup_rockets_max && need_rockets)
- rating = rating + max(0, 1 - self.ammo_rockets / g_pickup_rockets_max);
-
- if (item.ammo_cells)
- if (self.ammo_cells < g_pickup_cells_max && need_cells)
- rating = rating + max(0, 1 - self.ammo_cells / g_pickup_cells_max);
-
- if (item.armorvalue)
- if (self.armorvalue < item.max_armorvalue * 0.5)
- rating = rating + max(0, 1 - self.armorvalue / (item.max_armorvalue * 0.5));
-
- if (item.health)
- if (self.health < item.max_health * 0.5)
- {
- rating = rating + max(0, 1 - self.health / (item.max_health * 0.5));
- }
-
// TODO: if the item is not recognized then default to item.bot_pickupevalfunc(self, item);
-
return base * rating;
};
@@ -307,7 +319,28 @@
}
};
+// Functions for CTF
+float canreach(entity e)
+{
+ return vlen(self.origin - e.origin) < 1500;
+}
+
+float teamcount()
+{
+ if not(teams_matter)
+ return 0;
+
+ float c;
+ entity head;
+
+ FOR_EACH_PLAYER(head)
+ if(head.team==self.team)
+ ++c;
+
+ return c;
+}
+
void() havocbot_role_ctf_middle;
void() havocbot_role_ctf_defense;
void() havocbot_role_ctf_offense;
@@ -353,6 +386,37 @@
navigation_routerating(head, ratingscale, 10000);
};
+void havocbot_goalrating_ctf_ourbase(float ratingscale)
+{
+ if not(bot_waypoints_for_items)
+ {
+ havocbot_goalrating_ctf_ourflag(ratingscale);
+ return;
+ }
+
+ local entity head;
+ head = ctf_worldflaglist;
+ while (head)
+ {
+ if (self.team == head.team)
+ break;
+ head = head.ctf_worldflagnext;
+ }
+ if not(head)
+ return;
+
+ head = findradius(head.dropped_origin, 100);
+ while(head)
+ {
+ if(head.classname=="waypoint")
+ {
+ navigation_routerating(head, ratingscale, 10000);
+ return;
+ }
+ head=head.chain;
+ }
+};
+
void havocbot_goalrating_ctf_enemyflag(float ratingscale)
{
local entity head;
@@ -433,7 +497,7 @@
{
self.bot_strategytime = time + cvar("bot_ai_strategyinterval");
navigation_goalrating_start();
- havocbot_goalrating_ctf_ourflag(50000);
+ havocbot_goalrating_ctf_ourbase(50000);
if(self.health<100)
havocbot_goalrating_ctf_carrieritems(1000, self.origin, 1000);
navigation_goalrating_end();
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -691,6 +691,8 @@
float g_pickup_healthmega_max;
float g_weaponarena;
string g_weaponarena_list;
+float g_weaponspeedfactor;
+float g_weapondamagefactor;
float start_weapons;
float start_items;
@@ -1044,6 +1046,9 @@
if(g_nixnex) g_weaponarena = 0;
g_weaponarena = 0;
+ g_weaponspeedfactor = cvar("g_weaponspeedfactor");
+ g_weapondamagefactor = cvar("g_weapondamagefactor");
+
g_pickup_shells = cvar("g_pickup_shells");
g_pickup_shells_max = cvar("g_pickup_shells_max");
g_pickup_nails = cvar("g_pickup_nails");
@@ -1390,6 +1395,8 @@
precache_sound ("announcer/male/30kills.wav");
precache_sound ("announcer/male/botlike.wav");
precache_sound ("announcer/male/yoda.wav");
+ precache_sound ("announcer/male/amazing.wav");
+ precache_sound ("announcer/male/awesome.wav");
precache_sound ("announcer/male/headshot.wav");
precache_sound ("announcer/male/impressive.wav");
Modified: branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -1104,8 +1104,9 @@
else
self.punchangle_z = 0;
self.angles_x = self.punchangle_x;
- self.angles_y = self.punchangle_y;
+ self.angles_y = self.punchangle_y + self.mangle_y;
self.angles_z = self.punchangle_z;
+ self.mangle_y = self.mangle_y + 1.5;
self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd / 8));
self.cp_bob_spd = self.cp_bob_spd + 0.5;
Modified: branches/nexuiz-2.0/data/qcsrc/server/portals.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/portals.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/portals.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -151,7 +151,14 @@
return 0;
}
+ tdeath_hit = 0;
TeleportPlayer(teleporter, player, to, ang, newvel, teleporter.enemy.absmin, teleporter.enemy.absmax);
+ if(tdeath_hit)
+ {
+ // telefrag within 1 second of portal creation = amazing
+ if(time < teleporter.teleport_time + 1)
+ announce(player, "announcer/male/amazing.wav");
+ }
if not(teleporter.enemy)
{
@@ -336,6 +343,7 @@
destination.fade_time = time + 15;
teleporter.portal_wants_to_vanish = 0;
destination.portal_wants_to_vanish = 0;
+ teleporter.teleport_time = time;
}
void Portal_Remove(entity portal, float killed)
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -4,6 +4,7 @@
self.team = activator.team;
}
+float tdeath_hit;
void tdeath(entity player, entity teleporter, entity telefragger, vector telefragmin, vector telefragmax)
{
entity head;
@@ -33,6 +34,7 @@
Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
else // dead bodies and monsters gib themselves instead of telefragging
Damage (telefragger, teleporter, telefragger, 10000, DEATH_TELEFRAG, telefragger.origin, '0 0 0');
+ ++tdeath_hit;
}
}
@@ -67,6 +69,7 @@
// assuming to allows PL_MIN to PL_MAX box and some more
from = player.origin;
setorigin (player, to);
+ player.oldorigin = to; // don't undo the teleport by unsticking
player.angles = to_angles;
player.fixangle = TRUE;
player.velocity = to_velocity;
Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -382,10 +382,16 @@
if(self.cvar_scr_centertime == 0) return;
- if(!cvar("g_campaign"))
- if((time - self.jointime) > cvar("welcome_message_time")
- && !self.BUTTON_INFO)
+ if(cvar("g_campaign"))
+ {
+ if(self.classname == "player")
return;
+ }
+ else
+ {
+ if((time - self.jointime) > cvar("welcome_message_time") && !self.BUTTON_INFO)
+ return;
+ }
if( !(timeoutStatus >= 1) ) { //really print the WelcomeMessage to the player every frame when timeout-seconds are shown or the game is restarted, to make sure that the shown number is accurate
if(self.welcomemessage_time > time) return;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_common.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_common.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -139,7 +139,7 @@
if(headshot)
announce(self.owner, "announcer/male/headshot.wav");
if(yoda)
- announce(self.owner, "announcer/male/yoda.wav");
+ announce(self.owner, "announcer/male/awesome.wav");
}
//sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -135,8 +135,6 @@
self.punchangle_x = random () - 0.5;
self.punchangle_y = random () - 0.5;
}
-
- // ATTACK_FINISHED(self) = time + cvar("g_balance_hlac_secondary_refire");
}
@@ -158,7 +156,7 @@
return;
}
- ATTACK_FINISHED(self) = time + cvar("g_balance_hlac_primary_refire");
+ ATTACK_FINISHED(self) = time + cvar("g_balance_hlac_primary_refire") * W_WeaponSpeedFactor();
W_HLAC_Attack();
self.HLAC_bulletcounter = self.HLAC_bulletcounter + 1;
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hlac_primary_refire"), HLAC_fire1_02);
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -26,7 +26,7 @@
self.owner.switchweapon = w_getbestweapon(self.owner);
}
if(g_laserguided_missile)
- ATTACK_FINISHED(self.owner) = time + cvar("g_balance_rocketlauncher_refire");
+ ATTACK_FINISHED(self.owner) = time + cvar("g_balance_rocketlauncher_refire") * W_WeaponSpeedFactor();
}
remove (self);
}
@@ -194,7 +194,7 @@
self.velocity = newdir * velspeed; // make me fly in the new direction at my flight speed
self.angles = vectoangles(self.velocity); // turn model in the new flight direction
- ATTACK_FINISHED(self.owner) = time + 0.2;
+ ATTACK_FINISHED(self.owner) = time + 0.2 * W_WeaponSpeedFactor();
}
}
else
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -190,7 +190,7 @@
missile.projectiledeathtype = WEP_SEEKER;
setorigin (missile, w_shotorg);
- setsize (missile, '-2 -2 -2', '2 2 2');
+ setsize (missile, '-4 -4 -4', '4 4 4');
missile.movetype = MOVETYPE_FLYMISSILE;// MOVETYPE_TOSS;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2009-06-06 15:32:09 UTC (rev 6887)
@@ -30,7 +30,7 @@
}
// this attack_finished just enforces a cooldown at the end of a burst
- ATTACK_FINISHED(self) = time + cvar("g_balance_uzi_first_refire");
+ ATTACK_FINISHED(self) = time + cvar("g_balance_uzi_first_refire") * W_WeaponSpeedFactor();
if (self.uzi_bulletcounter == 1)
fireBallisticBullet(w_shotorg, w_shotdir, cvar("g_balance_uzi_first_spread"), cvar("g_balance_uzi_speed"), 5, cvar("g_balance_uzi_first_damage"), 0, cvar("g_balance_uzi_first_force"), deathtype, 0, 1, cvar("g_balance_uzi_bulletconstant"));
Modified: branches/nexuiz-2.0/data/sound/announcer/male/airshot.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/headshot.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/impressive.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/yoda.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/misc/armor1.wav
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/misc/armor10.wav
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/misc/armor17_5.wav
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/misc/powerup.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/player/lava.wav
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/player/pyria-skadi/coms/needhelp1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass3.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/campingrifle_fire2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/campingrifle_reload.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/crylink_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/crylink_fire2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/electro_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/grenade_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/grenade_impact.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hagar_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hagexp1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hagexp2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hagexp3.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/minstanexfire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/nexfire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/rocket_impact.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/shotgun_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tag_rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tagexp1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tagexp2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tagexp3.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/uzi_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/server/rcon2irc/rcon2irc-example.conf
===================================================================
--- branches/nexuiz-2.0/server/rcon2irc/rcon2irc-example.conf 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/server/rcon2irc/rcon2irc-example.conf 2009-06-06 15:32:09 UTC (rev 6887)
@@ -25,6 +25,11 @@
# Alternate IRC trigger (can be used instead of nickname to send stuff to the server)
#irc_trigger = nexnexnex
+# Custom output options
+#irc_announce_slotsfree = 1
+# The var irc_announce_mapchange can be set to either never, notempty or always
+#irc_announce_mapchange = always
+
# Tuning
#dp_secure = 1
#dp_server_from_wan =
Modified: branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl
===================================================================
--- branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl 2009-06-06 15:21:14 UTC (rev 6886)
+++ branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl 2009-06-06 15:32:09 UTC (rev 6887)
@@ -664,6 +664,9 @@
irc_quakenet_challengeauth => 'PRIVMSG Q at CServe.quakenet.org :CHALLENGEAUTH',
irc_quakenet_challengeprefix => ':Q!TheQBot at CServe.quakenet.org NOTICE [^:]+ :CHALLENGE',
+ irc_announce_slotsfree => 1,
+ irc_announce_mapchange => 'always',
+
dp_server => undef,
dp_secure => 1,
dp_listen => "",
@@ -1050,8 +1053,8 @@
if($full != ($store{slots_full} || 0))
{
$store{slots_full} = $full;
- return 0
- if $store{lms_blocked};
+ return 0 if $store{lms_blocked};
+ return 0 if !$config{irc_announce_slotsfree};
if($full)
{
out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION is full!\001";
@@ -1142,7 +1145,7 @@
$dpreason =~ s/(["\\])/\\$1/g;
out dp => 0, "kick # $id $dpreason";
my $slotnik = "playerslot_$id";
- out irc => 0, "PRIVMSG $nick :kicked #$id (@{[color_dp2irc $store{$slotnik}{name}]} @ $store{$slotnik}{ip}) ($reason)";
+ out irc => 0, "PRIVMSG $nick :kicked #$id (@{[color_dp2irc $store{$slotnik}{name}]}\017 @ $store{$slotnik}{ip}) ($reason)";
return 0;
}
@@ -1154,7 +1157,7 @@
$dpreason =~ s/(["\\])/\\$1/g;
out dp => 0, "kickban # $id $bantime $mask $dpreason";
my $slotnik = "playerslot_$id";
- out irc => 0, "PRIVMSG $nick :kickbanned #$id (@{[color_dp2irc $store{$slotnik}{name}]} @ $store{$slotnik}{ip}), netmask $mask, for $bantime seconds ($reason)";
+ out irc => 0, "PRIVMSG $nick :kickbanned #$id (@{[color_dp2irc $store{$slotnik}{name}]}\017 @ $store{$slotnik}{ip}), netmask $mask, for $bantime seconds ($reason)";
return 0;
}
@@ -1178,6 +1181,24 @@
return 0;
}
+ if($command =~ /^mute (\d+)$/)
+ {
+ my $id = $1;
+ out dp => 0, "mute $id";
+ my $slotnik = "playerslot_$id";
+ out irc => 0, "PRIVMSG $nick :muted $id (@{[color_dp2irc $store{$slotnik}{name}]}\017 @ $store{$slotnik}{ip})";
+ return 0;
+ }
+
+ if($command =~ /^unmute (\d+)$/)
+ {
+ my ($id) = ($1);
+ out dp => 0, "unmute $id";
+ my $slotnik = "playerslot_$id";
+ out irc => 0, "PRIVMSG $nick :unmuted $id (@{[color_dp2irc $store{$slotnik}{name}]}\017 @ $store{$slotnik}{ip})";
+ return 0;
+ }
+
if($command =~ /^quote (.*)$/)
{
my ($cmd) = ($1);
@@ -1193,7 +1214,7 @@
return 0;
}
- out irc => 0, "PRIVMSG $nick :unknown command (supported: status [substring], kick # id reason, kickban # id bantime mask reason, bans, unban banid)";
+ out irc => 0, "PRIVMSG $nick :unknown command (supported: status [substring], kick # id reason, kickban # id bantime mask reason, bans, unban banid, mute id, unmute id)";
return -1;
} ],
@@ -1402,8 +1423,10 @@
$store{playing} = 1;
$store{map} = $map;
$store{map_starttime} = time();
- my $slotsstr = nex_slotsstring();
- out irc => 0, "PRIVMSG $config{irc_channel} :\00304" . $map . "\017 has begun$slotsstr";
+ if ($config{irc_announce_mapchange} eq 'always' || ($config{irc_announce_mapchange} eq 'notempty' && $store{slots_active} > 0)) {
+ my $slotsstr = nex_slotsstring();
+ out irc => 0, "PRIVMSG $config{irc_channel} :\00304" . $map . "\017 has begun$slotsstr";
+ }
delete $store{lms_blocked};
return 0;
} ],
More information about the nexuiz-commits
mailing list