Merge master (fire control 12) into codex/moddable-ships

This commit is contained in:
Meta Vens 2026-09-30 02:21:09 +02:00
commit 18e12d81ce
37 changed files with 4947 additions and 395 deletions

View file

@ -50,7 +50,9 @@ public class ConsoleView : MonoBehaviour {
Keyboard.current.onTextInput += c =>
{
if (!Visible || c == '`') return;
// Text input also delivers control characters (backspace as '\b', enter as '\r'); editing keys are
// handled in Update, so only printable characters are text.
if (!Visible || c == '`' || char.IsControl(c)) return;
InputString += c;
};
InputString = "";
@ -81,7 +83,7 @@ public class ConsoleView : MonoBehaviour {
if (!Visible) return;
if(keyboard.deleteKey.wasPressedThisFrame && InputString.Length>0)
if((keyboard.backspaceKey.wasPressedThisFrame || keyboard.deleteKey.wasPressedThisFrame) && InputString.Length>0)
{
InputString = InputString.Substring(0, InputString.Length - 1);
}

View file

@ -373,8 +373,7 @@ public class TradeMenu : MonoBehaviour
{
if (hullData.HullType != HullType.Ship) throw new ArgumentException("Attempted to buy non-ship hull from station, WTF are you doing?!");
var ship = new Ship(GameManager.ItemManager, GameManager.Zone, item as EquippableItem, GameManager.ItemManager.GameplaySettings.DefaultEntitySettings) { IsPlayerShip = true };
ship.SetParent(GameManager.DockedEntity);
GameManager.CommissionShip(item as EquippableItem);
GameManager.Credits -= data.Price;
UpdateCreditsLabel();