summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/card_trader.txt72
-rw-r--r--npc/other/monster_race.txt6
-rw-r--r--npc/other/resetskill.txt1
3 files changed, 38 insertions, 41 deletions
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt
index cc07c0b51..8afff06e7 100644
--- a/npc/other/card_trader.txt
+++ b/npc/other/card_trader.txt
@@ -19,44 +19,44 @@
prontera,115,90,0 script Putty 90,{
if (!.card[1]) {
setarray .card1[0], 4001,4006,4009,4019,4075,4033,4012,4016,4026,4022,
- 4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
- 4101,4104,4110,4114,4119,4108,4095,4231,4280,4008,
- 4011,4013,4014,4015,4020,4032,4037,4039,4041,4045,
- 4046,4010,4023,4029,4052,4048,4056,4071,4093,4031,
- 4036,4034,4042,4055,4061,4087,4096,4116,4122,4170,
- 4215,4220,4228,4226,4212,4227,4267,4257,4278,4286,
- 4287,4292,4311,4315,4319,4322,4084,4078,4113,4149,
- 4153,4196,4240,4247,4256,4057,4066,4067,4112,4150,
- 4152,4186,4187,4181,4173,4167,4162,4176,4195,4193,
- 4200,4223,4194,4190,4189,4192,4224,4244,4248,4261,
- 4260,4259,4274,4275,4313,4299,4304,4294,4076,4127,
- 4154,4157,4156,4213,4214,4225,4235;
+ 4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
+ 4101,4104,4110,4114,4119,4108,4095,4231,4280,4008,
+ 4011,4013,4014,4015,4020,4032,4037,4039,4041,4045,
+ 4046,4010,4023,4029,4052,4048,4056,4071,4093,4031,
+ 4036,4034,4042,4055,4061,4087,4096,4116,4122,4170,
+ 4215,4220,4228,4226,4212,4227,4267,4257,4278,4286,
+ 4287,4292,4311,4315,4319,4322,4084,4078,4113,4149,
+ 4153,4196,4240,4247,4256,4057,4066,4067,4112,4150,
+ 4152,4186,4187,4181,4173,4167,4162,4176,4195,4193,
+ 4200,4223,4194,4190,4189,4192,4224,4244,4248,4261,
+ 4260,4259,4274,4275,4313,4299,4304,4294,4076,4127,
+ 4154,4157,4156,4213,4214,4225,4235;
setarray .card2[0], 4293,4297,4288,4283,4295,4307,4308,4309,4132,4326,
- 4341,4335,4337,4345,4344,4331,4333,4332,4089,4161,
- 4177,4178,4180,4184,4191,4206,4199,4273,4282,4268,
- 4289,4321,4316,4343,4339,4369,4377,4385,4383,4382,
- 4380,4381,4378,4379,4390,4389,4388,4391,4405,4400,
- 4401,4402,4404,4002,4003,4004,4005,4007,4017,4024,
- 4030,4035,4040,4043,4044,4049,4051,4053,4058,4060,
- 4062,4063,4064,4065,4068,4069,4070,4072,4073,4074,
- 4077,4080,4082,4083,4085,4086,4088,4091,4092,4097,
- 4098,4099,4100,4102,4103,4106,4107,4109,4111,4115,
- 4117,4118,4120,4124,4125,4126,4138,4139,4141,4151,
- 4158,4164,4165,4182,4185,4159,4160,4166,4172,4175,
- 4188,4201,4202,4204,4205,4208,4209;
+ 4341,4335,4337,4345,4344,4331,4333,4332,4089,4161,
+ 4177,4178,4180,4184,4191,4206,4199,4273,4282,4268,
+ 4289,4321,4316,4343,4339,4369,4377,4385,4383,4382,
+ 4380,4381,4378,4379,4390,4389,4388,4391,4405,4400,
+ 4401,4402,4404,4002,4003,4004,4005,4007,4017,4024,
+ 4030,4035,4040,4043,4044,4049,4051,4053,4058,4060,
+ 4062,4063,4064,4065,4068,4069,4070,4072,4073,4074,
+ 4077,4080,4082,4083,4085,4086,4088,4091,4092,4097,
+ 4098,4099,4100,4102,4103,4106,4107,4109,4111,4115,
+ 4117,4118,4120,4124,4125,4126,4138,4139,4141,4151,
+ 4158,4164,4165,4182,4185,4159,4160,4166,4172,4175,
+ 4188,4201,4202,4204,4205,4208,4209;
setarray .card3[0], 4120,4216,4217,4219,4221,4222,4230,4234,4233,4232,
- 4237,4238,4242,4243,4245,4246,4249,4252,4255,4258,
- 4262,4264,4276,4270,4271,4218,4239,4251,4253,4269,
- 4334,4105,4133,4136,4229,4272,4277,4279,4281,4284,
- 4285,4290,4296,4298,4301,4310,4314,4317,4325,4327,
- 4328,4329,4338,4340,4346,4347,4348,4349,4350,4351,
- 4353,4354,4355,4356,4358,4360,4362,4364,4366,4368,
- 4370,4371,4373,4375,4387,4406,4129,4155,4291,4392,
- 4393,4394,4409,4410,4411,4412,4413,4414,4415,4416,
- 4417,4418,4420,4421,4422,4423,4424,4427,4427,4428,
- 4429,4431,4432,4433,4434,4435,4436,4437,4438,4439,
- 4440,4442,4443,4444,4445,4447,4448,4449,4450,4452,
- 4453;
+ 4237,4238,4242,4243,4245,4246,4249,4252,4255,4258,
+ 4262,4264,4276,4270,4271,4218,4239,4251,4253,4269,
+ 4334,4105,4133,4136,4229,4272,4277,4279,4281,4284,
+ 4285,4290,4296,4298,4301,4310,4314,4317,4325,4327,
+ 4328,4329,4338,4340,4346,4347,4348,4349,4350,4351,
+ 4353,4354,4355,4356,4358,4360,4362,4364,4366,4368,
+ 4370,4371,4373,4375,4387,4406,4129,4155,4291,4392,
+ 4393,4394,4409,4410,4411,4412,4413,4414,4415,4416,
+ 4417,4418,4420,4421,4422,4423,4424,4427,4427,4428,
+ 4429,4431,4432,4433,4434,4435,4436,4437,4438,4439,
+ 4440,4442,4443,4444,4445,4447,4448,4449,4450,4452,
+ 4453;
setarray .card[1], getarraysize(.card1), getarraysize(.card2), getarraysize(.card3);
}
set .@points,oversea_event9;
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index d5b7d08b5..91db569e3 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -25,7 +25,6 @@
//= Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph]
//============================================================
-//============================================================
// Monstrer Race - Single Monster Race
//============================================================
hugel,51,61,0 script #race_timer1-1 -1,{
@@ -996,7 +995,6 @@ p_track01,55,28,0 duplicate(Tire_1) Tire6#4 -1,0,0
p_track01,51,28,0 duplicate(Tire_1) Tire6#5 -1,0,0
p_track01,47,28,0 duplicate(Tire_1) Tire6#6 -1,0,0
-//============================================================
// Monstrer Race - Dual Monster Race
//============================================================
hugel,47,56,0 script #race_timer2-1 -1,{
@@ -2037,8 +2035,7 @@ p_track02,55,28,0 duplicate(Tire_1) Tire#race02_6_4 -1,0,0
p_track02,51,28,0 duplicate(Tire_1) Tire#race02_6_5 -1,0,0
p_track02,47,28,0 duplicate(Tire_1) Tire#race02_6_6 -1,0,0
-//============================================================
-// NPCs for Redeeming Price Medals (Einbroch and Hugel)
+// NPCs for Redeeming Prize Medals (Einbroch and Hugel)
//============================================================
ein_in01,85,208,5 script Ei'felle#repay01 854,{
if (!ein_medal01) {
@@ -2769,7 +2766,6 @@ hugel,71,83,4 script Wayne 900,{
}
}
-//============================================================
// Monstrer Race Affiliated NPCs
//============================================================
airplane,246,47,1 script Eocatt#decoy01 878,{
diff --git a/npc/other/resetskill.txt b/npc/other/resetskill.txt
index 10e63fa0f..811d16aed 100644
--- a/npc/other/resetskill.txt
+++ b/npc/other/resetskill.txt
@@ -14,6 +14,7 @@
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//============================================================
+
prontera,146,232,4 script Hypnotist#2 124,{
mes "[Hypnotist]";
mes "Greetings, adventurer.";