Added optional Pre-Renewal Brasilis (#8480)

db/import-tmpl/mob_summon.yml

@@ -33,3 +33,24 @@ Header:
   Type: MOB_SUMMONABLE_DB
   Version: 1
 
+#Body:
+# Pre-re Brasilis
+#=============================================================
+#  - Group: BLOODY_DEAD_BRANCH
+#    Summon:
+#      - Mob: BOITATA
+#        Rate: 1000000
+#  - Group: Branch_Of_Dead_Tree
+#    Summon:
+#      - Mob: IARA
+#        Rate: 71428
+#      - Mob: PIRANHA
+#        Rate: 71428
+#      - Mob: HEADLESS_MULE
+#        Rate: 71428
+#      - Mob: JAGUAR
+#        Rate: 71428
+#      - Mob: TOUCAN
+#        Rate: 71428
+#      - Mob: CURUPIRA
+#        Rate: 71428

db/pre-re/pet_db.yml

@@ -866,3 +866,14 @@ Body:
         bonus2 bSubEle,Ele_Fire,2;
         bonus2 bAddEle,Ele_Fire,2;
       }
+  - Mob: E_HYDRA
+    TameItem: Leaf_Cat_Ball
+    EggItem: Mystic_Leaf_Cat_Ball
+    Fullness: 0
+    HungryDelay: 0
+    IntimacyStart: 0
+    IntimacyFed: 0
+    IntimacyOverfed: 0
+    IntimacyOwnerDie: 0
+    CaptureRate: 50
+    SpecialPerformance: false

npc/re/cities/brasilis.txt → npc/cities/brasilis.txt

@@ -1,26 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Brasilis Town
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.4
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Brasilis Town Script
-//===== Additional Comments: ================================= 
-//= 1.0 First version. Transportation and Basic NPCs.
+//===== Changelog: ===========================================
+//= 1.0 First version. Transportation and Basic NPCs. [L0ne_W0lf]
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
 //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //= 1.4 Added VIP features. [Euphy]
-//============================================================ 
+//============================================================
 
 // Brasilis Transportation :: brasilis_trans
 //============================================================
-/* Pre-Renewal coordinates: alberta,247,115,3 */
-alberta,246,82,3	script	Crewman#bra2	100,{
+-	script	::Crewman_bra2	-1,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
 	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";

npc/custom/warper.txt

@@ -110,7 +110,18 @@ function Pick {
 	Go(.@map$,.@x,.@y);
 }
 function Restrict {
-	if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
+	.@type = getarg(0);
+	
+	if (.@type == "Brasilis") {
+		// If the official warper to Brasilis is enabled, meaning is either
+		// Renewal mode or Pre-renewal Brasilis is enabled, we lift the restriction
+		if (getnpcid(0, "Crewman_bra2"))
+			return;
+		// Otherwise we apply the renewal restriction
+		.@type = "RE";
+	}
+
+	if ((.@type == "RE" && !checkre(0)) || (.@type == "Pre-RE" && checkre(0))) {
 		if (getarg(1,0)) {
 			set @warp_block,0;
 			for (set .@i,1; .@i<getargcount(); set .@i,.@i+1)
@@ -141,7 +152,7 @@ T2: Go("alberta",28,234);
 T3: Go("aldebaran",140,131);
 T4: Go("amatsu",198,84);
 T5: Go("ayothaya",208,166);
-T6: Restrict("RE");
+T6: Restrict("Brasilis");
 	Go("brasilis",196,217);
 T7: Go("comodo",209,143);
 T8: Restrict("RE");
@@ -218,7 +229,7 @@ F2: setarray @c[2],173,134,212,150;
 F3: Restrict("RE");
 	setarray @c[2],193,220,220,187;
 	Disp("Bifrost Field",1,2); Pick("bif_fild");
-F4: Restrict("RE");
+F4: Restrict("Brasilis");
 	setarray @c[2],74,32;
 	Disp("Brasilis Field",1,1); Pick("bra_fild");
 F5: Restrict("Pre-RE",5);
@@ -343,7 +354,7 @@ D7: Restrict("RE");
 D8: Restrict("RE",4,5);
 	setarray @c[2],150,288,150,18,140,134,244,52,100,202;
 	Disp("Bio Lab 1:Bio Lab 2:Bio Lab 3:Bio Lab 4:Tomb of the Fallen"); Pick("","lhz_dun01","lhz_dun02","lhz_dun03","lhz_dun04","lhz_dun_n");
-D9: Restrict("RE");
+D9: Restrict("Brasilis");
 	setarray @c[2],87,47,262,262;
 	Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
 D10: Restrict("RE",6);

npc/kafras/kafras.txt

@@ -687,3 +687,12 @@ alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
 	savepoint "alb2trea",92,64,1,1;
 	callfunc "F_KafEnd",0,1,"at Sunken Ship";
 }
+
+// Brasilis
+//============================================================
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,3,0,80,700;
+	savepoint "brasilis",195,259,1,1;
+	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
+}

npc/mapflag/night.txt

@@ -298,6 +298,12 @@ man_fild02	mapflag	nightenabled
 splendide	mapflag	nightenabled
 spl_fild01	mapflag	nightenabled
 
+//============================================================
+// Brasilis
+//============================================================
+brasilis	mapflag	nightenabled
+bra_fild01	mapflag	nightenabled
+
 //============================================================
 // Events
 //============================================================

npc/mapflag/nobranch.txt

@@ -371,6 +371,12 @@ splendide	mapflag	nobranch
 spl_in01	mapflag	nobranch
 spl_in02	mapflag	nobranch
 
+//============================================================
+// Brasilis
+//============================================================
+brasilis	mapflag	nobranch
+bra_in01	mapflag	nobranch
+
 //============================================================
 // RWC
 //============================================================

npc/mapflag/nomemo.txt

@@ -731,6 +731,13 @@ spl_fild01	mapflag	nomemo
 spl_in01	mapflag	nomemo
 spl_in02	mapflag	nomemo
 
+//============================================================
+// Brasilis
+//============================================================
+bra_in01	mapflag	nomemo
+bra_dun01	mapflag	nomemo
+bra_dun02	mapflag	nomemo
+
 //evt_zombie	mapflag	nomemo
 
 //============================================================

npc/mapflag/nopenalty.txt

@@ -25,6 +25,8 @@ ama_in01	mapflag	nopenalty
 ama_in02	mapflag	nopenalty
 ama_test	mapflag	nopenalty
 arena_room	mapflag	nopenalty
+brasilis	mapflag	nopenalty
+bra_in01	mapflag	nopenalty
 comodo	mapflag	nopenalty
 cmd_in01	mapflag	nopenalty
 cmd_in02	mapflag	nopenalty

npc/mapflag/nopvp.txt

@@ -58,6 +58,8 @@ aldebaran	mapflag	pvp	off
 ama_in01	mapflag	pvp	off
 ama_in02	mapflag	pvp	off
 amatsu	mapflag	pvp	off
+brasilis	mapflag	pvp	off
+bra_in01	mapflag	pvp	off
 cmd_in01	mapflag	pvp	off
 cmd_in02	mapflag	pvp	off
 comodo	mapflag	pvp	off

npc/mapflag/noteleport.txt

@@ -426,7 +426,7 @@ bat_a01	mapflag	noteleport
 bat_a02	mapflag	noteleport
 
 //============================================================
-// Episode 13
+// Episode 13.2
 //============================================================
 mid_campin	mapflag	noteleport
 moc_fild22b	mapflag	noteleport
@@ -438,6 +438,11 @@ man_in01	mapflag	noteleport
 spl_in01	mapflag	noteleport
 spl_in02	mapflag	noteleport
 
+//============================================================
+// Brasilis
+//============================================================
+bra_in01	mapflag	noteleport
+
 //============================================================
 // Orc's Memory
 //============================================================

npc/mapflag/reset.txt

@@ -14,6 +14,7 @@ alberta	mapflag	reset
 aldebaran	mapflag	reset
 amatsu	mapflag	reset
 ayothaya	mapflag	reset
+brasilis	mapflag	reset
 comodo	mapflag	reset
 einbroch	mapflag	reset
 einbech	mapflag	reset

npc/mapflag/town.txt

@@ -28,3 +28,4 @@ louyang	mapflag	town
 hugel	mapflag	town
 rachel	mapflag	town
 veins	mapflag	town
+brasilis	mapflag	town

npc/merchants/inn.txt

@@ -203,6 +203,47 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	}
 }
 
+//======================== Brasilis =================================
+bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
+	mes "[Hotel Keeper]";
+	mes "Welcome to the beautiful Brasilis Hotel.";
+	next;
+	switch(select("Save:Rest -5000 zeny:Cancel")) {
+	case 1:
+		mes "[Hotel Keeper]";
+		mes "Do you want to save here at the Brasilis Hotel?";
+		next;
+		switch(select("No thank you.:Absolutely.")) {
+		case 1:
+			mes "[Hotel Keeper]";
+			mes "Ok then, enjoy your stay.";
+			close;
+		case 2:
+			mes "[Hotel Keeper]";
+			mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
+			savepoint "bra_in01",144,69,1,1;
+			close;
+		}
+		end;
+	case 2:
+		if (Zeny > 4999) {
+			mes "[Hotel Keeper]";
+			mes "I will show you a great room.";
+			close2;
+			if (Zeny < 5000)
+				end;
+			Zeny -= 5000;
+			percentheal 100,100;
+			warp "bra_in01",144,69;
+			end;
+		}
+		mes "[Hotel Keeper]";
+		mes "I'm sorry, but the service charge is 5,000 zeny per night.";
+	case 3:
+		close;
+	}
+}
+
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	.@npc_name$ = getarg(0);

npc/pre-re/cities/brasilis.txt

@@ -0,0 +1,20 @@
+//===== rAthena Script =======================================
+//= Brasilis Town Pre-Renewal
+//===== Description: =========================================
+//= [Official Conversion based on bRO & jRO servers]
+//= Brasilis town NPCs.
+//
+// Note:
+// - Brasilis was introduced in Pre-Renewal only for bRO and
+//   jRO official servers with differences in monster stats,
+//   spawns and quests.
+//   It was added in Renewal for every other official server.
+//   Since we follow kRO this is disabled by default.
+//   You can enable it on npc/pre-re/scripts_athena.conf
+//===== Changelog: ===========================================
+//= 1.0 First Version [Daegaladh]
+//============================================================
+
+// Brasilis Transportation :: brasilis_trans
+//============================================================
+alberta,247,115,3	duplicate(Crewman_bra2)	Crewman#bra2	100

npc/pre-re/guides/guides_brasilis.txt

@@ -0,0 +1,77 @@
+//===== rAthena Script =======================================
+//= Brasilis Guide
+//===== Description: =========================================
+//= [Official Conversion based on bRO & jRO servers]
+//= Guide for the city of Brasilis.
+//
+// Note:
+// - Brasilis was introduced in Pre-Renewal only for bRO and
+//   jRO official servers with differences in monster stats,
+//   spawns and quests.
+//   It was added in Renewal for every other official server.
+//   Since we follow kRO this is disabled by default.
+//   You can enable it on npc/pre-re/scripts_athena.conf
+//===== Changelog: ===========================================
+//= 1.0 First Version [Daegaladh]
+//============================================================
+
+brasilis,219,97,3	script	Brasilis Guide	478,{
+	mes "[Brasilis Guide]";
+	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
+	mes "If you have any questions, please ask me.";
+	next;
+	switch(select("Ask about locations:Remove Marks from Mini-Map:Cancel")) {
+	case 1:
+		mes "[Brasilis Guide]";
+		mes "Where can I guide you?";
+		next;
+		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]")) {
+		case 1:
+			mes "[Brasilis Guide]";
+			mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 1,274,151,2,0xFF3355;
+			close;
+		case 2:
+			mes "[Brasilis Guide]";
+			mes "Do you want to go through the rough jungle? You can take a ";
+			mes "Jungle Cable here ^CE6300+^000000.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 1,308,335,3,0xCE6300;
+			close;
+		case 3:
+			mes "[Brasilis Guide]";
+			mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 1,137,167,4,0x00FF00;
+			close;
+		case 4:
+			mes "[Brasilis Guide]";
+			mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 1,254,248,5,0x55FF33;
+			close;
+		case 5:
+			mes "[Brasilis Guide]";
+			mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 1,195,235,6,0x3355FF;
+			close;
+		}
+		end;
+	case 2:
+		mes "[Brasilis Guide]";
+		mes "I'll remove all marks from your mini-map.";
+		mes "Is there anything else I can do for you?";
+		viewpoint 0,274,151,2,0x00FF00;
+		viewpoint 0,308,335,3,0x00FF00;
+		viewpoint 0,137,167,4,0x00FF00;
+		viewpoint 0,254,248,5,0x00FF00;
+		viewpoint 0,195,235,6,0x00FF00;
+		close;
+	case 3:
+		mes "[Brasilis Guide]";
+		mes "Wandering on your own is always the best way to explore. Anyway, take care.";
+		close;
+	}
+}

npc/pre-re/mobs/dungeons/bra_dun.txt

@@ -0,0 +1,64 @@
+//===== rAthena Script =======================================
+//= Brasilis Dungeon Monster Spawn Script
+//===== Description: =========================================
+//= [Official Conversion based on bRO & jRO servers]
+//
+// Note:
+// - Brasilis was introduced in Pre-Renewal only for bRO and
+//   jRO official servers with differences in monster stats,
+//   spawns and quests.
+//   It was added in Renewal for every other official server.
+//   Since we follow kRO this is disabled by default.
+//   You can enable it on npc/pre-re/scripts_athena.conf
+//===== Changelog: ===========================================
+//= 1.0 First Version [Playtester]
+//============================================================
+
+//bRO Pre-Renewal spawns
+
+//==================================================
+// bra_dun01 - Behind the Waterfall
+//==================================================
+bra_dun01	monster	Iara	2069,60,5000
+bra_dun01	monster	Piranha	2070,100,5000
+bra_dun01	monster	Hydra	1068,10,5000
+bra_dun01	monster	Plankton	1161,10,5000
+bra_dun01	monster	Marina	1141,10,5000
+bra_dun01	monster	Black Mushroom	1084,10,180000,90000
+
+//==================================================
+// bra_dun02 - Behind the Waterfall
+//==================================================
+bra_dun02	monster	Iara	2069,120,5000
+bra_dun02	monster	Piranha	2070,80,5000
+bra_dun02	monster	Hydra	1068,20,5000
+bra_dun02	monster	Plankton	1161,20,5000
+bra_dun02	monster	Marina	1141,10,5000
+bra_dun02	monster	Black Mushroom	1084,10,180000,90000
+bra_dun02	boss_monster	Boitata	2068,1,7200000,600000,1
+
+
+//jRO Pre-Renewal spawns
+
+//==================================================
+// bra_dun01 - Behind the Waterfall
+//==================================================
+//bra_dun01	monster	Kukre	1070,40,5000
+//bra_dun01	monster	Hydra	1068,60,5000
+//bra_dun01	monster	Marina	1141,5,5000
+//bra_dun01	monster	Thara Frog	1034,40,5000
+//bra_dun01	monster	Piranha	2070,50,5000
+//bra_dun01	monster	Iara	2069,30,5000
+//bra_dun01	monster	Headless Mule	2071,10,5000
+//bra_dun01	monster	Black Mushroom	1084,5,120000,60000
+
+//==================================================
+// bra_dun02 - Behind the Waterfall
+//==================================================
+//bra_dun02	monster	Hydra	1068,20,5000
+//bra_dun02	monster	Piranha	2070,60,5000
+//bra_dun02	monster	Iara	2069,40,5000
+//bra_dun02	monster	Headless Mule	2071,40,5000
+//bra_dun02	monster	Shining Plant	1083,1,1800000,900000
+//bra_dun02	monster	Red Mushroom	1084,5,120000,60000
+//bra_dun02	boss_monster	Boitata	2068,1,7200000,600000,1

npc/pre-re/mobs/fields/brasilis.txt

@@ -0,0 +1,48 @@
+//===== rAthena Script =======================================
+//= Brasilis Fields Monster Spawn Script
+//===== Description: =========================================
+//= [Official Conversion based on bRO & jRO servers]
+//
+// Note:
+// - Brasilis was introduced in Pre-Renewal only for bRO and
+//   jRO official servers with differences in monster stats,
+//   spawns and quests.
+//   It was added in Renewal for every other official server.
+//   Since we follow kRO this is disabled by default.
+//   You can enable it on npc/pre-re/scripts_athena.conf
+//===== Changelog: ===========================================
+//= 1.0 First Version [Playtester]
+//============================================================
+
+//==================================================
+// Brasilis, Strange Hydras
+//==================================================
+brasilis,283,88,6,6	monster	Strange Hydra	2081,5,30000
+brasilis,284,104,6,6	monster	Strange Hydra	2081,4,30000
+brasilis,215,80,6,6	monster	Strange Hydra	2081,4,30000
+brasilis,96,50,8,8	monster	Strange Hydra	2081,5,30000
+
+//bRO Pre-Renewal spawns
+
+//==================================================
+// bra_fild01 - Brasilis Field
+//==================================================
+bra_fild01	monster	Headless Mule	2071,40,5000
+bra_fild01	monster	Curupira	2074,80,5000
+bra_fild01	monster	Dokebi	1110,20,5000
+bra_fild01	monster	Jaguar	2072,10,5000
+bra_fild01	monster	Savage	1166,20,5000
+bra_fild01	monster	Toucan	2073,10,5000
+bra_fild01	monster	Red Mushroom	1085,3,360000,180000
+
+//jRO Pre-Renewal spawns
+
+//==================================================
+// bra_fild01
+//==================================================
+//bra_fild01	monster	Savage	1166,10,5000
+//bra_fild01	monster	Dokebi	1110,20,5000
+//bra_fild01	monster	Curupira	2074,50,5000
+//bra_fild01	monster	Jaguar	2072,35,5000
+//bra_fild01	monster	Toucan	2073,40,5000
+//bra_fild01	monster	Red Mushroom	1085,5,120000,60000

npc/pre-re/scripts_athena.conf

@@ -98,3 +98,34 @@ npc: npc/pre-re/quests/quests_nameless.txt
 npc: npc/pre-re/quests/quests_niflheim.txt
 npc: npc/pre-re/quests/the_sign_quest.txt
 npc: npc/pre-re/quests/quests_veins.txt
+
+// - Disable Brasilis by default --------------------------------
+// DO NOT COMMENT!!!
+// Instead, follow the instructions below.
+// --------------------------------------------------------------
+delnpc: npc/cities/brasilis.txt
+delnpc: npc/quests/quests_brasilis.txt
+delnpc: npc/warps/cities/brasilis.txt
+delnpc: npc/warps/dungeons/bra_dun.txt
+delnpc: npc/warps/fields/bra_fild.txt
+
+// -------------------- Pre-Renewal Brasilis --------------------
+// Brasilis was introduced in Pre-Renewal only for bRO and
+// jRO official servers with differences in monster stats,
+// spawns and quests.
+// It was added in Renewal for every other official server.
+// Since we follow kRO this is disabled by default.
+//
+// Uncomment the following NPC scripts to enable bRO/jRO's
+// Pre-Renewal version of Brasilis.
+// You also need to uncomment the data from file
+// mob_summon.yml in /db/import/ folder
+//npc: npc/cities/brasilis.txt
+//npc: npc/quests/quests_brasilis.txt
+//npc: npc/warps/cities/brasilis.txt
+//npc: npc/warps/dungeons/bra_dun.txt
+//npc: npc/warps/fields/bra_fild.txt
+//npc: npc/pre-re/cities/brasilis.txt
+//npc: npc/pre-re/guides/guides_brasilis.txt
+//npc: npc/pre-re/mobs/dungeons/bra_dun.txt
+//npc: npc/pre-re/mobs/fields/brasilis.txt

npc/re/quests/quests_brasilis.txt → npc/quests/quests_brasilis.txt

@@ -1,12 +1,6 @@
 //===== rAthena Script =======================================
 //= Brasilis Quests
-//===== By ===================================================
-//= L0ne_W0lf
-//===== Version ==============================================
-//= 1.3
-//===== Compatible With ======================================
-//= rAthena Project
-//===== Description ==========================================
+//===== Description: =========================================
 //= [Official Conversion]
 //= Lost Puppies (Repeatable, 24 hours.)
 //= Suspicious Beach (Repeatable, 24 hours. iRO/cRO version.)
@@ -14,13 +8,14 @@
 //= Brasilis Water Lily Quest
 //= Brasilis Dungeon Access Quest
 //= Iara (Buff reward. Repeatable, 24 hours.)
-//===== Comments =============================================
-//= 1.0 First version.
-//= 1.1 Hydra Ball (12408)
+//===== Changelog: ===========================================
+//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Hydra Ball (12408). [og2]
 //= 1.2 Optimization. [Euphy]
 //= 1.2a Added 'consumeitem' command. [Euphy]
 //= 1.3 Added VIP features and fixed some EXP values. [Euphy]
 //= 1.3a Clean-up. [Capuche]
+//= 1.4 Added pre-renewal differences [Daegaladh]
 //============================================================
 
 // Lost Puppies :: dogdog.sc
@@ -59,10 +54,12 @@ brasilis,297,307,5	script	Angelo#br	1_M_04,{
 		erasequest 9031;
 		setquest 9032;
 		specialeffect2 EF_ASSUMPTIO;
-		consumeitem 607; //Yggdrasilberry
-		.@rand = rand(1,10);
-		if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
-		else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
+		if (checkre(0)) {
+			consumeitem 607; //Yggdrasilberry
+			.@rand = rand(1,10);
+			if (.@rand > 4 && .@rand < 9) getitem 504,2; //White_Potion
+			else if (.@rand > 8) getitem 608,1; //Seed_Of_Yggdrasil
+		}
 		close;
 	}
 	mes "[Angelo]";
@@ -229,11 +226,15 @@ brasilis,192,133,6	script	Lucia#brasilis	4_F_BRZ_WOMAN,{
 				//recall_completequest 9029;
 				if (.@nQState2 > -1) erasequest 9029;
 				setquest 9029;
-				consumeitem 607; //Yggdrasilberry
+				if (checkre(0))
+					consumeitem 607; //Yggdrasilberry
 				consumeitem 12070; //Luk_Dish05
 				consumeitem 12055; //Vit_Dish05
 				consumeitem 12065; //Dex_Dish05
-				getitem 11502,3; //Light_Blue_Pot
+				if (checkre(0))
+					getitem 11502,3; //Light_Blue_Pot
+				else
+					getitem 505,5; //Blue_Potion
 				close;
 			}
 			else {
@@ -410,10 +411,12 @@ brasilis,187,162,5	script	Candy Maker	4_M_BRZ_MAN1,{
 		brazil_gua = 11;
 		completequest 2200;
 		getitem 12414,1; //Guarana_Candy
-		if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
-			getexp 105000,15000;
-		else
-			getexp 70000,10000;
+		if (checkre(0)) {
+			if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
+				getexp 105000,15000;
+			else
+				getexp 70000,10000;
+		}
 		close;
 	}
 	else if (brazil_gua == 11) {
@@ -1030,9 +1033,9 @@ brasilis,203,286,3	script	Botanist Karmen#bra	4_F_HUWOMAN,{
 		brazil_regia = 10;
 		completequest 2207;
 		if (VIP_SCRIPT && vip_status(VIP_STATUS_ACTIVE))
-			getexp 75000,15000;
+			getexp 75000, checkre(0)?15000:0;
 		else
-			getexp 50000,10000;
+			getexp 50000, checkre(0)?10000:0;
 		close;
 	}
 	else {
@@ -2855,9 +2858,13 @@ bra_dun02,157,74,5	script	Iara#nk	4_F_BRZ_WOMAN,2,2,{
 			mes "But... I think that the curse has been with me too long.";
 			mes "Get away from me quickly.";
 			delitem 11517,1; //Puri_Potion
-			percentheal 100,100;
-			sc_start SC_INCFLEE,3600000,20;
-			sc_start SC_INCCRI,3600000,10;
+			if (checkre(0)) {
+				percentheal 100,100;
+				sc_start SC_INCFLEE,3600000,20;
+				sc_start SC_INCCRI,3600000,10;
+			}
+			else
+				sc_start SC_INCCRI,3600000,7;
 			consumeitem 12043; //Str_Dish03
 			consumeitem 12063; //Dex_Dish03
 			consumeitem 12058; //Agi_Dish03

npc/re/cities/alberta.txt

@@ -21,6 +21,10 @@ alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
 //============================================================
 alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843
 
+// cities/brasilis.txt
+//============================================================
+alberta,246,82,3	duplicate(Crewman_bra2)	Crewman#bra2	100
+
 // cities/gonryun.txt
 //============================================================
 alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776

npc/re/guides/guides_brasilis.txt

@@ -1,19 +1,13 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Brasilis Guide
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
-//= [Official Conversion]
+//===== Description: =========================================
+//= [Official Conversion based on bRO & jRO servers]
 //= Guide for the city of Brasilis.
-//===== Additional Comments: ================================= 
-//= 1.0 First Version, Renewal guide.
-//= 1.1 Added a missing close.
+//===== Changelog: ===========================================
+//= 1.0 First Version, Renewal guide. [L0ne_W0lf]
+//= 1.1 Added a missing close. [L0ne_W0lf]
 //= 1.2 Navigation system update. [Euphy]
-//============================================================ 
+//============================================================
 
 brasilis,219,97,3	script	Brasilis Guide	478,{
 	mes "[Brasilis Guide]";
@@ -59,6 +53,7 @@ brasilis,219,97,3	script	Brasilis Guide	478,{
 			viewpoint 1,195,235,6,0x3355FF;
 			close;
 		}
+		end;
 	case 2:
 		mes "[Brasilis Guide]";
 		mes "I'll remove all marks from your mini-map.";

npc/re/kafras/kafras.txt

@@ -29,15 +29,6 @@
 //= 1.7 Added Rock Ridge Kafra. [Capuche]
 //============================================================ 
 
-// Brasilis
-//============================================================
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
-	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,3,0,80,700;
-	savepoint "brasilis",195,259,1,1;
-	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
-}
-
 // Dewata
 //============================================================
 dewata,202,184,6	script	Kafra Employee::kaf_dewata	4_F_KAFRA1,{

npc/re/mapflag/night.txt

@@ -8,10 +8,8 @@
 //============================================================
 
 //============================================================
-// Episode 13
+// Episode 13.3
 //============================================================
-brasilis	mapflag	nightenabled
-bra_fild01	mapflag	nightenabled
 dicastes01	mapflag	nightenabled
 dicastes02	mapflag	nightenabled
 dic_fild01	mapflag	nightenabled

npc/re/mapflag/nobranch.txt

@@ -42,12 +42,6 @@ job3_war01	mapflag	nobranch
 job3_war02	mapflag	nobranch
 jupe_core2	mapflag	nobranch
 
-//============================================================
-// Brasilis
-//============================================================
-brasilis	mapflag	nobranch
-bra_in01	mapflag	nobranch
-
 //============================================================
 // Episode 13.3
 //============================================================

npc/re/mapflag/nomemo.txt

@@ -18,7 +18,7 @@
 paramk	mapflag	nomemo
 
 //============================================================
-// Episode 13
+// Episode 13.3
 //============================================================
 job3_arch01	mapflag	nomemo
 job3_arch02	mapflag	nomemo
@@ -37,9 +37,6 @@ job3_gen01	mapflag	nomemo
 job3_sha01	mapflag	nomemo
 jupe_core2	mapflag	nomemo
 s_atelier	mapflag	nomemo
-bra_in01	mapflag	nomemo
-bra_dun01	mapflag	nomemo
-bra_dun02	mapflag	nomemo
 dicastes01	mapflag	nomemo
 dicastes02	mapflag	nomemo
 dic_in01	mapflag	nomemo

npc/re/mapflag/nopenalty.txt

@@ -16,8 +16,6 @@ paramk	mapflag	nopenalty
 //============================================================
 // Municipality (Cities/Towns/Villages)
 //============================================================
-brasilis	mapflag	nopenalty
-bra_in01	mapflag	nopenalty
 dicastes01	mapflag	nopenalty
 dicastes02	mapflag	nopenalty
 dic_in01	mapflag	nopenalty

npc/re/mapflag/nopvp.txt

@@ -85,8 +85,6 @@ paramk	mapflag	pvp	off
 // Municipality (Cities/Towns/Villages)
 //============================================================
 moc_para01	mapflag	pvp	off
-brasilis	mapflag	pvp	off
-bra_in01	mapflag	pvp	off
 dicastes01	mapflag	pvp	off
 dicastes02	mapflag	pvp	off
 dic_in01	mapflag	pvp	off

npc/re/mapflag/noteleport.txt

@@ -26,10 +26,9 @@ paramk	mapflag	noteleport
 moc_para01	mapflag	noteleport
 
 //============================================================
-// Episode 13
+// Episode 13.3
 //============================================================
 s_atelier	mapflag	noteleport
-bra_in01	mapflag	noteleport
 dic_in01	mapflag	noteleport
 job3_gen01	mapflag	noteleport
 job3_sha01	mapflag	noteleport

npc/re/mapflag/reset.txt

@@ -7,7 +7,6 @@
 //= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-brasilis	mapflag	reset
 dewata	mapflag	reset
 dicastes01	mapflag	reset
 dicastes02	mapflag	reset

npc/re/mapflag/restricted.txt

@@ -247,7 +247,6 @@ lhz_d_n2	mapflag	restricted	6
 //============================================================
 // Municipality (Cities/Towns/Villages)
 //============================================================
-brasilis	mapflag	restricted	7
 dewata	mapflag	restricted	7
 dicastes01	mapflag	restricted	7
 eclage	mapflag	restricted	7

npc/re/mapflag/town.txt

@@ -7,7 +7,6 @@
 //= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-brasilis	mapflag	town
 dewata	mapflag	town
 dicastes01	mapflag	town
 eclage	mapflag	town

npc/re/merchants/inn.txt

@@ -1,54 +0,0 @@
-//===== rAthena Script =======================================
-//= Inn Npcs
-//===== By: ==================================================
-//= c, L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Description: =========================================
-//= Inn Npcs, Save and Heal
-//===== Additional Comments: =================================
-//= 1.0 Added Brasilis inn receptionist. [c]
-//= 1.1 Updated dialog for Brasilis inn. [L0ne_W0lf]
-//============================================================
-
-// Brasilis
-//============================================================
-bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
-	mes "[Hotel Keeper]";
-	mes "Welcome to the beautiful Brasilis Hotel.";
-	next;
-	switch(select("Save:Rest -5000 zeny")) {
-	case 1:
-		mes "[Hotel Keeper]";
-		mes "Do you want to save here at the Brasilis Hotel?";
-		next;
-		switch(select("No thank you.:Absolutely.")) {
-		case 1:
-			mes "[Hotel Keeper]";
-			mes "Ok then, enjoy your stay.";
-			close;
-		case 2:
-			mes "[Hotel Keeper]";
-			mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
-			savepoint "bra_in01",144,69,1,1;
-			close;
-		}
-	case 2:
-		if (Zeny > 4999) {
-			mes "[Hotel Keeper]";
-			mes "I will show you a great room.";
-			close2;
-			set Zeny, Zeny-5000;
-			percentheal 100,100;
-			warp "bra_in01",144,69;
-			end;
-		}
-		else {
-			mes "[Hotel Keeper]";
-			mes "I'm sorry, but the service charge is 5,000 zeny per night.";
-			close;
-		}
-	}
-}

npc/re/mobs/dungeons/bra_dun.txt

@@ -1,37 +1,29 @@
 //===== rAthena Script =======================================
 //= Brasilis Dungeon Monster Spawn Script
-//===== By: ==================================================
-//= Kisuka
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Description: =========================================
-//= Official monster spawns in Brasilis Dungeon.
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
 //= 1.0 Official spawns from Aegis [Kisuka]
 //============================================================
 
 //==================================================
 // bra_dun01 - Behind the Waterfall
 //==================================================
-bra_dun01,0,0	monster	Piranha	2070,80,5000
-bra_dun01,0,0	monster	Iara	2069,30,5000
-bra_dun01,0,0	monster	Black Mushroom	1084,5,180000,90000
-bra_dun01,0,0	monster	Marina	1141,20,5000
-bra_dun01,0,0	monster	Kukre	1070,10,5000
-bra_dun01,0,0	monster	Plankton	1161,10,5000
-bra_dun01,0,0	monster	Hydra	1068,15,5000
+bra_dun01	monster	Piranha	2070,80,5000
+bra_dun01	monster	Iara	2069,30,5000
+bra_dun01	monster	Black Mushroom	1084,5,180000,90000
+bra_dun01	monster	Marina	1141,20,5000
+bra_dun01	monster	Kukre	1070,10,5000
+bra_dun01	monster	Plankton	1161,10,5000
+bra_dun01	monster	Hydra	1068,15,5000
 
 //==================================================
 // bra_dun02 - Behind the Waterfall
 //==================================================
-bra_dun02,0,0	monster	Piranha	2070,60,5000
-bra_dun02,0,0	monster	Iara	2069,110,5000
-bra_dun02,0,0	monster	Marina	1141,10,5000
-bra_dun02,0,0	monster	Kukre	1070,10,5000
-bra_dun02,0,0	monster	Plankton	1161,10,5000
-bra_dun02,0,0	monster	Hydra	1068,15,5000
-bra_dun02,0,0	monster	Shining Plant	1083,2,5000
-bra_dun02,0,0	monster	Black Mushroom	1084,5,5000
-bra_dun02,0,0,0,0	boss_monster	Boitata	2068,1,7200000,600000,1
+bra_dun02	monster	Piranha	2070,60,5000
+bra_dun02	monster	Iara	2069,110,5000
+bra_dun02	monster	Marina	1141,10,5000
+bra_dun02	monster	Kukre	1070,10,5000
+bra_dun02	monster	Plankton	1161,10,5000
+bra_dun02	monster	Hydra	1068,15,5000
+bra_dun02	monster	Shining Plant	1083,2,5000
+bra_dun02	monster	Black Mushroom	1084,5,5000
+bra_dun02	boss_monster	Boitata	2068,1,7200000,600000,1

npc/re/mobs/fields/brasilis.txt

@@ -1,22 +1,16 @@
 //===== rAthena Script =======================================
 //= Brasilis Fields Monster Spawn Script
-//===== By: ==================================================
-//= Kisuka
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Additional Comments: =================================
+//===== Changelog: ===========================================
 //= 1.0 Official spawns from Aegis [Kisuka]
 //============================================================
 
 //==================================================
 // bra_fild01 - Brasilis Field
 //==================================================
-bra_fild01,0,0	monster	Curupira	2074,50,5000
-bra_fild01,0,0	monster	Dokebi	1110,10,5000
-bra_fild01,0,0	monster	Savage	1166,5,5000
-bra_fild01,0,0	monster	Headless Mule	2071,40,5000
-bra_fild01,0,0	monster	Red Mushroom	1085,5,5000
-bra_fild01,0,0	monster	Jaguar	2072,55,5000
-bra_fild01,0,0	monster	Toucan	2073,60,5000
+bra_fild01	monster	Curupira	2074,50,5000
+bra_fild01	monster	Dokebi	1110,10,5000
+bra_fild01	monster	Savage	1166,5,5000
+bra_fild01	monster	Headless Mule	2071,40,5000
+bra_fild01	monster	Red Mushroom	1085,5,5000
+bra_fild01	monster	Jaguar	2072,55,5000
+bra_fild01	monster	Toucan	2073,60,5000

npc/re/scripts_athena.conf

@@ -14,7 +14,6 @@ npc: npc/re/battleground/bg_common.txt
 
 // --------------------------- Cities ---------------------------
 npc: npc/re/cities/alberta.txt
-npc: npc/re/cities/brasilis.txt
 npc: npc/re/cities/comodo.txt
 npc: npc/re/cities/dewata.txt
 npc: npc/re/cities/dicastes.txt
@@ -154,7 +153,6 @@ npc: npc/re/merchants/guild_warehouse.txt
 npc: npc/re/merchants/hd_refiner.txt
 npc: npc/re/merchants/HorrorToyFactory_merchants.txt
 npc: npc/re/merchants/InfiniteSpace_merchants.txt
-npc: npc/re/merchants/inn.txt
 npc: npc/re/merchants/malangdo_costume.txt
 npc: npc/re/merchants/moro_cav_exchange.txt
 npc: npc/re/merchants/mysterious_cookie_shop.txt
@@ -246,7 +244,6 @@ npc: npc/re/quests/quests_17_1.txt
 npc: npc/re/quests/quests_17_2.txt
 npc: npc/re/quests/quests_18_1.txt
 npc: npc/re/quests/quests_aldebaran.txt
-npc: npc/re/quests/quests_brasilis.txt
 npc: npc/re/quests/quests_dewata.txt
 npc: npc/re/quests/quests_dicastes.txt
 npc: npc/re/quests/quests_dungeons_200.txt

npc/re/scripts_warps.conf

@@ -4,7 +4,6 @@
 
 // --------------------------- Cities ---------------------------
 npc: npc/re/warps/cities/alberta.txt
-npc: npc/re/warps/cities/brasilis.txt
 npc: npc/re/warps/cities/dewata.txt
 npc: npc/re/warps/cities/dicastes.txt
 npc: npc/re/warps/cities/eclage.txt
@@ -22,7 +21,6 @@ npc: npc/re/warps/cities/yggdrasil.txt
 
 // -------------------------- Dungeons --------------------------
 npc: npc/re/warps/dungeons/amicitia.txt
-npc: npc/re/warps/dungeons/bra_dun.txt
 npc: npc/re/warps/dungeons/dic_dun.txt
 npc: npc/re/warps/dungeons/ecl_dun.txt
 npc: npc/re/warps/dungeons/ein_dun.txt
@@ -39,7 +37,6 @@ npc: npc/re/warps/dungeons/thor_v.txt
 
 // --------------------------- Fields ---------------------------
 npc: npc/re/warps/fields/bif_fild.txt
-npc: npc/re/warps/fields/bra_fild.txt
 npc: npc/re/warps/fields/com_fild.txt
 npc: npc/re/warps/fields/dic_fild.txt
 npc: npc/re/warps/fields/geffen_fild.txt

npc/re/warps/dungeons/bra_dun.txt

@@ -1,17 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Dungeon Warp
-//===== By: ==================================================
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Description: =========================================
-//= [Official Conversion]
-//= Brasilis Dungeon warp script
-//===== Additional Comments: =================================
-//= 1.0 First version.
-//============================================================
-
-bra_dun01,199,35,0	warp	brad1tobrad2	1,1,bra_dun02,261,263
-bra_dun02,261,265,0	warp	brad2tobrad1	1,1,bra_dun01,199,37

npc/re/warps/fields/bra_fild.txt

@@ -1,17 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Fild Warps Script
-//===== By: ==================================================
-//= Protimus
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena Project
-//===== Description: =========================================
-//= [Official Conversion]
-//= Warp Points for Brasilis
-//===== Additional Comments: =================================
-//= 1.0 First version.
-//============================================================
-
-bra_fild01,72,34,0	warp	bra_fild01_brasilis	1,1,brasilis,309,334
-brasilis,308,336,0	warp	brasilis_bra_fild01	1,1,bra_fild01,74,34

npc/scripts_athena.conf

@@ -34,6 +34,7 @@ npc: npc/cities/alberta.txt
 npc: npc/cities/aldebaran.txt
 npc: npc/cities/amatsu.txt
 npc: npc/cities/ayothaya.txt
+npc: npc/cities/brasilis.txt
 npc: npc/cities/comodo.txt
 npc: npc/cities/einbech.txt
 npc: npc/cities/einbroch.txt
@@ -250,6 +251,7 @@ npc: npc/quests/quests_alberta.txt
 npc: npc/quests/quests_aldebaran.txt
 npc: npc/quests/quests_amatsu.txt
 npc: npc/quests/quests_ayothaya.txt
+npc: npc/quests/quests_brasilis.txt
 npc: npc/quests/quests_comodo.txt
 npc: npc/quests/quests_ein.txt
 npc: npc/quests/quests_geffen.txt

npc/scripts_warps.conf

@@ -7,6 +7,7 @@ npc: npc/warps/cities/alberta.txt
 npc: npc/warps/cities/aldebaran.txt
 npc: npc/warps/cities/amatsu.txt
 npc: npc/warps/cities/ayothaya.txt
+npc: npc/warps/cities/brasilis.txt
 npc: npc/warps/cities/comodo.txt
 npc: npc/warps/cities/einbech.txt
 npc: npc/warps/cities/einbroch.txt
@@ -37,6 +38,7 @@ npc: npc/warps/dungeons/ama_dun.txt
 npc: npc/warps/dungeons/anthell.txt
 npc: npc/warps/dungeons/ayo_dun.txt
 npc: npc/warps/dungeons/beach_dun.txt
+npc: npc/warps/dungeons/bra_dun.txt
 npc: npc/warps/dungeons/c_tower.txt
 npc: npc/warps/dungeons/ein_dun.txt
 npc: npc/warps/dungeons/gef_dun.txt
@@ -67,6 +69,7 @@ npc: npc/warps/dungeons/xmas_dun.txt
 // --------------------------- Fields ---------------------------
 npc: npc/warps/fields/abyss_warper.txt
 npc: npc/warps/fields/amatsu_fild.txt
+npc: npc/warps/fields/bra_fild.txt
 npc: npc/warps/fields/ein_fild.txt
 npc: npc/warps/fields/gefenia.txt
 npc: npc/warps/fields/glastheim.txt

npc/re/warps/cities/brasilis.txt → npc/warps/cities/brasilis.txt

@@ -1,16 +1,7 @@
 //===== rAthena Script =======================================
-//= Brasilis Town Warps Script
-//===== By: ==================================================
-//= L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= rAthena Project; RO Episode 13.1+
-//===== Description: =========================================
-//= [Official Conversion]
-//= Warp Points for Brasilis
-//===== Additional Comments: =================================
-//= 1.0 First version.
+//= Brasilis Town Warps
+//===== Changelog: ===========================================
+//= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Fixed warps according to official. [Protimus]
 //= 1.1a Added Field warp according to official. [Jguy]
 //= 1.2 Added missing warps & removed duplicated one. [Daegaladh]

npc/warps/dungeons/bra_dun.txt

@@ -0,0 +1,8 @@
+//===== rAthena Script =======================================
+//= Brasilis Dungeon Warps
+//===== Changelog: ===========================================
+//= 1.0 First version. [L0ne_W0lf]
+//============================================================
+
+bra_dun01,199,35,0	warp	brad1tobrad2	1,1,bra_dun02,261,263
+bra_dun02,261,265,0	warp	brad2tobrad1	1,1,bra_dun01,199,37

npc/warps/fields/bra_fild.txt

@@ -0,0 +1,8 @@
+//===== rAthena Script =======================================
+//= Brasilis Field Warps
+//===== Changelog: ===========================================
+//= 1.0 First version. [Protimus]
+//============================================================
+
+bra_fild01,72,34,0	warp	bra_fild01_brasilis	1,1,brasilis,309,334
+brasilis,308,336,0	warp	brasilis_bra_fild01	1,1,bra_fild01,74,34