Skip to content

Commit

Permalink
Merge pull request #8 from xen-42/dev
Browse files Browse the repository at this point in the history
- Added achievements
- Added various fixes (thanks Trifid)
  • Loading branch information
xen-42 authored Jun 20, 2022
2 parents 38c1910 + 289d6d0 commit e0f1a61
Show file tree
Hide file tree
Showing 21 changed files with 128 additions and 113 deletions.
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "xen",
"name": "New Horizons Examples",
"uniqueName": "xen.NewHorizonsExamples",
"version": "0.13.0",
"version": "0.13.1",
"owmlVersion": "2.5.2",
"dependencies": [ "xen.NewHorizons" ]
}
7 changes: 4 additions & 3 deletions planets/DevilsMaw.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
"outerRadius" : 800,
"inclination" : 10,
"texture" : "planets/assets/accretion_disk.png",
"unlit" : true
"unlit" : true,
"fluidType": "plasma"
},
"Singularity" :
{
"Size" : 400,
"Type" : "BlackHole"
"size" : 400,
"type" : "blackHole"
},
"ShipLog" : {
"spriteFolder": "planets/ShipLogs/sprites",
Expand Down
4 changes: 2 additions & 2 deletions planets/Dialogue/ErnestosCousin.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<DialogueTree xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/dialogue_schema.xsd">
<NameField>Dead fish</NameField>
<NameField>dead fish</NameField>

<DialogueNode>
<Name></Name>
<EntryCondition>DEFAULT</EntryCondition>
<Dialogue>
<Page>I think this is Ernesto's cousin.</Page>
<Page>I think this was Ernesto's cousin.</Page>
</Dialogue>
<RevealFacts>
<FactID>EXAMPLES_COUSIN_FOUND</FactID>
Expand Down
12 changes: 6 additions & 6 deletions planets/ExistingPlanets/HourglassTwins/ashtwin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/body_schema.json",
"name" : "Ash Twin",
"childrenToDestroy" : ["SandSphere_Draining"],
"removeChildren" : ["SandSphere_Draining"],
"Base" :
{
"surfaceSize" : 150
Expand All @@ -19,10 +19,10 @@
{
"tornados" :
[
{"elevation" : 150, "height": 50, "width": 5},
{"elevation" : 150, "height": 50, "width": 5},
{"elevation" : 150, "height": 50, "width": 5},
{"elevation" : 150, "height": 50, "width": 5}
{"elevation" : 150, "height": 50},
{"elevation" : 150, "height": 50},
{"elevation" : 150, "height": 50},
{"elevation" : 150, "height": 50}
],
"reveal": [
{"radius":400, "reveals": ["EXAMPLES_LAVA_FOUND"]}
Expand All @@ -31,7 +31,7 @@
"Funnel" :
{
"target" : "Ember Twin",
"type" : "Lava",
"type" : "lava",
"curve":[
{"time":0,"value": 0},
{"time":1, "value":0},
Expand Down
2 changes: 1 addition & 1 deletion planets/ExistingPlanets/HourglassTwins/cavetwin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/body_schema.json",
"name" : "Ember Twin",
"childrenToDestroy" : ["SandSphere_Rising"],
"removeChildren" : ["SandSphere_Rising"],
"Base" :
{
"surfaceSize" : 150
Expand Down
4 changes: 2 additions & 2 deletions planets/ExistingPlanets/brittle_hollow.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/body_schema.json",
"name" : "BrittleHollow",
"Base" :{
"cloakRadius":2500
"Cloak": {
"radius": 2500
},
"Orbit": {
"semiMajorAxis" : 8800,
Expand Down
4 changes: 2 additions & 2 deletions planets/ExistingPlanets/giants_deep.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"inclination" : 5,
"longitudeOfAscendingNode" : 90,
"texture" : "planets/assets/default_rings.png",
"fluidType": "SAND"
"fluidType": "sand"
},
"Props" :
{
Expand All @@ -25,7 +25,7 @@
],
"reveal": [
{"radius":2500, "reveals": ["EXAMPLES_RINGS_FOUND", "EXAMPLES_RINGED_JEWEL_RUMOR"]},
{"radius":1000, "reveals": ["EXAMPLES_GIANTS_DEEP_ANGLERS"]}
{"radius":850, "reveals": ["EXAMPLES_GIANTS_DEEP_ANGLERS"]}
]
},
"ShipLog" : {
Expand Down
7 changes: 4 additions & 3 deletions planets/ExistingPlanets/timber_hearth.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,22 @@
"position": {"x": 18.0605, "y": -50.5836, "z": 185.0414},
"xmlFile" : "planets/Dialogue/Nomai.xml",
"pathToAnimController": "Sector_TH/Nomai_ANIM_SkyWatching_Idle(Clone)",
"lookAtRadius" : 5
"lookAtRadius" : 3
},
{
"position": {"x": 28.63121, "y": -46.67, "z": 185.68},
"xmlFile" : "planets/Dialogue/Geswaldo.xml"
},
{
"position": {"x": 23.9989, "y": -39.3724, "z": 186.4618},
"xmlFile" : "planets/Dialogue/Ernesto.xml"
"xmlFile" : "planets/Dialogue/Ernesto.xml",
"radius": 1.5
},
{
"position": {"x": 18.2946, "y": -40.5167, "z": 186.9321},
"xmlFile" : "planets/Dialogue/Shale.xml",
"pathToAnimController": "Sector_TH/Villager_HEA_Slate(Clone)/Villager_HEA_Slate_ANIM_LogSit",
"lookAtRadius" : 5
"lookAtRadius" : 3
}
],
"slideShows" :
Expand Down
29 changes: 14 additions & 15 deletions planets/LavaTwins/lava 1.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
"surfaceGravity" : 8,
"surfaceSize" : 100,
"hasMapMarker" : true,
"hasAmbientLight" : true,
"gravityFallOff": "linear",
"sphereOfInfluence": 1000
"ambientLight": 1,
"gravityFallOff": "linear"
},
"Orbit" :
{
Expand All @@ -25,21 +24,21 @@
{"time":5, "value": 0.8}
],
"tint" : {
"R" : 32,
"G" : 255,
"B" : 128,
"A" : 255
"r" : 32,
"g" : 255,
"b" : 128,
"a" : 255
}
},
"Funnel" :
{
"target" : "Lava 2",
"type" : "Lava",
"type" : "lava",
"tint" : {
"R" : 32,
"G" : 255,
"B" : 128,
"A" : 255
"r" : 32,
"g" : 255,
"b" : 128,
"a" : 255
},
"curve": [
{"time":0, "value": 0},
Expand All @@ -50,7 +49,7 @@
},
"ShipLog" : {
"spriteFolder": "planets/ShipLogs/sprites",
"MapMode" : {
"mapMode" : {
"revealedSprite": "planets/ShipLogs/sprites/lava_twin_map_mode.png",
"scale": 0.9,
"manualPosition": {
Expand All @@ -67,13 +66,13 @@
"volcanoes" : [
{
"position" : {"x": 105, "y": 0, "z": 0},
"lavaTint" : {"R" : 32, "G" : 255, "B" : 128, "A" : 255},
"lavaTint" : {"r" : 32, "g" : 255, "b" : 128, "a" : 255},
"minLaunchSpeed" : 35,
"maxLaunchSpeed" : 40
},
{
"position" : {"x": -105, "y": 0, "z": 0},
"lavaTint" : {"R" : 32, "G" : 255, "B" : 128, "A" : 255},
"lavaTint" : {"r" : 32, "g" : 255, "b" : 128, "a" : 255},
"minLaunchSpeed" : 35,
"maxLaunchSpeed" : 40
}
Expand Down
7 changes: 3 additions & 4 deletions planets/LavaTwins/lava 2.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
"surfaceGravity" : 8,
"surfaceSize" : 100,
"hasMapMarker" : true,
"hasAmbientLight" : true,
"gravityFallOff": "linear",
"sphereOfInfluence": 1000
"ambientLight": 1,
"gravityFallOff": "linear"
},
"Orbit" :
{
Expand All @@ -24,7 +23,7 @@
{"time":0, "value": 0.5},
{"time":5, "value":1}
],
"Tint" : {
"tint" : {
"r" : 32,
"g" : 255,
"b" : 128,
Expand Down
10 changes: 6 additions & 4 deletions planets/LavaTwins/lava focalpoint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
"name" : "Lava Twins",
"Base" :
{
"hasMapMarker" : true,
"sphereOfInfluence": 2000
"hasMapMarker" : true
},
"ReferenceFrame": {
"enabled": false
},
"Orbit" :
{
Expand All @@ -13,7 +15,7 @@
},
"FocalPoint" :
{
"Primary" : "Lava 1",
"Secondary" : "Lava 2"
"primary" : "Lava 1",
"secondary" : "Lava 2"
}
}
10 changes: 6 additions & 4 deletions planets/LureTwins/focalpoint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/body_schema.json",
"Base" :
{
"hasMapMarker" : true,
"sphereOfInfluence": 500
"hasMapMarker" : true
},
"ReferenceFrame": {
"enabled": false
},
"Orbit" :
{
Expand All @@ -15,7 +17,7 @@
},
"FocalPoint" :
{
"Primary" : "Terra Lure",
"Secondary" : "Luna Lure"
"primary" : "Terra Lure",
"secondary" : "Luna Lure"
}
}
6 changes: 3 additions & 3 deletions planets/LureTwins/luna_angler.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"surfaceSize" : 20,
"hasMapMarker" : true,
"gravityFallOff" : "linear",
"hasAmbientLight": true
"ambientLight": 1.4
},
"Atmosphere" :
{
"size" : 30,
"hasOxygen" : true,
"hasAtmosphere" : true,
"useAtmosphereShader": true,
"atmosphereTint" :
{
"r" : 128,
Expand All @@ -30,7 +30,7 @@
"isMoon" : true,
"tint": {"r": 26, "g": 26, "b": 26, "a": 255},
"isTidallyLocked": true,
"AlignmentAxis" : {"x": -1, "y": 0, "z": 0}
"alignmentAxis" : {"x": -1, "y": 0, "z": 0}
},
"HeightMap": {
"heightMap": "planets/assets/luna_heightmap.png",
Expand Down
15 changes: 7 additions & 8 deletions planets/LureTwins/terra_angler.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,31 @@
"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/body_schema.json",
"Base" :
{
"sphereOfInfluence" : 500,
"surfaceGravity" : 6,
"surfaceSize" : 30,
"hasMapMarker" : true,
"gravityFallOff" : "linear",
"hasAmbientLight": true
"ambientLight": 1.4
},
"Atmosphere" :
{
"size" : 50,
"hasOxygen" : true,
"hasAtmosphere" : true,
"useAtmosphereShader": true,
"atmosphereTint" :
{
"R" : 128,
"G" : 164,
"B" : 255,
"A" : 255
"r" : 128,
"g" : 164,
"b" : 255,
"a" : 255
}
},
"Orbit" :
{
"semiMajorAxis" : 0,
"inclination" : 4,
"primaryBody" : "Lures",
"tint": {"R": 78, "G": 78, "B": 52, "A": 255},
"tint": {"r": 78, "g": 78, "b": 52, "a": 255},
"isTidallyLocked": true,
"isMoon": true,
"alignmentAxis" : {"x": 0, "y": 0, "z": -1}
Expand Down
4 changes: 2 additions & 2 deletions planets/OtherStar/comet.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"surfaceGravity" : 6,
"surfaceSize" : 100,
"hasMapMarker" : true,
"hasAmbientLight" : true,
"ambientLight": 0.6,
"hasCometTail" : true
},
"Orbit" :
Expand Down Expand Up @@ -34,7 +34,7 @@
"fogDensity": 0.1,
"fogSize": 120,
"hasSnow" : true,
"hasAtmosphere" : true,
"useAtmosphereShader": true,
"atmosphereTint" :
{
"r" : 65,
Expand Down
9 changes: 4 additions & 5 deletions planets/OtherStar/star.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@
"Star" :
{
"size" : 200,
"tint" : { "R" : 5, "G" : 38, "B" : 255, "A" : 255 },
"giantTint" : { "R" : 255, "G" : 38, "B" : 255, "A" : 255 },
"solarFlareTint" : {"R" : 5, "G" : 38, "B" : 255, "A" : 255 },
"tint" : { "r" : 5, "g" : 38, "b" : 255, "a" : 255 },
"endTint" : { "r" : 255, "g" : 38, "b" : 255, "a" : 255 },
"solarLuminosity" : 0.6,
"lifeSpan": 0.5,
"curve":[
{"time": 0, "value":1},
{"time": 0.5, "value":2}
{"time": 21.5, "value":1},
{"time": 22, "value":2}
]
},
"ShipLog" : {
Expand Down
8 changes: 4 additions & 4 deletions planets/Quantum/Quantum - 2.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"size" : 250,
"fogTint":
{
"R" : 255,
"G" : 125,
"B" : 50,
"A" : 255
"r" : 255,
"g" : 125,
"b" : 50,
"a" : 255
},
"fogSize": 250,
"fogDensity":0.1
Expand Down
Loading

0 comments on commit e0f1a61

Please sign in to comment.