From d1cf08213157e04f4102b087bdc989eeb14ca0f6 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Thu, 28 Sep 2023 13:36:13 +0800
Subject: [PATCH] Revert "Merge pull request #405 from kuangshen04/PR-Branch"

This reverts commit 24dda1f57ca7b4c2e3c487ae90e375234de77114, reversing
changes made to a5a397fa473ed01e0d948b1cca753ecb4c9234ad.
---
 game/game.js | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/game/game.js b/game/game.js
index a69528b64..367ffc65b 100644
--- a/game/game.js
+++ b/game/game.js
@@ -39821,25 +39821,14 @@
 				});
 			}
 			if(info.inherit){
-				var inheritHistory=[];
-				doInherit(i);
-				function doInherit(i){
-					const info=lib.skill[i],iInfo=`${i}_info`;
-					if(!info.inherit) return;
-					if(inheritHistory.includes(info.inherit)) return;
-					inheritHistory.push(info.inherit);
-
-					const inheritInfo=lib.skill[info.inherit];
-					if(inheritInfo) Object.keys(inheritInfo).forEach(value=>{
-						if(info[value]!=undefined) return;
-						if(value=='audio'&&(typeof info[value]=='number'||typeof info[value]=='boolean')) info[value]=info.inherit;
-						else info[value]=inheritInfo[value];
-					});
-					if(lib.translate[i]==undefined) lib.translate[i]=lib.translate[info.inherit];
-					if(lib.translate[iInfo]==undefined) lib.translate[iInfo]=lib.translate[`${info.inherit}_info`];
-
-					doInherit(info.inherit);
-				}
+				const skill=lib.skill[info.inherit];
+				if(skill) Object.keys(skill).forEach(value=>{
+					if(info[value]!=undefined) return;
+					if(value=='audio'&&(typeof info[value]=='number'||typeof info[value]=='boolean')) info[value]=info.inherit;
+					else info[value]=skill[value];
+				});
+				if(lib.translate[i]==undefined) lib.translate[i]=lib.translate[info.inherit];
+				if(lib.translate[iInfo]==undefined) lib.translate[iInfo]=lib.translate[`${info.inherit}_info`];
 			}
 			if(info.limited){
 				if(info.mark===undefined) info.mark=true;