Commit e6cc463d authored by Micksha's avatar Micksha

Merge branch 'content' into 'master'

Content

See merge request !247
parents 496adfa9 4fe61e32
Pipeline #157638627 passed with stages
in 23 minutes and 28 seconds
......@@ -112,6 +112,7 @@ map_list: (
"012-3-1",
"012-3-2",
"012-3-3",
"020-1",
"sec_pri",
"test",
"testbg",
......
......@@ -109,6 +109,7 @@
012-3-1 109
012-3-2 110
012-3-3 111
sec_pri 112
test 113
testbg 114
020-1 112
sec_pri 113
test 114
testbg 115
This diff is collapsed.
......@@ -3224,6 +3224,304 @@ mob_db: (
Pearl: 1
}
},
{
Id: 1077
SpriteName: "DesertSnake"
Name: "Desert Snake"
Lv: 35
Hp: 3640
Sp: 0
Exp: 85
JExp: 7
AttackRange: 1
Attack: [250, 425]
Def: 65
Mdef: 10
Stats: {
Str: 35
Agi: 45
Vit: 25
Int: 5
Dex: 60
Luk: 25
}
ViewRange: 1
ChaseRange: 15
Size: 0
Race: 2
Element: (1, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 220
AttackDelay: 1000
AttackMotion: 750
DamageMotion: 1120
Drops: {
}
},
{
Id: 1078
SpriteName: "DesertScorpion"
Name: "Desert Scorpion"
Lv: 28
Hp: 3000
Sp: 0
Exp: 44
JExp: 5
AttackRange: 1
Attack: [220, 350]
Def: 40
Mdef: 15
Stats: {
Str: 45
Agi: 15
Vit: 50
Int: 1
Dex: 30
Luk: 20
}
ViewRange: 7
ChaseRange: 12
Size: 0
Race: 2
Element: (1, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 400
AttackDelay: 1250
AttackMotion: 800
DamageMotion: 500
Drops: {
}
},
{
Id: 1079
SpriteName: "BlackSlime"
Name: "Black Slime"
Lv: 25
Hp: 2650
Sp: 0
Exp: 35
JExp: 4
AttackRange: 1
Attack: [290, 400]
Def: 25
Mdef: 5
Stats: {
Str: 25
Agi: 25
Vit: 45
Int: 1
Dex: 35
Luk: 20
}
ViewRange: 8
ChaseRange: 8
Size: 0
Race: 2
Element: (1, 1)
Mode: {
CanMove: true
CanAttack: false
}
MoveSpeed: 320
AttackDelay: 2262
AttackMotion: 764
DamageMotion: 826
Drops: {
MaggotSlime: 800
}
},
{
Id: 1080
SpriteName: "FireGoblin"
Name: "Fire Goblin"
Lv: 37
Hp: 4042
Sp: 0
Exp: 75
JExp: 8
AttackRange: 1
Attack: [396,499]
Def: 35
Mdef: 25
Stats: {
Str: 25
Agi: 30
Vit: 45
Int: 1
Dex: 25
Luk: 15
}
ChaseRange: 12
Race: 2
Element: (3, 1)
Mode: {
CanMove: true
CanAttack: true
ChangeChase: true
CastSensorChase: true
}
MoveSpeed: 600
AttackDelay: 1872
AttackMotion: 672
DamageMotion: 480
Drops: {
BugLeg: 400
}
},
{
Id: 1081
SpriteName: "BrotherhoodFighter"
Name: "Brotherhood Fighter"
Lv: 30
Hp: 3220
Sp: 0
Exp: 37
JExp: 6
AttackRange: 1
Attack: [175, 300]
Def: 50
Mdef: 10
Stats: {
Str: 45
Agi: 20
Vit: 20
Int: 15
Dex: 30
Luk: 10
}
ViewRange: 6
ChaseRange: 9
Race: 2
Element: (7, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 270
AttackDelay: 870
AttackMotion: 672
DamageMotion: 400
},
{
Id: 1082
SpriteName: "BrotherhoodArcher"
Name: "Brotherhood Archer"
Lv: 32
Hp: 3200
Sp: 0
Exp: 50
JExp: 6
AttackRange: 2
Attack: [300, 440]
Def: 20
Mdef: 20
Stats: {
Str: 10
Agi: 25
Vit: 30
Int: 5
Dex: 60
Luk: 10
}
ViewRange: 6
ChaseRange: 9
Race: 2
Element: (7, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 310
AttackDelay: 2170
AttackMotion: 954
DamageMotion: 620
},
{
Id: 1083
SpriteName: "BrotherhoodLeader"
Name: "Brotherhood Leader"
Lv: 40
Hp: 3900
Sp: 0
Exp: 110
JExp: 13
AttackRange: 2
Attack: [425, 550]
Def: 70
Mdef: 25
Stats: {
Str: 30
Agi: 40
Vit: 30
Int: 20
Dex: 50
Luk: 10
}
ViewRange: 6
ChaseRange: 9
Race: 2
Element: (7, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 240
AttackDelay: 870
AttackMotion: 454
DamageMotion: 420
},
{
Id: 1084
SpriteName: "Skeleton"
Name: "Skeleton"
Lv: 40
Hp: 4100
Sp: 0
Exp: 140
JExp: 17
AttackRange: 1
Attack: [525, 650]
Def: 40
Mdef: 10
Stats: {
Str: 40
Agi: 40
Vit: 30
Int: 20
Dex: 50
Luk: 10
}
ViewRange: 7
ChaseRange: 11
Race: 2
Element: (7, 1)
Mode: {
CanMove: true
CanAttack: true
CastSensorChase: true
ChangeChase: true
}
MoveSpeed: 270
AttackDelay: 1070
AttackMotion: 570
DamageMotion: 450
},
{
Id: 1100
SpriteName: "PoisonSkull"
......
No preview for this file type
......@@ -19,7 +19,7 @@
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Look at your equipment, can you guess what material it is made from?"),
l("Seek a colorant for that material:"),
l("Cotton, cashmere, leather, ..."),
l("Cotton, Silk, leather, ..."),
l("Zinc-Titanium Oxide, Phthalocyanides, Cadmiums, Lazulite..."),
l("Colorant is not the yeying color. Some wear out from light, others look great but inflict itai-itai, and others become spotty or wash-away."),
l("What yoiis should know:"),
......@@ -34,7 +34,7 @@
function sell_dye {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?");
.@tissue_type = select(l("Cotton"), l("Cashmere"));
.@tissue_type = select(l("Cotton"), l("Silk"));
closeclientdialog;
switch (.@tissue_type)
......@@ -43,7 +43,7 @@
shop "Cotton#Dye001-1";
break;
case 2:
shop "Cashmere#Dye001-1";
shop "Silk#Dye001-1";
break;
default:
consolemes(CONSOLEMES_ERROR, "Calypsan script error, tissue_type is incorrect");
......
......@@ -83,23 +83,43 @@ OnClock0000:
restoreshopitem YellowCottonDye, 10;
}
001-1,48,125,0 trader Cashmere#Dye001-1 NPC_NO_SPRITE,{
001-1,48,125,0 trader Silk#Dye001-1 NPC_NO_SPRITE,{
OnInit:
tradertype(NST_MARKET);
sellitem CrimsonCashmereDye, -1, 7;
sellitem ChocolateCashmereDye, -1, 7;
sellitem MintCashmereDye, -1, 7;
sellitem PitchBlackSilkDye, -1, 7;
sellitem ChocolateSilkDye, -1, 7;
sellitem CrimsonSilkDye, -1, 7;
sellitem TomatoSilkDye, -1, 7;
sellitem GoldenrodSilkDye, -1, 7;
sellitem SunflowerSilkDye, -1, 7;
sellitem OliveSilkDye, -1, 7;
sellitem SeaGreenSilkDye, -1, 7;
sellitem MintSilkDye, -1, 7;
sellitem MidnightBlueSilkDye, -1, 7;
sellitem SlatBlueSilkDye, -1, 7;
sellitem OrchidSilkDye, -1, 7;
sellitem PinkiePinkSilkDye, -1, 7;
.sex = G_OTHER;
.distance = 4;
end;
OnClock0000:
restoreshopitem CrimsonCashmereDye, 7;
restoreshopitem ChocolateCashmereDye, 7;
restoreshopitem MintCashmereDye, 7;
restoreshopitem PitchBlackSilkDye, -1, 7;
restoreshopitem ChocolateSilkDye, -1, 7;
restoreshopitem CrimsonSilkDye, -1, 7;
restoreshopitem TomatoSilkDye, -1, 7;
restoreshopitem GoldenrodSilkDye, -1, 7;
restoreshopitem SunflowerSilkDye, -1, 7;
restoreshopitem OliveSilkDye, -1, 7;
restoreshopitem SeaGreenSilkDye, -1, 7;
restoreshopitem MintSilkDye, -1, 7;
restoreshopitem MidnightBlueSilkDye, -1, 7;
restoreshopitem SlatBlueSilkDye, -1, 7;
restoreshopitem OrchidSilkDye, -1, 7;
restoreshopitem PinkiePinkSilkDye, -1, 7;
}
001-1,64,114,0 trader Store#Aquada001-1 NPC_NO_SPRITE,{
......
......@@ -29,4 +29,4 @@
008-3-4,83,44,14,9 monster Red Slime 1074,5,10000,50000
008-3-4,115,67,13,29 monster Red Slime 1074,4,10000,50000
008-3-4,37,79,24,27 monster Yellow Slime 1073,4,10000,50000
008-3-4,111,67,13,29 monster Red Slime 1074,8,20000,75000
008-3-4,111,67,13,29 monster Yellow Slime 1073,8,20000,75000
......@@ -3,7 +3,7 @@
008-3-5,87,83,22,16 monster Cave Maggot 1027,8,2000,20000
008-3-5,79,68,54,12 monster Crafty 1018,12,2500,35000
008-3-5,71,62,49,39 monster Thief Slime 1105,3,20000,100000
008-3-5,90,70,13,29 monster Red Slime 1074,8,20000,75000
008-3-5,90,70,13,29 monster Yellow Slime 1073,8,20000,75000
008-3-5,79,82,21,15 monster Bandit 1063,3,2000,20000
008-3-5,74,66,38,21 monster Snake 1075,3,10000,100000
008-3-5,54,41,26,21 monster Robin Bandit 1064,2,2000,20000
......
// Map 020-1: Tulimshar
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/020-1/_mobs.txt",
"npc/020-1/_warps.txt",
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 020-1: Tulimshar mobs
020-1,165,77,14,12 monster Maggot 1026,6,5000,10000
020-1,222,172,54,18 monster Maggot 1026,15,5000,10000
020-1,282,114,12,39 monster Maggot 1026,5,5000,10000
020-1,175,209,128,38 monster Desert Scorpion 1078,15,12000,36000
020-1,59,158,18,26 monster Desert Scorpion 1078,5,12000,36000
020-1,92,189,58,56 monster Desert Snake 1077,8,18000,72000
020-1,60,174,23,29 monster Black Slime 1079,4,8500,36000
020-1,188,216,84,32 monster Maggot 1026,20,5000,10000
020-1,157,252,9,3 monster Golden Scorpion 1110,1,120000,120000
020-1,167,81,21,11 monster Brotherhood Fighter 1081,3,6000,18000
020-1,279,96,13,15 monster Legion Swordswoman 1066,3,6000,18000
020-1,74,185,23,46 monster Yellow Slime 1073,6,13500,60000
020-1,254,226,44,30 monster Desert Snake 1077,4,18000,36000
020-1,277,248,18,10 monster Thief Slime 1105,3,11500,45000
020-1,126,200,45,11 monster Giant Maggot 1076,2,36000,120000
020-1,70,73,10,16 monster Giant Maggot 1076,2,36000,120000
020-1,70,87,14,16 monster Maggot 1026,6,5000,10000
020-1,70,74,7,10 monster Thief Slime 1105,1,11500,45000
020-1,103,187,58,57 monster Fire Goblin 1080,10,8000,50000
020-1,74,95,0,0 monster Manana Tree 1017,1,420000,240000
020-1,157,130,123,35 monster Tortuga 1004,20,35000,120000
020-1,43,180,4,22 monster Blub 1008,1,60000,120000
020-1,282,249,12,7 monster Blub 1008,1,60000,120000
020-1,114,119,54,62 monster Little Blub 1007,12,25000,120000
020-1,294,95,0,0 monster Crocotree 1010,1,420000,240000
020-1,274,105,0,0 monster Crocotree 1010,1,420000,240000
020-1,278,125,0,0 monster Crocotree 1010,1,420000,240000
020-1,259,146,0,0 monster Crocotree 1010,1,420000,240000
020-1,289,144,0,0 monster Crocotree 1010,1,420000,240000
020-1,246,160,0,0 monster Crocotree 1010,1,420000,240000
020-1,215,184,0,0 monster Crocotree 1010,1,420000,240000
020-1,194,175,0,0 monster Crocotree 1010,1,420000,240000
020-1,187,157,0,0 monster Crocotree 1010,1,420000,240000
020-1,172,154,0,0 monster Crocotree 1010,1,420000,240000
020-1,140,133,0,0 monster Crocotree 1010,1,420000,240000
020-1,176,137,0,0 monster Crocotree 1010,1,420000,240000
020-1,156,84,0,0 monster Crocotree 1010,1,420000,240000
020-1,142,77,0,0 monster Crocotree 1010,1,420000,240000
020-1,104,183,0,0 monster Crocotree 1010,1,420000,240000
020-1,80,194,0,0 monster Crocotree 1010,1,420000,240000
020-1,50,188,0,0 monster Crocotree 1010,1,420000,240000
020-1,49,169,0,0 monster Crocotree 1010,1,420000,240000
020-1,71,166,0,0 monster Crocotree 1010,1,420000,240000
020-1,80,154,0,0 monster Crocotree 1010,1,420000,240000
020-1,90,138,0,0 monster Crocotree 1010,1,420000,240000
020-1,67,142,0,0 monster Crocotree 1010,1,420000,240000
020-1,40,139,0,0 monster Crocotree 1010,1,420000,240000
020-1,39,125,0,0 monster Crocotree 1010,1,420000,240000
020-1,77,124,0,0 monster Crocotree 1010,1,420000,240000
020-1,89,97,0,0 monster Crocotree 1010,1,420000,240000
020-1,63,83,0,0 monster Crocotree 1010,1,420000,240000
020-1,55,96,0,0 monster Crocotree 1010,1,420000,240000
020-1,66,64,0,0 monster Crocotree 1010,1,420000,240000
020-1,291,254,0,0 monster Crocotree 1010,1,420000,240000
020-1,285,246,0,0 monster Crocotree 1010,1,420000,240000
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 020-1: Tulimshar warps
020-1,166,242,0 warp #020-1_166_242 1,0,020-1,165,250
020-1,166,249,0 warp #020-1_166_249 1,0,020-1,165,241
......@@ -8,11 +8,13 @@ OnInit:
htput(.ht, "^ART", "001-1 89 86");
htput(.ht, "^BLACK|SMITH", "001-2-27 35 32");
htput(.ht, "^CAMP|FIRE", "008-1 55 46");
htput(.ht, "^CANDOR", "012-1 49 114");
htput(.ht, "^CITY|^HALL", "001-2-7 36 41");
htput(.ht, "^DIMOND|COVE", "008-1 106 222");
htput(.ht, "^DRA|ISLAND", "000-1 62 111");
htput(.ht, "^FARM|MOUB", "008-1 71 129");
htput(.ht, "^FIRST|^DECK1?$", "000-2-0 23 28");
htput(.ht, "^GARDEN", "020-1 76 99");
htput(.ht, "^HARB|^MASTER", "001-2-16 28 32");
htput(.ht, "^HOLD$", "000-2-2 42 31");
htput(.ht, "^HURN", "008-1 250 109");
......@@ -21,7 +23,9 @@ OnInit:
htput(.ht, "^LIB", "001-2-4 42 35");
htput(.ht, "^LIGHT", "001-2-0 37 32");
htput(.ht, "^LUVIA", "008-1 256 206");
htput(.ht, "^MAGIC|ACAD", "020-1 51 119");
htput(.ht, "^MERCH|^BANK", "001-2-19 28 30");
htput(.ht, "^MINE", "020-1 76 237");
htput(.ht, "^MOON", "001-2-2 40 34");
htput(.ht, "^NARD", "000-2-3 21 28");
htput(.ht, "^NOBLE1?$", "001-2-1 37 37");
......@@ -29,6 +33,7 @@ OnInit:
htput(.ht, "^NOBLE3$", "001-2-11 45 33");
htput(.ht, "^NOBLE4$", "001-2-12 34 32");
htput(.ht, "^NOBLE5$", "001-2-15 34 38");
htput(.ht, "^OASIS", "020-1 287 246");
htput(.ht, "^RED|PLUSH|^INN", "001-2-28 30 35");
htput(.ht, "^ROSSY", "008-3-0 130 108");
htput(.ht, "^SECOND|^DECK2$", "000-2-1 67 32");
......@@ -36,6 +41,7 @@ OnInit:
htput(.ht, "^START2$", "000-0-0 26 28");
htput(.ht, "^START3$", "000-0-1 26 28");
htput(.ht, "^START|^BEGIN", "000-0 22 24");
htput(.ht, "^TULIM|MARKET", "020-1 224 175");
htput(.ht, "^VEIN", "008-3-0 87 172");
htput(.ht, "^WARE", "001-2-18 37 31");
htput(.ht, "^WEST|PORT", "008-1-1 52 60");
......
......@@ -111,6 +111,7 @@
@include "npc/012-3-1/_import.txt"
@include "npc/012-3-2/_import.txt"
@include "npc/012-3-3/_import.txt"
@include "npc/020-1/_import.txt"
@include "npc/sec_pri/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment