summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-10-19 16:21:21 -0500
committerWushin <pasekei@gmail.com>2014-10-19 16:21:21 -0500
commit4526fb388dabd53a1f6f4c987b11c5d0afb2489e (patch)
treeeb8a90f43c982fd63d308604bdfd6df828a329e7
parent9109657bc83b052f910ee1a10406e6be89faf8af (diff)
parent5c888ebb044c8f3e3cedbef23b94e424ed5f0520 (diff)
downloadserverdata-4526fb388dabd53a1f6f4c987b11c5d0afb2489e.tar.gz
serverdata-4526fb388dabd53a1f6f4c987b11c5d0afb2489e.tar.bz2
serverdata-4526fb388dabd53a1f6f4c987b11c5d0afb2489e.tar.xz
serverdata-4526fb388dabd53a1f6f4c987b11c5d0afb2489e.zip
Merge pull request #176 from mekolat/contributor
fix contributor shirts
-rw-r--r--world/map/db/chest_item_db.txt19
-rw-r--r--world/map/npc/001-1/bleacher.txt6
-rw-r--r--world/map/npc/009-2/selim.txt7
3 files changed, 25 insertions, 7 deletions
diff --git a/world/map/db/chest_item_db.txt b/world/map/db/chest_item_db.txt
index 06d25276..de94086c 100644
--- a/world/map/db/chest_item_db.txt
+++ b/world/map/db/chest_item_db.txt
@@ -28,13 +28,7 @@
798, SorcererRobeRed, Sorcerer Robe Red, 5, 8000, 4000, 5, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
870, FineDress, Fine Dress, 5, 10000, 5000, 35, 0, 8, 0, 3, 0, 2, 512, 0, 0, 0, {}, {}
880, LazuriteRobe, Lazurite Robe, 5, 92000, 52000, 30, 0, 7, 0, 60, 0, 2, 512, 0, 90, 0, {}, {set @bStat, bInt;set @minbStatVal, 70;callfunc "RequireStat"; set @bStat, bVit;set @minbStatVal, 40;callfunc "RequireStat"; bonus bSpeedAddRate, -15; bonus bDef2Rate, -40; bonus bMdef, 60; bonus bVit, -1; bonus bInt, 7; bonus bLuk, -1; bonus bDex, -1; bonus bStr, -1;}
-1176, LightBlueContributor, Light Blue Contributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1177, BrownContributor, Brown Contributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1178, WhiteContributor, WhiteContributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1179, GreenContributor, GreenContributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1180, PurpleContributor, PurpleContributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1181, YellowContributor, YellowContributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
-1182, RedContributor, RedContributor, 5, 8000, 4000, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+1178, ContributorShirt, ContributorShirt, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
1183, AmberChristmasSweater, Amber Christmas Sweater, 5, 2000, 1000, 35, 0, 6, 0, -12, 0, 2, 512, 0, 0, 0, {}, {}
1184, FunkyChristmasSweater, Funky Christmas Sweater, 5, 2000, 1000, 35, 0, 6, 0, -12, 0, 2, 512, 0, 0, 0, {}, {}
1185, PinkChristmasSweater, Pink Christmas Sweater, 5, 8000, 4000, 30, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {}
@@ -238,3 +232,14 @@
5107, PurpleSorcererRobeWhite, Purple Sorcerer Robe Wh, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5108, DarkGreenSorcererRobeWh, Dark Green Sorcerer Rob, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5109, SorcererRobeWhite, Sorcerer Robe White, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
+//ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
+5131, RedContributor, Red Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5132, GreenContributor, Green Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5133, DarkBlueContributor, Dark Blue Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5134, YellowContributor, Yellow Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5135, LightBlueContributor, Light Blue Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5136, PinkContributor, Pink Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5137, BlackContributor, Black Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5138, OrangeContributor, Orange Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5139, PurpleContributor, Purple Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
+5140, DarkGreenContributor, Dark Green Contributor, 5, 0, 0, 20, 0, 5, 0, 5, 0, 2, 512, 0, 0, 0, {}, {}
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index e6fada9c..baed6f2e 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -22,6 +22,7 @@ L_bleach_menu:
menu
"Cotton shirt.", L_cottonshirt,
+ "Contributor shirt.", L_contributor,
"V-Neck sweater.", L_vneck,
"Turtleneck sweater.", L_tneck,
"Cotton shorts.", L_shorts,
@@ -44,6 +45,11 @@ L_bleach_menu:
"Cotton cloth.", L_cotton_cloth,
"Nevermind.", L_Close;
+L_contributor:
+ set @normal, 1178;
+ set @dyeBase, 5131;
+ goto L_choose_color;
+
L_cottonshirt:
set @normal, 1202;
set @dyeBase, 2050;
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index cf18d30c..81531749 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -38,9 +38,16 @@ L_clothes_choice:
"Sorcerer robe.", L_sorcererrobe,
"Bowler hat (brown).", L_bowlerhatbrown,
"Fine dress.", L_finedress,
+ "Contributor Shirt.", L_contributor,
"About these sorcerer robes...", L_asksorcererrobe,
"I'm fine for now, thanks.", L_Close;
+L_contributor:
+ set @del, 1178;
+ set @new, 5131;
+ set @name$, "contributor shirt";
+ goto L_picked_item;
+
L_cottonshirt:
set @del, 1202;
set @new, 2050;