Explorar o código

Follow up 9b87ca2b7cd826b42d9a1753da055e2c9e7adf33, added mob_random_db.txt in db/import-tmpl

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
Cydh Ramdh %!s(int64=10) %!d(string=hai) anos
pai
achega
d8da4dd2dc

+ 1 - 0
db/import-tmpl/mob_random_db.txt

@@ -0,0 +1 @@
+//import: db/import/mob_random_group.txt

+ 1 - 1
src/map/mob.c

@@ -4163,7 +4163,7 @@ static int mob_read_randommonster_sub(const char* filename, bool silent) {
 	}
 
 	fclose(fp);
-	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s/%s"CL_RESET"'.\n", entries, db_path, filename);
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", entries, filename);
 	return 0;
 }
 

+ 1 - 5
vcproj-10/map-server.vcxproj

@@ -330,15 +330,11 @@
     <Copy SourceFiles="..\db\import-tmpl\mercenary_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mercenary_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_avail.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_avail.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_boss.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_boss.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_branch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_branch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_chat_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_chat_db.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_classchange.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_classchange.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_item_ratio.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_item_ratio.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_poring.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_poring.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_pouch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_pouch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_race2_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_race2_db.txt')" />
+    <Copy SourceFiles="..\db\import-tmpl\mob_random_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_random_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\packet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\packet_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\pet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\pet_db.txt')" />

+ 1 - 5
vcproj-12/map-server.vcxproj

@@ -334,15 +334,11 @@
     <Copy SourceFiles="..\db\import-tmpl\mercenary_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mercenary_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_avail.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_avail.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_boss.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_boss.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_branch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_branch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_chat_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_chat_db.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_classchange.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_classchange.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_item_ratio.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_item_ratio.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_poring.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_poring.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_pouch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_pouch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_race2_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_race2_db.txt')" />
+    <Copy SourceFiles="..\db\import-tmpl\mob_random_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_random_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\packet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\packet_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\pet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\pet_db.txt')" />

+ 1 - 5
vcproj-13/map-server.vcxproj

@@ -334,15 +334,11 @@
     <Copy SourceFiles="..\db\import-tmpl\mercenary_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mercenary_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mercenary_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_avail.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_avail.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_boss.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_boss.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_branch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_branch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_chat_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_chat_db.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_classchange.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_classchange.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_item_ratio.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_item_ratio.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_poring.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_poring.txt')" />
-    <Copy SourceFiles="..\db\import-tmpl\mob_pouch.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_pouch.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_race2_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_race2_db.txt')" />
+    <Copy SourceFiles="..\db\import-tmpl\mob_random_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_random_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\mob_skill_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\mob_skill_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\packet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\packet_db.txt')" />
     <Copy SourceFiles="..\db\import-tmpl\pet_db.txt" DestinationFolder="..\db\import\" ContinueOnError="true" Condition="!Exists('..\db\import\pet_db.txt')" />