I hereby claim:
-
I am st3et on github.
-
I am st3et (https://keybase.io/st3et) on keybase.
-
I have a public key ASBRYDgxn_5_ZFxhuUm5U3qUv5YCVWG5kS1FJux1biuaCgo
I hereby claim:
I am st3et on github.
I am st3et (https://keybase.io/st3et) on keybase.
I have a public key ASBRYDgxn_5_ZFxhuUm5U3qUv5YCVWG5kS1FJux1biuaCgo
// FPS + net | |
fps_max 121 | |
cl_cmdrate 128 | |
cl_updaterate 128 | |
rate 128000 | |
cl_interp 0 | |
// Jump throw script | |
alias "+jumpthrow" "+jump;+attack;-attack;-attack2" | |
alias "-jumpthrow" "-jump" |
73, 84, 92, 92, 35, 39, 83, 68, 44, 14, 92, 86, 87, 8, 58, 75, 17, 33, 12, 53, 49, 84, 63, 73, 57, 16, 21, 62, 77, 89, 26, 68, 9, 14, 20, 91, 89, 2, 88, 51, 99, 35, 62, 79, 88, 40, 41, 72, 46, 53, 42, 90, 64, 78, 4, 84, 27, 72, 72, 69, 23, 53, 93, 52, 85, 51, 39, 34, 51, 66, 55, 78, 86, 91, 92, 19, 22, 9, 71, 60, 61, 29, 21, 52, 14, 48, 62, 12, 88, 88, 19, 60, 76, 55, 32, 6, 96, 89, 38, 12, 76, 78, 48, 0, 9, 6, 77, 40, 15, 76, 36, 78, 48, 45, 84, 25, 89, 62, 40, 18, 59, 49, 28, 13, 31, 39, 85, 42, 55, 82, 91, 98, 70, 15, 17, 46, 61, 39, 92, 12, 83, 33, 34, 84, 22, 74, 29, 82, 36, 55, 32, 73, 5, 66, 10, 51, 26, 79, 1, 40, 99, 34, 98, 85, 90, 85, 82, 18, 14, 96, 8, 98, 23, 38, 46, 74, 2, 27, 24, 74, 26, 94, 60, 17, 83, 55, 11, 75, 89, 80, 61, 31, 28, 6, 51, 40, 69, 57, 41, 17, 33, 79, 48, 43, 12, 70, 19, 43, 8, 23, 36, 54, 40, 60, 55, 45, 30, 43, 20, 5, 5, 94, 33, 16, 61, 53, 31, 84, 63, 10, 2, 84, 24, 49, 54, 89, 41, 14, 82, 60, 81, 92, 86, 13, 83, 73, 45, 14, 59, 98, 11, 60, 12, 65, 43, 6, 24, 82, 20, 0, 34, |
diff --git a/L2J_Server/java/com/l2jserver/gameserver/model/events/AbstractScript.java b/L2J_Server/java/com/l2jserver/gameserver/model/events/AbstractScript.java | |
index 6cdb2ec..abfe642 100644 | |
--- a/L2J_Server/java/com/l2jserver/gameserver/model/events/AbstractScript.java | |
+++ b/L2J_Server/java/com/l2jserver/gameserver/model/events/AbstractScript.java | |
@@ -1538,6 +1538,20 @@ | |
/** | |
* Show an on screen message to the player. | |
* @param player the player to display the message to | |
+ * @param npcString the NPC string to display | |
+ * @param position the position of the message on the screen |
diff --git a/L2J_DataPack/dist/game/data/buylists/3125600.xml b/L2J_DataPack/dist/game/data/buylists/3125600.xml | |
index 9639b4b..0b59e6b 100644 | |
--- a/L2J_DataPack/dist/game/data/buylists/3125600.xml | |
+++ b/L2J_DataPack/dist/game/data/buylists/3125600.xml | |
@@ -7,12 +7,15 @@ | |
<item id="218" /> <!-- Throwing Knife --> | |
<item id="272" /> <!-- Forest Bow --> | |
<item id="15" /> <!-- Short Spear --> | |
+ <item id="256" /> <!-- Cestus --> | |
<item id="68" /> <!-- Falchion --> |
diff --git a/L2J_Server/dist/game/config/Character.properties b/L2J_Server/dist/game/config/Character.properties | |
index b8a10c4..39a0176 100644 | |
--- a/L2J_Server/dist/game/config/Character.properties | |
+++ b/L2J_Server/dist/game/config/Character.properties | |
@@ -741,21 +741,6 @@ | |
# Default: 50 | |
MaxOffsetOnTeleport = 50 | |
-# Restores the player to their previous instance (ie. an instanced area/dungeon) on EnterWorld. | |
-# Default: False |
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java | |
index 235d4ff..33f7ed2 100644 | |
--- a/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java | |
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java | |
@@ -130,7 +130,17 @@ | |
} | |
else | |
{ | |
- StringUtil.append(sb, "<fstring>", String.valueOf(quest.getId()), state, "</fstring>"); | |
+ int questId = quest.getId(); |
diff --git a/L2J_DataPack/dist/game/data/stats/skills/11700-11799.xml b/L2J_DataPack/dist/game/data/stats/skills/11700-11799.xml | |
index ad7d87f..5aa1154 100644 | |
--- a/L2J_DataPack/dist/game/data/stats/skills/11700-11799.xml | |
+++ b/L2J_DataPack/dist/game/data/stats/skills/11700-11799.xml | |
@@ -86,9 +86,12 @@ | |
<set name="reuseDelay" val="15000" /> | |
<set name="isMagic" val="1" /> | |
</skill> | |
- <skill id="11755" levels="8" name="Radiant Heal"> | |
+ <skill id="11755" levels="8" name="Radiant Heal" enchantGroup1="10"> |
diff --git a/L2J_DataPack/dist/game/data/html/default/30598-1.htm b/L2J_DataPack/dist/game/data/html/default/30598-1.htm | |
deleted file mode 100644 | |
index 5479258..0000000 | |
--- a/L2J_DataPack/dist/game/data/html/default/30598-1.htm | |
+++ /dev/null | |
@@ -1,7 +0,0 @@ | |
-<html><body>My word, you've made progress all right! But so far you haven't had to use your head must at all -- from now on, you'll need to think and plan if you want to survive. In particular, I want you to ask me questions now, and remember the answers -- this is very important stuff. And when you reach level 11, I'll have more information for you.<br> | |
-<a action="bypass -h npc_%objectId%_Chat 2">What should I do now?</a><br> | |
-<a action="bypass -h npc_%objectId%_Chat 3">What is the best equipment for me?</a><br> | |
-<a action="bypass -h npc_%objectId%_Chat 4">What is the best hunting site for me?</a><br> |