Optimize dat. Fix bugs.

daidodo · Mar 8, 2020 · 88260c7 · 88260c7
1 parent 9846cb7
commit 88260c7
Show file tree

Hide file tree

Showing 10 changed files with 4,510 additions and 4,492 deletions.
diff --git a/.gitignore b/.gitignore
@@ -267,3 +267,5 @@ __pycache__/
 /Diablo Edit2/DlgPropertyList.cpp.bak
 /Diablo Edit2/DlgPrefixSuffix.h.bak
 /Diablo Edit2/DlgPrefixSuffix.cpp.bak
+/history
+/参考资料
diff --git a/Diablo Edit2/D2Item.cpp b/Diablo Edit2/D2Item.cpp
@@ -491,7 +491,7 @@ void CItemInfo::WriteData(COutBitsStream & bs, const CItemMetaData & itemData, B
 
 BOOL CItemInfo::IsNameValid() const {
 	for(char c : sTypeName)
-		if(c != ' ' && (c < 'a' || c > 'z'))
+		if(c != ' ' && !isalnum(c))
 			return FALSE;
 	return TRUE;
 }

diff --git a/Diablo Edit2/Diablo Edit2.cpp b/Diablo Edit2/Diablo Edit2.cpp
diff --git a/Diablo Edit2/Pictcures/Misc/Skeleton Flag.bmp b/Diablo Edit2/Pictcures/Misc/Skeleton Flag.bmp
diff --git a/Diablo Edit2/itemdata.dat b/Diablo Edit2/itemdata.dat
diff --git a/Diablo Edit2/language.dat b/Diablo Edit2/language.dat
diff --git a/Generate Data/Generate Data.vcxproj b/Generate Data/Generate Data.vcxproj
@@ -167,7 +167,7 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="itemdata.txt" />
-    <Text Include="lang.txt" />
+    <Text Include="language.txt" />
     <Text Include="property.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Generate Data/Generate Data.vcxproj.filters b/Generate Data/Generate Data.vcxproj.filters
@@ -43,7 +43,7 @@
     <Text Include="property.txt">
       <Filter>资源文件</Filter>
     </Text>
-    <Text Include="lang.txt">
+    <Text Include="language.txt">
       <Filter>资源文件</Filter>
     </Text>
   </ItemGroup>

diff --git a/Generate Data/itemdata.txt b/Generate Data/itemdata.txt
@@ -28,15 +28,20 @@ brz						1					1
 jaw						1					1								
 eyz						1					1								
 hrn						1					1								
+dhn	-1													1					
 tal						1					1								
-flg			12			1					1								
+flg						1					1								
+std	-1													1					
 fng						1					1								
 qll						1					1								
 sol						1					1								
 scz				4		1					1								
 spe						1					1								
 key										1									
 luv			12											1					
+pk1	-1		12											1					
+pk2	-1		12											1					
+pk3	-1		12											1					
 xyz														1					
 j34			12		1									1					
 g34			12		1									1					
@@ -46,8 +51,10 @@ tr1			22		1									1
 mss					1									1					
 ass			22		1									1					
 qey					1						1								
+bey	-1													1					
 qhr					1						1								
 qbr					1						1								
+mbr	-1													1					
 ear					1														
 gcv					1										1				
 gfv					1										1