Immortal Courage now is Defiance.

sil-quirk · Oct 15, 2017 · 8dc3a15 · 8dc3a15
1 parent 32514ab
commit 8dc3a15
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/Sil/lib/edit/ability.txt b/Sil/lib/edit/ability.txt
@@ -166,7 +166,7 @@ D:You gain a point of strength.
 N:20:Rout
 I:1:0:2
 D:Firing at fleeing monsters is calculated as if you had 5 points
-D: more of dexterity.
+D: more dexterity.
 T:19:0:99  # Bows
 
 N:21:Precision
@@ -479,7 +479,7 @@ I:5:6:7
 P:5/1:5/5
 D:Gives you resistance to poison.
 
-N:107:Immortal Courage
+N:107:Defiance
 I:5:7:8
 P:5/1
 D:You do not die when your health reaches zero, but become

diff --git a/Sil/src/defines.h b/Sil/src/defines.h
@@ -520,17 +520,17 @@
 /* 
  * Will abilities 
  */
-#define	WIL_CHANNELING				 0
-#define	WIL_STRENGTH_IN_ADVERSITY		 1
-#define	WIL_CURSE_BREAKING			 2
-#define	WIL_INNER_LIGHT				 3
-#define	WIL_INDOMITABLE				 4
-#define	WIL_HARDINESS				 5
-#define	WIL_POISON_RESISTANCE		 6
-#define	WIL_IMMORTAL_COURAGE		 7
-#define	WIL_CRITICAL_RESISTANCE		 8
-#define	WIL_MAJESTY					 9
-#define	WIL_CON						10
+#define	WIL_CHANNELING				0
+#define	WIL_STRENGTH_IN_ADVERSITY		1
+#define	WIL_CURSE_BREAKING			2
+#define	WIL_INNER_LIGHT				3
+#define	WIL_INDOMITABLE				4
+#define	WIL_HARDINESS				5
+#define	WIL_POISON_RESISTANCE			6
+#define	WIL_DEFIANCE				7
+#define	WIL_CRITICAL_RESISTANCE			8
+#define	WIL_MAJESTY				9
+#define	WIL_CON					10
 
 /* 
  * Smithing abilities 

diff --git a/Sil/src/dungeon.c b/Sil/src/dungeon.c
@@ -2206,7 +2206,7 @@ static void process_player(void)
 		take_hit(amount, "a fatal wound");
 	}
 
-	if (p_ptr->unwounded == 0 && !p_ptr->active_ability[S_WIL][WIL_IMMORTAL_COURAGE])
+	if (p_ptr->unwounded == 0 && !p_ptr->active_ability[S_WIL][WIL_DEFIANCE])
 	{
 		take_hit(p_ptr->chp, "loss of the will to live");
 	}

diff --git a/Sil/src/spells1.c b/Sil/src/spells1.c
@@ -547,7 +547,7 @@ void take_hit(int dam, cptr kb_str)
 	p_ptr->window |= (PW_PLAYER_0);
 
         /* Dead player */
-	if (p_ptr->active_ability[S_WIL][WIL_IMMORTAL_COURAGE])
+	if (p_ptr->active_ability[S_WIL][WIL_DEFIANCE])
 	{
 		if (p_ptr->chp <= 0 && p_ptr->unwounded == 1)
 		{
@@ -559,7 +559,7 @@ void take_hit(int dam, cptr kb_str)
 		}
 	}
 
-	if (p_ptr->chp <= 0 || (p_ptr->unwounded == 0 && !p_ptr->active_ability[S_WIL][WIL_IMMORTAL_COURAGE]))
+	if (p_ptr->chp <= 0 || (p_ptr->unwounded == 0 && !p_ptr->active_ability[S_WIL][WIL_DEFIANCE]))
 	{
 		/* Hack -- Note death */
 		message(MSG_DEATH, 0, "You die.");

diff --git a/Sil/src/xtra1.c b/Sil/src/xtra1.c
@@ -1518,7 +1518,7 @@ static void calc_hitpoints(void)
 	int tmp;
 
 
-	if (p_ptr->active_ability[S_WIL][WIL_IMMORTAL_COURAGE] && p_ptr->unwounded == 0)
+	if (p_ptr->active_ability[S_WIL][WIL_DEFIANCE] && p_ptr->unwounded == 0)
 	{
 		mhp = p_ptr->skill_use[S_WIL];
 	}
@@ -2796,7 +2796,7 @@ static void calc_bonuses(void)
 
 	if (p_ptr->skill_use[S_WIL] != old_skill_use[S_WIL])
 	{
-		// IMMORTAL_COURAGE
+		// DEFIANCE
 		p_ptr->update |= (PU_HP);
 	}