Mix e cpack

.github/pull_request_template.md

@@ -1,2 +1 @@
-<!-- Please manually add a label named [No Documentation Needed] if this change should not be mentioned in documentation, what's new and no credit needs to be given.
-If the changes are solely made to the documentation, please set the target branch to the pull request named "Weekly Regular Documentation Revisions", rather than the repository's existing branches. -->
+<!-- 注意提交请求时选择分支 Mix-ECpack ，并将功能说明和改动内容填写进《整合包说明》中的对应文档 -->

.github/workflows/nightly.yml

@@ -3,9 +3,7 @@ name: Nightly Build
 on:
   push:
     branches:
-    - master
-    - main
-    - develop
+    - Mix-ECpack
 
 env:
   # Path to the solution file relative to the root of the project.

.github/workflows/pr-doc-checker.yml

@@ -9,7 +9,7 @@ on:
       - labeled
       - unlabeled
 env:
-  BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+  BASE_REF: ${{ github.event.pull_request.base.sha }}
 
 jobs:
   Changelog-Check:
@@ -23,34 +23,13 @@ jobs:
       - name: Check that Changelog has been updated
         run: |
           # Check that Changelog has been updated
-          if (git diff --name-only $(git merge-base origin/$BASE_BRANCH HEAD) | grep ^docs/Whats-New.md$)
+          if ! git diff --quiet $(git merge-base $BASE_REF HEAD) -- "整合包说明/更新改动说明.md";
           then
-            echo "Thank you for remembering to update the Changelog! 😋"
+            echo "感谢您记得更新变更日志！😋"
             exit 0
           else
-            echo "It looks like you forgot to update the Changelog! 🧐"
-            echo "Please, mention your changes in 'docs/Whats-New.md' or use [No Documentation Needed] label for your Pull Request."
-            exit 1
-          fi
-
-  Credits-Check:
-    name: Credits List Mention
-    # If the No Documentation Needed or Bugfix label is set, then workflow will not be executed
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'No Documentation Needed') && !contains(github.event.pull_request.labels.*.name, 'Bugfix') }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Check that Credits List has been updated
-        run: |
-          # Check that Credits List has been updated
-          if (git diff --name-only $(git merge-base origin/$BASE_BRANCH HEAD) | grep ^CREDITS.md$)
-          then
-            echo "Thank you for remembering to update the Credits List! 😋"
-            exit 0
-          else
-            echo "It looks like you forgot to update the Credits List! 🧐"
-            echo "Please, mention your contribution in 'CREDITS.md' or use [No Documentation Needed] label for your Pull Request."
+            echo "你好像忘了更新变更日志！🧐"
+            echo "请在“整合包说明/更新改动说明”中提及您的更改。"
             exit 1
           fi
 
@@ -65,19 +44,12 @@ jobs:
       - name: Check that Documentation has been updated
         run: |
           # Check that Documentation has been updated
-          if (git diff --name-only $(git merge-base origin/$BASE_BRANCH HEAD) | \
-              grep \
-              -e ^docs/New-or-Enhanced-Logics.md$   \
-              -e ^docs/Fixed-or-Improved-Logics.md$ \
-              -e ^docs/AI-Scripting-and-Mapping.md$ \
-              -e ^docs/User-Interface.md$           \
-              -e ^docs/Miscellanous.md$             \
-          )
+          if ! git diff --quiet $(git merge-base $BASE_REF HEAD) -- "整合包说明/额外功能说明.md";
           then
-            echo "Thank you for remembering to add your changes to the docs! 😋"
+            echo "感谢您记得更新功能说明！😋"
             exit 0
           else
-            echo "It looks like you forgot to add your changes to the docs! 🧐"
-            echo "Please, document your changes or use [No Documentation Needed] label for your Pull Request."
+            echo "你好像忘了更新功能说明！🧐"
+            echo "请在“整合包说明/额外功能说明”中提及您的更改。"
             exit 1
           fi

.vscode/tasks.json

@@ -67,6 +67,16 @@
         "panel": "shared",
         "showReuseMessage": false
       }
+    },
+    {
+        "label": "Convert to UTF-8 with BOM",
+        "type": "shell",
+        "command": "powershell",
+        "args": [
+            "-Command",
+            "Get-ChildItem -Recurse -Include *.cpp,*.h,*.hpp,*.c | ForEach-Object { $content = Get-Content $_.FullName -Raw; [System.IO.File]::WriteAllText($_.FullName, $content, [System.Text.Encoding]::UTF8) }"
+        ],
+        "problemMatcher": []
     }
   ],
   "inputs": [

CREDITS.md

@@ -39,6 +39,7 @@ This page lists all the individual contributions to the project by their author.
   - Recursive transport killer fix
   - Custom locomotors example implementation and piggybacking test warheads
   - Initial jumpjet facing fix
+  - Techno Attachment logic
   - Migration utility
   - GitHub Actions setup
   - Official docs
@@ -147,6 +148,7 @@ This page lists all the individual contributions to the project by their author.
   - Shared ammo logic
   - Customizable FLH when infantry is prone or deployed
   - Initial strength for cloned infantry
+  - Grant new superweapons in superweapons
   - Map Events 604 & 605 for checking if a specific Techno enters in a cell
   - Warhead that can not kill
   - `Pips.HideIfNoStrength` and `SelfHealing.EnabledBy` additions for shields
@@ -261,6 +263,8 @@ This page lists all the individual contributions to the project by their author.
   - Customizable ChronoSphere teleport delays for units
   - Allowed and disallowed types for `FactoryPlant`
   - Forbidding parallel AI queues for specific TechnoTypes
+  - Vehicles keeping target on move command
+  - Reimplemented `Airburst` & `Splits` logic with more customization options
   - Nonprovocative Warheads
   - Customizing effect of level lighting on air units
   - Reimplemented `Airburst` & `Splits` logic with more customization options
@@ -514,7 +518,7 @@ This page lists all the individual contributions to the project by their author.
   - Use 2D distance instead of 3D to check whether in air team members have arrived destination
   - No rearm and reload in EMP or temporal
   - Enhanced Straight trajectory
-  - Enable Building Production Queue
+  - Enable building production queue
   - Fix for sidebar not updating queued unit numbers when on hold
   - New Parabola trajectory
   - Enhanced Bombard trajectory
@@ -665,7 +669,9 @@ This page lists all the individual contributions to the project by their author.
 - **tyuah8**:
   - Drive/Jumpjet/Ship/Teleport locomotor did not power on when it is un-piggybacked bugfix
   - Destroyed unit leaves sensors bugfix
-- **Aephiex** - initial fix for Ares academy not working on the initial payloads of vehicles built from a war factory
+- **Aephiex**:
+  - initial fix for Ares academy not working on the initial payloads of vehicles built from a war factory
+  - Aggressive stance toggle command (auto target unarmed enemy buildings)
 - **Multfinite** - Allow to toggle main exception handler via command line argument `-ExceptionHandler=boolean`
 - **hejiajun107, Xkein** - Fix a jumpjet crash related to voxel shadow drawing
 - **Ares developers**:

ECSDK/EC.Listener.h

@@ -0,0 +1,79 @@
+#pragma once
+#include "IH.Loader.h"
+
+
+struct ExceptionAnalyzer
+{
+	//行为受SyringeIH是否存在影响，可以通过 HasSyringeIH() 确定是否存在。
+	void (CALLBACK* AnalyzeAddr)(DWORD /*In*/ Addr, size_t /*In*/ BaseDescBufSize, DWORD& /*Out*/ RelAddr, char* /*Out GBK*/ BaseDesc);
+	void (CALLBACK* GetAccessStr)(LPVOID /*In*/ Addr, size_t /*In*/ BaseDescBufSize, char* /*Out GBK*/ AccessStr);
+	bool (CALLBACK* IsAddrExecutable)(LPVOID /*In*/ Addr);
+	void (CALLBACK* WriteToExceptIH)(const char* /*In GBK*/ Format, ...);
+
+	int Reserved[4];
+};
+
+/*
+前排：
+EC监听器的实现还是初始服务接口
+本质是一个叫做EC::Internal::ListenerAccess的服务
+以后一些乱七八糟的功能也会用服务接口给
+（或许这样初始服务看起来会不那么废物？）
+*/
+
+namespace ECListener
+{
+	void Set(const char* ListenerType, LibFuncHandle Function);
+
+	LibFuncHandle Get(const char* ListenerType);
+
+	void Remove(const char* ListenerType);
+
+	std::vector<LibFuncHandle> GetAll(const char* ListenerType);
+
+	//!!一个库每件事只能有一个监听器!!
+
+	//在EXE的最开始，全局对象初始化完成，内存可分配，Winmain顶头位置
+	//完成一些必要的初始化工作
+	typedef void (CALLBACK* Listener_InitBeforeEverything)();
+	void Listen_InitBeforeEverything(Listener_InitBeforeEverything Func);
+
+	//在读入rules（如rulesmd.ini，地图文件）等时触发
+	//Listen_LoadBeforeTypeData在原版的类型读取前触发
+	//Listen_LoadAfterTypeData在原版的类型读取后触发
+	//载入或更新设置
+	typedef void (CALLBACK* Listener_OnLoadGame)(const CCINIClass* pIni);
+	void Listen_LoadBeforeTypeData(Listener_OnLoadGame Func);
+	void Listen_LoadAfterTypeData(Listener_OnLoadGame Func);
+
+	//在触发FE时调用，入参为一组在异常状态下可以安全分析内存的函数
+	//记录必要的错误信息，转存入except_ih.txt
+	typedef void (CALLBACK* Listener_BeginWritingExceptIH)(const ExceptionAnalyzer& Anal);
+	void Listen_BeginWritingExceptIH(Listener_BeginWritingExceptIH Func);
+
+	//在载入CSF条目时调用，可以截留CSF的解析
+	//如果想要修改解析的结果，可以返回非零值作为新的解析结果，要求返回的const wchar_t*是非临时值，生命期一直保持
+	//监听函数返回nullptr，则返回原有查找策略
+	typedef const wchar_t* (CALLBACK* Listener_LoadCSFString)(const char* pLabel);
+	void Listen_LoadCSFString(Listener_LoadCSFString Func);
+
+	//对局从INI载入时，载入过程当中触发
+	typedef void (CALLBACK* Listener_LoadScenario)();
+	void Listen_LoadScenario(Listener_LoadScenario Func);
+
+	//从存档载入对局时，载入完成后将会调用
+	// HasWIC() == true 时可以工作
+	// 什么，不要问我为什么这个必样的函数执行的时候Swizzle怎么还没生效
+	typedef void (CALLBACK* Listener_AfterLoadGame)();
+	void Listen_AfterLoadGame(Listener_AfterLoadGame Func);
+
+	//从INI、地图载入对局时，载入完成后将会调用
+	// HasWIC() == true 时可以工作
+	typedef void (CALLBACK* Listener_AfterLoadINI)();
+	void Listen_AfterLoadINI(Listener_AfterLoadINI Func);
+
+	//对局结束，清理数据时将会调用
+	// HasWIC() == true 时可以工作
+	typedef void (CALLBACK* Listener_ClearScenario)();
+	void Listen_ClearScenario(Listener_ClearScenario Func);
+}