Merge pull request #7 from xen-42/dev

Achievements
Outer-Wilds-New-Horizons · Jun 20, 2022 · 38c1910 · 38c1910
2 parents 91fbfb4 + 5c397cb
commit 38c1910
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 37 deletions.
diff --git a/addon-manifest.json b/addon-manifest.json
@@ -0,0 +1,19 @@
+{
+    "achievements" : [
+        {
+            "ID" : "EXAMPLES_SIGNAL",
+            "secret" : false,
+            "signalIDs" : ["Lure Distress Signal"]
+        },
+        {
+            "ID" : "EXAMPLES_DIALOGUE",
+            "secret" : false,
+            "conditionIDs" : ["EXAMPLES_INSULT"]
+        },
+        {
+            "ID" : "EXAMPLES_FACTS",
+            "secret" : false,
+            "factIDs" : ["EXAMPLES_GIANTS_DEEP_ANGLERS"]
+        }
+    ]
+}
diff --git a/icons/EXAMPLES_DIALOGUE.png b/icons/EXAMPLES_DIALOGUE.png
diff --git a/icons/EXAMPLES_FACTS.png b/icons/EXAMPLES_FACTS.png
diff --git a/icons/EXAMPLES_SIGNAL.png b/icons/EXAMPLES_SIGNAL.png
diff --git a/icons/New Horizons Examples.png b/icons/New Horizons Examples.png
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "author": "xen",
   "name": "New Horizons Examples",
   "uniqueName": "xen.NewHorizonsExamples",
-  "version": "0.12.2",
-  "owmlVersion": "2.1.0",
+  "version": "0.13.0",
+  "owmlVersion": "2.5.2",
   "dependencies": [ "xen.NewHorizons" ]
 }
diff --git a/planets/Dialogue/Ernesto.xml b/planets/Dialogue/Ernesto.xml
@@ -7,10 +7,7 @@
 		<Dialogue>
 			<Page>Hey it's me Ernesto the magic talking anglerfish.</Page>
 		</Dialogue>
-		<RevealFacts>
-			<FactID>EXAMPLES_ERNESTO</FactID>
-		</RevealFacts>
-
+
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>Wow you can talk?</Text>
@@ -29,6 +26,10 @@
 				<DialogueTarget>4</DialogueTarget>
 			</DialogueOption>
 		</DialogueOptionsList>
+
+		<RevealFacts>
+			<FactID>EXAMPLES_ERNESTO</FactID>
+		</RevealFacts>
 	</DialogueNode>
 
 	<DialogueNode>
@@ -63,15 +64,17 @@
 		<Dialogue>
 			<Page>Me and Geswaldo were visiting my cousin on Wetrock, I don't know about the other two. I don't know those guys.</Page>
 		</Dialogue>
-		<RevealFacts>
-			<FactID>EXAMPLES_ERNESTO_COUSIN_RUMOR</FactID>
-		</RevealFacts>
+
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>Thanks for the info.</Text>
 				<DialogueTarget>START</DialogueTarget>
 			</DialogueOption>
 		</DialogueOptionsList>
+
+		<RevealFacts>
+			<FactID>EXAMPLES_ERNESTO_COUSIN_RUMOR</FactID>
+		</RevealFacts>
 	</DialogueNode>
 
 	<DialogueNode>

diff --git a/planets/Dialogue/Geswaldo.xml b/planets/Dialogue/Geswaldo.xml
@@ -14,6 +14,7 @@
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>I hate you.</Text>
+				<ConditionToSet>EXAMPLES_INSULT</ConditionToSet>
 				<DialogueTarget>1</DialogueTarget>
 			</DialogueOption>
 			<DialogueOption>
@@ -37,6 +38,7 @@
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>I hate you.</Text>
+				<ConditionToSet>EXAMPLES_INSULT</ConditionToSet>
 				<DialogueTarget>1</DialogueTarget>
 			</DialogueOption>
 			<DialogueOption>

diff --git a/planets/Dialogue/Ghostbird.xml b/planets/Dialogue/Ghostbird.xml
@@ -7,10 +7,7 @@
 		<Dialogue>
 			<Page>Hey man how's it going?</Page>
 		</Dialogue>
-		<RevealFacts>
-			<FactID>EXAMPLES_BOB</FactID>
-		</RevealFacts>
-
+
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>Aren't you supposed to kill me?</Text>
@@ -25,6 +22,10 @@
 				<DialogueTarget>3</DialogueTarget>
 			</DialogueOption>
 		</DialogueOptionsList>
+
+		<RevealFacts>
+			<FactID>EXAMPLES_BOB</FactID>
+		</RevealFacts>
 	</DialogueNode>
 
 	<DialogueNode>
@@ -51,19 +52,13 @@
 	<DialogueNode>
 		<Name>3</Name>
 		<Dialogue>
-			<Page>I'm actually a magical wizard and I've been casting some <b>crazy</b> spells on your solar system.</Page>
+			<Page>I'm actually a magical wizard and I've been casting some <![CDATA[<b>crazy</b>]]> spells on your solar system.</Page>
 			<Page>I put a bunch of sand on some moon, I put rings on some big gas giant...</Page>
 			<Page>Oh yeah I gave you guys an extra blackhole-whitehole pair, so you're welcome.</Page>
-			<Page><b>Oh</b> and I threw your planet far from the sun so look out for falling temperatures killing you all in a few months.</Page>
+			<Page><![CDATA[<b>Oh</b>]]> and I threw your planet far from the sun so look out for falling temperatures killing you all in a few months.</Page>
 			<Page>Although you might not be too worried about that now that I think about it.</Page>
 		</Dialogue>
 
-		<RevealFacts>
-			<FactID>EXAMPLES_SAND</FactID>
-			<FactID>EXAMPLES_RINGS</FactID>
-			<FactID>EXAMPLES_LAVA</FactID>
-		</RevealFacts>
-
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>What?</Text>
@@ -74,6 +69,12 @@
 				<DialogueTarget>4</DialogueTarget>
 			</DialogueOption>
 		</DialogueOptionsList>
+
+		<RevealFacts>
+			<FactID>EXAMPLES_SAND</FactID>
+			<FactID>EXAMPLES_RINGS</FactID>
+			<FactID>EXAMPLES_LAVA</FactID>
+		</RevealFacts>
 	</DialogueNode>
 
 	<DialogueNode>

diff --git a/planets/Dialogue/Nomai.xml b/planets/Dialogue/Nomai.xml
@@ -7,10 +7,7 @@
 		<Dialogue>
 			<Page>You looking at something?</Page>
 		</Dialogue>
-		<RevealFacts>
-			<FactID>EXAMPLES_FRED</FactID>
-		</RevealFacts>
-
+
 		<DialogueOptionsList>
 			<DialogueOption>
 				<Text>Aren't you guys all supposed to be dead?</Text>
@@ -29,6 +26,10 @@
 				<DialogueTarget>END</DialogueTarget>
 			</DialogueOption>
 		</DialogueOptionsList>
+
+		<RevealFacts>
+			<FactID>EXAMPLES_FRED</FactID>
+		</RevealFacts>
 	</DialogueNode>
 
 	<DialogueNode>

diff --git a/planets/ExistingPlanets/timber_hearth.json b/planets/ExistingPlanets/timber_hearth.json
@@ -38,6 +38,11 @@
 				"rotation": {"x":78, "y":189, "z":180},
 				"scale" : 0.08
 			},
+			{
+				"assetBundle": "planets/bundle/examples_trifid",
+				"path":"Assets/JellyfishLight (1).prefab",
+				"position": {"x": 28.63121, "y": -46.67, "z": 185.68}
+			},
 			{
 				"path": "Anglerfish_Body/Beast_Anglerfish",
 				"position": {"x": 23.9989, "y": -39.3724, "z": 186.4618},
@@ -201,13 +206,13 @@
 				"type": "scroll",
 				"seed": 10,
 				"arcInfo":[
-					{"position": {"x": 0, "y": 0}, "zRotation": 340, "type": "child", "location":"A"},
-					{"position": {"x": 0.31270, "y":  1.2733}, "zRotation": 140, "type": "stranger", "location":"B"},
-					{"position": {"x": -0.2968, "y":  1.7341}, "zRotation": 100, "type": "child", "location":"A"},
-					{"position": {"x": -0.7676, "y": 1.4533}, "zRotation": 160, "type": "adult", "location":"B"},
-					{"position": {"x": -1.0676, "y": 2.086}, "zRotation": 80, "type": "adult", "location":"B"},
-					{"position": {"x": -0.85, "y":  2.1}, "zRotation": 320, "type": "adult", "location":"B"},
-					{"position": {"x": 0.9988, "y": 1.7824}, "zRotation": 240, "type": "child", "location":"A"}
+					{"position": {"x": 0, "y": 0}, "zRotation": 340, "type": "child"},
+					{"position": {"x": 0.31270, "y":  1.2733}, "zRotation": 140, "type": "stranger"},
+					{"position": {"x": -0.2968, "y":  1.7341}, "zRotation": 100, "type": "child"},
+					{"position": {"x": -0.7676, "y": 1.4533}, "zRotation": 160, "type": "adult"},
+					{"position": {"x": -1.0676, "y": 2.086}, "zRotation": 80, "type": "adult"},
+					{"position": {"x": -0.85, "y":  2.1}, "zRotation": 320, "type": "adult"},
+					{"position": {"x": 0.9988, "y": 1.7824}, "zRotation": 240, "type": "child"}
 				]
 			},
 			{

diff --git a/planets/Text/Cairn.xml b/planets/Text/Cairn.xml
@@ -1,4 +1,4 @@
-<NomaiObject>
+<NomaiObject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/text_schema.xsd">
 	<TextBlock>
 		<ID>1</ID>
 		<Text>Slide reel examples (10m).</Text>

diff --git a/planets/Text/Computer.xml b/planets/Text/Computer.xml
@@ -1,4 +1,4 @@
-<NomaiObject>
+<NomaiObject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/text_schema.xsd">
 	<TextBlock>
 		<ID>1</ID>
 		<Text>Beep boop I am a computer.</Text>

diff --git a/planets/Text/Recorder.xml b/planets/Text/Recorder.xml
@@ -1,4 +1,4 @@
-<NomaiObject>
+<NomaiObject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/text_schema.xsd">
 	<TextBlock>
 		<ID>1</ID>
 		<Text>Dear diary.</Text>

diff --git a/planets/Text/Text.xml b/planets/Text/Text.xml
@@ -1,4 +1,4 @@
-<NomaiObject>
+<NomaiObject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/text_schema.xsd">
 	<TextBlock>
 		<ID>1</ID>
 		<Text>Fred: Fred was here.</Text>

diff --git a/planets/Text/WallText.xml b/planets/Text/WallText.xml
@@ -1,36 +1,43 @@
-<NomaiObject>
+<NomaiObject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/text_schema.xsd">
 	<TextBlock>
 		<ID>1</ID>
+		<LocationA />
 		<Text>FRED: Do you want to <![CDATA[<color=lightblue>duo</color>]]> in <![CDATA[<color=red>Fortnite</color>]]>.</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>2</ID>
 		<ParentID>1</ParentID>
+		<LocationB />
 		<Text>BOB: No, I'd really rather not.</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>3</ID>
 		<ParentID>2</ParentID>
+		<LocationA />
 		<Text>FRED: Okay well does anyone want to play <![CDATA[<color=pink>Among Us</color>]]>.</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>4</ID>
 		<ParentID>3</ParentID>
+		<LocationB />
 		<Text>Ernesto: Yeah I'm down.</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>5</ID>
 		<ParentID>3</ParentID>
+		<LocationB />
 		<Text>Geswaldo: Sure thing.</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>6</ID>
 		<ParentID>3</ParentID>
+		<LocationB />
 		<Text>Slate: Who even are you people?</Text>
 	</TextBlock>
 	<TextBlock>
 		<ID>7</ID>
 		<ParentID>6</ParentID>
+		<LocationA />
 		<Text>FRED: My name is Bob.</Text>
 	</TextBlock>
 </NomaiObject>
diff --git a/planets/bundle/examples_trifid b/planets/bundle/examples_trifid
diff --git a/planets/bundle/examples_trifid.manifest b/planets/bundle/examples_trifid.manifest
@@ -0,0 +1,21 @@
+ManifestFileVersion: 0
+CRC: 20654554
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: bd72812a75b18fe28c71138e4e608027
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: 73be9529c660771824724b399f71d221
+HashAppended: 0
+ClassTypes:
+- Class: 1
+  Script: {instanceID: 0}
+- Class: 4
+  Script: {instanceID: 0}
+- Class: 108
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/JellyfishLight (1).prefab
+Dependencies: []
diff --git a/translations/english.json b/translations/english.json
@@ -0,0 +1,17 @@
+{
+	"$schema": "https://raw.githubusercontent.com/xen-42/outer-wilds-new-horizons/main/NewHorizons/Schemas/translation_schema.json",
+    "AchievementTranslations" : {
+		"EXAMPLES_SIGNAL" : {
+			"Name" : "Not a Trap",
+			"Description" : "Discover a distress call"
+		},
+		"EXAMPLES_DIALOGUE" : {
+			"Name" : "You're a Bad Person",
+			"Description" : "Insult a jellyfish"
+		},
+		"EXAMPLES_FACTS" : {
+			"Name" : "Something Fishy",
+			"Description" : "Visit Giant's Deep"
+		}
+	}
+}