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.

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

[ Xedra Evolved ] Salamander eruption mutable special #69553

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
fb645a0
Salamander eruption
Maleclypse Nov 18, 2023
cde3b92
Apply suggestions from code review
Maleclypse Nov 19, 2023
2704ffb
Update mutable_special.json
Maleclypse Nov 19, 2023
2cae5e1
Apply suggestions from code review
Maleclypse Nov 19, 2023
5f73933
Apply suggestions from code review
Maleclypse Nov 19, 2023
e0f7535
Update mutable_special.json
Maleclypse Nov 19, 2023
932cf0f
Update mutable_special.json
Maleclypse Nov 20, 2023
35c6484
Update mutable_special.json
Maleclypse Nov 20, 2023
053b0cf
fixes
Maleclypse Nov 20, 2023
88579a7
Update mutable_special.json
Maleclypse Nov 20, 2023
51400b0
Update data/mods/Xedra_Evolved/connect_groups.json
Maleclypse Nov 20, 2023
fd2fed2
Update data/mods/Xedra_Evolved/overmap/mutable_special.json
Maleclypse Nov 20, 2023
4bbbdfb
Update salamander_eruption_nested.json
Maleclypse Nov 20, 2023
63bb695
Update salamander_eruption_nested.json
Maleclypse Nov 20, 2023
ba9eb5c
Update overmap_terrain.json
Maleclypse Nov 21, 2023
828b20a
Fixes
Maleclypse Nov 21, 2023
4b0c9ed
Update data/mods/Xedra_Evolved/overmap/mutable_special.json
Maleclypse Nov 21, 2023
7ccd094
Update mutable_special.json
Maleclypse Nov 21, 2023
9d46196
Update mutable_special.json
Maleclypse Nov 23, 2023
08566c9
Update mutable_special.json
Maleclypse Dec 17, 2023
9c5403d
Apply suggestions from code review
Maleclypse Dec 30, 2023
1e6e717
Update data/mods/Xedra_Evolved/overmap/mutable_special.json
Maleclypse Jan 1, 2024
b855de1
Update salamander_eruption_nested.json
Maleclypse Jan 18, 2024
a4c3f47
Apply suggestions from code review
Maleclypse Jan 18, 2024
40671d4
Monsters
Maleclypse Jan 30, 2024
a7360ac
Update data/mods/Xedra_Evolved/items/melee.json
Maleclypse Feb 3, 2024
fe93542
Update elementals.json
Maleclypse Feb 3, 2024
d211411
stuff
Maleclypse Feb 4, 2024
49b9cf3
Apply suggestions from code review
Maleclypse Feb 4, 2024
bca7978
More work
Maleclypse Mar 1, 2024
f35eb7f
Update data/mods/Xedra_Evolved/requirements/material.json
Maleclypse May 12, 2024
ce6c0cf
Delete terrain_eruption.json
Maleclypse May 20, 2024
c1fd69b
Update ammo.json
Maleclypse May 20, 2024
2f5f277
Update resources.json
Maleclypse May 20, 2024
efa08e2
Update resources.json
Maleclypse May 25, 2024
e6e3547
Update data/mods/Xedra_Evolved/items/melee.json
Maleclypse Jul 28, 2024
5549c3a
Update elementals.json
Maleclypse Jul 28, 2024
22803a4
attacks and such
Maleclypse Jul 29, 2024
d3ccc56
Update data/mods/Xedra_Evolved/monster_special_attacks/monster_specia…
Maleclypse Jul 29, 2024
6d540dc
Apply suggestions from code review
Maleclypse Oct 13, 2024
e189e9f
Update data/mods/Xedra_Evolved/items/resources.json
Maleclypse Oct 13, 2024
7a67120
Update data/mods/Xedra_Evolved/items/resources.json
Maleclypse Oct 13, 2024
e70654b
Apply suggestions from code review
Maleclypse Oct 13, 2024
f46116a
Apply suggestions from code review
Maleclypse Oct 15, 2024
577c41a
Update resources.json
Maleclypse Oct 15, 2024
d392dfd
Merge branch 'Paraclesian-eruptions' of https://github.com/Maleclypse…
Maleclypse Oct 15, 2024
b1471cc
Update overmap_terrain.json
Maleclypse Oct 24, 2024
bc32b07
itemgroups
Maleclypse Oct 26, 2024
dd188b9
Apply suggestions from code review
Maleclypse Oct 27, 2024
8aa55cf
Apply suggestions from code review
Maleclypse Oct 27, 2024
7e62b65
Update overmap_terrain.json
Maleclypse Oct 30, 2024
2839aaf
Update elementals.json
Maleclypse Oct 31, 2024
0b636f4
Update elementals.json
Maleclypse Oct 31, 2024
1a83601
Update elementals.json
Maleclypse Oct 31, 2024
ccb12aa
Update elementals.json
Maleclypse Nov 6, 2024
2a44722
Fixes
Maleclypse Nov 9, 2024
8dd53de
Update data/mods/Xedra_Evolved/items/melee.json
Maleclypse Nov 12, 2024
3082dc3
Update data/mods/Xedra_Evolved/mapgen/mutable/salamander_eruption.json
Maleclypse Nov 12, 2024
a40d230
Apply suggestions from code review
Maleclypse Nov 24, 2024
6ef8c5d
Apply suggestions from code review
Maleclypse Dec 14, 2024
fc37714
Update data/mods/Xedra_Evolved/mapgen/mutable/salamander_eruption.json
Maleclypse Dec 14, 2024
023ecc6
Update data/mods/Xedra_Evolved/monsters/elementals.json
Maleclypse Dec 15, 2024
32ba131
Update data/mods/Xedra_Evolved/monsters/elementals.json
Maleclypse Dec 15, 2024
9111bf5
Merge branch 'master' into Paraclesian-eruptions
Maleclypse Dec 24, 2024
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
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
Maleclypse and github-actions[bot] committed Oct 13, 2024
commit cde3b9231a6df9f5e6b4f9bccf1842e26594344b
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,12 @@
"####### #######",
"####### #######"
],
"terrain": { "#": "t_rock", " ": [ [ "t_puddle_underground", 1 ], [ "t_obsidian_floor", 10 ] ], "~": "t_obsidian_floor", ">": "t_ramp_up_low" },
"terrain": {
"#": "t_rock",
" ": [ [ "t_puddle_underground", 1 ], [ "t_obsidian_floor", 10 ] ],
"~": "t_obsidian_floor",
">": "t_ramp_up_low"
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
},
"nested": {
" ": {
"chunks": [ [ "salamander_sinkhole", 1 ], [ "fallen_adventurer", 1 ], [ "mine_minerals_equipment", 1 ], [ "null", 50 ] ]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/overmap/mutable_special.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@
}
]

Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
]
]
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved