diff options
| -rw-r--r-- | db/mob_pouch.txt | 4 | ||||
| -rw-r--r-- | db/pre-re/mob_boss.txt | 8 | ||||
| -rw-r--r-- | db/pre-re/mob_branch.txt | 58 | ||||
| -rw-r--r-- | db/pre-re/mob_poring.txt (renamed from db/mob_poring.txt) | 36 | ||||
| -rw-r--r-- | db/re/mob_boss.txt | 8 | ||||
| -rw-r--r-- | db/re/mob_branch.txt | 33 | ||||
| -rw-r--r-- | db/re/mob_poring.txt | 19 | ||||
| -rw-r--r-- | src/map/mob.c | 2 |
8 files changed, 121 insertions, 47 deletions
diff --git a/db/mob_pouch.txt b/db/mob_pouch.txt index 5a162666e..72c08b8ac 100644 --- a/db/mob_pouch.txt +++ b/db/mob_pouch.txt @@ -315,7 +315,7 @@ 1512,Yao Jun,71428 1513,Mao Guai,71428 1514,Zhu Po Long,71428 -1515,Garm Baby,71428 +1515,Baby Hatii,71428 1516,Mi Gao,71428 1517,Jing Guai,71428 1519,Green Maiden,71428 @@ -333,4 +333,4 @@ 1619,Porcellio,71428 1620,Noxious,71428 1621,Venomous,71428 -1622,Teddy Bear,71428 +1622,Teddy Bear,142857 diff --git a/db/pre-re/mob_boss.txt b/db/pre-re/mob_boss.txt index d15ab41a7..e1c82c6ec 100644 --- a/db/pre-re/mob_boss.txt +++ b/db/pre-re/mob_boss.txt @@ -20,7 +20,7 @@ 1159,Phreeoni,1000000 1190,Orc Lord,1000000 1251,Stormy Knight,1000000 -1252,Garm,1000000 +1252,Hatii,1000000 1272,Dark Lord,1000000 1312,Turtle General,1000000 1373,Lord of the Dead,1000000 @@ -42,9 +42,9 @@ 1751,Valkyrie Randgris,1000000 1768,Gloom Under Night,1000000 1779,Ktullanux,1000000 -1785,Atros,1000000 -1785,Atros,1000000 +1785,Atroce,1000000 1832,Ifrit,1000000 -1871,Fallen Bishop Hibram,1000000 +1871,Falling Bishop,1000000 1873,Beelzebub,1000000 1885,Gopinich,1000000 +2022,Nidhoggur's Shadow,1000000 diff --git a/db/pre-re/mob_branch.txt b/db/pre-re/mob_branch.txt index 2f015d18b..19fb9ac61 100644 --- a/db/pre-re/mob_branch.txt +++ b/db/pre-re/mob_branch.txt @@ -87,6 +87,7 @@ 1095,Andre,357142 1096,Angeling,71428 1097,Ant Egg,71428 +1098,Anubis,71428 1099,Argiope,71428 1100,Argos,214285 1101,Baphomet Jr.,71428 @@ -315,7 +316,7 @@ 1512,Yao Jun,71428 1513,Mao Guai,71428 1514,Zhu Po Long,71428 -1515,Garm Baby,71428 +1515,Baby Hatii,71428 1516,Mi Gao,71428 1517,Jing Guai,71428 1519,Green Maiden,71428 @@ -411,5 +412,58 @@ 1781,Drosera,71428 1782,Roween,71428 1783,Galion,71428 -1784,Stapo,71428 +1784,Stapo,142857 1789,Iceicle,71428 +1796,Aunoe,142857 +1797,Fanat,142857 +1829,Sword Guardian,71428 +1830,Bow Guardian,71428 +1831,Salamander,71428 +1833,Kasa,71428 +1836,Magmaring,214285 +1837,Imp,71428 +1838,Knocker,71428 +1839,Byrogue,71428 +1864,Zombie Slaughter,71428 +1865,Ragged Zombie,71428 +1866,Hellhound,71428 +1867,Banshee,71428 +1869,Flame Skull,71428 +1870,Necromancer,71428 +1872,Hell Fly,71428 +1880,Wood Goblin,71428 +1881,Les,71428 +1882,Baba-Yaga,71428 +1883,Uzhas,71428 +1884,Mavka,71428 +1918,Incarnation of Morroc,71428 +1919,Incarnation of Morroc,71428 +1920,Incarnation of Morroc,71428 +1921,Incarnation of Morroc,71428 +1974,Banshee Master,71428 +1975,Beholder Master,71428 +1976,Cobalt Mineral,71428 +1977,Heavy Metaling,71428 +1978,Hell Vesper,71428 +1979,Zakudam,71428 +1986,Tatacho,71428 +1987,Centipede,71428 +1988,Nepenthes,71428 +1989,Hillthrion,71428 +1990,Hardrock Mammoth,71428 +1991,Tendrillion,71428 +1992,Cornus,71428 +1993,Naga,71428 +1994,Luciola Vespa,71428 +1995,Pinguicula,71428 +1999,Centipede Larva,71428 +2013,Draco,71428 +2015,Dark Pinguicula,71428 +2016,Aqua Elemental,71428 +2017,Rata,71428 +2018,Duneyrr,71428 +2019,Ancient Tree,71428 +2020,Rhyncho,71428 +2021,Phylla,71428 +2023,Dark Shadow,71428 +2024,Bradium Golem,71428 diff --git a/db/mob_poring.txt b/db/pre-re/mob_poring.txt index dea04cc42..dee3d8938 100644 --- a/db/mob_poring.txt +++ b/db/pre-re/mob_poring.txt @@ -1,18 +1,18 @@ -// Poring Box Summonable Monsters Database -// -// Structure of Database: -// MobID,DummyName,Rate - -0,Poring,1002 -1002,Poring,1000000 -1031,Poporing,1000000 -1062,Santa Poring,200000 -1090,Mastering,400000 -1096,Angeling,200000 -1113,Drops,1000000 -1120,Ghostring,200000 -1242,Marin,1000000 -1388,Arc Angeling,200000 -1582,Deviling,200000 -1613,Metaling,1000000 -1784,Stapo,800000 +// Poring Box Summonable Monsters Database
+//
+// Structure of Database:
+// MobID,DummyName,Rate
+
+0,Poring,1002
+1002,Poring,1000000
+1031,Poporing,1000000
+1062,Santa Poring,200000
+1090,Mastering,400000
+1096,Angeling,200000
+1113,Drops,1000000
+1120,Ghostring,200000
+1242,Marin,1000000
+1388,Arc Angeling,200000
+1582,Deviling,200000
+1613,Metaling,1000000
+1784,Stapo,1000000
diff --git a/db/re/mob_boss.txt b/db/re/mob_boss.txt index a27523a34..6a1260c6e 100644 --- a/db/re/mob_boss.txt +++ b/db/re/mob_boss.txt @@ -20,7 +20,7 @@ 1159,Phreeoni,1000000 1190,Orc Lord,1000000 1251,Stormy Knight,1000000 -1252,Garm,1000000 +1252,Hatii,1000000 1272,Dark Lord,1000000 1312,Turtle General,1000000 1373,Lord of the Dead,1000000 @@ -42,11 +42,11 @@ 1751,Valkyrie Randgris,1000000 1768,Gloom Under Night,1000000 1779,Ktullanux,1000000 -1785,Atros,1000000 +1785,Atroce,1000000 1832,Ifrit,1000000 -1871,Fallen Bishop Hibram,1000000 +1871,Falling Bishop,1000000 1873,Beelzebub,1000000 1885,Gopinich,1000000 2022,Nidhoggur's Shadow,1000000 2068,Boitata,1000000 -2087,Queen Scaraba,1000000 +2087,Scaraba Queen,1000000 diff --git a/db/re/mob_branch.txt b/db/re/mob_branch.txt index afcee77b0..bd119a782 100644 --- a/db/re/mob_branch.txt +++ b/db/re/mob_branch.txt @@ -316,7 +316,7 @@ 1512,Yao Jun,71428 1513,Mao Guai,71428 1514,Zhu Po Long,71428 -1515,Garm Baby,71428 +1515,Baby Hatii,71428 1516,Mi Gao,71428 1517,Jing Guai,71428 1519,Green Maiden,71428 @@ -412,28 +412,28 @@ 1781,Drosera,71428 1782,Roween,71428 1783,Galion,71428 -1784,Stapo,142856 +1784,Stapo,142857 1789,Iceicle,71428 -1796,Aunoe,71428 -1797,Fanat,71428 +1796,Aunoe,142857 +1797,Fanat,142857 1829,Sword Guardian,71428 1830,Bow Guardian,71428 1831,Salamander,71428 1833,Kasa,71428 1836,Magmaring,214285 -1837,Fire Imp,71428 +1837,Imp,71428 1838,Knocker,71428 -1839,Byorgue,71428 +1839,Byrogue,71428 1864,Zombie Slaughter,71428 1865,Ragged Zombie,71428 -1866,Hell Poodle,71428 +1866,Hellhound,71428 1867,Banshee,71428 1869,Flame Skull,71428 1870,Necromancer,71428 1872,Hell Fly,71428 1880,Wood Goblin,71428 1881,Les,71428 -1882,Baba Yaga,71428 +1882,Baba-Yaga,71428 1883,Uzhas,71428 1884,Mavka,71428 1918,Incarnation of Morroc,71428 @@ -444,14 +444,14 @@ 1975,Beholder Master,71428 1976,Cobalt Mineral,71428 1977,Heavy Metaling,71428 -1978,Hell Apocalypse,71428 -1979,Zukadam,71428 +1978,Hell Vesper,71428 +1979,Zakudam,71428 1986,Tatacho,71428 1987,Centipede,71428 1988,Nepenthes,71428 -1989,Hills Lion,71428 +1989,Hillthrion,71428 1990,Hardrock Mammoth,71428 -1991,Tendril Lion,71428 +1991,Tendrillion,71428 1992,Cornus,71428 1993,Naga,71428 1994,Luciola Vespa,71428 @@ -473,12 +473,13 @@ 2072,Jaguar,71428 2073,Toucan,71428 2074,Curupira,71428 -2083,One-Horn Scaraba,71428 -2084,Two-Horn Scaraba,71428 +2083,One-Horned Scaraba,71428 +2084,Two-Horned Scaraba,71428 2085,Antler Scaraba,71428 2086,Rake Scaraba,71428 -2088,One-Horn Scaraba Egg,71428 -2089,Two-Horn Scaraba Egg,71428 +2088,Scaraba Egg,71428 +2089,Scaraba Egg,71428 2090,Antler Scaraba Egg,71428 2091,Rake Scaraba Egg,71428 2092,Dolomedes,71428 +2093,Botaring,142857 diff --git a/db/re/mob_poring.txt b/db/re/mob_poring.txt new file mode 100644 index 000000000..ab268f3bb --- /dev/null +++ b/db/re/mob_poring.txt @@ -0,0 +1,19 @@ +// Poring Box Summonable Monsters Database
+//
+// Structure of Database:
+// MobID,DummyName,Rate
+
+0,Poring,1002
+1002,Poring,1000000
+1031,Poporing,1000000
+1062,Santa Poring,200000
+1090,Mastering,400000
+1096,Angeling,200000
+1113,Drops,1000000
+1120,Ghostring,200000
+1242,Marin,1000000
+1388,Arc Angeling,200000
+1582,Deviling,200000
+1613,Metaling,1000000
+1784,Stapo,1000000
+2093,Botaring,400000
diff --git a/src/map/mob.c b/src/map/mob.c index 1a8f72a6f..1dacdd5ab 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3981,7 +3981,7 @@ static int mob_read_randommonster(void) int i,j; const char* mobfile[] = { DBPATH"mob_branch.txt", - "mob_poring.txt", + DBPATH"mob_poring.txt", DBPATH"mob_boss.txt", "mob_pouch.txt", "mob_classchange.txt"}; |