Merge pull request #7 from BC46/fixes

Fixes

DATA/MISSIONS/M06/m06.ini

@@ -3364,7 +3364,7 @@ nickname = tm_endholers
 system = Br05
 Cnd_Timer = 2
 Act_SendComm = quint, Player, DX_M06_1400_QUINTAINE
-Act_SetVibe = Br05_to_Br04_hole, Player, REP_FRIEND_MAXIMUM
+Act_SetVibe = Br05_to_Br04_hole, Player, REP_NEUTRAL
 Act_LockDock = Player, Br05_to_Br04_hole, unlock
 Act_PlayerCanDock = false, Br05_to_Br04_hole
 Act_ActTrig = nse_Leeds

DATA/MISSIONS/ptough.ini

@@ -38,4 +38,5 @@ ptough_graph_pt = 1626438, 35
 ptough_graph_pt = 1853394, 36
 ptough_graph_pt = 2112870, 37
 ptough_graph_pt = 2409599, 38
-
+ptough_graph_pt = 2746943, 39
+ptough_graph_pt = 3131515, 40

DATA/UNIVERSE/SYSTEMS/ST01/st01.ini

@@ -81,9 +81,11 @@ edge_fraction = 0.2
 
 [Object]
 nickname = St01_to_St02_hole
+ids_name = 60211
 pos = -5027, 0, -18614
 rotate = 0, -175, 0
 Archetype = jumphole
+ids_info = 66146
 jump_effect = jump_effect_hole
 goto = St02, St02_to_St01_hole, gate_tunnel_bretonia
 
@@ -93,7 +95,9 @@ ids_name = 261793
 pos = 46983, 0, -10694
 rotate = 0, 90, 0
 Archetype = nomad_gate
+ids_info = 55023
 jump_effect = jump_effect_bretonia
+reputation = fc_uk_grp
 goto = St03, St03_to_St01_hole, gate_tunnel_bretonia
 
 [zone]

DATA/UNIVERSE/SYSTEMS/ST03/st03.ini

@@ -70,6 +70,7 @@ Archetype = planet_desert_600
 spin = 0, 0.02, 0
 atmosphere_range = 700
 burn_color = 255, 222, 160
+ids_info = 66615
 
 [Object]
 nickname = St03_Sun
@@ -87,8 +88,9 @@ pos = 9493, 7100, 10625
 rotate = -32, 29, -6
 Archetype = nomad_gate
 msg_id_prefix = gcs_refer_system_St01
-ids_info = 66146
+ids_info = 55023
 jump_effect = jump_effect_bretonia
+reputation = fc_uk_grp
 goto = St01, St01_to_St03_hole, gate_tunnel_bretonia
 
 [zone]

DATA/UNIVERSE/SYSTEMS/ST03B/st03b.ini

@@ -105,7 +105,7 @@ nickname = Nomad_city
 ids_name = 217328
 pos = -18412, 0, 18955
 Archetype = dyson_city
-ids_info = 1
+ids_info = 55023
 base = Ew02_01_base
 reputation = fc_n_grp
 

DATA/initialworld.ini

@@ -2814,7 +2814,7 @@ rep = 0, gd_bh_grp
 [Group]
 nickname = fc_n_grp
 ids_name = 196891
-ids_info = 66205
+ids_info = 66615
 ids_short_name = 196939
 rep = -0.65, li_n_grp
 rep = -0.65, li_lsf_grp
@@ -2875,7 +2875,7 @@ rep = -0.65, gd_bh_grp
 [Group]
 nickname = fc_ln_grp
 ids_name = 196846
-ids_info = 66205
+ids_info = 66615
 ids_short_name = 196895
 rep = 0.91, li_n_grp
 rep = 0.91, li_lsf_grp

DLLS/BIN/callsign_readme.txt

@@ -0,0 +1,59 @@
+				   Call Sign
+				 by Jason Hood
+
+				  Version 1.00
+
+
+Tired of being called "Freelancer Alpha one dash one"?  Use this plugin to
+customise your call sign.  Copy CALLSIGN.DLL to DLLS\BIN and add it to the end
+of the [Initial ?P DLLs] sections in EXE\freelancer.ini.  Then just append how
+you want to be called:
+
+	DLL = callsign.dll, faction [formation [number][-][number]]
+
+If faction is not recognised as a name (see below), it will be treated as a
+nickname.  Formation may be name or number.  The numbers can be between 0 and
+20, inclusive.	Removing the dash will remove it for everybody.  Leaving a part
+out will result in numerous "invalid MSG id" warnings in FLSpew.txt.
+
+
+				    FACTIONS
+
+    player  Freelancer          co_vr   Ageira            fc_fa   Alliance
+                                co_alg  ALG               fc_b    Bundschuh
+    br_p    Bretonia Police     br_m    BMM               fc_c    Corsairs
+    ku_p    Kusari Police       co_be   Bowex             fc_bd   Dragons
+    li_p    Liberty Police      co_hsp  Cryer             fc_g    Gaians
+    li_lsf  LSF                 co_khc  Daumann           fc_gc   GC
+    rh_p    Rheinland Police	co_me	DSE		  fc_lh   Hacker
+                                co_nws  Gateway           fc_rh   Hessians
+    br_n    Armed Forces        co_ic   Interspace        fc_h    Hogosha
+    rh_n    Military            co_kt   Kishiro           fc_j    Junkers
+    ku_n    Naval Forces        rh_m    Kruger            fc_lwb  LWB
+    li_n    Navy                co_ti   Planetform        fc_m    Mollys
+                                co_rs   Republican        fc_or   Order
+    gd_bh   Bounty Hunters      co_shi  Samura            fc_ou   Outcasts
+    gd_gm   GMG                 co_os   Spa and Cruise    fc_lr   Rogues
+    gd_im   IMG                 co_ni   Synth Foods       fc_u    Unioners
+    gd_z    Zoners              co_ss   Universal         fc_x    Xenos
+
+
+                                   FORMATIONS
+
+                     01 Alpha      14 Red        22 Matsu
+                     02 Beta       15 Blue       23 Sakura
+                     03 Gamma      16 Gold       24 Fuji
+                     04 Delta      17 Green      25 Botan
+                     05 Epsilon    18 Silver     26 Hagi
+                     06 Zeta       19 Black      27 Susuki
+                     07 Theta      20 White      28 Kiku
+                     08 Iota       21 Yellow     29 Yanagi
+                     09 Kappa
+                     10 Lambda
+                     11 Omicron
+                     12 Sigma
+                     13 Omega
+
+
+Jason Hood, 3 February, 2010.
+http://freelancer.adoxa.cjb.net/

EXE/TurretZoom_readme.txt

@@ -0,0 +1,70 @@
+				  Turret Zoom
+				 by Jason Hood
+
+				  Version 1.41
+
+
+Turret Zoom is a plugin that lets you adjust the Turret View camera using the
+mouse wheel.  To install it, copy TURRETZOOM.DLL to Freelancer's EXE directory
+and add it to the [Libraries] section of EXE\dacom.ini.
+
+The default behavior is to adjust the "z" position of the camera, providing a
+zoom in (wheel down) and out (wheel up) feature.  It will scale the current
+value, by 1.5 up to 5K, then by 1.1.  Use the modifiers for additional control:
+
+	Shift	     move by 10K
+	Ctrl	     move by 1K
+	Alt	     move by 100
+	Shift+Ctrl   move by 10
+	Ctrl+Alt     move by 1
+
+Zooming in causes the camera to become quite sensitive.  The speed is halved
+every 10K, but can be fine-tuned by holding Shift+Ctrl+Alt and moving the wheel
+down (halve the speed) or up (double it).
+
+Holding Shift+Alt and moving the wheel down will switch to "y" mode (moving the
+wheel up will go back to "z").  In "y" mode, the camera will move up and down
+with the wheel.
+
+The current values are saved when you enter Turret View and restored on exit.
+However, this means if there is a situation where the view is reset without
+actually exiting Turret View, those values will become default.  Should that
+occur, a new launch/load/select will restore the original values.
+
+
+=======
+Options
+=======
+
+Strings can be added after the DLL in dacom.ini to customize the values (shown
+with their default):
+
+	fast		 immediate movement (like previous versions)
+	inverse 	 reverse wheel direction (movement only)
+	max=200000	 maximum distance to move
+	shift=10000	 Shift movement
+	ctrl=1000	 Ctrl movement
+	alt=100 	 Alt movement
+	s+c=10		 Shift+Ctrl movement
+	c+a=1		 Ctrl+Alt movement
+	small=1.1	 small move factor
+	large=1.5	 large move factor
+	switch=5000	 distance to switch from large to small
+	adjust=0.5	 zoom in camera speed adjust factor
+	interval=10000	 interval to adjust camera speed
+
+For example:
+
+	 TurretZoom.dll inverse max=20000 switch=0
+
+will cause wheel up to zoom in; move the camera no further than 20K; and always
+use the small factor.  There is a chance this may not work on your system, in
+which case the options can be patched directly into the DLL (which will also
+override the dacom.ini options).  Open TurretZoom.dll in your hex editor and go
+to hex offset 30C0, then just write in the options you want.  However, this
+method requires adding a space before the equal sign ("max = 20000").
+
+
+================================
+Jason Hood, 5 June, 2011.
+http://freelancer.adoxa.cjb.net/

EXE/dacom.ini

@@ -22,9 +22,11 @@ ximage.dll
 flmaterials.dll
 jflp.dll	; Jason's Freelancer Patch
 HudShift.dll
-Zone.dll
-WheelScroll.dll
 MPRep.dll
+numeric.dll
+TurretZoom.dll max=1000 shift=100 ctrl=10 alt=2 s+c=0.2 c+a=0.1 switch=50 interval=250 adjust=0.85
+WheelScroll.dll
+Zone.dll
 
 ;;EMAURER now include any DLLs used only in development.
 @include FL_DevOnlyLibs.ini

EXE/freelancer.ini

@@ -53,6 +53,8 @@ DLL = Content.dll, AISandbox, BELOW_NORMAL
 DLL = Content.dll, TestAutomation, BELOW_NORMAL
 DLL = Content.dll, BasePop, LOWEST
 
+DLL = callsign.dll, player 1 1-1
+
 [Resources]
 DLL = InfoCards.dll ; Contains all infocard text resources
 DLL = MiscText.dll  ; Contains other bulk text resource: rumor, offer, and mission text