Intro video rework.

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

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.
SilenceModeExclude = False
# Show Goddess of Destruction video introduction for newly created character
# Show introduction video for newly created characters.
# Default: True
GoDVideoIntro = True
ShowIntroVideo = True
# ---------------------------------------------------------------------------

View File

@@ -304,7 +304,7 @@ public class Config
public static boolean STORE_UI_SETTINGS;
public static String[] FORBIDDEN_NAMES;
public static boolean SILENCE_MODE_EXCLUDE;
public static boolean SHOW_GOD_VIDEO_INTRO;
public static boolean SHOW_INTRO_VIDEO;
// --------------------------------------------------
// Castle Settings
@@ -1925,7 +1925,7 @@ public class Config
STORE_UI_SETTINGS = characterConfig.getBoolean("StoreCharUiSettings", true);
FORBIDDEN_NAMES = characterConfig.getString("ForbiddenNames", "").split(",");
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;
ABILITY_MAX_POINTS = characterConfig.getInt("AbilityMaxPoints", 16);
ABILITY_POINTS_RESET_ADENA = characterConfig.getLong("AbilityPointsResetAdena", 10000000);

View File

@@ -40,6 +40,7 @@ public class PlayerVariables extends AbstractVariables
// Public variable names
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 WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_USED";
public static final String VITALITY_ITEMS_USED_VARIABLE_NAME = "VITALITY_ITEMS_USED";

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.item.PlayerItemTemplate;
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.GameClient;
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());
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();

View File

@@ -438,17 +438,12 @@ public class EnterWorld implements IClientIncomingPacket
// Friend list
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");
if (player.getRace() == Race.ERTHEIA)
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
}
else
{
player.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
player.getVariables().remove(PlayerVariables.INTRO_VIDEO);
player.sendPacket(player.getRace() == Race.ERTHEIA ? ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA : ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
}
SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);