Browse Source

- face accessories fix (slot hair, not hair2, so that it does not show the bangs)
- L2Teleporter in castle fix
- social action descriptions
- typo fixes

janiii 15 years ago
parent
commit
144b9bc675

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -142,7 +142,7 @@ public class ItemTable
 		_slots.put("fullarmor", L2Item.SLOT_FULL_ARMOR);
 		_slots.put("head", L2Item.SLOT_HEAD);
 		_slots.put("hair", L2Item.SLOT_HAIR);
-		_slots.put("face", L2Item.SLOT_HAIR2);
+		_slots.put("face", L2Item.SLOT_HAIR);
 		_slots.put("hair2", L2Item.SLOT_HAIR2);
 		_slots.put("dhair", L2Item.SLOT_HAIRALL);
 		_slots.put("hairall", L2Item.SLOT_HAIRALL);

+ 1 - 4
L2_GameServer/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -2530,15 +2530,12 @@ public class L2Clan
             if (4 < level)
             {
             	SiegeManager.getInstance().addSiegeSkills(leader);
+            	leader.sendPacket(new SystemMessage(SystemMessageId.CLAN_CAN_ACCUMULATE_CLAN_REPUTATION_POINTS));
             }
             else if (5 > level)
             {
             	SiegeManager.getInstance().removeSiegeSkills(leader);
             }
-            if (4 < level)
-            {
-                leader.sendPacket(new SystemMessage(SystemMessageId.CLAN_CAN_ACCUMULATE_CLAN_REPUTATION_POINTS));
-            }
         }
 
         // notify all the members about it

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2OlympiadManagerInstance.java

@@ -45,8 +45,8 @@ public class L2OlympiadManagerInstance extends L2Npc
 	private static Logger _logOlymp = Logger.getLogger(L2OlympiadManagerInstance.class.getName());
 
 	private static final int GATE_PASS = Config.ALT_OLY_COMP_RITEM;
-	private static final String FEWER_THAN = "Fewer than" + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
-	private static final String MORE_THAN = "More than" + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
+	private static final String FEWER_THAN = "Fewer than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
+	private static final String MORE_THAN = "More than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
 
 	public L2OlympiadManagerInstance (int objectId, L2NpcTemplate template)
 	{

+ 1 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java

@@ -193,8 +193,7 @@ public final class L2TeleporterInstance extends L2Npc
 				filename = "data/html/teleporter/castleteleporter-busy.htm"; // Busy because of siege
 			else if (condition == COND_OWNER) // Clan owns castle
 			{
-				if (player.getLevel()<40)
-					filename = getHtmlPath(getNpcId(), 0); // Owner message window
+				filename = getHtmlPath(getNpcId(), 0); // Owner message window
 			}
 		}
 

+ 15 - 15
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java

@@ -589,47 +589,47 @@ public final class RequestActionUse extends L2GameClientPacket
 				break;
 			case 5000: // TODO Baby Rudolph - Reindeer Scratch
 				break;
-			// CT2.3 Social Packets
-			case 12:
+			// Social Packets
+			case 12: // Greeting
 				tryBroadcastSocial(2);
 				break;
-			case 13:
+			case 13: // Victory
 				tryBroadcastSocial(3);
 				break;
-			case 14:
+			case 14: // Advance
 				tryBroadcastSocial(4);
 				break;
-			case 24:
+			case 24: // Yes
 				tryBroadcastSocial(6);
 				break;
-			case 25:
+			case 25: // No
 				tryBroadcastSocial(5);
 				break;
-			case 26:
+			case 26: // Bow
 				tryBroadcastSocial(7);
 				break;
-			case 29:
+			case 29: // Unaware
 				tryBroadcastSocial(8);
 				break;
-			case 30:
+			case 30: // Social Waiting
 				tryBroadcastSocial(9);
 				break;
-			case 31:
+			case 31: // Laugh
 				tryBroadcastSocial(10);
 				break;
-			case 33:
+			case 33: // Applaud
 				tryBroadcastSocial(11);
 				break;
-			case 34:
+			case 34: // Dance
 				tryBroadcastSocial(12);
 				break;
-			case 35:
+			case 35: // Sorrow
 				tryBroadcastSocial(13);
 				break;
-			case 62:
+			case 62: // Charm
 				tryBroadcastSocial(14);
 				break;
-			case 66:
+			case 66: // Shyness
 				tryBroadcastSocial(15);
 				break;
 			default: