From 04c9693760f307692c520eaaf14383564c3136e8 Mon Sep 17 00:00:00 2001
From: TomEngMaster <70163122+TomEngMaster@users.noreply.github.com>
Date: Sun, 13 Sep 2020 12:21:00 +0200
Subject: Added Griffin pet

Added Griffin pet and also fixed crashing issue with griffin pet in /pv
---
 constants/petnums.json | 135 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 134 insertions(+), 1 deletion(-)

(limited to 'constants')

diff --git a/constants/petnums.json b/constants/petnums.json
index 7de170a7..b669d827 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -3985,5 +3985,138 @@
             },
             "interp": "1:70"
         }
-    }
+    },
+	 "GRIFFIN": {
+        "COMMON": {
+            "1": {
+                "otherNums": [
+                ],
+                "statNums": {
+                    "CRIT_CHANCE": 0.1,
+                    "CRIT_DAMAGE": 0.5,
+					"STRENGTH": 0.25,
+					"MAGIC_FIND": 0.1,
+					"INTELLIGENCE": 0.1
+                }
+            },
+            "100": {
+                "otherNums": [
+                ],
+                "statNums": {
+                   "CRIT_CHANCE": 10,
+                    "CRIT_DAMAGE": 50,
+					"STRENGTH": 25,
+					"MAGIC_FIND": 10,
+					"INTELLIGENCE": 10
+                }
+            },
+            "interp": "1:70"
+        },
+		"UNCOMMON": {
+            "1": {
+                "otherNums": [
+                ],
+                "statNums": {
+                    "CRIT_CHANCE": 0.1,
+                    "CRIT_DAMAGE": 0.5,
+					"STRENGTH": 0.25,
+					"MAGIC_FIND": 0.1,
+					"INTELLIGENCE": 0.1
+                }
+            },
+            "100": {
+                "otherNums": [
+                ],
+                "statNums": {
+                   "CRIT_CHANCE": 10,
+                    "CRIT_DAMAGE": 50,
+					"STRENGTH": 25,
+					"MAGIC_FIND": 10,
+					"INTELLIGENCE": 10
+                }
+            },
+            "interp": "1:70"
+        },
+		"RARE": {
+            "1": {
+                "otherNums": [
+                ],
+                "statNums": {
+                    "CRIT_CHANCE": 0.1,
+                    "CRIT_DAMAGE": 0.5,
+					"STRENGTH": 0.25,
+					"MAGIC_FIND": 0.1,
+					"INTELLIGENCE": 0.1
+                }
+            },
+            "100": {
+                "otherNums": [
+                ],
+                "statNums": {
+                   "CRIT_CHANCE": 10,
+                    "CRIT_DAMAGE": 50,
+					"STRENGTH": 25,
+					"MAGIC_FIND": 10,
+					"INTELLIGENCE": 10
+                }
+            },
+            "interp": "1:70"
+        },
+		"EPIC": {
+            "1": {
+                "otherNums": [
+					1
+                ],
+                "statNums": {
+                    "CRIT_CHANCE": 0.1,
+                    "CRIT_DAMAGE": 0.5,
+					"STRENGTH": 0.25,
+					"MAGIC_FIND": 0.1,
+					"INTELLIGENCE": 0.1
+                }
+            },
+            "100": {
+                "otherNums": [
+					16
+                ],
+                "statNums": {
+                   "CRIT_CHANCE": 10,
+                    "CRIT_DAMAGE": 50,
+					"STRENGTH": 25,
+					"MAGIC_FIND": 10,
+					"INTELLIGENCE": 10
+                }
+            },
+            "interp": "1:70"
+        },
+		"LEGENDARY": {
+            "1": {
+                "otherNums": [
+					1,
+					1
+                ],
+                "statNums": {
+                    "CRIT_CHANCE": 0.1,
+                    "CRIT_DAMAGE": 0.5,
+					"STRENGTH": 0.25,
+					"MAGIC_FIND": 0.1,
+					"INTELLIGENCE": 0.1
+                }
+            },
+            "100": {
+                "otherNums": [
+					20,
+					15
+                ],
+                "statNums": {
+                   "CRIT_CHANCE": 10,
+                    "CRIT_DAMAGE": 50,
+					"STRENGTH": 25,
+					"MAGIC_FIND": 10,
+					"INTELLIGENCE": 10
+                }
+            },
+            "interp": "1:70"
+        }
+	}	
 }
\ No newline at end of file
-- 
cgit 


From a1550317d20257ab4baa862d41cfb50d351cde30 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Thu, 1 Oct 2020 10:24:38 -0400
Subject: Vannila Fixes

---
 constants/leveling.json | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'constants')

diff --git a/constants/leveling.json b/constants/leveling.json
index 3af6c5c3..cc62a0db 100644
--- a/constants/leveling.json
+++ b/constants/leveling.json
@@ -118,5 +118,57 @@
     25,
     100,
     500
+  ],
+  "catacombs": [
+	50,
+	75,
+	110,
+	160,
+	230,
+	330,
+	470,
+	670,
+	950,
+	1340,
+	1890,
+	2665,
+	3760,
+	5260,
+	7380,
+	10300,
+	14400,
+	20000,
+	27600,
+	38000,
+	52500,
+	71500,
+	97000,
+	132000,
+	180000,
+	243000,
+	328000,
+	445000,
+	600000,
+	800000,
+	1065000,
+	1410000,
+	1900000,
+	2500000,
+	3300000,
+	4300000,
+	5600000,
+	7200000,
+	9200000,
+	12000000,
+	15000000,
+	19000000,
+	24000000,
+	30000000,
+	38000000,
+	48000000,
+	60000000,
+	75000000,
+	93000000,
+	116250000
   ]
 }
\ No newline at end of file
-- 
cgit