Skip to content

Commit

Permalink
Merge pull request #97 from The-Grand-Archives/dev
Browse files Browse the repository at this point in the history
Release v1.14
  • Loading branch information
inuNorii authored Jul 29, 2024
2 parents aea3661 + 6963774 commit 75a8493
Show file tree
Hide file tree
Showing 8,668 changed files with 158,008 additions and 148,954 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
30 changes: 30 additions & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Build and check"
outputs:
release-tag:
value: ${{ steps.collect_version.outputs.tag }}
build-artifact-name:
value: ER_TGA_${{ steps.collect_version.outputs.tag }}

runs:
using: "composite"
steps:
- name: Install dependencies
shell: bash
run: ./scripts/install_deps.sh

- name: CE2FS build
shell: bash
run: "python ./scripts/build.py --check"

- name: Collect table version
id: collect_version
shell: bash
run: source BUILD_ENV && echo tag=v${TABLE_VERSION} >> $GITHUB_OUTPUT

- name: Upload build
id: upload_build
uses: actions/upload-artifact@v4
with:
name: ER_TGA_${{ steps.collect_version.outputs.tag }}
path: dist
retention-days: 5
17 changes: 17 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "Checks"
on:
pull_request:
branches: [dev]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true

- name: Build
uses: "./.github/actions/build"


94 changes: 94 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
name: "Release"
on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: "Build"
id: build
uses: "./.github/actions/build"

outputs:
release-tag: ${{ steps.build.outputs.release-tag }}
build-artifact-name: ${{ steps.build.outputs.build-artifact-name }}

check-version:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
sparse-checkout: BUILD_ENV

- name: Ensure version was updated
run: |
source BUILD_ENV
if git show-ref --tags --verify "refs/tags/v${TABLE_VERSION}"; then
echo "Release v${TABLE_VERSION} already exists"
exit 1
fi
generate-changelog:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
sparse-checkout: |
CHANGELOG.md
BUILD_ENV
- name: Extract changelog section
id: extract_changelog
run: |
source BUILD_ENV
escaped=$(echo "v${TABLE_VERSION}" | sed 's/\./\\./g')
changelog=$(grep -zoP "## \[$escaped\](?:.|\n)*?\n## " CHANGELOG.md | sed '1d; $ d')
if [ -z "${changelog}" ]; then
echo "No changelog written for release v${TABLE_VERSION}. Aborting."
exit 1
fi
{
echo 'changelog<<EOF'
echo "## Elden Ring app ver. ${GAME_VERSION}"
echo "${changelog}"
echo EOF
} >> $GITHUB_OUTPUT
outputs:
changelog: ${{ steps.extract_changelog.outputs.changelog }}

publish-release:
runs-on: ubuntu-latest
needs:
- build
- check-version
- generate-changelog
if: github.event_name == 'push'
steps:
- name: Download build artifact
uses: actions/download-artifact@v4
with:
name: ${{ needs.build.outputs.build-artifact-name }}
path: dist

- name: Create zip
run: zip ${{ needs.build.outputs.build-artifact-name }}.zip dist/* -r

- name: Publish release
uses: softprops/action-gh-release@v2
with:
name: Release ${{ needs.build.outputs.release-tag }}
tag_name: ${{ needs.build.outputs.release-tag }}
body: ${{ needs.generate-changelog.outputs.changelog }}
files: ${{ needs.build.outputs.build-artifact-name }}.zip
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
Releases/*
dist/
CheatTable/Files/
__pycache__
12 changes: 10 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
"clangd.fallbackFlags": [
"-I${workspaceFolder}/resources/include",
"-IC:/Program Files/Cheat Engine 7.4/include",
"-IC:/Program Files/Cheat Engine 7.5/include",
"-xc",
"-std=gnu99"
]
],
"Lua.runtime.version": "Lua 5.3",
"Lua.diagnostics.disable": [
"lowercase-global",
"undefined-global"
],
"files.associations": {
"*.cea": "lua" // TODO: Make language extension for CE that dispatches to lua/C/AA accordingly
}
}
62 changes: 62 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "TGA: Generate Missing XML",
"type": "shell",
"command": "./scripts/check.sh",
"windows": {
"command": ".\\scripts\\check.bat"
},
"args": ["--fixup"],
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
}
},
{
"label": "TGA: Build Table",
"type": "shell",
"command": "./scripts/build.sh",
"windows": {
"command": ".\\scripts\\build.bat"
},
"group": "build",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
}
},
{
"label": "TGA: Build table and generate missing XML",
"type": "shell",
"command": "./scripts/build.sh",
"windows": {
"command": ".\\scripts\\build.bat"
},
"args": ["--fixup"],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": false
},
"problemMatcher": []
}
]
}
3 changes: 3 additions & 0 deletions BUILD_ENV
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TABLE_VERSION=1.14.0
GAME_VERSION=1.12.3
MIN_CE_VERSION=7.4
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
# Changelog
## [Unreleased]

## [v1.14.0] - 2024-07-29
### Added
- by [Dasaav](https://github.com/Dasaav-dsv/)
- Save Character Flags, saves a list of all your flags to a file
- Event Flags lua rewrite
- New lua functions:
- booltonumber(bool)
- getPlayerIns(addr_or_slot) / getEnemyIns(addr)
### Changed
- ItemGive now sets maxNum depending on potGroupId when relevant
- Functions made accessible from anywhere:
- Lua rewrite of AddSoul
- Lua rewrite of ItemDrop
- SpEffect.add, SpEffect.erase, SpEffect.remove
- PlayAnimation
- BulletSpawn.create
- ef.getFlag rewrite
- ef.setFlag rewrite
- ef.batchSetFlags
### Fixed
- "Remove by Item ID" for Storage Chest
- "Unlock all Summoning Pools" thanks to [ivi](https://github.com/ividyon), also includes DLC summoning pools now
- Session Info equipment for real
- Focus, Stamina, Great Rune offsets
- Currently Equipped Magic helper shows correct spell more reliably
- Invasion Regions code by SeriouslyCasual and [Dasaav](https://github.com/Dasaav-dsv/)
- Teleport to Map-Relative Coordinates offsets

## [v1.13.0] - 2024-07-05
### Added
- full EquipItemData header
Expand Down Expand Up @@ -603,7 +631,8 @@
- Custom FPS Limit


[unreleased]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.13.0...dev
[unreleased]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.14.0...dev
[v1.14.0]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.13.0...v1.14.0
[v1.13.0]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.12.1...v1.13.0
[v1.12.1]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.12.0...v1.12.1
[v1.12.0]: https://github.com/inunorii/Elden-Ring-CT-TGA/compare/v1.11.2...v1.12.0
Expand Down
1 change: 1 addition & 0 deletions CheatTable/.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<CheatTable CheatEngineTableVersion="45"/>
5 changes: 5 additions & 0 deletions CheatTable/CheatEntries/.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<CheatEntry>
<x-ce2fs-child-order>
<id id="0"/>
</x-ce2fs-child-order>
</CheatEntry>
Loading

0 comments on commit 75a8493

Please sign in to comment.