From efd832b2e299396f7655b93ed3f01a840be1f859 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 10 Mar 2020 18:43:34 +0000 Subject: [PATCH] NpcTemplate default undying value set to non monster types. --- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- .../l2jmobius/gameserver/model/actor/templates/NpcTemplate.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0f8c71d7f3..9ea0f70234 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c75682aeb9..6e917e0562 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -143,7 +143,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c75682aeb9..6e917e0562 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -143,7 +143,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6879883ef0..868c8125fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6879883ef0..868c8125fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6879883ef0..868c8125fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c3d6993814..5d812860d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -175,7 +175,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c3d6993814..5d812860d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -175,7 +175,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index c3d6993814..5d812860d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -175,7 +175,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6879883ef0..868c8125fd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -169,7 +169,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _targetable = set.getBoolean("targetable", true); _talkable = set.getBoolean("talkable", true); _isQuestMonster = _title.contains("Quest"); - _undying = set.getBoolean("undying", true); + _undying = set.getBoolean("undying", !_type.equals("Monster") && !_type.equals("RaidBoss") && !_type.equals("GrandBoss")); _showName = set.getBoolean("showName", true); _randomWalk = set.getBoolean("randomWalk", !_type.equals("Guard")); _randomAnimation = set.getBoolean("randomAnimation", true);