Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/_Starlight/tiles/tiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ tiles-rusty-metal-floor = rusty metal floor
tiles-steel-grate-floor = steel grate floor
tiles-tech-greeb-floor = tech maints greeb floor

# Grass
tiles-mowed-dark-astro-grass = mowed dark astro-grass
tiles-mowed-light-astro-grass = mowed light astro-grass
tiles-mowed-jungle-astro-grass = mowed jungle astro-grass
tiles-grass-classic-planet-floor = classic grass
tiles-planet-grass-classic-floor-mowed = mowed classic astro-grass
tiles-planet-grass-classic-floor = classic astro-grass

Comment thread
coderabbitai[bot] marked this conversation as resolved.
# Developer tiles for mapping
tiles-floor-dev-floor = [dev] floor
tiles-floor-dev-door = [dev] door
Expand Down
15 changes: 13 additions & 2 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/flora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,21 @@
- type: RandomSpawner
prototypes:
- FloraTreeLarge
- FloraTreeConifer
- FloraTreeSnow
# - FloraTreeConifer #SL no snow
# - FloraTreeSnow #SL no snow
- FloraTree
#Starlight Start
- FloraBirchTreeLargeSL
- FloraBirchTreeMediumSL
- FloraBirchTreeSmallSL
- FloraTreeConiferMediumSL
- FloraTreeConiferBigSL
- FloraTreeConiferSmallSL
- FloraDeadTreeSL
- FloraDeadTreeSmallSL
#Starlight End
chance: 0.95
rarePrototypes:
- ShadowTree
- FloraTreeVampireSL #SL Edit
rareChance: 0.05
46 changes: 26 additions & 20 deletions Resources/Prototypes/Entities/Objects/Decoration/flora.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- type: entity
id: BaseRock
name: boulder
Expand Down Expand Up @@ -42,7 +42,7 @@
- type: Clickable
- type: Sprite
noRot: true
sprite: Objects/Decoration/Flora/flora_trees.rsi
sprite: _CP14/Objects/Decoration/Flora/flora_trees.rsi #SL Edit
drawdepth: Overdoors
offset: 0,0.9
- type: Physics
Expand Down Expand Up @@ -99,7 +99,7 @@
abstract: true
components:
- type: Sprite
sprite: Objects/Decoration/Flora/flora_treessnow.rsi
sprite: _CP14/Objects/Decoration/Flora/tree_snow.rsi #SL Edit
offset: 0,0.7
- type: Fixtures
fixtures:
Expand All @@ -117,7 +117,7 @@
abstract: true
components:
- type: Sprite
sprite: Objects/Decoration/Flora/flora_treeslarge.rsi
sprite: _CP14/Objects/Decoration/Flora/flora_treeslarge.rsi #SL Edit
offset: 0,1.55
- type: Fixtures
fixtures:
Expand All @@ -135,7 +135,7 @@
abstract: true
components:
- type: Sprite
sprite: Objects/Decoration/Flora/flora_treesconifer.rsi
sprite: _CP14/Objects/Decoration/Flora/tree_spruce_medium.rsi #SL Edit
offset: 0,1.15
- type: Fixtures
fixtures:
Expand Down Expand Up @@ -239,24 +239,27 @@
components:
- type: Sprite
layers:
- state: treesnow01
- state: tree01 #SL Edit
map: ["random"]
- type: RandomSprite
available:
- random:
treesnow01: ""
treesnow02: ""
treesnow03: ""
treesnow04: ""
treesnow05: ""
treesnow06: ""
#SL Start
tree01: ""
tree02: ""
tree03: ""
tree04: ""
tree05: ""
tree06: ""
#SL End

- type: entity
parent: BaseTreeSnow
parent: BaseTreeConiferOld #SL Edit
id: FloraTreeStump
name: tree stump
components:
- type: Sprite
sprite: Objects/Decoration/Flora/flora_treessnow.rsi #SL Edit
state: treestump

- type: entity
Expand All @@ -279,31 +282,34 @@
treelarge06: ""

- type: entity
parent: BaseTreeConifer
parent: BaseTreeConiferSnow #SL Edit
id: FloraTreeConifer
name: snowy conifer
components:
- type: Sprite
layers:
- state: treeconifer01
- state: tree01 #SL Edit
map: ["random"]
- type: RandomSprite
available:
- random:
treeconifer01: ""
treeconifer02: ""
treeconifer03: ""
# Starlight Start
tree01: ""
tree02: ""
tree03: ""
tree04: ""
# Starlight End

- type: entity
parent: BaseTreeConifer
parent: BaseTreeConiferOld #SL
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
id: FloraTreeChristmas01
name: christmas tree
components:
- type: Sprite
state: treechristmas01

- type: entity
parent: BaseTreeConifer
parent: BaseTreeConiferOld #SL
id: FloraTreeChristmas02
suffix: Safe Presents
name: christmas tree
Expand Down Expand Up @@ -351,7 +357,7 @@
orGroup: present

- type: entity
parent: BaseTreeConifer
parent: BaseTreeConiferOld #SL
id: FloraTreeStumpConifer
name: tree stump
components:
Expand Down
64 changes: 45 additions & 19 deletions Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- type: tile
id: FloorSteel
name: tiles-steel-floor
Expand Down Expand Up @@ -1462,7 +1462,17 @@
- type: tile
id: FloorGrass
name: tiles-planet-grass-floor
sprite: /Textures/Tiles/grass.png
sprite: /Textures/_CP14/Tiles/Grass/grass.png #SL Edit
#SL Start
variants: 6
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
#SL End
baseTurf: FloorDirt
isSubfloor: true
footstepSounds:
Expand All @@ -1474,7 +1484,17 @@
- type: tile
id: FloorGrassJungle
name: tiles-jungle-grass-floor
sprite: /Textures/Tiles/grassjungle.png
sprite: /Textures/_CP14/Tiles/GrassTall/grass.png #SL Edit
#SL Start
variants: 6
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
#SL End
baseTurf: FloorDirt
isSubfloor: true
footstepSounds:
Expand All @@ -1486,13 +1506,15 @@
- type: tile
id: FloorGrassDark
name: tiles-dark-grass-floor
sprite: /Textures/Tiles/grassdark.png
variants: 4
sprite: /Textures/_CP14/Tiles/GrassDark/grass.png #SL Edit
variants: 6 #SL
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0 #SL
- 1.0 #SL
baseTurf: FloorDirt
isSubfloor: true
footstepSounds:
Expand All @@ -1503,13 +1525,15 @@
- type: tile
id: FloorGrassLight
name: tiles-light-grass-floor
sprite: /Textures/Tiles/grasslight.png
variants: 4
sprite: /Textures/_CP14/Tiles/GrassLight/grass.png #SL Edit
variants: 6 #SL
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0 #SL
- 1.0 #SL
baseTurf: FloorDirt
isSubfloor: true
footstepSounds:
Expand Down Expand Up @@ -1956,23 +1980,25 @@
- type: tile
id: FloorAstroGrass
name: tiles-astro-grass
sprite: /Textures/Tiles/Planet/Grass/grass.png
variants: 4
sprite: /Textures/_CP14/Tiles/Grass/grass.png #SL Edit
variants: 6 #SL
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0 #SL
- 1.0 #SL
edgeSpritePriority: 1
edgeSprites:
SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png
SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png
South: /Textures/Tiles/Planet/Grass/double_edge.png
East: /Textures/Tiles/Planet/Grass/double_edge.png
North: /Textures/Tiles/Planet/Grass/double_edge.png
West: /Textures/Tiles/Planet/Grass/double_edge.png
SouthEast: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
NorthEast: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
NorthWest: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
SouthWest: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
South: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
East: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
North: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
West: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Cutting ]
Expand All @@ -1993,7 +2019,7 @@

- type: tile
id: FloorJungleAstroGrass
name: tiles-jungle-astro-grass
name: tiles-mowed-jungle-astro-grass #sl edit
parent: FloorGrassJungle
baseTurf: Plating
isSubfloor: false
Expand All @@ -2004,7 +2030,7 @@
- type: tile
parent: FloorGrassDark
id: FloorDarkAstroGrass
name: tiles-dark-astro-grass
name: tiles-mowed-dark-astro-grass #sl edit
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Cutting ]
Expand All @@ -2014,7 +2040,7 @@
- type: tile
parent: FloorGrassLight
id: FloorLightAstroGrass
name: tiles-light-astro-grass
name: tiles-mowed-light-astro-grass #sl edit
baseTurf: Plating
isSubfloor: false
deconstructTools: [ Cutting ]
Expand Down
22 changes: 12 additions & 10 deletions Resources/Prototypes/Tiles/planet.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- type: tile
id: FloorPlanetDirt
name: tiles-dirt-planet-floor
Expand Down Expand Up @@ -58,23 +58,25 @@
- type: tile
id: FloorPlanetGrass
name: tiles-grass-planet-floor
sprite: /Textures/Tiles/Planet/Grass/grass.png
variants: 4
sprite: /Textures/_CP14/Tiles/Grass/grass.png #SL Edit
variants: 6 #SL
placementVariants:
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0 #SL
- 1.0 #SL
edgeSpritePriority: 1
edgeSprites:
SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png
NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png
NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png
SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png
South: /Textures/Tiles/Planet/Grass/double_edge.png
East: /Textures/Tiles/Planet/Grass/double_edge.png
North: /Textures/Tiles/Planet/Grass/double_edge.png
West: /Textures/Tiles/Planet/Grass/double_edge.png
SouthEast: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
NorthEast: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
NorthWest: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
SouthWest: /Textures/_CP14/Tiles/Grass/single_edge.png #SL Edit
South: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
East: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
North: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
West: /Textures/_CP14/Tiles/Grass/double_edge.png #SL Edit
baseTurf: FloorPlanetDirt
isSubfloor: true
footstepSounds:
Expand Down
Loading
Loading