clean up requirements-dev, fix priority stuff for matching, fix wingcap level randomization, add .vscode back to save debug config

Author: andrelikesdogs

.gitignore

@@ -16,7 +16,6 @@ pip-selfcheck.json
 __pycache__
 .history
 .DS_Store
-.vscode
 env/
 .eggs/
 egg/

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Launch Project",
+            "type": "python",
+            "request": "launch",
+            "program": "main.py",
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "--shuffle-objects",
+                "--shuffle-entries",
+                "--shuffle-skybox",
+                "--shuffle-text",
+                "--shuffle-colors",
+                "--disable-cutscenes",
+                "--shuffle-instruments",
+                "SM64_US.z64"
+            ],
+            "env": {
+                "SM64R": "EXPORT"
+            }
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "Scripts\\python.exe"
+}

Config/sm64.vanilla.yml

@@ -503,6 +503,15 @@ collision_groups:
       - SLIPPERY
 
 # Start object randomization section. Can be deeply nested with groups, sub-group, etc
+# This segment will define all randomizable objects, that will be moved around in a level.
+# - Groups can be created (without a "match") property to organize multiple different objects together
+# - Matchings have a priority, defined by how much it matches an object in a level
+#   - for example: a Coin is supposed to not spawn in the air too high. It is matching via it's behaviour id.
+#                  however, in a wingcap level coins *can* spawn in the air. So a more specific "match" with
+#                  both the behaviour id and a match for level that have been flagged "fly_stage" will have
+#                  priority over the previous matching, allowing you overwrite randomization settings in special
+#                  circumstances. Randomizations with a "for" property automatically have +1 priority, as they're
+#                  generally intended for special levels that should take priority.
 object_randomization:
   # default
   rules:
@@ -861,27 +870,31 @@ object_randomization:
             - 'Warps'
           rules:
             - disabled
-        - name: "WC: Coins within Reach of Platform"
-          match:
+        - name: "TOTWC: Coins within Reach of Platform"
+          match: # this matching is very specific to increase priority
             - course_property: fly_stage
             - course_id: 0x1D
+            - area_id: 0x01
           rules:
             - no_floor_required
             - min_y: -2000
-            - max_y: 2500
+            - max_y: 2200
             - distance_to:
               - origin: [0, -2047, 0]
-                max_distance: 3000
+                max_distance: 5000
           for:
             - 'Coin'
             - 'Coin Formations'
         - name: "WMotR: Coins within Reach"
-          match:
+          match: # this matching is very specific to increase priority
+            - course_property: fly_stage
             - course_id: 0x1F
+            - area_id: 0x01
           rules:
+            - no_floor_required
             - distance_to:
               - origin: [0, 1900, 0]
-                max_distance: 5000
+                max_distance: 6500
             - min_y: -3500
             - max_y: 2200
           for:

requirements-dev.txt

@@ -1,212 +1,9 @@
-alabaster==0.7.12
-altgraph==0.16.1
-anaconda-client==1.7.2
-anaconda-navigator==1.9.7
-anaconda-project==0.8.2
-appnope==0.1.0
-appscript==1.0.1
-asn1crypto==0.24.0
-astroid==2.2.5
-astropy==3.1.2
-atomicwrites==1.3.0
-attrs==19.1.0
-Babel==2.6.0
-backcall==0.1.0
-backports.os==0.1.1
-backports.shutil-get-terminal-size==1.0.0
-beautifulsoup4==4.7.1
-bitarray==0.8.3
-bkcharts==0.2
-bleach==3.3.0
-bokeh==1.0.4
-boto==2.49.0
-Bottleneck==1.2.1
-certifi==2019.3.9
-cffi==1.12.2
-chardet==3.0.4
-Click==7.0
-cloudpickle==0.8.0
-clyent==1.2.2
-colorama==0.4.1
-colorlog==4.0.2
-conda==4.6.14
-conda-build==3.17.8
-conda-verify==3.1.1
-contextlib2==0.5.5
-cryptography==3.3.2
-cycler==0.10.0
-Cython==0.29.6
-cytoolz==0.9.0.1
-dask==1.1.4
-decorator==4.4.0
-defusedxml==0.5.0
-distributed==1.26.0
-docutils==0.14
-entrypoints==0.3
-et-xmlfile==1.0.1
-fastcache==1.0.2
-filelock==3.0.10
-Flask==1.0.2
-future==0.17.1
-gevent==1.4.0
-glob2==0.6
-gmpy2==2.0.8
-greenlet==0.4.15
-h5py==2.9.0
-heapdict==1.0.0
-html5lib==1.0.1
-idna==2.8
-imageio==2.5.0
-imagesize==1.1.0
-importlib-metadata==0.0.0
-ipykernel==5.1.0
-ipython==7.4.0
-ipython-genutils==0.2.0
-ipywidgets==7.4.2
-isort==4.3.16
-itsdangerous==1.1.0
-jdcal==1.4
-jedi==0.13.3
-Jinja2==2.11.3
-jsonschema==3.0.1
-jupyter==1.0.0
-jupyter-client==5.2.4
-jupyter-console==6.0.0
-jupyter-core==4.4.0
-jupyterlab==0.35.4
-jupyterlab-server==0.2.0
-keyring==18.0.0
-kiwisolver==1.0.1
-lazy-object-proxy==1.3.1
-libarchive-c==2.8
-lief==0.9.0
-llvmlite==0.28.0
-locket==0.2.0
-lxml==4.6.3
-macholib==1.11
-MarkupSafe==1.1.1
-matplotlib==3.0.3
-mccabe==0.6.1
-mistune==0.8.4
-mkl-fft==1.0.10
-mkl-random==1.0.2
-more-itertools==6.0.0
-mpmath==1.1.0
-msgpack==0.6.1
-multipledispatch==0.6.0
-navigator-updater==0.2.1
-nbconvert==5.4.1
-nbformat==4.4.0
-networkx==2.2
-nltk==3.4.5
-nose==1.3.7
-notebook==6.1.5
-numba==0.43.1
-numexpr==2.6.9
-numpy==1.20.0
-numpydoc==0.8.0
-olefile==0.46
-openpyxl==2.6.1
-packaging==19.0
-pandas==0.24.2
-pandocfilters==1.4.2
-parso==0.3.4
-partd==0.3.10
-path.py==11.5.0
-pathlib2==2.3.3
-patsy==0.5.1
-pefile==2019.4.18
-pep8==1.7.1
-pexpect==4.6.0
-pickleshare==0.7.5
-Pillow==8.2.0
-pkginfo==1.5.0.1
-plotly==3.10.0
-pluggy==0.9.0
-ply==3.11
-prometheus-client==0.6.0
-prompt-toolkit==2.0.9
-psutil==5.6.6
-ptyprocess==0.6.0
-py==1.10.0
-pycodestyle==2.5.0
-pycollada==0.6
-pycosat==0.6.3
-pycparser==2.19
-pycrypto==2.6.1
-pycurl==7.43.0.2
-pyflakes==2.1.1
-pyglet==1.3.2
-Pygments==2.7.4
-PyInstaller==3.4
-pylint==2.3.1
-pyodbc==4.0.26
-pyOpenSSL==19.0.0
-pyparsing==2.3.1
+numpy==1.18.1
+Pillow==7.0.0
+plotly==5.1.0
 pyperclip==1.7.0
-pyrsistent==0.14.11
-PySocks==1.6.8
-pytest==4.3.1
-pytest-arraydiff==0.3
-pytest-astropy==0.5.0
-pytest-doctestplus==0.3.0
-pytest-openfiles==0.3.2
-pytest-remotedata==0.3.1
-python-dateutil==2.8.0
-pytz==2018.9
-PyWavelets==1.0.2
-PyYAML==5.4
-pyzmq==18.0.0
-QtAwesome==0.5.7
-qtconsole==4.4.3
-QtPy==1.7.0
-requests==2.21.0
-retrying==1.3.3
-rope==0.12.0
+PyYAML==5.3
 Rtree==0.9.7
-ruamel-yaml==0.15.46
-scikit-image==0.14.2
-scikit-learn==0.20.3
-scipy==1.2.1
-seaborn==0.9.0
-Send2Trash==1.5.0
-Shapely==1.6.4.post2
-simplegeneric==0.8.1
-singledispatch==3.4.0.3
-six==1.12.0
-snowballstemmer==1.2.1
-sortedcollections==1.1.2
-sortedcontainers==2.1.0
-soupsieve==1.8
-Sphinx==1.8.5
-sphinxcontrib-websupport==1.1.0
-spyder==3.3.3
-spyder-kernels==0.4.2
-SQLAlchemy==1.3.1
-statsmodels==0.9.0
-svg.path==3.0
-sympy==1.3
-tables==3.5.1
-tblib==1.3.2
-terminado==0.8.1
-testpath==0.4.2
-toolz==0.9.0
-tornado==6.0.2
-tqdm==4.31.1
-traitlets==4.3.2
-trimesh==2.38.26
-unicodecsv==0.14.1
-urllib3==1.26.5
-wcwidth==0.1.7
-webencodings==0.5.1
-Werkzeug==0.15.3
-widgetsnbextension==3.4.2
-wrapt==1.11.1
-wurlitzer==1.0.2
-xlrd==1.2.0
-XlsxWriter==1.1.5
-xlwings==0.15.4
-xlwt==1.3.0
-xxhash==1.3.0
-zict==0.1.4
-zipp==0.3.3
+six==1.16.0
+tenacity==7.0.0
+trimesh==3.5.19

sm64r/Config.py

@@ -579,6 +579,7 @@ def parse_object_table(self, table, rules = None, match = None, exclude = None):
                   **target_rules,
                   **rules,
                 },
+                from_for=True,
                 name=f"{name}: {target['name']}"
               ))
 
@@ -604,6 +605,7 @@ def parse_object_table(self, table, rules = None, match = None, exclude = None):
                       **child_exclude,
                       **parent_exclude
                     },
+                    from_for=True,
                     name=f"{name}: {child['name']}"
                   ))
 
@@ -641,6 +643,7 @@ def parse_object_table(self, table, rules = None, match = None, exclude = None):
                   **target_rules,
                   **rules,
                 },
+                from_for=True,
                 name=f"{name}: {target['name']}"
               ))
 
@@ -667,6 +670,7 @@ def parse_object_table(self, table, rules = None, match = None, exclude = None):
                       **child_exclude,
                       **parent_exclude
                     },
+                    from_for=True,
                     name=f"{name}: {child['name']}"
                   ))
 

sm64r/Entities/LevelGeometry.py

@@ -455,5 +455,7 @@ def plot(self):
           )
 
       #print(f'plotting {self.level.name} {hex(area_id)}')
+      if not os.path.exists("dumps/level_plots"):
+        os.makedirs("dumps/level_plots")
       py.plot(traces, filename=f'dumps/level_plots/{self.level.name}_{hex(area_id)}.html', auto_open=False)
       #print('done')

sm64r/RandomModules/Objects/Whitelist.py

@@ -103,10 +103,13 @@ def matches_with(self, matching, object3d):
   def get_shuffle_properties(self, object3d : Object3D):
     best_match = None
     best_match_count = 0
+
+    # check against all matching/whitelist entries
     for whitelist_entry in self.object_whitelist:
       if whitelist_entry["match"] is None:
         continue
 
+      # if whitelist entry has an exclude property, see if we can skip this entry
       if whitelist_entry["exclude"] is not None:
         _, match_exclude = self.matches_with(whitelist_entry["exclude"], object3d)
 
@@ -115,12 +118,12 @@ def get_shuffle_properties(self, object3d : Object3D):
 
       # the more precise the matching, the more priority it will have
       matches, did_match = self.matches_with(whitelist_entry["match"], object3d)
+
+      # increase priority for matches from "for" rules
+      if "from_for" in whitelist_entry and whitelist_entry["from_for"]:
+        matches += 1
+
       if did_match and matches > best_match_count:
-        
-        #if best_match is not None and object3d.behaviour == 0x13002aa4:
-        #  print("replacing rule ", best_match)
-        #  print("with rule ", whitelist_entry)
-        
         best_match = whitelist_entry
         best_match_count = matches
     return best_match

sm64r/RandomModules/Objects/__init__.py

@@ -306,23 +306,23 @@ def is_valid_position(self, levelscript : LevelScriptParser, obj : Object3D,posi
         self.log_reason_for_reject("is_valid_position", "object position above max_y")
         return False
 
-    if "distance" in rules:
-      for distance_rules in rules["distance"]:
-        origin = distance_rules["origin"]
+    if "distance_to" in rules:
+      for distance_rule in rules["distance_to"]:
+        origin = distance_rule["origin"]
 
         distance = math.sqrt(
           (position[0] - origin[0]) ** 2 +
           (position[1] - origin[1]) ** 2 +
           (position[2] - origin[2]) ** 2
         )
 
-        if "max_distance" in distance_rules:
-          if distance > distance_rules["max_distance"]:
+        if "max_distance" in distance_rule:
+          if distance > distance_rule["max_distance"]:
             self.log_reason_for_reject("is_valid_position", "object too far away from origin")
             return False
 
-        if "min_distance" in distance_rules:
-          if distance > distance_rules["min_distance"]:
+        if "min_distance" in distance_rule:
+          if distance > distance_rule["min_distance"]:
             self.log_reason_for_reject("is_valid_position", "object too close to origin")
             return False
 
@@ -524,6 +524,8 @@ def generate_random_point_for(self, levelscript : LevelScriptParser, obj : Objec
     (bounds_min, bounds_max) = area_mesh.bounds
     (x, y, z) = bounds_min
 
+    # TODO: Check the rules here to more accurately set a bounding box in which to randomize, shits unoptimized yo
+
     # position for boundary is slightly overshot, probably because of some shit i forgot to write here while it happened
     if abs(bounds_min[0] - bounds_max[0]) > 0:
       x = random.randrange(bounds_min[0] + 1000, bounds_max[0] - 1000)

sm64r/Rom.py

@@ -204,6 +204,9 @@ def read_levels(self):
 
       if 'SM64R' in os.environ:
         if os.environ['SM64R'] == 'EXPORT':
+          if not os.path.exists(os.path.join("dumps", "level_geometry")):
+            os.makedirs(os.path.join("dumps", "level_geometry"))
+          
           for (area_id, mesh) in self.levelscripts[level].level_geometry.area_geometries.items():
             with open(os.path.join("dumps", "level_geometry", f"{level.name}_{hex(area_id)}.stl"), "wb+") as obj_output:
               mesh.export(obj_output, 'stl')