Game data for 7.05

xpdota · Jul 30, 2024 · 4d8a49b · 4d8a49b
1 parent 634b801
commit 4d8a49b
Show file tree

Hide file tree

Showing 92 changed files with 710 additions and 685 deletions.
diff --git a/xivdata/src/main/resources/xiv/actions/Action.csv b/xivdata/src/main/resources/xiv/actions/Action.csv
diff --git a/xivdata/src/main/resources/xiv/icon/013757_hr1.png b/xivdata/src/main/resources/xiv/icon/013757_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/013758_hr1.png b/xivdata/src/main/resources/xiv/icon/013758_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014132_hr1.png b/xivdata/src/main/resources/xiv/icon/014132_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014133_hr1.png b/xivdata/src/main/resources/xiv/icon/014133_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014135_hr1.png b/xivdata/src/main/resources/xiv/icon/014135_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014139_hr1.png b/xivdata/src/main/resources/xiv/icon/014139_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014143_hr1.png b/xivdata/src/main/resources/xiv/icon/014143_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014144_hr1.png b/xivdata/src/main/resources/xiv/icon/014144_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014145_hr1.png b/xivdata/src/main/resources/xiv/icon/014145_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014146_hr1.png b/xivdata/src/main/resources/xiv/icon/014146_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014148_hr1.png b/xivdata/src/main/resources/xiv/icon/014148_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014149_hr1.png b/xivdata/src/main/resources/xiv/icon/014149_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014150_hr1.png b/xivdata/src/main/resources/xiv/icon/014150_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014151_hr1.png b/xivdata/src/main/resources/xiv/icon/014151_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014179_hr1.png b/xivdata/src/main/resources/xiv/icon/014179_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014180_hr1.png b/xivdata/src/main/resources/xiv/icon/014180_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014181_hr1.png b/xivdata/src/main/resources/xiv/icon/014181_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014182_hr1.png b/xivdata/src/main/resources/xiv/icon/014182_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014183_hr1.png b/xivdata/src/main/resources/xiv/icon/014183_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014184_hr1.png b/xivdata/src/main/resources/xiv/icon/014184_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014185_hr1.png b/xivdata/src/main/resources/xiv/icon/014185_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014186_hr1.png b/xivdata/src/main/resources/xiv/icon/014186_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014194_hr1.png b/xivdata/src/main/resources/xiv/icon/014194_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014195_hr1.png b/xivdata/src/main/resources/xiv/icon/014195_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014196_hr1.png b/xivdata/src/main/resources/xiv/icon/014196_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014197_hr1.png b/xivdata/src/main/resources/xiv/icon/014197_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014198_hr1.png b/xivdata/src/main/resources/xiv/icon/014198_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014199_hr1.png b/xivdata/src/main/resources/xiv/icon/014199_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014200_hr1.png b/xivdata/src/main/resources/xiv/icon/014200_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014223_hr1.png b/xivdata/src/main/resources/xiv/icon/014223_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/014225_hr1.png b/xivdata/src/main/resources/xiv/icon/014225_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018532_hr1.png b/xivdata/src/main/resources/xiv/icon/018532_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018533_hr1.png b/xivdata/src/main/resources/xiv/icon/018533_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018534_hr1.png b/xivdata/src/main/resources/xiv/icon/018534_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018535_hr1.png b/xivdata/src/main/resources/xiv/icon/018535_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018536_hr1.png b/xivdata/src/main/resources/xiv/icon/018536_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018537_hr1.png b/xivdata/src/main/resources/xiv/icon/018537_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018538_hr1.png b/xivdata/src/main/resources/xiv/icon/018538_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018539_hr1.png b/xivdata/src/main/resources/xiv/icon/018539_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018847_hr1.png b/xivdata/src/main/resources/xiv/icon/018847_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018848_hr1.png b/xivdata/src/main/resources/xiv/icon/018848_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018849_hr1.png b/xivdata/src/main/resources/xiv/icon/018849_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018850_hr1.png b/xivdata/src/main/resources/xiv/icon/018850_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018851_hr1.png b/xivdata/src/main/resources/xiv/icon/018851_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018852_hr1.png b/xivdata/src/main/resources/xiv/icon/018852_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018854_hr1.png b/xivdata/src/main/resources/xiv/icon/018854_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018855_hr1.png b/xivdata/src/main/resources/xiv/icon/018855_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018856_hr1.png b/xivdata/src/main/resources/xiv/icon/018856_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018857_hr1.png b/xivdata/src/main/resources/xiv/icon/018857_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018858_hr1.png b/xivdata/src/main/resources/xiv/icon/018858_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018859_hr1.png b/xivdata/src/main/resources/xiv/icon/018859_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018917_hr1.png b/xivdata/src/main/resources/xiv/icon/018917_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018918_hr1.png b/xivdata/src/main/resources/xiv/icon/018918_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/018919_hr1.png b/xivdata/src/main/resources/xiv/icon/018919_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019921_hr1.png b/xivdata/src/main/resources/xiv/icon/019921_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019922_hr1.png b/xivdata/src/main/resources/xiv/icon/019922_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019923_hr1.png b/xivdata/src/main/resources/xiv/icon/019923_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019924_hr1.png b/xivdata/src/main/resources/xiv/icon/019924_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019925_hr1.png b/xivdata/src/main/resources/xiv/icon/019925_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019926_hr1.png b/xivdata/src/main/resources/xiv/icon/019926_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019927_hr1.png b/xivdata/src/main/resources/xiv/icon/019927_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019928_hr1.png b/xivdata/src/main/resources/xiv/icon/019928_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019929_hr1.png b/xivdata/src/main/resources/xiv/icon/019929_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019930_hr1.png b/xivdata/src/main/resources/xiv/icon/019930_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019931_hr1.png b/xivdata/src/main/resources/xiv/icon/019931_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019932_hr1.png b/xivdata/src/main/resources/xiv/icon/019932_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019933_hr1.png b/xivdata/src/main/resources/xiv/icon/019933_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019934_hr1.png b/xivdata/src/main/resources/xiv/icon/019934_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019935_hr1.png b/xivdata/src/main/resources/xiv/icon/019935_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019936_hr1.png b/xivdata/src/main/resources/xiv/icon/019936_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019941_hr1.png b/xivdata/src/main/resources/xiv/icon/019941_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019942_hr1.png b/xivdata/src/main/resources/xiv/icon/019942_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019943_hr1.png b/xivdata/src/main/resources/xiv/icon/019943_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019944_hr1.png b/xivdata/src/main/resources/xiv/icon/019944_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019945_hr1.png b/xivdata/src/main/resources/xiv/icon/019945_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019946_hr1.png b/xivdata/src/main/resources/xiv/icon/019946_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019947_hr1.png b/xivdata/src/main/resources/xiv/icon/019947_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019948_hr1.png b/xivdata/src/main/resources/xiv/icon/019948_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019949_hr1.png b/xivdata/src/main/resources/xiv/icon/019949_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019950_hr1.png b/xivdata/src/main/resources/xiv/icon/019950_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019951_hr1.png b/xivdata/src/main/resources/xiv/icon/019951_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019952_hr1.png b/xivdata/src/main/resources/xiv/icon/019952_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019953_hr1.png b/xivdata/src/main/resources/xiv/icon/019953_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019954_hr1.png b/xivdata/src/main/resources/xiv/icon/019954_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019955_hr1.png b/xivdata/src/main/resources/xiv/icon/019955_hr1.png
diff --git a/xivdata/src/main/resources/xiv/icon/019956_hr1.png b/xivdata/src/main/resources/xiv/icon/019956_hr1.png
diff --git a/xivdata/src/main/resources/xiv/maps/Map.csv b/xivdata/src/main/resources/xiv/maps/Map.csv
@@ -897,7 +897,7 @@ int32,MapCondition,byte,byte,sbyte,byte,uint16,str,uint16,int16,int16,PlaceName,
 893,0,99,10,8,1,591,"o5d1/08",200,-847,658,2405,4383,4478,39,3145728,1176,False,False,False,0
 894,0,0,0,0,1,0,"z5fc/00",400,-100,-100,2405,4441,0,-1,0,1168,True,False,False,0
 895,0,99,10,5,1,596,"o5d1/11",200,-189,730,2405,4383,4479,39,65536,1176,False,False,False,0
-896,0,0,0,0,0,0,"",0,0,0,0,0,0,0,0,0,False,False,False,0
+896,0,0,0,0,1,0,"default/00",100,0,0,4500,5000,0,-1,0,1209,True,False,False,0
 897,29,20,6,1,1,597,"y6d1/01",200,-44,-88,4500,4602,4900,148,2,1167,True,False,False,0
 898,29,20,6,2,1,598,"y6d1/02",200,-44,-88,4500,4602,4901,148,508,1167,True,False,False,0
 899,32,21,5,0,1,599,"x6d1/00",200,0,-20,4501,4909,0,149,2046,1198,True,False,False,0

diff --git a/xivdata/src/main/resources/xiv/npcyell/NpcYell.csv b/xivdata/src/main/resources/xiv/npcyell/NpcYell.csv
@@ -15977,7 +15977,7 @@ Mistress will be pleased!"
 14023,0,False,False,False,2,0,4,False,False,1,25,"Bow down!"
 14024,0,False,False,False,2,0,4,False,False,1,25,"Join us..."
 14025,0,False,False,False,2,0,4,False,False,1,25,"How thrilling! How chilling!"
-14026,0,False,False,False,2,0,4,False,False,1,25,"We'll frolic and play, until our dying day! ♪"
+14026,0,False,False,False,2,0,4,False,False,1,25,"We'll frolic and play, until our dying day!♪"
 14027,0,False,False,False,2,0,4,False,False,1,25,"Ahaha! Oh, what fun!"
 14028,0,False,False,False,3,0,4,False,False,1,25,"Could that have been─?"
 14029,0,False,False,False,3,0,4,False,False,1,25,"No, it couldn't have... Or <Emphasis>could</Emphasis> it?"
@@ -18600,7 +18600,7 @@ world its salvation!"
 16602,0,False,False,False,3,0,4,False,True,1,25,"<Split(<Highlight>ObjectParameter(1)</Highlight>, ,1)/>! Please... Please, wake up!"
 16603,0,False,False,False,3,0,4,False,True,1,25,"Nyipine, Father... I'm so sorry..."
 16604,0,False,False,False,3,0,4,False,False,1,25,"Ready, Pana? The road awaits!"
-16605,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn... Pfffbt! ♪"
+16605,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn... Pfffbt!♪"
 16606,0,False,False,False,3,0,4,False,False,1,25,"That's the spirit! They'll be inviting us to join a caravan any day now!"
 16607,0,False,False,False,3,0,4,False,False,1,25,"Thbbbpt!"
 16608,0,False,False,False,3,0,4,False,False,1,25,"Aaagh! What in the─!?"
@@ -18611,11 +18611,11 @@ world its salvation!"
 16613,0,False,False,False,3,0,4,False,False,1,25,"Wait, you've already defeated it!?"
 16614,0,False,False,False,3,0,4,False,False,1,25,"Incredible! Oh, thank the gods it didn't reach the village..."
 16615,0,False,False,False,3,0,4,False,False,1,25,"Our community is in your debt!"
-16616,0,False,False,False,3,0,4,False,False,1,25,"Patchoo! ♪"
+16616,0,False,False,False,3,0,4,False,False,1,25,"Patchoo!♪"
 16617,0,False,False,False,3,0,4,False,False,1,25,"We've made good progress. What say we rest here?"
 16618,0,False,False,False,3,0,4,False,False,1,25,"Fine by me. I'm sure our alpacas would appreciate a break."
 16619,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn..."
-16620,0,False,False,False,3,0,4,False,False,1,25,"Pfffbt. ♪"
+16620,0,False,False,False,3,0,4,False,False,1,25,"Pfffbt.♪"
 16621,0,False,False,False,3,0,4,False,False,1,25,"Hmm... Perhaps we overfilled our wagons this trip."
 16622,0,False,False,False,3,0,4,False,False,1,25,"Nonsense! Think of the profits we'll rake in when we get there!"
 16623,0,False,False,False,3,0,4,False,False,1,25,"Hrnnn... Hrrrmmm!"
@@ -18630,7 +18630,7 @@ world its salvation!"
 16632,0,False,False,False,3,0,4,False,False,1,25,"Now to get these supplies home!"
 16633,0,False,False,False,3,0,4,False,False,1,25,"Perhaps we'll see you around sometime."
 16634,0,False,False,False,3,0,4,False,False,1,25,"May fortune favor you, traveler!"
-16635,0,False,False,False,3,0,4,False,False,1,25,"Hum... ♪"
+16635,0,False,False,False,3,0,4,False,False,1,25,"Hum...♪"
 16636,0,False,False,False,3,0,4,False,False,1,25,"Thbbbpt!"
 16637,0,False,False,False,3,0,4,False,False,1,25,"No! The supplies!"
 16638,0,False,False,False,3,0,4,False,False,1,25,"Leave them! Our lives take precedence over profit!"
@@ -18686,25 +18686,26 @@ world its salvation!"
 16688,0,False,False,False,0,0,0,False,False,0,0,""
 16689,0,False,False,False,0,0,0,False,False,0,0,""
 16690,0,False,False,False,0,0,0,False,False,0,0,""
-16691,0,False,False,False,0,0,0,False,False,0,0,""
-16692,0,False,False,False,0,0,0,False,False,0,0,""
-16693,0,False,False,False,0,0,0,False,False,0,0,""
-16694,0,False,False,False,0,0,0,False,False,0,0,""
-16695,0,False,False,False,0,0,0,False,False,0,0,""
-16696,0,False,False,False,0,0,0,False,False,0,0,""
-16697,0,False,False,False,0,0,0,False,False,0,0,""
-16698,0,False,False,False,0,0,0,False,False,0,0,""
-16699,0,False,False,False,0,0,0,False,False,0,0,""
-16700,0,False,False,False,0,0,0,False,False,0,0,""
-16701,0,False,False,False,0,0,0,False,False,0,0,""
-16702,0,False,False,False,0,0,0,False,False,0,0,""
-16703,0,False,False,False,0,0,0,False,False,0,0,""
-16704,0,False,False,False,0,0,0,False,False,0,0,""
-16705,0,False,False,False,0,0,0,False,False,0,0,""
-16706,0,False,False,False,0,0,0,False,False,0,0,""
-16707,0,False,False,False,0,0,0,False,False,0,0,""
-16708,0,False,False,False,0,0,0,False,False,0,0,""
-16709,0,False,False,False,0,0,0,False,False,0,0,""
+16691,0,False,False,False,2,0,3,False,False,1,25,"Pfffbt!"
+16692,0,False,False,False,2,0,3,False,False,1,25,"Mrrrn...?"
+16693,0,False,False,False,2,0,3,False,False,1,25,"Hnnn... Hummm...!"
+16694,0,False,False,False,2,0,3,False,False,1,25,"Mrm, mrrrm!♪"
+16695,0,False,False,False,2,0,3,False,False,1,25,"Patchoo!"
+16696,0,False,False,False,2,0,3,False,False,1,25,"Mrnnngh!?"
+16697,0,False,False,False,2,0,3,False,False,1,25,"Hrnnn... Hrrrmmm!"
+16698,0,False,False,False,2,0,3,False,False,1,25,"Pfffthbbb!"
+16699,0,False,False,False,2,0,3,False,False,1,25,"Hrn-hrn-hrn-hrn, mrrr nrrr,
+hrm-hrm-hrmmm!"
+16700,0,False,False,False,2,0,3,False,False,1,25,"Thbbbpt!"
+16701,0,False,False,False,2,0,3,False,False,1,25,"0"
+16702,0,False,False,False,2,0,3,False,False,1,25,"0"
+16703,0,False,False,False,2,0,3,False,False,1,25,"0"
+16704,0,False,False,False,2,0,3,False,False,1,25,"0"
+16705,0,False,False,False,2,0,3,False,False,1,25,"Uolololo..."
+16706,0,False,False,False,2,0,3,False,False,1,25,"Grrrololo!"
+16707,0,False,False,False,2,0,3,False,False,1,25,"Lololoooh!"
+16708,0,False,False,False,2,0,3,False,False,1,25,"Uololo! Uolololo!"
+16709,0,False,False,False,2,0,3,False,False,1,25,"Loooh..."
 16710,0,False,False,False,3,0,4,False,False,1,25,"They say over a <Emphasis>thousand</Emphasis> people died here!"
 16711,0,False,False,False,3,0,4,False,False,1,25,"A thousand? Is that all?"
 16712,0,False,False,False,3,0,4,False,False,1,25,"Listen! D-d-did you hear that?"
@@ -18723,7 +18724,7 @@ world its salvation!"
 16725,0,False,False,False,3,0,3,False,False,1,25,"To protect my family, I shall bring my all to bear!"
 16726,0,False,False,False,3,0,4,False,False,1,25,"Ahhh... A dip in the hot springs is just what I needed."
 16727,0,False,False,False,3,0,4,False,False,1,25,"Soothing, isn't it? I feel so...toasty!"
-16728,0,False,False,False,3,0,4,False,False,1,25,"Pfffbt. ♪"
+16728,0,False,False,False,3,0,4,False,False,1,25,"Pfffbt.♪"
 16729,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn!"
 16730,0,False,False,False,3,0,4,False,False,1,25,"You know, this could be our final moment alive..."
 16731,0,False,False,False,3,0,4,False,False,1,25,"Oh, please. That old wives' tale doesn't scare me."
@@ -18756,7 +18757,7 @@ Whatever you need."
 16752,0,False,False,False,2,0,4,False,False,1,25,"The First Promise was born to sit the throne!"
 16753,0,False,False,False,2,0,4,False,False,1,25,"He will be a great Dawnservant!"
 16754,0,False,False,False,3,0,4,False,False,1,25,"Come along, Pana! It's time for a stroll!"
-16755,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn... Pfffbt! ♪"
+16755,0,False,False,False,3,0,4,False,False,1,25,"Mrrrn... Pfffbt!♪"
 16756,0,False,False,False,3,0,4,False,False,1,25,"Gotta keep our legs strong if we want to join a caravan!"
 16757,0,False,False,False,3,0,4,False,False,1,25,"Thbbbpt!"
 16758,0,False,False,False,3,0,4,False,False,1,25,"Aaagh! What in the─!?"
@@ -19312,7 +19313,7 @@ Rebooting geolocator..."
 17297,0,False,False,False,2,0,3,False,False,1,25,"Mew!"
 17298,0,False,False,False,2,0,3,False,False,1,25,"Zoooooom!"
 17299,0,False,False,False,2,0,3,False,False,1,25,"Ptui!"
-17300,0,False,False,False,0,0,0,False,False,0,0,""
+17300,0,False,False,False,2,0,3,False,False,1,25,"<slurp> <slurp>"
 17301,0,False,False,False,2,0,3,False,False,1,25,"Baaaaaa!"
 17302,0,False,False,False,2,0,3,False,False,1,25,"<lick> <lick>"
 17303,0,False,False,False,2,0,3,False,False,1,25,"Peep! Peep!"
@@ -19678,7 +19679,7 @@ We must needs keep in motion!"
 17648,0,False,False,False,3,0,4,False,False,1,25,"To think of how much pain each vessel represents..."
 17649,0,False,False,False,3,0,4,False,False,1,25,"Beneath the water..."
 17650,0,False,False,False,3,0,4,False,False,1,25,"Hah! You missed me!"
-17651,0,False,False,False,0,0,0,False,False,0,0,""
+17651,0,False,False,False,2,0,3,False,False,1,25,"<yawn>"
 17652,0,False,False,False,3,0,4,False,False,1,25,"I will just have to return another day and hope the swarm has moved on by then."
 17653,0,False,False,False,3,0,2,False,False,1,25,"I shall protect thee."
 17654,0,False,False,False,3,0,2,False,False,1,25,"Keep your guard up!"