diff options
| -rw-r--r-- | npc/other/poring_war.txt | 29 | ||||
| -rw-r--r-- | npc/quests/skills/novice_skills.txt | 4 | ||||
| -rw-r--r-- | npc/re/quests/skills/sage_skills.txt | 55 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
4 files changed, 74 insertions, 16 deletions
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index f81b54f89..6e701b398 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -1,17 +1,20 @@ -//===== Hercules Script ====================================== +//===== rAthena Script ======================================= //= Poring War //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1b +//= 1.2 +//===== Compatible With: ===================================== +//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Poring War //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka][5511] //= 1.1 Fixed some typos/bugs. [CalciumKid] //= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim] //= 1.1b Fixed incorrect label calls. [Euphy] +//= 1.2 Added missing barrier resets, credits to Zopokx. [Euphy] //============================================================ // Poring War Recruiter @@ -929,23 +932,23 @@ OnStop: end; OnAngelingWin: - removemapflag "poring_w02",mf_partylock; - removemapflag "poring_w02",mf_pvp; - removemapflag "poring_w02",mf_pvp_noguild; - removemapflag "poring_w02",mf_pvp_nocalcrank; - mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080; - donpcevent "Deviruchi#wop_endmaster::OnEnable"; - stopnpctimer; - end; - + set .@i,1; OnDevilingWin: removemapflag "poring_w02",mf_partylock; removemapflag "poring_w02",mf_pvp; removemapflag "poring_w02",mf_pvp_noguild; removemapflag "poring_w02",mf_pvp_nocalcrank; - mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080; + if (.@i) + mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080; + else + mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080; donpcevent "Deviruchi#wop_endmaster::OnEnable"; stopnpctimer; + // Reset Barriers + donpcevent "#aroom_ingate_wop::OnDisable"; + donpcevent "#aroom_outgate_wop::OnDisable"; + donpcevent "#droom_ingate_wop::OnDisable"; + donpcevent "#droom_outgate_wop::OnDisable"; end; OnTimer5000: diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt index 92cc797e6..17a670eed 100644 --- a/npc/quests/skills/novice_skills.txt +++ b/npc/quests/skills/novice_skills.txt @@ -15,7 +15,7 @@ //============================================================ prt_in,234,133,4 script Nami 66,{ - if ((Class == Job_Novice) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) { + if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) { mes "[Nami]"; mes "Hello!"; mes "I want to be a nurse so bad!"; @@ -189,7 +189,7 @@ prt_in,234,133,4 script Nami 66,{ } prt_in,73,87,4 script Chivalry Member 65,{ - if ((Class == Job_Novice) && (JobLevel > 6) && ((skill_nov >= 3) && (skill_nov <= 5))) { + if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 6) && ((skill_nov >= 3) && (skill_nov <= 5))) { mes "[Bulma]"; mes "Yeah. . . I look great. . ."; mes "I am a knight in the knight's"; diff --git a/npc/re/quests/skills/sage_skills.txt b/npc/re/quests/skills/sage_skills.txt new file mode 100644 index 000000000..2c92d7bd9 --- /dev/null +++ b/npc/re/quests/skills/sage_skills.txt @@ -0,0 +1,55 @@ +//===== Hercules Script ======================================= +//= Sage Quest Skill's related NPCs +//===== By: ================================================== +//= Zopokx +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Hercules +//===== Description: ========================================= +//= Morocc/Payon Solution duplicate NPCs for Sage Quest Skill +//===== Additional Comments: ================================= +//= 1.0 First version. [Zopokx] +//============================================================ + +moc_ruins,91,150,0 script Ponka-Hontas 93,{ + mes "[Mage Guildsman]"; + mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube."; + next; + if (select("Alright, Deal.:Nah, forget it.") == 1) { + mes "[Mage Guildsman]"; + if (zeny < 50) { + mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee."; + close; + } + if (countitem(1092) == 0) { + mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me."; + close; + } + delitem 1092,1; //Empty_Cylinder + set zeny,zeny-50; + getitem 1088,1; //Morocc_Potion + } + close; +} + +pay_arche,122,100,0 script Dollshoi 88,{ + mes "[Mage Guildsman]"; + mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube."; + next; + if (select("Alright, Deal.:Nah, forget it.") == 1) { + mes "[Mage Guildsman]"; + if (Zeny < 50) { + mes "Hey! You don't have enough money to cover my 50 Zeny charge."; + close; + } + if (countitem(1092) == 0) { + mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube."; + close; + } + delitem 1092,1; //Empty_Cylinder + set zeny,zeny-50; + getitem 1089,1; //Payon_Potion + } + close; +} diff --git a/src/map/script.c b/src/map/script.c index 9a123705b..c1b3cbf70 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7272,7 +7272,7 @@ BUILDIN(successrefitem) clif->additem(sd,i,1,0); pc_equipitem(sd,i,ep); clif->misceffect(&sd->bl,3); - if(sd->status.inventory[i].refine == MAX_REFINE && + if(sd->status.inventory[i].refine == 10 && sd->status.inventory[i].card[0] == CARD0_FORGE && sd->status.char_id == (int)MakeDWord(sd->status.inventory[i].card[2],sd->status.inventory[i].card[3]) ){ // Fame point system [DracoRPG] |