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:
@@ -25,36 +25,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@v6
-        with:
-            fetch-depth: 0
-      - 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
 
@@ -71,19 +48,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
@@ -284,6 +288,11 @@ This page lists all the individual contributions to the project by their author.
   - Owner change during buildup bugfix
   - Subterranean harvester pathfinding fix
   - Toggle to exclude technos from base center calculations
+  - Deploy priority filtering
+  - Customizable paradrop missions
+  - Guard range customizations
+  - Wall overlay unit sell exploit fix
+  - Fix vehicles disguised as trees incorrectly displaying veterancy insignia when they shouldn't
 - **Morton (MortonPL)**:
   - `XDrawOffset` for animations
   - Shield passthrough & absorption
@@ -405,6 +414,11 @@ This page lists all the individual contributions to the project by their author.
   - Map Action 511, 609, 610
   - Weapons now support `AttackFriendlies` and `AttackCursorOnFriendlies`
   - Attack non-threatening structures extensions
+  - Vehicle Deployment Enhancement
+  - Fix an issue where miners affected by `Passengers/DeployFire` were unable to unload minerals
+  - Fix an issue where mining vehicles could not move after leaving a tank bunker
+  - Fixed the bug in AI scripts 56 and 57 that forced the launch of superweapons with index numbers 3 and 4
+  - Fix rare cases where paradropped techno killed by falling down
 - **NetsuNegi**:
   - Forbidding parallel AI queues by type
   - Jumpjet crash speed fix when crashing onto building
@@ -480,6 +494,22 @@ This page lists all the individual contributions to the project by their author.
   - Fix the bug that weapon cannot used to intercept on gound bullet if it's projectile has `AG=no`
   - Customize size for mind controlled unit
   - Fix the issue that weapon selection don't check if secondary's warhead has `IsLocomotor=yes`
+  - Fix the issue that warhead with `IsLocomotor=yes` can be used to vehicles who is in tank bunker
+  - Fix the bug that if there's a tank in tank bunker, tank bunker use auto death by vanish will cause tank get stuck and game will crash quickly
+  - Customize whether weapon can be used to targeting ironcurtained technos or not
+  - Fix the bug where selected technos would lose their selection if their regular mind control was replaced with permanent mind control or with the control from the Psychic Dominator superweapon
+  - Fix the bug that building with `Explodes=yes` use Ares's rubble logic will cause it's owner cannot defeat normally
+  - Customizable disk drain logic
+  - Fix the bug that cause technos teleport to cell 0,0 by ChronoSphere superweapon
+  - Fix the bug that techno in attack move will move to target if it cannot attack it
+  - Penetrates damage on transporter
+  - Add amount limit of `LimboKill`
+  - Spawns particle when spawns tiberium by terrain
+  - Allow draw SuperWeapon timer as percentage
+  - Customize particle system of parasite logic
+  - Fix an issue where parasites that have infected infantry do not provide a refund when the infected infantry enters a Grinding building
+  - Fix the issue that `PassengerDeletion` dont consider passenger's passenger, parasite and hijacker
+  - Fix the issue that power output of building on tooltip won't consider power enhancer
 - **Apollo** - Translucent SHP drawing patches
 - **ststl**:
   - Customizable `ShowTimer` priority of superweapons
@@ -525,7 +555,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
@@ -582,6 +612,7 @@ This page lists all the individual contributions to the project by their author.
   - Fix an issue that the currently hovered planning node not update up-to-date, such as using hotkeys to select technos
   - Allow the aircraft to enter area guard mission and not crash immediately without any airport
   - Allow merging AOE damage to buildings into one
+  - Fix the bug that `DeploysInto` and `UndeploysInto` will make damaged techno lose 1 health
 - **Ollerus**:
   - Build limit group enhancement
   - Customizable rocker amplitude
@@ -607,6 +638,9 @@ This page lists all the individual contributions to the project by their author.
   - Toggle off laser trail and shake effects
   - OpenTopped range bonus and damage multiplier customization for passengers
   - AutoDeath upon ownership change
+  - Maximum amount for power plant enhancer
+  - Return warhead
+  - Fix rare cases where paradropped techno killed by falling down
 - **NaotoYuuki** - Vertical & meteor trajectory projectile prototypes
 - **handama** - AI script action to `16005 Jump Back To Previous Script`
 - **TaranDahl (航味麻酱)**:
@@ -673,14 +707,28 @@ This page lists all the individual contributions to the project by their author.
   - Fix an issue that rockets do not consider the destination altitude during climbing
   - Fix an issue that the AI would set anger towards friendly houses, causing it to act stupidly
   - Fix an issue that the AI would look for the first house in the array as an enemy instead of the nearest one when there were no enemies
+  - `AllowBerzerkOnAllies`
+  - Fix an issue that retaliation will make the unit keep switching among multiple targets with the same amount of threat
+  - Fix an issue where units recruited by a team with `AreTeamMembersRecruitable=false` cannot be recruited even if they have been liberated by that team
+  - Global default value for `DefaultToGuardArea`
+  - Weapon range finding in cylinder
+  - Allow jumpjet climbing ignore building height
+  - Fix an issue where the AI's regular targeting would also target garrisonable buildings
+  - Fix an issue that the move mission of the jumpjet does not end correctly
+  - Fix the issue that the Jumpjet must end its movement before starting the next mission
+  - Taunt warhead
 - **solar-III (凤九歌)**
   - Target scanning delay customization (documentation)
   - Skip target scanning function calling for unarmed technos (documentation)
-- **Flactine** - add target filtering options to attacheffect system
+- **Flactine**
+  - Add target filtering options to attacheffect system
+  - Add veterancy-based target filtering for weapons and warheads
 - **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**:
@@ -716,3 +764,4 @@ This page lists all the individual contributions to the project by their author.
 - **Dmitry Volkov** - extensive and thorough testing
 - **Rise of the East community** - extensive playtesting of in-dev features
 - **11EJDE11** - Prevent mpdebug number from being drawn when visibility toggled off
+- **CnCRazer** - Wall overlay unit sell exploit fix

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);
+}