From 8ab68e93d65461f7206417d3a81447a7f29a4d43 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 8 Jun 2018 11:24:10 -0300 Subject: Rename all candor fight occurences to 'fefe' (32 occurrences) --- npc/005-1/warpcandorbattle.txt | 2 +- npc/006-1/barrier.txt | 2 +- npc/006-1/crazyfefe.txt | 50 +++++++++++++++++++++--------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/npc/005-1/warpcandorbattle.txt b/npc/005-1/warpcandorbattle.txt index 964aff26c..be0e8d622 100644 --- a/npc/005-1/warpcandorbattle.txt +++ b/npc/005-1/warpcandorbattle.txt @@ -7,7 +7,7 @@ end; OnTouch: - if (BaseLevel >= 40 && !$@FIGHT_CAVE_LEVEL) + if (BaseLevel >= 40 && !$@FEFE_CAVE_LEVEL) warp "006-1", 49, 53; else if (BaseLevel >= 40) npctalk l("You don't have the required level to pass this barrier."); diff --git a/npc/006-1/barrier.txt b/npc/006-1/barrier.txt index 279211b1c..99598d9cc 100644 --- a/npc/006-1/barrier.txt +++ b/npc/006-1/barrier.txt @@ -4,7 +4,7 @@ // Jesusalva 006-1,49,54,0 script #FightCaveBarrier NPC_NO_SPRITE,0,0,{ - if ($@FIGHT_CAVE_LEVEL) goto L_Block; + if ($@FEFE_CAVE_LEVEL) goto L_Block; warp "005-1", 59, 53; end; diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt index efde8e3df..0d30c730e 100644 --- a/npc/006-1/crazyfefe.txt +++ b/npc/006-1/crazyfefe.txt @@ -5,19 +5,19 @@ // Description: // Crazyfefe will wake up when he smells battle // Variables: -// $@FIGHT_CAVE_LEVEL +// $@FEFE_CAVE_LEVEL // Tracks if a fight is going on, and the current round if true. // $@FEFE_DELAY // Tracks the delay between challenges. Also used to start the combat. -// $@FIGHT_CAVE_HERO$ +// $@FEFE_CAVE_HERO$ // Whoever started a fight. Also used to know if a fight is about to begin. -// $@FIGHT_CAVE_PLAYER_COUNT +// $@FEFE_CAVE_PLAYER_COUNT // How many players are there -// $@FIGHT_WAVE +// $@FEFE_WAVE // Current wave 006-1,47,22,0 script Crazyfefe NPC_STATUE_EVILMAN,{ - if ($@FIGHT_CAVE_LEVEL) goto L_Enjoy; + if ($@FEFE_CAVE_LEVEL) goto L_Enjoy; if ($@FEFE_DELAY > gettimetick(2)) goto L_Wait; mesn; mesq l("Who dares to disturb my slumber?"); @@ -43,7 +43,7 @@ L_Next: goto L_Exit; // Already started? - if ($@FIGHT_CAVE_LEVEL || $@FIGHT_CAVE_HERO$ != "") + if ($@FEFE_CAVE_LEVEL || $@FEFE_CAVE_HERO$ != "") goto L_AlreadyStarted; // Enough money? @@ -53,9 +53,9 @@ L_Next: Zeny = Zeny - .price; // Time delay $@FEFE_DELAY = gettimetick(2)+300*(@menu-1); - $@FIGHT_CAVE_HERO$ = strcharinfo(0); + $@FEFE_CAVE_HERO$ = strcharinfo(0); initnpctimer; - announce $@FIGHT_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc; + announce $@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc; mesn; mesq l("Please wait, the fight will start in @@, as requested.", FuzzyTime($@FEFE_DELAY,2,2)); close; @@ -65,9 +65,9 @@ L_StartFight: if (getmapusers("006-1") < 3) goto L_NotEnoughPlayers; - $@FIGHT_CAVE_LEVEL = 1; + $@FEFE_CAVE_LEVEL = 1; $@FEFE_DELAY = gettimetick(2)+.delay; - $@FIGHT_CAVE_PLAYER_COUNT = getmapusers("006-1"); + $@FEFE_CAVE_PLAYER_COUNT = getmapusers("006-1"); mapannounce("006-1", "The battle is about to begin!", bc_map); initnpctimer; end; @@ -75,7 +75,7 @@ L_StartFight: L_Enjoy: npctalk3 l("Pay attention to the fight, @@!", strcharinfo(0)); if (is_gm()) - dispbottom l("Round @@", $@FIGHT_CAVE_LEVEL); + dispbottom l("Round @@", $@FEFE_CAVE_LEVEL); end; L_NotEnough: @@ -85,7 +85,7 @@ L_NotEnough: L_AlreadyStarted: mesn; - mesq l("Sorry, @@ already started the fight.", $@FIGHT_CAVE_HERO$); + mesq l("Sorry, @@ already started the fight.", $@FEFE_CAVE_HERO$); close; L_Wait: @@ -130,7 +130,7 @@ L_Exit: // Check if we're ready for next wave. Otherwise, do this check again after 5 seconds. L_CaveLogic: - $@FIGHT_CAVE_PLAYER_COUNT = getmapusers("006-1"); + $@FEFE_CAVE_PLAYER_COUNT = getmapusers("006-1"); if (mobcount("006-1", "Crazyfefe::OnPetDeath") <= 0) goto L_NextRound; @@ -138,7 +138,7 @@ L_CaveLogic: // WARNING, of dead players still in cave are counted, we might never finish the fight. // And a GM might be called to ban everyone inside. // To enable debug, comment last part of victory condition. - if ($@FIGHT_CAVE_PLAYER_COUNT <= rand(1,2)) + if ($@FEFE_CAVE_PLAYER_COUNT <= rand(1,2)) goto L_CleanUp; // reset timer @@ -146,17 +146,17 @@ L_CaveLogic: end; L_NextRound: - $@FIGHT_WAVE = $@FIGHT_WAVE + 1; + $@FEFE_WAVE = $@FEFE_WAVE + 1; // Prepare next round, and reward survivors - $@FIGHT_CAVE_LEVEL = $@FIGHT_CAVE_LEVEL + $@FIGHT_CAVE_PLAYER_COUNT + rand(1,3); + $@FEFE_CAVE_LEVEL = $@FEFE_CAVE_LEVEL + $@FEFE_CAVE_PLAYER_COUNT + rand(1,3); areatimer "006-1", 20, 20, 70, 60, 10, "Crazyfefe::OnReward"; - mapannounce "006-1", "The wave nº "+$@FIGHT_WAVE+" is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; + mapannounce "006-1", "The wave nº "+$@FEFE_WAVE+" is starting with " + $@FEFE_CAVE_PLAYER_COUNT + " player(s) left alive." , 0; goto L_Summon; // TODO L_Summon: - .@amount=($@FIGHT_CAVE_LEVEL/rand(4,6)); + .@amount=($@FEFE_CAVE_LEVEL/rand(4,6)); for (.@i = 0; .@i < .@amount; ++.@i) { .@mid=rand(1,15); .@monsterId=Piou; @@ -201,9 +201,9 @@ L_CleanUp: mapannounce "006-1", "Game over! Who will be the next to fall on Crazyfefe's Cave?", 0; areatimer "006-1", 20, 20, 70, 60, 10, "Crazyfefe::OnReward"; - $@FIGHT_CAVE_LEVEL = 0; - $@FIGHT_WAVE = 0; - $@FIGHT_CAVE_HERO$ = ""; + $@FEFE_CAVE_LEVEL = 0; + $@FEFE_WAVE = 0; + $@FEFE_CAVE_HERO$ = ""; killmonster "006-1", "Crazyfefe::OnPetDeath"; stopnpctimer; end; @@ -220,23 +220,23 @@ OnReward: if (ispcdead()) end; // Player reward is a random number from 1~3 + lvl/50 (1 point ~= 12~8 mobs) - .@prize=rand(1,3) + ($@FIGHT_CAVE_LEVEL/50); + .@prize=rand(1,3) + ($@FEFE_CAVE_LEVEL/50); Zeny=Zeny+.@prize; getexp .@prize, rand(1,3); end; // Every 5 seconds, handle cave, if fighting. Does nothing when waiting. OnTimer5000: - if ($@FIGHT_CAVE_LEVEL) + if ($@FEFE_CAVE_LEVEL) goto L_CaveLogic; end; // Announces and attempts to start the fight once time run out //OnTimer30000: // to enable debug, uncomment this line OnTimer300000: - if ($@FIGHT_CAVE_LEVEL > 0) end; + if ($@FEFE_CAVE_LEVEL > 0) end; if ($@FEFE_DELAY <= gettimetick(2)) goto L_StartFight; - announce $@FIGHT_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc; + announce $@FEFE_CAVE_HERO$+" invites everyone to a challenge against Candor Cave. It'll start in "+FuzzyTime($@FEFE_DELAY,2,2)+". Prepare yourselves!", bc_all|bc_npc; initnpctimer; end; -- cgit v1.2.3-60-g2f50