summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2020-06-06 22:04:08 +0200
committerMicksha <Micksha@users.noreply.github.com>2020-06-17 12:45:12 +0200
commit6f891b0a803130dd85fd35d2793e64e9f6d7b5c8 (patch)
tree671fec69eb0bbc4250336e81d60da8d2992469ac
parentbb2052acabb96a949a7f5686b49db7c7e30e0925 (diff)
downloadserverdata-6f891b0a803130dd85fd35d2793e64e9f6d7b5c8.tar.gz
serverdata-6f891b0a803130dd85fd35d2793e64e9f6d7b5c8.tar.bz2
serverdata-6f891b0a803130dd85fd35d2793e64e9f6d7b5c8.tar.xz
serverdata-6f891b0a803130dd85fd35d2793e64e9f6d7b5c8.zip
add skeleton, replace cashmere with silk
-rw-r--r--db/re/mob_db.conf36
-rw-r--r--npc/001-1/calypsan.txt6
-rw-r--r--npc/001-1/shop.txt34
3 files changed, 66 insertions, 10 deletions
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index b2eab0fe..ca0ef908 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3487,6 +3487,42 @@ mob_db: (
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"
Name: "Poison Skull"
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index 36668f1b..ac3cbf3f 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -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");
diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt
index 9d49736f..85e43235 100644
--- a/npc/001-1/shop.txt
+++ b/npc/001-1/shop.txt
@@ -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,{