1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 10:59:24 +08:00

Merge remote-tracking branch 'LmeSzinc/master' into dev

# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
This commit is contained in:
0O0o0oOoO00
2026-01-23 10:21:18 +08:00
56 changed files with 311 additions and 581 deletions

View File

@@ -1342,7 +1342,7 @@
"AmbushEvade": true
},
"Coalition": {
"Mode": "area1-normal",
"Mode": "hard",
"Fleet": "single"
},
"StopCondition": {
@@ -1932,7 +1932,7 @@
"AmbushEvade": true
},
"Coalition": {
"Mode": "area1-normal",
"Mode": "sp",
"Fleet": "single"
},
"StopCondition": {