2
0
Эх сурвалжийг харах

Clan Fame configs. Thx Kerberos

Gigiikun 16 жил өмнө
parent
commit
7b2925e00a

+ 0 - 4
L2_GameServer/java/config/Character.properties

@@ -421,10 +421,6 @@ RemoveCastleCirclets = True
 # Default: 15
 AltClanMembersForWar = 15
 
-# Reputation score gained per kill during a clan war.
-# Default: 1
-ReputationScorePerKill = 1
-
 # ---------------------------------------------------------------------------
 # Party
 # ---------------------------------------------------------------------------

+ 67 - 0
L2_GameServer/java/config/Feature.properties

@@ -216,3 +216,70 @@ AltDawnGatesPdefMult = 1.1
 AltDuskGatesPdefMult = 0.8
 AltDawnGatesMdefMult = 1.1
 AltDuskGatesMdefMult = 0.8
+
+# ---------------------------------------------------------------------------
+# Clan Reputation Points
+# ---------------------------------------------------------------------------
+
+# Reputation score gained by taking Fortress.
+TakeFortPoints = 200
+
+# Reputation score gained by taking Castle.
+TakeCastlePoints = 1500
+
+# Reputation score gained by defended Castle.
+CastleDefendedPoints = 750
+
+# Reputation score gained per clan members of festival winning party.
+FestivalOfDarknessWin = 200
+
+# Reputation score gained for per hero clan members.
+HeroPoints = 1000
+
+# Minimum Reputation score gained after completing 2nd class transfer under Academy.
+CompleteAcademyMinPoints = 190
+
+# Maximum Reputation score gained after completing 2nd class transfer under Academy.
+CompleteAcademyMaxPoints = 650
+
+# Reputation score gained per killed ballista.
+KillBallistaPoints = 30
+
+# Reputation score gained per clan member listed as top raid killers.
+1stRaidRankingPoints = 1250
+2ndRaidRankingPoints = 900
+3rdRaidRankingPoints = 700
+4thRaidRankingPoints = 600
+5thRaidRankingPoints = 450
+6thRaidRankingPoints = 350
+7thRaidRankingPoints = 300
+8thRaidRankingPoints = 200
+9thRaidRankingPoints = 150
+10thRaidRankingPoints = 100
+UpTo50thRaidRankingPoints = 25
+UpTo100thRaidRankingPoints = 12
+
+# Reputation score gained/reduced per kill during a clan war or siege war.
+ReputationScorePerKill = 1
+
+# Reputation score reduced by loosing Fortress in battle.
+LooseFortPoints = 400
+
+# Reputation score reduced by loosing Castle in battle.
+LooseCastlePoints = 3000
+
+# Reputation score reduced by creating Royal Guard.
+CreateRoyalGuardCost = 5000
+
+# Reputation score reduced by creating Knight Unit.
+CreateKnightUnitCost = 10000
+
+# Reputation score reduced by reinforcing Knight Unit (if clan level is 9 or more).
+ReinforceKnightUnitCost = 5000
+
+# Reputation score reduced by increasing clan level.
+ClanLevel6Cost = 10000
+ClanLevel7Cost = 20000
+ClanLevel8Cost = 40000
+ClanLevel9Cost = 40000
+ClanLevel10Cost = 40000

+ 64 - 4
L2_GameServer/java/net/sf/l2j/Config.java

@@ -177,7 +177,6 @@ public final class Config
     public static boolean	ALT_GAME_NEW_CHAR_ALWAYS_IS_NEWBIE;
     public static boolean	ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH;
     public static boolean	REMOVE_CASTLE_CIRCLETS;
-    public static int		ALT_REPUTATION_SCORE_PER_KILL;
     public static int		ALT_PARTY_RANGE;
     public static int		ALT_PARTY_RANGE2;
     public static int		STARTING_ADENA;
@@ -329,7 +328,37 @@ public final class Config
 	/** Feature Settings -Begin                            **/
 	/** ************************************************** **/
     
-    // TODO: Fill this area up!
+    public static int TAKE_FORT_POINTS;
+    public static int LOOSE_FORT_POINTS;
+    public static int TAKE_CASTLE_POINTS;
+    public static int LOOSE_CASTLE_POINTS;
+    public static int CASTLE_DEFENDED_POINTS;
+    public static int FESTIVAL_WIN_POINTS;
+    public static int HERO_POINTS;
+    public static int ROYAL_GUARD_COST;
+    public static int KNIGHT_UNIT_COST;
+    public static int KNIGHT_REINFORCE_COST;
+    public static int BALLISTA_POINTS;
+    public static int REPUTATION_SCORE_PER_KILL;
+    public static int JOIN_ACADEMY_MIN_REP_SCORE;
+    public static int JOIN_ACADEMY_MAX_REP_SCORE;
+    public static int RAID_RANKING_1ST;
+    public static int RAID_RANKING_2ND;
+    public static int RAID_RANKING_3RD;
+    public static int RAID_RANKING_4TH;
+    public static int RAID_RANKING_5TH; 
+    public static int RAID_RANKING_6TH;
+    public static int RAID_RANKING_7TH;
+    public static int RAID_RANKING_8TH;
+    public static int RAID_RANKING_9TH;
+    public static int RAID_RANKING_10TH;
+    public static int RAID_RANKING_UP_TO_50TH;
+    public static int RAID_RANKING_UP_TO_100TH;
+    public static int CLAN_LEVEL_6_COST;
+    public static int CLAN_LEVEL_7_COST;
+    public static int CLAN_LEVEL_8_COST;
+    public static int CLAN_LEVEL_9_COST;
+    public static int CLAN_LEVEL_10_COST;
     
     /** ************************************************** **/
 	/** Feature Settings -End                              **/
@@ -1178,6 +1207,38 @@ public final class Config
 	                ALT_SIEGE_DUSK_GATES_PDEF_MULT						= Double.parseDouble(Feature.getProperty("AltDuskGatesPdefMult", "0.8"));
 	                ALT_SIEGE_DAWN_GATES_MDEF_MULT						= Double.parseDouble(Feature.getProperty("AltDawnGatesMdefMult", "1.1"));
 	                ALT_SIEGE_DUSK_GATES_MDEF_MULT						= Double.parseDouble(Feature.getProperty("AltDuskGatesMdefMult", "0.8"));
+	                
+	                TAKE_FORT_POINTS									= Integer.parseInt(Feature.getProperty("TakeFortPoints", "200"));
+	                LOOSE_FORT_POINTS									= Integer.parseInt(Feature.getProperty("LooseFortPoints", "400"));
+	                TAKE_CASTLE_POINTS									= Integer.parseInt(Feature.getProperty("TakeCastlePoints", "1500"));
+	                LOOSE_CASTLE_POINTS									= Integer.parseInt(Feature.getProperty("LooseCastlePoints", "3000"));
+	                CASTLE_DEFENDED_POINTS								= Integer.parseInt(Feature.getProperty("CastleDefendedPoints", "750"));
+	                FESTIVAL_WIN_POINTS									= Integer.parseInt(Feature.getProperty("FestivalOfDarknessWin", "200"));
+	                HERO_POINTS											= Integer.parseInt(Feature.getProperty("HeroPoints", "1000"));
+	                ROYAL_GUARD_COST									= Integer.parseInt(Feature.getProperty("CreateRoyalGuardCost", "5000"));
+	                KNIGHT_UNIT_COST									= Integer.parseInt(Feature.getProperty("CreateKnightUnitCost", "10000"));
+	                KNIGHT_REINFORCE_COST								= Integer.parseInt(Feature.getProperty("ReinforceKnightUnitCost", "5000"));
+	                BALLISTA_POINTS										= Integer.parseInt(Feature.getProperty("KillBallistaPoints", "30"));
+	                REPUTATION_SCORE_PER_KILL							= Integer.parseInt(Feature.getProperty("ReputationScorePerKill", "1"));
+	                JOIN_ACADEMY_MIN_REP_SCORE							= Integer.parseInt(Feature.getProperty("CompleteAcademyMinPoints", "190"));
+	                JOIN_ACADEMY_MAX_REP_SCORE							= Integer.parseInt(Feature.getProperty("CompleteAcademyMaxPoints", "650"));
+	                RAID_RANKING_1ST									= Integer.parseInt(Feature.getProperty("1stRaidRankingPoints", "1250"));
+	                RAID_RANKING_2ND									= Integer.parseInt(Feature.getProperty("2ndRaidRankingPoints", "900"));
+	                RAID_RANKING_3RD									= Integer.parseInt(Feature.getProperty("3rdRaidRankingPoints", "700"));
+	                RAID_RANKING_4TH									= Integer.parseInt(Feature.getProperty("4thRaidRankingPoints", "600"));
+	                RAID_RANKING_5TH									= Integer.parseInt(Feature.getProperty("5thRaidRankingPoints", "450"));
+	                RAID_RANKING_6TH									= Integer.parseInt(Feature.getProperty("6thRaidRankingPoints", "350"));
+	                RAID_RANKING_7TH									= Integer.parseInt(Feature.getProperty("7thRaidRankingPoints", "300"));
+	                RAID_RANKING_8TH									= Integer.parseInt(Feature.getProperty("8thRaidRankingPoints", "200"));
+	                RAID_RANKING_9TH									= Integer.parseInt(Feature.getProperty("9thRaidRankingPoints", "150"));
+	                RAID_RANKING_10TH									= Integer.parseInt(Feature.getProperty("10thRaidRankingPoints", "100"));
+	                RAID_RANKING_UP_TO_50TH									= Integer.parseInt(Feature.getProperty("UpTo50thRaidRankingPoints", "25"));
+	                RAID_RANKING_UP_TO_100TH									= Integer.parseInt(Feature.getProperty("UpTo100thRaidRankingPoints", "12"));
+	                CLAN_LEVEL_6_COST									= Integer.parseInt(Feature.getProperty("ClanLevel6Cost", "10000"));
+	                CLAN_LEVEL_7_COST									= Integer.parseInt(Feature.getProperty("ClanLevel7Cost", "20000"));
+	                CLAN_LEVEL_8_COST									= Integer.parseInt(Feature.getProperty("ClanLevel8Cost", "40000"));
+	                CLAN_LEVEL_9_COST									= Integer.parseInt(Feature.getProperty("ClanLevel9Cost", "40000"));
+	                CLAN_LEVEL_10_COST									= Integer.parseInt(Feature.getProperty("ClanLevel10Cost", "40000"));
 	            }
 	            catch (Exception e)
 	            {
@@ -1354,7 +1415,6 @@ public final class Config
 	                //ALT_GAME_NEW_CHAR_ALWAYS_IS_NEWBIE	= Boolean.parseBoolean(Character.getProperty("AltNewCharAlwaysIsNewbie", "False"));
 	                ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH= Boolean.parseBoolean(Character.getProperty("AltMembersCanWithdrawFromClanWH", "false"));
 	                REMOVE_CASTLE_CIRCLETS				= Boolean.parseBoolean(Character.getProperty("RemoveCastleCirclets", "true"));
-	                ALT_REPUTATION_SCORE_PER_KILL		= Integer.parseInt(Character.getProperty("ReputationScorePerKill", "1"));
 	                ALT_PARTY_RANGE						= Integer.parseInt(Character.getProperty("AltPartyRange", "1600"));
 	                ALT_PARTY_RANGE2					= Integer.parseInt(Character.getProperty("AltPartyRange2", "1400"));
 	                STARTING_ADENA						= Integer.parseInt(Character.getProperty("StartingAdena", "100"));
@@ -2244,7 +2304,7 @@ public final class Config
         else if (pName.equalsIgnoreCase("AltBlacksmithUseRecipes")) ALT_BLACKSMITH_USE_RECIPES = Boolean.parseBoolean(pValue);
         else if (pName.equalsIgnoreCase("AltGameSkillLearn")) ALT_GAME_SKILL_LEARN = Boolean.parseBoolean(pValue);
         else if (pName.equalsIgnoreCase("RemoveCastleCirclets")) REMOVE_CASTLE_CIRCLETS = Boolean.parseBoolean(pValue);
-        else if (pName.equalsIgnoreCase("ReputationScorePerKill")) ALT_REPUTATION_SCORE_PER_KILL = Integer.parseInt(pValue);
+        else if (pName.equalsIgnoreCase("ReputationScorePerKill")) REPUTATION_SCORE_PER_KILL = Integer.parseInt(pValue);
         else if (pName.equalsIgnoreCase("AltGameCancelByHit"))
         {
             ALT_GAME_CANCEL_BOW     = pValue.equalsIgnoreCase("bow") || pValue.equalsIgnoreCase("all");

+ 4 - 4
L2_GameServer/java/net/sf/l2j/gameserver/SevenSignsFestival.java

@@ -1186,11 +1186,11 @@ public class SevenSignsFestival implements SpawnListener
     {
       if (player.getClan() != null)
       {
-        player.getClan().setReputationScore(player.getClan().getReputationScore()+100, true);
+        player.getClan().setReputationScore(player.getClan().getReputationScore()+Config.FESTIVAL_WIN_POINTS, true);
         player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
         SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
                 sm.addString(partyMemberName);
-                sm.addNumber(100);
+                sm.addNumber(Config.FESTIVAL_WIN_POINTS);
         player.getClan().broadcastToOnlineMembers(sm);
       }
     }
@@ -1212,11 +1212,11 @@ public class SevenSignsFestival implements SpawnListener
                 L2Clan clan = ClanTable.getInstance().getClanByName(clanName);
                 if (clan != null)
                 {
-                  clan.setReputationScore(clan.getReputationScore()+100, true);
+                  clan.setReputationScore(clan.getReputationScore()+Config.FESTIVAL_WIN_POINTS, true);
                   clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
                   SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
                           sm.addString(partyMemberName);
-                          sm.addNumber(100);
+                          sm.addNumber(Config.FESTIVAL_WIN_POINTS);
                   clan.broadcastToOnlineMembers(sm);
                 }
               }

+ 18 - 17
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Clan.java

@@ -1418,9 +1418,10 @@ public class L2Clan
 	            	// Royal Guard 5000 points per each
 	                // Order of Knights 10000 points per each
 	            	if (pledgeType < L2Clan.SUBUNIT_KNIGHT1)
-	            		setReputationScore(getReputationScore() - 5000, true);
+	            		setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true);
 	            	else
-	            		setReputationScore(getReputationScore() - 10000, true);
+	            		setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true);
+	            	//TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST
 	            }
 
 	            if (Config.DEBUG) _log.fine("New sub_clan saved in db: "+getClanId()+"; "+pledgeType);
@@ -2180,11 +2181,11 @@ public class L2Clan
             }
             case 5:
             	// Upgrade to 6
-                if(getReputationScore() >= 10000 && getMembersCount() >= 30)
+                if(getReputationScore() >= Config.CLAN_LEVEL_6_COST && getMembersCount() >= 30)
                 {
-                    setReputationScore(getReputationScore() - 10000, true);
+                    setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-                    cr.addNumber(10000);
+                    cr.addNumber(Config.CLAN_LEVEL_6_COST);
                     player.sendPacket(cr);
                     cr = null;
                     increaseClanLevel = true;
@@ -2193,11 +2194,11 @@ public class L2Clan
 
             case 6:
             	// Upgrade to 7
-                if(getReputationScore() >= 20000 && getMembersCount() >= 80)
+                if(getReputationScore() >= Config.CLAN_LEVEL_7_COST && getMembersCount() >= 80)
                 {
-                    setReputationScore(getReputationScore() - 20000, true);
+                    setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-                    cr.addNumber(20000);
+                    cr.addNumber(Config.CLAN_LEVEL_7_COST);
                     player.sendPacket(cr);
                     cr = null;
                     increaseClanLevel = true;
@@ -2205,11 +2206,11 @@ public class L2Clan
                 break;
             case 7:
             	// Upgrade to 8
-                if(getReputationScore() >= 40000 && getMembersCount() >= 120)
+                if(getReputationScore() >= Config.CLAN_LEVEL_8_COST && getMembersCount() >= 120)
                 {
-                    setReputationScore(getReputationScore() - 40000, true);
+                    setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true);
                     SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-                    cr.addNumber(40000);
+                    cr.addNumber(Config.CLAN_LEVEL_8_COST);
                     player.sendPacket(cr);
                     cr = null;
                     increaseClanLevel = true;
@@ -2217,14 +2218,14 @@ public class L2Clan
                 break;
             case 8:
             	// Upgrade to 9
-                if(getReputationScore() >= 40000 && player.getInventory().getItemByItemId(9910) != null && getMembersCount() >= 120)
+                if(getReputationScore() >= Config.CLAN_LEVEL_9_COST && player.getInventory().getItemByItemId(9910) != null && getMembersCount() >= 120)
                 {
                 	// itemId 9910 == Blood Oath
                 	if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false))
                 	{
-                		setReputationScore(getReputationScore() - 40000, true);
+                		setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true);
                 		SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-                		cr.addNumber(40000);
+                		cr.addNumber(Config.CLAN_LEVEL_9_COST);
                 		player.sendPacket(cr);
                 		cr = null;
                 		SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
@@ -2237,14 +2238,14 @@ public class L2Clan
                 break;
             case 9:
             	// Upgrade to 10
-                if(getReputationScore() >= 40000 && player.getInventory().getItemByItemId(9911) != null && getMembersCount() >= 140)
+                if(getReputationScore() >= Config.CLAN_LEVEL_10_COST && player.getInventory().getItemByItemId(9911) != null && getMembersCount() >= 140)
                 {
                 	// itemId 9911 == Blood Alliance
                 	if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false))
                 	{
-                		setReputationScore(getReputationScore() - 40000, true);
+                		setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true);
                 		SystemMessage cr = new SystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-                		cr.addNumber(40000);
+                		cr.addNumber(Config.CLAN_LEVEL_10_COST);
                 		player.sendPacket(cr);
                 		cr = null;
                 		SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_DISAPPEARED);

+ 2 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortBallistaInstance.java

@@ -14,6 +14,7 @@
  */
 package net.sf.l2j.gameserver.model.actor.instance;
 
+import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.model.actor.L2Character;
 import net.sf.l2j.gameserver.model.actor.L2Npc;
@@ -54,7 +55,7 @@ public class L2FortBallistaInstance extends L2Npc
             	L2PcInstance player = ((L2PcInstance)killer);
             	if (player.getClan() != null && player.getClan().getLevel() >= 5)
             	{
-            		player.getClan().setReputationScore(player.getClan().getReputationScore() + 30, true);
+            		player.getClan().setReputationScore(player.getClan().getReputationScore() + Config.BALLISTA_POINTS, true);
             		player.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(player.getClan()));
             	}
             	player.sendPacket(new SystemMessage(SystemMessageId.BALLISTA_DESTROYED_CLAN_REPU_INCREASED));

+ 32 - 17
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -2202,9 +2202,9 @@ public final class L2PcInstance extends L2Playable
 
 		if (getLvlJoinedAcademy() != 0 && _clan != null && PlayerClass.values()[Id].getLevel() == ClassLevel.Third)
         {
-			if(getLvlJoinedAcademy() <= 16) _clan.setReputationScore(_clan.getReputationScore()+650, true);
-            else if(getLvlJoinedAcademy() >= 39) _clan.setReputationScore(_clan.getReputationScore()+190, true);
-            else _clan.setReputationScore(_clan.getReputationScore()+(650-(getLvlJoinedAcademy()-16)*20), true);
+			if(getLvlJoinedAcademy() <= 16) _clan.setReputationScore(_clan.getReputationScore()+Config.JOIN_ACADEMY_MAX_REP_SCORE, true);
+            else if(getLvlJoinedAcademy() >= 39) _clan.setReputationScore(_clan.getReputationScore()+Config.JOIN_ACADEMY_MIN_REP_SCORE, true);
+            else _clan.setReputationScore(_clan.getReputationScore()+(Config.JOIN_ACADEMY_MAX_REP_SCORE-(getLvlJoinedAcademy()-16)*20), true);
 			_clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
 			setLvlJoinedAcademy(0);
             //oust pledge member from the academy, cuz he has finished his 2nd class transfer
@@ -5005,22 +5005,26 @@ public final class L2PcInstance extends L2Playable
 					
 					if (!(isInsideZone(ZONE_PVP) && !isInsideZone(ZONE_SIEGE)))
 					{
-						if (pk != null && pk.getClan() != null && getClan() != null && !isAcademyMember() && !(pk.isAcademyMember()) && _clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getClanId()))
+						if (pk != null && pk.getClan() != null && getClan() != null && !isAcademyMember() && !(pk.isAcademyMember()) )
 						{
-							
-							// when your reputation score is 0 or below, the other clan cannot acquire any reputation points
-							if (getClan().getReputationScore() > 0)
+							if ((_clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getClanId()))||
+									((isInsideZone(ZONE_SIEGE) && pk.isInsideZone(ZONE_SIEGE))&&
+											(isInSiege() && pk.isInSiege())))
 							{
-								pk.getClan().setReputationScore(pk.getClan().getReputationScore() + Config.ALT_REPUTATION_SCORE_PER_KILL, true);
-								getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
-								pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan()));
-							}
-							// when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
-							if (pk.getClan().getReputationScore() > 0)
-							{
-								_clan.setReputationScore(_clan.getReputationScore() - Config.ALT_REPUTATION_SCORE_PER_KILL, true);
-								getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
-								pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan()));
+								// 	when your reputation score is 0 or below, the other clan cannot acquire any reputation points
+								if (getClan().getReputationScore() > 0)
+								{
+									pk.getClan().setReputationScore(pk.getClan().getReputationScore() + Config.REPUTATION_SCORE_PER_KILL, true);
+									getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
+									pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan()));
+								}
+								// 	when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
+								if (pk.getClan().getReputationScore() > 0)
+								{
+									_clan.setReputationScore(_clan.getReputationScore() - Config.REPUTATION_SCORE_PER_KILL, true);
+									getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(_clan));
+									pk.getClan().broadcastToOnlineMembers(new PledgeShowInfoUpdate(pk.getClan()));
+								}
 							}
 						}
 					}
@@ -12064,6 +12068,7 @@ public final class L2PcInstance extends L2Playable
 	private FastMap<Integer, TimeStamp> _reuseTimeStamps = new FastMap<Integer, TimeStamp>().setShared(true);
 	private boolean _canFeed;
 	private int _afroId = 0;
+	private boolean _isInSiege;
 
     public Collection<TimeStamp> getReuseTimeStamps()
     {
@@ -12704,4 +12709,14 @@ public final class L2PcInstance extends L2Playable
 	    _afroId = id;
 	    broadcastUserInfo();
     }
+
+    public void setIsInSiege(boolean b)
+    {
+    	_isInSiege = b;
+    }
+    
+    public boolean isInSiege()
+    {
+    	return _isInSiege;
+    }
 }

+ 4 - 4
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Castle.java

@@ -1526,16 +1526,16 @@ public class Castle
 			if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId()))
 			{
 				int maxreward = Math.max(0, _formerOwner.getReputationScore());
-				_formerOwner.setReputationScore(_formerOwner.getReputationScore() - 1000, true);
+				_formerOwner.setReputationScore(_formerOwner.getReputationScore() - Config.LOOSE_CASTLE_POINTS, true);
 				L2Clan owner = ClanTable.getInstance().getClan(getOwnerId());
 				if (owner != null)
 				{
-					owner.setReputationScore(owner.getReputationScore() + Math.min(1000, maxreward), true);
+					owner.setReputationScore(owner.getReputationScore() + Math.min(Config.TAKE_CASTLE_POINTS, maxreward), true);
 					owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
 				}
 			}
 			else
-				_formerOwner.setReputationScore(_formerOwner.getReputationScore() + 500, true);
+				_formerOwner.setReputationScore(_formerOwner.getReputationScore() + Config.CASTLE_DEFENDED_POINTS, true);
 			
 			_formerOwner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(_formerOwner));
 		}
@@ -1544,7 +1544,7 @@ public class Castle
 			L2Clan owner = ClanTable.getInstance().getClan(getOwnerId());
 			if (owner != null)
 			{
-				owner.setReputationScore(owner.getReputationScore() + 1000, true);
+				owner.setReputationScore(owner.getReputationScore() + Config.TAKE_CASTLE_POINTS, true);
 				owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
 			}
 		}

+ 7 - 3
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Fort.java

@@ -407,11 +407,12 @@ public class Fort
 		if (updateClansReputation)
 		{
 			// update reputation first
-			updateClansReputation(clan);
+			updateClansReputation(clan,false);
 		}
 		// Remove old owner
 		if (getOwnerClan() != null && (clan != null && clan != getOwnerClan()))
 		{
+			updateClansReputation(clan,true);
 			removeOwner(true);
 		}
 		setFortState(0,0); // initialize fort state
@@ -986,11 +987,14 @@ public class Fort
 		return _name;
 	}
 	
-	public void updateClansReputation(L2Clan owner)
+	public void updateClansReputation(L2Clan owner, boolean removePoints)
 	{
 		if (owner != null)
 		{
-			owner.setReputationScore(owner.getReputationScore() + 200, true);
+			if (removePoints)
+				owner.setReputationScore(owner.getReputationScore() - Config.LOOSE_FORT_POINTS, true);
+			else
+				owner.setReputationScore(owner.getReputationScore() + Config.TAKE_FORT_POINTS, true);
 			owner.broadcastToOnlineMembers(new PledgeShowInfoUpdate(owner));
 		}
 	}

+ 4 - 4
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Hero.java

@@ -331,11 +331,11 @@ public class Hero
 				L2Clan clan = player.getClan();
 				if (clan != null)
 				{
-					clan.setReputationScore(clan.getReputationScore() + 1000, true);
+					clan.setReputationScore(clan.getReputationScore() + Config.HERO_POINTS, true);
 					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 					SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS);
 					sm.addString(name);
-					sm.addNumber(1000);
+					sm.addNumber(Config.HERO_POINTS);
 					clan.broadcastToOnlineMembers(sm);
 				}
 				player.sendPacket(new UserInfo(player));
@@ -361,11 +361,11 @@ public class Hero
 							L2Clan clan = ClanTable.getInstance().getClanByName(clanName);
 							if (clan != null)
 							{
-								clan.setReputationScore(clan.getReputationScore() + 1000, true);
+								clan.setReputationScore(clan.getReputationScore() + Config.HERO_POINTS, true);
 								clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
 								SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS);
 								sm.addString(name);
-								sm.addNumber(1000);
+								sm.addNumber(Config.HERO_POINTS);
 								clan.broadcastToOnlineMembers(sm);
 							}
 						}

+ 4 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/zone/type/L2CastleZone.java

@@ -82,7 +82,10 @@ public class L2CastleZone extends L2ZoneType
 				if (((L2PcInstance) character).getClan() != null 
 						&& (_castle.getSiege().checkIsAttacker(((L2PcInstance) character).getClan())
 						|| _castle.getSiege().checkIsDefender(((L2PcInstance) character).getClan())))
+				{
+					((L2PcInstance) character).setIsInSiege(true);
 					((L2PcInstance) character).startFameTask(Config.CASTLE_ZONE_FAME_TASK_FREQUENCY * 1000, Config.CASTLE_ZONE_FAME_AQUIRE_POINTS);
+				}
 				((L2PcInstance) character).sendPacket(new SystemMessage(SystemMessageId.ENTERED_COMBAT_ZONE));
 			}
 		}
@@ -102,6 +105,7 @@ public class L2CastleZone extends L2ZoneType
 			{
 				((L2PcInstance) character).sendPacket(new SystemMessage(SystemMessageId.LEFT_COMBAT_ZONE));
 				((L2PcInstance) character).stopFameTask();
+				((L2PcInstance) character).setIsInSiege(false);
 				
 				// Set pvp flag
 				if (((L2PcInstance) character).getPvpFlag() == 0)

+ 4 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/zone/type/L2FortZone.java

@@ -89,7 +89,10 @@ public class L2FortZone extends L2ZoneType
 				if (((L2PcInstance) character).getClan() != null 
 						&& (_fort.getSiege().checkIsAttacker(((L2PcInstance) character).getClan())
 						|| _fort.getSiege().checkIsDefender(((L2PcInstance) character).getClan())))
+				{
 					((L2PcInstance) character).startFameTask(Config.FORTRESS_ZONE_FAME_TASK_FREQUENCY * 1000, Config.FORTRESS_ZONE_FAME_AQUIRE_POINTS);
+					((L2PcInstance) character).setIsInSiege(true);
+				}
 			}
 		}
 	}
@@ -107,6 +110,7 @@ public class L2FortZone extends L2ZoneType
 			{
 				((L2PcInstance) character).sendPacket(new SystemMessage(SystemMessageId.LEFT_COMBAT_ZONE));
 				((L2PcInstance) character).stopFameTask();
+				((L2PcInstance) character).setIsInSiege(false);
 				
 				// Set pvp flag
 				if (((L2PcInstance) character).getPvpFlag() == 0)

+ 13 - 12
L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/tasks/TaskRaidPointsReset.java

@@ -17,6 +17,7 @@ package net.sf.l2j.gameserver.taskmanager.tasks;
 import java.util.Calendar;
 import java.util.Map;
 
+import net.sf.l2j.Config;
 import net.sf.l2j.gameserver.datatables.ClanTable;
 import net.sf.l2j.gameserver.instancemanager.RaidBossPointsManager;
 import net.sf.l2j.gameserver.model.L2Clan;
@@ -58,40 +59,40 @@ public class TaskRaidPointsReset extends Task
 						switch (entry.getValue())
 						{
 							case 1:
-								reputation = 1250;
+								reputation = Config.RAID_RANKING_1ST;
 								break;
 							case 2:
-								reputation = 900;
+								reputation = Config.RAID_RANKING_2ND;
 								break;
 							case 3:
-								reputation = 700;
+								reputation = Config.RAID_RANKING_3RD;
 								break;
 							case 4:
-								reputation = 600;
+								reputation = Config.RAID_RANKING_4TH;
 								break;
 							case 5:
-								reputation = 450;
+								reputation = Config.RAID_RANKING_5TH;
 								break;
 							case 6:
-								reputation = 350;
+								reputation = Config.RAID_RANKING_6TH;
 								break;
 							case 7:
-								reputation = 300;
+								reputation = Config.RAID_RANKING_7TH;
 								break;
 							case 8:
-								reputation = 200;
+								reputation = Config.RAID_RANKING_8TH;
 								break;
 							case 9:
-								reputation = 150;
+								reputation = Config.RAID_RANKING_9TH;
 								break;
 							case 10:
-								reputation = 100;
+								reputation = Config.RAID_RANKING_10TH;
 								break;
 							default:
 								if (entry.getValue() <= 50)
-									reputation = 25;
+									reputation = Config.RAID_RANKING_UP_TO_50TH;
 								else
-									reputation = 12;
+									reputation = Config.RAID_RANKING_UP_TO_100TH;
 								break;
 						}
 						c.setReputationScore(c.getReputationScore() + reputation, true);