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

Faction system improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-01-30 14:31:45 +00:00
parent 8c970407cb
commit ce12f92f82
5 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/dist/game/config/Custom.ini vendored
View File

@ -615,11 +615,11 @@ EnableFactionSystem = False
# Default: 85332,16199,-1252
StartingLocation = 85332,16199,-1252
# Faction manager npc id.
# Default: 109
FactionManagerNpcId = 109
# Faction manager NPC ID.
# Default: 500
FactionManagerNpcId = 500
# Spawn location for faction manager npc.
# Spawn location for faction manager NPC.
# Default: 85712,15974,-1260,26808
ManagerSpawnLocation = 85712,15974,-1260,26808
@ -648,8 +648,8 @@ GoodNameColor = 00FF00
EvilNameColor = 0000FF
# Enable faction guards.
# The npc template must have faction as clan.
# Test guard ids 31033(Good), 31036(Evil).
# The NPC template must have faction as clan.
# Guard IDs 501(Good), 502(Evil).
# Default: True
EnableFactionGuards = True

2
trunk/dist/game/data/stats/npcs/31000-31099.xml vendored
View File

@ -1247,7 +1247,7 @@
<sex>MALE</sex>
<equipment rhand="273" /> <!-- rhand: Composite Bow -->
<stats>
<vitals hp="13290.11306877694" hpRegen="8.5" mp="11674.8" mpRegen="3" />
<vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
<attack physical="970.537548504614" magical="662.751329129412" random="10" critical="8" accuracy="0" attackSpeed="253" reuseDelay="1500" type="BOW" range="1100" distance="10" width="0" />
<defence physical="341.375" magical="249.80341" />
<attribute>

107
trunk/dist/game/data/stats/npcs/custom/factions.xml vendored Normal file
View File

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/npcs.xsd">
<npc id="500" displayId="34209" name="Faction Manager" usingServerSideName="true" title=" " usingServerSideTitle="true" type="L2Npc">
<race>ELF</race>
<sex>FEMALE</sex>
<stats>
<vitals hp="2444.46819" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
<attack physical="688.86373" magical="470.40463" random="30" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
<defence physical="295.91597" magical="216.53847" />
<speed>
<walk ground="50" />
<run ground="120" />
</speed>
</stats>
<status attackable="false" />
<collision>
<radius normal="8" />
<height normal="23" />
</collision>
</npc>
<npc id="501" displayId="31033" level="105" type="L2Guard" name="Sentinel" usingServerSideName="true">
<parameters>
<param name="NoFnHi" value="1" />
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="79" />
</parameters>
<race>ELF</race>
<sex>MALE</sex>
<equipment rhand="276" /> <!-- rhand: Elven Bow -->
<stats>
<vitals hp="3290.11306877694" hpRegen="8.5" mp="1674.8" mpRegen="3" />
<attack physical="970.537548504614" magical="662.751329129412" random="10" critical="8" accuracy="0" attackSpeed="253" reuseDelay="1500" type="BOW" range="1100" distance="10" width="0" />
<defence physical="341.375" magical="249.80341" />
<attribute>
<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
</attribute>
<speed>
<walk ground="50" />
<run ground="160" />
</speed>
</stats>
<status attackable="false" undying="false" />
<skillList>
<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
<skill id="4411" level="16" /> <!-- Very Strong M. Atk. -->
<skill id="4412" level="16" /> <!-- Very Strong P. Def. -->
<skill id="4413" level="16" /> <!-- Very Strong M. Def. -->
<skill id="4414" level="2" /> <!-- Standard Type -->
<skill id="4415" level="9" /> <!-- Bows -->
<skill id="4416" level="15" /> <!-- Elves -->
</skillList>
<exCrtEffect>true</exCrtEffect>
<ai aggroRange="500" clanHelpRange="300">
<clanList>
<clan>GOOD</clan>
</clanList>
</ai>
<collision>
<radius normal="8" />
<height normal="23.5" />
</collision>
</npc>
<npc id="502" displayId="31036" level="105" type="L2Guard" name="Centurion" usingServerSideName="true">
<parameters>
<param name="NoFnHi" value="1" />
<param name="MoveAroundSocial" value="0" />
<param name="MoveAroundSocial1" value="140" />
</parameters>
<race>ORC</race>
<sex>MALE</sex>
<equipment rhand="273" /> <!-- rhand: Composite Bow -->
<stats>
<vitals hp="13290.11306877694" hpRegen="8.5" mp="11674.8" mpRegen="3" />
<attack physical="970.537548504614" magical="662.751329129412" random="10" critical="8" accuracy="0" attackSpeed="253" reuseDelay="1500" type="BOW" range="1100" distance="10" width="0" />
<defence physical="341.375" magical="249.80341" />
<attribute>
<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
</attribute>
<speed>
<walk ground="50" />
<run ground="160" />
</speed>
</stats>
<status attackable="false" undying="false" />
<skillList>
<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
<skill id="4410" level="16" /> <!-- Very Strong P. Atk. -->
<skill id="4411" level="16" /> <!-- Very Strong M. Atk. -->
<skill id="4412" level="16" /> <!-- Very Strong P. Def. -->
<skill id="4413" level="16" /> <!-- Very Strong M. Def. -->
<skill id="4414" level="2" /> <!-- Standard Type -->
<skill id="4415" level="9" /> <!-- Bows -->
<skill id="4416" level="17" /> <!-- Orcs -->
</skillList>
<exCrtEffect>true</exCrtEffect>
<ai aggroRange="500" clanHelpRange="300">
<clanList>
<clan>EVIL</clan>
</clanList>
</ai>
<collision>
<radius normal="8" />
<height normal="27" />
</collision>
</npc>
</list>

2
trunk/java/com/l2jmobius/Config.java
View File

@ -2587,7 +2587,7 @@ public final class Config
FACTION_SYSTEM_ENABLED = Boolean.valueOf(CustomSettings.getBoolean("EnableFactionSystem", false));
tempString = CustomSettings.getString("StartingLocation", "85332,16199,-1252").split(",");
FACTION_STARTING_LOCATION = new Location(Integer.parseInt(tempString[0]), Integer.parseInt(tempString[1]), Integer.parseInt(tempString[2]));
FACTION_MANAGER_NPCID = CustomSettings.getInt("FactionManagerNpcId", 109);
FACTION_MANAGER_NPCID = CustomSettings.getInt("FactionManagerNpcId", 500);
tempString = CustomSettings.getString("ManagerSpawnLocation", "85712,15974,-1260,26808").split(",");
FACTION_MANAGER_LOCATION = new Location(Integer.parseInt(tempString[0]), Integer.parseInt(tempString[1]), Integer.parseInt(tempString[2]), tempString[3] != null ? Integer.parseInt(tempString[3]) : 0);
tempString = CustomSettings.getString("GoodBaseLocation", "45306,48878,-3058").split(",");

2
trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java
View File

@ -53,7 +53,7 @@ public class FactionManager
while (rs.next())
{
final int id = rs.getInt(1);
_playerFactions.put(id, rs.getInt(4));
_playerFactions.put(id, rs.getInt(2));
}
}
catch (SQLException e)