* The status SC_INVINCIBLE now reduces all damage to 1.

- Official behavior, and allows players to cancel NPC_ALLHEAL casts.
- If battle_config.invincible_nodamage is true, reflected damage is still 0.
* Minor updates and supporting data for Sealed Shrine.
- Zone 5 is now designated for sealed shrine restricted skills.
- Added new quest_db entries for Sealed Shine cooldown.
- Updated mob_db entries for Orc's Memory Instance. (improper stats)
- Updated Land Mine to have a splash effect. (Provided by Daegaladh)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14101 54d463be-8e91-2dee-dedb-b68131a5f0ec

8 files changed, 29 insertions, 9 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 61c3d078d..19c3760c8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 09/10/25
+	* Rev. 14101 The status SC_INVINCIBLE now reduces all damage to 1. [L0ne_W0lf]
+	- Official behavior, and allows players to cancel NPC_ALLHEAL casts.
+	- If battle_config.invincible_nodamage is true, reflected damage is still 0.
+09/10/25
 	* Implemented the official version of 'OnTouch' named as 'OnTouch_' and it can be defined in script_athena.conf. [Inkfish]
 	* Adapted 'map_foreachinarea' to 'map_forsomeinarea' so that it allows you to specify the count of bl you wanna operate on. [Inkfish]
 09/10/24
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 05a1bdd48..8753bba39 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,12 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
+2009/10/25
+	* Rev. 14101 Minor updates and supporting data for Sealed Shrine. [L0ne_W0lf]
+	- Zone 5 is now designated for sealed shrine restricted skills.
+	- Added new quest_db entries for Sealed Shine cooldown.
+	- Updated mob_db entries for Orc's Memory Instance. (improper stats)
+	- Updated Land Mine to have a splash effect. (Provided by Daegaladh)
 2009/10/02
 	* Rev. 14080 Updated Crystal 6 through 9 monsters for Valkyie Gift event. [L0ne_W0lf]
 2009/09/27
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 5658e6908..32aaa4a12 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1026,10 +1026,10 @@
 1979,ZUKDAM,Zukadam,Zukadam,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1980,KUBLIN,Kubkin,Kublin,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Orc Dungeon Instance
-1981,I_HIGH_ORC,High Orc,High Orc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1982,I_ORC_ARCHER,Orc Archer,Orc Archer,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1983,I_ZENORC,Zenorc,Zenorc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1984,I_ORC_LORD,Orc Lord,Orc Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1981,I_HIGH_ORC,Safeguard Chief,Safeguard Chief,52,6890,0,3618,1639,1,428,533,15,5,55,46,55,35,82,40,10,12,2,7,43,0x3695,150,1500,500,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1982,I_ORC_ARCHER,Orc Sniper,Orc Sniper,24,1568,0,196,120,1,151,184,5,10,1,12,24,0,24,5,10,12,1,1,29,0x3885,400,2852,1152,840,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1983,I_ORC_SKELETON,Depraved Orc Spirit,Depraved Orc Spirit,49,7440,0,1729,1787,9,310,390,10,5,1,44,25,20,125,20,10,12,1,7,22,0x3095,300,1960,620,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1984,I_ORC_LADY,Shaman Cargalache,Shaman Cargalache,31,2000,0,644,407,1,135,170,10,10,35,42,25,15,69,55,10,12,1,7,42,0x3695,200,1050,900,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Another World (13.1)
 1985,DANDELION,Dandelion,Dandelion,88,28890,0,8650,3879,2,780,1560,30,35,10,85,4,88,60,30,10,12,1,7,80,12949,150,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1986,TATACHO,Tatacho,Tatacho,106,39311,0,23700,13825,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,7,22,0x108B,150,900,672,480,0,0,0,0,0,0,0,0,6020,4000,579,3000,516,3000,6021,3000,1544,20,1925,10,0,0,0,0,0,0,0,0
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 240d6b561..f1b510d4a 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -2,7 +2,6 @@
 //
 // Structure of Database :
 // Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,Quest Title
-// Note: Work in progress. Hardly ready for actual use.
 //
 1000,0,0,0,0,0,0,0,"Transcend"
 1001,0,0,0,0,0,0,0,"Job Change to Acolyte"
@@ -204,6 +203,10 @@
 3041,180,0,0,0,0,0,0,"The curse of Baphomet - Dearth of magical power"
 3042,0,0,0,0,0,0,0,"The identity of the Cursed Baphomet Doll - Finding Rust Blackhand..."
 3043,0,0,0,0,0,0,0,"The identity of the Cursed Baphomet Doll - The true Gigantic Magestic Goat?"
+3044,0,0,0,0,0,0,0,"The Gigantic Magestic Goat"
+3045,9600,0,0,0,0,0,0,"Sealed Shrine"
+3046,0,0,0,0,0,0,0,"Sealed Shrine After-effect"
+//
 3050,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - News about Morocc Village"
 3051,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - Test of Quealification"
 3052,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - Test of Quealification2"
@@ -910,7 +913,7 @@
 12056,0,0,0,0,0,0,0,"Job Quest - Assassin"
 12057,0,0,0,0,0,0,0,"Pass to the Lab"
 12058,0,0,0,0,0,0,0,"Admission Restricted to the 102 Tower"
-12059,0,0,0,0,0,0,0,"Orc's Memory Time Limit"
+12059,9600,0,0,0,0,0,0,"Orc's Memory Time Limit"
 12060,86400,0,0,0,0,0,0,"Today's Fishing Closed"
 12061,0,0,0,0,0,0,0,"Concentration"
 12062,86400,0,0,0,0,0,0,"Today's Mining Closed"
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 648550827..cc334e7f5 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -157,7 +157,7 @@
 113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0,	BS_OVERTHRUST,Power-Thrust
 114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,		BS_MAXIMIZE,Maximize Power
 115,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10,	HT_SKIDTRAP,Skid Trap
-116,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0,	HT_LANDMINE,Land Mine
+116,3,6,2,2,0x42,0,5,1,no,0,0x80,0,misc,0,	HT_LANDMINE,Land Mine
 117,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,0,	HT_ANKLESNARE,Ankle Snare
 118,3,6,2,0,0x2,1,5,1,no,0,0x80,0,misc,0,	HT_SHOCKWAVE,Shockwave Trap
 119,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0,	HT_SANDMAN,Sandman
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index c12b220d7..49022b5b4 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -91,3 +91,10 @@
 
 //Zone 4 - WoE:SE
 426,256 //High Jump
+
+//Zone 5 - Sealed Shrine
+12,512	//MG_SAFETYWALL
+26,512	//AL_TELEPORT
+219,512	//Snatch
+361,512	//HP_ASSUMPTIO
+691,512	//CASH_ASSUMPTIO
diff --git a/src/map/battle.c b/src/map/battle.c
index b65a5fcde..a1105420a 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -298,7 +298,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag
 	sc = status_get_sc(bl);
 
 	if( sc && sc->data[SC_INVINCIBLE] && !sc->data[SC_INVINCIBLEOFF] )
-		return 0;
+		return 1;
 
 	if (skill_num == PA_PRESSURE)
 		return damage; //This skill bypass everything else.
diff --git a/src/map/status.c b/src/map/status.c
index 71d0f6770..84c396a9a 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -668,7 +668,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
 	{
 		if( !sp )
 			return 0;
-		hp = 0;
+		hp = 1;
 	}
 
 	if( hp && !(flag&1) ) {