Changeset 2411

Author: Sarynth

(2010/06/28 19:14) Over 1 year ago

[1.9 branch] Basic Siege Information support
 - New Packet that controls many Siege aspects. (Thanks Rhys2002!)
 - Siege Location data xml from client. (Thanks Tomate!)
 - //siege admin command with many features.
 - siege.properties to disable siege functions.
 - Be sure to update database with sql/au_server_gs.sql
 - Abyss Teleporter locations unlocked with the new packet but destinations currently bugged.

Affected files

branches/1.9/config/administration/admin.properties Download diff

 # Kill target
 gameserver.administration.command.kill = 3
+# Legion command allows you to disband/setlevel/setpoints of a legion
+gameserver.administration.command.legion = 3
 # Move player1 to player2 location
 gameserver.administration.command.moveplayertoplayer = 3
 # The message is sent to all players chatbox and a message appear in center screen
 gameserver.administration.command.notice = 3
+# Playerinfo command
+gameserver.administration.command.playerinfo = 3
+# Prison command
+gameserver.administration.command.prison = 3
 # Give admin rights to player
 gameserver.administration.command.promote = 3
 # Reload all spawn data from files
 gameserver.administration.command.reloadspawns = 3
+# Remove command allow remove an item from player
+gameserver.administration.command.remove = 3
 # Resurrect a target player
 gameserver.administration.command.resurrect = 3
 # Set title target player title
 gameserver.administration.command.settitle = 3
+# Modify current siege values
+gameserver.administration.command.siege = 3
 # Self explanatory
 gameserver.administration.command.spawnnpc = 3
 gameserver.administration.command.weather = 3
 # Prints zone info (//zone) or refreshes currect zone (//zone refresh)
 gameserver.administration.command.zone = 3
-# Legion command allows you to disband/setlevel/setpoints of a legion
-gameserver.administration.command.legion = 3
-# Remove command allow remove an item from player
-gameserver.administration.command.remove = 3
-# Playerinfo command
-gameserver.administration.command.playerinfo = 3
-# Prison command
-gameserver.administration.command.prison = 3

branches/1.9/data/static_data/static_data.xml Download diff

	2410		2411
153	<pet_skill_templates>	153	<pet_skill_templates>
154	<import file="pet_skills" skipRoot="true"/>	154	<import file="pet_skills" skipRoot="true"/>
155	</pet_skill_templates>	155	</pet_skill_templates>
156		156
		157	<siege_locations>
		158	<import file="siege/siege_locations.xml" skipRoot="true"/>
		159	</siege_locations>
157	</ae_static_data>	160	</ae_static_data>

branches/1.9/data/static_data/static_data.xsd Download diff

 	<xs:include schemaLocation="item_sets/item_sets.xsd" />
 	<xs:include schemaLocation="npc_skills/npc_skills.xsd" />
 	<xs:include schemaLocation="pet_skills/pet_skills.xsd" />
+	<xs:include schemaLocation="siege/siege_locations.xsd" />
 	<xs:element name="ae_static_data">
 		<xs:complexType>
 				<xs:element ref="item_sets" minOccurs="0" />
 				<xs:element ref="npc_skill_templates" minOccurs="0" />
 				<xs:element ref="pet_skill_templates" minOccurs="0" />
+				<xs:element ref="siege_locations" minOccurs="0" />
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>

branches/1.9/sql/au_server_gs.sql Download diff

	2410		2411
430	`mp` INT(11) NOT NULL DEFAULT 1 ,	430	`mp` INT(11) NOT NULL DEFAULT 1 ,
431	`fp` INT(11) NOT NULL DEFAULT 1 ,	431	`fp` INT(11) NOT NULL DEFAULT 1 ,
432	PRIMARY KEY (`player_id`) )	432	PRIMARY KEY (`player_id`) )
433	ENGINE = MyISAM DEFAULT CHARSET=UTF8;	433	ENGINE = MyISAM DEFAULT CHARSET=UTF8;
		434
		435
		436	-- ----------------------------
		437	-- `siege_locations`
		438	-- ----------------------------
		439
		440	CREATE TABLE IF NOT EXISTS `siege_locations` (
		441	`id` int(11) NOT NULL,
		442	`race` enum('ELYOS', 'ASMODIANS', 'BALAUR') NOT NULL,
		443	`legion_id` int (11) NOT NULL,
		444	PRIMARY KEY(`id`)
		445	) ENGINE=InnoDB DEFAULT CHARSET=utf8;

branches/1.9/src/com/aionemu/gameserver/configs/administration/AdminConfig.java Download diff

 	@Property(key = "gameserver.administration.command.kill", defaultValue = "3")
 	public static int	COMMAND_KILL;
+	@Property(key = "gameserver.administration.command.legion", defaultValue = "3")
+	public static int	COMMAND_LEGION;
 	@Property(key = "gameserver.administration.command.moveplayertoplayer", defaultValue = "3")
 	public static int	COMMAND_MOVEPLAYERTOPLAYER;
 	@Property(key = "gameserver.administration.command.notice", defaultValue = "3")
 	public static int	COMMAND_NOTICE;
+	@Property(key = "gameserver.administration.command.playerinfo", defaultValue = "3")
+	public static int	COMMAND_PLAYERINFO;
+	@Property(key = "gameserver.administration.command.prison", defaultValue = "3")
+	public static int	COMMAND_PRISON;
 	@Property(key = "gameserver.administration.command.promote", defaultValue = "3")
 	public static int	COMMAND_PROMOTE;
 	@Property(key = "gameserver.administration.command.reloadspawns", defaultValue = "3")
 	public static int	COMMAND_RELOADSPAWNS;
+    @Property(key = "gameserver.administration.command.remove", defaultValue = "3")
+    public static int	COMMAND_REMOVE;
 	@Property(key = "gameserver.administration.command.resurrect", defaultValue = "3")
 	public static int	COMMAND_RESURRECT;
 	@Property(key = "gameserver.administration.command.settitle", defaultValue = "3")
 	public static int	COMMAND_SETTITLE;
+	@Property(key = "gameserver.administration.command.siege", defaultValue = "3")
+	public static int	COMMAND_SIEGE;
 	@Property(key = "gameserver.administration.command.spawnnpc", defaultValue = "3")
 	public static int	COMMAND_SPAWNNPC;
 	@Property(key = "gameserver.administration.command.zone", defaultValue = "3")
 	public static int	COMMAND_ZONE;
-	@Property(key = "gameserver.administration.command.legion", defaultValue = "3")
-	public static int	COMMAND_LEGION;
-    @Property(key = "gameserver.administration.command.remove", defaultValue = "3")
-    public static int	COMMAND_REMOVE;
-	@Property(key = "gameserver.administration.command.playerinfo", defaultValue = "3")
-	public static int	COMMAND_PLAYERINFO;
-	@Property(key = "gameserver.administration.command.prison", defaultValue = "3")
-	public static int	COMMAND_PRISON;
 }

branches/1.9/src/com/aionemu/gameserver/configs/Config.java Download diff

 import com.aionemu.gameserver.configs.main.PricesConfig;
 import com.aionemu.gameserver.configs.main.RateConfig;
 import com.aionemu.gameserver.configs.main.ShutdownConfig;
+import com.aionemu.gameserver.configs.main.SiegeConfig;
 import com.aionemu.gameserver.configs.main.TaskManagerConfig;
 import com.aionemu.gameserver.configs.main.ThreadConfig;
 import com.aionemu.gameserver.configs.network.IPConfig;
 			ConfigurableProcessor.process(PricesConfig.class, mainProps);
 			log.info("Loading: " + main + "/prices.properties");
+			ConfigurableProcessor.process(SiegeConfig.class, mainProps);
+			log.info("Loading: " + main + "/siege.properties");
 			ConfigurableProcessor.process(ThreadConfig.class, mainProps);
 			log.info("Loading: " + main + "/thread.properties");

branches/1.9/src/com/aionemu/gameserver/configs/main/SiegeConfig.java

Show contents

branches/1.9/src/com/aionemu/gameserver/dao/SiegeDAO.java

Show contents

branches/1.9/src/com/aionemu/gameserver/dataholders/DataManager.java Download diff

 	public static PetSkillData			PET_SKILL_DATA;
+	public static SiegeLocationData		SIEGE_LOCATION_DATA;
 	private XmlDataLoader loader;
 	/**
 		ITEM_SET_DATA  = data.itemSetData;
 		NPC_SKILL_DATA = data.npcSkillData;
 		PET_SKILL_DATA = data.petSkillData;
+		SIEGE_LOCATION_DATA = data.siegeLocationData;
 		// some sexy time message
 		long seconds = time / 1000;

branches/1.9/src/com/aionemu/gameserver/dataholders/SiegeLocationData.java

Show contents

branches/1.9/src/com/aionemu/gameserver/dataholders/StaticData.java Download diff

 	@XmlElement(name = "pet_skill_templates")
 	public PetSkillData				petSkillData;
+	@XmlElement(name = "siege_locations")
+	public SiegeLocationData		siegeLocationData;
 	// JAXB callback
 	@SuppressWarnings("unused")
 	private void afterUnmarshal(Unmarshaller unmarshaller, Object parent)
 		DataManager.log.info("Loaded " + itemSetData.size() + " item set entries");
 		DataManager.log.info("Loaded " + npcSkillData.size() + " npc skill list entries");
 		DataManager.log.info("Loaded " + petSkillData.size() + " pet skill list entries");
+		DataManager.log.info("Loaded " + siegeLocationData.size() + " siege location entries");
 	}
 }

branches/1.9/src/com/aionemu/gameserver/GameServer.java Download diff

 import com.aionemu.gameserver.configs.network.NetworkConfig;
 import com.aionemu.gameserver.dao.PlayerDAO;
 import com.aionemu.gameserver.dataholders.DataManager;
+import com.aionemu.gameserver.model.siege.Influence;
 import com.aionemu.gameserver.network.aion.GameConnectionFactoryImpl;
 import com.aionemu.gameserver.network.chatserver.ChatServer;
 import com.aionemu.gameserver.network.loginserver.LoginServer;
 import com.aionemu.gameserver.services.GroupService;
 import com.aionemu.gameserver.services.MailService;
 import com.aionemu.gameserver.services.PeriodicSaveService;
+import com.aionemu.gameserver.services.SiegeService;
 import com.aionemu.gameserver.services.WeatherService;
 import com.aionemu.gameserver.services.ZoneService;
 import com.aionemu.gameserver.spawnengine.SpawnEngine;
 		BrokerService.getInstance();
+		SiegeService.getInstance();
+		Influence.getInstance();
 		DropService.getInstance();
 		ExchangeService.getInstance();

branches/1.9/src/com/aionemu/gameserver/model/siege/Artifact.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/Commander.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/Fortress.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/Influence.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/SiegeLocation.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/SiegeRace.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/siege/SiegeType.java

Show contents

branches/1.9/src/com/aionemu/gameserver/model/templates/siegelocation/SiegeLocationTemplate.java

Show contents

branches/1.9/src/com/aionemu/gameserver/network/aion/clientpackets/CM_ENTER_WORLD.java Download diff

 import com.aionemu.gameserver.network.aion.AionClientPacket;
 import com.aionemu.gameserver.network.aion.AionConnection;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_ABYSS_RANK;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_SIEGE_LOCATION_INFO;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_CHANNEL_INFO;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_CUBE_UPDATE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION_LIST;
 			sendPacket(new SM_PLAYER_SPAWN(player));
 			sendPacket(new SM_EMOTION_LIST());
 			sendPacket(new SM_INFLUENCE_RATIO());
+			sendPacket(new SM_SIEGE_LOCATION_INFO());
+			// TODO: Send Rift Announce Here
 			sendPacket(new SM_PRICES(player.getPrices()));
 			sendPacket(new SM_PLAYER_ID(player));
 			sendPacket(new SM_ABYSS_RANK(player.getAbyssRank()));

branches/1.9/src/com/aionemu/gameserver/network/aion/serverpackets/SM_INFLUENCE_RATIO.java Download diff

	2410		2411
18		18
19	import java.nio.ByteBuffer;	19	import java.nio.ByteBuffer;
20		20
		21	import com.aionemu.gameserver.model.siege.Influence;
21	import com.aionemu.gameserver.network.aion.AionConnection;	22	import com.aionemu.gameserver.network.aion.AionConnection;
22	import com.aionemu.gameserver.network.aion.AionServerPacket;	23	import com.aionemu.gameserver.network.aion.AionServerPacket;
		24	import com.aionemu.gameserver.services.SiegeService;
23		25
24	/**	26	/**
25	* @author Nemiroff	27	* @author Nemiroff
...		...
34	@Override	36	@Override
35	protected void writeImpl(AionConnection con, ByteBuffer buf)	37	protected void writeImpl(AionConnection con, ByteBuffer buf)
36	{	38	{
37	writeD(buf, 5749);	39	Influence inf = Influence.getInstance();
38	writeF(buf, (float) 0.34); //elyos	40
39	writeF(buf, (float) 0.33); //asmo	41	writeD(buf, SiegeService.getInstance().getSiegeTime());
40	writeF(buf, (float) 0.33); //balaur	42	writeF(buf, inf.getElyos());
41	// asmo + balaur + elyos = 1	43	writeF(buf, inf.getAsmos());
		44	writeF(buf, inf.getBalaur());
		45
		46	//TODO: 1.9 has writeH(buf, 3) with balauria values
42	writeH(buf, 1);	47	writeH(buf, 1);
43	writeD(buf, 400010000); //worlid ?	48
44	writeF(buf, (float) 0.34); //elyos	49	writeD(buf, 400010000);
45	writeF(buf, (float) 0.33); //asmo	50	writeF(buf, inf.getElyos());
46	writeF(buf, (float) 0.33); //balaur	51	writeF(buf, inf.getAsmos());
47		52	writeF(buf, inf.getBalaur());
		53
48	}	54	}
49	}	55	}

branches/1.9/src/com/aionemu/gameserver/network/aion/serverpackets/SM_SIEGE_LOCATION_INFO.java

Show contents

branches/1.9/src/com/aionemu/gameserver/network/aion/ServerPacketsOpcodes.java Download diff

	2410		2411
182	addPacketOpcode(SM_LOOT_ITEMLIST.class, 0xEA, idSet);// 1.9	182	addPacketOpcode(SM_LOOT_ITEMLIST.class, 0xEA, idSet);// 1.9
183	addPacketOpcode(SM_LOOT_STATUS.class, 0xEB, idSet);// 1.9	183	addPacketOpcode(SM_LOOT_STATUS.class, 0xEB, idSet);// 1.9
184	addPacketOpcode(SM_RECIPE_LIST.class, 0xED, idSet);// testing	184	addPacketOpcode(SM_RECIPE_LIST.class, 0xED, idSet);// testing
		185	addPacketOpcode(SM_SIEGE_LOCATION_INFO.class, 0xEF, idSet);// 1.9
185	addPacketOpcode(SM_PLAYER_SEARCH.class, 0xF1, idSet);// 1.9	186	addPacketOpcode(SM_PLAYER_SEARCH.class, 0xF1, idSet);// 1.9
186	addPacketOpcode(SM_LEAVE_GROUP_MEMBER.class, 0xF5, idSet);// 1.9	187	addPacketOpcode(SM_LEAVE_GROUP_MEMBER.class, 0xF5, idSet);// 1.9
187	addPacketOpcode(SM_SHOW_BRAND.class, 0xF7, idSet);// 1.9	188	addPacketOpcode(SM_SHOW_BRAND.class, 0xF7, idSet);// 1.9

branches/1.9/src/com/aionemu/gameserver/services/SiegeService.java

Show contents

AE-go

Changeset 2411

Affected files