Merge Open World into CCMultiworldRandomizer

.github/workflows/wiki.yml

@@ -0,0 +1,20 @@
+name: Publish wiki
+on:
+  push:
+    branches: [main]
+    paths:
+      - docs/wiki/**
+      - .github/workflows/wiki.yml
+concurrency:
+  group: publish-wiki
+  cancel-in-progress: true
+permissions:
+  contents: write
+jobs:
+  publish-wiki:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Andrew-Chen-Wang/github-wiki-action@v5
+        with:
+          path: docs/wiki/

.gitignore

@@ -1,3 +1,17 @@
+# ccmwr
 node_modules
-*.js
+mw-rando/*.js
 *.ccmod
+
+# ccow
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+Readme.md
+assets/media/bgm/
+package.json
+releases/

CONTRIBUTING.md

@@ -1,29 +1,16 @@
 Hello, developers!
 
-Thank you for your interest in contributing to this project. There are a few things you'll want to know about setting
-up the development environment.
+Thank you for your interest in contributing to this project. Most of the
+information about contributing is available on the wiki. In particular, you will
+want to make yourself familiar with the pages **Development Flow** and **Data
+Format**.
 
-## Archipelago.js
+These are available online at:
 
-Archipelago.js is the JavaScript library that provides the websocket connection to the Archipelago server. As of August
-2024, CCMultiworldRandomizer depends on
-[a custom fork of Archipelago.js](https://github.com/CodeTriangle/archipelago.js/tree/crosscode)
-tailored for use in CrossCode.
+* <https://github.com/CodeTriangle/CCMultiworldRandomizer/wiki/Development-Flow>
+* <https://github.com/CodeTriangle/CCMultiworldRandomizer/wiki/Data-Format>
 
-To ensure correct versioning, it is included in this repository at `extern/apjs` via git submodule. Upon cloning this
-repository, run the following to download submodules:
+Or in your local repository at:
 
-```bash
-git submodule update --init --recursive
-```
-
-If you ever make changes to `extern/apjs`, make sure run `npm install` in the root of the CCMultiworldRandomizer
-repository to ensure that your changes are added.
-
-The fork is necessary because:
-* The upstream depends on `isomorphic-ws`, a package which in theory provides the same websocket interface for node.js
-  and browser installations, but breaks CrossCode due to the nw.js environment, which combines aspects of the browser
-  and the web. Previously, the project depended on a packed tarball custom-made for CrossCode by the maintainer of
-  Archipelago.js, which caused a significant amount of friction for people checking out the code for the first time.
-* The upstream is not used in many other APWorlds and is therefore somewhat untested for this purpose. The fork will
-  contain these fixes before they are merged into main.
+* [docs/wiki/Development-Flow.md](docs/wiki/Development-Flow.md)
+* [docs/wiki/Data-Format.md](docs/wiki/Data-Format.md)

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Juan Bautista Newton
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -21,3 +21,13 @@ Check out the [FAQ](https://github.com/CodeTriangle/CCMultiworldRandomizer/wiki/
 
 If you think you have an idea for a feature, read the [Contributing](https://github.com/CodeTriangle/CCMultiworldRandomizer/wiki/Contributing)
 page to learn how you can help. No programming experience necessary!
+
+# CC-Open-World
+
+Previously a separate mod, CC-Open-World has been merged into CCMultiworldRandomizer.
+
+This mod patches a lot of events in the game, in order to remove the story and freely roam as long as you have the access to certain areas. This is mostly meant to be played with Randomizers like [CC-Item-Randomizer](https://github.com/CCDirectLink/CCItemRandomizer), or [CCMultiworldRandomizer](https://github.com/CodeTriangle/CCMultiworldRandomizer) integration for Archipelago, though it isn't required to use any of them to play around with this mod.
+
+There's a lot of vital patches that change how things work in terms of story and content, so certain areas are completely locked (either from specific questlines, or just entirely locked), or already unlocked from other methods. There's a small info [Guide](https://raw.githubusercontent.com/buanjautista/cc-open-world/main/GUIDE) you can reference to know about these.
+
+For more info on certain changes, you can check the [CHANGELOG](./CHANGELOG).

assets/data/areas/forest.json.patch

@@ -0,0 +1,11 @@
+[
+  { "type": "ENTER", "index": ["floors"] },
+	{ "type": "ENTER", "index": ["1", "connections", 34] },
+  { 
+    "type": "SET_KEY", 
+    "_comment": "Show the hidden passage connection at all points",
+		"index": "condition"
+  },
+	{ "type": "EXIT", "count": 3 },	  
+	{ "type": "EXIT" }	  
+]

assets/data/database.json.patch

@@ -1,4 +1,59 @@
 [
+    {
+        "type": "ENTER",
+        "index": "commonEvents"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/enable-party-shizuka.json"
+    },{
+        "type": "INCLUDE",
+        "src": "mod:patches/database/remove-save-fixes.json"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/extra-commonEvents.json"
+    },
+    { 
+        "type": "IF", 
+        "_comment": "Adds corresponding patch if DLC is active", 
+        "cond": "ig.vars.get('extension.post-game.active') >= 1", 
+        "thenSteps": [
+        {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/dlc/remove-party-blocks.json"
+        }] 
+    },
+    {
+        "type": "EXIT"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/quest-fixes.json"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/dlc/quest-fixes.json"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:extra-patches/extra-quests/database/quests.json.patch"
+    },
+    {
+        "type": "ENTER",
+        "index": "shops"
+    },
+    {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/shop-conditions.json"
+    },
+        {
+        "type": "INCLUDE",
+        "src": "mod:patches/database/dlc/shop-conditions.json"
+    },
+    {
+        "type": "EXIT"
+    },
     { "type": "ENTER", "index": ["traders"] },
 
     {