Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Light naming #19

Merged
merged 3 commits into from
Dec 22, 2024
Merged

Light naming #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba0905
-enforce crlf conversion on checkout
Sebastian-81 Dec 22, 2024
48b29b8
-added prefix PL to lights to make their name unique
Sebastian-81 Dec 22, 2024
7821394
added missing ObjectBounds
Sebastian-81 Dec 22, 2024
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
1 change: 0 additions & 1 deletion .gitattribute
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# convert all text files to CRLF on checkout, xmls won't be converted they are utf-16 encoded and thus need to be treated as binary
* text=auto eol=crlf
19 changes: 0 additions & 19 deletions Spriggit/Placed Light/Lights/Blue - 000802_Placed Light.esm.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...BluePotion - 000F4F_Placed Light.esm.json → ...BluePotion - 000F4F_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000F4F:Placed Light.esm",
"EditorID": "BluePotion",
"EditorID": "PL_BluePotion",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
2 changes: 1 addition & 1 deletion ...hts/Candle - 000800_Placed Light.esm.json → .../PL_Candle - 000800_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000800:Placed Light.esm",
"EditorID": "Candle",
"EditorID": "PL_Candle",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
2 changes: 1 addition & 1 deletion ...reenPotion - 000F50_Placed Light.esm.json → ...reenPotion - 000F50_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000F50:Placed Light.esm",
"EditorID": "GreenPotion",
"EditorID": "PL_GreenPotion",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
2 changes: 1 addition & 1 deletion ...hts/Orange - 000001_Placed Light.esm.json → .../PL_Orange - 000001_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000001:Placed Light.esm",
"EditorID": "Orange",
"EditorID": "PL_Orange",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
2 changes: 1 addition & 1 deletion .../RedPotion - 000F51_Placed Light.esm.json → ..._RedPotion - 000F51_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000F51:Placed Light.esm",
"EditorID": "RedPotion",
"EditorID": "PL_RedPotion",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
6 changes: 3 additions & 3 deletions ...ghts/Green - 000803_Placed Light.esm.json → ...s/PL_White - 000000_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"FormKey": "000803:Placed Light.esm",
"EditorID": "Green",
"FormKey": "000000:Placed Light.esm",
"EditorID": "PL_White",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
},
"Time": -1,
"Radius": 256,
"Color": "#0000FF00",
"Color": "#00FFFFFF",
"Flags": [
"Dynamic"
],
Expand Down
2 changes: 1 addition & 1 deletion ...hts/Yellow - 000002_Placed Light.esm.json → .../PL_Yellow - 000002_Placed Light.esm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FormKey": "000002:Placed Light.esm",
"EditorID": "Yellow",
"EditorID": "PL_Yellow",
"ObjectBounds": {
"First": "-38, -40, -74",
"Second": "38, 40, 48"
Expand Down
19 changes: 0 additions & 19 deletions Spriggit/Placed Light/Lights/Pink - 000805_Placed Light.esm.json
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions Spriggit/Placed Light/Lights/Purple - 000804_Placed Light.esm.json
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions Spriggit/Placed Light/Lights/Red - 000801_Placed Light.esm.json
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions package/LightPlacer/Placed Light/Placed Light - Apocrypha.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"points": [[0.0, 0.0, 0.0]],
"data": {
"light": "BluePotion",
"light": "PL_BluePotion",
"radius": 256.0,
"fade": 1.0
}
Expand All @@ -34,7 +34,7 @@
{
"points": [[0.0, 0.0, 0.0]],
"data": {
"light": "BluePotion",
"light": "PL_BluePotion",
"radius": 256.0,
"fade": 1.0
}
Expand All @@ -49,7 +49,7 @@
{
"nodes": ["Seed01:18"],
"data": {
"light": "GreenPotion",
"light": "PL_GreenPotion",
"radius": 256.0,
"fade": 1.0
}
Expand All @@ -62,7 +62,7 @@
{
"nodes": ["ILight01:17"],
"data": {
"light": "Yellow",
"light": "PL_Yellow",
"radius": 512.0,
"fade": 1.0
}
Expand All @@ -78,7 +78,7 @@
{
"nodes": ["Post01:18"],
"data": {
"light": "Yellow",
"light": "PL_Yellow",
"radius": 256.0,
"fade": 1.0
}
Expand Down Expand Up @@ -128,7 +128,7 @@
"Collision11:0"
],
"data": {
"light": "GreenPotion",
"light": "PL_GreenPotion",
"radius": 128.0,
"fade": 1.0
}
Expand Down
12 changes: 6 additions & 6 deletions package/LightPlacer/Placed Light/Placed Light - Candles - Timer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"clutter\\shrines\\shrinebase.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 1.0,
"conditions": ["Self IsInInterior NONE NONE == 1 AND"]
Expand All @@ -48,7 +48,7 @@
"clutter\\candles\\candlehornfloor01.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 256.0,
"fade": 1.0,
"conditions": ["Self IsInInterior NONE NONE == 1 AND"]
Expand Down Expand Up @@ -153,7 +153,7 @@
"clutter\\silver\\SilverCandleStick03_J.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 0.8,
"conditions": ["Self IsInInterior NONE NONE == 1 AND"]
Expand Down Expand Up @@ -190,7 +190,7 @@
"clutter\\sovngarde\\sovcandlestick03static.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 0.6,
"flags": "RandomAnimStart",
Expand Down Expand Up @@ -247,7 +247,7 @@
"clutter\\candles\\candlehornfloor01.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 256.0,
"fade": 0.8,
"flags": "RandomAnimStart",
Expand Down Expand Up @@ -390,7 +390,7 @@
"clutter\\silver\\SilverCandleStick03_J.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 0.8,
"flags": "RandomAnimStart",
Expand Down
6 changes: 3 additions & 3 deletions package/LightPlacer/Placed Light/Placed Light - Candles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"clutter\\shrines\\shrinebase.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 1.0
}
Expand All @@ -47,7 +47,7 @@
"clutter\\candles\\candlehornfloor01.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 256.0,
"fade": 1.0
}
Expand Down Expand Up @@ -151,7 +151,7 @@
"clutter\\silver\\SilverCandleStick03_J.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 64.0,
"fade": 1.0
}
Expand Down
12 changes: 6 additions & 6 deletions package/LightPlacer/Placed Light/Placed Light - Chandeliers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 384.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand All @@ -32,7 +32,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 256.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand All @@ -56,7 +56,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 288.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand All @@ -80,7 +80,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 288.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand All @@ -104,7 +104,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 256.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand All @@ -125,7 +125,7 @@
"clutter\\candles\\candlehornchandelier02.nif"
],
"data": {
"light": "Candle",
"light": "PL_Candle",
"radius": 304.0,
"fade": 1.0,
"flags": "PortalStrict",
Expand Down
Loading
Loading