From 73129732813573834acbb441513b8d43775584e8 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 9 Apr 2024 12:41:03 -0700 Subject: Updated to 0.6.0 Revert weapon mount obsoletion Revert nether healing being too obvious Fix meat scrap description Fix missing rebuilt recon laser recipe Add patch to nerf fungal blossom spawn rate --- ...s-ignore-mechs-that-aren-t-being-piloted-.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch (limited to 'hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch') diff --git a/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch b/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch deleted file mode 100644 index a03a172..0000000 --- a/hotfix-01_fix-monsters-ignore-mechs-that-aren-t-being-piloted-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8618c68bafe113d8c6e301e8eb23d7df2292d91d Mon Sep 17 00:00:00 2001 -From: Chaosvolt -Date: Tue, 9 Jan 2024 17:56:09 -0600 -Subject: [PATCH] fix: monsters ignore mechs that aren't being piloted (#4083) - ---- - src/monster.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/monster.cpp b/src/monster.cpp -index 5cadb78107f..1c8c755f760 100644 ---- a/src/monster.cpp -+++ b/src/monster.cpp -@@ -1223,6 +1223,10 @@ Attitude monster::attitude_to( const Creature &other ) const - if( m == this ) { - return Attitude::A_FRIENDLY; - } -+ // Ignore inactive mechs -+ if( m->has_flag( MF_RIDEABLE_MECH ) && !m->has_effect( effect_ridden ) ) { -+ return Attitude::A_NEUTRAL; -+ } - - static const string_id faction_zombie( "zombie" ); - auto faction_att = faction.obj().attitude( m->faction ); --- -2.43.0 - -- cgit v1.2.1