Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/instances/Kamaloka/Kamaloka.java (modified) (8 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java

@@ -440 +440 @@
                 if (party == null)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
                         return false;
                 }
@@ -446 +446 @@
                 if (party.getLeader() != player)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+                        player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
                         return false;
                 }
@@ -452 +452 @@
                 if (party.getMemberCount() > MAX_PARTY_SIZE[index])
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
                         return false;
                 }
@@ -488 +488 @@
                                 {
                                         // find instance with same name (kamaloka or labyrinth)
+                                        // TODO: Zoey76: Don't use instance name, use other system.
                                         if (!instanceName.equals(InstanceManager.getInstance().getInstanceIdName(id)))
                                                 continue;
@@ -579 +580 @@
                                         || world.templateId != templateId)
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return;
                         }
@@ -600 +601 @@
                 }
                 // Creating new kamaloka instance
-                else
-                {
-                        if (!checkConditions(player, index))
-                                return;
-                        
-                        // Creating dynamic instance without template
-                        final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
-                        final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
-                        // set name for the kamaloka
-                        inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
-                        // set return location
-                        final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
-                        inst.setSpawnLoc(returnLoc);
-                        // disable summon friend into instance
-                        inst.setAllowSummon(false);
-                        // set duration and empty destroy time
-                        inst.setDuration(DURATION[index] * 60000);
-                        inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
-                        
-                        // Creating new instanceWorld, using our instanceId and templateId
-                        world = new KamaWorld();
-                        world.instanceId = instanceId;
-                        world.templateId = templateId;
-                        // set index for easy access to the arrays
-                        ((KamaWorld)world).index = index;
-                        InstanceManager.getInstance().addWorld(world);
-                        world.status = 0;
-                        // spawn npcs
-                        spawnKama((KamaWorld)world);
-                        
-                        // and finally teleport party into instance
-                        final L2Party party = player.getParty();
-                        for (L2PcInstance partyMember : party.getPartyMembers())
-                        {
-                                if (partyMember.getQuestState(qn) == null)
-                                        newQuestState(partyMember);
-                                world.allowed.add(partyMember.getObjectId());
-                                
-                                removeBuffs(partyMember);
-                                teleportPlayer(partyMember, TELEPORTS[index], instanceId);
-                        }
+                if (!checkConditions(player, index))
                         return;
-                }
+                
+                // Creating dynamic instance without template
+                final int instanceId = InstanceManager.getInstance().createDynamicInstance(null);
+                final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+                // set name for the kamaloka
+                inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
+                // set return location
+                final int[] returnLoc = { player.getX(), player.getY(), player.getZ() };
+                inst.setSpawnLoc(returnLoc);
+                // disable summon friend into instance
+                inst.setAllowSummon(false);
+                // set duration and empty destroy time
+                inst.setDuration(DURATION[index] * 60000);
+                inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);
+                
+                // Creating new instanceWorld, using our instanceId and templateId
+                world = new KamaWorld();
+                world.instanceId = instanceId;
+                world.templateId = templateId;
+                // set index for easy access to the arrays
+                ((KamaWorld)world).index = index;
+                InstanceManager.getInstance().addWorld(world);
+                world.status = 0;
+                // spawn npcs
+                spawnKama((KamaWorld)world);
+                
+                // and finally teleport party into instance
+                final L2Party party = player.getParty();
+                for (L2PcInstance partyMember : party.getPartyMembers())
+                {
+                        if (partyMember.getQuestState(qn) == null)
+                                newQuestState(partyMember);
+                        world.allowed.add(partyMember.getObjectId());
+                        
+                        removeBuffs(partyMember);
+                        teleportPlayer(partyMember, TELEPORTS[index], instanceId);
+                }
+                return;
         }
         
@@ -661 +659 @@
                         
                         SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_RESTRICTED);
-                        sm.addString(InstanceManager.getInstance().getInstanceIdName(world.templateId));
+                        sm.addInstanceName(world.templateId);
                         
                         // set instance reenter time for all allowed players
@@ -824 +822 @@
                         if (player.isInParty() && player.getParty().isLeader(player))
                                 return "32496.htm";
-                        else
-                                return "32496-no.htm";
-                }
-                
+                        return "32496-no.htm";
+                }
                 return "";
         }