From 9421356a0410c29fc0cda0642677599c65183a01 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 4 Aug 2024 17:22:40 +0300 Subject: [PATCH] update ship, remove shrooms. --- .../ContentLocalizationManager.cs | 11 +- Resources/Maps/_CP14/Shuttles/test-ship.yml | 697 +++++++++++++----- .../Entities/Structures/Walls/iron_grille.yml | 4 + 3 files changed, 522 insertions(+), 190 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 451ee617bc..39753b6804 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "ru-RU"; // CrystallPunk-Localization. "ru-RU" or "en-US" + private const string Culture = "en-US"; // CrystallPunk-Localization. "ru-RU" or "en-US" /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. @@ -26,12 +26,11 @@ namespace Content.Shared.Localizations public void Initialize() { var culture = new CultureInfo(Culture); - // Uncomment for Ru localization _loc.LoadCulture(culture); - - var fallbackCulture = new CultureInfo("en-US"); - _loc.LoadCulture(fallbackCulture); - _loc.SetFallbackCluture(fallbackCulture); + // Uncomment for Ru localization + //var fallbackCulture = new CultureInfo("en-US"); + //_loc.LoadCulture(fallbackCulture); + //_loc.SetFallbackCluture(fallbackCulture); // _loc.AddFunction(culture, "PRESSURE", FormatPressure); diff --git a/Resources/Maps/_CP14/Shuttles/test-ship.yml b/Resources/Maps/_CP14/Shuttles/test-ship.yml index 16923011c7..fc546cbb7f 100644 --- a/Resources/Maps/_CP14/Shuttles/test-ship.yml +++ b/Resources/Maps/_CP14/Shuttles/test-ship.yml @@ -355,16 +355,6 @@ entities: canCollide: False - proto: CP14AgaricMushroom entities: - - uid: 47 - components: - - type: Transform - pos: 0.034677863,20.277407 - parent: 1 - - uid: 50 - components: - - type: Transform - pos: 0.8315527,20.574282 - parent: 1 - uid: 376 components: - type: Transform @@ -377,12 +367,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.40257,-0.47695678 parent: 1 - - uid: 381 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.13719702,19.808657 - parent: 1 - uid: 403 components: - type: Transform @@ -419,18 +403,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5666323,-0.43008178 parent: 1 - - uid: 570 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.0743203,-20.633669 - parent: 1 - - uid: 571 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.0430703,-18.547731 - parent: 1 - uid: 573 components: - type: Transform @@ -469,44 +441,6 @@ entities: parent: 1 - type: CollisionWake enabled: False - - uid: 582 - components: - - type: Transform - pos: 3.476459,-8.187602 - parent: 1 - - uid: 583 - components: - - type: Transform - pos: 3.710834,-8.234477 - parent: 1 - - uid: 584 - components: - - type: Transform - pos: 4.038959,-8.234477 - parent: 1 - - uid: 598 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.78467786,20.058657 - parent: 1 - - uid: 651 - components: - - type: Transform - pos: 7.8385744,-21.134516 - parent: 1 - - uid: 653 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.2760744,-23.607653 - parent: 1 - - uid: 654 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.9791994,-21.05624 - parent: 1 - proto: CP14AlchemyFurnace entities: - uid: 285 @@ -538,38 +472,6 @@ entities: parent: 1 - proto: CP14BarrelAgaricMushroom entities: - - uid: 611 - components: - - type: Transform - pos: 1.1846054,20.363583 - parent: 1 - - uid: 612 - components: - - type: Transform - pos: -0.14351928,19.347958 - parent: 1 - - uid: 658 - components: - - type: Transform - pos: -1.8142228,-24.572914 - parent: 1 - - type: Pullable - prevFixedRotation: True - - uid: 659 - components: - - type: Transform - pos: -3.7742772,-23.467274 - parent: 1 - - uid: 660 - components: - - type: Transform - pos: -3.8836522,-22.967274 - parent: 1 - - uid: 661 - components: - - type: Transform - pos: -3.0399017,-23.436024 - parent: 1 - uid: 667 components: - type: Transform @@ -609,6 +511,13 @@ entities: - type: Transform pos: -3.3544888,5.513693 parent: 1 +- proto: CP14BarrelWildSageSap + entities: + - uid: 600 + components: + - type: Transform + pos: -0.36537468,-20.350859 + parent: 1 - proto: CP14BaseBattleStaff entities: - uid: 180 @@ -630,6 +539,52 @@ entities: rot: 3.141592653589793 rad pos: -1.1716173,9.815824 parent: 1 +- proto: CP14BaseHandheldAxe + entities: + - uid: 762 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.81202817,-22.976862 + parent: 1 + - uid: 821 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5470756,-22.966866 + parent: 1 + - uid: 822 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.2871219,-22.971865 + parent: 1 +- proto: CP14BaseLightCrossbow + entities: + - uid: 823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.15214598,-23.4703 + parent: 1 + - uid: 824 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.29712033,-23.49029 + parent: 1 + - uid: 825 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.11215329,-23.835117 + parent: 1 + - uid: 826 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.25212836,-23.825123 + parent: 1 - proto: CP14BaseMace entities: - uid: 494 @@ -694,6 +649,72 @@ entities: - type: Transform pos: -4.7254086,-17.740698 parent: 1 + - uid: 845 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.22507632,-24.752707 + parent: 1 + - uid: 846 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.34501636,-24.757706 + parent: 1 + - uid: 847 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.44996393,-24.757706 + parent: 1 + - uid: 848 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5249264,-24.752707 + parent: 1 + - uid: 849 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.6148814,-24.752707 + parent: 1 + - uid: 850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.77979875,-24.737709 + parent: 1 + - uid: 851 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.839769,-24.737709 + parent: 1 + - uid: 852 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.94471645,-24.752707 + parent: 1 + - uid: 853 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.039669,-24.767704 + parent: 1 + - uid: 854 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.1396189,-24.762705 + parent: 1 + - uid: 855 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.2795491,-24.762705 + parent: 1 - proto: CP14BaseSharpeningStoneStructure entities: - uid: 792 @@ -702,6 +723,38 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-21.5 parent: 1 + - uid: 856 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-10.5 + parent: 1 +- proto: CP14BaseShield + entities: + - uid: 858 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.7946587,5.619905 + parent: 1 + - uid: 859 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5809464,5.406262 + parent: 1 + - uid: 860 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.4122275,5.6536384 + parent: 1 + - uid: 861 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.232259,5.496217 + parent: 1 - proto: CP14BaseSickle entities: - uid: 6 @@ -709,6 +762,79 @@ entities: - type: Transform pos: 3.1924152,-1.4207557 parent: 1 + - uid: 707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.35211015,-22.667017 + parent: 1 + - uid: 713 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.52208006,-22.667017 + parent: 1 + - uid: 720 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.67705226,-22.687006 + parent: 1 +- proto: CP14BaseSword + entities: + - uid: 681 + components: + - type: Transform + pos: -0.23213148,-22.247227 + parent: 1 + - uid: 682 + components: + - type: Transform + pos: -0.41209984,-22.252224 + parent: 1 + - uid: 683 + components: + - type: Transform + pos: -0.5770699,-22.23723 + parent: 1 + - uid: 706 + components: + - type: Transform + pos: -0.7520391,-22.267216 + parent: 1 +- proto: CP14BaseTwoHandedSword + entities: + - uid: 841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.4620905,-24.035019 + parent: 1 + - uid: 842 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.49208522,-24.159956 + parent: 1 + - uid: 843 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.49208522,-24.254908 + parent: 1 + - uid: 844 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.4770881,-24.399836 + parent: 1 +- proto: CP14BaseVat + entities: + - uid: 857 + components: + - type: Transform + pos: -6.218236,1.7931371 + parent: 1 - proto: CP14BaseWoodDoor entities: - uid: 339 @@ -910,11 +1036,51 @@ entities: parent: 1 - proto: CP14ClothingRingCureWounds entities: + - uid: 2 + components: + - type: Transform + pos: -3.8508606,-24.101267 + parent: 1 + - uid: 50 + components: + - type: Transform + pos: -3.8408628,-24.426104 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: -3.6009054,-24.196218 + parent: 1 - uid: 86 components: - type: Transform pos: 1.2639279,-24.406971 parent: 1 + - uid: 206 + components: + - type: Transform + pos: -3.6009054,-24.09627 + parent: 1 + - uid: 583 + components: + - type: Transform + pos: -3.590907,-24.55104 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: -3.5959067,-24.371132 + parent: 1 + - uid: 611 + components: + - type: Transform + pos: -3.8408628,-24.55104 + parent: 1 + - uid: 654 + components: + - type: Transform + pos: -3.865858,-24.25619 + parent: 1 - uid: 690 components: - type: Transform @@ -925,6 +1091,116 @@ entities: - type: Transform pos: 1.5514088,-24.331799 parent: 1 +- proto: CP14ClothingRingFireball + entities: + - uid: 381 + components: + - type: Transform + pos: -3.1809804,-24.616009 + parent: 1 + - uid: 584 + components: + - type: Transform + pos: -3.1709821,-24.071281 + parent: 1 + - uid: 612 + components: + - type: Transform + pos: -3.1759813,-24.426104 + parent: 1 + - uid: 642 + components: + - type: Transform + pos: -3.160984,-24.236198 + parent: 1 +- proto: CP14ClothingRingFlameCreation + entities: + - uid: 570 + components: + - type: Transform + pos: -2.9060295,-24.05629 + parent: 1 + - uid: 571 + components: + - type: Transform + pos: -2.9060295,-24.266184 + parent: 1 + - uid: 660 + components: + - type: Transform + pos: -2.9060295,-24.640997 + parent: 1 + - uid: 663 + components: + - type: Transform + pos: -2.9160275,-24.491072 + parent: 1 +- proto: CP14ClothingRingIceDagger + entities: + - uid: 651 + components: + - type: Transform + pos: -2.4061189,-24.611012 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: -2.4211159,-24.426104 + parent: 1 + - uid: 661 + components: + - type: Transform + pos: -2.4211159,-24.066284 + parent: 1 + - uid: 662 + components: + - type: Transform + pos: -2.411118,-24.241196 + parent: 1 +- proto: CP14ClothingRingIceShards + entities: + - uid: 601 + components: + - type: Transform + pos: -2.2011554,-24.606014 + parent: 1 + - uid: 602 + components: + - type: Transform + pos: -2.2061546,-24.436098 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: -2.2061546,-24.25619 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: -2.2011554,-24.066284 + parent: 1 +- proto: CP14ClothingRingShadowGrab + entities: + - uid: 664 + components: + - type: Transform + pos: -1.7712321,-24.071281 + parent: 1 + - uid: 665 + components: + - type: Transform + pos: -1.766233,-24.261187 + parent: 1 + - uid: 674 + components: + - type: Transform + pos: -1.766233,-24.436098 + parent: 1 + - uid: 675 + components: + - type: Transform + pos: -1.7812302,-24.576029 + parent: 1 - proto: CP14ClothingRingShadowStep entities: - uid: 620 @@ -932,6 +1208,26 @@ entities: - type: Transform pos: -1.2709069,9.50901 parent: 1 + - uid: 676 + components: + - type: Transform + pos: -1.5362741,-24.066284 + parent: 1 + - uid: 677 + components: + - type: Transform + pos: -1.5262756,-24.221207 + parent: 1 + - uid: 678 + components: + - type: Transform + pos: -1.5112785,-24.41611 + parent: 1 + - uid: 679 + components: + - type: Transform + pos: -1.5312748,-24.581026 + parent: 1 - proto: CP14ClothingShirtCottonBlue entities: - uid: 540 @@ -1218,6 +1514,78 @@ entities: - type: Transform pos: -4.375,-19.515625 parent: 1 +- proto: CP14Crossbolt + entities: + - uid: 827 + components: + - type: Transform + pos: -0.4770881,-23.41033 + parent: 1 + - uid: 828 + components: + - type: Transform + pos: -0.5470756,-23.41033 + parent: 1 + - uid: 829 + components: + - type: Transform + pos: -0.6070647,-23.405333 + parent: 1 + - uid: 830 + components: + - type: Transform + pos: -0.6720531,-23.395338 + parent: 1 + - uid: 831 + components: + - type: Transform + pos: -0.7320421,-23.400335 + parent: 1 + - uid: 832 + components: + - type: Transform + pos: -0.8020297,-23.400335 + parent: 1 + - uid: 833 + components: + - type: Transform + pos: -0.89201355,-23.395338 + parent: 1 + - uid: 834 + components: + - type: Transform + pos: -0.87701654,-23.745163 + parent: 1 + - uid: 835 + components: + - type: Transform + pos: -0.77203536,-23.745163 + parent: 1 + - uid: 836 + components: + - type: Transform + pos: -0.66205525,-23.735168 + parent: 1 + - uid: 837 + components: + - type: Transform + pos: -0.58706844,-23.735168 + parent: 1 + - uid: 838 + components: + - type: Transform + pos: -0.52707875,-23.735168 + parent: 1 + - uid: 839 + components: + - type: Transform + pos: -0.46708965,-23.735168 + parent: 1 + - uid: 840 + components: + - type: Transform + pos: -0.3771057,-23.735168 + parent: 1 - proto: CP14CuttingBoard entities: - uid: 314 @@ -1802,32 +2170,12 @@ entities: parent: 1 - proto: CP14GatherableFlyAgaric entities: - - uid: 604 - components: - - type: Transform - pos: 0.5,20.5 - parent: 1 - - uid: 610 - components: - - type: Transform - pos: 0.5,19.5 - parent: 1 - uid: 657 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-17.5 parent: 1 - - uid: 674 - components: - - type: Transform - pos: 6.5,-22.5 - parent: 1 - - uid: 675 - components: - - type: Transform - pos: 5.5,-23.5 - parent: 1 - proto: CP14GoldBar1 entities: - uid: 111 @@ -2135,18 +2483,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,1.5 parent: 1 - - uid: 655 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-24.5 - parent: 1 - - uid: 656 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5784988,-24.620077 - parent: 1 - uid: 698 components: - type: Transform @@ -2682,11 +3018,6 @@ entities: parent: 1 - proto: CP14SmallWoodenCrateFilled entities: - - uid: 2 - components: - - type: Transform - pos: -0.49704182,-24.687271 - parent: 1 - uid: 3 components: - type: Transform @@ -2776,11 +3107,6 @@ entities: parent: 1 - proto: CP14SpawnPointAlchemist entities: - - uid: 52 - components: - - type: Transform - pos: 0.5,20.5 - parent: 1 - uid: 418 components: - type: Transform @@ -2913,6 +3239,11 @@ entities: - type: Transform pos: -0.5,-18.5 parent: 1 + - uid: 47 + components: + - type: Transform + pos: -0.5,-23.5 + parent: 1 - uid: 64 components: - type: Transform @@ -3062,16 +3393,56 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-21.5 parent: 1 + - uid: 582 + components: + - type: Transform + pos: -0.5,-24.5 + parent: 1 - uid: 586 components: - type: Transform pos: 6.5,-21.5 parent: 1 + - uid: 589 + components: + - type: Transform + pos: 0.5,18.5 + parent: 1 - uid: 596 components: - type: Transform pos: -1.5,5.5 parent: 1 + - uid: 598 + components: + - type: Transform + pos: -1.5,-24.5 + parent: 1 + - uid: 610 + components: + - type: Transform + pos: -0.5,-22.5 + parent: 1 + - uid: 655 + components: + - type: Transform + pos: -2.5,-24.5 + parent: 1 + - uid: 656 + components: + - type: Transform + pos: 0.5,20.5 + parent: 1 + - uid: 658 + components: + - type: Transform + pos: 0.5,19.5 + parent: 1 + - uid: 659 + components: + - type: Transform + pos: -3.5,-24.5 + parent: 1 - uid: 670 components: - type: Transform @@ -3112,12 +3483,6 @@ entities: - type: Transform pos: 6.820428,-1.2870219 parent: 1 - - uid: 589 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.37092686,19.797869 - parent: 1 - uid: 591 components: - type: Transform @@ -3138,41 +3503,6 @@ entities: - type: Transform pos: 3.1556704,-8.174997 parent: 1 - - uid: 600 - components: - - type: Transform - pos: -0.25407338,20.579119 - parent: 1 - - uid: 601 - components: - - type: Transform - pos: -0.0040733814,20.563494 - parent: 1 - - uid: 602 - components: - - type: Transform - pos: 1.0584269,19.73537 - parent: 1 - - uid: 662 - components: - - type: Transform - pos: -3.3640804,-22.875706 - parent: 1 - - uid: 663 - components: - - type: Transform - pos: -2.9109554,-22.875706 - parent: 1 - - uid: 664 - components: - - type: Transform - pos: -2.4734554,-23.375706 - parent: 1 - - uid: 665 - components: - - type: Transform - pos: -4.051581,-22.32883 - parent: 1 - proto: CP14VialSmallChromiumSlime entities: - uid: 529 @@ -4635,7 +4965,7 @@ entities: pos: -3.5,-9.5 parent: 1 - type: Door - secondsUntilStateChange: -4584.9634 + secondsUntilStateChange: -4853.909 state: Opening - proto: CP14WoodDoorTavern entities: @@ -4914,8 +5244,7 @@ entities: - uid: 803 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.15226746,2.7312455 + pos: -0.43687105,3.312364 parent: 1 - uid: 806 components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml index 3f4b3f5c5d..79a068e0de 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/iron_grille.yml @@ -50,6 +50,7 @@ layer: - MidImpassable - LowImpassable + - WallLayer - type: entity parent: CP14IronGrilleBase @@ -83,6 +84,7 @@ layer: - MidImpassable - LowImpassable + - WallLayer - type: entity parent: CP14IronGrilleBase @@ -116,6 +118,7 @@ layer: - MidImpassable - LowImpassable + - WallLayer - type: entity parent: CP14IronGrilleBase @@ -140,6 +143,7 @@ layer: - MidImpassable - LowImpassable + - WallLayer - type: InteractionOutline - type: Door openSpriteState: door_opened