From a08660ca24cc18778ad929eb5a79453ba37d232e Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 11 Jul 2012 14:16:02 -0700 Subject: Add a tmx-to-wlk converter that handles CSV (in Python), and run it. Some of the _mobs files changed due to bugs in the maps, which I fixed. Remove the old Java version. --- world/map/npc/003-1/_mobs.txt | 6 ++++++ world/map/npc/006-3/_mobs.txt | 4 +++- world/map/npc/013-3/_mobs.txt | 31 +++++++++++++------------------ world/map/npc/017-1/_mobs.txt | 23 ++++++++++------------- world/map/npc/025-3/_mobs.txt | 2 +- world/map/npc/025-4/_mobs.txt | 4 ++-- world/map/npc/028-3/_mobs.txt | 2 +- world/map/npc/046-1/_mobs.txt | 6 +++--- world/map/npc/047-1/_mobs.txt | 6 +++--- world/map/npc/048-1/_mobs.txt | 6 +++--- 10 files changed, 45 insertions(+), 45 deletions(-) (limited to 'world/map') diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt index 62e1391e..0120bde8 100644 --- a/world/map/npc/003-1/_mobs.txt +++ b/world/map/npc/003-1/_mobs.txt @@ -1,6 +1,7 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Beach mobs +003-1.gat,158,68,28,96|monster|Giant Maggot|1006,10,100000,30000,Mob003-1::On1006 003-1.gat,0,0,0,0|monster|Sea Slime|1033,15,100000,30000,Mob003-1::On1033 003-1.gat,120,31,22,22|monster|Sea Slime|1033,5,100000,30000,Mob003-1::On1033 003-1.gat,119,68,105,101|monster|Green Slime|1005,35,100000,30000,Mob003-1::On1005 @@ -19,6 +20,11 @@ On1005: callfunc "MobPoints"; end; +On1006: + set @mobID, 1006; + callfunc "MobPoints"; + end; + On1026: set @mobID, 1026; callfunc "MobPoints"; diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt index 46fdfd33..30b5427e 100644 --- a/world/map/npc/006-3/_mobs.txt +++ b/world/map/npc/006-3/_mobs.txt @@ -7,15 +7,17 @@ 006-3.gat,86,90,29,9|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026 006-3.gat,109,78,12,9|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026 006-3.gat,119,117,15,14|monster|Mountain Snake|1026,4,15000,90000,Mob006-3::On1026 +006-3.gat,106,64,14,17|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026 006-3.gat,65,71,31,35|monster|Mountain Snake|1026,10,15000,90000,Mob006-3::On1026 006-3.gat,57,105,27,30|monster|Mountain Snake|1026,8,15000,90000,Mob006-3::On1026 006-3.gat,73,120,16,5|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026 006-3.gat,117,54,11,9|monster|Mountain Snake|1026,4,15000,90000,Mob006-3::On1026 006-3.gat,123,62,10,5|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026 +006-3.gat,72,36,24,25|monster|Mountain Snake|1026,10,15000,90000,Mob006-3::On1026 006-3.gat,84,27,5,7|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026 006-3.gat,40,40,36,28|monster|Mountain Snake|1026,8,15000,90000,Mob006-3::On1026 006-3.gat,34,60,27,11|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026 -006-3.gat,87,74,26,9|monster|Red Slime|1008,1,15000,10000,Mob006-3::On1008 +006-3.gat,87,74,26,9|monster|Red Slime|1008,3,15000,10000,Mob006-3::On1008 006-3.gat,120,76,9,21|monster|Red Slime|1008,3,15000,10000,Mob006-3::On1008 006-3.gat,101,85,14,8|monster|Red Slimes|1008,4,15000,10000,Mob006-3::On1008 006-3.gat,44,124,29,7|monster|Mountain Snake|1026,5,15000,90000,Mob006-3::On1026 diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt index 8132bd96..830da7bb 100644 --- a/world/map/npc/013-3/_mobs.txt +++ b/world/map/npc/013-3/_mobs.txt @@ -29,12 +29,12 @@ 013-3.gat,80,33,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023 013-3.gat,75,46,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024 013-3.gat,67,46,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023 -013-3.gat,149,145,7,26|monster|Silkworm|2037,10,20000,5000,Mob013-3::On2037 -013-3.gat,117,157,6,14|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023 -013-3.gat,150,129,17,4|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023 -013-3.gat,162,138,5,5|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023 -013-3.gat,138,174,15,8|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023 -013-3.gat,146,151,62,54|monster|Bat|2019,20,15000,5000,Mob013-3::On2019 +013-3.gat,149,145,7,26|monster|Silkworm|1035,10,20000,5000,Mob013-3::On1035 +013-3.gat,117,157,6,14|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021 +013-3.gat,150,129,17,4|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021 +013-3.gat,162,138,5,5|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021 +013-3.gat,138,174,15,8|monster|Cave Snake|1021,3,30000,10000,Mob013-3::On1021 +013-3.gat,146,151,62,54|monster|Bat|1017,20,15000,5000,Mob013-3::On1017 013-3.gat,0,0,0|script|Mob013-3|-1,{ @@ -68,6 +68,11 @@ On1012: callfunc "MobPoints"; end; +On1017: + set @mobID, 1017; + callfunc "MobPoints"; + end; + On1021: set @mobID, 1021; callfunc "MobPoints"; @@ -83,18 +88,8 @@ On1024: callfunc "MobPoints"; end; -On2019: - set @mobID, 2019; - callfunc "MobPoints"; - end; - -On2023: - set @mobID, 2023; - callfunc "MobPoints"; - end; - -On2037: - set @mobID, 2037; +On1035: + set @mobID, 1035; callfunc "MobPoints"; end; diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt index af722b24..36eeaaf4 100644 --- a/world/map/npc/017-1/_mobs.txt +++ b/world/map/npc/017-1/_mobs.txt @@ -2,9 +2,11 @@ // Woodland Hills mobs 017-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob017-1::On1037 -017-1.gat,29,29,19,12|monster|Gamboge Herb|2033,1,0,25000,Mob017-1::On2033 -017-1.gat,91,25,76,8|monster|Log Head|2027,3,5000,60000,Mob017-1::On2027 -017-1.gat,31,48,19,12|monster|Log Head|2027,3,5000,60000,Mob017-1::On2027 +017-1.gat,99,30,2,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037 +017-1.gat,98,30,3,1|monster|Clover Patch|1037,1,0,15000,Mob017-1::On1037 +017-1.gat,29,29,19,12|monster|Gamboge Herb|1031,1,0,25000,Mob017-1::On1031 +017-1.gat,91,25,76,8|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025 +017-1.gat,31,48,19,12|monster|Log Head|1025,3,5000,60000,Mob017-1::On1025 017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob017-1::On1055 017-1.gat,0,0,0,0|monster|Bat|1017,5,0,0,Mob017-1::On1017 017-1.gat,0,0,0,0|monster|Fire Goblin|1011,5,0,0,Mob017-1::On1011 @@ -46,6 +48,11 @@ On1019: callfunc "MobPoints"; end; +On1025: + set @mobID, 1025; + callfunc "MobPoints"; + end; + On1028: set @mobID, 1028; callfunc "MobPoints"; @@ -91,15 +98,5 @@ On1055: callfunc "MobPoints"; end; -On2027: - set @mobID, 2027; - callfunc "MobPoints"; - end; - -On2033: - set @mobID, 2033; - callfunc "MobPoints"; - end; - end; } diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt index 36e60dba..82ee3e08 100644 --- a/world/map/npc/025-3/_mobs.txt +++ b/world/map/npc/025-3/_mobs.txt @@ -3,7 +3,7 @@ 025-3.gat,0,0,0,0|monster|Cave Maggot|1056,100,0,100,Mob025-3::On1056 025-3.gat,0,0,0,0|monster|Archant|1060,20,0,100,Mob025-3::On1060 -025-3.gat,0,0,0,0|monster|Angry Scorpion|1057,25,0,0,Mob025-3::On1057 +025-3.gat,0,0,0,0|monster|Angry Scorpion|1057,25,0,100,Mob025-3::On1057 025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0,30000,Mob025-3::On1043 diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt index 7f18439c..fcf82719 100644 --- a/world/map/npc/025-4/_mobs.txt +++ b/world/map/npc/025-4/_mobs.txt @@ -1,8 +1,8 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Rossy Battle Caves mobs -025-4.gat,29,31,20,14|monster|Cave Maggot|1056,3,0,0,Mob025-4::On1056 -025-4.gat,94,24,20,21|monster|Cave Maggot|1056,5,0,0,Mob025-4::On1056 +025-4.gat,29,31,20,14|monster|Cave Maggot|1056,3,0,100,Mob025-4::On1056 +025-4.gat,94,24,20,21|monster|Cave Maggot|1056,5,0,100,Mob025-4::On1056 025-4.gat,0,0,0|script|Mob025-4|-1,{ diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt index 2816948d..5556ef9d 100644 --- a/world/map/npc/028-3/_mobs.txt +++ b/world/map/npc/028-3/_mobs.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Easter Island Cave mobs -028-3.gat,51,49,22,15|monster|Silkworm|1035,10,0,3000,Mob028-3::On1035 +028-3.gat,51,49,22,15|monster|Silkworm|1035,10,30000,3000,Mob028-3::On1035 028-3.gat,43,35,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013 028-3.gat,27,31,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013 028-3.gat,50,49,61,60|monster|Bat|1017,10,60000,10000,Mob028-3::On1017 diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt index 205ac676..4cc8d70d 100644 --- a/world/map/npc/046-1/_mobs.txt +++ b/world/map/npc/046-1/_mobs.txt @@ -1,9 +1,9 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Rock Plateau mobs -046-1.gat,0,0,0,0|monster|Reinboo|1094,40,0,0,Mob046-1::On1094 -046-1.gat,0,0,0,0|monster|Fluffy|1020,50,0,0,Mob046-1::On1020 -046-1.gat,0,0,0,0|monster|Squirrel|1038,50,0,0,Mob046-1::On1038 +046-1.gat,0,0,0,0|monster|Reinboo|1094,40,100000,30000,Mob046-1::On1094 +046-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob046-1::On1020 +046-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000,30000,Mob046-1::On1038 046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000,30000,Mob046-1::On1061 046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000,30000,Mob046-1::On1072 046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000,30000,Mob046-1::On1090 diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt index 2b7a9c3e..d3caf06f 100644 --- a/world/map/npc/047-1/_mobs.txt +++ b/world/map/npc/047-1/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Highlands mobs -047-1.gat,0,0,0,0|monster|Reinboo|1094,20,0,0,Mob047-1::On1094 -047-1.gat,0,0,0,0|monster|Fluffy|1020,25,0,0,Mob047-1::On1020 +047-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob047-1::On1094 +047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob047-1::On1020 047-1.gat,0,0,0,0|monster|White Bell|1095,4,100000,30000,Mob047-1::On1095 -047-1.gat,0,0,0,0|monster|Squirrel|1038,25,0,0,Mob047-1::On1038 +047-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob047-1::On1038 047-1.gat,19,57,1,1|monster|Yeti|1072,1,100000,30000,Mob047-1::On1072 047-1.gat,106,26,23,13|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 047-1.gat,30,79,22,27|monster|Wolvern|1090,4,100000,30000,Mob047-1::On1090 diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt index b8e5e3bd..94c84611 100644 --- a/world/map/npc/048-1/_mobs.txt +++ b/world/map/npc/048-1/_mobs.txt @@ -1,9 +1,9 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Snow Forest mobs -048-1.gat,0,0,0,0|monster|Reinboo|1094,20,0,0,Mob048-1::On1094 -048-1.gat,0,0,0,0|monster|Fluffy|1020,25,0,0,Mob048-1::On1020 -048-1.gat,0,0,0,0|monster|Squirrel|1038,25,0,0,Mob048-1::On1038 +048-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000,30000,Mob048-1::On1094 +048-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000,30000,Mob048-1::On1020 +048-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000,30000,Mob048-1::On1038 048-1.gat,0,0,0,0|monster|White Bell|1095,5,100000,30000,Mob048-1::On1095 048-1.gat,68,40,2,2|monster|White Slime|1093,4,100000,30000,Mob048-1::On1093 048-1.gat,72,61,4,5|monster|Blue Slime|1091,2,100000,30000,Mob048-1::On1091 -- cgit v1.2.3-60-g2f50