Remove the hardcoded checks in pc_rental_expire and use OnRentalEndScript field in item database for those items instead

Fixes #140

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

2 files changed, 92 insertions, 18 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 3fe2fdacd..ba9de0dd4 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -69572,7 +69572,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 1; ">
+	Script: <" setfont(1); ">
+	OnRentalEndScript: <"
+		if (getfont() == 1)
+			setfont(0);
+	">
 },
 {
 	Id: 12288
@@ -69589,7 +69593,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 2; ">
+	Script: <" setfont(2); ">
+	OnRentalEndScript: <"
+		if (getfont() == 2)
+			setfont(0);
+	">
 },
 {
 	Id: 12289
@@ -69606,7 +69614,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 3; ">
+	Script: <" setfont(3); ">
+	OnRentalEndScript: <"
+		if (getfont() == 3)
+			setfont(0);
+	">
 },
 {
 	Id: 12290
@@ -69858,7 +69870,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 4; ">
+	Script: <" setfont(4); ">
+	OnRentalEndScript: <"
+		if (getfont() == 4)
+			setfont(0);
+	">
 },
 {
 	Id: 12305
@@ -69875,7 +69891,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 5; ">
+	Script: <" setfont(5); ">
+	OnRentalEndScript: <"
+		if (getfont() == 5)
+			setfont(0);
+	">
 },
 {
 	Id: 12306
@@ -69892,7 +69912,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 6; ">
+	Script: <" setfont(6); ">
+	OnRentalEndScript: <"
+		if (getfont() == 6)
+			setfont(0);
+	">
 },
 {
 	Id: 12307
@@ -69909,7 +69933,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 7; ">
+	Script: <" setfont(7); ">
+	OnRentalEndScript: <"
+		if (getfont() == 7)
+			setfont(0);
+	">
 },
 {
 	Id: 12308
@@ -69926,7 +69954,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 8; ">
+	Script: <" setfont(8); ">
+	OnRentalEndScript: <"
+		if (getfont() == 8)
+			setfont(0);
+	">
 },
 {
 	Id: 12309
@@ -69943,7 +69975,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 9; ">
+	Script: <" setfont(9); ">
+	OnRentalEndScript: <"
+		if (getfont() == 9)
+			setfont(0);
+	">
 },
 {
 	Id: 12310
@@ -73053,6 +73089,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <" setcashmount(); ">
+	OnRentalEndScript: <" sc_end(SC_ALL_RIDING); ">
 },
 {
 	Id: 12701
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 9f49c07ef..f9997cb53 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -89228,7 +89228,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 1; ">
+	Script: <" setfont(1); ">
+	OnRentalEndScript: <"
+		if (getfont() == 1)
+			setfont(0);
+	">
 },
 {
 	Id: 12288
@@ -89245,7 +89249,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 2; ">
+	Script: <" setfont(2); ">
+	OnRentalEndScript: <"
+		if (getfont() == 2)
+			setfont(0);
+	">
 },
 {
 	Id: 12289
@@ -89262,7 +89270,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 3; ">
+	Script: <" setfont(3); ">
+	OnRentalEndScript: <"
+		if (getfont() == 3)
+			setfont(0);
+	">
 },
 {
 	Id: 12290
@@ -89514,7 +89526,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 4; ">
+	Script: <" setfont(4); ">
+	OnRentalEndScript: <"
+		if (getfont() == 4)
+			setfont(0);
+	">
 },
 {
 	Id: 12305
@@ -89531,7 +89547,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 5; ">
+	Script: <" setfont(5); ">
+	OnRentalEndScript: <"
+		if (getfont() == 5)
+			setfont(0);
+	">
 },
 {
 	Id: 12306
@@ -89548,7 +89568,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 6; ">
+	Script: <" setfont(6); ">
+	OnRentalEndScript: <"
+		if (getfont() == 6)
+			setfont(0);
+	">
 },
 {
 	Id: 12307
@@ -89565,7 +89589,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 7; ">
+	Script: <" setfont(7); ">
+	OnRentalEndScript: <"
+		if (getfont() == 7)
+			setfont(0);
+	">
 },
 {
 	Id: 12308
@@ -89582,7 +89610,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 8; ">
+	Script: <" setfont(8); ">
+	OnRentalEndScript: <"
+		if (getfont() == 8)
+			setfont(0);
+	">
 },
 {
 	Id: 12309
@@ -89599,7 +89631,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" setfont 9; ">
+	Script: <" setfont(9); ">
+	OnRentalEndScript: <"
+		if (getfont() == 9)
+			setfont(0);
+	">
 },
 {
 	Id: 12310
@@ -93351,6 +93387,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <" setcashmount(); ">
+	OnRentalEndScript: <" sc_end(SC_ALL_RIDING); ">
 },
 {
 	Id: 12623