summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/re/item_db.conf112
-rw-r--r--db/re/mob_db.conf17
-rw-r--r--npc/003-1/itka.txt10
-rw-r--r--npc/017-1/shops.txt8
-rw-r--r--npc/020-5/bracco.txt14
5 files changed, 158 insertions, 3 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f4517f021..2464295be 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -19535,7 +19535,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, MercBoxC, CrazyRum, Manapple, Dragonfruit, JasmineTea, TreasureMap, MysteriousBottle, Lockpicks, ArcmageBoxset, TreasureKey, CoinBag, WurtziteOre; // ~8.33% each
+ setarray .@r, MercBoxC, CrazyRum, Manapple, Dragonfruit, JasmineTea, TreasureMap, MysteriousBottle, Lockpicks, ArcmageBoxset, TreasureKey, CoinBag, WurtziteOre, ChocolateCake; // ~8.33% each
.@n=rand(getarraysize(.@r));
getitem .@r[.@n], 1;
">
@@ -19557,7 +19557,7 @@ item_db: (
noauction: true
}
Script: <"
- setarray .@r, MercBoxD, AncientBlueprint, WhiskeyAle, ElixirOfLife, Dragonfruit, YerbaMate, BronzeGift, TreasureMap, MysteriousBottle, Lockpicks, HousingLetterI, BrokenWarpCrystal, StatusResetPotion, ArcmageBoxset, TitaniumOre, LOFCoin, GrapheneStone; // ~5.88% each
+ setarray .@r, MercBoxD, AncientBlueprint, WhiskeyAle, ElixirOfLife, Dragonfruit, YerbaMate, BronzeGift, TreasureMap, MysteriousBottle, Lockpicks, HousingLetterI, BrokenWarpCrystal, StatusResetPotion, ArcmageBoxset, TitaniumOre, LOFCoin, GrapheneStone, WhiteCake; // ~5.88% each
.@n=rand(getarraysize(.@r));
getitem .@r[.@n], 1;
">
@@ -20149,6 +20149,114 @@ item_db: (
noauction: true
}
},
+{
+ Id: 8061
+ AegisName: "LemonCake"
+ Name: "Lemon Cake"
+ Type: "IT_HEALING"
+ Buy: 180
+ Sell: 60
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("ItHeal2", 4, 1);
+ else
+ callfunc("HomunHeal", 20, 10);
+ ">
+},
+{
+ Id: 8062
+ AegisName: "OrangeCake"
+ Name: "Orange Cake"
+ Type: "IT_HEALING"
+ Buy: 360
+ Sell: 120
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("ItHeal2", 4, 2);
+ else
+ callfunc("HomunHeal", 40, 10);
+ ">
+},
+{
+ Id: 8063
+ AegisName: "ChocolateCake"
+ Name: "Chocolate Cake"
+ Type: "IT_HEALING"
+ Buy: 540
+ Sell: 180
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("ItHeal2", 4, 3);
+ else
+ callfunc("HomunHeal", 60, 10);
+ ">
+},
+{
+ Id: 8064
+ AegisName: "WhiteCake"
+ Name: "White Cake"
+ Type: "IT_HEALING"
+ Buy: 720
+ Sell: 240
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("ItHeal2", 4, 4);
+ else
+ callfunc("HomunHeal", 80, 10);
+ ">
+},
+{
+ Id: 8065
+ AegisName: "AppleCake"
+ Name: "Apple Cake"
+ Type: "IT_HEALING"
+ Buy: 900
+ Sell: 300
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("ItHeal2", 4, 5);
+ else
+ callfunc("HomunHeal", 100, 10);
+ ">
+},
+{
+ Id: 8066
+ AegisName: "BlueberryCake"
+ Name: "Blueberry Cake"
+ Type: "IT_HEALING"
+ Buy: 900
+ Sell: 300
+ Weight: 10
+ Refine: false
+ Delay: 500
+ UseEffect: "EFFECT_HEAL"
+ Script: <"
+ if (@useType == 1)
+ callfunc("MPHeal", 4, 50, 100);
+ else
+ callfunc("HomunHeal", 200, 10); // TODO FIXME: BROKEN (no MP regen)
+ ">
+},
)
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 0fa5017b1..aa1571ebb 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -5041,6 +5041,7 @@ mob_db: (
DamageMotion: 200
Drops: {
RedApple: 400
+ LemonCake: 300
MoubooSteak: 215
Cherry: 8
BloodyMoubooHat: 1
@@ -5090,6 +5091,7 @@ mob_db: (
SulfurPowder: 480
DarkCrystal: 350
CottonCloth: 51
+ WhiteCake: 30
PumpkinHat: 1
}
},
@@ -8735,6 +8737,7 @@ mob_db: (
Drops: {
Coal: 700
AnimalBones: 420
+ WhiteCake: 210
Cherry: 32
}
},
@@ -9225,6 +9228,7 @@ mob_db: (
DamageMotion: 200
Drops: {
BronzeBossGift: 1000
+ OrangeCake: 340
CherryCake: 60
ThetaRing: 2
}
@@ -9971,8 +9975,8 @@ mob_db: (
Drops: {
ChocolateBar: 6000
ChocolateBar: 3600
- ChocolateBar: 1000
ChocolateBiscuit: 800
+ ChocolateCake: 400
Pear: 75
ChocolateMouboo: 40
LOFCoin: 10
@@ -10904,6 +10908,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 200
FluoPowder: 900
FluoPowder: 50
DodgeDonut: 30
@@ -10949,6 +10954,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 200
FluoPowder: 900
FluoPowder: 50
DodgeDonut: 30
@@ -10994,6 +11000,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 200
FluoPowder: 900
FluoPowder: 50
DodgeDonut: 30
@@ -11039,6 +11046,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 200
FluoPowder: 900
FluoPowder: 50
DodgeDonut: 30
@@ -11084,6 +11092,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 300
FluoPowder: 900
FluoPowder: 100
DodgeDonut: 40
@@ -11130,6 +11139,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 300
FluoPowder: 900
FluoPowder: 100
DodgeDonut: 40
@@ -11176,6 +11186,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 300
FluoPowder: 900
FluoPowder: 100
DodgeDonut: 40
@@ -11222,6 +11233,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ AppleCake: 300
FluoPowder: 900
FluoPowder: 100
DodgeDonut: 40
@@ -11363,6 +11375,7 @@ mob_db: (
ViewRange: 7
ChaseRange: 11
Drops: {
+ LemonCake: 540
Fungus: 200
SparklyStrawberryDonut: 60
DodgeDonut: 20
@@ -11593,6 +11606,7 @@ mob_db: (
ChaseRange: 11
Drops: {
ArtichokeHerb: 2800
+ OrangeCake: 140
ChocolateDonut: 100
Fungus: 50
Cherry: 40
@@ -12540,6 +12554,7 @@ mob_db: (
DamageMotion: 200
Drops: {
Brainstem: 450
+ LemonCake: 40
Cherry: 5
}
},
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index e6ac006f9..90011d040 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -30,12 +30,22 @@ OnInit:
tradertype(NST_MARKET);
sellitem CherryCake, 200, 50; // 50 cakes for 200 GP each
+ // She might sell extra cakes depending on story state
+ if ($GAME_STORYLINE >= 4 && !rand2(10))
+ sellitem LemonCake, -1, $GAME_STORYLINE;
+ if ($GAME_STORYLINE >= 5 && !rand2(12))
+ sellitem OrangeCake, -1, $GAME_STORYLINE;
+
.sex = G_FEMALE;
.distance = 5;
end;
OnMinute16:
restoreshopitem CherryCake, 200, 50;
+ if ($GAME_STORYLINE >= 4 && !rand2(10))
+ restoreshopitem LemonCake, $GAME_STORYLINE;
+ if ($GAME_STORYLINE >= 5 && !rand2(12))
+ restoreshopitem OrangeCake, $GAME_STORYLINE;
end;
// Pay your taxes!
diff --git a/npc/017-1/shops.txt b/npc/017-1/shops.txt
index ac5affeb0..f0bb3a13a 100644
--- a/npc/017-1/shops.txt
+++ b/npc/017-1/shops.txt
@@ -30,6 +30,10 @@ OnInit:
sellitem Bullet, -1, 2000;
if (!rand2(4))
sellitem OolongTea, getiteminfo(OolongTea, ITEMINFO_BUYPRICE)*15/10, rand2(1,3);
+ if (!rand2(5))
+ sellitem OrangeCake, getiteminfo(OrangeCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,5);
+ if (!rand2(6))
+ sellitem WhiteCake, getiteminfo(WhiteCake, ITEMINFO_BUYPRICE)*15/10, rand2(1,3);
sellitem WoodenShield, -1, 1;
sellitem LeatherShirt, -1, 1;
end;
@@ -45,6 +49,10 @@ OnClock0112:
restoreshopitem Bullet, -1, 2000;
if (!rand2(4))
restoreshopitem OolongTea, getiteminfo(OolongTea, ITEMINFO_BUYPRICE)*15/10, rand2(1,3);
+ if (!rand2(5))
+ restoreshopitem OrangeCake, getiteminfo(OrangeCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,5);
+ if (!rand2(6))
+ restoreshopitem WhiteCake, getiteminfo(WhiteCake, ITEMINFO_BUYPRICE)*15/10, rand2(1,3);
end;
// Pay your taxes!
diff --git a/npc/020-5/bracco.txt b/npc/020-5/bracco.txt
index 06bab034f..4d0fd6a7d 100644
--- a/npc/020-5/bracco.txt
+++ b/npc/020-5/bracco.txt
@@ -248,6 +248,10 @@
L_Start:
mesn;
mesq l("Welcome to my fine establishment!");
+ if ($GAME_STORYLINE >= 3)
+ tutmes l("I can melt your equipment to recover some of the materials used, and I also sell %s on the side!", l("some equipments and even cake"));
+ else
+ tutmes l("I can melt your equipment to recover some of the materials used, and I also sell %s on the side!", l("some equipments"));
mes "";
select
l("Trade"),
@@ -405,6 +409,11 @@ OnInit:
sellitem ShortBow, -1, 1;
sellitem ArrowAmmoBox,-1,rand(8,12);
sellitem IronAmmoBox,-1,rand(3,5);
+ // No one buys stuff from Bracco, so he started baking cake
+ if ($GAME_STORYLINE >= 3 && !rand2(3))
+ sellitem ChocolateCake, getiteminfo(ChocolateCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,$GAME_STORYLINE*2);
+ if ($GAME_STORYLINE >= 5 && !rand2(12))
+ sellitem AppleCake, getiteminfo(AppleCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,$GAME_STORYLINE*2);
npcsit;
.sex = G_MALE;
@@ -426,6 +435,11 @@ OnMon2000:
restoreshopitem ShortBow, 1;
restoreshopitem ArrowAmmoBox,rand(8,12);
restoreshopitem IronAmmoBox,rand(3,5);
+ // No one buys stuff from Bracco, so he started baking cake
+ if ($GAME_STORYLINE >= 3 && !rand2(3))
+ restoreshopitem ChocolateCake, getiteminfo(ChocolateCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,$GAME_STORYLINE*2);
+ if ($GAME_STORYLINE >= 5 && !rand2(12))
+ restoreshopitem AppleCake, getiteminfo(AppleCake, ITEMINFO_BUYPRICE)*15/10, rand2(2,$GAME_STORYLINE*2);
end;
// Pay your taxes!
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-30 13:27:44 +0000