Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-04-29 17:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

8.0 combat formulas and few items. and update world

Browse Source
This commit is contained in:
ErikasKontenis 2022-10-09 10:49:25 +03:00
parent 903b723e11
commit 1efbf9c38d
10 changed files with 1828 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
800OTClient/packet.log
View File

File diff suppressed because one or more lines are too long

4
config.lua
View File

@ -1,7 +1,7 @@
-- Custom -- Custom
clientVersion = 800 clientVersion = 800
knightCloseAttackDamageIncreasePercent = 15 knightCloseAttackDamageIncreasePercent = -1
paladinRangeAttackDamageIncreasePercent = 10 paladinRangeAttackDamageIncreasePercent = -1
-- Min/Max rate spawn is a multiplication of the map spawntime in spawns.xml Regular monster spawn time is 600. The formula would be randomValue = random(600*100, 600*200) which varies between 60s and 120s -- Min/Max rate spawn is a multiplication of the map spawntime in spawns.xml Regular monster spawn time is 600. The formula would be randomValue = random(600*100, 600*200) which varies between 60s and 120s
minRateSpawn = 100 minRateSpawn = 100
maxRateSpawn = 200 maxRateSpawn = 200

1
data/monster/790/hand of cursed fate.xml
View File

@ -66,6 +66,7 @@
<item id="5799" chance="1" /><!-- golden figurine --> <item id="5799" chance="1" /><!-- golden figurine -->
<item id="5668" chance="2" /><!-- mysterious voodoo skull --> <item id="5668" chance="2" /><!-- mysterious voodoo skull -->
<item id="3155" countmax="8" chance="42" /><!-- sudden death rune --> <item id="3155" countmax="8" chance="42" /><!-- sudden death rune -->
<item id="7414" chance="5" /><!-- abyss hammer -->
</loot> </loot>
<script> <script>
<event name="KillingInTheNameOf" /> <event name="KillingInTheNameOf" />

1
data/monster/790/phantasm.xml
View File

@ -67,5 +67,6 @@
<item id="6299" chance="3" /><!-- death ring --> <item id="6299" chance="3" /><!-- death ring -->
<item id="3030" countmax="3" chance="121" /><!-- small ruby --> <item id="3030" countmax="3" chance="121" /><!-- small ruby -->
<item id="3033" countmax="3" chance="145" /><!-- small amethyst --> <item id="3033" countmax="3" chance="145" /><!-- small amethyst -->
<item id="7414" chance="4" /><!-- abyss hammer -->
</loot> </loot>
</monster> </monster>

1
data/monster/ferumbras.xml
View File

@ -137,5 +137,6 @@
<item id="7435" chance="75" /><!-- impaler --> <item id="7435" chance="75" /><!-- impaler -->
<item id="7411" chance="75" /><!-- ornamented axe --> <item id="7411" chance="75" /><!-- ornamented axe -->
<item id="7388" chance="100" /><!-- vile axe --> <item id="7388" chance="100" /><!-- vile axe -->
<item id="7414" chance="100" /><!-- abyss hammer -->
</loot> </loot>
</monster> </monster>

2
data/npc/rashid.npc
View File

@ -66,6 +66,7 @@ VANISH,! -> "Good bye."
"noble","axe" -> Type=7456, Amount=1, Price=10000, "You want sell a noble axe for %P gold?", Topic=2 "noble","axe" -> Type=7456, Amount=1, Price=10000, "You want sell a noble axe for %P gold?", Topic=2
"royal","axe" -> Type=7434, Amount=1, Price=40000, "You want sell a royal axe for %P gold?", Topic=2 "royal","axe" -> Type=7434, Amount=1, Price=40000, "You want sell a royal axe for %P gold?", Topic=2
"vile","axe" -> Type=7388, Amount=1, Price=30000, "You want sell a vile axe for %P gold?", Topic=2 "vile","axe" -> Type=7388, Amount=1, Price=30000, "You want sell a vile axe for %P gold?", Topic=2
"abyss","hammer" -> Type=7414, Amount=1, Price=20000, "You want sell a abyss hammer for %P gold?", Topic=2
"dragon","scale","mail" -> Type=3386, Amount=1, Price=40000, "You want sell a dragon scale mail for %P gold?", Topic=2 "dragon","scale","mail" -> Type=3386, Amount=1, Price=40000, "You want sell a dragon scale mail for %P gold?", Topic=2
"dwarven","armor" -> Type=3397, Amount=1, Price=30000, "You want sell a dwarven armor for %P gold?", Topic=2 "dwarven","armor" -> Type=3397, Amount=1, Price=30000, "You want sell a dwarven armor for %P gold?", Topic=2
@ -107,6 +108,7 @@ VANISH,! -> "Good bye."
%1,1<%1,"noble","axe" -> Type=7456, Amount=%1, Price=10000*%1, "You want sell %A noble axes for %P gold?", Topic=2 %1,1<%1,"noble","axe" -> Type=7456, Amount=%1, Price=10000*%1, "You want sell %A noble axes for %P gold?", Topic=2
%1,1<%1,"royal","axe" -> Type=7434, Amount=%1, Price=40000*%1, "You want sell %A royal axes for %P gold?", Topic=2 %1,1<%1,"royal","axe" -> Type=7434, Amount=%1, Price=40000*%1, "You want sell %A royal axes for %P gold?", Topic=2
%1,1<%1,"vile","axe" -> Type=7388, Amount=%1, Price=30000*%1, "You want sell %A vile axes for %P gold?", Topic=2 %1,1<%1,"vile","axe" -> Type=7388, Amount=%1, Price=30000*%1, "You want sell %A vile axes for %P gold?", Topic=2
%1,1<%1,"abyss","hammer" -> Type=7414, Amount=%1, Price=20000*%1, "You want sell %A abyss hammers for %P gold?", Topic=2
%1,1<%1,"dragon","scale","mail" -> Type=3386, Amount=%1, Price=40000*%1, "You want sell %A dragon scale mails for %P gold?", Topic=2 %1,1<%1,"dragon","scale","mail" -> Type=3386, Amount=%1, Price=40000*%1, "You want sell %A dragon scale mails for %P gold?", Topic=2
%1,1<%1,"dwarven","armor" -> Type=3397, Amount=%1, Price=30000*%1, "You want sell %A dwarven armors for %P gold?", Topic=2 %1,1<%1,"dwarven","armor" -> Type=3397, Amount=%1, Price=30000*%1, "You want sell %A dwarven armors for %P gold?", Topic=2

12
data/world800/map-house.xml
View File

@ -933,7 +933,7 @@
<house name="Unnamed House #2382" houseid="2382" entryx="32345" entryy="32244" entryz="7" rent="0" townid="1" size="14" /> <house name="Unnamed House #2382" houseid="2382" entryx="32345" entryy="32244" entryz="7" rent="0" townid="1" size="14" />
<house name="Unnamed House #2383" houseid="2383" entryx="32348" entryy="32244" entryz="7" rent="0" townid="1" size="14" /> <house name="Unnamed House #2383" houseid="2383" entryx="32348" entryy="32244" entryz="7" rent="0" townid="1" size="14" />
<house name="Unnamed House #2384" houseid="2384" entryx="32347" entryy="32245" entryz="6" rent="0" townid="1" size="16" /> <house name="Unnamed House #2384" houseid="2384" entryx="32347" entryy="32245" entryz="6" rent="0" townid="1" size="16" />
<house name="Unnamed House #2385" houseid="2385" entryx="32361" entryy="32244" entryz="6" rent="0" townid="1" size="30" /> <house name="Unnamed House #2385" houseid="2385" entryx="32361" entryy="32244" entryz="6" rent="0" townid="1" size="29" />
<house name="Unnamed House #2386" houseid="2386" entryx="32386" entryy="32238" entryz="7" rent="0" townid="1" size="44" /> <house name="Unnamed House #2386" houseid="2386" entryx="32386" entryy="32238" entryz="7" rent="0" townid="1" size="44" />
<house name="Unnamed House #2387" houseid="2387" entryx="32374" entryy="32241" entryz="7" rent="0" townid="1" size="20" /> <house name="Unnamed House #2387" houseid="2387" entryx="32374" entryy="32241" entryz="7" rent="0" townid="1" size="20" />
<house name="Unnamed House #2388" houseid="2388" entryx="32364" entryy="32241" entryz="7" rent="0" townid="1" size="30" /> <house name="Unnamed House #2388" houseid="2388" entryx="32364" entryy="32241" entryz="7" rent="0" townid="1" size="30" />
@ -941,7 +941,7 @@
<house name="Unnamed House #2390" houseid="2390" entryx="32352" entryy="32201" entryz="7" rent="0" townid="1" size="22" /> <house name="Unnamed House #2390" houseid="2390" entryx="32352" entryy="32201" entryz="7" rent="0" townid="1" size="22" />
<house name="Unnamed House #2391" houseid="2391" entryx="32352" entryy="32196" entryz="7" rent="0" townid="1" size="22" /> <house name="Unnamed House #2391" houseid="2391" entryx="32352" entryy="32196" entryz="7" rent="0" townid="1" size="22" />
<house name="Unnamed House #2392" houseid="2392" entryx="32361" entryy="32190" entryz="7" rent="0" townid="1" size="28" /> <house name="Unnamed House #2392" houseid="2392" entryx="32361" entryy="32190" entryz="7" rent="0" townid="1" size="28" />
<house name="Unnamed House #2393" houseid="2393" entryx="32371" entryy="32201" entryz="7" rent="0" townid="1" size="90" /> <house name="Unnamed House #2393" houseid="2393" entryx="32371" entryy="32201" entryz="7" rent="0" townid="1" size="86" />
<house name="Unnamed House #2394" houseid="2394" entryx="32389" entryy="32216" entryz="7" rent="0" townid="1" size="66" /> <house name="Unnamed House #2394" houseid="2394" entryx="32389" entryy="32216" entryz="7" rent="0" townid="1" size="66" />
<house name="Unnamed House #2395" houseid="2395" entryx="32387" entryy="32212" entryz="7" rent="0" townid="1" size="33" /> <house name="Unnamed House #2395" houseid="2395" entryx="32387" entryy="32212" entryz="7" rent="0" townid="1" size="33" />
<house name="Unnamed House #2396" houseid="2396" entryx="32395" entryy="32218" entryz="6" rent="0" townid="1" size="39" /> <house name="Unnamed House #2396" houseid="2396" entryx="32395" entryy="32218" entryz="6" rent="0" townid="1" size="39" />
@ -1018,4 +1018,12 @@
<house name="Fimbul Shelf 2" houseid="2470" entryx="32209" entryy="31175" entryz="7" rent="1045" townid="13" size="21" /> <house name="Fimbul Shelf 2" houseid="2470" entryx="32209" entryy="31175" entryz="7" rent="1045" townid="13" size="21" />
<house name="Fimbul Shelf 1" houseid="2471" entryx="32204" entryy="31169" entryz="7" rent="975" townid="13" size="20" /> <house name="Fimbul Shelf 1" houseid="2471" entryx="32204" entryy="31169" entryz="7" rent="975" townid="13" size="20" />
<house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="378" /> <house name="Frost Manor" houseid="2472" entryx="32287" entryy="31106" entryz="5" rent="26370" townid="13" size="378" />
<house name="Unnamed House #2473" houseid="2473" entryx="32346" entryy="32245" entryz="6" rent="0" townid="1" size="17" />
<house name="Unnamed House #2474" houseid="2474" entryx="32060" entryy="32449" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2475" houseid="2475" entryx="32060" entryy="32445" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2476" houseid="2476" entryx="32060" entryy="32441" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2477" houseid="2477" entryx="32060" entryy="32437" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2478" houseid="2478" entryx="32060" entryy="32433" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2479" houseid="2479" entryx="32060" entryy="32429" entryz="7" rent="0" townid="1" size="32" />
<house name="Unnamed House #2480" houseid="2480" entryx="32083" entryy="32440" entryz="7" rent="0" townid="1" size="47" />
</houses> </houses>

2953
data/world800/map-spawn.xml
View File

File diff suppressed because it is too large Load Diff

BIN
data/world800/map.otbm
View File

Binary file not shown.

13
src/combat.cpp
View File

@ -1296,10 +1296,23 @@ void Combat::getAttackValue(Creature* creature, uint32_t& attackValue, uint32_t&
} }
skillValue = player->getSkillLevel(skill); skillValue = player->getSkillLevel(skill);
if (weapon->getMinimumLevel() > player->getLevel()) {
attackValue = std::max<uint32_t>(7, attackValue / 2);
}
} else { } else {
attackValue = 7; attackValue = 7;
skillValue = player->getSkillLevel(skill); skillValue = player->getSkillLevel(skill);
} }
// begin 8.0 combat formula
if (player->getVocationId() == 3 || player->getVocationId() == 7) {
attackValue += (player->getLevel() / 4.5);
}
else if (player->getVocationId() == 4 || player->getVocationId() == 8) {
attackValue += (player->getLevel() / 3.0);
}
// end 8.0 combat formula
} else if (Monster* monster = creature->getMonster()) { } else if (Monster* monster = creature->getMonster()) {
attackValue = monster->mType->info.attack; attackValue = monster->mType->info.attack;
skillValue = monster->mType->info.skill; skillValue = monster->mType->info.skill;