unstable: functionality reached. no npc dupes (tnx AliasRequired). summons back to work, most spawns, texts and skills should be ok. no jython, no 7s, no sieges yet.

datapack_development/data/stats/skills/0000-0099.xml

@@ -250,7 +250,7 @@
 <skill id="13" levels="1" name="Summon Siege Golem">
   <table name="#itemConsumeCount"> 300 </table>
   <table name="#reuseDelay"> 20000 </table>
-  <table name="#npcIds"> 12251 </table>
+  <table name="#npcIds"> 14737 </table>
   <table name="#itemConsumeCountOT"> 70 </table>
   <set name="mpInitialConsume" val="530"/>
   <set name="mpConsume" val="0"/>
@@ -462,7 +462,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12187 12188 12189 12190 12191 12522 12523 12524 12525 </table>
+  <table name="#npcIds"> 14663 14664 14665 14666 14667 14668 14669 14670 14671 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.15"/>
   <set name="isCubic" val="false"/>

datapack_development/data/stats/skills/0200-0299.xml

@@ -1303,7 +1303,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12184 12185 12186 12473 12474 12475 12476 </table>
+  <table name="#npcIds"> 14799 14800 14801 14802 14803 14804 14805 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.15"/>
   <set name="isCubic" val="false"/>
@@ -1576,7 +1576,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <set name="npcId" val="12375"/>
+  <set name="npcId" val="14768"/>
   <set name="expPenalty" val="0.0"/>
   <set name="isCubic" val="false"/>
   <for>

datapack_development/data/stats/skills/0300-0399.xml

@@ -19,7 +19,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12517 12518 12519 12520 12521 </table>
+  <table name="#npcIds"> 14702 14703 14704 14705 14706 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.3"/>
   <set name="isCubic" val="false"/>

datapack_development/data/stats/skills/1100-1199.xml

@@ -193,7 +193,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12006 12344 12007 12345 12008 12346 12175 12347 12176 12411 12412 12413 12414 12415 12416 12417 12418 12419 </table>
+  <table name="#npcIds"> 14111 14116 14112 14117 14113 14118 14114 14119 14115 14120 14121 14122 14123 14124 14125 14126 14127 14128 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.3" />
   <set name="isCubic" val="false" />
@@ -259,7 +259,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12070 12362 12071 12363 12072 12364 12181 12365 12182 12447 12448 12449 12450 12451 12452 12453 12454 12455 </table> 
+  <table name="#npcIds"> 14479 14484 14480 14485 14481 14486 14482 14487 14483 14488 14489 14490 14491 14492 14493 14494 14495 14496 </table> 
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.3" />
   <set name="isCubic" val="false" />
@@ -288,7 +288,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="40"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12192 12193 12465 12466 12467 12468 12469 </table> 
+  <table name="#npcIds"> 14001 14002 14003 14004 14005 14006 14007 </table> 
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.15" />
   <set name="isCubic" val="false" />
@@ -520,7 +520,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="50"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12194 12195 12196 12470 12471 12472 </table>
+  <table name="#npcIds"> 14038 14039 14040 14041 14042 14043 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.9" />
   <set name="isCubic" val="false" />

datapack_development/data/stats/skills/1200-1299.xml

@@ -359,7 +359,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12348 12061 12349 12062 12350 12063 12351 12177 12352 12420 12421 12422 12423 12424 12425 12426 12427 12428 </table>
+  <table name="#npcIds"> 14163 14159 14164 14160 14165 14161 14166 14162 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.9" />
   <set name="isCubic" val="false" />
@@ -389,7 +389,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12064 12353 12065 12354 12066 12355 12178 12356 12179 12438 12439 12440 12441 12442 12443 12444 12445 12446 </table>
+  <table name="#npcIds"> 14295 14300 14296 14301 14297 14302 14298 14303 14299 14304 14305 14306 14307 14308 14309 14310 14311 14312 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.3" />
   <set name="isCubic" val="false" />
@@ -414,7 +414,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12357 12067 12358 12068 12359 12069 12360 12180 12361 12429 12430 12431 12432 12433 12434 12435 12436 12437 </table> 
+  <table name="#npcIds"> 14347 14343 14348 14344 14349 14345 14350 14346 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 </table> 
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.9" />
   <set name="isCubic" val="false" />
@@ -439,7 +439,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12366 12073 12367 12074 12368 12075 12369 12183 12370 12456 12457 12458 12459 12460 12461 12462 12463 12464 </table>
+  <table name="#npcIds"> 14531 14527 14532 14528 14533 14529 14534 14530 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.9" />
   <set name="isCubic" val="false" />
@@ -1491,7 +1491,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 12488 12489 12536 </table>
+  <table name="#npcIds"> 14207 14208 14209 14210 14211 14212 14213 14214 14215 14216 14217 14218 14219 14207 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.1" />
   <set name="isCubic" val="false" />
@@ -1519,7 +1519,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12490 12491 12492 12493 12494 12495 12496 12497 12498 12499 12500 12501 12502 12537 </table>
+  <table name="#npcIds"> 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 </table>
   <set name="npcId" val="#npcIds" />
   <set name="expPenalty" val="0.1" />
   <set name="isCubic" val="false" />
@@ -1548,7 +1548,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 12503 12504 12505 12506 12507 12508 12509 12510 12511 12512 12513 12514 12515 12538 </table>
+  <table name="#npcIds"> 14575 14576 14577 14578 14579 14580 14581 14582 14583 14584 14585 14586 14587 14588 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.1"/>
   <set name="isCubic" val="false"/>

datapack_development/data/stats/skills/1300-1399.xml

@@ -421,7 +421,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 13137 13138 13139 13140 13141 13142 13143 13144 13145 13146 13147 13148 13149 13150 </table>
+  <table name="#npcIds"> 14251 14252 14253 14254 14255 14256 14257 14258 14259 14260 14261 14262 14263 14264 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.05"/>
   <set name="isCubic" val="false"/>
@@ -450,7 +450,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 </table>
+  <table name="#npcIds"> 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 14448 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.05"/>
   <set name="isCubic" val="false"/>
@@ -479,7 +479,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="-1"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 13175 13176 13177 13178 </table>
+  <table name="#npcIds"> 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.05"/>
   <set name="isCubic" val="false"/>
@@ -508,7 +508,7 @@
   <set name="operateType" val="OP_ACTIVE"/>
   <set name="castRange" val="40"/>
   <!-- Summon-specific -->
-  <table name="#npcIds"> 13179 13180 13181 13182 13183 13184 13185 </table>
+  <table name="#npcIds"> 14074 14075 14076 14077 14078 14079 14080 </table>
   <set name="npcId" val="#npcIds"/>
   <set name="expPenalty" val="0.15"/>
   <set name="isCubic" val="false"/>

datapack_development/sql/droplist.sql

@@ -23347,21 +23347,6 @@ INSERT INTO `droplist` VALUES
 (29006,951,1,1,0,140000),
 (29006,57,100000,150000,0,1000000),
 (29006,6662,1,1,0,300000),
-(21084,57,765,1528,0,700000),
-(21084,2397,1,1,0,12),
-(21084,4069,1,1,0,2102),
-(21084,2402,1,1,0,19),
-(21084,4070,1,1,0,3192),
-(21084,2406,1,1,0,8),
-(21084,4071,1,1,0,1615),
-(21084,1864,1,1,0,178349),
-(21084,1866,1,1,0,59450),
-(21084,1878,1,1,0,35670),
-(21084,1885,1,1,0,7432),
-(21084,1889,1,1,0,5945),
-(21084,4197,1,1,0,68),
-(21084,1419,1,1,0,200000),
-(21084,1806,1,1,1,10868),
 (18003,1871,1,1,1,9797),
 (29014,76,1,1,0,42000),
 (29014,145,1,1,0,35000),

datapack_development/sql/merchants.sql

@@ -78,10 +78,10 @@ INSERT INTO `merchants` VALUES (1030839,13);
 INSERT INTO `merchants` VALUES (1030840,13);
 INSERT INTO `merchants` VALUES (1030841,13);
 INSERT INTO `merchants` VALUES (1030842,13);
-INSERT INTO `merchants` VALUES (135102,14);
-INSERT INTO `merchants` VALUES (135144,14);
-INSERT INTO `merchants` VALUES (135228,14);
-INSERT INTO `merchants` VALUES (135186,14);
-INSERT INTO `merchants` VALUES (135276,14);
-INSERT INTO `merchants` VALUES (135007,14);
+INSERT INTO `merchants` VALUES (1035102,14);
+INSERT INTO `merchants` VALUES (1035144,14);
+INSERT INTO `merchants` VALUES (1035228,14);
+INSERT INTO `merchants` VALUES (1035186,14);
+INSERT INTO `merchants` VALUES (1035276,14);
+INSERT INTO `merchants` VALUES (1035007,14);
 

datapack_development/sql/npcskills.sql

@@ -9008,8 +9008,8 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30022,4045,1),
 (30023,4290,1),
 (30023,4045,1),
-(31275,4290,1),
-(31275,4045,1),
+(30024,4290,1),
+(30024,4045,1),
 (30025,4290,1),
 (30025,4045,1),
 (30026,4290,1),
@@ -9114,8 +9114,8 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30075,4045,1),
 (30076,4290,1),
 (30076,4045,1),
-(31275,4290,1),
-(31275,4045,1),
+(30077,4290,1),
+(30077,4045,1),
 (30078,4290,1),
 (30078,4045,1),
 (30079,4290,1),
@@ -9160,8 +9160,8 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30098,4045,1),
 (30099,4290,1),
 (30099,4045,1),
-(31284,4290,1),
-(31284,4045,1),
+(30100,4290,1),
+(30100,4045,1),
 (30101,4290,1),
 (30101,4045,1),
 (30102,4290,1),
@@ -9294,10 +9294,10 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30165,4045,1),
 (30166,4290,1),
 (30166,4045,1),
-(31268,4290,1),
-(31268,4045,1),
-(31738,4290,1),
-(31738,4045,1),
+(30167,4290,1),
+(30167,4045,1),
+(30168,4290,1),
+(30168,4045,1),
 (30169,4290,1),
 (30169,4045,1),
 (30170,4290,1),
@@ -9382,8 +9382,8 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30209,4045,1),
 (30210,4290,1),
 (30210,4045,1),
-(31741,4290,1),
-(31741,4045,1),
+(30211,4290,1),
+(30211,4045,1),
 (30212,4290,1),
 (30212,4045,1),
 (30213,4290,1),
@@ -9508,16 +9508,12 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30272,4045,1),
 (30273,4290,1),
 (30273,4045,1),
-(30274,4290,1),
-(30274,4045,1),
 (30275,4290,1),
 (30275,4045,1),
 (30276,4290,1),
 (30276,4045,1),
 (30277,4290,1),
 (30277,4045,1),
-(30278,4290,1),
-(30278,4045,1),
 (30279,4290,1),
 (30279,4045,1),
 (30280,4290,1),
@@ -10174,8 +10170,8 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (30605,4045,1),
 (30606,4290,1),
 (30606,4045,1),
-(31269,4290,1),
-(31269,4045,1),
+(30607,4290,1),
+(30607,4045,1),
 (30608,4290,1),
 (30608,4045,1),
 (30609,4290,1),
@@ -15593,18 +15589,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (31843,4290,1),
 (31843,4045,1),
 (31843,4390,1),
-(21084,4298,1),
-(21084,4278,1),
-(21084,4333,3),
-(21084,4039,6),
-(21084,4002,6),
-(21084,4035,6),
-(21084,4298,1),
-(21084,4278,1),
-(21084,4333,3),
-(21084,4039,6),
-(21084,4002,6),
-(21084,4035,6),
 (35001,4290,1),
 (35001,4045,1),
 (18003,4293,1),
@@ -15862,34 +15846,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (14040,4290,1),
 (14040,4121,1),
 (14040,4260,5),
-(35197,4297,1),
-(35197,4045,1),
-(35198,4297,1),
-(35198,4045,1),
-(35199,4297,1),
-(35199,4045,1),
-(35200,4297,1),
-(35200,4045,1),
-(35201,4297,1),
-(35201,4045,1),
-(35202,4297,1),
-(35202,4045,1),
-(35203,4297,1),
-(35203,4045,1),
-(35204,4297,1),
-(35204,4045,1),
-(35205,4297,1),
-(35205,4045,1),
-(35206,4297,1),
-(35206,4045,1),
-(35207,4297,1),
-(35207,4045,1),
-(35208,4297,1),
-(35208,4045,1),
-(35209,4297,1),
-(35209,4045,1),
-(35210,4297,1),
-(35210,4045,1),
 (29019,4299,1),
 (29019,4045,1),
 (29019,4122,1),
@@ -15901,8 +15857,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (29019,4111,1),
 (29019,4112,1),
 (29019,4113,1),
-(35212,4290,1),
-(35212,4045,1),
 (35191,4290,1),
 (35191,4045,1),
 (35192,4290,1),
@@ -16146,40 +16100,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (31859,4278,1),
 (31859,4045,1),
 (31859,4390,1),
-(35325,4290,1),
-(35325,4045,1),
-(35326,4290,1),
-(35326,4045,1),
-(35327,4290,1),
-(35327,4045,1),
-(35328,4290,1),
-(35328,4045,1),
-(35329,4290,1),
-(35329,4045,1),
-(35330,4290,1),
-(35330,4045,1),
-(35331,4290,1),
-(35331,4045,1),
-(35332,4290,1),
-(35332,4045,1),
-(35333,4290,1),
-(35333,4045,1),
-(35334,4290,1),
-(35334,4045,1),
-(35335,4290,1),
-(35335,4045,1),
-(35336,4290,1),
-(35336,4045,1),
-(35337,4290,1),
-(35337,4045,1),
-(35338,4290,1),
-(35338,4045,1),
-(35339,4290,1),
-(35339,4045,1),
-(35340,4290,1),
-(35340,4045,1),
-(35341,4290,1),
-(35341,4045,1),
 (13004,4290,1),
 (13004,4045,1),
 (13005,4290,1),
@@ -16265,8 +16185,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (14535,4298,1),
 (14535,4121,1),
 (14535,4260,5),
-(31228,4293,1),
-(31228,4045,1),
 (29020,4291,1),
 (29020,4045,1),
 (29020,4256,1),
@@ -16305,70 +16223,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (29024,4085,1),
 (29024,4086,1),
 (29024,4045,1),
-(35378,4291,1),
-(35378,4045,1),
-(35379,4291,1),
-(35379,4045,1),
-(35380,4291,1),
-(35380,4045,1),
-(35381,4291,1),
-(35381,4045,1),
-(35382,4291,1),
-(35382,4045,1),
-(35383,4291,1),
-(35383,4045,1),
-(35384,4291,1),
-(35384,4045,1),
-(35385,4291,1),
-(35385,4045,1),
-(35386,4291,1),
-(35386,4045,1),
-(35387,4291,1),
-(35387,4045,1),
-(35388,4291,1),
-(35388,4045,1),
-(35389,4291,1),
-(35389,4045,1),
-(35390,4291,1),
-(35390,4045,1),
-(35391,4291,1),
-(35391,4045,1),
-(35392,4291,1),
-(35392,4045,1),
-(35393,4291,1),
-(35393,4045,1),
-(35394,4291,1),
-(35394,4045,1),
-(35395,4291,1),
-(35395,4045,1),
-(35396,4291,1),
-(35396,4045,1),
-(35397,4291,1),
-(35397,4045,1),
-(35398,4291,1),
-(35398,4045,1),
-(35399,4291,1),
-(35399,4045,1),
-(35400,4291,1),
-(35400,4045,1),
-(35401,4291,1),
-(35401,4045,1),
-(35402,4291,1),
-(35402,4045,1),
-(35403,4291,1),
-(35403,4045,1),
-(35404,4291,1),
-(35404,4045,1),
-(35405,4291,1),
-(35405,4045,1),
-(35406,4291,1),
-(35406,4045,1),
-(35407,4291,1),
-(35407,4045,1),
-(35408,4291,1),
-(35408,4045,1),
-(35409,4291,1),
-(35409,4045,1),
 (18005,4291,1),
 (14120,4293,1),
 (14120,4121,1),
@@ -16598,9 +16452,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (14219,4293,1),
 (14219,4121,1),
 (14219,4378,7),
-(14391,4296,1),
-(14391,4121,1),
-(14391,4137,4),
 (14392,4296,1),
 (14392,4121,1),
 (14392,4137,4),
@@ -16637,11 +16488,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (14403,4296,1),
 (14403,4121,1),
 (14403,4137,7),
-(14575,4298,1),
-(14575,4121,1),
-(14575,4138,4),
-(14575,4259,4),
-(14575,4140,4),
 (14576,4298,1),
 (14576,4121,1),
 (14576,4138,4),
@@ -16716,9 +16562,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (14706,4291,1),
 (14706,4121,1),
 (14706,4139,7),
-(14702,4291,1),
-(14702,4121,1),
-(14702,4139,7),
 (14668,4291,1),
 (14668,4121,1),
 (14668,4068,6),
@@ -16773,9 +16616,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (35410,4045,1),
 (29025,4295,1),
 (29025,4045,1),
-(14207,4293,1),
-(14207,4121,1),
-(14207,4378,7),
 (14391,4296,1),
 (14391,4121,1),
 (14391,4137,7),
@@ -17888,8 +17728,6 @@ INSERT INTO `npcskills` (`npcid`, `skillid`, `level`) VALUES
 (35453,4045,1),
 (35455,4290,1),
 (35455,4045,1),
-(35451,4290,1),
-(35451,4045,1),
 (35457,4290,1),
 (35457,4045,1),
 (35459,4290,1),

datapack_development/sql/skill_learn.sql

@@ -326,20 +326,6 @@ INSERT INTO skill_learn VALUES
 (30255,53),
 (30255,54),
 (30255,55),
-(30274,18),
-(30274,19),
-(30274,20),
-(30274,21),
-(30274,22),
-(30274,23),
-(30274,24),
-(30278,31),
-(30278,32),
-(30278,33),
-(30278,34),
-(30278,35),
-(30278,36),
-(30278,37),
 (30293,25),
 (30293,29),
 (30293,30),

datapack_development/sql/spawnlist.sql

@@ -21660,7 +21660,7 @@ INSERT INTO `spawnlist` VALUES
 (21611,'oren_t20_15_014',1,20479,2600,-92243,-3221,0,0,-2696,15,0,0),
 (21612,'oren_t20_15_014',1,20479,1774,-93126,-3221,0,0,-2696,15,0,0),
 (21613,'oren_t20_15_014',1,20479,1475,-93618,-3221,0,0,-2696,15,0,0),
-(21614,'oren_t20_18_001',20001,1,32049,7848,-3701,0,0,-3476,15,0,0),
+(21614,'oren_t20_18_001',1,20001,32049,7848,-3701,0,0,-3476,15,0,0),
 (21615,'oren_t20_18_001',1,20529,32260,8402,-3701,0,0,-3476,15,0,0),
 (21616,'oren_t20_18_001',1,20529,30964,9243,-3701,0,0,-3476,15,0,0),
 (21617,'oren_t20_18_001',1,20529,29526,4760,-3701,0,0,-3476,15,0,0),
@@ -21671,11 +21671,11 @@ INSERT INTO `spawnlist` VALUES
 (21622,'oren_t20_18_001',1,20536,31944,6781,-3701,0,0,-3476,15,0,0),
 (21623,'oren_t20_18_001',1,20536,29729,9157,-3701,0,0,-3476,15,0,0),
 (21624,'oren_t20_18_001',1,20536,30982,5322,-3701,0,0,-3476,15,0,0),
-(21625,'oren_t20_18_002',20001,1,27045,5741,-3697,0,0,-3372,15,0,0),
-(21626,'oren_t20_18_002',20001,1,24750,3309,-3697,0,0,-3372,15,0,0),
-(21627,'oren_t20_18_002',20001,1,23135,5208,-3697,0,0,-3372,15,0,0),
-(21628,'oren_t20_18_002',20001,1,19372,6802,-3697,0,0,-3372,15,0,0),
-(21629,'oren_t20_18_002',20001,1,22325,7146,-3697,0,0,-3372,15,0,0),
+(21625,'oren_t20_18_002',1,20001,27045,5741,-3697,0,0,-3372,15,0,0),
+(21626,'oren_t20_18_002',1,20001,24750,3309,-3697,0,0,-3372,15,0,0),
+(21627,'oren_t20_18_002',1,20001,23135,5208,-3697,0,0,-3372,15,0,0),
+(21628,'oren_t20_18_002',1,20001,19372,6802,-3697,0,0,-3372,15,0,0),
+(21629,'oren_t20_18_002',1,20001,22325,7146,-3697,0,0,-3372,15,0,0),
 (21630,'oren_t20_18_002',1,20529,21626,4799,-3697,0,0,-3372,15,0,0),
 (21631,'oren_t20_18_002',1,20529,28153,4821,-3697,0,0,-3372,15,0,0),
 (21632,'oren_t20_18_002',1,20529,25162,4589,-3697,0,0,-3372,15,0,0),
@@ -21697,9 +21697,9 @@ INSERT INTO `spawnlist` VALUES
 (21648,'oren_t20_18_002',1,20536,19590,9259,-3697,0,0,-3372,15,0,0),
 (21649,'oren_t20_18_002',1,20536,22222,8836,-3697,0,0,-3372,15,0,0),
 (21650,'oren_t20_18_002',1,20536,19521,5331,-3697,0,0,-3372,15,0,0),
-(21651,'oren_t20_18_003',20001,1,28814,17690,-3701,0,0,-3476,15,0,0),
-(21652,'oren_t20_18_003',20001,1,30596,17395,-3701,0,0,-3476,15,0,0),
-(21653,'oren_t20_18_003',20001,1,28350,17617,-3701,0,0,-3476,15,0,0),
+(21651,'oren_t20_18_003',1,20001,28814,17690,-3701,0,0,-3476,15,0,0),
+(21652,'oren_t20_18_003',1,20001,30596,17395,-3701,0,0,-3476,15,0,0),
+(21653,'oren_t20_18_003',1,20001,28350,17617,-3701,0,0,-3476,15,0,0),
 (21654,'oren_t20_18_003',1,20529,32249,12784,-3701,0,0,-3476,15,0,0),
 (21655,'oren_t20_18_003',1,20529,32390,15336,-3701,0,0,-3476,15,0,0),
 (21656,'oren_t20_18_003',1,20529,29759,16759,-3701,0,0,-3476,15,0,0),
@@ -21717,8 +21717,8 @@ INSERT INTO `spawnlist` VALUES
 (21668,'oren_t20_18_003',1,20536,30358,15574,-3701,0,0,-3476,15,0,0),
 (21669,'oren_t20_18_003',1,20536,28227,14216,-3701,0,0,-3476,15,0,0),
 (21670,'oren_t20_18_003',1,20536,29981,17054,-3701,0,0,-3476,15,0,0),
-(21671,'oren_t20_18_004',20001,1,21690,13767,-3725,0,0,-3300,15,0,0),
-(21672,'oren_t20_18_004',20001,1,23200,18141,-3725,0,0,-3300,15,0,0),
+(21671,'oren_t20_18_004',1,20001,21690,13767,-3725,0,0,-3300,15,0,0),
+(21672,'oren_t20_18_004',1,20001,23200,18141,-3725,0,0,-3300,15,0,0),
 (21673,'oren_t20_18_004',1,20529,27696,17412,-3725,0,0,-3300,15,0,0),
 (21674,'oren_t20_18_004',1,20529,23362,18010,-3725,0,0,-3300,15,0,0),
 (21675,'oren_t20_18_004',1,20529,26646,12792,-3725,0,0,-3300,15,0,0),