Merge pull request #58 from DonovanMods/develop

Develop

.gitignore

@@ -3,6 +3,9 @@
 .vscode/
 obj/
 
-ToDo.md
 debug.xml
 archive/
+
+todo.md
+todo.archive.md
+todo.someday.md

CHANGELOG.md

@@ -0,0 +1,48 @@
+# Donovan Mods CHANGELOG
+
+*NOTE: This log was only started with mod version v21.0.5, please refer to [Github releases] for any previous version information.*
+
+Also, if you want to see what's coming up, check out the [Develop] branch.
+
+## [v21.1.2]
+
+### Added
+
+- New Modlet (AiO): Better Traps - Blade Traps have more health and do slightly more damage
+- New Modlet (AiO): Night Vision Helmet Mod - add a NVG helmet mod (found on Military and Swat Helmets)
+- New Modlet (Optional): Craftable Dukes - craft Dukes from Brass + Iron in the Forge
+
+### Changed
+
+- Moved `donovan-morelootbags` into AiO (A21.1 severely reduces the prob of loot bags drops)
+- Reorganized the folder structure for the modlets
+  - All modlets now live under `modlets`
+  - `modlets/a-la-carte` contains the modlets that are included in `donovan-aio`
+  - `modlets/optional` contains the modlets that are **not** included in `donovan-aio`
+
+## [v21.1.1]
+
+### Added
+
+- New Modlet: Better Batons (AiO) -- makes Batons on par with Spears
+
+### Fixed
+
+- Verify support for A21.1
+
+## [v21.0.5]
+
+### Added
+
+- The Wraith (AiO) -- a new zombie that spawns at night and/or anytime in the wasteland. It's creepy and spooky, it's CROOKY!
+
+### Fixed
+
+- Various bugfixes for A21.0
+
+<!-- Versions -->
+[github releases]: https://github.com/DonovanMods/donovan-7d2d-modlets/releases
+[develop]: https://github.com/DonovanMods/donovan-7d2d-modlets/tree/develop
+[v21.1.2]: https://github.com/DonovanMods/donovan-7d2d-modlets/compare/A21.1.1...A21.1.2
+[v21.1.1]: https://github.com/DonovanMods/donovan-7d2d-modlets/compare/A21.0.5...A21.1.1
+[v21.0.5]: https://github.com/DonovanMods/donovan-7d2d-modlets/compare/A21.0.4...A21.0.5

README.md

@@ -18,53 +18,54 @@ The _All In One_ modlet is a bundle of modlets which _I personally_ recommend fo
 
 Any modlets added after the AiO will overrule what's included in the AiO, esentially replacing the mod with a different one. e.g. `more*` vs `mega*` modlets. So you can start with AiO as your base and add additional ones to customize your experience.
 
-### The List
+- [All-In-One](modlets/donovan-aio) - My "recommended" modlets all bundled together into a single modlet for convience.
 
-- [All-In-One](donovan-aio) - My "recommended" modlets all bundled together into a single modlet for convience.
-
-#### Includes the following mods
+### Included in AiO
 
 Note that any of these mods can also be used a-la-carte, we just bundle them together for convienence in AiO.
 
-- [BetterBlades](donovan-betterblades) - Increases melee damange on bladed weapons, spears, and axes
-- [BetterBuffs](donovan-betterbuffs) - Tweaks (de)buffs; i.e. shorter NearDeathTrauma and no more being thirsty/hungry at 190%
-- [BetterCement](donovan-bettercement) - Create 'Cement Mix' directly in the cement mixer
-- [BetterCollectors](donovan-bettercollectors) - Get more water from dew collectors
-- [BetterDyes](donovan-betterdyes) - Allows all colored dyes to be crafted from paint
-- [BetterPowertools](donovan-betterpowertools) - Makes the Chainsaw, Auger, and Nailgun way more useful
-- [BetterVehicles](donovan-bettervehicles) - Bigger and Faster Vehicles; more storage and +25% normal speed (double that in turbo)
-- [LessGrind](donovan-lessgrind) - Increases the harvest amount of most methods and reduces some resource requirements
-- [LongerLootbags](donovan-longerlootbags) - Decreases the decay rate on zombie lootbags from 5 to 30 minutes
-- [MegaStacks](donovan-megastacks) - Vastly increases stack sizes
-- [MoreBooks](donovan-morebooks) - Increases the chance of finding books
-- [MorePerks](donovan-moreperks) - Increases the amount of perks points received per level to 2
-- [PickMeUp](donovan-pickmeup) - Allows for certain blocks to be picked up after placing.
-
-### A La Carte
-
-Add these mods by themselves, or as overrides to the AiO modlet.
-
-- [BetterBridges](donovan-betterbridges) - Allows advanced rotation on garage door and drawbridge
-- [LevelFaster](donovan-levelfaster) - Increases the experience gain on most items / actions (_deprecated as you can now set this in the game options_)
-- [MegaBooks](donovan-megabooks) - Significantly increases the chance of finding books
-- [MegaPerks](donovan-megaperks) - Increases the amount of perks points received per level to 4
-- [ModSchematics](donovan-modschematics) - Turn mods into schematics
-- [NightFog](donovan-nightfog) - Thick fog rolls in at night
-- [Wraith](donovan-wraith) - Adds a new zombie type, the Wraith, which is a fast, stealthy, and deadly zombie
-
-#### Inventory Size (pick one)
-
-1. [BigBackpack](donovan-bigbackpack) - Increases the size of the player inventory to 60
-2. [MegaBackpack](donovan-megabackpack) - Increases the size of the player inventory to 120
-
-#### Lootbag Drop Rates (pick one)
-
-1. [MoreLootbags](donovan-morelootbags) - Increases the drop rates on zombie lootbags (normal: 5%, feral: 10%, irradiated: 20%)
-2. [MegaLootbags](donovan-megalootbags) - Dramatically increases the drop rates on zombie lootbags (normal: 20%, feral: 50%, irradiated: 80%)
+- [BetterBatons](modlets/a-la-carte/donovan-betterbatons) - Increases melee damange on pipe and stun batons (puts them on par with spears/clubs)
+- [BetterBlades](modlets/a-la-carte/donovan-betterblades) - Increases melee damange on bladed weapons, spears, and axes
+- [BetterBridges](modlets/a-la-carte/donovan-betterbridges) - Allows advanced rotation on garage door and drawbridge
+- [BetterBuffs](modlets/a-la-carte/donovan-betterbuffs) - Tweaks (de)buffs; i.e. shorter NearDeathTrauma and no more being thirsty/hungry at 190%
+- [BetterCement](modlets/a-la-carte/donovan-bettercement) - Create 'Cement Mix' directly in the cement mixer
+- [BetterCollectors](modlets/a-la-carte/donovan-bettercollectors) - Get more water from dew collectors
+- [BetterDyes](modlets/a-la-carte/donovan-betterdyes) - Allows all colored dyes to be crafted from paint
+- [BetterPowertools](modlets/a-la-carte/donovan-betterpowertools) - Makes the Chainsaw, Auger, and Nailgun way more useful
+- [BetterTraps](modlets/a-la-carte/donovan-betterptraps) - Blade Traps have more health and do slightly more damage
+- [BetterVehicles](modlets/a-la-carte/donovan-bettervehicles) - Bigger and Faster Vehicles; more storage and +25% normal speed (double that in turbo)
+- [LessGrind](modlets/a-la-carte/donovan-lessgrind) - Increases the harvest amount of most methods and reduces some resource requirements
+- [LongerLootbags](modlets/a-la-carte/donovan-longerlootbags) - Decreases the decay rate on zombie lootbags from 5 to 30 minutes
+- [MegaStacks](modlets/a-la-carte/donovan-megastacks) - Vastly increases stack sizes
+- [MoreBooks](modlets/a-la-carte/donovan-morebooks) - Increases the chance of finding books
+- [MoreLootbags](modlets/a-la-carte/donovan-morelootbags) - Increases the drop rates on zombie lootbags (normal: 5%, feral: 10%, irradiated: 20%)
+- [MorePerks](modlets/a-la-carte/donovan-moreperks) - Increases the amount of perks points received per level to 2
+- [NVHelmetMod](modlets/a-la-carte/donovan-nvhelmetmod) - Adds a Night Vision Helmet Mod (found on Military and Swat Helmets)
+- [PickMeUp](modlets/a-la-carte/donovan-pickmeup) - Allows for certain blocks to be picked up after placing.
+- [Wraith](modlets/a-la-carte/donovan-wraith) - Adds a new zombie type, the Wraith, which is a fast, stealthy, and deadly zombie
+
+
+### Optional
+
+These are not included in AiO but may be used individually or as overrides to the AiO modlet. Unless otherwise noted below, they are all compatible with AiO.
+
+- [CraftableDukes](modlets/optional/donovan-craftabledukes) - Allows you to craft Dukes from Brass + Iron in the Forge
+- [CraftableParts](modlets/optional/donovan-craftableparts) - Allows you to craft all weapon and armor parts in the workbench.
+- [LevelFaster](modlets/optional/donovan-levelfaster) - Increases the experience gain on most items / actions (_deprecated as you can now set this in the game options_)
+- [MegaBooks](modlets/optional/donovan-megabooks) - Significantly increases the chance of finding books
+- [MegaLootbags](modlets/optional/donovan-megalootbags) - Dramatically increases the drop rates on zombie lootbags (normal: 20%, feral: 50%, irradiated: 80%)
+- [MegaPerks](modlets/optional/donovan-megaperks) - Increases the amount of perks points received per level to 4
+- [ModSchematics](modlets/optional/donovan-modschematics) - Turn mods into schematics
+- [NightFog](modlets/optional/donovan-nightfog) - Thick fog rolls in at night
+
+#### Inventory Size (only install one of these at at time)
+
+1. [BigBackpack](modlets/optional/donovan-bigbackpack) - Increases the size of the player inventory to 60
+2. [MegaBackpack](modlets/optional/donovan-megabackpack) - Increases the size of the player inventory to 120
 
 ### UI
 
-- [Donovan UI](donovan-ui) - A very simple custom UI that repositions the food/water bars.
+- [Donovan UI](modlets/donovan-ui) - A very simple custom UI that repositions the food/water bars.
 
 ### Outdated/Removed Modlets
 
@@ -77,6 +78,10 @@ Add these mods by themselves, or as overrides to the AiO modlet.
 - LootCleanup - REMOVED as of A21 (now incorporated into the base game)
 - Craftables - REMOVED as of A21 due to compatibility issues with the base game
 
+## Additional Credits
+
+- ["Rain Collectors" mod by khzmusik](https://gitlab.com/karlgiesing/7d2d-a21-modlets) in order to add additional functionality for Dew Collectors
+
 ## History
 
 I previously used an excellent XML config replacement made by SpikeDaddy, so full credit to him for his work and my inspiration!

aio-modlist.txt

@@ -0,0 +1,19 @@
+modlets/a-la-carte/donovan-betterbatons
+modlets/a-la-carte/donovan-betterblades
+modlets/a-la-carte/donovan-betterbridges
+modlets/a-la-carte/donovan-betterbuffs
+modlets/a-la-carte/donovan-bettercement
+modlets/a-la-carte/donovan-bettercollectors
+modlets/a-la-carte/donovan-betterdyes
+modlets/a-la-carte/donovan-betterpowertools
+modlets/a-la-carte/donovan-bettertraps
+modlets/a-la-carte/donovan-bettervehicles
+modlets/a-la-carte/donovan-lessgrind
+modlets/a-la-carte/donovan-longerlootbags
+modlets/a-la-carte/donovan-megastacks
+modlets/a-la-carte/donovan-morebooks
+modlets/a-la-carte/donovan-morelootbags
+modlets/a-la-carte/donovan-moreperks
+modlets/a-la-carte/donovan-nvhelmetmod
+modlets/a-la-carte/donovan-pickmeup
+modlets/a-la-carte/donovan-wraith

modlets/README.md

@@ -0,0 +1,6 @@
+# Donovan's Modlets
+
+## Folders
+
+- [a-la-carte](a-la-carte): Modlets included in AiO but can also be used independently
+- [optional](optional): Modlets that are not included in AiO but can also be used independently or as overrides to AiO

modlets/a-la-carte/README.md

@@ -0,0 +1,3 @@
+# A La Carte Modlets
+
+These modlets are all included in the [Donovan All In One](../donovan-aio) modlet, but are also available individually for those who want to pick and choose.

donovan-betterbatons/ModInfo.xml → modlets/a-la-carte/donovan-betterbatons/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Batons do more damage" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterbatons" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterbatons" />
 </xml>

donovan-betterblades/ModInfo.xml → modlets/a-la-carte/donovan-betterblades/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Bladed weapons do more damage and harvest animals" />
   <Author value="Donovan" />
   <Version value="21.0.3" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterblades" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterblades" />
 </xml>

donovan-betterbridges/ModInfo.xml → modlets/a-la-carte/donovan-betterbridges/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Allows advanced rotation on garage door and drawbridge" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterbridges" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterbridges" />
 </xml>

donovan-betterbuffs/ModInfo.xml → modlets/a-la-carte/donovan-betterbuffs/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Tweaks some of the (de)buff settings. Notably, NearTrauma now only lasts 10 minutes and hunger and thirsty are now more realistic." />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterbuffs" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterbuffs" />
 </xml>

donovan-bettercement/ModInfo.xml → modlets/a-la-carte/donovan-bettercement/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Create 'Cement Mix' directly in the cement mixer" />
   <Author value="Donovan" />
   <Version value="21.0.2" compat="A21,A20,A19,A18" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-bettercement" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-bettercement" />
 </xml>

donovan-bettercollectors/ModInfo.xml → modlets/a-la-carte/donovan-bettercollectors/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Makes the Dew Collectors produce more water, faster" />
   <Author value="Donovan" />
   <Version value="21.0.3" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-bettercollectors" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-bettercollectors" />
 </xml>

donovan-betterdyes/ModInfo.xml → modlets/a-la-carte/donovan-betterdyes/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Craft dyes using paint" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19,A18" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterdyes" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterdyes" />
 </xml>

donovan-betterpowertools/ModInfo.xml → modlets/a-la-carte/donovan-betterpowertools/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Makes the Chainsaw, Auger, and Nailgun more useful" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-betterpowertools" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterpowertools" />
 </xml>

modlets/a-la-carte/donovan-bettertraps/Config/blocks.xml

@@ -0,0 +1,5 @@
+<configs>
+  <set xpath="//block[@name='bladeTrap']/property[@name='Damage']/@value">40</set>
+  <set xpath="//block[@name='bladeTrap']/property[@name='DamageReceived']/@value">2</set>
+  <set xpath="//block[@name='electricfencepost']/property[@name='MaxDamage']/@value">500</set>
+</configs>

modlets/a-la-carte/donovan-bettertraps/Config/localization.txt

@@ -0,0 +1,3 @@
+Key,Source,Context,Changes,English
+trapsT1,progression,Attribute,Edit,"Tier 1: Electric Fence & Dart Trap"
+trapsT2,progression,Attribute,Edit,"Tier 2: Blade Trap & Shotgun Auto Turret"

modlets/a-la-carte/donovan-bettertraps/Config/materials.xml

@@ -0,0 +1,3 @@
+<configs>
+  <set xpath="//material[@id='MmetalBladeTrap']/property[@name='MaxDamage']/@value">7000</set>
+</configs>

modlets/a-la-carte/donovan-bettertraps/Config/progression.xml

@@ -0,0 +1,8 @@
+<configs>
+  <set xpath="//crafting_skill[@name='craftingTraps']/display_entry[@name_key='trapsT1']/@icon">electricfencepost</set>
+  <set xpath="//crafting_skill[@name='craftingTraps']/display_entry[@name_key='trapsT2']/@icon">bladeTrap</set>
+  <csv xpath="//crafting_skill[@name='craftingTraps']/display_entry[@name_key='trapsT1']/unlock_entry/@item" delim="," op="remove">bladeTrap</csv>
+  <csv xpath="//crafting_skill[@name='craftingTraps']/display_entry[@name_key='trapsT2']/unlock_entry/@item" delim="," op="add">bladeTrap</csv>
+  <csv xpath="//crafting_skill[@name='craftingTraps']/effect_group/passive_effect[@level='25,100']/@tags" delim="," op="remove">bladeTrap</csv>
+  <csv xpath="//crafting_skill[@name='craftingTraps']/effect_group/passive_effect[@level='50,100']/@tags" delim="," op="add">bladeTrap</csv>
+</configs>

modlets/a-la-carte/donovan-bettertraps/ModInfo.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xml>
+  <Name value="Donovan_BetterTraps" />
+  <DisplayName value="Donovan's Better Traps" />
+  <Description value="Traps have more health and do more damage" />
+  <Author value="Donovan" />
+  <Version value="21.1.0" compat="A21" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-betterblades" />
+</xml>

modlets/a-la-carte/donovan-bettertraps/README.md

@@ -0,0 +1,7 @@
+# Donovan BetterTraps
+
+## 7 Days 2 Die Modlet
+
+- Blade Traps and Electric Fences now have higher durability
+- Blade Traps do slightly more damage.
+- Blade Traps moved to T2 unlock (up to 50, from 25)

donovan-bettervehicles/ModInfo.xml → modlets/a-la-carte/donovan-bettervehicles/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Bigger and Faster Vehicles; more storage plus 25% normal speed and double turbo speed" />
   <Author value="Donovan" />
   <Version value="21.0.2" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-bettervehicles" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-bettervehicles" />
 </xml>

donovan-lessgrind/ModInfo.xml → modlets/a-la-carte/donovan-lessgrind/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Increases the harvest amount of most resources" />
   <Author value="Donovan" />
   <Version value="21.0.8" compat="A21" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-lessgrind" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-lessgrind" />
 </xml>

donovan-longerlootbags/ModInfo.xml → modlets/a-la-carte/donovan-longerlootbags/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Decreases the decay rate on zombie loot bags from 5 to 30 minutes" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19,A18,A17" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-longerlootbags" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-longerlootbags" />
 </xml>

donovan-megastacks/ModInfo.xml → modlets/a-la-carte/donovan-megastacks/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Increases stack sizes a large amount" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-megastacks" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-megastacks" />
 </xml>

donovan-morebooks/ModInfo.xml → modlets/a-la-carte/donovan-morebooks/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Increases the chance of finding books" />
   <Author value="Donovan" />
   <Version value="21.0.1" compat="A21,A20" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-morebooks" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-morebooks" />
 </xml>

donovan-morelootbags/ModInfo.xml → modlets/a-la-carte/donovan-morelootbags/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Increases zombie lootbag drop rates" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-morelootbags" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-morelootbags" />
 </xml>

donovan-moreperks/ModInfo.xml → modlets/a-la-carte/donovan-moreperks/ModInfo.xml

@@ -5,5 +5,5 @@
   <Description value="Increases the number of perks you get per level (x2)" />
   <Author value="Donovan" />
   <Version value="21.0.0" compat="A21,A20,A19,A18,A17" />
-  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/donovan-moreperks" />
+  <Website value="https://github.com/DonovanMods/donovan-7d2d-modlets/tree/stable/modlets/a-la-carte/donovan-moreperks" />
 </xml>