== Episode 3.0 & more ==

=General:
*Merged missing changes from 3ceam rev. 507

*Cleaned, and organized some database files and other things.
-Organized linkes in skill_reproduce_db.
-Removed 1 unneeded skill tag.
-A few other small things here and there.
-Added missing Wolfs Blood drops.

*Corrected progress bar behavior (Thanks to rAthena)

*Some more work on Episode System
-Comodo NPCs and spawns will now only load on Episode 3.0 and up.
-Star Gladiator, Bard, Dancer and Minstrel Job Quests, all Nameless Island Quests, all Veins Quests and the Valkyrie Realm will also only load on Episode 3.0 and up (for now), they need Comodo.
-All Kafra Warps to Comodo will only work on Episode 3.0 and up.
-Corrected Episode specific mapflags.
-Added support for controlling reset- mapflag via script commands.
-Updated setmapflag/removemapflag commands to support setting a restricted zone.
-Some Quest-NPCs of Eden Group will only load on Episode 3.0 and up (for now), they need Comodo.
-Added full support for episode specific shop npcs and spawn sets.
-Rewrote / optimized episode-code in npc_parse_duplicate.

Changelog-15-3athena.txt

@@ -4,6 +4,27 @@
 // 	* Modifications.
 // 		- Details.
 //========================================
+
+10/01/2016
+	r137 [15peaces]
+		*Merged missing changes from 3ceam rev. 507
+		*Cleaned, and organized some database files and other things.
+			-Organized linkes in skill_reproduce_db.
+			-Removed 1 unneeded skill tag.
+			-A few other small things here and there.
+			-Added missing Wolfs Blood drops.
+		*Corrected progress bar behavior (Thanks to rAthena)
+		*Some more work on Episode System
+			-Comodo NPCs and spawns will now only load on Episode 3.0 and up.
+			-Star Gladiator, Bard, Dancer and Minstrel Job Quests, all Nameless Island Quests, all Veins Quests and the Valkyrie Realm will also only load on Episode 3.0 and up (for now), they need Comodo.
+			-All Kafra Warps to Comodo will only work on Episode 3.0 and up.
+			-Corrected Episode specific mapflags.
+			-Added support for controlling reset- mapflag via script commands.
+			-Updated setmapflag/removemapflag commands to support setting a restricted zone.
+			-Some Quest-NPCs of Eden Group will only load on Episode 3.0 and up (for now), they need Comodo.
+			-Added full support for episode specific shop npcs and spawn sets.
+			-Rewrote / optimized episode-code in npc_parse_duplicate.
+
 09/11/2016
 	r136 [15peaces]
 		*Fixed a Bug in Sealed Shrine Instance where you cannot get the L_Magestic_Goat more than once.
@@ -16,7 +37,7 @@
 
 09/06/2016
 	r134 [15peaces]
-		*Merged missing changes from 3ceam rev. 505 - 806
+		*Merged missing changes from 3ceam rev. 505 - 506
 		*Fixed potential quest warnings in quests/quests_13_1.txt
 		*Updated SR_CRESCENTELBOW according to the official behavior.
 		*Added all kinds of Malangdo traders and refiners.

conf/battle/feature.conf

@@ -47,11 +47,9 @@ feature.roulette: off
 // List of unsupported episodes:
 // 40	- 4.0	War of Emperium								(PACKETVER(?))	(May 2003)
 // 70	- 7.0 	Village of the Utan Tribe ~ Umbala			(PACKETVER 5+)	(January 2004)
-// 80	- 8.0	City of the Dead ~ Niflheim					(PACKETVER 5+)	(Feburary 2004)
 // 90	- 9.0 	Branch Job System							(PACKETVER 6+)	(April 2004)
 // 100	- 10.0	The Republic of Schwarzwald					(PACKETVER 7+)	(March 2005)
 // 101	- 10.1	Einbroch ~ The Steel Town in a Red Haze
-// 102	- 10.2	Lighthalzen ~ The Apex of Lights, The Shadow of Darkness
 // 103	- 10.3	Noghalt ~ The Abyss Lake, The Tower of Thanatos
 // 104	- 10.4	Hugel ~ A Haven for the Forgotten 
 // 110	- 11.0	The Religious Nation, Arunafeltz			(PACKETVER 7+)	(July 2006)
@@ -69,6 +67,8 @@ feature.roulette: off
 // 30	- 3.0	Comodo										(PACKETVER(?))			(February 2003)
 // 50	- 5.0	Juno ~ Forgotten Legacy of an Ancient Era	(PACKETVER(?))			(July 2003)
 // 60	- 6.0	Beyond Rune-Midgarts (The Global Project)	(PACKETVER(?))			(October 2003)
+// 80	- 8.0	City of the Dead ~ Niflheim					(PACKETVER 5+)			(Feburary 2004)
+// 102	- 10.2	Lighthalzen ~ The Apex of Lights, The Shadow of Darkness
 // 120	- 12.0	Nightmare of Midgard, Destruction of Morroc	(PACKETVER 20070918+)	(October 2007)
 // 131	- 13.1	ASH VACUUM									(PACKETVER 20080102+)	(June 2008)
 // 132	- 13.2	Encounter With the Unknown					(PACKETVER 20080102+)

db/const.txt

@@ -375,6 +375,7 @@ mf_allowks	48
 mf_monster_noteleport	49
 mf_pvp_nocalcrank	50
 mf_battleground	51
+mf_reset	52
 
 cell_walkable		0
 cell_shootable		1

db/homunculus_db.txt

@@ -18,6 +18,7 @@
 // Legend: b: base, gn: growth min, gx: growth max, en: evolution min, ex: evolution max
 // NOTE: Only the growth values are in a 1/10 scale, the other stats are 1/1 (eg: 5 gmAGI means 0.5 agi)
 
+// Regular Homunculus
 6001,6009,Lif,537,60000,0,1,7,0,700,150,40,17,20,15,35,24,12,60,100,4,9,5,19,5,19,5,19,4,20,6,20,6,20,1,10,10,20,1,5,1,4,1,5,4,10,1,10,1,3
 6002,6010,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
 6003,6011,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
@@ -26,7 +27,8 @@
 6006,6014,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,12,80,130,1,4,8,20,4,20,4,20,1,10,3,19,3,19,10,20,1,10,1,10,1,5,4,10,1,3,1,4,1,5
 6007,6015,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,8,20,1,10,3,19,4,20,3,19,5,15,5,15,4,10,1,10,1,3,1,4,1,5,1,5
 6008,6016,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,10,1,10,1,10,1,10,1,10,1,10
-//6047,MER_MONSTER,Monster
+
+// Mutated Homunculus
 //6048,MER_EIRA,Eira
 //6049,MER_BAYERI,Bayeri
 //6050,MER_SERA,Sera

db/mob_db.txt

@@ -109,8 +109,8 @@
 1103,CARAMEL,Caramel,Caramel,23,1424,0,264,162,1,90,112,5,5,35,23,46,5,38,10,10,12,0,2,22,0x91,200,1604,840,756,0,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1
 1104,COCO,Coco,Coco,17,817,0,120,78,1,56,67,0,0,24,17,34,20,24,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,578,600,0,0,0,0,4041,1
 1105,DENIRO,Deniro,Deniro,19,760,0,135,85,1,68,79,15,0,1,19,30,20,43,10,10,12,0,4,22,0x118B,150,1288,288,576,0,0,0,0,0,0,0,0,955,9000,910,3000,938,1200,990,50,1001,8,1002,450,757,34,0,0,0,0,4043,1
-1106,DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,427,266,1,169,208,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,1217,140,0,0,0,0,4082,1
-1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,9,164,0,20,16,1,30,36,0,0,1,9,9,5,21,40,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,517,600,2301,200,13011,5,582,1000,0,0,0,0,4023,1
+1106,DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,427,266,1,169,208,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,1253,5,7030,5500,2311,1,517,1200,920,2000,756,53,1217,140,6252,200,1287,1,4082,1
+1107,DESERT_WOLF_B,Desert Wolf Baby,Baby Desert Wolf,9,164,0,20,16,1,30,36,0,0,1,9,9,5,21,40,10,12,0,2,23,0x1089,300,1600,900,240,0,0,0,0,0,0,0,0,1010,85,919,5500,2306,80,517,600,2301,200,13011,5,582,1000,6252,200,0,0,4023,1
 1108,DEVIACE,Deviace,Deviace,47,20090,0,9988,7207,1,514,1024,10,20,1,47,62,48,62,25,10,12,1,5,81,0x91,400,1680,480,384,0,0,0,0,0,0,0,0,995,25,1053,9000,1054,1000,5011,2,971,200,1256,3,756,161,0,0,0,0,4125,1
 1109,DEVIRUCHI,Deviruchi,Deviruchi,46,6666,0,2662,1278,1,475,560,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,0,1038,5335,1039,400,984,2,1458,2,1009,5,912,1500,756,154,0,0,0,0,4122,1
 1110,DOKEBI,Dokebi,Dokebi,33,2697,0,889,455,1,197,249,0,10,50,50,40,35,69,40,10,12,0,6,27,0x191,250,1156,456,384,0,0,0,0,0,0,0,0,1021,9000,757,150,1517,2,1613,1,969,1,1501,300,1005,5,0,0,0,0,4098,1
@@ -1352,6 +1352,9 @@
 2858,C1_DEATHWORD,Swift Death Word,Swift Death Word,114,147510,1,83350,172950,1,1005,1405,9,5,91,64,53,88,139,54,10,12,1,0,60,13973,150,176,912,300,0,0,0,0,0,0,0,0,1097,4000,7015,300,11003,50,7449,500,2418,10,7479,2,7480,1,0,0,0,0,4388,1
 2859,C2_DEATHWORD,Solid Death Word,Solid Death Word,114,295020,1,83350,172950,1,1005,1405,9,5,91,64,53,88,139,54,10,12,1,0,60,13973,150,176,912,300,0,0,0,0,0,0,0,0,1097,4000,7015,300,11003,50,7449,500,2418,10,7479,2,7480,1,0,0,0,0,4388,1
 //Champion Mobs
+2873,C1_CENTIPEDE,Swift Centipede,Swift Centipede,125,224928,1,104000,243900,2,1065,1468,18,3,133,71,69,39,120,49,10,12,1,4,45,14229,150,1000,792,336,0,0,0,0,0,0,0,0,2746,2,2747,2,1741,10,1042,5335,912,5000,6224,10,943,2500,0,0,0,0,4447,1
+2874,C2_CENERE,Solid Cenere,Solid Cenere,146,2342358,1,355850,1028100,1,1942,2807,11,10,67,39,30,35,95,45,10,12,0,3,24,14229,300,1500,720,360,0,0,0,0,0,0,0,0,6561,2000,7322,500,7001,1500,7320,1000,0,0,0,0,0,0,0,0,0,0,4595,1
+//Champion Mobs
 2876,C4_CATERPILLAR,Furious Caterpillar,Furious Caterpillar,121,230904,1,97500,297000,1,1145,1628,11,42,58,48,51,50,54,45,10,12,0,4,22,14229,300,1672,672,480,0,0,0,0,0,0,0,0,949,3000,7054,5335,13034,20,1000,100,997,50,603,12,2894,500,0,0,0,0,4289,1
 2877,C5_CARAT,Elusive Carat,Elusive Carat,103,82998,1,58300,131100,1,950,1323,11,67,102,64,60,40,80,50,10,12,1,6,44,14229,200,1078,768,384,0,0,0,0,0,0,0,0,7054,3200,536,1000,2409,5,5003,1,509,1450,0,0,0,0,0,0,0,0,4288,1
 2878,C1_CARAMEL,Swift Caramel,Swift Caramel,25,4662,1,4050,13650,1,108,140,4,0,19,10,15,10,32,5,10,12,0,2,22,145,200,1604,840,756,0,0,0,0,0,0,0,0,1027,9000,2310,5,919,5500,1455,10,1405,15,1408,20,0,0,0,0,0,0,4063,1

db/mob_db2.txt

@@ -72,8 +72,6 @@
 2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x37B5,200,1152,1152,576,37144,10000,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 
 // Additional Monsters (renewal)
-2873,C1_CENTIPEDE,Swift Centipede,Swift Centipede,125,124960,1,10400,24390,2,1065,1468,143,25,133,71,69,39,120,49,10,12,1,4,45,14229,150,1000,792,336,0,0,0,0,0,0,0,0,2746,2,2747,2,1741,10,1042,5335,912,5000,6224,10,943,2500,0,0,0,0,4447,1
-2874,C2_CENERE,Solid Cenere,Solid Cenere,146,1301310,1,35585,102810,1,1942,2807,87,81,67,39,30,35,95,45,10,12,0,3,24,14229,300,1500,720,360,0,0,0,0,0,0,0,0,6561,2000,7322,500,7001,1500,7320,1000,0,0,0,0,0,0,0,0,0,0,4595,1
 2875,C3_CELIA,Celia Ringleader,Celia Ringleader,141,1265730,1,110535,342300,1,1824,2597,74,312,136,99,61,121,121,49,10,12,1,7,68,12949,150,1152,384,288,0,0,0,0,0,0,0,0,7345,2000,6471,1,2853,20,985,100,18111,10,1654,1,6470,150,0,0,0,0,4568,1
 2896,C5_ANTLER_SCARABA,Elusive Antler Scaraba,Elusive Antler Scaraba,136,313000,1,15825,47280,1,1519,2200,155,102,23,99,59,129,137,45,10,12,1,4,42,14725,200,504,624,360,0,0,0,0,0,0,0,0,6322,6500,1930,1,12735,10,7939,10,993,1,0,0,0,0,0,0,0,0,4505,1
 2897,C1_ANTIQUE_BOOK,Swift Antique Book,Swift Antique Book,148,673075,1,36125,105660,1,2001,2894,74,42,67,53,32,44,125,5,10,12,0,0,60,14229,150,864,960,480,0,0,0,0,0,0,0,0,6560,2000,7015,1000,1097,1000,0,0,0,0,0,0,0,0,0,0,0,0,4596,1

db/skill_db.txt

@@ -1198,8 +1198,6 @@
 2467,9,6,2,4,0x1,0,3,1,yes,0,0,1,magic,0,	SO_WIND_INSIGNIA,Wind Insignia
 2468,9,6,2,2,0x1,0,3,1,yes,0,0,1,magic,0,	SO_EARTH_INSIGNIA,Earth Insignia
 
-//2472,0,0,0,0,0,0,??,0,no,0,0,0,none,0,	SO_ENDMARK //needed? What is this for? [15peaces]
-
 // Genetic
 2474,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		GN_TRAINING_SWORD,Sword Training
 2475,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		GN_REMODELING_CART,Cart Remodeling

db/skill_reproduce_db.txt

@@ -6,11 +6,11 @@
 // SkillID,Flag
 //=================================
 
-//Swordsman
+// Swordsman
 5,1	//Bash
 7,1	//Magnum Break
 
-//Mage
+// Mage
 11,1	// Napalm Beat
 13,1	// Soul Strike
 14,1	// Cold Bolt
@@ -21,40 +21,43 @@
 20,1	// Lightning Bolt
 21,1	// Thunderstorm
 
-//Acolyte
+// Acolyte
 24,1	// Ruwach
 28,1	// Heal
 
-//Merchant
+// Merchant
 42,1	// Mammonite
 
-//Archer
+// Archer
 46,1	// Double Strafe
 47,1	// Arrow Shower
 
-//Thief
+// Thief
 52,1	// Envenom
-152,1	// Stone Fling
+
+// Resurrection
+54,1	// Resurrection
 
 // Knight
 62,1	// Bowling Bash
 
 // Priest
-54,1	// Resurrection
 68,1	// Asperio
 69,1	// B.S Sacramenti
 70,1	// Sanctuary
 77,1	// Turn Undead
 79,1	// Magnus Exorcismus
 
 // Wizard
+80,1	// Fire Pillar
 81,1	// Sightrasher
 83,1	// Meteor Storm
 84,1	// Jupitel Thunder
 85,1	// Lord of Vermillion
 86,1	// Water Ball
 88,1	// Frost Nova
 89,1	// Storm Gust
+90,1	// Earth Spike
 91,1	// Heaven's Drive
 
 // Hunter
@@ -66,6 +69,11 @@
 // Assassin
 141,1	// Venom Splasher
 
+// 1st Job Quest Skills
+148,1	// Arrow Repel
+152,1	// Stone Fling
+156,1	// Holy Light
+
 // Rogue
 212,1	// Backstab
 
@@ -86,18 +94,8 @@
 271,1	// Guillotine Fist
 272,1	// Raging Quadruple Blow
 
-// Wizard/Sage
-80,1	// Fire Pillar
-90,1	// Earth Spike
-
-// Quest Skill of certain Jobs
-148,1	// Arrow Repel
-156,1	// Holy Light
-1001,1	// Charge Attack
-1004,1	// Venom Knife
-1006,1	// Sight Blaster
-1009,1	// Phantasmic Arrow
-1015,1	// Excruciating Palm
+// Item Skill
+337,1	// Tomahawk Throwing
 
 // TaeKwon Kid
 421,1	// Flying Kick
@@ -116,6 +114,13 @@
 541,1	// Lightning Jolt
 542,1	// First Wind
 
+// 2nd Job Quest Skills
+1001,1	// Charge Attack
+1004,1	// Venom Knife
+1006,1	// Sight Blaster
+1009,1	// Phantasmic Arrow
+1015,1	// Excruciating Palm
+
 // Rune Knight
 2002,1	// Sonic Wave
 2005,1	// Ignition Break
@@ -133,13 +138,13 @@
 2054,1	// Duple Light
 
 // Warlock
-2210,1	// Drain Life
 2202,1	// Soul Expansion
+2203,1	// Frosty Misty
+2204,1	// Jack Frost
+2210,1	// Drain Life
 2211,1	// Crimson Rock
 2212,1	// Hell Inferno
 2213,1	// Comet
-2203,1	// Frosty Misty
-2204,1	// Jack Frost
 2214,1	// Chain Lightning
 2216,1	// Earth Strain
 
@@ -157,10 +162,10 @@
 
 // Royal Guard
 2310,1	// Shield Press
+2315,1	// Shield Spell
+2316,1	// Exceed Break
 2320,1	// Moon Slasher
 2323,1	// Earth Drive
-2316,1	// Exceed Break
-2315,1	// Shield Spell
 
 // Sura
 2326,1	// Dragon Combo
@@ -183,11 +188,11 @@
 // Sorcerer
 2443,1	// Fire Walk
 2444,1	// Electric Walk
-2449,1	// Psychic Wave
-2450,1	// Cloud Kill
-2448,1	// Poison Buster
 2446,1	// Earth Grave
 2447,1	// Diamond Dust
+2448,1	// Poison Buster
+2449,1	// Psychic Wave
+2450,1	// Cloud Kill
 2454,1	// Varetyr Spear
 
 // Genetic
@@ -197,6 +202,3 @@
 2482,1	// Wall of Thorns
 2483,1	// Crazy Weed
 2490,1	// Hell's Plant
-
-// Other
-337,1	// Tomahawk Throwing

db/skill_require_db.txt

@@ -936,8 +936,6 @@
 2467,0,0,22:30:38,0,0,0,99,0,0,none,0,6362,1:2:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SO_WIND_INSIGNIA#Wind Insignia#
 2468,0,0,22:30:38,0,0,0,99,0,0,none,0,6363,1:2:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SO_EARTH_INSIGNIA#Earth Insignia#
 
-2472,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SO_ENDMARK##
-
 // Genetic
 2476,0,0,30,0,0,0,99,0,0,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0				//GN_CART_TORNADO#Cart Tornado#
 2477,0,0,40:42:46:48:50,0,0,0,99,8,1,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GN_CARTCANNON#Cart Cannon#

doc/episode_system.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= 15-3athena Dev Team
 //===== Last Updated: ========================================
-//= 20160501
+//= 20161001
 //===== Description: =========================================
 //= Explanation of the episode system
 //============================================================
@@ -73,5 +73,6 @@ Supported episode-specific database-files:
 
 To check what episode the server is currently running on, you can use the 'getepisode' script command.
 
-Also we can disable a whole npc script for a certain range of episodes. 
+Also we can disable a whole npc, shop, monster or warp script for a certain range of episodes.
+Duplicates of npc types mentioned above can also be disabled. 
 To do so, please refer to the script_commands documentation.