summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/battle/battle.conf6
-rw-r--r--conf/map/battle/client.conf2
-rw-r--r--conf/map/battle/gm.conf2
-rw-r--r--conf/map/battle/player.conf2
-rw-r--r--db/re/item_db.conf37
-rw-r--r--db/re/mob_db.conf86
-rw-r--r--db/re/mob_skill_db.conf24
-rw-r--r--npc/000-1/gugli.txt4
-rw-r--r--npc/000-2-1/arpan.txt4
-rw-r--r--npc/000-2-1/chefgado.txt2
-rw-r--r--npc/000-2-1/peter.txt2
-rw-r--r--npc/001-1/enora.txt2
-rw-r--r--npc/001-1/fexil.txt2
-rw-r--r--npc/001-1/salem.txt2
-rw-r--r--npc/001-2-19/lloyd.txt2
-rw-r--r--npc/001-2-22/peter.txt2
-rw-r--r--npc/001-2-28/plush.txt2
-rw-r--r--npc/001-2-9/janus.txt4
-rw-r--r--npc/008-2-2/melania.txt2
-rw-r--r--npc/008-2-2/melinda.txt6
20 files changed, 157 insertions, 38 deletions
diff --git a/conf/map/battle/battle.conf b/conf/map/battle/battle.conf
index eafb5ec9..290e1ee7 100644
--- a/conf/map/battle/battle.conf
+++ b/conf/map/battle/battle.conf
@@ -51,12 +51,12 @@ critical_rate: 100
// or walk animation may be omitted client-side, causing cropped attacks or
// monsters that teleport to you)
// Otherwise, the delay is equal to the 'attack animation' (amotion)
-attack_walk_delay: 15
+attack_walk_delay: 14
// Move-delay adjustment after being hit. (Note 2)
// The 'can't walk' delay after being hit is calculated as a percentage of the damage animation duration.
// NOTE: Only affects the normal delay from a single attack, not the delay added by the multihit_delay option below.
-pc_damage_walk_delay_rate: 20
+pc_damage_walk_delay_rate: 0
damage_walk_delay_rate: 100
// Move-delay adjustment for multi-hitting attacks.
@@ -155,7 +155,7 @@ equip_skill_break_rate: 100
// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
// NOTE: The official setting is true, even thought it degrades performance a bit.
-delay_battle_damage: true
+delay_battle_damage: false
// Are arrows/ammo consumed when used on a bow/gun?
// 0 = No
diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index e5fb29d9..9a4305f4 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -40,7 +40,7 @@ packet_obfuscation: 0
// Minimum delay between whisper/global/party/guild messages (in ms)
// Messages that break this threshold are silently omitted.
-min_chat_delay: 0
+min_chat_delay: 20
// Valid range of dyes and styles on the client.
min_hair_style: 0
diff --git a/conf/map/battle/gm.conf b/conf/map/battle/gm.conf
index 782e44db..ea9548f7 100644
--- a/conf/map/battle/gm.conf
+++ b/conf/map/battle/gm.conf
@@ -48,7 +48,7 @@ atcommand_max_stat_bypass: false
// Ban people that try trade dupe.
// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
-ban_hack_trade: 5
+ban_hack_trade: 0
// requires RENEWAL_DROP to be enabled (src/map/config/renewal.h)
// modifies @mobinfo to display the users' real drop rate as per renewal_drop formula
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
index 2b1569e8..ed5767ae 100644
--- a/conf/map/battle/player.conf
+++ b/conf/map/battle/player.conf
@@ -172,7 +172,7 @@ invite_request_check: true
// 0 = Disabled
// 1 = Dropped only in PvP maps
// 2 = Dropped in all situations
-bone_drop: 0
+bone_drop: 1
// Do mounted (on Peco) characters increase their size
// 0 = no
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ecee9e3f..d93afc2a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1591,6 +1591,20 @@ item_db: (
">
},
{
+ Id: 610
+ AegisName: "DeathPotion"
+ Name: "Death Potion"
+ Type: "IT_USABLE"
+ Buy: 5000
+ Sell: 325
+ Weight: 250
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ percentheal -100, -100;
+ ">
+},
+// Generic
+{
Id: 700
AegisName: "SmallTentacles"
Name: "Small Tentacles"
@@ -1615,22 +1629,10 @@ item_db: (
Id: 701
AegisName: "PiouFeathers"
Name: "Piou Feathers"
- Type: "IT_USABLE"
+ Type: "IT_ETC"
Buy: 10
Sell: 3
Weight: 1
- Atk: 0
- Matk: 0
- Def: 0
- Range: 0
- Slots: 0
- WeaponLv: 0
- EquipLv: 0
- Refine: false
- ViewSprite: 701
- BindOnEquip: false
- Delay: 0
- Sprite: 0
},
{
Id: 702
@@ -4902,4 +4904,13 @@ item_db: (
Loc: "EQP_AMMO"
Subtype: "A_ARROW"
},
+{
+ Id: 7420
+ AegisName: "AdventurerSoul"
+ Name: "Adventurer's Soul"
+ Type: "IT_ETC"
+ Buy: 1
+ Sell: 0
+ Weight: 0
+},
)
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 42cacaad..c0669370 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3086,6 +3086,49 @@ mob_db: (
}
},
{
+ Id: 1106
+ SpriteName: "SpiderQueen"
+ Name: "Spider Queen"
+ Lv: 45
+ Hp: 18000
+ Sp: 0
+ Exp: 1250
+ JExp: 125
+ AttackRange: 3
+ Attack: [450, 750]
+ Def: 50
+ Mdef: 120
+ Stats: {
+ Str: 40
+ Agi: 30
+ Vit: 50
+ Int: 15
+ Dex: 65
+ Luk: 40
+ }
+ ViewRange: 8
+ ChaseRange: 15
+ Size: 0
+ Race: 2
+ Element: (5, 1)
+ Mode: {
+ CanMove: true
+ CanAttack: true
+ CastSensorChase: true
+ ChangeChase: true
+ Boss: true
+ Angry: true
+ Aggressive: true
+ }
+ MoveSpeed: 210
+ AttackDelay: 1200
+ AttackMotion: 550
+ DamageMotion: 450
+ MvpExp: 0
+ Drops: {
+ }
+},
+{
Id: 1107
SpriteName: "Dummy2"
Name: "Dummy"
@@ -3187,4 +3230,47 @@ mob_db: (
Drops: {
}
},
+{
+ Id: 1120
+ SpriteName: "Tengu"
+ Name: "Tengu"
+ Lv: 80
+ Hp: 7500
+ Sp: 0
+ Exp: 100
+ JExp: 15
+ AttackRange: 2
+ Attack: [250, 750]
+ Def: 45
+ Mdef: 10
+ Stats: {
+ Str: 70
+ Agi: 20
+ Vit: 40
+ Int: 10
+ Dex: 80
+ Luk: 20
+ }
+ ViewRange: 6
+ ChaseRange: 12
+ Size: 1
+ Race: 2
+ Element: (5, 1)
+ Mode: {
+ CanMove: true
+ CanAttack: true
+ CastSensorChase: true
+ ChangeChase: true
+ Boss: true
+ Angry: true
+ Aggressive: true
+ }
+ MoveSpeed: 170
+ AttackDelay: 1200
+ AttackMotion: 450
+ DamageMotion: 850
+ MvpExp: 0
+ Drops: {
+ }
+},
)
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index d1a08402..85e7a240 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -314,8 +314,29 @@ mob_skill_db:(
CastCondition: "MSC_MYHPLTMAXRATE"
ConditionData: 7
}
+ /**********************************************************************/
+ }
+ SpiderQueen: {
+ NPC_POISON: {
+ SkillState: "MSS_ALL"
+ SkillLevel: 20
+ Rate: 5000
+ Delay: 100
+ Cancelable: true
+ SkillTarget: "MST_TARGET"
+ CastCondition: "MSC_ALWAYS"
+ }
+ NPC_SUMMONSLAVE: {
+ SkillState: "MSS_ANY"
+ SkillLevel: 5
+ Rate: 10000
+ CastTime: 700
+ Delay: 60000
+ SkillTarget: "MST_SELF"
+ CastCondition: "MSC_SPAWN"
+ val0: 1044
+ }
}
-
/**********************************************************************/
FireDummy: {
MG_FIREWALL: {
@@ -333,3 +354,4 @@ mob_skill_db:(
}
)
+
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index dd2e6739..77738a8a 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -150,7 +150,7 @@ L_Couwan:
if (countitem(FishBox) > 0) delitem FishBox, 1;
setq ShipQuests_Couwan, 2;
- Zeny = Zeny + 10;
+ Zeny += 10;
getexp 40, 0;
message strcharinfo(0), l("You receive @@ E!", 10);
@@ -202,7 +202,7 @@ L_TaskDone:
if (countitem(PlushroomBox) == 1) delitem PlushroomBox, 1;
setq ShipQuests_Gugli, 2;
- Zeny = Zeny + 250;
+ Zeny += 250;
getexp 50, 0;
mes "";
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 9b2b9665..98cd05dc 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -201,7 +201,7 @@ L_WhereOldClothes:
setq ShipQuests_ArpanMoney, 2;
.@q = getq(ShipQuests_Arpan);
- Zeny = Zeny + 10;
+ Zeny += 10;
message strcharinfo(0), l("You receive @@ E!", 10);
goto L_BeforeMenu;
@@ -214,7 +214,7 @@ L_WhereMoney:
setq ShipQuests_ArpanMoney, 2;
.@q = getq(ShipQuests_Arpan);
- Zeny = Zeny + 10;
+ Zeny += 10;
message strcharinfo(0), l("You receive @@ E!", 10);
goto L_BeforeMenu;
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 69570fcf..0039e094 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -161,7 +161,7 @@ L_PoisonJulia:
mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!");
setq ShipQuests_ChefGado, 4;
- Zeny = Zeny + 200;
+ Zeny += 200;
message strcharinfo(0), l("You receive @@ E!", 200);
inventoryplace Bread, 1;
getitem Bread, 1;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index eaade56e..060fa660 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -285,7 +285,7 @@ OnDone:
default: @peter=750; break;
}
- Zeny = Zeny + @peter;
+ Zeny += @peter;
message strcharinfo(0), l("You receive @@ E!", @peter);
// Some cleanup. Shouldn't cause bugs but it's absence causes a ugly behavior.
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 45e6e551..bf2f7b16 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -123,7 +123,7 @@
.@zeny_reward = getarg(1);
getexp .@exp_reward, 0;
- Zeny = Zeny + .@zeny_reward;
+ Zeny += .@zeny_reward;
narrator S_LAST_NEXT,
l("You received @@ EXP and @@ E.", .@exp_reward, .@zeny_reward);
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 2ea78091..7b612674 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -122,7 +122,7 @@
l("Deal, I offer you @@ E!", .@price);
delitem FluffyFur, .@amount;
- Zeny = Zeny + .@price;
+ Zeny += .@price;
break;
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index c8ea3ab8..ceaeda8f 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -48,7 +48,7 @@
return 3;
}
- Zeny = Zeny - .@price;
+ Zeny -= .@price;
getitem PiouEgg, 1;
ArtisQuests_PiousBought += 1;
mesq l("You take good care of your piou. Remember to feed it every day.");
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index fc17cc4f..e2f02ec0 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -115,7 +115,7 @@
}
else
{
- Zeny = Zeny - .@price;
+ Zeny -= .@price;
setq ArtisQuests_Lloyd, 1;
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Perfect!"),
diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt
index 7fefb5f2..85d80bbb 100644
--- a/npc/001-2-22/peter.txt
+++ b/npc/001-2-22/peter.txt
@@ -285,7 +285,7 @@ OnDone:
default: @peter=750; break;
}
- Zeny = Zeny + @peter;
+ Zeny += @peter;
message strcharinfo(0), l("You receive @@ E!", @peter);
// Some cleanup. Shouldn't cause bugs but it's absence causes a ugly behavior.
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 330258b8..0cba5b2a 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -27,7 +27,7 @@
else
{
emotion E_HAPPY;
- Zeny = Zeny - .@price;
+ Zeny -= .@price;
INN_REGISTER = REDPLUSH_INN;
PC_IS_DEAD = false;
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 616991a6..6d176615 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -31,7 +31,7 @@
}
else
{
- Zeny = Zeny - .@party_price;
+ Zeny -= .@party_price;
setq General_Janus, 2;
skill NV_BASIC, 7, 0;
@@ -61,7 +61,7 @@
else
{
inventoryplace GuildCertification, 1;
- Zeny = Zeny - .@guild_price;
+ Zeny -= .@guild_price;
setq General_Janus, 3;
getitem GuildCertification, 1;
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
index 57275325..cf02dc90 100644
--- a/npc/008-2-2/melania.txt
+++ b/npc/008-2-2/melania.txt
@@ -89,7 +89,7 @@
else
{
emotion E_HAPPY;
- Zeny = Zeny - .@price;
+ Zeny -= .@price;
INN_REGISTER = .inn;
PC_IS_DEAD = false;
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
index 86f26e96..17127656 100644
--- a/npc/008-2-2/melinda.txt
+++ b/npc/008-2-2/melinda.txt
@@ -47,7 +47,7 @@ switch (select(l("Sure! [Don't tip]"),
getinventorylist;
if (@inventorylist_count == 100 && countitem("Beer") == 0)
goto L_TooMany;
- set Zeny, Zeny - 90;
+ Zeny -= 90;
getitem Beer, 1;
mes "";
mesn;
@@ -59,7 +59,7 @@ switch (select(l("Sure! [Don't tip]"),
getinventorylist;
if (@inventorylist_count == 100 && countitem("Beer") == 0)
goto L_TooMany;
- set Zeny, Zeny - 95;
+ Zeny -= 95;
getitem "Beer", 1;
mes "";
mesn;
@@ -71,7 +71,7 @@ switch (select(l("Sure! [Don't tip]"),
getinventorylist;
if (@inventorylist_count == 100 && countitem("Beer") == 0)
goto L_TooMany;
- set Zeny, Zeny - 100;
+ Zeny -= 100;
getitem "Beer", 1;
mes "";
mesn;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-17 01:36:06 +0000