Merge pull request #2570 from Asheraf/scconfnoboss

MishimaHaruna · web-flow · commit f91cbd5d1f9f · 2019-11-17T17:43:09.000+01:00
Dehardcode status effect boss resistance
diff --git a/db/sc_config.conf b/db/sc_config.conf
@@ -42,12 +42,14 @@ SC_TYPE: {
 		Debuff:            (bool) SC considered as debuff and be removed by Gospel and etc.
 		NoMadoReset:       (bool) SC cannot be reset when MADO Gear is taken off.
 		NoAllReset:        (bool) SC cannot be reset by 'sc_end SC_ALL' and status change clear.
+		NoBoss:            (bool) SC cannot be applied to boss monsters.
 	}
 }
 **************************************************************************/
 SC_PROVOKE: {
 	Flags: {
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_ENDURE: {
@@ -105,6 +107,7 @@ SC_BLESSING: {
 	Flags: {
 		Buff: true
 		NoMadoReset: true
+		NoBoss: true
 	}
 }
 SC_INC_AGI: {
@@ -117,6 +120,7 @@ SC_DEC_AGI: {
 	Flags: {
 		NoSave: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_SLOWPOISON: {
@@ -575,6 +579,7 @@ SC_FOGWALL: {
 		NoSave: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_SPIDERWEB: {
@@ -714,6 +719,7 @@ SC_GRAVITATION: {
 		NoSave: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_OVERTHRUSTMAX: {
@@ -784,6 +790,7 @@ SC_NJ_SUITON: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_FOOD_STR: {
@@ -1404,48 +1411,56 @@ SC_TOXIN: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PARALYSE: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_VENOMBLEED: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_MAGICMUSHROOM: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_DEATHHURT: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PYREXIA: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_OBLIVIONCURSE: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_LEECHESEND: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_DUPLELIGHT: {
@@ -1468,12 +1483,14 @@ SC_ELECTRICSHOCKER: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_MARSHOFABYSS: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_RECOGNIZEDSPELL: {
@@ -1496,6 +1513,7 @@ SC_WUGBITE: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CAMOUFLAGE: {
@@ -1622,6 +1640,7 @@ SC_MAGNETICFIELD: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_NEUTRALBARRIER: {
@@ -1782,6 +1801,7 @@ SC_EXEEDBREAK: {
 SC_ADORAMUS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PRESTIGE: {
@@ -1834,11 +1854,13 @@ SC_INSPIRATION: {
 SC__ENERVATION: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC__GROOMY: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_RAISINGDRAGON: {
@@ -1852,11 +1874,13 @@ SC_RAISINGDRAGON: {
 SC__IGNORANCE: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC__LAZINESS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_LIGHTNINGWALK: {
@@ -1875,6 +1899,7 @@ SC_ACARAJE: {
 SC__UNLUCKY: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CURSEDCIRCLE_ATKER: {
@@ -1896,6 +1921,7 @@ SC_CURSEDCIRCLE_TARGET: {
 SC__WEAKNESS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CRESCENTELBOW: {
@@ -1954,6 +1980,7 @@ SC_SPELLFIST: {
 SC_NETHERWORLD: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_SIREN: {
@@ -1966,6 +1993,7 @@ SC_DEEP_SLEEP: {
 	Flags: {
 		NoSave: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_SIRCLEOFNATURE: {
@@ -2081,6 +2109,7 @@ SC_FROSTMISTY: {
 	Visible: true
 	Flags: {
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_STOMACHACHE: {
@@ -2136,6 +2165,7 @@ SC_MORA_BUFF: {
 SC_NEEDLE_OF_PARALYZE: {
 	Flags: {
 		NoDeathReset: true
+		NoBoss: true
 	}
 }
 SC_PAIN_KILLER: {
@@ -2604,6 +2634,7 @@ SC_PUSH_CART: {
 SC_COLD: {
 	Visible: true
 	Flags: {
+		NoBoss: true
 	}
 }
 SC_BLOOD_SUCKER: {
@@ -2777,6 +2808,7 @@ SC_SPRITEMABLE: {
 SC_BITESCAR: {
 	Flags: {
 		NoDispelReset: true
+		NoBoss: true
 	}
 }
 SC_CLAN_INFO: {
@@ -2809,3 +2841,38 @@ SC_DAILYSENDMAILCNT: {
 		NoAllReset: true
 	}
 }
+SC_COMA: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_RICHMANKIM: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_ROKISWEIL: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_BURNING: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_VACUUM_EXTREME: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_FRESHSHRIMP: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_SV_ROOTTWIST: {
+	Flags: {
+		NoBoss: true
+	}
+}
diff --git a/src/map/status.c b/src/map/status.c
@@ -10581,55 +10581,10 @@ static bool status_is_boss_resist_sc(enum sc_type type)
 {
 	if (type >= SC_COMMON_MIN && type <= SC_COMMON_MAX)
 		return true;
-	switch (type) {
-		case SC_BLESSING:
-		case SC_DEC_AGI:
-		case SC_PROVOKE:
-		case SC_COMA:
-		case SC_GRAVITATION:
-		case SC_NJ_SUITON:
-		case SC_RICHMANKIM:
-		case SC_ROKISWEIL:
-		case SC_FOGWALL:
-		case SC_FROSTMISTY:
-		case SC_BURNING:
-		case SC_MARSHOFABYSS:
-		case SC_ADORAMUS:
-		case SC_NEEDLE_OF_PARALYZE:
-		case SC_DEEP_SLEEP:
-		case SC_COLD:
-
-		// Exploit prevention - kRO Fix
-		case SC_PYREXIA:
-		case SC_DEATHHURT:
-		case SC_TOXIN:
-		case SC_PARALYSE:
-		case SC_VENOMBLEED:
-		case SC_MAGICMUSHROOM:
-		case SC_OBLIVIONCURSE:
-		case SC_LEECHESEND:
-
-		// Ranger Effects
-		case SC_WUGBITE:
-		case SC_ELECTRICSHOCKER:
-		case SC_MAGNETICFIELD:
 
-		// Masquerades
-		case SC__ENERVATION:
-		case SC__GROOMY:
-		case SC__LAZINESS:
-		case SC__UNLUCKY:
-		case SC__WEAKNESS:
-		case SC__IGNORANCE:
+	if (status->get_sc_type(type) & SC_NO_BOSS)
+		return true;
 
-		// Other Effects
-		case SC_VACUUM_EXTREME:
-		case SC_NETHERWORLD:
-		case SC_FRESHSHRIMP:
-		case SC_SV_ROOTTWIST:
-		case SC_BITESCAR:
-			return true;
-	}
 	return false;
 }
 
@@ -13498,7 +13453,8 @@ static bool status_read_scdb_libconfig_sub_flag(struct config_setting_t *it, int
 			{ "Buff", SC_BUFF },
 			{ "Debuff", SC_DEBUFF },
 			{ "NoMadoReset", SC_MADO_NO_RESET },
-			{ "NoAllReset", SC_NO_CLEAR }
+			{ "NoAllReset", SC_NO_CLEAR },
+			{ "NoBoss", SC_NO_BOSS },
 		};
 
 		ARR_FIND(0, ARRAYLENGTH(flags), j, strcmpi(flag, flags[j].name) == 0);
diff --git a/src/map/status.h b/src/map/status.h
@@ -61,7 +61,8 @@ typedef enum sc_conf_type {
 	SC_DEBUFF        = 0x020,
 	SC_MADO_NO_RESET = 0x040,
 	SC_NO_CLEAR      = 0x080,
-	SC_VISIBLE       = 0x100
+	SC_VISIBLE       = 0x100,
+	SC_NO_BOSS       = 0x200
 } sc_conf_type;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@ SC_TYPE: {`
`42`	`42`	`Debuff: (bool) SC considered as debuff and be removed by Gospel and etc.`
`43`	`43`	`NoMadoReset: (bool) SC cannot be reset when MADO Gear is taken off.`
`44`	`44`	`NoAllReset: (bool) SC cannot be reset by 'sc_end SC_ALL' and status change clear.`
	`45`	`+ NoBoss: (bool) SC cannot be applied to boss monsters.`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`**************************************************************************/`
`48`	`49`	`SC_PROVOKE: {`
`49`	`50`	`Flags: {`
`50`	`51`	`Debuff: true`
	`52`	`+ NoBoss: true`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`	`SC_ENDURE: {`
`@@ -105,6 +107,7 @@ SC_BLESSING: {`
`105`	`107`	`Flags: {`
`106`	`108`	`Buff: true`
`107`	`109`	`NoMadoReset: true`
	`110`	`+ NoBoss: true`
`108`	`111`	`}`
`109`	`112`	`}`
`110`	`113`	`SC_INC_AGI: {`
`@@ -117,6 +120,7 @@ SC_DEC_AGI: {`
`117`	`120`	`Flags: {`
`118`	`121`	`NoSave: true`
`119`	`122`	`Debuff: true`
	`123`	`+ NoBoss: true`
`120`	`124`	`}`
`121`	`125`	`}`
`122`	`126`	`SC_SLOWPOISON: {`
`@@ -575,6 +579,7 @@ SC_FOGWALL: {`
`575`	`579`	`NoSave: true`
`576`	`580`	`NoClearanceReset: true`
`577`	`581`	`Buff: true`
	`582`	`+ NoBoss: true`
`578`	`583`	`}`
`579`	`584`	`}`
`580`	`585`	`SC_SPIDERWEB: {`
`@@ -714,6 +719,7 @@ SC_GRAVITATION: {`
`714`	`719`	`NoSave: true`
`715`	`720`	`NoClearanceReset: true`
`716`	`721`	`Buff: true`
	`722`	`+ NoBoss: true`
`717`	`723`	`}`
`718`	`724`	`}`
`719`	`725`	`SC_OVERTHRUSTMAX: {`
`@@ -784,6 +790,7 @@ SC_NJ_SUITON: {`
`784`	`790`	`NoDispelReset: true`
`785`	`791`	`NoClearanceReset: true`
`786`	`792`	`Debuff: true`
	`793`	`+ NoBoss: true`
`787`	`794`	`}`
`788`	`795`	`}`
`789`	`796`	`SC_FOOD_STR: {`
`@@ -1404,48 +1411,56 @@ SC_TOXIN: {`
`1404`	`1411`	`Flags: {`
`1405`	`1412`	`NoDispelReset: true`
`1406`	`1413`	`Buff: true`
	`1414`	`+ NoBoss: true`
`1407`	`1415`	`}`
`1408`	`1416`	`}`
`1409`	`1417`	`SC_PARALYSE: {`
`1410`	`1418`	`Flags: {`
`1411`	`1419`	`NoDispelReset: true`
`1412`	`1420`	`Buff: true`
	`1421`	`+ NoBoss: true`
`1413`	`1422`	`}`
`1414`	`1423`	`}`
`1415`	`1424`	`SC_VENOMBLEED: {`
`1416`	`1425`	`Flags: {`
`1417`	`1426`	`NoDispelReset: true`
`1418`	`1427`	`Buff: true`
	`1428`	`+ NoBoss: true`
`1419`	`1429`	`}`
`1420`	`1430`	`}`
`1421`	`1431`	`SC_MAGICMUSHROOM: {`
`1422`	`1432`	`Flags: {`
`1423`	`1433`	`NoDispelReset: true`
`1424`	`1434`	`Buff: true`
	`1435`	`+ NoBoss: true`
`1425`	`1436`	`}`
`1426`	`1437`	`}`
`1427`	`1438`	`SC_DEATHHURT: {`
`1428`	`1439`	`Flags: {`
`1429`	`1440`	`NoDispelReset: true`
`1430`	`1441`	`Buff: true`
	`1442`	`+ NoBoss: true`
`1431`	`1443`	`}`
`1432`	`1444`	`}`
`1433`	`1445`	`SC_PYREXIA: {`
`1434`	`1446`	`Flags: {`
`1435`	`1447`	`NoDispelReset: true`
`1436`	`1448`	`Buff: true`
	`1449`	`+ NoBoss: true`
`1437`	`1450`	`}`
`1438`	`1451`	`}`
`1439`	`1452`	`SC_OBLIVIONCURSE: {`
`1440`	`1453`	`Flags: {`
`1441`	`1454`	`NoDispelReset: true`
`1442`	`1455`	`Buff: true`
	`1456`	`+ NoBoss: true`
`1443`	`1457`	`}`
`1444`	`1458`	`}`
`1445`	`1459`	`SC_LEECHESEND: {`
`1446`	`1460`	`Flags: {`
`1447`	`1461`	`NoDispelReset: true`
`1448`	`1462`	`Buff: true`
	`1463`	`+ NoBoss: true`
`1449`	`1464`	`}`
`1450`	`1465`	`}`
`1451`	`1466`	`SC_DUPLELIGHT: {`
`@@ -1468,12 +1483,14 @@ SC_ELECTRICSHOCKER: {`
`1468`	`1483`	`NoDispelReset: true`
`1469`	`1484`	`NoClearanceReset: true`
`1470`	`1485`	`Buff: true`
	`1486`	`+ NoBoss: true`
`1471`	`1487`	`}`
`1472`	`1488`	`}`
`1473`	`1489`	`SC_MARSHOFABYSS: {`
`1474`	`1490`	`Flags: {`
`1475`	`1491`	`NoDispelReset: true`
`1476`	`1492`	`Buff: true`
	`1493`	`+ NoBoss: true`
`1477`	`1494`	`}`
`1478`	`1495`	`}`
`1479`	`1496`	`SC_RECOGNIZEDSPELL: {`
`@@ -1496,6 +1513,7 @@ SC_WUGBITE: {`
`1496`	`1513`	`NoDispelReset: true`
`1497`	`1514`	`NoClearanceReset: true`
`1498`	`1515`	`Buff: true`
	`1516`	`+ NoBoss: true`
`1499`	`1517`	`}`
`1500`	`1518`	`}`
`1501`	`1519`	`SC_CAMOUFLAGE: {`
`@@ -1622,6 +1640,7 @@ SC_MAGNETICFIELD: {`
`1622`	`1640`	`NoDispelReset: true`
`1623`	`1641`	`NoClearanceReset: true`
`1624`	`1642`	`Buff: true`
	`1643`	`+ NoBoss: true`
`1625`	`1644`	`}`
`1626`	`1645`	`}`
`1627`	`1646`	`SC_NEUTRALBARRIER: {`
`@@ -1782,6 +1801,7 @@ SC_EXEEDBREAK: {`
`1782`	`1801`	`SC_ADORAMUS: {`
`1783`	`1802`	`Flags: {`
`1784`	`1803`	`Buff: true`
	`1804`	`+ NoBoss: true`
`1785`	`1805`	`}`
`1786`	`1806`	`}`
`1787`	`1807`	`SC_PRESTIGE: {`
`@@ -1834,11 +1854,13 @@ SC_INSPIRATION: {`
`1834`	`1854`	`SC__ENERVATION: {`
`1835`	`1855`	`Flags: {`
`1836`	`1856`	`Buff: true`
	`1857`	`+ NoBoss: true`
`1837`	`1858`	`}`
`1838`	`1859`	`}`
`1839`	`1860`	`SC__GROOMY: {`
`1840`	`1861`	`Flags: {`
`1841`	`1862`	`Buff: true`
	`1863`	`+ NoBoss: true`
`1842`	`1864`	`}`
`1843`	`1865`	`}`
`1844`	`1866`	`SC_RAISINGDRAGON: {`
`@@ -1852,11 +1874,13 @@ SC_RAISINGDRAGON: {`
`1852`	`1874`	`SC__IGNORANCE: {`
`1853`	`1875`	`Flags: {`
`1854`	`1876`	`Buff: true`
	`1877`	`+ NoBoss: true`
`1855`	`1878`	`}`
`1856`	`1879`	`}`
`1857`	`1880`	`SC__LAZINESS: {`
`1858`	`1881`	`Flags: {`
`1859`	`1882`	`Buff: true`
	`1883`	`+ NoBoss: true`
`1860`	`1884`	`}`
`1861`	`1885`	`}`
`1862`	`1886`	`SC_LIGHTNINGWALK: {`
`@@ -1875,6 +1899,7 @@ SC_ACARAJE: {`
`1875`	`1899`	`SC__UNLUCKY: {`
`1876`	`1900`	`Flags: {`
`1877`	`1901`	`Buff: true`
	`1902`	`+ NoBoss: true`
`1878`	`1903`	`}`
`1879`	`1904`	`}`
`1880`	`1905`	`SC_CURSEDCIRCLE_ATKER: {`
`@@ -1896,6 +1921,7 @@ SC_CURSEDCIRCLE_TARGET: {`
`1896`	`1921`	`SC__WEAKNESS: {`
`1897`	`1922`	`Flags: {`
`1898`	`1923`	`Buff: true`
	`1924`	`+ NoBoss: true`
`1899`	`1925`	`}`
`1900`	`1926`	`}`
`1901`	`1927`	`SC_CRESCENTELBOW: {`
`@@ -1954,6 +1980,7 @@ SC_SPELLFIST: {`
`1954`	`1980`	`SC_NETHERWORLD: {`
`1955`	`1981`	`Flags: {`
`1956`	`1982`	`Buff: true`
	`1983`	`+ NoBoss: true`
`1957`	`1984`	`}`
`1958`	`1985`	`}`
`1959`	`1986`	`SC_SIREN: {`
`@@ -1966,6 +1993,7 @@ SC_DEEP_SLEEP: {`
`1966`	`1993`	`Flags: {`
`1967`	`1994`	`NoSave: true`
`1968`	`1995`	`Debuff: true`
	`1996`	`+ NoBoss: true`
`1969`	`1997`	`}`
`1970`	`1998`	`}`
`1971`	`1999`	`SC_SIRCLEOFNATURE: {`
`@@ -2081,6 +2109,7 @@ SC_FROSTMISTY: {`
`2081`	`2109`	`Visible: true`
`2082`	`2110`	`Flags: {`
`2083`	`2111`	`Debuff: true`
	`2112`	`+ NoBoss: true`
`2084`	`2113`	`}`
`2085`	`2114`	`}`
`2086`	`2115`	`SC_STOMACHACHE: {`
`@@ -2136,6 +2165,7 @@ SC_MORA_BUFF: {`
`2136`	`2165`	`SC_NEEDLE_OF_PARALYZE: {`
`2137`	`2166`	`Flags: {`
`2138`	`2167`	`NoDeathReset: true`
	`2168`	`+ NoBoss: true`
`2139`	`2169`	`}`
`2140`	`2170`	`}`
`2141`	`2171`	`SC_PAIN_KILLER: {`
`@@ -2604,6 +2634,7 @@ SC_PUSH_CART: {`
`2604`	`2634`	`SC_COLD: {`
`2605`	`2635`	`Visible: true`
`2606`	`2636`	`Flags: {`
	`2637`	`+ NoBoss: true`
`2607`	`2638`	`}`
`2608`	`2639`	`}`
`2609`	`2640`	`SC_BLOOD_SUCKER: {`
`@@ -2777,6 +2808,7 @@ SC_SPRITEMABLE: {`
`2777`	`2808`	`SC_BITESCAR: {`
`2778`	`2809`	`Flags: {`
`2779`	`2810`	`NoDispelReset: true`
	`2811`	`+ NoBoss: true`
`2780`	`2812`	`}`
`2781`	`2813`	`}`
`2782`	`2814`	`SC_CLAN_INFO: {`
`@@ -2809,3 +2841,38 @@ SC_DAILYSENDMAILCNT: {`
`2809`	`2841`	`NoAllReset: true`
`2810`	`2842`	`}`
`2811`	`2843`	`}`
	`2844`	`+SC_COMA: {`
	`2845`	`+ Flags: {`
	`2846`	`+ NoBoss: true`
	`2847`	`+ }`
	`2848`	`+}`
	`2849`	`+SC_RICHMANKIM: {`
	`2850`	`+ Flags: {`
	`2851`	`+ NoBoss: true`
	`2852`	`+ }`
	`2853`	`+}`
	`2854`	`+SC_ROKISWEIL: {`
	`2855`	`+ Flags: {`
	`2856`	`+ NoBoss: true`
	`2857`	`+ }`
	`2858`	`+}`
	`2859`	`+SC_BURNING: {`
	`2860`	`+ Flags: {`
	`2861`	`+ NoBoss: true`
	`2862`	`+ }`
	`2863`	`+}`
	`2864`	`+SC_VACUUM_EXTREME: {`
	`2865`	`+ Flags: {`
	`2866`	`+ NoBoss: true`
	`2867`	`+ }`
	`2868`	`+}`
	`2869`	`+SC_FRESHSHRIMP: {`
	`2870`	`+ Flags: {`
	`2871`	`+ NoBoss: true`
	`2872`	`+ }`
	`2873`	`+}`
	`2874`	`+SC_SV_ROOTTWIST: {`
	`2875`	`+ Flags: {`
	`2876`	`+ NoBoss: true`
	`2877`	`+ }`
	`2878`	`+}`