summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/pre-re/item_db.conf2
-rw-r--r--db/pre-re/skill_require_db.txt2
-rw-r--r--db/pre-re/skill_unit_db.txt2
-rw-r--r--db/re/item_db.conf2
-rw-r--r--db/re/skill_require_db.txt2
-rw-r--r--db/re/skill_unit_db.txt2
-rw-r--r--doc/constants.md2
-rw-r--r--doc/item_db.txt2
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/map/mob.c4
-rw-r--r--src/map/script.c6
11 files changed, 17 insertions, 11 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 5546d35cf..375a08e13 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -70,7 +70,7 @@ item_db: (
Taekwon: true/false (boolean, defaults to false)
Star_Gladiator: true/false (boolean, defaults to false)
Soul_Linker: true/false (boolean, defaults to false)
- Gungslinger: true/false (boolean, defaults to false)
+ Gunslinger: true/false (boolean, defaults to false)
Ninja: true/false (boolean, defaults to false)
Gangsi: true/false (boolean, defaults to false)
Death_Knight: true/false (boolean, defaults to false)
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index 87c11bc48..067298f14 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -637,7 +637,7 @@
2280,20:40:60:80:100,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
-2283,0,0,15,0,0,0,99,0,0,none,0,6186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
+2283,0,0,15,0,0,0,99,0,0,none,0,6186,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
//****
// SC Shadow Chaser
diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt
index 406152b27..8f3b2d8ef 100644
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -157,7 +157,7 @@
3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU
3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE
3009,0x86, , 0, 3, 100,enemy, 0x018 //KO_HUUMARANKA
-3020,0xf8, , 0, 3, 100,all, 0x018 //KO_ZENKAI
+3020,0xf8, , 0, 3, 500,all, 0x018 //KO_ZENKAI
3010,0xfc, , 0, 0,5000,enemy, 0x018 //KO_MAKIBISHI
5006,0x101, , 0, 3,2000,enemy, 0x018 //NC_MAGMA_ERUPTION
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 9b7ad19c4..f0ad7e42b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -70,7 +70,7 @@ item_db: (
Taekwon: true/false (boolean, defaults to false)
Star_Gladiator: true/false (boolean, defaults to false)
Soul_Linker: true/false (boolean, defaults to false)
- Gungslinger: true/false (boolean, defaults to false)
+ Gunslinger: true/false (boolean, defaults to false)
Ninja: true/false (boolean, defaults to false)
Gangsi: true/false (boolean, defaults to false)
Death_Knight: true/false (boolean, defaults to false)
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index a2e763dc2..56ac107f6 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -641,7 +641,7 @@
2280,20:40:60:80:100,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
-2283,0,0,15,0,0,0,99,0,0,none,0,6186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
+2283,0,0,15,0,0,0,99,0,0,none,0,6186,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
//****
// SC Shadow Chaser
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index ba9b3841a..c9a8ce4e5 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -160,7 +160,7 @@
3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU
3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE
3009,0x86, , 0, 3, 100,enemy, 0x018 //KO_HUUMARANKA
-3020,0xf8, , 0, 3, 100,all, 0x018 //KO_ZENKAI
+3020,0xf8, , 0, 3, 500,all, 0x018 //KO_ZENKAI
3010,0xfc, , 0, 0,5000,enemy, 0x018 //KO_MAKIBISHI
5006,0x101, , 0, 3,2000,enemy, 0x018 //NC_MAGMA_ERUPTION
diff --git a/doc/constants.md b/doc/constants.md
index 138808dfe..65e26502d 100644
--- a/doc/constants.md
+++ b/doc/constants.md
@@ -3651,7 +3651,7 @@
- `MAX_GUILD_STORAGE`: 600
- `MAX_CART`: 100
- `MAX_INVENTORY`: 100
-- `MAX_ZENY`: 1000000000
+- `MAX_ZENY`: 2147483647
- `MAX_BG_MEMBERS`: 30
- `MAX_CHAT_USERS`: 20
- `MAX_REFINE`: 20
diff --git a/doc/item_db.txt b/doc/item_db.txt
index 3a31bb77c..7e637c3c8 100644
--- a/doc/item_db.txt
+++ b/doc/item_db.txt
@@ -45,7 +45,7 @@ item_db: (
Rogue: true/false (boolean, defaults to false)
Alchemist: true/false (boolean, defaults to false)
Bard: true/false (boolean, defaults to false)
- Gungslinger: true/false (boolean, defaults to false)
+ Gunslinger: true/false (boolean, defaults to false)
Ninja: true/false (boolean, defaults to false)
Taekwon: true/false (boolean, defaults to false)
Star_Gladiator: true/false (boolean, defaults to false)
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 0abae6092..7df52e450 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -120,7 +120,7 @@
#define MAX_SLOTS 4
//Max amount of a single stacked item
#define MAX_AMOUNT 30000
-#define MAX_ZENY 1000000000
+#define MAX_ZENY INT_MAX
//Official Limit: 2.1b ( the var that stores the money doesn't go much higher than this by default )
#define MAX_BANK_ZENY INT_MAX
diff --git a/src/map/mob.c b/src/map/mob.c
index 8d38fead7..53ad87912 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2402,7 +2402,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
* so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it,
* thus why we're unsure on how to best place the setting) */
/* temp, will not be hardcoded for long thudu. */
- if (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77) /* for when not hardcoded: add a check on mvp bonus drop as well */
+ // TODO: This should be a field in the item db.
+ if (mvp_sd != NULL
+ && (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77)) /* for when not hardcoded: add a check on mvp bonus drop as well */
clif->item_drop_announce(mvp_sd, it->nameid, md->name);
// Announce first, or else ditem will be freed. [Lance]
diff --git a/src/map/script.c b/src/map/script.c
index 0fc4a5a65..007c6e0e1 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -16845,8 +16845,12 @@ BUILDIN(unittalk) {
bl = map->id2bl(unit_id);
if( bl != NULL ) {
struct StringBuf sbuf;
+ char blname[NAME_LENGTH];
StrBuf->Init(&sbuf);
- StrBuf->Printf(&sbuf, "%s : %s", clif->get_bl_name(bl), message);
+ safestrncpy(blname, clif->get_bl_name(bl), sizeof(blname));
+ if(bl->type == BL_NPC)
+ strtok(blname, "#");
+ StrBuf->Printf(&sbuf, "%s : %s", blname, message);
clif->disp_overhead(bl, StrBuf->Value(&sbuf));
StrBuf->Destroy(&sbuf);
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-04 05:33:33 +0000