Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mutable "generic" mine #56555

Merged
merged 18 commits into from
Apr 22, 2022
Merged

Mutable "generic" mine #56555

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dd7ce2d
Moved artifacts to its own file
Night-Pryanik Apr 3, 2022
9b8096f
Created "generic" mine mapgen and nested chunks for it
Night-Pryanik Apr 3, 2022
66a20f6
Created mutable mine OMS definition
Night-Pryanik Apr 3, 2022
8e7d29f
Removed Mine Entrance OMS and created an empty migration for it
Night-Pryanik Apr 3, 2022
36815c5
Obsoleted `mine`, `mine_down` OMTs and made `mine_finale` OMT rotatable
Night-Pryanik Apr 3, 2022
0b76176
Added `GROUP_MINERS` monster group (for mapgen)
Night-Pryanik Apr 3, 2022
a9c359b
Removed now-unused `GROUP_DOG_THING` monster group
Night-Pryanik Apr 3, 2022
ef8f9b8
Removed old hardcoded `overmap::build_mine` and `map::draw_mine` func…
Night-Pryanik Apr 3, 2022
562da26
Added migration for old `mine_finale` OMT
Night-Pryanik Apr 3, 2022
75ff86b
More strict conditions
Night-Pryanik Apr 3, 2022
6465958
Resolve conflicts
Night-Pryanik Apr 4, 2022
21bfd33
Merge branch 'master' into mutable-mine
Night-Pryanik Apr 4, 2022
47ade3e
Trying to fix the failing tests
Night-Pryanik Apr 4, 2022
8e0f33c
Merge branch 'mutable-mine' of https://github.com/Night-Pryanik/Catac…
Night-Pryanik Apr 4, 2022
fc4ba9c
Optimized, removed unneeded
Night-Pryanik Apr 4, 2022
cb4b187
Fixed tests
Night-Pryanik Apr 6, 2022
0378783
Merge branch 'master' into mutable-mine
BrettDong Apr 21, 2022
58f8457
Removed Mine Entrance specials from mods
Night-Pryanik Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions data/json/itemgroups/artifacts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"type": "item_group",
"id": "microlab_artifacts",
"subtype": "distribution",
"entries": [
{
"group": "amigara_items",
"artifact": { "procgen_id": "netherum_tunnels", "rules": { "power_level": 750, "max_attributes": 4, "max_negative_power": -1000 } },
"prob": 100
}
]
},
{
"type": "item_group",
"id": "altered_object_i",
"subtype": "distribution",
"entries": [
{
"group": "altered_item",
"artifact": { "procgen_id": "altered_object", "rules": { "power_level": 750, "max_attributes": 4, "max_negative_power": -1000 } },
"prob": 100
}
]
},
{
"type": "item_group",
"id": "portalmancy_i",
"subtype": "distribution",
"entries": [
{
"group": "portalmancy",
"artifact": { "procgen_id": "portalmancy", "rules": { "power_level": 1000, "max_attributes": 1, "max_negative_power": -1000 } },
"prob": 100
}
]
}
]
12 changes: 0 additions & 12 deletions data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
[
{
"type": "item_group",
"id": "microlab_artifacts",
"subtype": "distribution",
"entries": [
{
"group": "amigara_items",
"artifact": { "procgen_id": "netherum_tunnels", "rules": { "power_level": 750, "max_attributes": 4, "max_negative_power": -1000 } },
"prob": 100
}
]
},
{
"type": "mapgen",
"method": "json",
Expand Down
24 changes: 0 additions & 24 deletions data/json/mapgen/microlab/microlab_special_tiles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,4 @@
[
{
"type": "item_group",
"id": "altered_object_i",
"subtype": "distribution",
"entries": [
{
"group": "altered_item",
"artifact": { "procgen_id": "altered_object", "rules": { "power_level": 750, "max_attributes": 4, "max_negative_power": -1000 } },
"prob": 100
}
]
},
{
"type": "item_group",
"id": "portalmancy_i",
"subtype": "distribution",
"entries": [
{
"group": "portalmancy",
"artifact": { "procgen_id": "portalmancy", "rules": { "power_level": 1000, "max_attributes": 1, "max_negative_power": -1000 } },
"prob": 100
}
]
},
{
"type": "mapgen",
"nested_mapgen_id": "microlab_generic_tile",
Expand Down
Loading