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

Backport few magiclysm fixes #75841

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Backport few magiclysm fixes #75841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions data/mods/Magiclysm/Spells/animist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"max_range": 3,
"min_aoe": 2,
"max_aoe": 2,
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 1080000,
"duration_increment": 36000
Expand Down Expand Up @@ -235,7 +235,7 @@
"type": "effect_on_condition",
"id": "EOC_SUMMON_ZOMBIE_SWARM",
"effect": {
"switch": { "u_val": "spell_level", "spell": "summon_undead" },
"switch": { "u_val": "spell_level", "spell": "summon_undead_swarm" },
"cases": [
{ "case": 0, "effect": { "u_cast_spell": { "id": "summon_zombie_dog" } } },
{ "case": 5, "effect": { "u_cast_spell": { "id": "summon_dog_skeleton" } } },
Expand Down Expand Up @@ -263,7 +263,7 @@
"max_range": 3,
"min_aoe": 2,
"max_aoe": 2,
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 1080000,
"duration_increment": 36000
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/Spells/attunements/Tundra_Mage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"range_increment": 0.2,
"min_aoe": 2,
"max_aoe": 2,
"flags": [ "SOMATIC", "VERBAL", "CONCENTRATE", "MUST_HAVE_CLASS_TO_LEARN" ],
"flags": [ "SOMATIC", "VERBAL", "CONCENTRATE", "MUST_HAVE_CLASS_TO_LEARN", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 180000,
"duration_increment": 5000
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Magiclysm/Spells/druid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"name": { "str": "Bag of Cats" },
"description": "Are you the crazy cat lady?",
"valid_targets": [ "ground" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP", "NO_CORPSE_QUIET" ],
"min_damage": 1,
"max_damage": 12,
"damage_increment": 1.0,
Expand Down Expand Up @@ -280,7 +280,7 @@
"base_energy_cost": 675,
"final_energy_cost": 475,
"energy_increment": -5.0,
"flags": [ "HOSTILE_50", "CONCENTRATE", "SOMATIC", "VERBAL", "NO_LEGS" ],
"flags": [ "HOSTILE_50", "CONCENTRATE", "SOMATIC", "VERBAL", "NO_LEGS", "NO_CORPSE_QUIET" ],
"shape": "blast",
"effect": "summon",
"effect_str": "mon_bear"
Expand Down Expand Up @@ -511,7 +511,7 @@
"max_duration": 1080000,
"duration_increment": 36000,
"base_energy_cost": 400,
"flags": [ "SOMATIC", "VERBAL", "NO_LEGS" ],
"flags": [ "SOMATIC", "VERBAL", "NO_LEGS", "NO_CORPSE_QUIET" ],
"shape": "blast",
"effect": "summon",
"effect_str": "mon_wolf"
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
"energy_source": "MANA",
"base_energy_cost": 50,
"base_casting_time": 3000,
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "HOSTILE_50" ],
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "HOSTILE_50", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 1080000,
"duration_increment": 36000,
Expand Down Expand Up @@ -300,7 +300,7 @@
"energy_source": "MANA",
"base_energy_cost": 80,
"base_casting_time": 3000,
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP" ],
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 1080000,
"duration_increment": 36000,
Expand Down Expand Up @@ -329,7 +329,7 @@
"energy_source": "MANA",
"base_energy_cost": 400,
"base_casting_time": 3000,
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP" ],
"flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "NO_CORPSE_QUIET" ],
"min_duration": 36000,
"max_duration": 1080000,
"duration_increment": 36000
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Xedra_Evolved/player/cbm_spells.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": { "str": "Swarm of Bats" },
"description": "Are you the Bat Man?",
"valid_targets": [ "ground" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP", "NO_CORPSE_QUIET" ],
"min_damage": 1,
"max_damage": 12,
"damage_increment": 1.0,
Expand All @@ -31,7 +31,7 @@
"name": { "str": "Giant Bat" },
"description": "Are you the Bat Man?",
"valid_targets": [ "ground" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP" ],
"flags": [ "LOUD", "SOMATIC", "SPAWN_GROUP", "NO_CORPSE_QUIET" ],
"min_damage": 1,
"max_damage": 3,
"damage_increment": 0.1,
Expand Down
1 change: 1 addition & 0 deletions src/magic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ std::string enum_to_string<spell_flag>( spell_flag data )
case spell_flag::EXTRA_EFFECTS_FIRST: return "EXTRA_EFFECTS_FIRST";
case spell_flag::MUST_HAVE_CLASS_TO_LEARN: return "MUST_HAVE_CLASS_TO_LEARN";
case spell_flag::SPAWN_WITH_DEATH_DROPS: return "SPAWN_WITH_DEATH_DROPS";
case spell_flag::NO_CORPSE_QUIET: return "NO_CORPSE_QUIET";
case spell_flag::NON_MAGICAL: return "NON_MAGICAL";
case spell_flag::PSIONIC: return "PSIONIC";
case spell_flag::RECHARM: return "RECHARM";
Expand Down
1 change: 1 addition & 0 deletions src/magic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ enum class spell_flag : int {
IGNITE_FLAMMABLE, // if spell effect area has any thing flammable, a fire will be produced
MUST_HAVE_CLASS_TO_LEARN, // you can't learn the spell unless you already have the class.
SPAWN_WITH_DEATH_DROPS, // allow summoned monsters to drop their usual death drops
NO_CORPSE_QUIET, // allow summoned monsters to vanish/leave without leaving a corpse
NON_MAGICAL, // ignores spell resistance
PSIONIC, // psychic powers instead of traditional magic
RECHARM, // charm_monster spell adds to duration of existing charm_monster effect
Expand Down
1 change: 1 addition & 0 deletions src/magic_spell_effect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,7 @@ static bool add_summoned_mon( const tripoint &pos, const time_duration &time, co
spawned_mon.set_summon_time( time );
}
spawned_mon.no_extra_death_drops = !sp.has_flag( spell_flag::SPAWN_WITH_DEATH_DROPS );
spawned_mon.no_corpse_quiet = sp.has_flag( spell_flag::NO_CORPSE_QUIET );
return true;
}

Expand Down
Loading