Initial Blazemod re-work #37497

Soup-de-Loop · 2020-01-29T07:56:07Z

Summary

SUMMARY: Content "Modernises blazemod"

Purpose of change

blazemod has been abandoned for some time, which I didn't realise- until its removal from mainline came up, and I actually delved into the files. There was a lot going on wrong, and it was abundantly clear that the entire file structure was not modern and there have been a lot of redundant entries for quite some time now. Additionally, some of the content is confusing, or just outright thematically clashing.

Also, some things like solar arrays are straight up unbalanced. I'm considering adding severe drawbacks that make them useful in specific circumstances while not being outright silly- feedback on this stuff is very welcome.

Describe the solution

I have compartmentalised much of the data into a proper file structure, using separating folders to follow vanilla format so that people can work on the mod without losing their sanity.

Additionally, since #34202 all of the automatic versions of the turrets in blazemod are completely and utterly useless and redundant, since any turret can now become automatic and only through the installation of a turret control unit on the same space. These duplicates have been removed, and the unnecessary overrides were removed as well. Turrets have also been converted to use the modern vanilla standard of a general turret template so that copy-from can be used to great effect as it has been in mainline.

Besides that, I have at least a guide for blob vehicles in the works, and intend to provide a more thematic integration into the game.

Describe alternatives you've considered

Waiting for someone else to do such, since the mod was mainlined I actually assumed that the mod was already adopted and being looked after. There has been another refactor attempt by another contributor, however they seem to have stepped back due to IRL issues #35957.

Testing

Linting, astyling etc performed, playtested with for a few weeks and making adjustments based on issues that cropped up. Additionally playtested by 3 other users on discord, fixes errors that were brought up until none are currently being thrown.

Additional context

blazemod has become obsolete as of #37272 due to being orphaned. If people are willing, I'd be happy to maintain blazemod for the time being and try to bring it closer to parity with vanilla and generally make the content seem more immersive rather than out of place, while improving code quality over time and fixing bugs.

~~I'll be looking at #35957 to see if I can cannibalize some of their work to help the overall workload, and so that the work they have done so far isn't in vain.~~

TO-DO:

UPDATE: Some tasks removed due to not being in the scope of this PR; different PR's will address other issues and future objectives for blazemod.

data/mods/blazemod/modinfo.json

Soup-de-Loop · 2020-01-29T12:18:23Z

data/mods/blazemod/diamond.json

@@ -0,0 +1,359 @@
+[


diamond.json was built from all of the diamond items/parts/recipes from blaze_test.json

now also split into respective separations

Soup-de-Loop · 2020-01-29T12:19:20Z

data/mods/blazemod/items/books/blob_books.json

@@ -0,0 +1,82 @@
+[


Probably going to redact these so that I can say the only changes so far have been modernisation, but these roughly encompass the idea of how I want to introduce the recipes.

Soup-de-Loop · 2020-01-29T12:19:48Z

data/mods/blazemod/items/fuel.json

@@ -0,0 +1,44 @@
+[


Simply aggregated the only two ammos added by blazemod here, simple change.

Soup-de-Loop · 2020-01-29T12:21:57Z

data/mods/blazemod/items/guns/blob_turret.json

@@ -0,0 +1,351 @@
+[


Simple one here, just pulled all of the "type": "GUN" entries from blaze_blob.json and stuck them here for better sorting.

Soup-de-Loop · 2020-01-29T12:22:33Z

data/mods/blazemod/items/tools/blob_container.json

@@ -0,0 +1,80 @@
+[


Wasn't sure whether I should separate these out since they're so few, but here it is. Otherwise unchanged.

Soup-de-Loop · 2020-01-29T12:24:59Z

data/mods/blazemod/items/tools/blob_tools.json

@@ -0,0 +1,651 @@
+[


Another separate file formed, this one by pulling all of the "type": "TOOL" out of blaze_blob.json

Soup-de-Loop · 2020-01-29T12:25:41Z

data/mods/blazemod/items/vehicle/blaze_engine.json

@@ -0,0 +1,83 @@
+[


No changes here beyond separating them out, I think this is vanilla file structure?

Soup-de-Loop · 2020-01-29T12:26:22Z

data/mods/blazemod/items/vehicle/blaze_other.json

@@ -0,0 +1,17 @@
+[


Kept as a normal inclusion, unchanged so far.

Soup-de-Loop · 2020-01-29T12:26:53Z

data/mods/blazemod/items/vehicle/blaze_solar.json

@@ -0,0 +1,47 @@
+[


I wanted to change these, but here they remain for now, just separated out.

Soup-de-Loop · 2020-01-29T12:27:40Z

data/mods/blazemod/items/vehicle/blob_treads.json

@@ -0,0 +1,53 @@
+[


Separated the treads out as they're in a weird place in general. Unchanged.

Soup-de-Loop · 2020-01-29T12:31:38Z

data/mods/blazemod/items/vehicle/blob_vehicleparts.json

@@ -0,0 +1,30 @@
+[


One of the re-writes here, but should be noted as modernisation- biggest change is the name of the frost_hull (id remains same) to "gelacier boat hull" from "gelacier wheel", copying the actual frostie_wheel. Small symbol change to bring to parity with other hull-type items. Surface level changes only, and separated out here due to a lack of other appropriate populated categories.

Soup-de-Loop · 2020-01-29T12:32:17Z

data/mods/blazemod/items/vehicle/blob_wheel.json

@@ -0,0 +1,83 @@
+[


Pulled out into a separate json, unchanged otherwise.

Soup-de-Loop · 2020-01-29T12:33:37Z

data/mods/blazemod/modinfo.json

@@ -4,10 +4,9 @@
    "ident": "blazemod",


Not sure if I'm jumping the gun here on the maintainer field, but I've reversed my wrong correction of Blaze's handle as per Brian's suggestion.

Soup-de-Loop · 2020-01-29T12:35:29Z

data/mods/blazemod/recipes/blaze_other_recipes.json

@@ -102,7 +102,7 @@
    "components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]


Small but important change here. With this, I've also removed all other mentions to turretframe, which means I'll need to add migration code. Beyond that, allows the vanilla turret_mount to be crafted, and brings all of the content in blazemod to parity only using vanilla turret mounts. Space anomaly left unchanged, just separated out to here.

Soup-de-Loop · 2020-01-29T12:36:15Z

data/mods/blazemod/recipes/diamond_recipes.json

@@ -0,0 +1,81 @@
+[


There were only a few recipes in blaze_test.json, but I felt it prudent to separate them out nevertheless immediately. Unchanged.

Soup-de-Loop · 2020-01-29T12:36:43Z

data/mods/blazemod/recipes/vortex_recipes.json

@@ -0,0 +1,142 @@
+[


Vortex stuff is strange, I almost had duplicates in here but that's sorted. Otherwise, unchanged.

Soup-de-Loop · 2020-01-29T12:37:04Z

data/mods/blazemod/requirements/blob.json

@@ -0,0 +1,8 @@
+[


Unchanged, just separated out and given correct file structure.

Soup-de-Loop · 2020-01-29T12:37:38Z

data/mods/blazemod/vehicleparts/blaze_treads.json

@@ -0,0 +1,53 @@
+[


Non-blob treads separated out, as they are also in a weird place. Unchanged.

Soup-de-Loop · 2020-01-29T12:42:59Z

data/mods/blazemod/vehicleparts/blaze_weapons_parts.json

@@ -0,0 +1,993 @@
+[


Did a couple of rudimentary changes here, though they are impactful. The "copy-from": field was changed from blazemod's custom turrets to use vanilla precedent here- also, these are all from blaze_autoweapons_parts.json, the manual versions don't seem to be necessary because they all had auto equivalents. Duplicates that were essentially an "automated" version were removed, as that is all handled in vanilla with the turret control unit now. A smaller change here is that "breaks_into": was changed from "count": [ 0, 1 ] to the "prob": 50 used in vanilla for these fields. Unsure about them breaking into their base component minus the turret, but for now that's left unchanged. Effectively they are unchanged, but this should be a considerable optimization of bloat code that was made obsolete by other PR's.

Soup-de-Loop · 2020-01-29T12:43:18Z

data/mods/blazemod/vehicleparts/blob_battery.json

@@ -0,0 +1,28 @@
+[


Separated out, unchanged otherwise.

Soup-de-Loop · 2020-01-29T12:44:21Z

data/mods/blazemod/vehicleparts/blob_boards.json

@@ -0,0 +1,343 @@
+[


Blob boards painstakingly separated out and consolidated into one file. Unchanged otherwise, could use requirements for a lot of the tiering for gel-ooze-gray but that's a consideration for another PR.

Soup-de-Loop · 2020-01-29T12:45:26Z

data/mods/blazemod/vehicleparts/blob_engine.json

@@ -0,0 +1,25 @@
+[


Separated out for now, I'll have to review how this part acts in-game to make sure it's working as intended.

Soup-de-Loop · 2020-01-29T12:46:04Z

data/mods/blazemod/vehicleparts/blob_frames.json

@@ -0,0 +1,203 @@
+[


Frames, painstakingly separated out. This is where most of the tile pains will come from, but once done, it doesn't need to be done again. Unchanged otherwise.

Soup-de-Loop · 2020-01-29T12:46:45Z

data/mods/blazemod/vehicleparts/blob_rams.json

@@ -0,0 +1,20 @@
+[


Only ram left from blazemod? Separated out, unchanged.

Soup-de-Loop · 2020-01-29T12:47:14Z

data/mods/blazemod/vehicleparts/blob_treads.json

@@ -0,0 +1,41 @@
+[


Same as before, treads in a weird place separated out. Left unchanged.

Soup-de-Loop · 2020-01-29T12:53:14Z

data/mods/blazemod/vehicleparts/blob_turret.json

@@ -0,0 +1,195 @@
+[


Another modernisation was performed here, after separating out the blob turrets. The blob_turret_mount was expanded to include installation and removal times, a folded_volume that wasn't 1, and damage_reduction like the vanilla turret mount. After that, I made a blob_turret template part that contains basic fields that all turrets would have, and has helped trim down most of the entries of this type- there's a couple of weird weapons with their own durabilities and whatnot, and that has been retained.

Need feedback on the folded_volume, it was mostly a pull-over from vanilla and I'm not sure if I should have changed it from the value of 1- I could probably do balancing for that in a different PR.

Soup-de-Loop · 2020-01-29T12:55:42Z

data/mods/blazemod/vehicleparts/blob_vehicleparts.json

@@ -0,0 +1,725 @@
+[


Painstakingly separated out, this is the actual part versions of the parts, unchanged. I could use templates to trim these down as well, and some of the fields definitely need modernising, but I'll leave them be for now.

Soup-de-Loop · 2020-01-29T12:55:56Z

data/mods/blazemod/vehicleparts/blob_wheel.json

@@ -0,0 +1,105 @@
+[


Wheels, separated out. Unchanged.

Soup-de-Loop · 2020-01-29T12:57:36Z

data/mods/blazemod/vortex.json

@@ -0,0 +1,336 @@
+[


Messy, these were. Something to do with automated versions to redact, and I had to change the turret fields to reflect vanilla: but generally- unchanged. Could use a template, not sure how popular vortex stuff is amongst players though.

These are the ones that were caught by the recently improved check.

Now you're cooking with dino eggs

…o Aftershock (CleverRaven#40082) * Damage over time initial implementation * Unhardcode healing from panacea and move it to Aftershock * Update src/creature.cpp Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com> * DoT class * Save and load DoT * doc * Apply suggestions from code review Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com> * serialize, deserialize and load in proper cdda fashion Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>

[DinoMod] Create dino egg recipes

Gun volume audit for .45-70

…_sorting_2 Enforce localized sorting 2

Converted all name fields that can use the new string format to use it, converted all recipe times to use the string time format instead of int, found a case where treads weren't separated out in vehicleparts, removed some duplicate entries, added mounted_ prefix to all turret ID's to conform to vanilla standard and remove overlap to original items.

separated turret id's from their gun counterparts as well

Split into their own vanilla hierearchy, irrespective of low number of entries.

The gelectrode item was completely broken and is now just a vehicle part that does nothing until installed, battery versions of the gelectrode for vehicles out until revision, gel lamps had to be removed due to dependency on broken functionality, new gel lights that replicate functionality with blob part factors added. Removed repeat entry of ammo type.

Removes the guns that were removed as per CleverRaven#37979 - to note, tavor_12 was migrated in item but not ID to avoid save compatibility, but is now rectified.

…/Cataclysm-DDA into soupdeloop-blazemod

Soup-de-Loop · 2020-05-12T01:02:30Z

Ignore me! I did a fuckywucky!

Brian-Otten reviewed Jan 29, 2020

View reviewed changes

data/mods/blazemod/modinfo.json Outdated Show resolved Hide resolved

Soup-de-Loop commented Jan 29, 2020

View reviewed changes

data/mods/blazemod/vehicleparts/blob_battery.json Outdated

@@ -0,0 +1,28 @@

[

Copy link

Contributor Author

Soup-de-Loop Jan 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separated out, unchanged otherwise.

Soup-de-Loop commented Jan 29, 2020

View reviewed changes

data/mods/blazemod/vehicleparts/blob_wheel.json Outdated

@@ -0,0 +1,105 @@

[

Copy link

Contributor Author

Soup-de-Loop Jan 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wheels, separated out. Unchanged.

Soup-de-Loop commented Jan 29, 2020

View reviewed changes

jbytheway and others added 25 commits May 4, 2020 09:36

Sort achievements by name, not description

ce441bf

Remove unnecessary '/' character

76cf8b6

Suppress warning on sorting directory names

4402b90

Convert some std::sort calls to localized_compare

8ca7f94

These are the ones that were caught by the recently improved check.

Audit Marlin 1895 SBL

f16e8e2

Audit Magnum Research BFR

1ac1a33

Audit 1874 Sharps Rifle

a247f84

[DinoMod] Create recipe_food.json

20bdfee

Now you're cooking with dino eggs

Cannibalism and demihumans (CleverRaven#38313)

8b4a4e2

Falling into deep water deals less damage (CleverRaven#39903)

5de957a

Merge pull request CleverRaven#40141 from LyleSY/patch-1

d552434

[DinoMod] Create dino egg recipes

Add survivor car to survivor camp (CleverRaven#40021)

c1b8853

Update ws_fire_lookout_tower.json (CleverRaven#40033)

70f064a

Add FS2000(plus STANAG mag volume update) (CleverRaven#36838)

3928c8f

Ask for confirmation on eating raw meat

2d5cca7

Merge pull request CleverRaven#40060 from LaVeyanFiend/GunVolume4570

f97e96a

Gun volume audit for .45-70

Merge pull request CleverRaven#40041 from jbytheway/enforce_localized…

e635446

…_sorting_2 Enforce localized sorting 2

Update blob_turret.json

b8d5c26

separated turret id's from their gun counterparts as well

Refactor diamond and vortex stuff

b5fa5f0

Split into their own vanilla hierearchy, irrespective of low number of entries.

remove leadworks turrets

522a2be

Removes the guns that were removed as per CleverRaven#37979 - to note, tavor_12 was migrated in item but not ID to avoid save compatibility, but is now rectified.

rebase old blazemod PR

833bfab

Merge branch 'soupdeloop-blazemod' of https://github.com/Soup-de-Loop…

2aaa273

…/Cataclysm-DDA into soupdeloop-blazemod

Soup-de-Loop requested review from I-am-Erk, John-Candlebury and KorGgenT as code owners May 12, 2020 01:00

Soup-de-Loop closed this May 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial Blazemod re-work #37497

Initial Blazemod re-work #37497

Soup-de-Loop commented Jan 29, 2020 •

edited

Loading

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Feb 23, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop Jan 29, 2020

Soup-de-Loop commented May 12, 2020

		@@ -102,7 +102,7 @@
		"components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]

Initial Blazemod re-work #37497

Initial Blazemod re-work #37497

Conversation

Soup-de-Loop commented Jan 29, 2020 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Soup-de-Loop commented May 12, 2020

Soup-de-Loop commented Jan 29, 2020 •

edited

Loading