Toams/rowboat + Micksha/galmatia

5 files changed, 489 insertions, 3 deletions

diff --git a/db/constants.conf b/db/constants.conf
index a4813353..5beb8db8 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4121,7 +4121,10 @@ constants_db: {
     NPC_SOPHIALLA:          455
     NPC_MUNDANE:            456
     NPC_ROWBOAT_STAND_WE:   457
-
+    NPC_UNMOUNTROWBOAT:     458
+    NPC_ROWBOATHELPER:      459
+    NPC_BLOSSOM:            460
+    NPC_GALIMATIA:          461
     NPC_TEST1:              800
     NPC_PLAYER:             801
 
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index aef21302..bd75860f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1632,6 +1632,68 @@ item_db: (
     ">
 },
 {
+    Id: 608
+    AegisName: "FertilityPotion"
+    Name: "Fertility Potion"
+    Type: "IT_HEALING"
+    Buy: 25000
+    Sell: 2750
+    Weight: 25
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 608
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 1000
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+},
+{
+    Id: 609
+    AegisName: "Honey"
+    Name: "Honey"
+    Type: "IT_HEALING"
+    Buy: 5000
+    Sell: 325
+    Weight: 250
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 609
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 100
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 350;
+        @max = 500;
+        @delay = 10;
+        @type = 2;
+        doevent "rand_sc_heal::OnUse";
+        bonus bMaxSP,20;
+    ">
+},
+{
     Id: 700
     AegisName: "SmallTentacles"
     Name: "Small Tentacles"
@@ -2886,6 +2948,206 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 748
+    AegisName: "ARedRose"
+    Name: "Red Rose"
+    Type: "IT_ETC"
+    Buy: 1000
+    Sell: 75
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 749
+    AegisName: "AWhiteRose"
+    Name: "White Rose"
+    Type: "IT_ETC"
+    Buy: 1000
+    Sell: 75
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 750
+    AegisName: "AYellowRose"
+    Name: "Yellow Rose"
+    Type: "IT_ETC"
+    Buy: 1000
+    Sell: 75
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 751
+    AegisName: "ABlueRose"
+    Name: "Blue Rose"
+    Type: "IT_ETC"
+    Buy: 2000
+    Sell: 150
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 752
+    AegisName: "ARedTulip"
+    Name: "Red Tulip"
+    Type: "IT_ETC"
+    Buy: 800
+    Sell: 65
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 753
+    AegisName: "AWhiteTulip"
+    Name: "White Tulip"
+    Type: "IT_ETC"
+    Buy: 800
+    Sell: 65
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 754
+    AegisName: "AYellowTulip"
+    Name: "Yellow Tulip"
+    Type: "IT_ETC"
+    Buy: 800
+    Sell: 65
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 755
+    AegisName: "ABlueTulip"
+    Name: "Blue Tulip"
+    Type: "IT_ETC"
+    Buy: 1600
+    Sell: 130
+    Weight: 10
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 800
     AegisName: "DiamondShard"
     Name: "Diamond Shard"
@@ -4242,6 +4504,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2915
+    AegisName: "Rosehat"
+    Name: "Rosehat"
+    Type: "IT_ARMOR"
+    Buy: 12000
+    Sell: 4100
+    Weight: 50
+    Atk: 0
+    Matk: 10
+    Def: 10
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 10
+    Refine: false
+    ViewSprite: 2915
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 3200
     AegisName: "Shemagh"
     Name: "Shemagh"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 87b64496..c7da6eff 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2395,6 +2395,200 @@ mob_db: (
     }
 },
 {
+    Id: 1058
+    SpriteName: "BadBee"
+    Name: "Bad Bee"
+    Lv: 25
+    Hp: 850
+    Sp: 0
+    Exp: 40
+    JExp: 0
+    AttackRange: 1
+    Attack: [350, 500]
+    Def: 25
+    Mdef: 0
+    WalkMask: "WALK_AIR"
+    Stats: {
+        Str: 25
+        Agi: 25
+        Vit: 15
+        Int: 1
+        Dex: 35
+        Luk: 30
+    }
+    ViewRange: 10
+    ChaseRange: 20
+    Size: 0
+    Race: 2
+    Element: (4, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        ChangeChase: true
+        Assist: true
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 85
+    AttackDelay: 800
+    AttackMotion: 500
+    DamageMotion: 300
+    MvpExp: 0
+    Drops: {
+    }
+},
+{
+    Id: 1059
+    SpriteName: "YellowTulip"
+    Name: "Yellow Tulip"
+    Lv: 1
+    Hp: 1
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1000
+    Drops: {
+        AYellowTulip: 500
+    }
+},
+{
+    Id: 1060
+    SpriteName: "YellowRose"
+    Name: "Yellow Rose"
+    Lv: 1
+    Hp: 1
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1000
+    Drops: {
+        AYellowRose: 500
+    }
+},
+{
+    Id: 1061
+    SpriteName: "BlueRose"
+    Name: "Blue Rose"
+    Lv: 1
+    Hp: 1
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1000
+    Drops: {
+        ABlueRose: 200
+        ABlueRose: 50
+    }
+},
+{
+    Id: 1062
+    SpriteName: "RedRose"
+    Name: "Red Rose"
+    Lv: 1
+    Hp: 1
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1000
+    Drops: {
+        ARedRose: 500
+        ARedRose: 100
+        ARedRose: 50
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 6c60c207..8e395099 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -220,7 +220,7 @@ mob_skill_db:(
 			SkillTarget: "MST_SELF"
 			CastCondition: "MSC_ALWAYS"
 			ConditionData: 15
-			val0: 1029
+			val0: 1058
 		}
 	}
 	PoisonSkull: {
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 1af2555e..4af6834b 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -70,5 +70,5 @@
 1016,Tipiou@NPC_SUMMONSLAVE,idle,196,2,7000,700,10000,no,self,slavele,4,1002,,,,,,
 1024,Green Slime@NPC_SUMMONMONSTER,dead,209,2,10000,0,0,no,self,always,2,1025,,,,,,
 1029,Bee@NPC_POISON,attack,176,20,1000,0,500,yes,anytarget,always,0,0,10,,,,,
-1034,PinkFlower@NPC_SUMMONSLAVE,any,196,1,2000,1000,10000,no,self,slavelt,4,1029,,,,,,
+1034,PinkFlower@NPC_SUMMONSLAVE,any,196,1,2000,1000,10000,no,self,slavelt,4,1058,,,,,,
 1100,PoisonSkull@NPC_POISON,attack,176,20,2500,0,100,yes,target,always,0,,,,,,,