change stats points. and add new foods items

22 files changed, 668 insertions, 365 deletions

diff --git a/conf/map/battle/exp.conf b/conf/map/battle/exp.conf
index 3a38c1c6c..d1c296f92 100644
--- a/conf/map/battle/exp.conf
+++ b/conf/map/battle/exp.conf
@@ -93,10 +93,10 @@ pvp_exp: true
 death_penalty_type: 1
 
 // Base exp. penalty rate (Each 100 is 1% of their exp)
-death_penalty_base: 100
+death_penalty_base: 1000
 
 // Job exp. penalty rate (Each 100 is 1% of their exp)
-death_penalty_job: 100
+death_penalty_job: 500
 
 // When a player dies (to another player), how much zeny should we penalize them with?
 // NOTE: It is a percentage of their zeny, so 100 = 1%
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 49fcbbf18..f32d2f0bb 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -65,14 +65,12 @@ map_list: (
     "003-2-0",
     "003-2-1",
     "003-2-2",
-    "004-1-1-1",
-    "004-1-1",
-    "004-1",
     "005-1",
     "005-2",
     "005-3",
     "005-4",
     "005-5",
+    "005-6",
     "008-1",
     "008-2-0",
     "008-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 10a5f771c..6f20914da 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -62,29 +62,27 @@
 003-2-0 62
 003-2-1 63
 003-2-2 64
-004-1-1-1 65
-004-1-1 66
-004-1 67
-005-1 68
-005-2 69
-005-3 70
-005-4 71
-005-5 72
-008-1 73
-008-2-0 74
-008-2-1 75
-008-2-10 76
-008-2-11 77
-008-2-12 78
-008-2-13 79
-008-2-14 80
-008-2-2 81
-008-2-3 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-test 89
-testbg 90
+005-1 65
+005-2 66
+005-3 67
+005-4 68
+005-5 69
+005-6 70
+008-1 71
+008-2-0 72
+008-2-1 73
+008-2-10 74
+008-2-11 75
+008-2-12 76
+008-2-13 77
+008-2-14 78
+008-2-2 79
+008-2-3 80
+008-2-4 81
+008-2-5 82
+008-2-6 83
+008-2-7 84
+008-2-8 85
+008-2-9 86
+test 87
+testbg 88
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 276b2c1d0..40463c175 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1270,6 +1270,142 @@ item_db: (
     ">
 },
 {
+    Id: 539
+    AegisName: "RoastedMaggot"
+    Name: "Roasted Maggot"
+    Type: "IT_HEALING"
+    Buy: 110
+    Sell: 55
+    Weight: 5
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 539
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 55;
+        @max = 155;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 540
+    AegisName: "RedApple"
+    Name: "Red Apple"
+    Type: "IT_HEALING"
+    Buy: 99
+    Sell: 5
+    Weight: 5
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 540
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 400
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 100;
+        @max = 400;
+        @delay = 4;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 541
+    AegisName: "CactusPotion"
+    Name: "Cactus Potion"
+    Type: "IT_HEALING"
+    Buy: 70
+    Sell: 35
+    Weight: 4
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 541
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 10;
+        @max = 1000;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 542
+    AegisName: "CactusDrink"
+    Name: "Cactus Drink"
+    Type: "IT_HEALING"
+    Buy: 50
+    Sell: 25
+    Weight: 4
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 542
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 4;
+        @max = 400;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
     Id: 700
     AegisName: "SmallTentacles"
     Name: "Small Tentacles"
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index b79d30f86..340a7b35b 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 972ece79c..48b5e1dbf 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2808,22 +2808,22 @@ mob_db: (
     Id: 1066
     SpriteName: "LogHead"
     Name: "Log Head"
-    Lv: 5
-    Hp: 500
-    Sp: 0
-    Exp: 4
-    JExp: 1
+    Lv: 30
+    Hp: 5000
+    Sp: 300
+    Exp: 101
+    JExp: 5
     AttackRange: 1
-    Attack: [50, 100]
-    Def: 10
-    Mdef: 0
+    Attack: [70, 120]
+    Def: 50
+    Mdef: 5
     Stats: {
         Str: 1
         Agi: 1
         Vit: 1
         Int: 1
-        Dex: 6
-        Luk: 5
+        Dex: 20
+        Luk: 25
     }
     ViewRange: 1
     ChaseRange: 12
@@ -2841,12 +2841,10 @@ mob_db: (
     DamageMotion: 480
     MvpExp: 0
     Drops: {
-        MaggotSlime: 800
-        BugLeg: 400
-        RoastedMaggot: 150
-        CactusPotion: 70
-        SharpKnife: 10
-        CrystallizedMaggot: 1
+        Acorn: 3000
+        Root: 2400
+        RawLog: 2000
+        RawLog: 2000
     }
 },
 {
@@ -3213,22 +3211,22 @@ mob_db: (
     Id: 1075
     SpriteName: "ManaBug"
     Name: "Mana Bug"
-    Lv: 5
-    Hp: 500
-    Sp: 0
-    Exp: 4
+    Lv: 25
+    Hp: 2500
+    Sp: 500
+    Exp: 8
     JExp: 1
-    AttackRange: 1
-    Attack: [50, 100]
-    Def: 10
-    Mdef: 0
+    AttackRange: 2
+    Attack: [80, 160]
+    Def: 20
+    Mdef: 60
     Stats: {
         Str: 1
-        Agi: 1
+        Agi: 4
         Vit: 1
-        Int: 1
-        Dex: 6
-        Luk: 5
+        Int: 30
+        Dex: 5
+        Luk: 4
     }
     ViewRange: 1
     ChaseRange: 12
@@ -3246,12 +3244,10 @@ mob_db: (
     DamageMotion: 480
     MvpExp: 0
     Drops: {
-        MaggotSlime: 800
-        BugLeg: 400
-        RoastedMaggot: 150
-        CactusPotion: 70
-        SharpKnife: 10
-        CrystallizedMaggot: 1
+        MaggotSlime: 1000
+        BugLeg: 800
+        RoastedMaggot: 400
+        BlueManaPearl: 3
     }
 },
 {
diff --git a/db/re/statpoint.txt b/db/re/statpoint.txt
index 5b2329983..55e05b1c5 100644
--- a/db/re/statpoint.txt
+++ b/db/re/statpoint.txt
@@ -7,249 +7,249 @@
 68
 72
 76
-80
-85
-90
-95
-100
-105
-111
-117
-123
-129
-135
-142
-149
-156
-163
-170
-178
-186
+82
+87
+92
+97
+102
+108
+114
+120
+127
+134
+145
+153
+161
+169
+177
+185
 194
-202
-210
-219
-228
+203
+212
+222
 237
-246
-255
-265
-275
-285
-295
+248
+259
+270
+281
+293
 305
-316
-327
-338
-349
-360
-372
-384
-396
-408
+317
+330
+343
+363
+377
+391
+405
 420
-433
-446
-459
-472
-485
-499
-513
-527
-541
-555
-570
-585
-600
-615
-630
-646
-662
-678
-694
-710
+435
+450
+466
+482
+498
+522
+539
+556
+573
+591
+609
+627
+645
+663
+681
+708
 727
-744
-761
-778
-795
-813
-831
-849
+746
+765
+785
+805
+825
+846
 867
-885
-904
-923
-942
-961
-980
-1000
-1020
-1040
-1060
-1080
-1101
-1122
-1143
-1164
-1185
-1207
-1229
-1251
-1273
-1295
-1318
-1341
-1364
-1387
-1410
-1433
-1456
-1479
-1502
-1525
-1549
-1573
-1597
-1621
-1645
-1669
-1693
-1717
-1741
-1765
-1790
-1815
-1840
+888
+919
+941
+963
+985
+1007
+1029
+1051
+1073
+1095
+1117
+1150
+1173
+1196
+1219
+1242
+1265
+1288
+1311
+1334
+1357
+1391
+1414
+1437
+1460
+1483
+1506
+1529
+1552
+1575
+1598
+1648
+1670
+1692
+1713
+1734
+1754
+1774
+1793
+1812
+1830
+1848
 1865
-1890
-1915
-1940
-1965
-1990
-2015
-2041
-2067
-2093
-2119
-2145
+1882
+1898
+1914
+1930
+1945
+1959
+1973
+1986
+1999
+2011
+2023
+2034
+2045
+2061
+2072
+2083
+2094
+2105
+2127
+2138
+2149
+2160
 2171
-2197
-2223
-2249
+2187
+2198
+2209
+2220
+2231
+2253
+2264
 2275
-2302
-2329
-2356
-2383
-2410
-2437
-2464
-2491
-2518
-2545
-2573
-2601
-2629
-2657
-2685
-2713
+2286
+2297
+2313
+2324
+2335
+2346
+2357
+2407
+2418
+2429
+2440
+2451
+2467
+2478
+2489
+2500
+2511
+2533
+2544
+2555
+2566
+2577
+2593
+2604
+2615
+2626
+2637
+2659
+2670
+2681
+2692
+2703
+2719
+2730
 2741
-2770
-2799
-2828
-2857
-2886
-2915
+2752
+2763
+2785
+2796
+2807
+2818
+2829
+2845
+2856
+2867
+2878
+2889
+2911
+2922
+2933
 2944
-2974
+2955
+2971
+2982
+2993
 3004
-3034
-3064
-3094
-3124
-3154
-3185
-3216
-3247
-3278
+3015
+3065
+3076
+3087
+3098
+3109
+3125
+3136
+3147
+3158
+3169
+3191
+3202
+3213
+3224
+3235
+3251
+3262
+3273
+3284
 3295
-3325
-3355
-3385
-3415
-3446
-3477
-3508
-3539
-3570
-3601
-3632
-3663
-3694
-3725
+3317
+3328
+3339
+3350
+3361
+3377
+3388
+3399
+3410
+3421
+3443
+3454
+3465
+3476
+3487
+3503
+3514
+3525
+3536
+3547
+3569
+3580
+3591
+3602
+3613
+3624
+3635
+3646
+3657
+3668
+3713
+3724
+3735
+3746
 3757
-3789
-3821
-3853
-3885
-3917
-3949
-3981
-4013
-4045
-4078
-4111
-4114
-4177
-4210
-4243
-4276
-4309
-4342
-4375
-4409
-4443
-4477
-4511
-4545
-4579
-4613
-4647
-4681
-4715
-4750
-4785
-4820
-4855
-4890
-4925
-4960
-5030
-5065
-5100
-5136
-5172
-5208
-5244
-5280
-5316
-5352
-5388
-5424
-5460
-5497
-5537
-5571
-5608
-5645
-5682
-5719
-5793
-5830
-5868
-5906
-5944
-5982
-6020
-6058
+3768
diff --git a/npc/003-2-1/_warps.txt b/npc/003-2-1/_warps.txt
index b3d603825..01b8d9348 100644
--- a/npc/003-2-1/_warps.txt
+++ b/npc/003-2-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 003-2-1: First Deck warps
-003-2-1,19,28,0	warp	#003-2-1_19_28	0,0,004-1,193,109
+003-2-1,19,28,0	warp	#003-2-1_19_28	0,0,005-1,193,109
 003-2-1,33,28,0	warp	#003-2-1_33_28	0,0,003-2-0,20,27
 003-2-1,31,25,0	warp	#003-2-1_31_25	0,0,003-2-2,72,29
diff --git a/npc/004-1-1-1/_import.txt b/npc/004-1-1-1/_import.txt
deleted file mode 100644
index 496cbbb5a..000000000
--- a/npc/004-1-1-1/_import.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// Map 004-1-1-1: Candor Island
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/004-1-1/_import.txt b/npc/004-1-1/_import.txt
deleted file mode 100644
index 991283715..000000000
--- a/npc/004-1-1/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// Map 004-1-1: Light Armor Shop
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/004-1-1/_warps.txt",
diff --git a/npc/004-1-1/_warps.txt b/npc/004-1-1/_warps.txt
deleted file mode 100644
index 4c67ee852..000000000
--- a/npc/004-1-1/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 004-1-1: Light Armor Shop warps
-004-1-1,30,35,0	warp	#004-1-1_30_35	0,0,001-1,51,66
-004-1-1,37,46,0	warp	#004-1-1_37_46	0,0,004-1,55,72
diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt
deleted file mode 100644
index 31c31230f..000000000
--- a/npc/004-1/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// Map 004-1: candor
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/004-1/_warps.txt",
diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
deleted file mode 100644
index e7794ef46..000000000
--- a/npc/004-1/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 004-1: candor warps
-004-1,6,3,0	warp	#004-1_6_3	0,0,004-1-1,37,45
-004-1,30,17,0	warp	#004-1_30_17	0,0,003-2-1,20,28
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 1a1a15781..08601d0bf 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -2,4 +2,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-1/_mobs.txt",
 "npc/005-1/_warps.txt",
-"npc/005-1/zegas.txt",
diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt
index 5f89c4fbb..242d35034 100644
--- a/npc/005-1/_mobs.txt
+++ b/npc/005-1/_mobs.txt
@@ -7,21 +7,11 @@
 005-1,37,44,11,5	monster	Tortuga	1004,2,35000,120000
 005-1,42,19,9,16	monster	Tortuga	1004,2,35000,120000
 005-1,87,15,12,11	monster	Tortuga	1004,3,35000,120000
-005-1,44,53,2,1	monster	Little Blub	1007,2,25000,120000
 005-1,61,42,7,10	monster	Little Blub	1007,2,25000,120000
 005-1,62,3,10,4	monster	Little Blub	1007,2,25000,120000
 005-1,87,47,4,3	monster	Blub	1008,1,60000,120000
-005-1,85,11,2,3	monster	Little Blub	1007,1,25000,120000
 005-1,85,36,14,9	monster	Little Blub	1007,2,35000,120000
-005-1,48,39,9,6	monster	Little Blub	1007,1,35000,120000
-005-1,28,26,3,5	monster	Little Blub	1007,1,35000,120000
-005-1,35,28,0,1	monster	Plushroom Field	1011,1,35000,150000
-005-1,54,93,0,1	monster	Plushroom Field	1011,1,35000,150000
-005-1,63,58,4,2	monster	Plushroom Field	1011,1,35000,150000
 005-1,54,42,0,2	monster	Plushroom Field	1011,1,35000,150000
-005-1,78,36,4,5	monster	Plushroom Field	1011,2,35000,150000
-005-1,71,40,1,1	monster	Plushroom Field	1011,1,35000,150000
-005-1,41,83,8,9	monster	Croc	1006,2,35000,300000
 005-1,63,9,10,3	monster	Croc	1006,1,35000,300000
 005-1,76,46,1,1	monster	Croc	1006,1,35000,300000
 005-1,52,70,4,17	monster	Croc	1006,1,35000,300000
diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt
index 6c1f5599a..30a459eba 100644
--- a/npc/005-1/_warps.txt
+++ b/npc/005-1/_warps.txt
@@ -1,7 +1,9 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-1: Drasil Island warps
-005-1,38,96,0	warp	#005-1_38_96	0,0,000-2-0,21,28
+005-1,43,107,0	warp	#005-1_43_107	0,0,000-2-0,21,28
 005-1,31,80,0	warp	#005-1_31_80	0,0,005-2,33,42
 005-1,34,74,0	warp	#005-1_34_74	0,0,005-3,25,42
 005-1,48,70,0	warp	#005-1_48_70	0,0,005-4,25,42
 005-1,39,68,0	warp	#005-1_39_68	0,0,005-5,25,41
+005-1,22,91,0	warp	#005-1_22_91	0,0,005-5,24,41
+005-1,43,75,0	warp	#005-1_43_75	0,0,005-6,33,42
diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt
deleted file mode 100644
index cbeb83294..000000000
--- a/npc/005-1/zegas.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Evol scripts.
-// Authors:
-//    gumi
-//    Reid
-// Description:
-//    Lloyd the banker NPC.
-// Variables:
-//    0  ArtisQuests_Lloyd
-//    1  ArtisQuests_Fexil
-//    2  ArtisQuests_Enora
-// Quest states:
-//    00  -- Never talked
-//    01  -- Registred on the Guild
-//    10  -- not started
-//    11  -- Lloyd warned about the quest
-//    20  -- Default.
-//    21  -- BlackSmith quest delivered.
-//    22  -- Chelios Quest given.
-//    23  -- Chelios Quest done.
-
-005-1,35,75,0	script	Zegas	NPC_LLOYD,{
-
-
-
-OnPCLoginEvent:
-    if (#MerchantBank)
-    {
-        BankVault += max(0, #MerchantBank);
-        #MerchantBank = 0;
-    }
-    end;
-}
diff --git a/npc/004-0/_import.txt b/npc/005-6/_import.txt
index e7a3c06d7..365d443e9 100644
--- a/npc/004-0/_import.txt
+++ b/npc/005-6/_import.txt
@@ -1,3 +1,5 @@
-// Map 004-0: Oceania
+// Map 005-6: Candor Magic House
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/004-0/_warps.txt",
+"npc/005-6/_warps.txt",
+"npc/005-6/morgan.txt",
+"npc/005-6/zitoni.txt",
diff --git a/npc/004-0/_warps.txt b/npc/005-6/_warps.txt
index a92576de9..2ac22ab7d 100644
--- a/npc/004-0/_warps.txt
+++ b/npc/005-6/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 004-0: Oceania warps
-004-0,6,3,0	warp	#004-0_6_3	0,0,004-1-1,55,72
+// Map 005-6: Candor Magic House warps
+005-6,33,43,0	warp	#005-6_33_43	0,0,005-1,43,76
diff --git a/npc/005-6/morgan.txt b/npc/005-6/morgan.txt
new file mode 100644
index 000000000..5f9fe1c3b
--- /dev/null
+++ b/npc/005-6/morgan.txt
@@ -0,0 +1,6 @@
+005-6,30,37,0	script	Morgan	NPC_RUMLY,{
+
+OnInit:
+    .sex = G_MALE;
+    end;
+}
diff --git a/npc/005-6/zitoni.txt b/npc/005-6/zitoni.txt
new file mode 100644
index 000000000..ad5086de4
--- /dev/null
+++ b/npc/005-6/zitoni.txt
@@ -0,0 +1,226 @@
+// Evol scripts.
+// Author:
+//    Vasily_Makarov
+// Description:
+//    Stat resetter.
+// Variables:
+//    General_Rumly
+// Values:
+//    0  Player hasn't met Zitomi
+//    1  Last time player has told that he will never come back
+//    2  Last time player has told that he will come back later
+//    3  Player has already reset his stat
+// Others:
+// .@visited - Zitomi actual variable
+// .@wasSP - free status points before reset
+
+005-6,43,39,0	script	Zitoni	NPC_RUMLY,{
+
+    setnpcdir "Rumly#001-1", 2;
+    stopnpctimer;
+    initnpctimer;
+
+    speech S_LAST_NEXT,
+        l("Hey you, do you have any @@s?", getitemlink(Plushroom));
+
+L_Menu:
+    .@visited = getq(General_Rumly);
+    .@plush_count = lognbaselvl(1, 10);
+
+    select
+        l("Plushrooms you say?"),
+        l("Who are you?"),
+        rif(.@visited >  0, l("Can you reset my stats please?")),
+        lg("You are weird, I have to go sorry.");
+
+    switch (@menu)
+    {
+        case 1:
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("Wind and grass is nice and cool, so juicy sweet..."),
+                l("Our only wish to eat a plush, so juicy sweet...");
+            goto L_Menu;
+        case 2:
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                lg("Why are you asking? And who are you too? I've never seen you around before..."),
+                lg("Wait, are you one of those from the Legion of Gasaron? I didn't do anything wrong, I promise!"),
+                l("I... I just like to eat the purple and delightful... And natural, and...");
+
+            switch (select(l("Chill out I won't say anything."),
+                           l("Yes I am and you are going to face justice!")))
+            {
+                case 1: break;
+                case 2:
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                        l("No! No, no, my precious plushrooms! Don’t take me to them, they wants my precious.");
+                    goto L_Quit;
+            }
+
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("I won't forget it, I swear on my precious plushrooms!"),
+                l("There is an unknown side effect to these plushrooms, they can free you from your past mistakes."),
+                l("You can use it to clear your stats, to start freshly if you see what I mean..."),
+                l("Bring me some of these plushrooms and I will show you how it works!"),
+                l("Although the more powerful you are, the more plushrooms you will need.");
+
+            select
+                l("Sounds good!"),
+                rif(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")),
+                l("We will talk about it later."),
+                l("My stats are too good, I won't need it.");
+
+            switch (@menu)
+            {
+                case 1:
+                    if (.@visited < 2)
+                    {
+                        setq General_Rumly, 2;
+                    }
+
+                    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                        l("Great! Can't wait for some tasty mushrooms!");
+
+                    goto L_Menu;
+                case 2:
+                    goto L_ResetStats;
+                case 3:
+                    goto L_Later;
+                case 4:
+                    goto L_Never;
+            }
+
+        case 3:
+            goto L_ResetStats;
+        case 4:
+            if (.@visited < 2) goto L_Quit;
+
+            .@rand = rand(2);
+
+            if (.@rand)
+            {
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("See you! And come back with the plushrooms!");
+            }
+            else
+            {
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Oh noes!"),
+                    l("A rabbit!"),
+                    l("He has a guns!"),
+                    l("*Bang bang*");
+                narrator S_LAST_NEXT,
+                    l("Rumly is hiding behind the tree.");
+            }
+
+            goto L_Quit;
+    }
+
+L_ResetStats:
+    if (.@visited == 1)
+    {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            lg("Changed your mind, uh?"),
+            l("Very good."),
+            l("Status point reset can't be undone. Do you really want this?"),
+            lg("Are you sure about this?");
+    }
+    else
+    {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            lg("Are you sure about this?");
+    }
+
+L_ConfirmReset:
+    switch (select(lg("Yes, I am sure."),
+                   lg("I need to think about it..."),
+                   lg("I won't need it, thank you.")))
+    {
+        case 1:
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom));
+
+            select
+                rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")),
+                rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")),
+                rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")),
+                lg("I have to go, sorry.");
+
+            if (@menu > 1)
+            {
+                goto L_Later;
+            }
+
+            delitem Plushroom, .@plush_count;
+
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("Thank you."),
+                l("Now stand still... It should not take much time...");
+
+            .@wasSP = StatusPoint;
+            resetstatus;
+            if (.@visited < 3)
+            {
+                setq General_Rumly, 3;
+            }
+            if (StatusPoint == .@wasSP)
+            {
+                speech S_LAST_NEXT,
+                    l("It seems that you have no status points to reset!"),
+                    lg("But the plushroom you brought was really awesome you know."),
+                    lg("Come back when you will really need me. And bring more plushrooms with you!");
+            }
+            else
+            {
+                speech S_LAST_NEXT,
+                    l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
+                    l("Spend it wisely this time."),
+                    lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
+            }
+            goto L_Quit;
+
+        case 2:
+            goto L_Later;
+        case 3:
+            goto L_Never;
+    }
+
+L_Later:
+    if (.@visited < 2)
+    {
+        setq General_Rumly, 2;
+    }
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("Come back soon, and bring @@s!", getitemlink(Plushroom));
+
+    goto L_Quit;
+
+L_Never:
+    if (.@visited < 2)
+    {
+        setq General_Rumly, 1;
+    }
+
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        lg("I am sure that you will change your mind.");
+
+    goto L_Quit;
+
+L_Quit:
+    setnpcdir "Rumly#001-1", 4;
+    stopnpctimer;
+    initnpctimer;
+
+    goodbye;
+
+OnTimer1800:
+    stopnpctimer;
+
+    if (getnpcdir("Rumly#001-1") == 2) setnpcdir "Rumly#001-1", 6;
+    if (getnpcdir("Rumly#001-1") == 4) setnpcdir "Rumly#001-1", 8;
+
+    end;
+
+OnInit:
+    .sex = G_MALE;
+    end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 90ebfc55f..fbebc881b 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -64,14 +64,12 @@
 @include "npc/003-2-0/_import.txt"
 @include "npc/003-2-1/_import.txt"
 @include "npc/003-2-2/_import.txt"
-@include "npc/004-1-1-1/_import.txt"
-@include "npc/004-1-1/_import.txt"
-@include "npc/004-1/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
 @include "npc/005-3/_import.txt"
 @include "npc/005-4/_import.txt"
 @include "npc/005-5/_import.txt"
+@include "npc/005-6/_import.txt"
 @include "npc/008-1/_import.txt"
 @include "npc/008-2-0/_import.txt"
 @include "npc/008-2-1/_import.txt"