Skip to content

Commit

Permalink
Alie Release Cleanup (#16)
Browse files Browse the repository at this point in the history
Clean up some files and window dressings to prep for a release.

* make credits current

* package a changelog

* add lockable flag to a couple doors i missed

* Fixed type in No_Fungi mod in defaults.json

* fixed icon rendering

* Added link to changelog in main readme

* add icon sourcefile for future edits

* write down my linux build scribbles

* scribble down macos build process

* added reference docs so i dont lose them

* giving up on linux for initial release

* replaced images for readme
  • Loading branch information
neonspectra authored Feb 7, 2024
1 parent 67d68e9 commit 95b0715
Show file tree
Hide file tree
Showing 28 changed files with 99 additions and 16 deletions.
23 changes: 15 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
# Cataclysm 2040

<p align="center">
<img src="./data/screenshots/ultica-showcase-sep-2021.png" alt="Tileset: Ultica">
<img src="./data/screenshots/titlebanner.png" alt="Cataclysm 2040">
</p>

---

Five days after an event called the Cataclysm, the mundane routine of a civilized world has transformed into a desparate fight for survival of the human race. From the mist of government conspiracies and cover-ups, the few who saw the coming dangers prepared themselves for the end of the world...

Cataclysm 2040 is a turn-based roguelike survival game set in a cyberpunk post-apocalyptic future. Forked from the critically acclaimed [Cataclysm: Dark Days Ahead](https://github.com/CleverRaven/Cataclysm-DDA/), Cataclysm 2040 is a revival project that seeks to restore the original futuristic setting and thematics of Cataclysm prior to the "present-day" retcon.

*[CHANGELOG](data/changelog.txt)*

---

<p align="center">
<img src="./data/screenshots/showcase-2024.png" alt="Tileset: Chibi Ultica">
</p>

---

## Design Philosophy

In order to properly set the scope for this fork, I'd like to take a moment to discuss the design philosophy behind Cataclysm 2040.
Expand Down Expand Up @@ -49,10 +59,7 @@ I am one person and I don't have hundreds of contributors like C:DDA does, so it

## Core Supported Platforms

As of this writing, this fork is maintained by a single person. As such, Cataclysm 2040 simply doesn't have the capacity to support the broad range of platforms available for Cataclysm: DDA. The only officially supported platforms with pre-compiled release binaries are:

- macOS (arm64 - Apple Silicon)
- Linux (x86_64)
As of this writing, this fork is maintained by a single person. As such, Cataclysm 2040 simply doesn't have the capacity to support the broad range of platforms available for Cataclysm: DDA. Currently, the only officially supported platform with pre-compiled release binaries is macOS (arm64 - Apple Silicon).

No other platforms or architectures are officially supported, but you're free to use the compilation guides written for Cataclysm: DDA to build your own binaries. At this time, we're not in any major package managers.

Expand All @@ -67,7 +74,7 @@ At the current time of writing, I don't have automated CI set up for Cataclysm 2
Cataclysm 2040 pre-built releases are named using the following notation:

Codename BuildDate <--- The convention we use
Alie 2024.1 <--- Example of an actual release version name
Alie 2024.2 <--- Example of an actual release version name

This notation is designed to tell you the release family codename as well as the date that the build was assembled (which has an associated tag in this repo).

Expand Down
Binary file modified build-data/osx/AppIcon.icns
Binary file not shown.
Binary file modified build-data/osx/AppIcon.iconset/icon_128x128.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 modified build-data/osx/AppIcon.iconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build-data/osx/AppIcon.iconset/icon_16x16.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 modified build-data/osx/AppIcon.iconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build-data/osx/AppIcon.iconset/icon_256x256.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 modified build-data/osx/AppIcon.iconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build-data/osx/AppIcon.iconset/icon_32x32.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 modified build-data/osx/AppIcon.iconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build-data/osx/AppIcon.iconset/icon_512x512.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 modified build-data/osx/AppIcon.iconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build-data/osx/AppIcon.iconset/icon_64x64.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 build-data/osx/CD2040-AppIcon_sourcefile.xcf
Binary file not shown.
2 changes: 2 additions & 0 deletions build-scripts/2040/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cataclysm 2040 Build Process
This is a WIP folder for writing down my (currently manual) build process. Eventually, this should be automated via an actual CI script. However, I don't really have the time to do that right now.
15 changes: 15 additions & 0 deletions build-scripts/2040/build_cd2040_linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
# Bypass all linters and checks to build CD2040 (yolo) and then pack it up into a tarball
make -j8 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1 LOCALISE=0 LINTJSON=0 ASTYLE=0 RUNTESTS=0
mkdir cataclysm2040-linux64-tiles-sounds-alie2024_1
mv cataclysm-launcher cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv cataclysm-tiles cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv data cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv gfx cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv lang cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv README.md cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv doc cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv LICENSE.txt cataclysm2040-linux64-tiles-sounds-alie2024_1/
mv LICENSE-OFL-Terminus-Font.txt cataclysm2040-linux64-tiles-sounds-alie2024_1/
tar czf cataclysm2040-linux64-tiles-sounds-alie2024_1.tar.gz cataclysm2040-linux64-tiles-sounds-alie2024_1

11 changes: 11 additions & 0 deletions build-scripts/2040/build_cd2040_macos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
# Build a .app for Apple Silicon, then do the fixes so that it actually works.
# I know building as root is bad. Don't bully me. I ran into some permission issues but didn't have time to fix it. Yolo, I'll fix it later...
make app RELEASE=1 TILES=1 LOCALIZE=0 SOUND=1 NATIVE=osx
cd Cataclysm.app/Contents/Resources/
rm cataclysm-tiles
mv ../../../cataclysm-tiles .
cd ../../../
dylibbundler -of -b -x Cataclysm.app/Contents/Resources/cataclysm-tiles -d Cataclysm.app/Contents/Resources/ -p @Cataclysm.app/
# Turn our .app into a DMG. Needs some cleanup.
# ./node_modules/create-dmg/cli.js Cataclysm.app --dmg-title='Cataclysm 2040'
34 changes: 34 additions & 0 deletions data/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
# Alie 2024.2
This is the initial release for Cataclysm 2040. This development was forked immediately after Cataclysm:DDA 0.G.

Features:
(#13) Lock Vehicle Doors (DDA61087)

Content:
(#11) Restore CBMs from Zombie Corpses
(#17) Remove AFS Formless Ruins

Interface:
0d6070e Made ChibiUltica the default tileset

Mods:
(#3) Fixed & un-deprecated No Fungi mod
(#4) Add Whaley Hair and Tattoo
(#5) Backport Sky Islands
(#9) Add Useful Helicopters and make piloting/A&P mechanic free
(#10) Set Default Mods

Balance:
(#2) Remove Proficiencies
(#7) Disable Portal Storms
(#8) Remove Welding Rods
(#14) Turn Skill Rust off by default

Build:
(#1) Apple Silicon support
(#15) Define Release Model

---
# Cataclysm: Dark Days Ahead below this line
---

# 0.G (Gaiman)

## Highlights
Expand Down
16 changes: 14 additions & 2 deletions data/credits/en.credits
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@
# The following line is for reference
##############################################################################
<color_white>Original author:</color> <color_white>Project Manager:</color>
<color_yellow>Whales</color> (<color_dark_gray>retired</color>) <color_yellow>KevinGranade</color>
<color_yellow>Whales</color> (<color_dark_gray>retired</color>) <color_yellow>Neon</color>

<color_white>Current Main Developers:</color>
<color_white>Special thanks to:</color>
<color_yellow>The entire CleverRaven team</color> - For maintaining the amazing game this fork is based off of.

<color_white>For web details about the project please see:</color>
<color_cyan>https://github.com/neonspectra/Cataclysm-2040</color>

<color_light_cyan>Cataclysm</color> <color_pink>2040</color> is released under <color_white>CC-BY-SA 3.0</color>:
<color_cyan>https://creativecommons.org/licenses/by-sa/3.0/</color>

******************************************************************************

<color_white>Main Developers (<color_cyan>0.G</color>):</color>
<color_yellow>Kevin Granade</color> - C:DDA project maintainer.
<color_yellow>I-am-Erk</color> - Ultica, lore writing, ideas guy.
<color_yellow>KorGgenT</color> - Professional yak shaver.

Expand Down
10 changes: 5 additions & 5 deletions data/json/vehicleparts/doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"damage_reduction": { "all": 20 },
"description": "A door. Solid construction means you can't see through it when closed.",
"durability": 240,
"flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
"flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR", "LOCKABLE_DOOR" ],
"item": "frame",
"location": "center",
"looks_like": "door",
Expand Down Expand Up @@ -165,7 +165,7 @@
"damage_reduction": { "all": 30 },
"description": "A strong door. Solid construction means you can't see through it when closed.",
"durability": 660,
"flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
"flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "door_opaque",
Expand Down Expand Up @@ -253,7 +253,7 @@
"damage_reduction": { "all": 20 },
"description": "A strong door. Solid construction means you can't see through it when closed.",
"durability": 450,
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR", "LOCKABLE_DOOR" ],
"item": "frame",
"location": "center",
"looks_like": "door_opaque",
Expand All @@ -279,7 +279,7 @@
"damage_reduction": { "all": 30 },
"description": "A very strong door. A window lets you see through it when closed.",
"durability": 900,
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "hatch",
Expand All @@ -305,7 +305,7 @@
"damage_reduction": { "all": 30 },
"description": "A very strong door. Solid construction means you can't see through it when closed.",
"durability": 1000,
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
"flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "hatch_opaque",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"id": "dev:default",
"name": "default",
"description": "contains all the mods recommended by the developers",
"dependencies": [ "dda", "aftershock", "no_npc_food", "personal_portal_storms", "no_fungal_growth", "no_fungi", "package_bionic_professions", "blazeindustries", "useful_helicopters", "Tamable_Wildlife", "MMA", "WHALEYHAIR1", "magiclysm" ]
"dependencies": [ "dda", "aftershock", "no_npc_food", "personal_portal_storms", "no_fungal_growth", "No_Fungi", "package_bionic_professions", "blazeindustries", "useful_helicopters", "Tamable_Wildlife", "WHALEYHAIR1", "magiclysm" ]
}
]
Binary file added data/screenshots/showcase-2024.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 data/screenshots/titlebanner.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 removed data/screenshots/ultica-showcase-sep-2021.png
Binary file not shown.
Binary file added doc/2040/C DDA Design Outline.pdf
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions doc/2040/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Cataclysm 2040 Documentation
This folder is for 2040-specific documentation. As of now, but much is in here. For now, I'm mainly using this as a dumping ground for historical design documents that reference the 2040 setting in case they get removed from the internet so that we can access them later.
Binary file not shown.

0 comments on commit 95b0715

Please sign in to comment.