More accurate descriptions, and make it synchronised
This commit is contained in:
@@ -158,8 +158,6 @@ public final class Settings {
|
|||||||
public boolean teleportThroughUnbreakableBlocks = false;
|
public boolean teleportThroughUnbreakableBlocks = false;
|
||||||
/** <b>[Server-only]</b> Whether to allow players to damage their designated allies using magic. */
|
/** <b>[Server-only]</b> Whether to allow players to damage their designated allies using magic. */
|
||||||
public FriendlyFire friendlyFire = FriendlyFire.ALL;
|
public FriendlyFire friendlyFire = FriendlyFire.ALL;
|
||||||
/** <b>[Server-only]</b> Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc. */
|
|
||||||
public boolean passiveMobsAreAllies = false;
|
|
||||||
/** <b>[Server-only]</b> Whether to allow players to disarm other players using the telekinesis spell. */
|
/** <b>[Server-only]</b> Whether to allow players to disarm other players using the telekinesis spell. */
|
||||||
public boolean telekineticDisarmament = true;
|
public boolean telekineticDisarmament = true;
|
||||||
/** <b>[Server-only]</b> Whether summoned creatures can revenge attack their caster if their caster attacks them. */
|
/** <b>[Server-only]</b> Whether summoned creatures can revenge attack their caster if their caster attacks them. */
|
||||||
@@ -277,6 +275,8 @@ public final class Settings {
|
|||||||
* effect.
|
* effect.
|
||||||
*/
|
*/
|
||||||
public boolean slowTimeAffectsPlayers = true;
|
public boolean slowTimeAffectsPlayers = true;
|
||||||
|
/** <b>[Synchronised]</b> Whether passive mobs should count as allies, i.e. they should not be damaged indirectly by spells */
|
||||||
|
public boolean passiveMobsAreAllies = false;
|
||||||
/** <b>[Synchronised]</b> Whether to replace Minecraft's own fireballs with wizardry fireballs. */
|
/** <b>[Synchronised]</b> Whether to replace Minecraft's own fireballs with wizardry fireballs. */
|
||||||
public boolean replaceVanillaFireballs = true;
|
public boolean replaceVanillaFireballs = true;
|
||||||
/** <b>[Synchronised]</b> Chance of 'misreading' an undiscovered spell and triggering a forfeit instead. */
|
/** <b>[Synchronised]</b> Chance of 'misreading' an undiscovered spell and triggering a forfeit instead. */
|
||||||
@@ -581,10 +581,9 @@ public final class Settings {
|
|||||||
propOrder.add(property.getName());
|
propOrder.add(property.getName());
|
||||||
|
|
||||||
property = config.get(DIFFICULTY_CATEGORY, "passiveMobsAreAllies", false,
|
property = config.get(DIFFICULTY_CATEGORY, "passiveMobsAreAllies", false,
|
||||||
"Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc.");
|
"Whether passive mobs should count as allies, i.e. they should not be damaged indirectly by spells.");
|
||||||
property.setLanguageKey("config." + Wizardry.MODID + ".passive_mobs_are_allies");
|
property.setLanguageKey("config." + Wizardry.MODID + ".passive_mobs_are_allies");
|
||||||
Wizardry.proxy.setToNamedBooleanEntry(property);
|
Wizardry.proxy.setToNamedBooleanEntry(property);
|
||||||
property.setRequiresWorldRestart(false);
|
|
||||||
passiveMobsAreAllies = property.getBoolean();
|
passiveMobsAreAllies = property.getBoolean();
|
||||||
propOrder.add(property.getName());
|
propOrder.add(property.getName());
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
|
|||||||
Wizardry.settings.bookshelfSearchRadius = message.settings.bookshelfSearchRadius;
|
Wizardry.settings.bookshelfSearchRadius = message.settings.bookshelfSearchRadius;
|
||||||
Wizardry.settings.bookshelfBlocks = message.settings.bookshelfBlocks;
|
Wizardry.settings.bookshelfBlocks = message.settings.bookshelfBlocks;
|
||||||
Wizardry.settings.bookItems = message.settings.bookItems;
|
Wizardry.settings.bookItems = message.settings.bookItems;
|
||||||
|
Wizardry.settings.passiveMobsAreAllies = message.settings.passiveMobsAreAllies;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Message implements IMessage {
|
public static class Message implements IMessage {
|
||||||
@@ -71,6 +72,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
|
|||||||
settings.bookshelfSearchRadius = buf.readInt();
|
settings.bookshelfSearchRadius = buf.readInt();
|
||||||
settings.bookshelfBlocks = readMetaItems(buf);
|
settings.bookshelfBlocks = readMetaItems(buf);
|
||||||
settings.bookItems = readMetaItems(buf);
|
settings.bookItems = readMetaItems(buf);
|
||||||
|
settings.passiveMobsAreAllies = buf.readBoolean();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -83,6 +85,7 @@ public class PacketSyncSettings implements IMessageHandler<Message, IMessage> {
|
|||||||
buf.writeInt(settings.bookshelfSearchRadius);
|
buf.writeInt(settings.bookshelfSearchRadius);
|
||||||
writeMetaItems(buf, settings.bookshelfBlocks);
|
writeMetaItems(buf, settings.bookshelfBlocks);
|
||||||
writeMetaItems(buf, settings.bookItems);
|
writeMetaItems(buf, settings.bookItems);
|
||||||
|
buf.writeBoolean(settings.passiveMobsAreAllies);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
|
|||||||
@@ -1194,9 +1194,9 @@ config.ebwizardry.legacy_wand_levelling.false=No - Level me up!
|
|||||||
config.ebwizardry.friendly_fire=Friendly Fire
|
config.ebwizardry.friendly_fire=Friendly Fire
|
||||||
config.ebwizardry.friendly_fire.tooltip=Controls which creatures may be damaged by your magic when allied to you. Your spells will not target your allies or creatures summoned/owned by them regardless of this setting, but this setting makes them completely immune if disabled.
|
config.ebwizardry.friendly_fire.tooltip=Controls which creatures may be damaged by your magic when allied to you. Your spells will not target your allies or creatures summoned/owned by them regardless of this setting, but this setting makes them completely immune if disabled.
|
||||||
config.ebwizardry.passive_mobs_are_allies=Passive Mobs Are Allies
|
config.ebwizardry.passive_mobs_are_allies=Passive Mobs Are Allies
|
||||||
config.ebwizardry.passive_mobs_are_allies.tooltip=Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc.
|
config.ebwizardry.passive_mobs_are_allies.tooltip=Whether all passive mobs should count as allies, i.e. they should not be damaged indirectly by spells. Tamed mobs always count as allies.
|
||||||
config.ebwizardry.passive_mobs_are_allies.true=Yes - don't hurt the animals!
|
config.ebwizardry.passive_mobs_are_allies.true=Yes - don't hurt the animals!
|
||||||
config.ebwizardry.passive_mobs_are_allies.false=No - I like my steak phoenix-grilled!
|
config.ebwizardry.passive_mobs_are_allies.false=No - I like my steak lightning-grilled!
|
||||||
config.ebwizardry.minion_revenge_targeting=Minion Revenge Targeting
|
config.ebwizardry.minion_revenge_targeting=Minion Revenge Targeting
|
||||||
config.ebwizardry.minion_revenge_targeting.tooltip=Whether summoned creatures can revenge-attack players or creatures that they would not otherwise be able to attack.
|
config.ebwizardry.minion_revenge_targeting.tooltip=Whether summoned creatures can revenge-attack players or creatures that they would not otherwise be able to attack.
|
||||||
config.ebwizardry.minion_revenge_targeting.true=Yes - I'd never hurt them!
|
config.ebwizardry.minion_revenge_targeting.true=Yes - I'd never hurt them!
|
||||||
|
|||||||
@@ -1194,9 +1194,9 @@ config.ebwizardry.legacy_wand_levelling.false=No - Level me up!
|
|||||||
config.ebwizardry.friendly_fire=Friendly Fire
|
config.ebwizardry.friendly_fire=Friendly Fire
|
||||||
config.ebwizardry.friendly_fire.tooltip=Controls which creatures may be damaged by your magic when allied to you. Your spells will not target your allies or creatures summoned/owned by them regardless of this setting, but this setting makes them completely immune if disabled.
|
config.ebwizardry.friendly_fire.tooltip=Controls which creatures may be damaged by your magic when allied to you. Your spells will not target your allies or creatures summoned/owned by them regardless of this setting, but this setting makes them completely immune if disabled.
|
||||||
config.ebwizardry.passive_mobs_are_allies=Passive Mobs Are Allies
|
config.ebwizardry.passive_mobs_are_allies=Passive Mobs Are Allies
|
||||||
config.ebwizardry.passive_mobs_are_allies.tooltip=Whether passive mobs should count as allies, i.e. they should not be targeted by minions, lightning chaining, etc.
|
config.ebwizardry.passive_mobs_are_allies.tooltip=Whether all passive mobs should count as allies, i.e. they should not be damaged indirectly by spells. Tamed mobs always count as allies.
|
||||||
config.ebwizardry.passive_mobs_are_allies.true=Yes - don't hurt the animals!
|
config.ebwizardry.passive_mobs_are_allies.true=Yes - don't hurt the animals!
|
||||||
config.ebwizardry.passive_mobs_are_allies.false=No - I like my steak phoenix-grilled!
|
config.ebwizardry.passive_mobs_are_allies.false=No - I like my steak lightning-grilled!
|
||||||
config.ebwizardry.minion_revenge_targeting=Minion Revenge Targeting
|
config.ebwizardry.minion_revenge_targeting=Minion Revenge Targeting
|
||||||
config.ebwizardry.minion_revenge_targeting.tooltip=Whether summoned creatures can revenge-attack players or creatures that they would not otherwise be able to attack.
|
config.ebwizardry.minion_revenge_targeting.tooltip=Whether summoned creatures can revenge-attack players or creatures that they would not otherwise be able to attack.
|
||||||
config.ebwizardry.minion_revenge_targeting.true=Yes - I'd never hurt them!
|
config.ebwizardry.minion_revenge_targeting.true=Yes - I'd never hurt them!
|
||||||
|
|||||||
Reference in New Issue
Block a user