Bläddra i källkod

Fixes Assumptio status in renewal (#4736)

* Adjusts Assumptio to increase hard defense, not soft.
* Adjusts CASH_ASSUMPTIO status icon to follow as well.
Thanks to @LordWhiplash!
Aleos 5 år sedan
förälder
incheckning
bdd63022a9
1 ändrade filer med 11 tillägg och 5 borttagningar
  1. 11 5
      src/map/status.cpp

+ 11 - 5
src/map/status.cpp

@@ -581,7 +581,7 @@ void initChangeTables(void)
 #ifndef RENEWAL
 			EFST_ASSUMPTIO		, SCB_NONE );
 #else
-			EFST_ASSUMPTIO_BUFF	, SCB_DEF2 );
+			EFST_ASSUMPTIO_BUFF	, SCB_DEF );
 #endif
 #ifdef RENEWAL
 	set_sc( HP_BASILICA			, SC_BASILICA	, EFST_BASILICA_BUFF	, SCB_ALL );
@@ -718,7 +718,12 @@ void initChangeTables(void)
 
 	set_sc( CASH_BLESSING		, SC_BLESSING		, EFST_BLESSING		, SCB_STR|SCB_INT|SCB_DEX );
 	set_sc( CASH_INCAGI		, SC_INCREASEAGI	, EFST_INC_AGI, SCB_AGI|SCB_SPEED );
-	set_sc( CASH_ASSUMPTIO		, SC_ASSUMPTIO		, EFST_ASSUMPTIO		, SCB_NONE );
+	set_sc( CASH_ASSUMPTIO		, SC_ASSUMPTIO		,
+#ifndef RENEWAL
+			EFST_ASSUMPTIO		, SCB_NONE );
+#else
+			EFST_ASSUMPTIO_BUFF	, SCB_DEF );
+#endif
 
 	set_sc( ALL_PARTYFLEE		, SC_PARTYFLEE		, EFST_PARTYFLEE		, SCB_NONE );
 	set_sc( ALL_ODINS_POWER		, SC_ODINS_POWER	, EFST_ODINS_POWER	, SCB_WATK|SCB_MATK|SCB_MDEF|SCB_DEF );
@@ -6904,7 +6909,10 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc,
 
 	if(sc->data[SC_DRUMBATTLE])
 		def += sc->data[SC_DRUMBATTLE]->val3;
-#ifndef RENEWAL
+#ifdef RENEWAL
+	if (sc->data[SC_ASSUMPTIO])
+		def += sc->data[SC_ASSUMPTIO]->val1 * 50;
+#else
 	if(sc->data[SC_DEFENCE])
 		def += sc->data[SC_DEFENCE]->val2;
 #endif
@@ -7000,8 +7008,6 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
 #ifdef RENEWAL
 	if (sc->data[SC_SKA])
 		def2 += 80;
-	if (sc->data[SC_ASSUMPTIO])
-		def2 += sc->data[SC_ASSUMPTIO]->val1 * 50;
 #endif
 	if(sc->data[SC_ANGELUS])
 #ifdef RENEWAL /// The VIT stat bonus is boosted by angelus [RENEWAL]