From a77a9fc98de390650709e6f042cfc6b57d945494 Mon Sep 17 00:00:00 2001 From: Connor Smith Date: Tue, 17 Sep 2024 00:22:55 +1000 Subject: [PATCH 1/2] Move scripts out of root directory --- .github/workflows/readable-data-changes.yml | 2 +- .github/workflows/renumber-objects-and-sprites.yml | 4 ++-- RenumberObjects.js => scripts/RenumberObjects.js | 0 RenumberSprites.js => scripts/RenumberSprites.js | 0 checkIn.sh => scripts/checkIn.sh | 0 checkInNoPush.sh => scripts/checkInNoPush.sh | 0 checkInReport.sh => scripts/checkInReport.sh | 0 .../listReverseUseDecayTrans.sh | 0 makeNudityMod.sh => scripts/makeNudityMod.sh | 0 printAutoDecays.sh => scripts/printAutoDecays.sh | 0 printBlockingObjects.sh => scripts/printBlockingObjects.sh | 0 .../printContainableObjects.sh | 0 printContainerObjects.sh => scripts/printContainerObjects.sh | 0 printDeadlyObjects.sh => scripts/printDeadlyObjects.sh | 0 .../printHoldableMultiSpriteObjects.sh | 0 printHoldableObjects.sh => scripts/printHoldableObjects.sh | 0 printLastUseActor.sh => scripts/printLastUseActor.sh | 0 printLastUseTarget.sh => scripts/printLastUseTarget.sh | 0 printNaturalObjects.sh => scripts/printNaturalObjects.sh | 0 .../printNonContaiableObjects.sh | 0 printUseableObjects.sh => scripts/printUseableObjects.sh | 0 pull.sh => scripts/pull.sh | 0 readableAssets.py => scripts/readableAssets.py | 0 23 files changed, 3 insertions(+), 3 deletions(-) rename RenumberObjects.js => scripts/RenumberObjects.js (100%) rename RenumberSprites.js => scripts/RenumberSprites.js (100%) rename checkIn.sh => scripts/checkIn.sh (100%) rename checkInNoPush.sh => scripts/checkInNoPush.sh (100%) rename checkInReport.sh => scripts/checkInReport.sh (100%) rename listReverseUseDecayTrans.sh => scripts/listReverseUseDecayTrans.sh (100%) rename makeNudityMod.sh => scripts/makeNudityMod.sh (100%) rename printAutoDecays.sh => scripts/printAutoDecays.sh (100%) rename printBlockingObjects.sh => scripts/printBlockingObjects.sh (100%) rename printContainableObjects.sh => scripts/printContainableObjects.sh (100%) rename printContainerObjects.sh => scripts/printContainerObjects.sh (100%) rename printDeadlyObjects.sh => scripts/printDeadlyObjects.sh (100%) rename printHoldableMultiSpriteObjects.sh => scripts/printHoldableMultiSpriteObjects.sh (100%) rename printHoldableObjects.sh => scripts/printHoldableObjects.sh (100%) rename printLastUseActor.sh => scripts/printLastUseActor.sh (100%) rename printLastUseTarget.sh => scripts/printLastUseTarget.sh (100%) rename printNaturalObjects.sh => scripts/printNaturalObjects.sh (100%) rename printNonContaiableObjects.sh => scripts/printNonContaiableObjects.sh (100%) rename printUseableObjects.sh => scripts/printUseableObjects.sh (100%) rename pull.sh => scripts/pull.sh (100%) rename readableAssets.py => scripts/readableAssets.py (100%) diff --git a/.github/workflows/readable-data-changes.yml b/.github/workflows/readable-data-changes.yml index 0c0f1a8988..cdf157872c 100644 --- a/.github/workflows/readable-data-changes.yml +++ b/.github/workflows/readable-data-changes.yml @@ -20,7 +20,7 @@ jobs: - name: Parse asset changes to be more readable id: readable-assets - run: python readableAssets.py + run: python scripts/readableAssets.py env: REPO: ${{ github.repository }} REPO_PATH: ${{ github.workspace }} diff --git a/.github/workflows/renumber-objects-and-sprites.yml b/.github/workflows/renumber-objects-and-sprites.yml index 8504bf5f35..604ef71d0e 100644 --- a/.github/workflows/renumber-objects-and-sprites.yml +++ b/.github/workflows/renumber-objects-and-sprites.yml @@ -36,7 +36,7 @@ jobs: id="${fn//[^0-9]/}" (( id > nextID && id < start_number )) && start_number=$id done - node RenumberObjects.js $start_number + node scripts/RenumberObjects.js $start_number maxID=$(ls -v objects/[0-9]*.txt | tail -1 | sed 's/objects\///' | sed 's/.txt//') echo -n $((maxID + 1)) > objects/nextObjectNumber.txt @@ -60,7 +60,7 @@ jobs: id="${fn//[^0-9]/}" (( id > nextID && id < start_number )) && start_number=$id done - node RenumberSprites.js $start_number + node scripts/RenumberSprites.js $start_number maxID=$(ls -v sprites/[0-9]*.txt | tail -1 | sed 's/sprites\///' | sed 's/.txt//') echo -n $((maxID + 1)) > sprites/nextSpriteNumber.txt diff --git a/RenumberObjects.js b/scripts/RenumberObjects.js similarity index 100% rename from RenumberObjects.js rename to scripts/RenumberObjects.js diff --git a/RenumberSprites.js b/scripts/RenumberSprites.js similarity index 100% rename from RenumberSprites.js rename to scripts/RenumberSprites.js diff --git a/checkIn.sh b/scripts/checkIn.sh similarity index 100% rename from checkIn.sh rename to scripts/checkIn.sh diff --git a/checkInNoPush.sh b/scripts/checkInNoPush.sh similarity index 100% rename from checkInNoPush.sh rename to scripts/checkInNoPush.sh diff --git a/checkInReport.sh b/scripts/checkInReport.sh similarity index 100% rename from checkInReport.sh rename to scripts/checkInReport.sh diff --git a/listReverseUseDecayTrans.sh b/scripts/listReverseUseDecayTrans.sh similarity index 100% rename from listReverseUseDecayTrans.sh rename to scripts/listReverseUseDecayTrans.sh diff --git a/makeNudityMod.sh b/scripts/makeNudityMod.sh similarity index 100% rename from makeNudityMod.sh rename to scripts/makeNudityMod.sh diff --git a/printAutoDecays.sh b/scripts/printAutoDecays.sh similarity index 100% rename from printAutoDecays.sh rename to scripts/printAutoDecays.sh diff --git a/printBlockingObjects.sh b/scripts/printBlockingObjects.sh similarity index 100% rename from printBlockingObjects.sh rename to scripts/printBlockingObjects.sh diff --git a/printContainableObjects.sh b/scripts/printContainableObjects.sh similarity index 100% rename from printContainableObjects.sh rename to scripts/printContainableObjects.sh diff --git a/printContainerObjects.sh b/scripts/printContainerObjects.sh similarity index 100% rename from printContainerObjects.sh rename to scripts/printContainerObjects.sh diff --git a/printDeadlyObjects.sh b/scripts/printDeadlyObjects.sh similarity index 100% rename from printDeadlyObjects.sh rename to scripts/printDeadlyObjects.sh diff --git a/printHoldableMultiSpriteObjects.sh b/scripts/printHoldableMultiSpriteObjects.sh similarity index 100% rename from printHoldableMultiSpriteObjects.sh rename to scripts/printHoldableMultiSpriteObjects.sh diff --git a/printHoldableObjects.sh b/scripts/printHoldableObjects.sh similarity index 100% rename from printHoldableObjects.sh rename to scripts/printHoldableObjects.sh diff --git a/printLastUseActor.sh b/scripts/printLastUseActor.sh similarity index 100% rename from printLastUseActor.sh rename to scripts/printLastUseActor.sh diff --git a/printLastUseTarget.sh b/scripts/printLastUseTarget.sh similarity index 100% rename from printLastUseTarget.sh rename to scripts/printLastUseTarget.sh diff --git a/printNaturalObjects.sh b/scripts/printNaturalObjects.sh similarity index 100% rename from printNaturalObjects.sh rename to scripts/printNaturalObjects.sh diff --git a/printNonContaiableObjects.sh b/scripts/printNonContaiableObjects.sh similarity index 100% rename from printNonContaiableObjects.sh rename to scripts/printNonContaiableObjects.sh diff --git a/printUseableObjects.sh b/scripts/printUseableObjects.sh similarity index 100% rename from printUseableObjects.sh rename to scripts/printUseableObjects.sh diff --git a/pull.sh b/scripts/pull.sh similarity index 100% rename from pull.sh rename to scripts/pull.sh diff --git a/readableAssets.py b/scripts/readableAssets.py similarity index 100% rename from readableAssets.py rename to scripts/readableAssets.py From 9831c9258e4a096733b026b47d2be288776d6ab0 Mon Sep 17 00:00:00 2001 From: Connor Smith Date: Tue, 17 Sep 2024 00:23:00 +1000 Subject: [PATCH 2/2] Add README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000..61728d07c0 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# OneLifeData7 (for Two Hours One Life) +All content *(data)* changes for Two Hours One Life. Including, art, objects and recipes. + +This data is manipulated with a purpose built client known as The Editor. + +- [Server, client and editor](https://github.com/twohoursonelife/OneLife) +- [Engine](https://github.com/twohoursonelife/minorGems)