Skip to content

Commit babc8f0

Browse files
Spaghetti-bitSpaghetti-bit
committed
WIP changes
1 parent 7a5a55d commit babc8f0

10 files changed

Lines changed: 112 additions & 86 deletions

File tree

‎Resources/Locale/en-US/_FarHorizons/markings/protogen_markings.ftl‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -170,27 +170,13 @@ marking-ProtoCycloriteMediumArmor-medium = Standard Protogen-Cyclorite Cyberneti
170170
171171
marking-ProtoAvaliVisor = Avali Visor
172172
marking-ProtoAvaliVisor-visor = Avali Visor
173-
marking-ProtoAvaliVisorLightless = Avali Visor w/o Lights
174-
marking-ProtoAvaliVisorLightless-lightless = Avali Visor w/o Lights
175-
marking-ProtoAvaliVisorColorable = Avali Visor w/ Colorable Screen
176-
marking-ProtoAvaliVisorColorable-colorable = Avali Visor w/ Colorable Screen
177173
marking-ProtoAvaliLEDFace = Default Avali LEDs
178174
marking-ProtoAvaliLEDFace-face = Default Avali LEDs
179-
marking-ProtoAvaliLEDFaceSquare = Square Avali LEDs
180-
marking-ProtoAvaliLEDFaceSquare-square = Square Avali LEDs
181-
marking-ProtoAvaliLEDFaceCircular = Circular Avali LEDs
182-
marking-ProtoAvaliLEDFaceCircular-circular = Circular Avali LEDs
183-
marking-ProtoAvaliLEDFaceDiagonal = Diagonal Avali LEDs
184-
marking-ProtoAvaliLEDFaceDiagonal-diagonal = Diagonal Avali LEDs
185-
marking-ProtoAvaliLEDFaceStraight = Straight Avali LEDs
186-
marking-ProtoAvaliLEDFaceStraight-straight = Straight Avali LEDs
187175
marking-ProtoAvaliLights = Circular LEDs
188176
marking-ProtoAvaliLights-body = Circular LEDs
189177
marking-ProtoAvaliWings = Hardlight Avali Wings
190178
marking-ProtoAvaliWings-wings = Hardlight Avali Wings
191179
192-
marking-ProtoAvaliLightArmor = Light Protogen-Avali Cybernetics
193-
marking-ProtoAvaliLightArmor-light = Light Protogen-Avali Cybernetics
194180
marking-ProtoAvaliMediumArmor = Standard Protogen-Avali Cybernetics
195181
marking-ProtoAvaliMediumArmor-medium = Standard Protogen-Avali Cybernetics
196182
@@ -204,3 +190,19 @@ marking-ProtoLagomorphVisor = Lagomorph Visor
204190
marking-ProtoLagomorphVisor-visor = Lagomorph Visor
205191
marking-ProtoLagomorphLEDFace = Default Lagomorph LEDs
206192
marking-ProtoLagomorphLEDFace-face = Default Lagomorph LEDs
193+
194+
# Starlight
195+
marking-ProtoAvaliLightArmor = Light Protogen-Avali Cybernetics
196+
marking-ProtoAvaliLightArmor-light = Light Protogen-Avali Cybernetics
197+
marking-ProtoAvaliLEDFaceSquare = Square Avali LEDs
198+
marking-ProtoAvaliLEDFaceSquare-square = Square Avali LEDs
199+
marking-ProtoAvaliLEDFaceCircular = Circular Avali LEDs
200+
marking-ProtoAvaliLEDFaceCircular-circular = Circular Avali LEDs
201+
marking-ProtoAvaliLEDFaceDiagonal = Diagonal Avali LEDs
202+
marking-ProtoAvaliLEDFaceDiagonal-diagonal = Diagonal Avali LEDs
203+
marking-ProtoAvaliLEDFaceStraight = Straight Avali LEDs
204+
marking-ProtoAvaliLEDFaceStraight-straight = Straight Avali LEDs
205+
marking-ProtoAvaliVisorLightless = Avali Visor w/o Lights
206+
marking-ProtoAvaliVisorLightless-lightless = Avali Visor w/o Lights
207+
marking-ProtoAvaliVisorColorable = Avali Visor w/ Colorable Screen
208+
marking-ProtoAvaliVisorColorable-colorable = Avali Visor w/ Colorable Screen

‎Resources/Prototypes/_FarHorizons/Entities/Mobs/Customization/protogen.yml‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -689,25 +689,6 @@
689689
- sprite: _FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi
690690
state: visor
691691

692-
#Begin Starlight
693-
- type: marking
694-
id: ProtoAvaliVisorLightless
695-
bodyPart: FaceCover
696-
markingCategory: FaceCover
697-
speciesRestriction: [ProtoAvali]
698-
sprites:
699-
- sprite: _FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi
700-
state: visorlightless
701-
702-
- type: marking
703-
id: ProtoAvaliVisorColorable
704-
bodyPart: FaceCover
705-
markingCategory: FaceCover
706-
speciesRestriction: [ProtoAvali]
707-
sprites:
708-
- sprite: _FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi
709-
state: visorcolorable
710-
#end Starlight
711692
- type: marking
712693
id: ProtoAvaliLEDFace
713694
bodyPart: FaceCoverCover
@@ -717,44 +698,6 @@
717698
- sprite: _FarHorizons/Mobs/Customization/proto-avali/led_shapes_face.rsi
718699
state: face
719700

720-
#Begin Starlight
721-
- type: marking
722-
id: ProtoAvaliLEDFaceCircular
723-
bodyPart: FaceCoverCover
724-
markingCategory: FaceCoverCover
725-
speciesRestriction: [ProtoAvali]
726-
sprites:
727-
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
728-
state: circular
729-
730-
- type: marking
731-
id: ProtoAvaliLEDFaceDiagonal
732-
bodyPart: FaceCoverCover
733-
markingCategory: FaceCoverCover
734-
speciesRestriction: [ProtoAvali]
735-
sprites:
736-
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
737-
state: diagonal
738-
739-
- type: marking
740-
id: ProtoAvaliLEDFaceSquare
741-
bodyPart: FaceCoverCover
742-
markingCategory: FaceCoverCover
743-
speciesRestriction: [ProtoAvali]
744-
sprites:
745-
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
746-
state: square
747-
748-
- type: marking
749-
id: ProtoAvaliLEDFaceStraight
750-
bodyPart: FaceCoverCover
751-
markingCategory: FaceCoverCover
752-
speciesRestriction: [ProtoAvali]
753-
sprites:
754-
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
755-
state: straight
756-
#end Starlight
757-
758701
- type: marking
759702
id: ProtoAvaliLights
760703
bodyPart: BodyCoverCover

‎Resources/Prototypes/_Starlight/Entities/Mobs/Customization/Marking/ProtoAvali/protoavali.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#Armors
2+
- type: marking
3+
id: ProtoAvaliLightArmor
4+
bodyPart: BodyCover
5+
markingCategory: BodyCover
6+
speciesRestriction: [ProtoAvali]
7+
sprites:
8+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/body_armor.rsi
9+
state: light
10+
11+
#Visors
12+
- type: marking
13+
id: ProtoAvaliVisorLightless
14+
bodyPart: FaceCover
15+
markingCategory: FaceCover
16+
speciesRestriction: [ProtoAvali]
17+
sprites:
18+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/visor_shapes.rsi
19+
state: visorlightless
20+
21+
- type: marking
22+
id: ProtoAvaliVisorColorable
23+
bodyPart: FaceCover
24+
markingCategory: FaceCover
25+
speciesRestriction: [ProtoAvali]
26+
sprites:
27+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/visor_shapes.rsi
28+
state: visorcolorable
29+
30+
#LED Face Shapes
31+
- type: marking
32+
id: ProtoAvaliLEDFaceCircular
33+
bodyPart: FaceCoverCover
34+
markingCategory: FaceCoverCover
35+
speciesRestriction: [ProtoAvali]
36+
sprites:
37+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
38+
state: circular
39+
40+
- type: marking
41+
id: ProtoAvaliLEDFaceDiagonal
42+
bodyPart: FaceCoverCover
43+
markingCategory: FaceCoverCover
44+
speciesRestriction: [ProtoAvali]
45+
sprites:
46+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
47+
state: diagonal
48+
49+
- type: marking
50+
id: ProtoAvaliLEDFaceSquare
51+
bodyPart: FaceCoverCover
52+
markingCategory: FaceCoverCover
53+
speciesRestriction: [ProtoAvali]
54+
sprites:
55+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
56+
state: square
57+
58+
- type: marking
59+
id: ProtoAvaliLEDFaceStraight
60+
bodyPart: FaceCoverCover
61+
markingCategory: FaceCoverCover
62+
speciesRestriction: [ProtoAvali]
63+
sprites:
64+
- sprite: _Starlight/Mobs/Customization/Protogen/proto-avali/led_shapes_face.rsi
65+
state: straight

‎Resources/Textures/_FarHorizons/Mobs/Customization/proto-avali/body_armor.rsi/meta.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
{
88
"name": "medium",
99
"directions": 4
10-
},
11-
{
12-
"name": "light",
13-
"directions": 4,
14-
"copyright": "Based off of Killer Tamashi's (Discord) work, edited by Spaghetti-Bit"
1510
}
1611
]
1712
}

‎Resources/Textures/_FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi/meta.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
"name": "visor",
99
"directions": 4,
1010
"copyright": "Killer Tamashi's (discord) work, edited by Spaghetti-Bit"
11-
},
12-
{
13-
"name": "visorlightless",
14-
"directions": 4,
15-
"copyright": "Based off Killer Tamashi's (discord) work, edited by Spaghetti-Bit"
16-
},
17-
{
18-
"name": "visorcolorable",
19-
"directions": 4,
20-
"copyright": "Based off Killer Tamashi's (discord) work, edited by Spaghetti-Bit"
2111
}
2212
]
2313
}

Resources/Textures/_FarHorizons/Mobs/Customization/proto-avali/body_armor.rsi/light.png renamed to Resources/Textures/_Starlight/Mobs/Customization/Protogen/proto-avali/body_armor.rsi/light.png

File renamed without changes.

‎Resources/Textures/_Starlight/Mobs/Customization/Protogen/proto-avali/body_armor.rsi/meta.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-4.0",
4+
"copyright": "By Killer Tamashi (Discord)",
5+
"size": {"x": 32, "y": 32},
6+
"states": [
7+
{
8+
"name": "light",
9+
"directions": 4,
10+
"copyright": "Based off of Killer Tamashi's (Discord) work, edited by Spaghetti-Bit"
11+
}
12+
]
13+
}

‎Resources/Textures/_Starlight/Mobs/Customization/Protogen/proto-avali/visor_shapes.rsi/meta.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-4.0",
4+
"copyright": "By Killer Tamashi (Discord)",
5+
"size": {"x": 32, "y": 32},
6+
"states": [
7+
{
8+
"name": "visorlightless",
9+
"directions": 4,
10+
"copyright": "Based off Killer Tamashi's (discord) work, edited by Spaghetti-Bit"
11+
},
12+
{
13+
"name": "visorcolorable",
14+
"directions": 4,
15+
"copyright": "Based off Killer Tamashi's (discord) work, edited by Spaghetti-Bit"
16+
}
17+
]
18+
}

Resources/Textures/_FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi/visorcolorable.png renamed to Resources/Textures/_Starlight/Mobs/Customization/Protogen/proto-avali/visor_shapes.rsi/visorcolorable.png

File renamed without changes.

Resources/Textures/_FarHorizons/Mobs/Customization/proto-avali/visor_shapes.rsi/visorlightless.png renamed to Resources/Textures/_Starlight/Mobs/Customization/Protogen/proto-avali/visor_shapes.rsi/visorlightless.png

File renamed without changes.

0 commit comments

Comments
 (0)