Skip to content

Commit 76c89f3

Browse files
Merge pull request #82604 from Standing-Storm/star-vampire-invisibility
Star vampires have `PERMANENT_INVISIBILITY`, when they drink blood it applies `SUPPRESS_INVISIBILITY`
1 parent 1c5f28f commit 76c89f3

File tree

3 files changed

+4
-35
lines changed

3 files changed

+4
-35
lines changed

data/json/effects.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5071,8 +5071,8 @@
50715071
"name": [ "Drank blood" ],
50725072
"desc": [ "The star vampire has drunk blood and is now visible." ],
50735073
"rating": "good",
5074-
"removes_effects": [ "invisibility" ],
5075-
"show_in_info": true
5074+
"show_in_info": true,
5075+
"flags": [ "SUPPRESS_INVISIBILITY" ]
50765076
},
50775077
{
50785078
"id": "star_vampire_blood_drink_feral",

data/json/monster_special_attacks/spells.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,20 +1119,6 @@
11191119
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ],
11201120
"effect_str": "nausea"
11211121
},
1122-
{
1123-
"type": "SPELL",
1124-
"id": "star_vampire_invisibility_spell",
1125-
"name": { "str": "star vampire invisibility", "//~": "NO_I18N" },
1126-
"description": { "str": "Makes the star vampire invisible", "//~": "NO_I18N" },
1127-
"valid_targets": [ "self" ],
1128-
"effect": "attack",
1129-
"effect_str": "invisibility",
1130-
"shape": "blast",
1131-
"message": "",
1132-
"min_duration": 99999999999,
1133-
"max_duration": 99999999999,
1134-
"flags": [ "SILENT", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ]
1135-
},
11361122
{
11371123
"type": "SPELL",
11381124
"id": "sloth_attack",

data/json/monsters/nether.json

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -690,15 +690,6 @@
690690
"miss_msg_npc": "%1$s tries to fasten onto <npcname>, but they dodge!",
691691
"no_dmg_msg_u": "%1$s tries to fasten onto your %2$s, but can't penetrate your armor.",
692692
"no_dmg_msg_npc": "%1$s tries to fasten onto <npcname>'s %2$s, but can't penetrate their armor."
693-
},
694-
{
695-
"id": "star_vampire_invisibility",
696-
"type": "spell",
697-
"spell_data": { "id": "star_vampire_invisibility_spell", "min_level": 3 },
698-
"cooldown": 1,
699-
"allow_no_target": true,
700-
"condition": { "or": [ { "not": { "u_has_effect": "invisibility" } }, { "not": { "u_has_effect": "star_vampire_blood_drank" } } ] },
701-
"monster_message": ""
702693
}
703694
],
704695
"bleed_rate": 40,
@@ -721,7 +712,8 @@
721712
"PLASTIC",
722713
"NO_BREATHE",
723714
"HARDTOSHOOT",
724-
"NOGIB"
715+
"NOGIB",
716+
"PERMANENT_INVISIBILITY"
725717
],
726718
"armor": { "bash": 8, "electric": 3 }
727719
},
@@ -886,15 +878,6 @@
886878
"miss_msg_npc": "%1$s tries to clutch onto you <npcname>, but they dodge!",
887879
"no_dmg_msg_u": "%1$s tries to clutch onto your %2$s, but can't penetrate your armor.",
888880
"no_dmg_msg_npc": "%1$s tries to clutch onto <npcname>'s %2$s, but can't penetrate their armor."
889-
},
890-
{
891-
"id": "star_vampire_invisibility",
892-
"type": "spell",
893-
"spell_data": { "id": "star_vampire_invisibility_spell", "min_level": 3 },
894-
"cooldown": 1,
895-
"allow_no_target": true,
896-
"condition": { "or": [ { "not": { "u_has_effect": "invisibility" } }, { "not": { "u_has_effect": "star_vampire_blood_drank" } } ] },
897-
"monster_message": ""
898881
}
899882
]
900883
},

0 commit comments

Comments
 (0)