Skip to content

Commit

Permalink
[HM] Finalize HollowMoon setup (I-am-Erk#623)
Browse files Browse the repository at this point in the history
* Add compose workflow and expand pr_validator

* Move generic.png to template folder

* fix zombie skull and zombie soldier folder structure

* Run script to create the missing seasonal variants

* Fix compose errors

* Fix some json, offsets and background of trees

* Fix some sprite with wrong background
  • Loading branch information
Fris0uman authored May 24, 2021
1 parent 7279d73 commit bd4292f
Show file tree
Hide file tree
Showing 5,510 changed files with 233 additions and 96 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
62 changes: 62 additions & 0 deletions .github/workflows/hm_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# preforms CI builds using compose.py from
# https://github.com/CleverRaven/Cataclysm-DDA
#
# This action is triggerd by any PR against the master branch as well
# as on any push to the master branch itself
# that changes any file in gfx/HollowMoon folder
name: HollowMoon composer

on:
push:
branches:
- master
paths:
- 'gfx/HollowMoon/**'
- '.github/workflows/hm_build.yml'
pull_request:
branches:
- master
paths:
- 'gfx/HollowMoon/**'
- '.github/workflows/hm_build.yml'

jobs:
build:
name: CI Build
runs-on: ubuntu-latest
container: alpine:latest
steps:
- name: Install Dependencies
run: |
apk add --no-cache musl-dev gcc vips-dev python3-dev zip py3-pip py3-wheel
pip3 install pyvips
- name: Checkout Code
uses: actions/checkout@v2

- name: Build
id: build
run: |
mkdir build && cd build
wget -q https://raw.githubusercontent.com/CleverRaven/Cataclysm-DDA/master/tools/gfx_tools/compose.py \
|| echo "Error: Failed to get compose.py"
cd ..
python3 build/compose.py --use-all --obsolete-fillers gfx/HollowMoon
cd build
artifact_name=HollowMoon-$(echo $GITHUB_SHA | cut -c -8)
tileset_dir=../gfx/HollowMoon
mkdir $artifact_name
mv $tileset_dir/*.png $artifact_name
mv $tileset_dir/tile_config.json $artifact_name
mv $tileset_dir/tileset.txt $artifact_name
echo ::set-output name=artifact_name::$artifact_name
- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: ${{ steps.build.outputs.artifact_name }}
path: build/${{ steps.build.outputs.artifact_name }}
2 changes: 1 addition & 1 deletion .github/workflows/pr_validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
- name: "Validate SUMMARY"
uses: CleverRaven/pr-validator@master
with:
description-regex: '(\n|^)#### Summary\s+(None|((Ultica|Ultica-iso|Chibi-Ultica|NeoDays|RetroDays|MSX|BLB|Chesthole|MD|Infrastructure) +".*"))\s*(\n|$)'
description-regex: '(\n|^)#### Summary\s+(None|((Ultica|Ultica-iso|Chibi-Ultica|NeoDays|RetroDays|MSX|BLB|Chesthole|MD|HM|Infrastructure) +".*"))\s*(\n|$)'
description-regex-flags: 'i'
Binary file added gfx/HollowMoon/palette/palette_season_autumn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/HollowMoon/palette/palette_season_spring.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/HollowMoon/palette/palette_season_summer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/HollowMoon/palette/palette_season_winter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 25 additions & 5 deletions gfx/HollowMoon/pngs_giant_64x64/terrain/t_tree/t_tree.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
[
{ "id": "t_tree", "fg": "t_tree", "bg": [], "rotates": false },
{ "id": "t_tree_season_autumn", "fg": "t_tree_autumn", "bg": [], "rotates": false },
{ "id": "t_tree_season_winter", "fg": "t_tree_winter", "bg": [], "rotates": false },
{ "id": "t_tree_season_summer", "fg": "t_tree_summer", "bg": [], "rotates": false }
]
{
"id": "t_tree",
"fg": "t_tree",
"bg": [ "t_grass_giant" ],
"rotates": false
},
{
"id": "t_tree_season_autumn",
"fg": "t_tree_autumn",
"bg": [ "t_grass_giant_autumn" ],
"rotates": false
},
{
"id": "t_tree_season_winter",
"fg": "t_tree_winter",
"bg": [ "t_grass_giant_winter" ],
"rotates": false
},
{
"id": "t_tree_season_summer",
"fg": "t_tree_summer",
"bg": [ "t_grass_giant_summer" ],
"rotates": false
}
]
30 changes: 25 additions & 5 deletions gfx/HollowMoon/pngs_giant_64x64/terrain/t_tree_oak/t_tree_oak.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
[
{ "id": "t_tree_oak", "fg": "t_tree_oak", "bg": [], "rotates": false },
{ "id": "t_tree_oak_season_autumn", "fg": "t_tree_oak_autumn", "bg": [], "rotates": false },
{ "id": "t_tree_oak_season_winter", "fg": "t_tree_oak_winter", "bg": [], "rotates": false },
{ "id": "t_tree_oak_season_summer", "fg": "t_tree_oak_summer", "bg": [], "rotates": false }
]
{
"id": "t_tree_oak_season_spring",
"fg": "t_tree_oak_season_spring",
"bg": [ "t_grass_giant" ],
"rotates": false
},
{
"id": "t_tree_oak_season_autumn",
"fg": "t_tree_oak_season_autumn",
"bg": [ "t_grass_giant_autumn" ],
"rotates": false
},
{
"id": "t_tree_oak_season_winter",
"fg": "t_tree_oak_season_winter",
"bg": [ "t_grass_giant_winter" ],
"rotates": false
},
{
"id": "t_tree_oak_season_summer",
"fg": "t_tree_oak_season_summer",
"bg": [ "t_grass_giant_summer" ],
"rotates": false
}
]
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed gfx/HollowMoon/pngs_normal_24x24/ammo/12mm/12mm.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit bd4292f

Please sign in to comment.