diff --git a/Resources/Maps/_CP14/Ships/cargo_shuttle.yml b/Resources/Maps/_CP14/Ships/cargo_shuttle.yml deleted file mode 100644 index d7c838ddd7..0000000000 --- a/Resources/Maps/_CP14/Ships/cargo_shuttle.yml +++ /dev/null @@ -1,909 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 2: CP14FloorMarble - 35: CP14FloorOakWoodPlanksCruciform - 1: CP14FloorStonebricks -entities: -- proto: "" - entities: - - uid: 1 - components: - - type: MetaData - name: grid - - type: Transform - pos: -0.5393677,-0.48875555 - parent: invalid - - type: MapGrid - chunks: - 0,0: - ind: 0,0 - tiles: AQAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - - type: Broadphase - - type: Physics - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 - fixedRotation: False - bodyType: Dynamic - - type: Fixtures - fixtures: {} - - type: OccluderTree - - type: SpreaderGrid - - type: Shuttle - - type: GridPathfinding - - type: Gravity - gravityShakeSound: !type:SoundPathSpecifier - path: /Audio/Effects/alert.ogg - - type: DecalGrid - chunkCollection: - version: 2 - nodes: - - node: - color: '#FFFFFFFF' - id: CP14BrickTileStoneLineE - decals: - 5: 0,-1 - 6: 0,-2 - 7: 0,-3 - 8: 0,-4 - - node: - color: '#FFFFFFFF' - id: CP14BrickTileStoneLineS - decals: - 9: -2,1 - 10: -1,1 - 11: 0,1 - 12: 1,1 - 13: 2,1 - - node: - color: '#FFFFFFFF' - id: CP14BrickTileStoneLineW - decals: - 1: 0,-1 - 2: 0,-2 - 3: 0,-3 - 4: 0,-4 - - type: GridAtmosphere - version: 2 - data: - chunkSize: 4 - - type: GasTileOverlay - - type: RadiationGridResistance -- proto: C14IronCabinetCargo - entities: - - uid: 55 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 - parent: 1 -- proto: CP14BlueBottle - entities: - - uid: 73 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.1868525,4.558953 - parent: 1 -- proto: CP14ChairWooden - entities: - - uid: 39 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.4904509,1.7075868 - parent: 1 - - uid: 69 - components: - - type: Transform - pos: 1.4735842,3.462273 - parent: 1 - - uid: 70 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.495323,6.3642545 - parent: 1 - - uid: 71 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.4109906,5.4531674 - parent: 1 -- proto: CP14CurtainsRedOpened - entities: - - uid: 22 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-1.5 - parent: 1 - - uid: 23 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-2.5 - parent: 1 - - uid: 24 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 1 - - uid: 25 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-2.5 - parent: 1 - - uid: 26 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 - parent: 1 -- proto: CP14FenceWoodSmallCorner - entities: - - uid: 28 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,4.5 - parent: 1 - - uid: 29 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,6.5 - parent: 1 - - uid: 30 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,6.5 - parent: 1 - - uid: 31 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,4.5 - parent: 1 -- proto: CP14FenceWoodSmallStraight - entities: - - uid: 35 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 36 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,5.5 - parent: 1 - - uid: 37 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,5.5 - parent: 1 - - uid: 38 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,6.5 - parent: 1 - - uid: 59 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,2.5 - parent: 1 - - uid: 63 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,1.5 - parent: 1 - - uid: 76 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: CP14GreenBottle2 - entities: - - uid: 75 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.0687864,6.6510777 - parent: 1 -- proto: CP14IronDoorBankStaff - entities: - - uid: 50 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 -- proto: CP14OrangeBottle - entities: - - uid: 72 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.9675874,4.289 - parent: 1 -- proto: CP14PaperFolderRed - entities: - - uid: 58 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.2494469,2.1800027 - parent: 1 - - uid: 68 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.4349785,2.4162087 - parent: 1 -- proto: CP14PenFeather - entities: - - uid: 52 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.300046,1.6063542 - parent: 1 -- proto: CP14RedBottle - entities: - - uid: 74 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.4061184,4.289 - parent: 1 -- proto: CP14RoofStone - entities: - - uid: 78 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 79 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 80 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 81 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 82 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 83 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 84 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 85 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 86 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 87 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 88 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 89 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 90 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 91 - components: - - type: Transform - pos: 0.5,-3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 92 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 93 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 94 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 95 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 96 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 97 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 98 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 99 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 100 - components: - - type: Transform - pos: 1.5,0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 101 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 102 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 103 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 104 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 105 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 106 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 107 - components: - - type: Transform - pos: 2.5,0.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 108 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 109 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 110 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 111 - components: - - type: Transform - pos: 1.5,2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 112 - components: - - type: Transform - pos: 0.5,2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 113 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 114 - components: - - type: Transform - pos: 0.5,3.5 - parent: 1 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} -- proto: CP14ShuttleWingBigL - entities: - - uid: 9 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 1 -- proto: CP14ShuttleWingBigR - entities: - - uid: 6 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 -- proto: CP14ShuttleWingSmallL - entities: - - uid: 4 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 - - uid: 5 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 1 -- proto: CP14ShuttleWingSmallR - entities: - - uid: 7 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 8 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 1 -- proto: CP14TableWoodenCounter - entities: - - uid: 32 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,4.5 - parent: 1 - - uid: 51 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,7.5 - parent: 1 - - uid: 53 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,4.5 - parent: 1 - - uid: 54 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,5.5 - parent: 1 - - uid: 56 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,6.5 - parent: 1 - - uid: 61 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,4.5 - parent: 1 - - uid: 64 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 65 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,2.5 - parent: 1 - - uid: 66 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,1.5 - parent: 1 - - uid: 77 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,1.5 - parent: 1 -- proto: CP14WallMarbleBrick - entities: - - uid: 12 - components: - - type: Transform - pos: 2.5,0.5 - parent: 1 - - uid: 13 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - - uid: 20 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 1 - - uid: 21 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 1 - - uid: 27 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 1 - - uid: 33 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 1 - - uid: 34 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 40 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 - - uid: 41 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 1 - - uid: 42 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 - - uid: 43 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - - uid: 44 - components: - - type: Transform - pos: 1.5,0.5 - parent: 1 -- proto: CP14WallmountFlagBankShip - entities: - - uid: 17 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-0.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 19 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-0.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 60 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,1.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 62 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,1.5 - parent: 1 - - type: Fixtures - fixtures: {} -- proto: CP14WallmountLamp - entities: - - uid: 57 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 67 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - type: Fixtures - fixtures: {} -- proto: CP14WindowMarbleBrick - entities: - - uid: 45 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-4.5 - parent: 1 - - uid: 46 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-2.5 - parent: 1 - - uid: 47 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 48 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-1.5 - parent: 1 - - uid: 49 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-2.5 - parent: 1 -- proto: CP14WoodenPalletBuy - entities: - - uid: 10 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - uid: 11 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 14 - components: - - type: Transform - pos: -0.5,-1.5 - parent: 1 - - uid: 15 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 -- proto: CP14WoodenPalletSell - entities: - - uid: 2 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 1 - - uid: 3 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 16 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 1 - - uid: 18 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 -... diff --git a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml index 884e9bc6c4..f8d5a82f9f 100644 --- a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml @@ -1,10 +1,23 @@ # Structures +# For any thin wooden entities +# Use if the logical “thickness” of this entity is less than the logs of a tree. +# Examples of uses: Chairs, tables, plates, wooden weapons,... +- type: damageModifierSet + id: CP14Wood + coefficients: + Blunt: 0.5 + Slash: 2.0 + Heat: 1.5 + +# For any thick monolithic wooden objects. +# Use if the logical “thickness” of the object is equal to or greater than a tree log +# Examples of use: Trees, wooden walls - type: damageModifierSet id: CP14WoodStructural coefficients: Blunt: 0.4 - Slash: 1.0 + Slash: 1.5 Piercing: 0.8 Heat: 1.3 Structural: 0.25 @@ -14,6 +27,58 @@ Piercing: 10 Structural: 10 +# For small items made of stone +- type: damageModifierSet + id: CP14Rock + coefficients: + Blunt: 0.75 + Slash: 0.5 + Piercing: 1.0 + Heat: 0.15 + Structural: 4 + +# For thick, monolithic stone structures such as statues, large stones, stone walls +- type: damageModifierSet + id: CP14RockStructural + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.8 + Heat: 0.1 + Structural: 1 + flatReductions: + Blunt: 10 + Slash: 10 + Piercing: 10 + Structural: 10 + +- type: damageModifierSet + id: CP14Metallic + coefficients: + Blunt: 0.7 + Slash: 0.5 + Piercing: 0.7 + Shock: 1.2 + Structural: 0.8 + flatReductions: + Blunt: 5 + Heat: 5 + +- type: damageModifierSet + id: CP14MetallicStructural + coefficients: + Blunt: 0.7 + Slash: 0.5 + Piercing: 0.7 + Shock: 1.2 + Structural: 0.8 + flatReductions: + Blunt: 10 + Slash: 10 + Piercing: 10 + Heat: 10 + Structural: 10 + # Mobs - type: damageModifierSet diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml index a00260c52a..b816e58139 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml @@ -65,7 +65,7 @@ damage: types: Cold: 4 - Piercing: 4 + Piercing: 6 - type: Sprite sprite: _CP14/Effects/Magic/ice_shard.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index 9c16465867..53b04b2860 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -74,12 +74,13 @@ - type: MobThresholds thresholds: 0: Alive - 40: Critical - 120: Dead + 35: Critical + 90: Dead - type: SlowOnDamage speedModifierThresholds: 10: 0.8 - 30: 0.4 + 20: 0.4 + 30: 0.2 - type: StatusEffects allowed: - Stun @@ -122,8 +123,7 @@ path: /Audio/Effects/bite.ogg damage: types: - Slash: 5 - Structural: 6 + Slash: 8 - type: Pullable - type: SpamEmitSound minInterval: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml index 1417eae4da..9b9650c6f6 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/door_frames.yml @@ -70,7 +70,7 @@ state: closed - type: Damageable damageContainer: Inorganic - damageModifierSet: StructuralMetallic + damageModifierSet: CP14Metallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml index c4e8cc7296..396fcddbfc 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml @@ -18,15 +18,17 @@ path: /Audio/Effects/door_close.ogg - type: Damageable damageContainer: Inorganic - damageModifierSet: StructuralMetallic + damageModifierSet: CP14MetallicStructural - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 500 + damage: 75 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - !type:ChangeConstructionNodeBehavior + node: CP14IronDoorFrame - type: Construction graph: CP14IronDoor node: CP14IronDoor diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml index 0ad836bda6..1cec2f2cdf 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml @@ -21,15 +21,17 @@ path: /Audio/Effects/door_close.ogg - type: Damageable damageContainer: Inorganic - damageModifierSet: StructuralMetallic + damageModifierSet: CP14MetallicStructural - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 500 + damage: 75 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - !type:ChangeConstructionNodeBehavior + node: CP14IronDoorFrame - type: Construction graph: CP14IronDoor node: CP14IronDoor diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml index a59ec324d2..49c07b221b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml @@ -24,10 +24,17 @@ thresholds: - trigger: !type:DamageTrigger - damage: 250 + damage: 75 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WoodenDoorFrame - type: Construction graph: CP14WoodenDoor node: CP14WoodenDoor diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml index 67f31a252c..eddb76713d 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml @@ -27,10 +27,17 @@ thresholds: - trigger: !type:DamageTrigger - damage: 250 + damage: 75 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WoodenDoorFrame - type: Construction graph: CP14WoodenDoor node: CP14WoodenDoorWindowed diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml index 4d01959b02..b74752ee4a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/big_fence.yml @@ -32,9 +32,13 @@ !type:PhysShapeAabb bounds: "-0.3,-0.3,0.3,0.3" density: 1000 + mask: + - Impassable layer: - LowImpassable - MidImpassable + - HighImpassable + - InteractImpassable - type: IconSmooth key: CP14fencebig base: fence diff --git a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml index b2b7827a1d..e69de29bb2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml @@ -1,254 +0,0 @@ -- type: entity - id: CP14FrameWooden - name: wooden wall frame - parent: - - BaseStructureDynamic - - CP14BaseFlammableSpreading - description: Wooden frame for any wooden wall. - categories: [ ForkFiltered ] - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Mobs - snapCardinals: true - sprite: _CP14/Structures/Walls/wall_frame.rsi - state: wooden - - type: PlacementReplacement - key: walls - - type: Transform - anchored: true - noRot: false - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,0.45,0.45" - density: 60 - mask: - - MachineMask - layer: - - GlassAirlockLayer - - type: InteractionOutline - - type: Construction - graph: CP14WallWood - node: FrameWooden - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14FrameWoodenCrushedMedium: - min: 1 - max: 1 - -- type: entity - id: CP14BaseCrushed - categories: [ ForkFiltered ] - parent: BaseStructure - abstract: true - description: A wall that has not resisted the flow of time and aggressive conditions. - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Mobs - snapCardinals: true - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_medium - - type: PlacementReplacement - key: walls - - type: Transform - anchored: true - noRot: false - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,0.45,0.45" - density: 60 - mask: - - MachineMask - layer: - - GlassAirlockLayer - - type: InteractionOutline - -- type: entity ### Crushed Medium frame - id: CP14FrameWoodenCrushedMedium - name: wooden wall frame - parent: CP14BaseCrushed - suffix: CrushedMedium - components: - - type: Sprite - sprite: _CP14/Structures/Walls/wall_frame.rsi - state: crushed_medium - - type: Icon - sprite: _CP14/Structures/Walls/wall_frame.rsi - state: crushed_medium - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 20 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - CP14FrameWoodenCrushedLow: - min: 1 - max: 1 - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14FrameWoodenCrushedLow: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity ### Crushed Low frame - id: CP14FrameWoodenCrushedLow - name: wooden wall frame - parent: CP14BaseCrushed - suffix: CrushedLow - components: - - type: Sprite - sprite: _CP14/Structures/Walls/wall_frame.rsi - state: crushed_low - - type: Icon - sprite: _CP14/Structures/Walls/wall_frame.rsi - state: crushed_low - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity ### Crushed Medium stone - id: CP14WallStonebrickCrushedMedium - name: stone brick wall - parent: CP14BaseCrushed - suffix: CrushedMedium - components: - - type: Sprite - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_medium - - type: Icon - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_medium - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - CP14WallStonebrickCrushedLow: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity ### Crushed Low stone - id: CP14WallStonebrickCrushedLow - name: stone brick wall - parent: CP14BaseCrushed - suffix: CrushedLow - components: - - type: Sprite - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_low - - type: Icon - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - state: crushed_low - - type: Transform - anchored: true - noRot: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Shuttle/shuttle_elements.yml b/Resources/Prototypes/_CP14/Entities/Structures/Shuttle/shuttle_elements.yml deleted file mode 100644 index a313a7f915..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Structures/Shuttle/shuttle_elements.yml +++ /dev/null @@ -1,55 +0,0 @@ -- type: entity - id: CP14ShuttleWingBase - abstract: true - categories: [ ForkFiltered ] - name: airship wing - description: Giant webbed wings, capable, along with magic, of holding the heaviest objects in the air. - placement: - mode: SnapgridCenter - components: - - type: Sprite - drawdepth: FloorTiles - - type: Clickable - - type: Transform - anchored: true - -- type: entity - parent: CP14ShuttleWingBase - id: CP14ShuttleWingSmallR - suffix: Right, Small - components: - - type: Sprite - offset: 1, -0.75 - sprite: _CP14/Structures/Shuttle/wing_small.rsi - state: right - -- type: entity - parent: CP14ShuttleWingBase - id: CP14ShuttleWingSmallL - suffix: Left, Small - components: - - type: Sprite - offset: -1, -0.75 - sprite: _CP14/Structures/Shuttle/wing_small.rsi - state: left - - -- type: entity - parent: CP14ShuttleWingBase - id: CP14ShuttleWingBigL - suffix: Left, Big - components: - - type: Sprite - offset: -1.75, -1.5 - sprite: _CP14/Structures/Shuttle/wing_big.rsi - state: left - -- type: entity - parent: CP14ShuttleWingBase - id: CP14ShuttleWingBigR - suffix: Right, Big - components: - - type: Sprite - offset: 1.75, -1.5 - sprite: _CP14/Structures/Shuttle/wing_big.rsi - state: right diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 92c874d129..66b378f108 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -12,7 +12,7 @@ base: wall - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: Rock + damageModifierSet: CP14RockStructural - type: Destructible thresholds: - trigger: @@ -100,7 +100,7 @@ base: wall - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: Rock + damageModifierSet: Rock # "Soft" - type: Destructible thresholds: - trigger: @@ -230,7 +230,7 @@ - type: IconSmooth base: wall - type: Damageable - damageContainer: StructuralInorganic + damageContainer: Inorganic damageModifierSet: Rock - type: Destructible thresholds: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml index d98295ec78..4af53b8c79 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml @@ -29,8 +29,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14OreCopper1: - min: 1 - max: 3 + min: 3 + max: 6 - !type:DoActsBehavior acts: ["Destruction"] @@ -64,8 +64,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14OreIron1: - min: 1 - max: 3 + min: 3 + max: 6 - !type:DoActsBehavior acts: ["Destruction"] @@ -99,8 +99,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14OreGold1: - min: 1 - max: 3 + min: 3 + max: 6 - !type:DoActsBehavior acts: ["Destruction"] - type: IconSmooth @@ -136,8 +136,8 @@ - !type:SpawnEntitiesBehavior spawn: CP14OreMithril1: - min: 1 - max: 3 + min: 3 + max: 6 - !type:DoActsBehavior acts: ["Destruction"] - type: IconSmooth diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml new file mode 100644 index 0000000000..1de2755d8a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml @@ -0,0 +1,153 @@ +# Stonebrick + +- type: entity + id: CP14WallFrameStonebrick + name: stonebrick wall base + parent: CP14BaseWallFrame + components: + - type: Sprite + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: frame + - type: Icon + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + state: frame + - type: Construction + graph: CP14WallStonebrick + node: CP14WallFrameStonebrick + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14RockStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14StoneBlock1: + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WallStonebrick + name: stonebrick wall + parent: CP14BaseWall + components: + - type: Sprite + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi + - type: IconSmooth + base: stonebricks + - type: Construction + graph: CP14WallStonebrick + node: CP14WallStonebrick + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14RockStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14StoneBlock1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WallFrameStonebrick + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: CP14WallpaperHolder + +# Marble + +- type: entity + id: CP14WallFrameMarblebrick + name: marblebrick wall base + parent: CP14BaseWallFrame + components: + - type: Sprite + sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi + state: frame + - type: Icon + sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi + state: frame + - type: Construction + graph: CP14WallMarbleBrick + node: CP14WallFrameMarblebrick + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14RockStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14MarbleBlock1: + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WallMarbleBrick + name: marble brick wall + parent: CP14BaseWall + components: + - type: Sprite + sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi + - type: IconSmooth + base: stonebricks + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14RockStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14MarbleBlock1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WallFrameMarblebrick + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: CP14WallMarbleBrick + node: CP14WallMarbleBrick + - type: CP14WallpaperHolder \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index ce99d5cc99..46d87a1df3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -24,140 +24,38 @@ key: walls - type: entity - id: CP14WallStonebrick - name: stone brick wall - parent: CP14BaseWall + id: CP14BaseWallFrame + categories: [ ForkFiltered ] + parent: BaseStructure + abstract: true + description: This wall is now in an indeterminate state between existence and non-existence. + placement: + mode: SnapgridCenter + snap: + - Wall components: - type: Sprite - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi - - type: IconSmooth - base: stonebricks - - type: Construction - graph: CP14WallStonebrick - node: WallStonebrick - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Rock - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 150 - behaviors: - - !type:SpawnEntitiesBehavior - spawn: - CP14WallStonebrickCrushedMedium: - min: 1 - max: 1 - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: CP14WallpaperHolder - -- type: entity - id: CP14WallMarbleBrick - name: marble brick wall - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/marblebricks_stone_wall.rsi - - type: IconSmooth - base: stonebricks - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Rock - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: CP14WallMarbleBrick - node: CP14WallMarbleBrick - - type: CP14WallpaperHolder - -- type: entity - id: CP14WallBrownbrick - name: brick wall - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/bricks_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/bricks_wall.rsi - - type: IconSmooth - base: bricksA - - type: Appearance - - type: RandomIconSmooth - randomStates: - - bricksA - - bricksB - - type: CP14WallpaperHolder - -- type: entity - id: CP14WallWooden - name: wooden wall - parent: - - CP14BaseWall - - CP14BaseFlammableSpreading - components: - - type: Sprite - sprite: _CP14/Structures/Walls/wooden_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/wooden_wall.rsi - - type: IconSmooth - base: wood - - type: Damageable - damageContainer: Inorganic - damageModifierSet: CP14WoodStructural - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14FrameWooden: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: CP14WallWood - node: WallWooden - - type: CP14WallpaperHolder - -- type: entity - id: CP14WallWoodenBirch - parent: CP14WallWooden - components: - - type: Sprite - sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi - - type: Icon - sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi - - type: Construction - graph: CP14WallWood - node: WallWoodenBirch + drawdepth: Mobs + snapCardinals: true + - type: PlacementReplacement + key: walls + - type: Transform + anchored: true + noRot: false + - type: SpriteFade + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + mask: + - FullTileMask + layer: + - WallLayer + density: 1000 - type: entity id: CP14WallWoodenPalisade @@ -183,7 +81,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 100 behaviors: - !type:PlaySoundBehavior sound: @@ -199,49 +97,6 @@ graph: CP14WallWoodenPalisade node: CP14WallWoodenPalisade -- type: entity - id: CP14WallCardboard - name: cardboard Wall - description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. - parent: - - CP14WallWooden - - CP14BaseFlammableSpreadingStrong - components: - - type: Sprite - sprite: _CP14/Structures/Walls/cardboard_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/cardboard_wall.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - CP14FrameWooden: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: CP14WallpaperHolder - -- type: entity - id: CP14WallCyan - name: cyan wall - parent: CP14BaseWall - components: - - type: Sprite - sprite: _CP14/Structures/Walls/cyan_wall.rsi - - type: Icon - sprite: _CP14/Structures/Walls/cyan_wall.rsi - - type: IconSmooth - base: wall - - type: CP14WallpaperHolder - - type: entity id: CP14WallSkulls name: skulls wall @@ -253,10 +108,20 @@ sprite: _CP14/Structures/Walls/wall_of_skulls.rsi - type: IconSmooth base: skulls - - type: RandomIconSmooth - randomStates: - - skulls - - skullsA - - skullsB - - type: Appearance + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14RockStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: CP14WallpaperHolder \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml new file mode 100644 index 0000000000..b9a9898123 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden.yml @@ -0,0 +1,136 @@ +# Wooden + +- type: entity + id: CP14WallFrameWooden + name: wooden wall frame + parent: + - CP14BaseWallFrame + - CP14BaseFlammableSpreading + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall.rsi + state: frame + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall.rsi + state: frame + - type: Construction + graph: CP14WallWooden + node: CP14WallFrameWooden + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14WoodStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WallWooden + name: wooden wall + parent: + - CP14BaseWall + - CP14BaseFlammableSpreading + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall.rsi + - type: IconSmooth + base: wood + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: CP14WoodStructural + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WallFrameWooden + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: CP14WallWooden + node: CP14WallWooden + - type: CP14WallpaperHolder + +# Wooden birch + +- type: entity + id: CP14WallFrameWoodenBirch + parent: CP14WallFrameWooden + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Construction + graph: CP14WallWoodenBirch + node: CP14WallFrameWoodenBirch + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodenPlanks1: + min: 1 + max: 2 + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14WallWoodenBirch + parent: CP14WallWooden + components: + - type: Sprite + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Icon + sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi + - type: Construction + graph: CP14WallWoodenBirch + node: CP14WallWoodenBirch + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14BirchWoodenPlanks1: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: CP14WallFrameWoodenBirch + - !type:DoActsBehavior + acts: [ "Destruction" ] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml index 149be6dd56..1c10ff1956 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml @@ -13,6 +13,9 @@ base: window - type: PlacementReplacement key: walls + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass - type: Destructible thresholds: - trigger: @@ -50,6 +53,9 @@ - type: Icon sprite: _CP14/Structures/Windows/stone_bricks_window.rsi state: full + - type: Construction + graph: CP14WallStonebrick + node: CP14WallStonebrick - type: entity id: CP14WindowMarbleBrick @@ -62,6 +68,9 @@ - type: Icon sprite: _CP14/Structures/Windows/marble_bricks_window.rsi state: full + - type: Construction + graph: CP14WallMarbleBrick + node: CP14WindowMarbleBrick - type: entity id: CP14WindowWooden @@ -71,16 +80,13 @@ name: wooden window description: A wooden wall with a glass window in it. components: - - type: Damageable - damageContainer: Inorganic - damageModifierSet: CP14WoodStructural - type: Sprite sprite: _CP14/Structures/Windows/wooden_window.rsi - type: Icon sprite: _CP14/Structures/Windows/wooden_window.rsi - type: Construction - graph: CP14WallWood - node: WindowWooden + graph: CP14WallWooden + node: CP14WindowWooden - type: entity id: CP14WindowIceBlock @@ -108,9 +114,6 @@ soundGroups: Brute: collection: GlassSmash - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - type: InteractionPopup interactSuccessString: popup-cp14crystal-ding messagePerceivedByOthers: popup-cp14crystal-ding diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml index 45289bc18e..fea8644c57 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -2,16 +2,17 @@ id: BaseBladePickaxe modifiers: - !type:EditMeleeWeapon - attackRateMultiplier: 0.75 + attackRateMultiplier: 0.55 angleMultiplier: 1.2 bonusDamage: types: - Piercing: 9 + Piercing: 10 + Structural: 6 - !type:EditIncreaseDamageOnWield bonusDamage: types: - Piercing: 4 - Structural: 14 + Piercing: 8 + Structural: 17 - !type:EditItem newSize: Normal adjustShape: 1, 1 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml index a19196a45a..6ae8987689 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml @@ -17,9 +17,9 @@ entityMask: - CP14WallStone entity: CP14WallStoneIronOre - count: 5 - minGroupSize: 10 - maxGroupSize: 15 + count: 20 + minGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier id: IronOreUnderground @@ -38,9 +38,9 @@ entityMask: - CP14WallStone entity: CP14WallStoneIronOre - count: 10 - minGroupSize: 10 - maxGroupSize: 15 + count: 30 + minGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier id: CopperOre @@ -80,7 +80,7 @@ entityMask: - CP14WallStone entity: CP14WallStoneCopperOre - count: 20 + count: 10 minGroupSize: 5 maxGroupSize: 7 @@ -89,7 +89,7 @@ - type: cp14DemiplaneModifier id: GoldOre levels: - min: 3 + min: 5 max: 6 name: cp14-modifier-gold-ore unique: false @@ -102,10 +102,10 @@ - !type:OreDunGen entityMask: - CP14WallStone - entity: CP14WallStoneGoldOre # Hellish gold 666 - count: 6 - minGroupSize: 6 - maxGroupSize: 6 + entity: CP14WallStoneGoldOre + count: 10 + minGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier id: GoldOreUnderground @@ -123,10 +123,10 @@ - !type:OreDunGen entityMask: - CP14WallStone - entity: CP14WallStoneGoldOre # Hellish gold 666 - count: 10 - minGroupSize: 6 - maxGroupSize: 6 + entity: CP14WallStoneGoldOre + count: 20 + minGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier id: MithrilOre @@ -145,9 +145,9 @@ entityMask: - CP14WallStone entity: CP14WallStoneMithrilOre - count: 5 - minGroupSize: 4 - maxGroupSize: 8 + count: 10 + minGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier id: MithrilOreUnderground @@ -166,6 +166,6 @@ entityMask: - CP14WallStone entity: CP14WallStoneMithrilOre - count: 8 - minGroupSize: 4 - maxGroupSize: 8 + count: 20 + minGroupSize: 1 + maxGroupSize: 5 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml index 190f60e4f1..d854572540 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/iron_doors.yml @@ -18,11 +18,11 @@ - to: start completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 - !type:DeleteEntity {} steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 - to: CP14IronDoorFrameMirrored steps: @@ -46,13 +46,16 @@ entity: CP14IronDoorFrameMirrored edges: - to: start + conditions: + - !type:Locked + locked: false completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 - !type:DeleteEntity {} steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 - to: CP14IronDoorFrame steps: @@ -76,46 +79,58 @@ entity: CP14IronDoor edges: - to: CP14IronDoorFrame + conditions: + - !type:Locked + locked: false completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 - node: CP14IronDoorMirrored entity: CP14IronDoorMirrored edges: - to: CP14IronDoorFrameMirrored + conditions: + - !type:Locked + locked: false completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 - node: CP14IronDoorWindowed entity: CP14IronDoorWindowed edges: - to: CP14IronDoorFrame + conditions: + - !type:Locked + locked: false completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 - node: CP14IronDoorWindowedMirrored entity: CP14IronDoorWindowedMirrored edges: - to: CP14IronDoorFrameMirrored + conditions: + - !type:Locked + locked: false completed: - !type:SpawnPrototype - prototype: CP14IronBar1 + prototype: CP14ScrapIron amount: 2 steps: - - tool: Prying #TODO - new tool + - tool: Prying doAfter: 5 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml index d94fe351c2..d86b17a152 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Doors/wooden_doors.yml @@ -8,7 +8,7 @@ edges: - to: CP14WoodenDoorFrame steps: - - stackGroup: WoodenPlanks + - material: CP14WoodenPlanks amount: 2 doAfter: 2 @@ -22,22 +22,19 @@ amount: 2 - !type:DeleteEntity {} steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 - to: CP14WoodenDoorFrameMirrored steps: - tool: CP14Hammering doAfter: 1 - to: CP14WoodenDoor steps: - - stackGroup: WoodenPlanks + - material: CP14WoodenPlanks amount: 2 doAfter: 2 - to: CP14WoodenDoorWindowed steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - material: CP14WoodenPlanks amount: 2 doAfter: 2 @@ -47,10 +44,13 @@ edges: - to: start completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 - !type:DeleteEntity {} steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 - to: CP14WoodenDoorFrame steps: - tool: CP14Hammering @@ -62,9 +62,6 @@ doAfter: 2 - to: CP14WoodenDoorWindowedMirrored steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - material: CP14WoodenPlanks amount: 2 doAfter: 2 @@ -73,30 +70,58 @@ entity: CP14WoodenDoor edges: - to: CP14WoodenDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 - node: CP14WoodenDoorMirrored entity: CP14WoodenDoorMirrored edges: - to: CP14WoodenDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 - node: CP14WoodenDoorWindowed entity: CP14WoodenDoorWindowed edges: - to: CP14WoodenDoorFrame + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 - node: CP14WoodenDoorWindowedMirrored entity: CP14WoodenDoorWindowedMirrored edges: - to: CP14WoodenDoorFrameMirrored + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + conditions: + - !type:Locked + locked: false steps: - - tool: Prying #TODO - new tool - doAfter: 5 + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml deleted file mode 100644 index d57a1dad8a..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallMarble.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: constructionGraph - id: CP14WallMarbleBrick - start: start - graph: - - node: start - edges: - - to: CP14WallMarbleBrick - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: CP14MarbleStone - amount: 3 - doAfter: 2 - - node: CP14WallMarbleBrick - entity: CP14WallMarbleBrick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallStone.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallStone.yml deleted file mode 100644 index 1eedfcf489..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallStone.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: constructionGraph - id: CP14WallStonebrick - start: start - graph: - - node: start - edges: - - to: WallStonebrick - completed: - - !type:SnapToGrid - southRotation: true - steps: - - material: CP14Stone - amount: 3 - doAfter: 2 - - node: WallStonebrick - entity: CP14WallStonebrick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml deleted file mode 100644 index 8b09764110..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallWood.yml +++ /dev/null @@ -1,88 +0,0 @@ -- type: constructionGraph - id: CP14WallWood - start: start - graph: - - node: start - edges: - - to: FrameWooden - completed: - - !type:SnapToGrid - southRotation: true - steps: - - stackGroup: WoodenPlanks - amount: 2 - doAfter: 2 - - - node: FrameWooden - entity: CP14FrameWooden - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 - - !type:DeleteEntity {} - steps: - - tool: Screwing #TODO - new tool - doAfter: 1 - - to: WallWooden - steps: - - material: CP14WoodenPlanks - amount: 2 - doAfter: 1 - - material: CP14Nail - amount: 2 - doAfter: 1 - - tool: CP14Hammering - doAfter: 2 - - to: WallWoodenBirch - steps: - - material: CP14BirchWoodenPlanks - amount: 2 - doAfter: 1 - - material: CP14Nail - amount: 2 - doAfter: 1 - - tool: CP14Hammering - doAfter: 2 - - to: WindowWooden - steps: - - material: CP14GlassSheet - amount: 2 - doAfter: 1 - - - node: WallWooden - entity: CP14WallWooden - edges: - - to: FrameWooden - steps: - - tool: CP14Hammering - doAfter: 2 - - - node: WallWoodenBirch - entity: CP14WallWoodenBirch - edges: - - to: FrameWooden - steps: - - tool: CP14Hammering - doAfter: 2 - - - node: WindowWooden - entity: CP14WindowWooden - - -- type: constructionGraph - id: CP14WallWoodenPalisade - start: start - graph: - - node: start - edges: - - to: CP14WallWoodenPalisade - completed: - - !type:SnapToGrid - steps: - - stackGroup: WoodenPlanks - amount: 4 - doAfter: 2 - - node: CP14WallWoodenPalisade - entity: CP14WallWoodenPalisade diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallDirt.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml similarity index 100% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/WallDirt.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_dirt.yml diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml new file mode 100644 index 0000000000..41545a4a52 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick.yml @@ -0,0 +1,52 @@ +- type: constructionGraph + id: CP14WallStonebrick + start: start + graph: + - node: start + edges: + - to: CP14WallFrameStonebrick + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14Stone + amount: 2 + doAfter: 2 + + - node: CP14WallFrameStonebrick + entity: CP14WallFrameStonebrick + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14StoneBlock1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 2 + - to: CP14WallStonebrick + steps: + - material: CP14Stone + amount: 2 + doAfter: 2 + - to: CP14WindowStoneBrick + steps: + - material: CP14GlassSheet + amount: 2 + doAfter: 2 + + - node: CP14WallStonebrick + entity: CP14WallStonebrick + edges: + - to: CP14WallFrameStonebrick + steps: + - tool: CP14Hammering + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14StoneBlock1 + amount: 2 + + - node: CP14WindowStoneBrick + entity: CP14WindowStoneBrick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml new file mode 100644 index 0000000000..63af925959 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_stonebrick_marble.yml @@ -0,0 +1,52 @@ +- type: constructionGraph + id: CP14WallMarbleBrick + start: start + graph: + - node: start + edges: + - to: CP14WallFrameMarblebrick + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14MarbleStone + amount: 2 + doAfter: 2 + + - node: CP14WallFrameMarblebrick + entity: CP14WallFrameMarblebrick + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14MarbleBlock1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 2 + - to: CP14WallMarbleBrick + steps: + - material: CP14MarbleStone + amount: 2 + doAfter: 2 + - to: CP14WindowMarbleBrick + steps: + - material: CP14GlassSheet + amount: 2 + doAfter: 2 + + - node: CP14WallMarbleBrick + entity: CP14WallMarbleBrick + edges: + - to: CP14WallFrameMarblebrick + steps: + - tool: CP14Hammering + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14MarbleBlock1 + amount: 2 + + - node: CP14WindowMarbleBrick + entity: CP14WindowMarbleBrick \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml new file mode 100644 index 0000000000..f0d93457a2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden.yml @@ -0,0 +1,52 @@ +- type: constructionGraph + id: CP14WallWooden + start: start + graph: + - node: start + edges: + - to: CP14WallFrameWooden + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + + - node: CP14WallFrameWooden + entity: CP14WallFrameWooden + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 2 + - to: CP14WallWooden + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - to: CP14WindowWooden + steps: + - material: CP14GlassSheet + amount: 2 + doAfter: 2 + + - node: CP14WallWooden + entity: CP14WallWooden + edges: + - to: CP14WallFrameWooden + steps: + - tool: CP14Hammering + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14WoodenPlanks1 + amount: 2 + + - node: CP14WindowWooden + entity: CP14WindowWooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml new file mode 100644 index 0000000000..1c71853839 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_birch.yml @@ -0,0 +1,52 @@ +- type: constructionGraph + id: CP14WallWoodenBirch + start: start + graph: + - node: start + edges: + - to: CP14WallFrameWoodenBirch + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + + - node: CP14WallFrameWoodenBirch + entity: CP14WallFrameWoodenBirch + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 2 + - to: CP14WallWoodenBirch + steps: + - material: CP14BirchWoodenPlanks + amount: 2 + doAfter: 2 + #- to: WindowWooden + # steps: + # - material: CP14GlassSheet + # amount: 2 + # doAfter: 2 + + - node: CP14WallWoodenBirch + entity: CP14WallWoodenBirch + edges: + - to: CP14WallFrameWoodenBirch + steps: + - tool: CP14Hammering + doAfter: 2 + completed: + - !type:SpawnPrototype + prototype: CP14BirchWoodenPlanks1 + amount: 2 + + #- node: WindowWooden + # entity: CP14WindowWooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_palisade.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_palisade.yml new file mode 100644 index 0000000000..8f2c542b25 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Structures/Walls/wall_wooden_palisade.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: CP14WallWoodenPalisade + start: start + graph: + - node: start + edges: + - to: CP14WallWoodenPalisade + completed: + - !type:SnapToGrid + steps: + - stackGroup: WoodenPlanks + amount: 4 + doAfter: 2 + - node: CP14WallWoodenPalisade + entity: CP14WallWoodenPalisade diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index 0b33eea948..b1d074d473 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -3,9 +3,9 @@ name: wooden wall description: Sturdy enough to cover you from threats or cold winds. id: CP14WoodenWall - graph: CP14WallWood + graph: CP14WallWooden startNode: start - targetNode: WallWooden + targetNode: CP14WallWooden category: construction-category-structures icon: sprite: _CP14/Structures/Walls/wooden_wall.rsi @@ -21,9 +21,9 @@ name: wooden birch wall description: Sturdy enough to cover you from threats or cold winds. id: CP14WoodenWallBirch - graph: CP14WallWood + graph: CP14WallWoodenBirch startNode: start - targetNode: WallWoodenBirch + targetNode: CP14WallWoodenBirch category: construction-category-structures icon: sprite: _CP14/Structures/Walls/wooden_wall_birch.rsi @@ -57,9 +57,9 @@ name: wooden window description: A wooden wall with a glass window in it. id: CP14WindowWooden - graph: CP14WallWood + graph: CP14WallWooden startNode: start - targetNode: WindowWooden + targetNode: CP14WindowWooden category: construction-category-structures icon: sprite: _CP14/Structures/Windows/wooden_window.rsi @@ -72,7 +72,7 @@ - type: construction crystallPunkAllowed: true - name: earth cliffs + name: earth wall description: A tall pile of dirt. Can a house be built from it? id: CP14WallDirt graph: CP14WallDirt @@ -95,7 +95,7 @@ id: CP14WallStonebrick graph: CP14WallStonebrick startNode: start - targetNode: WallStonebrick + targetNode: CP14WallStonebrick category: construction-category-structures icon: sprite: _CP14/Structures/Walls/bricks_stone_wall.rsi diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/left.png b/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/left.png deleted file mode 100644 index e15c8aeea7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/meta.json deleted file mode 100644 index ec2a722889..0000000000 --- a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "size": { - "x": 144, - "y": 128 - }, - "states": [ - { - "name": "left" - }, - { - "name": "right" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/right.png b/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/right.png deleted file mode 100644 index 2989bd9909..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Shuttle/wing_big.rsi/right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/left.png b/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/left.png deleted file mode 100644 index c8b3d7a55d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/meta.json deleted file mode 100644 index c926510c06..0000000000 --- a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "size": { - "x": 96, - "y": 80 - }, - "states": [ - { - "name": "left" - }, - { - "name": "right" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/right.png b/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/right.png deleted file mode 100644 index 2d739a5284..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Shuttle/wing_small.rsi/right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA0.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA0.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA1.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA1.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA2.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA2.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA3.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA3.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA4.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA4.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA5.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA6.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA6.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA7.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksA7.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksA7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB0.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB1.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB2.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB3.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB4.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB5.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB6.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/bricksB7.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/bricksB7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_wall.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/bricks_wall.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/full.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/full.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/full.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall0.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall0.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall1.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall1.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall2.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall2.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall3.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall3.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall4.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall4.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall5.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall5.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall6.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall6.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall6.png diff --git a/Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall7.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/cyan_wall.rsi/wall7.png rename to Resources/Textures/_CP14/Structures/Walls/OUTDATED/cyan_wall.rsi/wall7.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/crushed_low.png b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/crushed_low.png deleted file mode 100644 index ced0259f68..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/crushed_low.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/crushed_medium.png b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/frame.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/crushed_medium.png rename to Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/frame.png diff --git a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/meta.json index c709d9f7bb..9b251ba1d7 100644 --- a/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/bricks_stone_wall.rsi/meta.json @@ -11,10 +11,7 @@ "name": "full" }, { - "name": "crushed_medium" - }, - { - "name": "crushed_low" + "name": "frame" }, { "name": "stonebricks0", diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png deleted file mode 100644 index b168d176ae..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/meta.json deleted file mode 100644 index 0bed3cf247..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 64 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Discord) ", - "states": [ - { - "name": "wood0", - "directions": 4 - }, - { - "name": "wood1", - "directions": 4 - }, - { - "name": "wood2", - "directions": 4 - }, - { - "name": "wood3", - "directions": 4 - }, - { - "name": "wood4", - "directions": 4 - }, - { - "name": "wood5", - "directions": 4 - }, - { - "name": "wood6", - "directions": 4 - }, - { - "name": "wood7", - "directions": 4 - }, - { - "name": "full" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png deleted file mode 100644 index 690628172d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png deleted file mode 100644 index 81b48b283c..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png deleted file mode 100644 index 7f796c1b2a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png deleted file mode 100644 index aa09399d68..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood4.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood4.png deleted file mode 100644 index 487eb53c8b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood5.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood5.png deleted file mode 100644 index 261754dc43..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png deleted file mode 100644 index d88f28f761..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood7.png b/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood7.png deleted file mode 100644 index d5cbf40e2b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/cardboard_wall.rsi/wood7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/frame.png b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/frame.png new file mode 100644 index 0000000000..e18eef2d90 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/frame.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json index 9d72dff925..f491ac82e8 100644 --- a/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/marblebricks_stone_wall.rsi/meta.json @@ -7,6 +7,9 @@ "y": 64 }, "states": [ + { + "name": "frame" + }, { "name": "full" }, diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png deleted file mode 100644 index bc08c28406..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_low.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png deleted file mode 100644 index 843b1366d1..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/crushed_medium.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json deleted file mode 100644 index 274ab41a56..0000000000 --- a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 64 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd & Jaraten , modified by vladimir.s", - "states": [ - { - "name": "wooden" - }, - { - "name": "crushed_medium" - }, - { - "name": "crushed_low" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json index 544305558a..74883535a1 100644 --- a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/meta.json @@ -7,6 +7,9 @@ "license": "CC-BY-SA-3.0", "copyright": "Created by Skilets (Discord) ", "states": [ + { + "name": "full" + }, { "name": "skulls0", "directions": 4 @@ -38,73 +41,6 @@ { "name": "skulls7", "directions": 4 - }, - { - "name": "skullsA0", - "directions": 4 - }, - { - "name": "skullsA1", - "directions": 4 - }, - { - "name": "skullsA2", - "directions": 4 - }, - { - "name": "skullsA3", - "directions": 4 - }, - { - "name": "skullsA4", - "directions": 4 - }, - { - "name": "skullsA5", - "directions": 4 - }, - { - "name": "skullsA6", - "directions": 4 - }, - { - "name": "skullsA7", - "directions": 4 - }, - { - "name": "skullsB0", - "directions": 4 - }, - { - "name": "skullsB1", - "directions": 4 - }, - { - "name": "skullsB2", - "directions": 4 - }, - { - "name": "skullsB3", - "directions": 4 - }, - { - "name": "skullsB4", - "directions": 4 - }, - { - "name": "skullsB5", - "directions": 4 - }, - { - "name": "skullsB6", - "directions": 4 - }, - { - "name": "skullsB7", - "directions": 4 - }, - { - "name": "full" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA0.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA0.png deleted file mode 100644 index ccc41deb7e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA1.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA1.png deleted file mode 100644 index 8f65bf628d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA2.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA2.png deleted file mode 100644 index 7c726d1943..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA3.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA3.png deleted file mode 100644 index 44aa9f1e8f..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA4.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA4.png deleted file mode 100644 index 3915a2b19a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA5.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA5.png deleted file mode 100644 index 45be3dd398..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA6.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA6.png deleted file mode 100644 index 1dbb193600..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA7.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA7.png deleted file mode 100644 index c030a0cfd2..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsA7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB0.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB0.png deleted file mode 100644 index 2ffdfce627..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB0.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB1.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB1.png deleted file mode 100644 index d181f5cf25..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB2.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB2.png deleted file mode 100644 index 396bea0073..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB3.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB3.png deleted file mode 100644 index f8167eba80..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB4.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB4.png deleted file mode 100644 index 88e31c145a..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB5.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB5.png deleted file mode 100644 index 45be3dd398..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB5.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB6.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB6.png deleted file mode 100644 index 55907ee17e..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB6.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB7.png b/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB7.png deleted file mode 100644 index c030a0cfd2..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Walls/wall_of_skulls.rsi/skullsB7.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/frame.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Walls/wall_frame.rsi/wooden.png rename to Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/frame.png diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json index 76ce984102..6bb01f4bcf 100644 --- a/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/wooden_wall.rsi/meta.json @@ -41,6 +41,9 @@ }, { "name": "full" + }, + { + "name": "frame" } ] } diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/frame.png b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/frame.png new file mode 100644 index 0000000000..eeccdacee3 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/frame.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json index f032108316..a8542b9b71 100644 --- a/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/wooden_wall_birch.rsi/meta.json @@ -41,6 +41,9 @@ }, { "name": "full" + }, + { + "name": "frame" } ] } diff --git a/Resources/migration.yml b/Resources/migration.yml index 2214c5377b..452e757818 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -321,6 +321,15 @@ CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster CP14FenceIronGrilleGateDemiplaneCrystal: CP14FenceGateBigIronDemiplaneCrystal CP14FenceIronGrilleWindowStraight: CP14FenceWindowIron +#2025-21-04 +CP14WallBrownbrick: CP14WallMarbleBrick +CP14FrameWoodenCrushedMedium: CP14WallFrameWooden +CP14FrameWoodenCrushedLow: CP14WallFrameWooden +CP14WallStonebrickCrushedMedium: CP14WallFrameStonebrick +CP14WallStonebrickCrushedLow: CP14WallFrameStonebrick +CP14WallCyan: CP14WallStonebrick +CP14FrameWooden: CP14WallFrameWooden + # <---> CrystallEdge migration zone end