fixes from dkkserv

mattyx14 · Feb 3, 2022 · 101a5fb · 101a5fb
1 parent e1a9a7c
commit 101a5fb
Show file tree

Hide file tree

Showing 49 changed files with 954 additions and 4,686 deletions.
diff --git a/data/XML/events.xml b/data/XML/events.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <events>
+	<event name="DarkKonia Online" startdate="06/02/2022" enddate="13/02/2022" script="example.lua" >
+		<ingame exprate="250" lootrate="200" spawnrate="100" skillrate="200" />
+		<description description="DarkKonia Online description double exp and a half, double loot !chance!, regular spawn and double skill" />
+		<colors colordark="#235c00" colorlight="#2d7400" />
+		<details displaypriority="6" isseasonal="0" specialevent="0" />
+	</event>
 </events>
diff --git a/data/XML/vocations.xml b/data/XML/vocations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <vocations>
-	<vocation id="0" clientid="0" baseid="0" name="None" description="none" magicshield="0" gaincap="10" gainhp="5" gainmana="5" gainhpticks="12000" gainhpamount="10" gainmanaticks="6000" gainmanaamount="20" manamultiplier="4.0" attackspeed="2000" basespeed="220" soulmax="100" gainsoulticks="120000" fromvoc="0">
+	<vocation id="0" clientid="0" baseid="0" name="None" description="none" allowpvp="0" magicshield="0" gaincap="10" gainhp="5" gainmana="5" gainhpticks="12000" gainhpamount="10" gainmanaticks="6000" gainmanaamount="20" manamultiplier="4.0" attackspeed="2000" basespeed="220" soulmax="100" gainsoulticks="120000" fromvoc="0">
 		<formula meleeDamage="1.0" distDamage="1.0" defense="1.0" armor="1.0" />
 		<skill id="0" multiplier="1.5" />
 		<skill id="1" multiplier="2.0" />

diff --git a/data/items/items.xml b/data/items/items.xml
@@ -17102,7 +17102,10 @@
 		<attribute key="floorchange" value="north" />
 	</item>
 	<item id="8379" article="a" name="ramp" />
-	<item fromid="8380" toid="8385" article="a" name="tunnel entrance" />
+	<item id="8380" article="a" name="tunnel entrance">
+		<attribute key="floorchange" value="down" />
+	</item>
+	<item fromid="8381" toid="8385" article="a" name="tunnel entrance" />
 	<item fromid="8386" toid="8387" article="a" name="bone" />
 	<item id="8388" article="a" name="skull" />
 	<item fromid="8389" toid="8392" article="a" name="bone" />
@@ -17309,7 +17312,10 @@
 	<item fromid="8625" toid="8626" article="a" name="dwarven statue" />
 	<item fromid="8627" toid="8630" article="a" name="bone" />
 	<item id="8631" article="a" name="burning wall" />
-	<item id="8632" article="a" name="water vortex" />
+	<item id="8632" article="a" name="water vortex">
+		<attribute key="type" value="teleport" />
+		<attribute key="effect" value="teleport" />
+	</item>
 	<item fromid="8633" toid="8636" article="a" name="large crystal" />
 	<item fromid="8637" toid="8640" article="a" name="crystal" />
 	<item fromid="8641" toid="8642" article="a" name="crucible" />

diff --git a/data/lib/core/player.lua b/data/lib/core/player.lua
@@ -136,7 +136,7 @@ function Player.transferMoneyTo(self, target, amount)
 	local targetPlayer = Player(target)
 	if targetPlayer then
 		local town = targetPlayer:getTown()
-		if town then
+		if town and town:getId() ~= TOWNS_LIST.DAWNPORT or town:getId() ~= TOWNS_LIST.DAWNPORT_TUTORIAL then -- Blocking transfer to Dawnport
 			targetPlayer:setBankBalance(targetPlayer:getBankBalance() + amount)
 		end
 	else
@@ -149,7 +149,7 @@ function Player.transferMoneyTo(self, target, amount)
 			local town = result.getDataInt(query_town, "town_id")
 			if town then
 				local town_id = Town(town) and Town(town):getId()
-				if town_id then
+				if town_id and town_id  == TOWNS_LIST.DAWNPORT or town_id == TOWNS_LIST.DAWNPORT_TUTORIAL then -- Blocking transfer to Dawnport
 					return false
 				end
 			end

diff --git a/data/lib/core/quests.lua b/data/lib/core/quests.lua
@@ -14,7 +14,27 @@ if not Quests then
 					states = {
 						[1] = "You have contributed with the collection of tomes."
 					}
-				}
+				},
+				[2] = {
+					name = "Circle of the Black Sphinx",
+					storageId = Storage.ForgottenKnowledge.LadyTenebrisKilled,
+					missionId = 10361,
+					startValue = 0,
+					endValue = 1522018605,
+					states = {
+						[1] = "You defeated the rogue Lady Tenebris."
+					}
+				},
+				[3] = {
+					name = "Bane of the deep",
+					storageId = Storage.MisidiaQuest.JaulKilled,
+					missionId = 10362,
+					startValue = 0,
+					endValue = 1522018605,
+					states = {
+						[1] = "You defeated the terrifying Jaul."
+					}
+				},
 			}
 		},
 	}