Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typo update

Browse Source
This commit is contained in:
Atemo 2016-02-29 20:06:24 +01:00
parent c094314b66
commit db53e580af
8 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/re/quest_db.txt
View File

@ -1368,7 +1368,7 @@
7494,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cleanup of the mushroom farm"
// WOE TE Mission
7501,14400,2451,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Suspicious Babe 1"
7501,14400,2451,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"1 Suspicious Babe"
7502,14400,2451,10,0,0,0,0,0,0,0,0,0,0,0,0,0,"10 Suspicious Babes"
7503,14400,2451,30,0,0,0,0,0,0,0,0,0,0,0,0,0,"30 Suspicious Babes"
7504,14400,1288,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Destroy 1 Emperium"

1
db/status_disabled.txt
View File

@ -20,6 +20,7 @@
// 512 - restricted in zone 5
// 1024 - restricted in zone 6
// 2048 - restricted in zone 7
// 4096 - restricted in zone 8
//
// Example:
// SC_ENDURE,4 // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.

2
doc/mapflags.txt
View File

@ -276,7 +276,7 @@ Enables Guild vs. Guild mode on a map and applies the corresponding damage adjus
*gvg_te_castle
Used to determines map is WOE:TE area. Special restrcitions are apllied.
Used to determines map is WOE:TE area. Special restrictions are applied.
---------------------------------------

16
doc/script_commands.txt
View File

@ -6640,6 +6640,20 @@ even though WoE itself may or may not actually be in effect.
---------------------------------------
*gvgon3 "<map name>";
*gvgoff3 "<map name>";
Theses commands behave identically to gvgon/gvgoff, but apply GVG_TE mapflag.
---------------------------------------
*canParticipateSiegeTE {<char id>};
Return 1 if player can participate in WOE:TE, 0 otherwise.
Currently third class, Kagerou/Oboro and Rebellion class can't participate in WOE:TE.
---------------------------------------
*flagemblem <guild id>;
This command only works when run by the NPC objects which have sprite id 722,
@ -6690,7 +6704,7 @@ Type indicates what information to return:
This command will return the relation between 2 guilds.
NOTE: This should be use in collaboration with 'requestguildinfo' as the
NOTE: This should be used in collaboration with 'requestguildinfo' as the
map-server needs to request for information from the char-server.
Return values:

7
npc/re/merchants/te_merchant.txt
View File

@ -3,6 +3,7 @@
//===== Description: =========================================
//= [Official Conversion]
//= Merchants and Rental merchant template for WoE TE
// (duplicates in re/woe_te/<castle file>).
//===== Changelogs: ==========================================
//= 1.0 First Version. [Capuche]
//============================================================
@ -129,16 +130,14 @@ S_Rent:
if (.@s <= .@total_item) {
.@index = .@s *2 +1;
mes "[Rental Items Manager]";
if (countitem(getarg(.@index)) > 0) {
if (countitem(getarg(.@index)) > 0)
mes "You already have "+ getarg(.@index+1) +".";
mes "Do you need anything else?";
}
else {
mes "Here is "+ getarg(.@index+1) +".";
mes "^4d4dffThis item is effective for the next 24 hours^000000 and after that it expires.";
mes "Do you need anything else?";
rentitem getarg(.@index),86400;
}
mes "Do you need anything else?";
next;
}
return;

4
npc/re/other/Global_Functions.txt
View File

@ -4,8 +4,8 @@
//===== Description: =========================================
//= General script functions.
//===== Changelogs: ==========================================
//= 1.0 Added WoeTECheckHour(X) function to check if the woe
// will start in X hour. [Capuche]
//= 1.0 WoeTECheckHour(X) function check if the woe
// will start in X seconds. [Capuche]
//============================================================
// WoeTETimeStart(<seconds>) : return 1 if the woe te will start in less than X seconds, 0 otherwise

10
npc/re/quests/woe_te/te_goditem_alde1.txt
View File

@ -43,14 +43,14 @@ te_aldecas1,226,34,3 script Blacksmith Cano#tegod01 4_M_RACHMAN1,{
mes "I hope I can find that way here.";
close;
}
if ($@2012_tegod_kafra == 0) {
if ($@2012_tegod_kafra == 0) {// quest status
mes "Ah... Master.";
mes "I feel so thankful all the time.";
mes "Since I owe you big time, I'll help you with anything anytime.";
next;
switch( select( "Make Jormungand.","Fuse materials.","Relax." ) ) {
case 1:
if (.@economy > 29) {// economy
if (.@economy > 29) {
if (countitem(6603) > 3 && countitem(6599) > 0 && countitem(6598) > 0 && countitem(6601) > 3 && countitem(6600) > 0 && countitem(6605) > 0 && countitem(6604) > 0 && countitem(1473) > 0) {
mes "^ff0000Wizardry staff is needed in the process of making Jormungand.";
mes "You should not possess any other items except for Wizardry Staffs in order to proceed with the quest.^ff0000";
@ -369,7 +369,7 @@ S_Fuse:
}
OnInit:
if ($@2012_tegod_kafra == 3 || agitcheck3())
if ($@2012_tegod_kafra == 3 || agitcheck3())// 3 -> quest failed
disablenpc strnpcinfo(0);
else
enablenpc strnpcinfo(0);
@ -498,7 +498,7 @@ OnTimer4210000:
OnTimer4220000:
mapannounce "te_aldecas1","Aira: Ah! I can't take it anymore! Girls, come here!",bc_map,"0x00ff00",FW_NORMAL,12;
$@2012_tegod_kafra = 3;// event off until someone break the emp
$@2012_tegod_kafra = 3;// quest off until someone break the emp
callsub S_EventReset;
enablenpc "aldeg-1-11_aldeg-1-15#te";
end;
@ -599,7 +599,7 @@ S_MobRedondant:
end;
OnInit:
$@2012_tegirls_alde01 = 0;
$@2012_tegirls_alde01 = 0;// mob killed count
if ($@2012_tegod_kafra < 3)
$@2012_tegod_kafra = 0;
OnMyMobDead:

2
npc/re/quests/woe_te/te_mission_main.txt
View File

@ -7,7 +7,7 @@
//= 1.0 First Version. [Capuche]
//============================================================
// call duplicate of pop_mission_TE npc to spawn the mobs mission
// This npc call the duplicate of pop_mission_TE npc in order to spawn the mobs mission.
- script #popswitch -1,{
OnInit:
if (strnpcinfo(4) == "") end;