Skip to content

Commit

Permalink
content(torments): Named Murmrus
Browse files Browse the repository at this point in the history
Also buffed Murmurs.

Ideas from @simply-peachy in #132
  • Loading branch information
db0 committed Jan 2, 2022
1 parent 01eede4 commit 1f0ab88
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 28 deletions.
Binary file added assets/enemies/sound-waves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/enemies/sound-waves.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/sound-waves.png-09145e179c2472ae325feb942faf2597.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/enemies/sound-waves.png"
dest_files=[ "res://.import/sound-waves.png-09145e179c2472ae325feb942faf2597.stex" ]

[params]

compress/mode=1
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
18 changes: 9 additions & 9 deletions src/dreamscape/CombatElements/Enemies/Enemies.gd
Original file line number Diff line number Diff line change
Expand Up @@ -160,29 +160,29 @@ const BUTTERFLY:= {
"_texture": preload("res://assets/enemies/butterfly.png"),
"_character_art": "Lorc",
}
const UNNAMED_ENEMY_1 := {
"Name": "Unnamed Enemy 1",
"Type": "Undefined",
"Health": 72,
const MURMURS := {
"Name": "Murmurs",
"Type": "Fear",
"Health": 83,
"Intents": [
{
"intent_scripts": ["Debuff:2:disempower"],
"intent_scripts": ["Debuff:2:disempower", "Stress:4"],
"reshuffle": false,
},
{
"intent_scripts": ["Buff:3:thorns"],
"intent_scripts": ["Buff:4:thorns"],
"reshuffle": false,
},
{
"intent_scripts": ["Stress:10"],
"reshuffle": true,
},
],
"_health_variability": 3,
"_health_variability": 4,
"_texture_size_x": "120",
"_texture_size_y": "120",
"_texture": preload("res://assets/enemies/lantern-flame.png"),
"_character_art": "Lorc"
"_texture": preload("res://assets/enemies/sound-waves.png"),
"_character_art": "Skoll"
}
const BROKEN_MIRROR:= {
"Name": "Broken Mirror",
Expand Down
2 changes: 1 addition & 1 deletion src/dreamscape/Overworld/Journal.gd
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ func _input(event):
globals.player.pathos.modify_released_pathos(Terms.RUN_ACCUMULATION_NAMES.artifact, 200)
# globals.player.damage = 85
var debug_encounters = [
# EnemyEncounter.new(Act2.ClownShow, "hard"),
EnemyEncounter.new(Act1.Murmurs, "easy"),
preload("res://src/dreamscape/Run/NCE/Act2/RiskyEvent3.gd").new(),
BossEncounter.new(Act1.BOSSES["Narcissus"], "Narcissus"),
# EliteEncounter.new(Act2.IndescribableAbsurdity, "medium"),
Expand Down
16 changes: 8 additions & 8 deletions src/dreamscape/Run/Act1.gd
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,21 @@ const Gaslighter = {
}


const UnnamedEnemy1 = {
const Murmurs = {
"journal_description":\
'[url={torment_tag1}]<Description to be added>[/url].',
'I thought I heard [url={torment_tag1}]murmurs on the wind[/url]. Were they talking about that time..?',
"journal_reward":\
'Through overcoming that weird experience, [url=card_draft]I felt wiser.[/url]',
"enemies": {
"easy": [
{
"definition": EnemyDefinitions.UNNAMED_ENEMY_1,
"health_modifier": -10,
"definition": EnemyDefinitions.MURMURS,
"health_modifier": -15,
},
],
"medium": [
{
"definition": EnemyDefinitions.UNNAMED_ENEMY_1,
"definition": EnemyDefinitions.MURMURS,
"starting_effects": [
{
"name": Terms.ACTIVE_EFFECTS.thorns.name,
Expand All @@ -157,12 +157,12 @@ const UnnamedEnemy1 = {
],
"hard": [
{
"definition": EnemyDefinitions.UNNAMED_ENEMY_1,
"definition": EnemyDefinitions.MURMURS,
"health_modifier": +30,
"starting_effects": [
{
"name": Terms.ACTIVE_EFFECTS.thorns.name,
"stacks": 3
"stacks": 4
}
]
},
Expand Down Expand Up @@ -492,7 +492,7 @@ const ENEMIES = [
TheLaughingOnes,
TheCritic,
Fearmonger,
UnnamedEnemy1,
Murmurs,
Clown,
Butterfly,
BrokenMirrors,
Expand Down
2 changes: 1 addition & 1 deletion src/dreamscape/Run/NCE/Shop.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var current_shop


func _init():
description = "I decided to pause for a bit to understand the feelings this dream was causing me."
description = "I saw a friend mine becking me over. We certainly had much to catch up on."
pathos_released = Terms.RUN_ACCUMULATION_NAMES.shop

func begin() -> void:
Expand Down
14 changes: 7 additions & 7 deletions src/dreamscape/cards/sets/SetDefinition_Enemies.gd
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ const CARDS := {
},
"_is_upgrade": true,
},
"Unnamed Enemy 1": {
"Murmurs": {
"Type": "Understanding",
"Tags": [Terms.ACTIVE_EFFECTS.thorns.name, Terms.GENERIC_TAGS.slumber.name],
"Abilities": "Gain {effect_stacks} {thorns}. {forget}",
Expand All @@ -461,12 +461,12 @@ const CARDS := {
},
"_upgrade_threshold_modifier": 0,
"_upgrades": [
"* Unnamed Enemy 1 *",
"^ Unnamed Enemy 1 ^",
"Sustained Unnamed Enemy 1",
"* Murmurs *",
"^ Murmurs ^",
"Sustained Murmurs",
],
},
"* Unnamed Enemy 1 *": {
"* Murmurs *": {
"Type": "Understanding",
"Tags": [Terms.ACTIVE_EFFECTS.thorns.name, Terms.GENERIC_TAGS.slumber.name],
"Abilities": "Gain {effect_stacks} {thorns}. {forget}",
Expand All @@ -482,7 +482,7 @@ const CARDS := {
},
"_is_upgrade": true,
},
"^ Unnamed Enemy 1 ^": {
"^ Murmurs ^": {
"Type": "Understanding",
"Tags": [Terms.ACTIVE_EFFECTS.thorns.name, Terms.GENERIC_TAGS.alpha.name],
"Abilities": "Gain {effect_stacks} {thorns}. {forget}",
Expand All @@ -498,7 +498,7 @@ const CARDS := {
},
"_is_upgrade": true,
},
"Sustained Unnamed Enemy 1": {
"Sustained Murmurs": {
"Type": "Understanding",
"Tags": [Terms.ACTIVE_EFFECTS.thorns.name],
"Abilities": "Gain {effect_stacks} {thorns}",
Expand Down
4 changes: 2 additions & 2 deletions src/dreamscape/cards/sets/SetScripts_Enemies.gd
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ const scripts := {
],
},
},
"Unnamed Enemy 1": {
"Murmurs": {
"manual": {
"hand": [
{
Expand All @@ -432,7 +432,7 @@ const scripts := {
],
},
},
"Sustained Unnamed Enemy": {
"Sustained Murmurs": {
"manual": {
"hand": [
{
Expand Down

0 comments on commit 1f0ab88

Please sign in to comment.