lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Intro video rework.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-28 23:07:33 +00:00
parent 3c092dcc0f
commit fca34d55b7
58 changed files with 160 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_01.0_Ertheia/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -837,9 +837,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -304,7 +304,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1925,7 +1925,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16); ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16);
ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000); ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000);
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -325,9 +326,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -438,17 +438,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_02.5_Underground/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -837,9 +837,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -311,7 +311,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1945,7 +1945,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16); ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16);
ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000); ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000);
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -325,9 +326,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -443,17 +443,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_03.0_Helios/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -837,9 +837,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -311,7 +311,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1958,7 +1958,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16); ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16);
ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000); ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000);
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -325,9 +326,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -443,17 +443,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_04.0_GrandCrusade/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -813,9 +813,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -305,7 +305,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1939,7 +1939,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -325,9 +326,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -443,17 +443,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_05.0_Salvation/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -813,9 +813,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -312,7 +312,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1948,7 +1948,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -444,17 +444,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_05.5_EtinasFate/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -813,9 +813,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -312,7 +312,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1955,7 +1955,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -444,17 +444,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_06.0_Fafurion/dist/game/config/Character.ini
Vendored
+2 -2
View File
@@ -833,9 +833,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True # Default: True
GoDVideoIntro = True ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -1994,7 +1994,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -444,17 +444,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Character.ini
Vendored
+3 -3
View File
@@ -842,9 +842,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True (Video changed at Prelude of War) # Default: True
GoDVideoIntro = False ShowIntroVideo = False
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -2004,7 +2004,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+5 -10
View File
@@ -448,17 +448,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN); SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
L2J_Mobius_08.2_Homunculus/dist/game/config/Character.ini
Vendored
+3 -3
View File
@@ -842,9 +842,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True (Video changed at Prelude of War) # Default: True
GoDVideoIntro = False ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -2002,7 +2002,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9); MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9);
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+8 -9
View File
@@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -71,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -458,16 +458,15 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(ExShowUsm.ANTHARAS_INTRO);
if (!Config.DISABLE_TUTORIAL)
{ {
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA); ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), 15000);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
} }
} }
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+1
View File
@@ -32,6 +32,7 @@ public class ExShowUsm implements IClientOutgoingPacket
public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance
public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147); public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147);
public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148); public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148);
public static final ExShowUsm ANTHARAS_INTRO = new ExShowUsm(149);
private final int _videoId; private final int _videoId;
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini
Vendored
+3 -3
View File
@@ -842,9 +842,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True (Video changed at Prelude of War) # Default: True
GoDVideoIntro = False ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -2004,7 +2004,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9); MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9);
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+8 -9
View File
@@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -71,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -463,16 +463,15 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(ExShowUsm.ANTHARAS_INTRO);
if (!Config.DISABLE_TUTORIAL)
{ {
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA); ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), 15000);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
} }
} }
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+1
View File
@@ -32,6 +32,7 @@ public class ExShowUsm implements IClientOutgoingPacket
public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance
public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147); public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147);
public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148); public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148);
public static final ExShowUsm ANTHARAS_INTRO = new ExShowUsm(149);
private final int _videoId; private final int _videoId;
L2J_Mobius_10.0_MasterClass/dist/game/config/Character.ini
Vendored
+3 -3
View File
@@ -842,9 +842,9 @@ ForbiddenNames = annou,ammou,amnou,anmou,anou,amou
# The exclude list is cleared each time the character goes into silence mode. # The exclude list is cleared each time the character goes into silence mode.
SilenceModeExclude = False SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character # Show introduction video for newly created characters.
# Default: True (Video changed at Prelude of War) # Default: True
GoDVideoIntro = False ShowIntroVideo = True
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/Config.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class Config
public static boolean STORE_UI_SETTINGS; public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES; public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE; public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO; public static boolean SHOW_INTRO_VIDEO;
// -------------------------------------------------- // --------------------------------------------------
// Castle Settings // Castle Settings
@@ -2004,7 +2004,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true); STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(","); FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false); SILENCE_MODE_EXCLUDE = characterConfig.getBoolean("SilenceModeExclude", false);
SHOW_GOD_VIDEO_INTRO = characterConfig.getBoolean("GoDVideoIntro", true); SHOW_INTRO_VIDEO = characterConfig.getBoolean("ShowIntroVideo", true);
PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000; PLAYER_MOVEMENT_BLOCK_TIME = characterConfig.getInt("NpcTalkBlockingTime", 0) * 1000;
ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000); ABILITY_POINTS_RESET_SP = characterConfig.getLong("AbilityPointsResetSP", 500000000);
MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9); MAX_HOMUNCULUS_COUNT = characterConfig.getInt("MaxHomunculusCount", 9);
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/variables/PlayerVariables.java
+1
View File
@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names // Public variable names
public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN"; public static final String INSTANCE_ORIGIN = "INSTANCE_ORIGIN";
public static final String INTRO_VIDEO = "INTRO_VIDEO";
public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED"; public static final String HAIR_ACCESSORY_VARIABLE_NAME = "HAIR_ACCESSORY_ENABLED";
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED"; public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED"; public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+3 -2
View File
@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.PlayerItemTemplate;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.variables.PlayerVariables;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
@@ -384,9 +385,9 @@ public class CharacterCreate implements IClientIncomingPacket
EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players()); EventDispatcher.getInstance().notifyEvent(new OnPlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
newChar.setOnlineStatus(true, false); newChar.setOnlineStatus(true, false);
if (Config.SHOW_GOD_VIDEO_INTRO) if (Config.SHOW_INTRO_VIDEO)
{ {
newChar.getVariables().set("intro_god_video", true); newChar.getVariables().set(PlayerVariables.INTRO_VIDEO, true);
} }
Disconnection.of(client, newChar).storeMe().deleteMe(); Disconnection.of(client, newChar).storeMe().deleteMe();
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+8 -9
View File
@@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.data.xml.BeautyShopData;
import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.data.xml.ClanHallData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassInfoType; import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -71,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.ConnectionState;
import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.Disconnection;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -467,16 +467,15 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list // Friend list
player.sendPacket(new L2FriendList(player)); player.sendPacket(new L2FriendList(player));
if (Config.SHOW_GOD_VIDEO_INTRO && player.getVariables().getBoolean("intro_god_video", false))
// Intro video.
if (Config.SHOW_INTRO_VIDEO && player.getVariables().hasVariable(PlayerVariables.INTRO_VIDEO))
{ {
player.getVariables().remove("intro_god_video"); player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
if (player.getRace() == Race.ERTHEIA) player.sendPacket(player.isDeathKnight() ? ExShowUsm.DEATH_KNIGHT_INTRO : ExShowUsm.ANTHARAS_INTRO);
if (!Config.DISABLE_TUTORIAL)
{ {
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA); ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), player.isDeathKnight() ? 30000 : 15000);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
} }
} }
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+2
View File
@@ -32,6 +32,8 @@ public class ExShowUsm implements IClientOutgoingPacket
public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance public static final ExShowUsm USM_Q015_E = new ExShowUsm(15); // Chamber of Prophecies instance
public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147); public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147);
public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148); public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148);
public static final ExShowUsm ANTHARAS_INTRO = new ExShowUsm(149);
public static final ExShowUsm DEATH_KNIGHT_INTRO = new ExShowUsm(150);
private final int _videoId; private final int _videoId;