Debug text tweaking, guiframe for relay component, spears loaded into a harpoon gun don't float in the air, some new names

Subsurface/Content/Characters/Human/ffirstnames.txt

@@ -1,19 +1,25 @@
 Albertine
+Alexia
 Alfredia
+Alice
 Alita
 Alla
 Alta
 Althea
 Alyce
 Amee
+Amira
 Annette
 Ara
 Arcelia
 Arie
 Armanda
+Aryanna
+Ashley
 Ashly
 Astrid
 Avril
+Azul
 Barbra
 Beaulah
 Bell
@@ -22,13 +28,17 @@ Bettyann
 Beverley
 Bridgett
 Candace
+Cara
 Carie
 Carla
+Carmen
 Cathleen
+Cathy
 Cecille
 Christiana
 Christine
 Cinda
+Claire
 Cleopatra
 Codi
 Corinne
@@ -46,19 +56,26 @@ Doria
 Dorthy
 Eleanor
 Elinor
+Eliza
+Elliana
 Emerald
+Emilee
+Erica
 Erline
 Ethel
 Eugenia
 Fanny
 Fernanda
+Fiona
 Glenda
+Gloria
 Hortensia
 Ilene
 Ina
 Inga
 Iris
 Jacquline
+Jaida
 Janee
 Janessa
 Janie
@@ -75,30 +92,37 @@ Karyn
 Katerina
 Katherina
 Kathy
+Katrina
 Kellie
+Kenna
 Keri
 Kizzie
 Kristeen
 Kristie
 Larissa
 Larita
+Lauren
 Laurie
 Laurinda
 Lavinia
 Leanne
 Leila
 Lelah
+Lena
 Leola
+Lily
 Lindy
 Liza
 Lola
 Lora
 Lorriane
 Lorrie
+Macey
 Mafalda
 Maira
 Majorie
 Marcy
+Margaret
 Margeret
 Mariela
 Marin
@@ -110,19 +134,25 @@ Masako
 Maudie
 Maybell
 Mechelle
+Megan
 Melany
 Melba
 Michele
+Mikaela
 Mila
 Miranda
 Muoi
 Natalia
 Natashia
+Nicole
 Nola
 Noriko
 Page
+Pamela
 Paula
 Peggie
+Phoenix
+Priscilla
 Randi
 Reatha
 Renata
@@ -146,9 +176,13 @@ Sherita
 Sherry
 Shin
 Shirlee
+Siena
 Socorro
+Sophie
 Stefany
+Stella
 Stephane
+Summer
 Susy
 Synthia
 Tania
@@ -169,3 +203,4 @@ Velma
 Yahaira
 Zandra
 Zoe
+Zoey

Subsurface/Content/Characters/Human/firstnames.txt

@@ -1,17 +1,20 @@
 Abe
 Adam
 Adan
+Ahmed
 Alan
 Aldo
 Allan
 Alonso
 Alton
 Alvaro
+Alvin
 Andres
 Anton
 Antony
 Arkadi
 Arron
+Arthur
 Arturo
 Austin
 Avery
@@ -22,6 +25,7 @@ Ben
 Bennie
 Bertram
 Bill
+Bo
 Boyce
 Boyd
 Brady
@@ -41,14 +45,15 @@ Christoper
 Chuck
 Claude
 Coleman
+Cuck
 Dan
 Darius
 Darrin
 Darwin
 David
 Delbert
-Devin
 Dewey
+Devin
 Dewitt
 Dimitry
 Dominick
@@ -61,6 +66,7 @@ Elmer
 Erich
 Erik
 Ernie
+Esteban
 Everette
 Ezequiel
 Filiberto
@@ -70,6 +76,8 @@ Freeman
 Fritz
 Garrett
 Gerard
+Glenn
+Gregor
 Hal
 Harlan
 Harris
@@ -77,6 +85,7 @@ Harry
 Hector
 Herman
 Hobert
+Igor
 Irwin
 Ivan
 Jackie
@@ -94,12 +103,15 @@ Jerrell
 Jerrod
 Jess
 Joe
+Joel
 John
+Johny
 Jonathan
 Josef
 Joseph
 Joshua
 Jude
+Julius
 Keith
 Kendall
 Keneth
@@ -114,7 +126,9 @@ Lanny
 Lee
 Len
 Lenny
+Leo
 Lionel
+Lucas
 Lynn
 Lynwood
 Malcom
@@ -131,6 +145,7 @@ Mauricio
 Mckinley
 Mechislav
 Merrill
+Messiah
 Micheal
 Milton
 Minh
@@ -143,11 +158,14 @@ Mose
 Murray
 Neal
 Neil
+Nick
 Nolan
 Norman
+Omari
 Orval
 Oscar
 Owen
+Pedro
 Pete
 Peter
 Quincy
@@ -165,6 +183,7 @@ Rob
 Roderick
 Roland
 Romeo
+Ronnie
 Rosendo
 Roy
 Rupert
@@ -176,14 +195,17 @@ Sergei
 Seth
 Shelby
 Sidney
+Simon
 Son
 Sonny
 Steve
 Stevie
 Sylvester
 Tad
+Tate
 Terrance
 Terrell
+The
 Timur
 Tod
 Todd
@@ -193,14 +215,16 @@ Travis
 Tyler
 Tyson
 Ulof
-Virgil
-Virgilio
 Waldo
 Walker
 Warner
+Vasili
 Wilford
 Will
 Williams
+Willie
 Willy
 Winston
+Virgil
+Virgilio
 Zachary

Subsurface/Content/Characters/Human/lastnames.txt

@@ -1,9 +1,15 @@
+Aguilar
 Aker
 Angles
+Ashley
 Atterbury
+Avery
+Bailey
+Banks
 Bartolomeo
 Basnett
 Baumgardner
+Beltran
 Bergman
 Berlin
 Berner
@@ -13,121 +19,207 @@ Boman
 Bonham
 Books
 Box
+Bradley
+Brady
 Breeki
+Buckley
+Burke
 Bushman
 Callahan
-Callanan
 Carey
+Carroll
+Case
+Castillo
+Castro
 Celina Ryder
 Chandler
 Chaney
+Chaney
 Chapman
 Chiu
+Clements
 Clothier
+Cluck
 Cobble
+Collins
 Colpitts
 Combs
 Connors
 Cork
 Cortese
+Craig
+Cuevas
 Danko
 Day
+Day
 Delange
 Deloney
 Deras
 Dews
 Dimauro
 Dollinger
+Donovan
 Dorado
 Dudley
 Duplantier
+Dyer
 Eastman
+Elliott
+Ellison
+Escobar
 Feinberg
 Feinman
 Fesler
 Fleig
 Flowers
 Fonte
+Freeman
 Frye
 Gadberry
 Gallagher
 Gallardo
+Gay
 Gears
 Geist
+Gomez
 Gonzales
 Goodin
+Gordon
+Gould
+Graves
+Graves
+Green
+Gregory
 Gumbs
 Hajek
 Hallett
+Hampton
 Hardy
 Harp
 Hebert
 Hedrick
 Hefner
+Hernandez
 Heuer
+Higgins
 Hillard
 Hines
+Hinton
 Hocker
+Hoffman
 Holter
 House
+Huber
+Huber
+Hurley
+Hutchinson
+Huynh
 Jack
+James
 Jones
 Keller
+Kidd
 Kinney
 Klein
 Knowles
 Krall
+Kramer
 Lane
+Larsen
+Larsen
 Lavey
+Lawrence
+Lawson
+Lee
 Leonard
 Lester
 Linares
+Little
 Lowe
+Lozano
+Lucas
+Lyons
 Malone
 Mansfield
 Marchi
+Marquez
 Mason
+Maxwell
 Maynard
 Maynes
+Mcclure
+Mcdowell
 McLeroy
 McNeal
+Mcneil
 Mead
 Meals
 Meisner
 Mell
 Mendel
+Mendez
+Meza
+Molina
+Monroe
+Mooney
+Moran
+Moses
+Moses
+Mosley
 Mulford
 Mungo
 Navarro
 Newton
 Nicolosi
+Nunez
 Ordway
 Ouellette
 Palmieri
 Parchman
 Parker
 Parks
+Patel
+Pearson
 Petersen
+Phillips
 Phoenix
 Pickett
 Planck
+Pollard
 Pool
 Poole
+Preston
 Price
+Proctor
+Quinn
 Radebaugh
 Radice
 Ram
+Ramos
+Rangel
+Reeves
+Reynolds
 Rhymer
 Riddle
 Riles
+Rios
+Rivera
 Robertson
 Rolfe
+Roman
 Rosewood
+Rowe
 Sacks
 Santillan
 Santistevan
+Saunders
 Sawyer
+Schmitt
+Serrano
 Severance
+Sexton
+Shah
+Simpson
 Smith
 Southworth
 Sparks
@@ -135,6 +227,8 @@ Stalvey
 Stanley
 Stein
 Stogner
+Suarez
+Summers
 Summitt
 Sunderland
 Swanger
@@ -142,16 +236,21 @@ Swanson
 Sykes
 Tamashiro
 Tate
+Terry
 Thompkins
 Tootle
 Tseng
 Tyson
 Ulrich
+Walls
 Vaughn
+Vazquez
 Veach
+Weaver
 Velazquez
 Welden
 Wheeling
 Whitely
 Wiley
 Williams
+Zhang

Subsurface/Content/Items/Electricity/signalitems.xml

@@ -220,7 +220,9 @@
 
     <Sprite texture="signalcomp.png" depth="0.8" sourcerect="48,16,16,16"/>
 
-    <RelayComponent canbeselected = "true"/>
+    <RelayComponent canbeselected = "true">
+      <GuiFrame rect="0,0,200,160" alignment="Center" color="0.0,0.0,0.0,0.6"/>
+    </RelayComponent>
 
     <fixrequirement name="Reset fuse">
       <skill name="Electrical Engineering" level="30"/>

Subsurface/Content/Items/Weapons/weapons.xml

@@ -49,7 +49,7 @@
       <RequiredSkill name="Weapons" level="30"/>
     </RangedWeapon>
 
-    <ItemContainer itempos="27,10" iteminterval="0,-8" hideitems="false">
+    <ItemContainer itempos="27,10" iteminterval="0,-4" hideitems="false">
       <Containable name="Spear"/>
     </ItemContainer>
   </Item>

Subsurface/Source/GUI/GUI.cs

@@ -398,27 +398,27 @@ namespace Barotrauma
 
             if (GameMain.DebugDraw)
             {
-                spriteBatch.DrawString(Font,
+                spriteBatch.DrawString(SmallFont,
                     "FPS: " + (int)GameMain.FrameCounter.AverageFramesPerSecond,
                     new Vector2(10, 10), Color.White);
 
-                spriteBatch.DrawString(Font,
+                spriteBatch.DrawString(SmallFont,
                     "Physics: " + GameMain.World.UpdateTime,
+                    new Vector2(10, 20), Color.White);
+
+                spriteBatch.DrawString(SmallFont,
+                    "Bodies: " + GameMain.World.BodyList.Count + " (" + GameMain.World.BodyList.FindAll(b => b.Awake && b.Enabled).Count + " awake)",
                     new Vector2(10, 30), Color.White);
 
-                spriteBatch.DrawString(Font,
+                spriteBatch.DrawString(SmallFont,
-                    "Bodies: " + GameMain.World.BodyList.Count + " (" + GameMain.World.BodyList.FindAll(b => b.Awake && b.Enabled).Count + " awake)",
+                    "Camera pos: " + GameMain.GameScreen.Cam.Position.ToPoint(),
-                    new Vector2(10, 50), Color.White);
+                    new Vector2(10, 40), Color.White);
 
-                spriteBatch.DrawString(Font,
+                if (Submarine.Loaded != null)
-                    "Camera pos: " + GameMain.GameScreen.Cam.Position,
-                    new Vector2(10, 70), Color.White);
-
-                if (Submarine.Loaded!=null)
                 {
-                    spriteBatch.DrawString(Font,
+                    spriteBatch.DrawString(SmallFont,
-                        "Sub pos: " + Submarine.Loaded.Position,
+                        "Sub pos: " + Submarine.Loaded.Position.ToPoint(),
-                        new Vector2(10, 90), Color.White);
+                        new Vector2(10, 50), Color.White);
                 }
             }
             

Subsurface/Source/Items/Item.cs

@@ -813,6 +813,9 @@ namespace Barotrauma
 
             if (prefab.sprite != null)
             {
+                float depth = Sprite.Depth;
+                depth += (ID % 255) * 0.000001f;
+
                 if (body == null)
                 {
                     if (prefab.ResizeHorizontal || prefab.ResizeVertical)
@@ -821,7 +824,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        prefab.sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color);
+                        prefab.sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color, 0.0f, 1.0f, SpriteEffects.None, depth);
                     }
 
                 }
@@ -830,7 +833,6 @@ namespace Barotrauma
                     var holdable = GetComponent<Holdable>();
                     if (holdable!=null && holdable.Picker !=null)
                     {
-                        float depth = Sprite.Depth;
                         if (holdable.Picker.SelectedItems[0]==this)
                         {
                             depth = holdable.Picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.000001f;
@@ -844,7 +846,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        body.Draw(spriteBatch, prefab.sprite, color);
+                        body.Draw(spriteBatch, prefab.sprite, color, depth);
                     }                    
                 }
             }

Subsurface/Source/Map/Hull.cs

@@ -522,9 +522,13 @@ namespace Barotrauma
                 new Rectangle(drawRect.X, -drawRect.Y, rect.Width, rect.Height),
                 Color.Red*((100.0f-OxygenPercentage)/400.0f), true);
 
-            spriteBatch.DrawString(GUI.Font, "Pressure: " + ((int)pressure - rect.Y).ToString() +
+            if (GameMain.DebugDraw)
-                " - Oxygen: " + ((int)OxygenPercentage), new Vector2(drawRect.X + 10, -drawRect.Y + 10), Color.Black);
+            {
-            spriteBatch.DrawString(GUI.Font, volume + " / " + FullVolume, new Vector2(drawRect.X + 10, -drawRect.Y + 30), Color.Black);
+                spriteBatch.DrawString(GUI.SmallFont, "Pressure: " + ((int)pressure - rect.Y).ToString() +
+                    " - Oxygen: " + ((int)OxygenPercentage), new Vector2(drawRect.X + 5, -drawRect.Y + 5), Color.White);
+                spriteBatch.DrawString(GUI.SmallFont, volume + " / " + FullVolume, new Vector2(drawRect.X + 5, -drawRect.Y + 20), Color.White);
+
+            }
 
             if ((isSelected || isHighlighted) && editing)
             {