Skip to content

Commit

Permalink
修改了崔凡客得几堵遮挡视线的墙,再也不怕瘸子在墙后看不到了 (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wing924 authored Nov 28, 2022
1 parent 939df02 commit e62344d
Show file tree
Hide file tree
Showing 74 changed files with 147,792 additions and 598 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGE-LOG

## unreleased

### New Features

- 修改了崔凡客得几堵遮挡视线的墙,再也不怕瘸子在墙后看不到了
- 特等改为红色,更醒目

## v1.7.1

### Improvements
Expand Down
2 changes: 2 additions & 0 deletions config/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ patches:
- patches/05_entrance_light
- patches/06_highlight_cain
- patches/07_layout
# - patches/08_waypoint_light # only available on startup
- patches/09_better_arrow
- patches/10_global_light
- patches/11_level_names
- patches/12_levelgroup_res
- patches/13_base_item_desc
- patches/14_hide_wall

pipelines:
- name: add English name and detailed info (base item)
Expand Down
1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephcomp.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephe.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephe2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephetheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephew.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephew2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephewarp.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephewarpd.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephewarpu.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephewtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephn.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephn2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephne.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephne2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnetheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnew.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnew2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnewtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephns.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephns2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnse.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnse2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnsetheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnsew.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnsew2.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnstheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnsw.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnsw2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnswtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephntheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnw.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnw2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnwarp.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnwarpd.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnwarpu.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephnwtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephs.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephs2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephse.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephse2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsetheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsew.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsew2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsewtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephstheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsw.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephsw2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephswarp.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephswarpd.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephswarpu.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephswtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephw.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephw2.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephwtheme.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephwwarp.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephwwarpd.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/mephwwarpu.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travn.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travne.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travnw.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travs.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travse.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions origin/data/hd/env/preset/act3/travincal/travsw.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions patches/11_level_names/data/local/lng/strings/levels.json.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -eu
set -eu -o pipefail

NEW_KEYS=(
2 "Sewers Level 1"
Expand All @@ -19,7 +19,7 @@ new_keys_json="$tmpdir/new_keys.json"

cat > "$levels_json"

for i in $(seq 0 2 ${#NEW_KEYS[*]}); do
for i in $(seq 0 2 $((${#NEW_KEYS[*]} - 1)) ); do
act="${NEW_KEYS[$i]}"
key="${NEW_KEYS[$(($i + 1))]}"
cat "$levels_json" | jq ".[] | select(.Key == \"$key\") | (.Key |= \"act$act \" + .) | (.id |= -1)"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"entities": [
{
"name": "plain_wall01_02",
"components": [
{
"name": "plain_wall01_02_components_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
},
{
"name": "plain_wall01_03",
"components": [
{
"name": "plain_wall01_03_components_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
},
{
"name": "plain_wall01_04",
"components": [
{
"name": "plain_wall01_04_components_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
},
{
"name": "ornate_wall05_01",
"components": [
{
"name": "ornate_wall05_01_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
},
{
"name": "ornate_wall05_02",
"components": [
{
"name": "ornate_wall05_02_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
},
{
"name": "plain_wall_large01_01",
"components": [
{
"name": "plain_wall_large01_01_TransformDefinitionComponent",
"scale": {
"y": 0.33
}
}
]
}
]
}
2 changes: 1 addition & 1 deletion resources/text_modify.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ id Key zhTW prefix newName suffix
5018 Tristram 崔斯特姆 A1:[6|39|76] A5:[50|75|83]
1711 HiqualityFormat %0%1 %1 %0
1712 LowqualityFormat %0%1 (null)
1727 Hiquality 特等的 [特等]
1727 Hiquality 特等的 ÿc1[特等]ÿc0
27186 DiabloCloneMessageTierOne 恐懼默默凝視聖休亞瑞。 【1/6】
27187 DiabloCloneMessageTierTwo 恐懼逐漸逼近聖休亞瑞。 【2/6】
27188 DiabloCloneMessageTierThree 恐懼開始滲入聖休亞瑞。 【3/6】
Expand Down
9 changes: 7 additions & 2 deletions scripts/build-patch.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -eu
set -eu -o pipefail

std_json=build/bin/std-json
jsonpatch=build/bin/jsonpatch
Expand Down Expand Up @@ -113,6 +113,11 @@ while IFS= read -r -d '' patch_file; do
spruce diff "$std_origin" "$dst_file" || :
;;
*.json|*.txt|*.sh)
$DIFF --strip-trailing-cr -u "$origin_file" "$dst_file" || :
dst_file_size="$(cat "$dst_file" | wc -c)"
if [[ $dst_file_size < 1048576 ]]; then
$DIFF --strip-trailing-cr -u "$origin_file" "$dst_file" || :
else
echo "skip diff becasue the file is too large: $dst_file"
fi
esac
done < <(find "$patch_dir/data" -type f -print0)
Loading

0 comments on commit e62344d

Please sign in to comment.