From 572e2c0dcc4e124136f9ad4bc493184e917e8f63 Mon Sep 17 00:00:00 2001 From: ultramage Date: Fri, 2 Mar 2007 00:11:54 +0000 Subject: EOL-styled some more files git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9947 54d463be-8e91-2dee-dedb-b68131a5f0ec --- .../eAAC_Scripts/DonationGirl/sql/donate.sql | 10 +- .../DonationGirl/sql/donate_item_db.sql | 26 ++-- npc/jobs/2-2/sage.txt | 8 +- npc/jobs/novice/supernovice.txt | 2 +- npc/sample/npc_test_setitemx.txt | 140 ++++++++++----------- 5 files changed, 93 insertions(+), 93 deletions(-) (limited to 'npc') diff --git a/npc/custom/eAAC_Scripts/DonationGirl/sql/donate.sql b/npc/custom/eAAC_Scripts/DonationGirl/sql/donate.sql index 3b7eefbed..9315228a9 100644 --- a/npc/custom/eAAC_Scripts/DonationGirl/sql/donate.sql +++ b/npc/custom/eAAC_Scripts/DonationGirl/sql/donate.sql @@ -1,6 +1,6 @@ -CREATE TABLE `donate` ( - `account_id` int(11) unsigned NOT NULL, - `amount` float(5,2) unsigned NOT NULL, - `claimed` float(5,2) unsigned NOT NULL, - PRIMARY KEY (`account_id`,`amount`) +CREATE TABLE `donate` ( + `account_id` int(11) unsigned NOT NULL, + `amount` float(5,2) unsigned NOT NULL, + `claimed` float(5,2) unsigned NOT NULL, + PRIMARY KEY (`account_id`,`amount`) ) TYPE=MyISAM; \ No newline at end of file diff --git a/npc/custom/eAAC_Scripts/DonationGirl/sql/donate_item_db.sql b/npc/custom/eAAC_Scripts/DonationGirl/sql/donate_item_db.sql index 604373139..34519324b 100644 --- a/npc/custom/eAAC_Scripts/DonationGirl/sql/donate_item_db.sql +++ b/npc/custom/eAAC_Scripts/DonationGirl/sql/donate_item_db.sql @@ -1,14 +1,14 @@ -CREATE TABLE `donate_item_db` ( - `id` smallint(5) unsigned NOT NULL default '0', - `name` varchar(30) NOT NULL default '', - `price` float(5,2) unsigned NOT NULL, - PRIMARY KEY (`id`) -) TYPE=MyISAM; - -#(ID,'Name',Price); -REPLACE INTO `donate_item_db` VALUES (601,'Fly_Wing',0.06); -REPLACE INTO `donate_item_db` VALUES (602,'Butterfly_Wing',0.33); -REPLACE INTO `donate_item_db` VALUES (603,'Old_Blue_Box',10); -REPLACE INTO `donate_item_db` VALUES (604,'Dead_Branch',0.05); -REPLACE INTO `donate_item_db` VALUES (605,'Anodyne',2); +CREATE TABLE `donate_item_db` ( + `id` smallint(5) unsigned NOT NULL default '0', + `name` varchar(30) NOT NULL default '', + `price` float(5,2) unsigned NOT NULL, + PRIMARY KEY (`id`) +) TYPE=MyISAM; + +#(ID,'Name',Price); +REPLACE INTO `donate_item_db` VALUES (601,'Fly_Wing',0.06); +REPLACE INTO `donate_item_db` VALUES (602,'Butterfly_Wing',0.33); +REPLACE INTO `donate_item_db` VALUES (603,'Old_Blue_Box',10); +REPLACE INTO `donate_item_db` VALUES (604,'Dead_Branch',0.05); +REPLACE INTO `donate_item_db` VALUES (605,'Anodyne',2); REPLACE INTO `donate_item_db` VALUES (606,'Aloevera',2); \ No newline at end of file diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index cbb79973d..70d38bbc0 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -1558,15 +1558,15 @@ L_Menu1_2: L_Test1_14: mes "15. Which one isn't necessary to unlock the Blacksmith skill 'Maximize Power'?"; next; - menu "Hilt Bending",L_Test1_15,"Skin Tempering",-,"Hammer Fall",L_Test1_15,"Weapon Perfection",L_Test1_15; + menu "Hilt Binding",L_Test1_15,"Skin Tempering",-,"Hammer Fall",L_Test1_15,"Weapon Perfection",L_Test1_15; set @sage_test2,@sage_test2+5; L_Test1_15: - mes "16. What is the defense power and supplemental ability of a Ribbon?"; + mes "16. What is the defense power and supplemental ability of a Cute Ribbon?"; next; menu "0 / SP +20",L_Test1_16,"0 / SP +30",L_Test1_16,"1 / SP +20",-,"1 / SP +30",L_Test1_16; set @sage_test2,@sage_test2+5; L_Test1_16: - mes "17. Which class can't equip a Saint Robe?"; + mes "17. Which class can't equip a Saint's Robe?"; next; //Swordsmen can't equip it either as of this writing. menu "Swordsman",-,"Merchant",L_Test1_17,"Thief",-,"Acolyte",L_Test1_17; @@ -1584,7 +1584,7 @@ L_Menu1_2: L_Test1_19: mes "20. Which tree is said to be the world's root?"; next; - menu "Igg Drasil",-,"Idrasil",L_Menu2_3,"Master",L_Menu2_3,"Old Tree",L_Menu2_3; + menu "Yggdrasil",-,"Idrasil",L_Menu2_3,"Master",L_Menu2_3,"Old Tree",L_Menu2_3; set @sage_test2,@sage_test2+5; goto L_Menu2_3; //================================== diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index 4f94859bb..5212254b6 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -216,7 +216,7 @@ L_Otherjob: // -- Car Rental -- -aldebaran.gat,54,238,5 script Kafra 117,{ +aldebaran.gat,54,238,5 script Kafra::kaf_sn 117,{ if(BaseJob != Job_SuperNovice) goto L_Otherjob; if(checkcart() == 1) goto L_GotCart; mes "[Kafra]"; diff --git a/npc/sample/npc_test_setitemx.txt b/npc/sample/npc_test_setitemx.txt index 1e8d021e4..a13a3f836 100644 --- a/npc/sample/npc_test_setitemx.txt +++ b/npc/sample/npc_test_setitemx.txt @@ -1,70 +1,70 @@ -//by Lupus. -// SVN TRUNK 9940+ only - -//setiteminfo(itemID,n,Value), where n -// 0 value_buy; -// 1 value_sell; -// 2 type; -// 3 maxchance = Max drop chance of this item e.g. 1 = 0.01% , etc.. -// if = 0, then monsters don't drop it at all (rare or a quest item) -// if = 10000, then this item is sold in NPC shops only -// 4 sex; -// 5 equip; -// 6 weight; -// 7 atk; -// 8 def; -// 9 range; -// 10 slot; -// 11 look; -// 12 elv; -// 13 wlv; - -prontera.gat,164,161,5 script Lupus 1013,{ - menu "Make Knife[3] Edible",M_1, - "Make Apple Equippable",M_2, - "Edible Knife = Full SP",M_3, - "Knife = Weapon + 3 Notes",M_4; - close; - -M_1: - //WORKS! - mes "Ok. We Made Knife[3] Edible"; - setiteminfo(1201,2,0); //type = 0 : potion - setitemscript(1201,"{dispbottom \"* You used Knife[3]\";}"); - close; - -M_2: - //WORKS! - mes "Ok. We Made Apple Equippable"; - //item type -> headgear - setiteminfo(512,2,5); //type = 5 - //where to equip to - setiteminfo(512,5,512); //equip = 512 - //set as headgear location - setiteminfo(512,11,256); //loc = 256 - //set Headgear Sprite ID - setiteminfo(512,14,85); //view id = 85 - - setitemscript(512,"{dispbottom \"* Other item's changed\";}",0); - setitemscript(512,"{dispbottom \"* Equipped\";}",1); - setitemscript(512,"{dispbottom \"* Unequipped\";}",2); - close; - -M_3: - //WORKS! - mes "Ok. Now Edible Knife[3] restores your SP"; - setitemscript(1201,2,0); - setitemscript(1201,"{dispbottom \"* You ate Knife[3] + Full SP\"; percentheal 0,100;}"); - close; - -M_4: - //WORKS! - mes "Ok. We Made Knife... a weapon. But added 3 notes."; - setiteminfo(1201,2,4); //type = 4 : weapon again - setitemscript(1201,"{dispbottom \"* 1 Used\";}",0); - setitemscript(1201,"{dispbottom \"* 2 Equipped\";}",1); - setitemscript(1201,"{dispbottom \"* 3 Unequipped\";}",2); - close; - -} - +//by Lupus. +// SVN TRUNK 9940+ only + +//setiteminfo(itemID,n,Value), where n +// 0 value_buy; +// 1 value_sell; +// 2 type; +// 3 maxchance = Max drop chance of this item e.g. 1 = 0.01% , etc.. +// if = 0, then monsters don't drop it at all (rare or a quest item) +// if = 10000, then this item is sold in NPC shops only +// 4 sex; +// 5 equip; +// 6 weight; +// 7 atk; +// 8 def; +// 9 range; +// 10 slot; +// 11 look; +// 12 elv; +// 13 wlv; + +prontera.gat,164,161,5 script Lupus 1013,{ + menu "Make Knife[3] Edible",M_1, + "Make Apple Equippable",M_2, + "Edible Knife = Full SP",M_3, + "Knife = Weapon + 3 Notes",M_4; + close; + +M_1: + //WORKS! + mes "Ok. We Made Knife[3] Edible"; + setiteminfo(1201,2,0); //type = 0 : potion + setitemscript(1201,"{dispbottom \"* You used Knife[3]\";}"); + close; + +M_2: + //WORKS! + mes "Ok. We Made Apple Equippable"; + //item type -> headgear + setiteminfo(512,2,5); //type = 5 + //where to equip to + setiteminfo(512,5,512); //equip = 512 + //set as headgear location + setiteminfo(512,11,256); //loc = 256 + //set Headgear Sprite ID + setiteminfo(512,14,85); //view id = 85 + + setitemscript(512,"{dispbottom \"* Other item's changed\";}",0); + setitemscript(512,"{dispbottom \"* Equipped\";}",1); + setitemscript(512,"{dispbottom \"* Unequipped\";}",2); + close; + +M_3: + //WORKS! + mes "Ok. Now Edible Knife[3] restores your SP"; + setitemscript(1201,2,0); + setitemscript(1201,"{dispbottom \"* You ate Knife[3] + Full SP\"; percentheal 0,100;}"); + close; + +M_4: + //WORKS! + mes "Ok. We Made Knife... a weapon. But added 3 notes."; + setiteminfo(1201,2,4); //type = 4 : weapon again + setitemscript(1201,"{dispbottom \"* 1 Used\";}",0); + setitemscript(1201,"{dispbottom \"* 2 Equipped\";}",1); + setitemscript(1201,"{dispbottom \"* 3 Unequipped\";}",2); + close; + +} + -- cgit v1.2.3-70-g09d2