Skip to content

Commit

Permalink
- Fixed bugreport:9146, wrong message for msg 380. Thank Napster
Browse files Browse the repository at this point in the history
- Changed Monster, Mercenary, & Elemental defense element check, from %10 to %20, to support 10 custom elements. Thank @Atemo
- Updated some arrays in ACMD_FUNC(mobinfo)
- Removed element number limit for each level in db/[pre-]re/attr_fix.txt
- Allowing 'getitembound' and 'getitembound2' to put bound type 0 (no bound) for scripting easier
- Updated doc/mob_db.txt, follow up ca4a0ea
- Updated map_msg_idn.conf

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
  • Loading branch information
cydh committed Jul 19, 2014
1 parent ca4a0ea commit 2bfe1d6
Show file tree
Hide file tree
Showing 15 changed files with 238 additions and 191 deletions.
2 changes: 1 addition & 1 deletion conf/msg_conf/map_msg.conf
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
//etc
378: Eleanor is now in %s mode.
379: Item Failed. [%s] is cooling down. Wait %.1f minutes.
380: Item Failed. [%s] is cooling down. Wait %.1f seconds.
380: Item Failed. [%s] is cooling down. Wait %d seconds.
381: Skill Failed. [%s] requires %dx %s.
382: You're too close to a stone or emperium to use this skill.
383: You cannot create a savepoint in an instance.
Expand Down
60 changes: 39 additions & 21 deletions conf/msg_conf/map_msg_idn.conf
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,9 @@
377: -- Pemain %s telah menolak permintaan duel --
//lain-lain
378: Eleanor sekarang dalam mode %s.
379: Dapat digunakan setelah %.1f menit.
380: Dapat digunakan setelah %d detik.
381: Penggunaan skill gagal. [%s] membutuhkan %dx %s.
379: Penggunaan item [%s] gagal. Dapat digunakan setelah %1.f menit.
380: Penggunaan item [%s] gagal. Dapat digunakan setelah %d detik.
381: Penggunaan skill [%s] gagal. Membutuhkan %dx %s.
382: Kamu terlalu dekat dengan batu atau emperium untuk menggunakan skill ini.
383: Kamu tidak dapat membuat save point di instance
384: Kamu tidak dapat membuat memo di instance
Expand Down Expand Up @@ -519,7 +519,25 @@
// @auction
517: Sistem Auction tidak tersedia.

//518~534: kosong
// @itemlist -- continued
518: Lower Costume Head,
519: Top Costume Head,
520: Top/Lower Costume Head,
521: Mid Costume Head,
522: Mid/Lower Costume Head,
523: Top/Mid/Lower Costume Head,
524: Costume Robe,
525: Costume Floor,
526: Ammo,
527: Shadow Body,
528: Shadow Right Hand,
529: Shadow Left Hand,
530: Shadow Both Hands,
531: Shadow Shoes,
532: Shadow Right Accessory,
533: Shadow Left Accessory,

//534: kosong

// Pesan yang berhubungan dengan deteksi Bot (Saat ini belum diimplementasikan)
535: Kemungkinan BOT (99%%) atau client yang digunakan sudah dimodifikasi '%s' (akun: %d, char_id: %d). Pemain ini bisa melihat nama kamu saat kamu sedang tidak terlihat.
Expand Down Expand Up @@ -1373,25 +1391,25 @@

// @itemlist
1332: ------ %s daftar item dari '%s' ------
1333: | dipakai:
1334: jubah,
1335: aksesori kiri,
1336: badan/armor,
1337: tangan kanan,
1338: tangan kiri,
1339: kedua tangan,
1340: kaki,
1341: aksesori kanan,
1342: kepala bagian bawah,
1343: kepala bagian atas,
1344: kepala bagian bawah/atas,
1345: kepala bagian tengah,
1346: kepala bagian bawah/tengah,
1347: kepala bagian bawah/tengah/atas,
1333: | Dipakai:
1334: Jubah,
1335: Aksesori kiri,
1336: Badan/armor,
1337: Tangan kanan,
1338: Tangan kiri,
1339: Kedua tangan,
1340: Kaki,
1341: Aksesori kanan,
1342: Kepala bagian bawah,
1343: Kepala bagian atas,
1344: Kepala bagian bawah/atas,
1345: Kepala bagian tengah,
1346: Kepala bagian bawah/tengah,
1347: Kepala bagian bawah/tengah/atas,
1348: -> (telur peliharaan, id peliharaan: %u, sudah diberi nama)
1349: -> (telur peliharaan, id peliharaan: %u, belum diberi nama)
1350: -> (item dibuat, id pembuat: %u, %d star crumb, elemen %d)
1351: -> (memproduksi item, id pembuat: %u)
1350: -> (item buatan, id pembuat: %u, %d star crumb, elemen %d)
1351: -> (item produksi, id pembuat: %u)
1352: -> (kartu:
1353: Tidak ada item yang ditemukan di %s pemain.
1354: %d item ditemukan di slot %d %s.
Expand Down
1 change: 1 addition & 0 deletions db/const.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4618,6 +4618,7 @@ IT_AMMO 10
IT_DELAYCONSUME 11
IT_CASH 18

Bound_None 0
Bound_Account 1
Bound_Guild 2
Bound_Party 3
Expand Down
8 changes: 4 additions & 4 deletions db/pre-re/attr_fix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Columns - attacker's weapon element
// Rows - target's defense element

1,10 // lv1 Attribute table
1 // lv1 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 25, 100, // Neutral
100, 25, 100, 150, 50, 100, 75, 100, 100, 100, // Water
Expand All @@ -17,7 +17,7 @@
25, 100, 100, 100, 100, 100, 75, 75, 125, 100, // Ghost
100, 100, 100, 100, 100, 50, 100, 0, 100, 0, // Undead

2,10 // lv2 Attribute table
2 // lv2 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 25, 100, // Neutral
100, 0, 100, 175, 25, 100, 50, 75, 100, 100, // Water
Expand All @@ -30,7 +30,7 @@
0, 75, 75, 75, 75, 75, 50, 50, 150, 125, // Ghost
100, 75, 75, 75, 75, 25, 125, 0, 100, 0, // Undead

3,10 // lv3 Attribute table
3 // lv3 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // Neutral
100, -25, 100, 200, 0, 100, 25, 50, 100, 125, // Water
Expand All @@ -43,7 +43,7 @@
0, 50, 50, 50, 50, 50, 25, 25, 175, 150, // Ghost
100, 50, 50, 50, 50, 0, 150, 0, 100, 0, // Undead

4,10 // lv4 Attribute table
4 // lv4 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // Neutral
100, -50, 100, 200, 0, 75, 0, 25, 100, 150, // Water
Expand Down
8 changes: 4 additions & 4 deletions db/re/attr_fix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Columns - attacker's weapon element
// Rows - target's defense element

1,10 // lv1 Attribute table
1 // lv1 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 70, 100, // Neutral
100, 25, 100, 150, 90, 100, 75, 100, 100, 100, // Water
Expand All @@ -17,7 +17,7 @@
70, 100, 100, 100, 100, 100, 75, 75, 125, 100, // Ghost
100, 100, 100, 100, 100, 50, 100, 0, 100, 0, // Undead

2,10 // lv2 Attribute table
2 // lv2 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 50, 100, // Neutral
100, 0, 100, 175, 80, 100, 50, 75, 100, 100, // Water
Expand All @@ -30,7 +30,7 @@
50, 75, 75, 75, 75, 75, 50, 50, 150, 125, // Ghost
100, 75, 75, 75, 75, 25, 125, 0, 100, 0, // Undead

3,10 // lv3 Attribute table
3 // lv3 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // Neutral
100, -25, 100, 200, 70, 100, 25, 50, 100, 125, // Water
Expand All @@ -43,7 +43,7 @@
0, 50, 50, 50, 50, 50, 25, 25, 175, 150, // Ghost
100, 50, 50, 50, 50, 0, 150, 0, 100, 0, // Undead

4,10 // lv4 Attribute table
4 // lv4 Attribute table
//Neut Watr Erth Fire Wind Pois Holy Shdw Gho Und
100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // Neutral
100, -50, 100, 200, 60, 75, 0, 25, 100, 150, // Water
Expand Down
Loading

0 comments on commit 2bfe1d6

Please sign in to comment.