Skip to content

Commit

Permalink
Fix PARROT_AT_DANGER attack, proper quotes for new feral lines (#2837)
Browse files Browse the repository at this point in the history 
* Fix PARROT_AT_DANGER attack, proper quotes for new feral lines

* Remove searchlight attack from feral labsec
  • Loading branch information
@chaosvolt
chaosvolt authored May 18, 2023
1 parent 8273e2f commit c0e7b5e
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 52 deletions.
2 changes: 1 addition & 1 deletion data/json/monsters/feral_humans.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
"path_settings": { "max_dist": 10 },
"diff": 5,
"starting_ammo": { "9mm": 5 },
"special_attacks": [ [ "PARROT_AT_DANGER", 5 ], [ "SEARCHLIGHT", 1 ], [ "TAZER", 10 ] ],
"special_attacks": [ [ "PARROT_AT_DANGER", 5 ], [ "TAZER", 10 ] ],
"death_drops": "feral_security_death_drops_flashlight",
"death_function": [ "NORMAL" ],
"zombify_into": "mon_zombie_labsecurity",
Expand Down
86 changes: 43 additions & 43 deletions data/json/speech.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2610,259 +2610,259 @@
{
"type": "speech",
"speaker": [ "mon_feral_scientist_scalpel" ],
"sound": "I'll show them. I'll prove I was right all along!",
"sound": "\"I'll show them. I'll prove I was right all along!\"",
"volume": 20
},
{
"type": "speech",
"speaker": [ "mon_feral_scientist_scalpel" ],
"sound": "The vectors, the vectors are all wrong…",
"sound": "\"The vectors, the vectors are all wrong…\"",
"volume": 15
},
{
"type": "speech",
"speaker": [ "mon_feral_scientist_scalpel" ],
"sound": "There's nothing there. This is all just a simulation, a bad dream…",
"sound": "\"There's nothing there. This is all just a simulation, a bad dream…\"",
"volume": 15
},
{
"type": "speech",
"speaker": [ "mon_feral_scientist_scalpel" ],
"sound": "There's. Nothing. There.",
"sound": "\"There's. Nothing. There.\"",
"volume": 20
},
{
"type": "speech",
"speaker": [ "mon_feral_scientist_scalpel" ],
"sound": "They called me a fool. Now who's the fool!?",
"sound": "\"They called me a fool. Now who's the fool!?\"",
"volume": 40
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_labsecurity_flashlight" ],
"sound": "Get back in your cage!",
"sound": "\"Get back in your cage!\"",
"volume": 40
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_labsecurity_flashlight", "mon_feral_soldier" ],
"sound": "X-ray breaching perimeter!",
"sound": "\"X-ray breaching perimeter!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_labsecurity_flashlight" ],
"sound": "Lock this sector down, damnit!",
"sound": "\"Lock this sector down, damnit!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_labsecurity_flashlight" ],
"sound": "Unknown entity escaping containment!",
"sound": "\"Unknown entity escaping containment!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "I am the night rider!",
"sound": "\"I am the night rider!\"",
"volume": 20
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "I'm here to swim in gasoline, baby!",
"sound": "\"I'm here to swim in gasoline, baby!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "Give me unleaded, or you'll get lead!",
"sound": "\"Give me unleaded, or you'll get lead!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "I'm a fuel-injected suicide machine!",
"sound": "\"I'm a fuel-injected suicide machine!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "I'm gonna tan your god damn hide!",
"sound": "\"I'm gonna tan your god damn hide!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot" ],
"sound": "Which one of you fuckers touched my bike!?",
"sound": "\"Which one of you fuckers touched my bike!?\"",
"volume": 40
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Reach for the sky!",
"sound": "\"Reach for the sky!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_militia", "mon_feral_prepper" ],
"sound": "Clear my line of fire!",
"sound": "\"Clear my line of fire!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Reach for the sky!",
"sound": "\"Reach for the sky!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper" ],
"sound": "Weapons hot!",
"sound": "\"Weapons hot!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper" ],
"sound": "Lock and load!",
"sound": "\"Lock and load!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_survivalist" ],
"sound": "I don't have to be faster than them, just faster than you!",
"sound": "\"I don't have to be faster than them, just faster than you!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_survivalist" ],
"sound": "My feet failed me! Arms, don't fail me!",
"sound": "\"My feet failed me! Arms, don't fail me!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Look at me. I am the captain now.",
"sound": "\"Look at me. I am the captain now.\"",
"volume": 20
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "I don't have to take this abuse from you, there are plenty of people to abuse me!",
"sound": "\"I don't have to take this abuse from you, there are plenty of people to abuse me!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "You're a monster!",
"sound": "\"You're a monster!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "I've had enough of your bullshit!",
"sound": "\"I've had enough of your bullshit!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Adios, motherfucker!",
"sound": "\"Adios, motherfucker!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Get out of here or I'll kill you!",
"sound": "\"Get out of here or I'll kill you!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Keep your distance!",
"sound": "\"Keep your distance!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot", "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "This is my territory, asshole!",
"sound": "\"This is my territory, asshole!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot", "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Fuck off, I saw this place first!",
"sound": "\"Fuck off, I saw this place first!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_jackboot", "mon_feral_militia", "mon_feral_prepper", "mon_feral_survivalist" ],
"sound": "Get out of here, I own this town now!",
"sound": "\"Get out of here, I own this town now!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "We've got incoming!",
"sound": "\"We've got incoming!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Hostiles inbound.",
"sound": "\"Hostiles inbound.\"",
"volume": 20
},
{
"type": "speech",
"speaker": [ "mon_feral_labsecurity_9mm", "mon_feral_labsecurity_flashlight", "mon_feral_soldier" ],
"sound": "I've got movement!",
"sound": "\"I've got movement!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Danger close!",
"sound": "\"Danger close!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Last one alive, lock the door!",
"sound": "\"Last one alive, lock the door!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "We have you surrounded, at least from this side!",
"sound": "\"We have you surrounded, at least from this side!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Charge!",
"sound": "\"Charge!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Contact!",
"sound": "\"Contact!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Contact, enemy in sight!",
"sound": "\"Contact, enemy in sight!\"",
"volume": 30
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "Target in sight!",
"sound": "\"Target in sight!\"",
"volume": 25
},
{
"type": "speech",
"speaker": [ "mon_feral_soldier" ],
"sound": "We've got hostiles!",
"sound": "\"We've got hostiles!\"",
"volume": 25
}
]
13 changes: 5 additions & 8 deletions src/monattack.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4556,14 +4556,11 @@ bool mattack::parrot( monster *z )

bool mattack::parrot_at_danger( monster *parrot )
{
for( monster &monster : g->all_monsters() ) {
if( one_in( 20 ) && ( monster.faction->attitude( parrot->faction ) == mf_attitude::MFA_HATE ||
( monster.anger > 0 &&
monster.faction->attitude( parrot->faction ) == mf_attitude::MFA_BY_MOOD ) ) &&
parrot->sees( monster ) ) {
parrot_common( parrot );
return true;
}

Creature *target = parrot->attack_target();
if( one_in( 20 ) && target != nullptr && parrot->sees( *target ) ) {
parrot_common( parrot );
return true;
}

return false;
Expand Down

0 comments on commit c0e7b5e

Please sign in to comment.