Merge pull request #7 from cloudyluna/0.7.0

Release for 0.7.0

CHANGELOG.md

@@ -3,9 +3,19 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+and this project *loosely* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Minor version bumps could mean removal of things.
 
-## [Unreleased]
+## [0.7.0] - 2024-11-07
+
+### Removed
+
+- `Arcana` mod from `#extras`. I personally don't really use it as much and thus I don't see the need for it to be included by default. One can always add this mod manually like any other, though.
+
+### Changed
+
+- Bump `CDDA` game version to `2024-11-03-0625`.
+- Bump `No_rust` from Minimods to `b039afd3007b083d191f4bf63d35f9b28896d8e4`. Previously we were using the Steam 0.G edition with minimal compatibility patch.
+- Bump `Tankmod_Revived` to `e542d43df005acb65468430821bc318886d85bf0`.
 
 ## [0.6.0] - 2024-09-07
 

README.md

@@ -71,7 +71,7 @@ Once it is installed, run `cdda-tiles-launcher` and enjoy the game!
 - `nix run --refresh github:cloudyluna/cdda-custom-experimental#extras`
 
 ## Flake configuration version
-0.6.0
+0.7.0
 
 ## Flake Outputs
 
@@ -100,10 +100,10 @@ pre-built executables from [here](https://github.com/CleverRaven/Cataclysm-DDA/r
 #### Current game type used
 - Edition: Native GUI (tiles) bundled with CC-Sounds sound pack.
   > Note: If CC-Sounds is not enabled by default, you can enable it manually in your game settings! (Options > General > Soundpack)
-- **Version**: 2024-09-06-2220
+- **Version**: 2024-11-03-0625
 - **Supported architecture**: x86_64-linux
-- [Release page](https://github.com/CleverRaven/Cataclysm-DDA/releases/tag/cdda-experimental-2024-09-06-2220)
-- [Full changelog since 2024-08-01-0705](https://github.com/CleverRaven/Cataclysm-DDA/compare/cdda-experimental-2024-08-01-0705...cdda-experimental-2024-09-06-2220)
+- [Release page](https://github.com/CleverRaven/Cataclysm-DDA/releases/tag/cdda-experimental-2024-11-03-0625)
+- [Full changelog since 2024-09-06-2220](https://github.com/CleverRaven/Cataclysm-DDA/compare/cdda-experimental-2024-09-06-2220...cdda-experimental-2024-11-03-0625)
 
 #### Exposed executables:
   - `cdda-tiles-launcher` - ***Most user should use this.*** A shell script to 
@@ -132,11 +132,11 @@ while playing the game.
 > NOTE: Remember to enable them in your world creation menu by pressing 'm' button and select your mod of choice in the world creation screen.
 
 #### Included mods
-- [Tankmod Revived](https://github.com/chaosvolt/cdda-tankmod-revived-mod/tree/70278e9576a875c801ff6848e059312ae97a411c)
+- [Tankmod Revived](https://github.com/chaosvolt/cdda-tankmod-revived-mod/tree/e542d43df005acb65468430821bc318886d85bf0)
    - M1 Abrams, electric powered mini tank, etc. 
-   I love battle tanks in this game! Cozy and comfy.
+   I love battle tanks in this game!
 
-- [Minimods](https://github.com/John-Candlebury/CDDA-Minimods/tree/2b8fbb3ffe1ecded1b0716d6d6601977752457d5)
+- [Minimods](https://github.com/John-Candlebury/CDDA-Minimods/tree/b039afd3007b083d191f4bf63d35f9b28896d8e4)
   - Included submods:
     - ***No Rust*** because I don't want character skills to decay at all.
     Enable this in your mod balance's sub-tab menu.
@@ -148,9 +148,6 @@ while playing the game.
   - Only additional items mod are added which doesn't include the world
   content expansion submod. See [modules/cdda-extras.nix](/modules/cdda-extras.nix) if you want to add.
 
-- [Arcana](https://github.com/chaosvolt/cdda-arcana-mod/tree/76b2dc9257441734baffb0c0e17d50d7a0e58073)
-  - Magical items, professions and all the wizardry lore goodness.
-
 #### Included tilesets
 - [UndeadPeopleTileset](https://github.com/Theawesomeboophis/UndeadPeopleTileset/tree/65a9f538897643c084c93133861eb13e26d47db8)
   - Really good looking tileset/gfx and I personally favor it for most of 

TODO

@@ -1,4 +1,3 @@
-- Enable CC-Sounds by default for CDDA game.
 - Copy the game directory into $USERDIR.
     - Warn that anything that user put in $GAMEDIR in their $USERDIR will lose
     all the new updates from flake $out dir. They need to backup and restore 

modules/cdda-extras.nix

@@ -29,20 +29,20 @@
       subdirs = [ "Tankmod_Revived" ];
       src = fetchGit {
         url = "https://github.com/chaosvolt/cdda-tankmod-revived-mod";
-        rev = "70278e9576a875c801ff6848e059312ae97a411c";
+        rev = "e542d43df005acb65468430821bc318886d85bf0";
         shallow = true;
       };
     }
 
     {
       name = "Minimods";
       subdirs = [
-        "No_rust - Steam 0.G"
+        "No_rust"
         "No_portal_storms - Steam 0.G"
       ];
       src = fetchGit {
         url = "https://github.com/John-Candlebury/CDDA-Minimods";
-        rev = "2b8fbb3ffe1ecded1b0716d6d6601977752457d5";
+        rev = "b039afd3007b083d191f4bf63d35f9b28896d8e4";
         shallow = true;
       };
     }
@@ -64,16 +64,6 @@
         shallow = true;
       };
     }
-
-    {
-      name = "Arcana";
-      subdirs = [ "Arcana" ];
-      src = fetchGit {
-        url = "https://github.com/chaosvolt/cdda-arcana-mod";
-        rev = "76b2dc9257441734baffb0c0e17d50d7a0e58073";
-        shallow = true;
-      };
-    }
   ];
 
   soundPacks = [ ];

modules/cdda-game-settings.nix

@@ -1,11 +1,11 @@
 {
   cdda = rec {
-    version = "2024-09-06-2220";
+    version = "2024-11-03-0625";
     archiveUrl =
       "https://github.com/CleverRaven/Cataclysm-DDA/releases/download"
       + "/cdda-experimental-${version}"
       + "/cdda-linux-tiles-sounds-x64-${version}.tar.gz";
-    hash = "sha256-vJnitJlSP3+kL2GSA/5tl+rfUjn4D1Y1m4ofGu6mKZ4=";
+    hash = "sha256-dorsAaqBcOtN5UO43zkqf3Uo2Di2KISAG1DJdsV6aag=";
     description = "CDDA GUI version (tiles) bundled with CC-Sounds soundpack";
   };
 }

patches/minimods/minimods.patch

@@ -13,24 +13,3 @@ index 3dfb380..620950b 100644
      "category": "rebalance",
      "dependencies": [ "dda" ]
    },
-diff --git a/No_rust - Steam 0.G/modinfo.json b/No_rust - Steam 0.G/modinfo.json
-index 3503451..5c14f38 100644
---- a/No_rust - Steam 0.G/modinfo.json	
-+++ b/No_rust - Steam 0.G/modinfo.json	
-@@ -3,7 +3,6 @@
-     "type": "MOD_INFO",
-     "id": "minimod_no_rust",
-     "name": "0.G. No Skill Rust",
--    "steam_id": 3142744628,
-     "authors": [ "John-Candlebury" ],
-     "maintainers": [ "John-Candlebury" ],
-     "description": "Disables Skill Rust.",
-@@ -22,8 +21,6 @@
-     "id": "NO_SKILL_RUST_TRAIT",
-     "name": { "str": "no skill rust" },
-     "points": 0,
--    "//": "We double dip, but maybe there's no need to?",
--    "skill_rust_multiplier": 0,
-     "enchantments": [ { "condition": "ALLWAYS", "values": [ { "value": "SKILL_RUST_RESIST", "add": 100000 } ] } ],
-     "description": "Disables skill rust."
-   }