Add Halos

macrovision.html

@@ -11,6 +11,7 @@
   <script src="presets/landmarks.js"></script>
   <script src="presets/characters.js"></script>
   <script src="presets/objects.js"></script>
+  <script src="presets/fiction.js"></script>
   <script src="presets/food.js"></script>
   <script src="presets/naturals.js"></script>
   <script src="presets/vehicles.js"></script>

macrovision.js

@@ -1389,6 +1389,7 @@ function prepareEntities() {
     availableEntities["landmarks"] = makeLandmarks();
     availableEntities["characters"] = makeCharacters();
     availableEntities["objects"] = makeObjects();
+    availableEntities["fiction"] = makeFiction();
     availableEntities["food"] = makeFood();
     availableEntities["naturals"] = makeNaturals();
     availableEntities["vehicles"] = makeVehicles();

media/attribution.js

@@ -7782,6 +7782,20 @@ const attributionData = {
             ]
         },
         //characters
+        {
+            prefix: "./media/fiction/halo/halo/",
+            files: [
+                { name: "side.svg", source: null },
+                { name: "edge.svg", source: null },
+                { name: "angled.svg", source: null },
+            ],
+            authors: [
+                "chemicalcrux"
+            ],
+            owners: [
+                "halo"
+            ]
+        },
         {
             prefix: "./media/food/animals/",
             files: [
@@ -7863,20 +7877,6 @@ const attributionData = {
                 "anonymous"
             ]
         },
-        {
-            prefix: "./media/games/halo/halo/",
-            files: [
-                { name: "side.svg", source: null },
-                { name: "edge.svg", source: null },
-                { name: "angled.svg", source: null },
-            ],
-            authors: [
-                "chemicalcrux"
-            ],
-            owners: [
-                "halo"
-            ]
-        },
         {
             prefix: "./media/landmarks/",
             files: [

media/fiction/halo/halo/angled.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 915.39 881.91" style="enable-background:new 0 0 915.39 881.91;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+</style>
+<g>
+	<g>
+		<g class="st0">
+			<g>
+				<path d="M90.27,773.28l-13.77-15.9c56.42,65.15,143.16,104.57,250.49,104.57l13.77,15.9
+					C233.43,877.85,146.69,838.43,90.27,773.28z"/>
+			</g>
+			<g>
+				<path d="M825.13,108.63l13.77,15.9c68.11,78.65,92.03,194.8,54.63,324.37c-68.39,236.91-315.87,428.95-552.76,428.95
+					l-13.77-15.9c236.9,0,484.37-192.04,552.76-428.95C917.16,303.43,893.24,187.28,825.13,108.63z"/>
+			</g>
+			<g>
+				<path d="M828.68,105.56l13.77,15.9C785.49,55.69,697.93,15.9,589.58,15.9L575.81,0C684.16,0,771.72,39.79,828.68,105.56z"/>
+			</g>
+			<g>
+				<path d="M589.58,15.9c239.14,0,377.04,193.86,308.01,433c-69.04,239.15-318.87,433.01-558.01,433.01
+					c-239.15,0-377.05-193.87-308.02-433.01C100.6,209.76,350.43,15.9,589.58,15.9z M340.76,877.85
+					c236.9,0,484.37-192.04,552.76-428.95C961.91,212,825.31,19.96,588.41,19.96S104.03,212,35.64,448.9
+					C-32.75,685.81,103.86,877.85,340.76,877.85"/>
+			</g>
+			<g>
+				<path d="M86.72,776.36l-13.77-15.9C4.19,681.06-19.96,563.8,17.8,433C86.83,193.86,336.66,0,575.81,0l13.77,15.9
+					c-239.15,0-488.98,193.86-558.02,433C-6.19,579.7,17.96,696.96,86.72,776.36z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

media/fiction/halo/halo/edge.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 31.8" style="enable-background:new 0 0 1000 31.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+</style>
+<rect width="1000" height="31.8"/>
+</svg>

media/fiction/halo/halo/side.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 1000" style="enable-background:new 0 0 1000 1000;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+</style>
+<path d="M500,0C223.86,0,0,223.86,0,500s223.86,500,500,500s500-223.86,500-500S776.14,0,500,0z M500,995.3
+	C226.45,995.3,4.7,773.55,4.7,500S226.45,4.7,500,4.7S995.3,226.45,995.3,500S773.55,995.3,500,995.3z"/>
+</svg>

presets/fiction.js

@@ -0,0 +1,39 @@
+function makeFiction() {
+    const results = [];
+
+    results.push({
+        name: "Halo",
+        constructor: () => makeObject(
+            "Halo",
+            {
+                side: {
+                    height: math.unit(10000, "km"),
+                    mass: math.unit(1e17, "kg"),
+                    image: { source: "./media/fiction/halo/halo/side.svg" },
+                    name: "Side"
+                },
+                edge: {
+                    height: math.unit(318, "km"),
+                    mass: math.unit(1e17, "kg"),
+                    image: { source: "./media/fiction/halo/halo/edge.svg" },
+                    name: "Edge"
+                },
+                angled: {
+                    height: math.unit(8819.1, "km"),
+                    mass: math.unit(1e17, "kg"),
+                    image: { source: "./media/fiction/halo/halo/angled.svg" },
+                    name: "Angled"
+                },
+            }
+        )
+    });
+
+    
+    results.sort((b1, b2) => {
+        e1 = b1.constructor();
+        e2 = b2.constructor();
+        return -math.subtract(e1.views[e1.defaultView].height, e2.views[e2.defaultView].height).value;
+    });
+
+    return results;
+}