feat(content): In-repo Magical Nights with correct attribution #5906

RobbieNeko · 2025-01-08T22:44:38Z

Checklist

Required

I wrote the PR title in conventional commit format.
I ran the code formatter.
I linked any relevant issues using github keyword syntax so it can be closed automatically.
I have committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.
I have cherry-picked my commits so that the commit history and proper attribution is preserved (as required by @KorGgenT )

Optional

This is a PR that removes JSON entities.
- The removed JSON entities have new entries in data/json/obsoletion/ folder or use some other migration process for existing saves.

Purpose of change

The previous attempt, #5881 , had notable issues with attribution as pointed out by KorG. This aims to remedy the issue by correctly preserving commit history as well as leaving the originally stated "authors" in the modinfo in their slot.

Describe the solution

Takes the approach that KorG suggested: moving the Magiclysm files and cherry-picking the Magical Nights commits on top of it.

Moved Magiclysm files to a new folder (being in the root of the repo while cherry-picking for the purpose of it actually working correctly), delete the old folder
Cherry-picks the relevant Magical Nights commits over top of them
Re-takes care of the housekeeping matters (moving the folder back to the right location, fixing some errors / formatting noted in the original PR)

Describe alternatives you've considered

Give up
Attempt to do this without deleting Magiclysm

This is how KorG evidently wanted it (given that Magiclysm had no maintainer in our repo anyway), and I certainly don't want to give github any reason to mess up the commit history / continuity. I have made my best effort to handle migration how we have in the past for in-repo mods.

Testing

Some proof of the commit history being preserved:

The mod still works, and Catapult users can safely remove Magical Nights from their user mods folder.

Loading into a world created with Magiclysm after removing it doesn't seem to crash the game at least? But all I had done in the world is spawn in, then save & exit as it was purely for testing purposes.

Additional context

Sorry for the ping KorG, but I thought you'd like to know that it has been done correctly this time (and, if you so desire, give your input on it).

Adding KorG for good measure Let's try it this way Move the rest of the files Co-Authored-By: Curtis Merrill <[email protected]>

Import in the files after finally making the darn repo

Silly me, technically forking off on a version where these weren't actually in yet. Original PR: cataclysmbnteam#3772

Backporting the rest of the magiclysm changes since I forked (though cherrypicking a little)

Balancing of the spell has been sitting there for millennia at this point.

…ls and Spellbooks Finally fixing bugs that have been going for ages! ... and also removing the uranium from those lights. Served with a side of making sure my spells are actually attainable.

Hopefully much more balanced now

+ Makes the magic classes non-mutually exclusive + Adds new novice spellbooks, distributes them to the relevant professions and adds a new novice Kelvinist profession - Nerf owlbear spawnrate just slightly as an additional bonus

Reorganized the tileset! This will probably introduce some bugs/incorrect tiles that I missed, so please let me know if you encounter anything that seems off.

Thanks Derg for pointing this out ^-^

Now with 99% less mouth encumbrance worries!

Also giving Krabgeks the bioproof flag they're supposed to have but I forgot last time apparently

Thanks to Pr0man for showing just how busted spells like Jolt were.

- Removed lore-problematic itemgroup additions - Made monstergroup additions to vanilla groups better - Removed ATTACKMON from dragons - Buffed Necrotic Gaze back up a bit - Improved location names on the map - Added Resin Golems! - Buffed loot rates in wizard towers slightly

…am#1) * Mana circlet wearing The mana circlet couldn't be worn with helmets or any other headwear for some reason; this allows it to be worn underneath other helmets or just with hats, making it more useful. * Stone fists fix Stone fists are no longer armor, and thus will spawn wielded instead of worn, making them much more useful as emergency melee weapons.

x10 to most of the durations, hopefully this will make them much better

Good thing nobody noticed

Non-flammable material that shouldn't fuck anything up, hopefully

…irelighter Dimming (cataclysmbnteam#2) * Copper circlet can now be worn under power armor * Update enchanted_rings.json Enchanted rings no longer conflict * Finger Firelighter Dimming

No more error on latest experimental, yay!

- Rebalanced some effects - Added blood to the harvest entries - Yoinked concentrated mana material, use it - Added dragon bone material - Added recipes for orichalcum weapons - Added garage door to wizzard towers - Gaul Maraz item added (but not spawn or finished true version)

They need to be good at actually doing their jobs for the loot

Evidently I missed a few earlier. Now they truly will not spawn in normal society (recipes and dragon books are okay, I can write those off as being interpreted as medieval texts for now)

W h y would you do that anyway KorG. Also, WHY DIDN'T YOU CORRECTLY ORGANIZE IT

Bugfix / bugreport to BN incoming soonTM

How the fuck did I even make some of them flesh originally

- Added back exotic books (for now) - Made magic academies spawn more recipe books - Provided more starting traits - Adds Summon Lemon

Why the hell is it called "items" when it uses itemGROUPS, smh.

Adds mithril metal, more staves of the magi, and a couple new golems --------- Co-authored-by: RobbieNeko <[email protected]>

Oops!

Thanks to Chaosvolt, his dergliness

No more 300 extra speed, and windrunning now alters movecost instead (and makes use of enchantments to do so)

~10000 grams of pure caffeine

* Storm spells for kelvinist Fire + Ice * Two extra scrolls for kelvinists. * Added two scrolls to tier 3 item group. * Added rock tomb spell * Added rock tomb scroll. * Fixed a derp. * Add rock tomb scroll to tier 2. * Style / grammar changes --------- Co-authored-by: RobbieNeko <[email protected]>

* Added Meteor spell * Added meteor scroll. * Added meteor scroll to tier 3 scrolls group. With low spawn chance. * Description Tweaks --------- Co-authored-by: RobbieNeko <[email protected]>

My bad for assuming the PR was playtested

* Tier 1 acid bolt spell. * Added Tier 2 acid bomb spell * Lint * Tier 3 Acid Storm spell * Added scrolls for new spells. * Added new scrolls to spawn. * Grammar Changes --------- Co-authored-by: RobbieNeko <[email protected]>

Housekeeping 1 Fix more bits of docs Remove accidental MMN Whoops style(autofix.ci): automated formatting elipses Oops

If this is what he wants

RoyalFox2140

It's a clusterfuck and it deletes Magiclysm from the Repo, but commit history stayed so I guess a few people will be happy out of this. No going back now,

RobbieNeko and others added 30 commits January 8, 2025 16:16

Create the folder, test movement

fb3ce79

Adding KorG for good measure Let's try it this way Move the rest of the files Co-Authored-By: Curtis Merrill <[email protected]>

AND THEN THERE WAS LIGHT

acead63

Import in the files after finally making the darn repo

Backport Spell Components

1895ff2

Silly me, technically forking off on a version where these weren't actually in yet. Original PR: cataclysmbnteam#3772

Draw the rest of the damn Backport

76f2c75

Backporting the rest of the magiclysm changes since I forked (though cherrypicking a little)

Add liquid spells, balance a Stormshaper spell a bit

038e8eb

Balancing of the spell has been sitting there for millennia at this point.

Fix Magic Lights and Actually Add the liquid spells to relevant Scrol…

a78d65c

…ls and Spellbooks Finally fixing bugs that have been going for ages! ... and also removing the uranium from those lights. Served with a side of making sure my spells are actually attainable.

Rebalance Spells Ver. 2 + Dragonscale clothing mod

97344af

Hopefully much more balanced now

Tileset Reorganization!

8d09c9d

Reorganized the tileset! This will probably introduce some bugs/incorrect tiles that I missed, so please let me know if you encounter anything that seems off.

Correct use of STAB and SPEAR for weapons

ead2947

Thanks Derg for pointing this out ^-^

Update Spell Requirements!

d89805a

Now with 99% less mouth encumbrance worries!

Less Krabby Bookstores, Better magical lighting

d76ef89

Also giving Krabgeks the bioproof flag they're supposed to have but I forgot last time apparently

AOE Rebalance, smol Goblin balance changes

6a7b489

Thanks to Pr0man for showing just how busted spells like Jolt were.

Summons and self-effect buffs

17cf2f7

x10 to most of the durations, hopefully this will make them much better

Fix a smol bug in the materials recipes

9f830d4

Good thing nobody noticed

Give the relevant auras a material of water

e08a4b2

Non-flammable material that shouldn't fuck anything up, hopefully

Copper Circlet w/ Power Armor, Enchanted Rings Not Conflict, Finger F…

960ec76

…irelighter Dimming (cataclysmbnteam#2) * Copper circlet can now be worn under power armor * Update enchanted_rings.json Enchanted rings no longer conflict * Finger Firelighter Dimming

Surround start fix (cataclysmbnteam#3)

1242144

No more error on latest experimental, yay!

Buff wizard tower magic spawns

1076724

They need to be good at actually doing their jobs for the loot

Fix spells popping up in bad vanilla places

7be7c19

Evidently I missed a few earlier. Now they truly will not spawn in normal society (recipes and dragon books are okay, I can write those off as being interpreted as medieval texts for now)

Fix mana nose being racist against Earthshaper

851c591

W h y would you do that anyway KorG. Also, WHY DIDN'T YOU CORRECTLY ORGANIZE IT

Everburning torch actually crafts

090f966

Bugfix / bugreport to BN incoming soonTM

Blood is actually blood

bb97091

How the fuck did I even make some of them flesh originally

Magic itemgroups rebalancing!

64d3283

- Added back exotic books (for now) - Made magic academies spawn more recipe books - Provided more starting traits - Adds Summon Lemon

Fix magic academies

e6fea7f

Why the hell is it called "items" when it uses itemGROUPS, smh.

Some minor changes (cataclysmbnteam#5)

eff41f7

Adds mithril metal, more staves of the magi, and a couple new golems --------- Co-authored-by: RobbieNeko <[email protected]>

Companion to PR, hopeful fuel fixes

aa40eb2

RobbieNeko and others added 20 commits January 8, 2025 16:58

Harvest Parity with base BN

56443d2

Fix demon spider queen's blood

2202ef4

Capitalization of spellcraft

5095b8a

Fix resin golems fighting their bretheren

8219784

Oops!

Black Dragonbone weapons and more casting

23a121f

Autolearn demonchitin armor

ce3c410

Fix some regenerating thread bugs

8bac0cf

Thanks to Chaosvolt, his dergliness

Fix plastic golems being silly factionless bozos

0dc7099

Reduce speed-spells to reasonable levels

a31b57d

No more 300 extra speed, and windrunning now alters movecost instead (and makes use of enchantments to do so)

MMN: Brain Implosion Energy

a39983a

~10000 grams of pure caffeine

Memeteor time. (cataclysmbnteam#14)

856719e

* Added Meteor spell * Added meteor scroll. * Added meteor scroll to tier 3 scrolls group. With low spawn chance. * Description Tweaks --------- Co-authored-by: RobbieNeko <[email protected]>

Fix commas in earthshaper.json

41d6f15

My bad for assuming the PR was playtested

Biomancer acid spells (cataclysmbnteam#15)

47f9399

* Tier 1 acid bolt spell. * Added Tier 2 acid bomb spell * Lint * Tier 3 Acid Storm spell * Added scrolls for new spells. * Added new scrolls to spawn. * Grammar Changes --------- Co-authored-by: RobbieNeko <[email protected]>

Orc Camps!

5048782

Get ready for the in-repoing

7bb3d45

Fix an error in the orc update

27e84ee

Housekeeping

e4b4925

Housekeeping 1 Fix more bits of docs Remove accidental MMN Whoops style(autofix.ci): automated formatting elipses Oops

remove unncecessary conflicts

ca15c91

If this is what he wants

I think this is how we handle removed mods?

4c7738c

github-actions bot added docs PRs releated to docs page JSON related to game datas in JSON format. mods PR changes related to mods. labels Jan 8, 2025

RobbieNeko requested review from RoyalFox2140, Coolthulhu, yay855, chaosvolt and scarf005 January 8, 2025 22:46

RoyalFox2140 approved these changes Jan 8, 2025

View reviewed changes

RoyalFox2140 merged commit 155ee6f into cataclysmbnteam:main Jan 8, 2025
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(content): In-repo Magical Nights with correct attribution #5906

feat(content): In-repo Magical Nights with correct attribution #5906

RobbieNeko commented Jan 8, 2025 •

edited

Loading

RoyalFox2140 left a comment

feat(content): In-repo Magical Nights with correct attribution #5906

feat(content): In-repo Magical Nights with correct attribution #5906

Conversation

RobbieNeko commented Jan 8, 2025 • edited Loading

Checklist

Required

Optional

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

RoyalFox2140 left a comment

Choose a reason for hiding this comment

RobbieNeko commented Jan 8, 2025 •

edited

Loading