SVN Revision 3081

[DOLBot]

Commit from shursan

Log Messages
Somes LanguageMgr Adds,
GetTitle for PlayerClass now check player instead of serv_language properties
DelveInfo on SpellHandler now check player instead of serv_language properties
Somes Languagemgr begins on spellhandler (summon for the moment)
GameInventoryItem for WriteMagicalBonuses by client instead of SERV_LANGUAGE

Files Changed:
MODIFY - DOLSharp/trunk/GameServer/craft/AbstractCraftingSkill.cs
MODIFY - DOLSharp/trunk/GameServer/craft/AbstractProfession.cs
MODIFY - DOLSharp/trunk/GameServer/gameobjects/CharacterClasses/CharacterClassBase.cs
MODIFY - DOLSharp/trunk/GameServer/gameobjects/CharacterClasses/ICharacterClass.cs
MODIFY - DOLSharp/trunk/GameServer/gameobjects/GameInventoryItem.cs
MODIFY - DOLSharp/trunk/GameServer/gameobjects/GamePlayer.cs
MODIFY - DOLSharp/trunk/GameServer/language/EN/Ability.txt
MODIFY - DOLSharp/trunk/GameServer/language/EN/Crafting.txt
MODIFY - DOLSharp/trunk/GameServer/language/EN/Spells.txt
MODIFY - DOLSharp/trunk/GameServer/language/FR/Ability.txt
MODIFY - DOLSharp/trunk/GameServer/language/FR/Crafting.txt
MODIFY - DOLSharp/trunk/GameServer/language/FR/Spells.txt
MODIFY - DOLSharp/trunk/GameServer/packets/Server/PacketLib168.cs
MODIFY - DOLSharp/trunk/GameServer/packets/Server/PacketLib175.cs
MODIFY - DOLSharp/trunk/GameServer/packets/Server/PacketLib179.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassArmsman.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassCabalist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassCleric.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassFriar.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassHeretic.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassInfiltrator.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassMaulerAlb.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassMercenary.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassMinstrel.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassNecromancer.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassPaladin.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassReaver.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassScout.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassSorcerer.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassTheurgist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/albion/ClassWizard.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassAcolyte.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassAlbionRogue.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassDisciple.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassElementalist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassFighter.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassForester.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassGuardian.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassMage.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassMagician.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassMidgardRogue.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassMystic.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassNaturalist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassSeer.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassStalker.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/base/ClassViking.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassAnimist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassBainshee.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassBard.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassBlademaster.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassChampion.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassDruid.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassEldritch.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassEnchanter.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassHero.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassMaulerHib.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassMentalist.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassNightshade.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassRanger.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassValewalker.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassVampiir.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/hibernia/ClassWarden.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassBerserker.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassBonedancer.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassHealer.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassHunter.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassMaulerMid.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassRunemaster.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassSavage.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassShadowblade.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassShaman.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassSkald.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassSpiritmaster.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassThane.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassValkyrie.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassWarlock.cs
MODIFY - DOLSharp/trunk/GameServer/playerclasses/midgard/ClassWarrior.cs
MODIFY - DOLSharp/trunk/GameServer/spells/AblativeArmorSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Animist/PetPBAoE.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Animist/SummonAnimistFnF.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Animist/SummonAnimistMainPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Animist/SummonAnimistPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Animist/TurretSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Bonedancer/SummonCommanderPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Bonedancer/SummonMinionHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Cabalist/SummonSimulacrum.cs
MODIFY - DOLSharp/trunk/GameServer/spells/CharmSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/DamageSpeedDecrease.cs
MODIFY - DOLSharp/trunk/GameServer/spells/DirectDamageDebuffSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Druid/SummonDruidPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Enchanter/SummonUnderhill.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Hunter/SummonHunterPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/NearsightSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Necromancer/SummonNecromancerPet.cs
MODIFY - DOLSharp/trunk/GameServer/spells/ProcSpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/ResistDebuff.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Savage/SavageBuff.cs
MODIFY - DOLSharp/trunk/GameServer/spells/SpellHandler.cs
MODIFY - DOLSharp/trunk/GameServer/spells/Spirit Master/SummonSpiritFighter.cs

View Changes:
http://dolserver.svn.sourceforge.net/do ... v&rev=3081

[Graveen]

Big commit ty Apo !

[Shursan]

I have another Big Commit to do.
review of many Serv_Language use. Money etc ...

For the money, i have only one problem with CustomInventoryLoggingExample with Money.GetString() function. (Commented for the moment, that's just an exemple :p) My question is, can i commit this with the commented problematic code in CustomInventoryLoggingExample ?

Code: Select all

public class CustomInventoryLoggingExample
{
[ScriptLoadedEvent]
public static void OnScriptLoaded(DOLEvent e, object sender, EventArgs args)
{
GamePlayer player = null;
if (sender is GamePlayer)
player = sender as GamePlayer;
// Change formats of lines:
InventoryLogging.ActionXformat[eInventoryActionType.Trade] = "Trade: {0} gives {2} to {1}.";
InventoryLogging.ActionXformat[eInventoryActionType.Loot] = "Loot: {0} gives {2} to {1}.";
InventoryLogging.ActionXformat[eInventoryActionType.Quest] = "Quest: {0} gives {2} to {1}.";
InventoryLogging.ActionXformat[eInventoryActionType.Merchant] = "Merchant: {0} gives {2} to {1}.";
InventoryLogging.ActionXformat[eInventoryActionType.Craft] = "Craft: {0} gives {2} to {1}.";
InventoryLogging.ActionXformat[eInventoryActionType.Other] = "Other: {0} gives {2} to {1}.";

InventoryLogging.GetGameObjectString = obj => obj == null ? "(null)" : obj.Name;
InventoryLogging.GetItemString = (item, amount) => item == null ? "(null)" : (amount + " " + item.Name);
//InventoryLogging.GetMoneyString = Money.GetString();
}
}

I have many spellhandler to update also.

[Graveen]

I don't understand what you mean

[Tolakram]

An issue that should be handled at some point is when the players language is used. If I run a server I do not want to see log messages in French, even if I support the french language in game. I also don't like the fact that the current system will show a players selected language to surrounding players instead of using the language selected buy each player.

I don't understand the code snippet you posted, but if it's logging related then it should be logged in the default language of the server, not the player.

[Lost]

I believe what Ysia is saying is... Is there any rule against committing a file that retains its existing functionality however some parts that are revised are commented out so perhaps it can be addressed at a later date.

[Graveen]

No, this is not something interesting, because generally if the committer does not implement it, there are few chances anyone els works on theses parts of code. "Wannabe" code is not really what is missing in DOL core

[Shursan]

I understand all of that. For the moment, i continue to work on many spellhandler translate.

[Shursan]

Seems the change on Spellhandler make some delving problem on GameNPC Caster like BuffBot, pet ..
I commit a fix soon.

[Phen]

DOLSharp/trunk/GameServer/language/EN/Ability.txt
EN version:
Skill.Ability.CannotUse.CamouflageDisableDuration:

Should be:
Skill.Ability.CannotUse.Camouflage.DisableDuration

players are getting this exact message instead of :
You must wait {0} more second to attempt to use camouflage!

Matter of fact all the Camouflage messages in EN need a period:

Skill.Ability.CannotUseCamouflage.Mezzed:
Skill.Ability.CannotUseCamouflage.Stunned:
Skill.Ability.CannotUseCamouflage.NotStealthed:
Skill.Ability.CannotUseCamouflage.Dead:

And I noticed as a stealther trying to summon a mount gets a DE message even when using EN language.

(GameServer\language\EN\GameObjects\GamePlayer.txt(299): GamePlayer.UseSlot.CantMountStealthed)

is missing : at the end of the string

not sure if it matters but it is different then ever other string in that .cs

[Shursan]

ok i check that soon thank you

[Shursan]

Fixed