Merge branch 'master' into master

DexterHuang · May 4, 2024 · 64291d9 · 64291d9
2 parents abadfe5 + 30cdd64
commit 64291d9
Show file tree

Hide file tree

Showing 30 changed files with 14,479 additions and 12,679 deletions.
diff --git a/UpdateNote.md b/UpdateNote.md
@@ -31,6 +31,12 @@ Step-by-step [Guide](https://cybercode-online.fandom.com/wiki/GitHub_PR_Tutorial
 
 ## Updates
 
+### 0.1831
+
+-   Added global party contribution feature, now you can go to `Partyline Pub` found in the market street, where a new NPC `Jieun` has been added, you can contribute 10% of global party with your unit, when the funding reaches 100%, global party buff will be activated immediately.
+
+![image](https://github.com/DexterHuang/CyberCodeOnline/assets/18545294/f1a41a2c-73cc-414b-a4f8-64eee9bd3b7c)
+
 ### 0.1830
 
 -   Fixed issue with chat message popup on non-English UI

diff --git a/contribution/lang/ar.json b/contribution/lang/ar.json
@@ -207,6 +207,89 @@
  	 	 	 	"eng": "This content is contributed by the community. click here to contribute your own content."
  	 	 	}
  	 	},
+ 	 	"quest": {
+ 	 	 	"globalParty": {
+ 	 	 	 	"progressTitle": {
+ 	 	 	 	 	"trans": "صندوق الحفلات العالمي",
+ 	 	 	 	 	"eng": "Global Party Funds"
+ 	 	 	 	}
+ 	 	 	},
+ 	 	 	"dynamicTutorial": {
+ 	 	 	 	"title": {
+ 	 	 	 	 	"trans": "دروس",
+ 	 	 	 	 	"eng": "Tutorials"
+ 	 	 	 	},
+ 	 	 	 	"printingTooLow": {
+ 	 	 	 	 	"title": {
+ 	 	 	 	 	 	"trans": "تحسين الطباعة رتبة",
+ 	 	 	 	 	 	"eng": "Improve Printing Rank"
+ 	 	 	 	 	},
+ 	 	 	 	 	"description": {
+ 	 	 	 	 	 	"trans": "تحدد رتبة الطباعة مستوى العنصر الذي تطبعه. كسب طباعة إكسب من قبل الطباعة والشراء في السوق السوداء",
+ 	 	 	 	 	 	"eng": "Printing Rank determines the level of item you print. Gain printing exp by print & sell in Black Market"
+ 	 	 	 	 	}
+ 	 	 	 	},
+ 	 	 	 	"gearTooWeak": {
+ 	 	 	 	 	"title": {
+ 	 	 	 	 	 	"trans": "الحصول على معدات أفضل!",
+ 	 	 	 	 	 	"eng": "Get even better equipments!"
+ 	 	 	 	 	},
+ 	 	 	 	 	"description": {
+ 	 	 	 	 	 	"trans": "يبدو أن المعدات الحالية الخاصة بك أبيت قديمة على مستواك، حاول الطباعة أقوى لاستبدالها",
+ 	 	 	 	 	 	"eng": "Your current equipment seems abit outdated for your level, try printing stronger ones to replace them"
+ 	 	 	 	 	}
+ 	 	 	 	},
+ 	 	 	 	"noUpgrade": {
+ 	 	 	 	 	"title": {
+ 	 	 	 	 	 	"trans": "ترقية المعدات الخاصة بك!",
+ 	 	 	 	 	 	"eng": "Upgrade your equipment!"
+ 	 	 	 	 	},
+ 	 	 	 	 	"description": {
+ 	 	 	 	 	 	"vars": [
+ 	 	 	 	 	 	 	"itemName"
+ 	 	 	 	 	 	],
+ 	 	 	 	 	 	"trans": "يمكنك ترقية المعدات الخاصة بك باستخدام ${itemName}",
+ 	 	 	 	 	 	"eng": "You can upgrade your equipment by using the ${itemName}"
+ 	 	 	 	 	}
+ 	 	 	 	},
+ 	 	 	 	"aiCore": {
+ 	 	 	 	 	"title": {
+ 	 	 	 	 	 	"trans": "استخدام AI CORE",
+ 	 	 	 	 	 	"eng": "Use AI Core"
+ 	 	 	 	 	},
+ 	 	 	 	 	"description": {
+ 	 	 	 	 	 	"trans": "يبدو أن لديك بعض النوى AI، واستخدامها للقيام AFK التسوية التلقائي في منطقة المستوى المناسب.",
+ 	 	 	 	 	 	"eng": "Looks like you have some AI Cores, use them to do AFK auto leveling in appropriate level area."
+ 	 	 	 	 	}
+ 	 	 	 	},
+ 	 	 	 	"noAiCore": {
+ 	 	 	 	 	"title": {
+ 	 	 	 	 	 	"trans": "الحصول على ai النوى",
+ 	 	 	 	 	 	"eng": "Acquire AI Cores"
+ 	 	 	 	 	},
+ 	 	 	 	 	"description": {
+ 	 	 	 	 	 	"trans": "قد تحصل على ai cores بواسطة: \n         - فروق في مواقع مختلفة \n         - صياغة مع معالجات التجزئة وقطع القصاصات التقنية \n         - نهب من الأعداء في جميع المواقع",
+ 	 	 	 	 	 	"eng": "You may get AI Cores by: \r\n        - Scavenge in various locations\r\n        - Crafting with Hash Processors and Tech Scraps\r\n        - Looting from enemies in all locations"
+ 	 	 	 	 	}
+ 	 	 	 	},
+ 	 	 	 	"common": {
+ 	 	 	 	 	"clickToOpen": {
+ 	 	 	 	 	 	"trans": "انقر لفتح",
+ 	 	 	 	 	 	"eng": "click to open"
+ 	 	 	 	 	}
+ 	 	 	 	}
+ 	 	 	},
+ 	 	 	"globalQuest": {
+ 	 	 	 	"title": {
+ 	 	 	 	 	"trans": "عالمي",
+ 	 	 	 	 	"eng": "Global"
+ 	 	 	 	},
+ 	 	 	 	"progressTitle": {
+ 	 	 	 	 	"trans": "SL-Data fortress خرق",
+ 	 	 	 	 	"eng": "SL-Data Fortress Breach"
+ 	 	 	 	}
+ 	 	 	}
+ 	 	},
  	 	"minigame": {
  	 	 	"colors": {
  	 	 	 	"win": {
@@ -1248,97 +1331,13 @@
  	 	 	 	}
  	 	 	}
  	 	},
- 	 	"quest": {
- 	 	 	"dynamicTutorial": {
- 	 	 	 	"title": {
- 	 	 	 	 	"trans": "دروس",
- 	 	 	 	 	"eng": "Tutorials"
- 	 	 	 	},
- 	 	 	 	"printingTooLow": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "تحسين الطباعة رتبة",
- 	 	 	 	 	 	"eng": "Improve Printing Rank"
- 	 	 	 	 	},
- 	 	 	 	 	"description": {
- 	 	 	 	 	 	"trans": "تحدد رتبة الطباعة مستوى العنصر الذي تطبعه. كسب طباعة إكسب من قبل الطباعة والشراء في السوق السوداء",
- 	 	 	 	 	 	"eng": "Printing Rank determines the level of item you print. Gain printing exp by print & sell in Black Market"
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"gearTooWeak": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "الحصول على معدات أفضل!",
- 	 	 	 	 	 	"eng": "Get even better equipments!"
- 	 	 	 	 	},
- 	 	 	 	 	"description": {
- 	 	 	 	 	 	"trans": "يبدو أن المعدات الحالية الخاصة بك أبيت قديمة على مستواك، حاول الطباعة أقوى لاستبدالها",
- 	 	 	 	 	 	"eng": "Your current equipment seems abit outdated for your level, try printing stronger ones to replace them"
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"noUpgrade": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "ترقية المعدات الخاصة بك!",
- 	 	 	 	 	 	"eng": "Upgrade your equipment!"
- 	 	 	 	 	},
- 	 	 	 	 	"description": {
- 	 	 	 	 	 	"vars": [
- 	 	 	 	 	 	 	"itemName"
- 	 	 	 	 	 	],
- 	 	 	 	 	 	"trans": "يمكنك ترقية المعدات الخاصة بك باستخدام ${itemName}",
- 	 	 	 	 	 	"eng": "You can upgrade your equipment by using the ${itemName}"
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"aiCore": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "استخدام AI CORE",
- 	 	 	 	 	 	"eng": "Use AI Core"
- 	 	 	 	 	},
- 	 	 	 	 	"description": {
- 	 	 	 	 	 	"trans": "يبدو أن لديك بعض النوى AI، واستخدامها للقيام AFK التسوية التلقائي في منطقة المستوى المناسب.",
- 	 	 	 	 	 	"eng": "Looks like you have some AI Cores, use them to do AFK auto leveling in appropriate level area."
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"noAiCore": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "الحصول على ai النوى",
- 	 	 	 	 	 	"eng": "Acquire AI Cores"
- 	 	 	 	 	},
- 	 	 	 	 	"description": {
- 	 	 	 	 	 	"trans": "قد تحصل على ai cores بواسطة: \n         - فروق في مواقع مختلفة \n         - صياغة مع معالجات التجزئة وقطع القصاصات التقنية \n         - نهب من الأعداء في جميع المواقع",
- 	 	 	 	 	 	"eng": "You may get AI Cores by: \r\n        - Scavenge in various locations\r\n        - Crafting with Hash Processors and Tech Scraps\r\n        - Looting from enemies in all locations"
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"common": {
- 	 	 	 	 	"clickToOpen": {
- 	 	 	 	 	 	"trans": "انقر لفتح",
- 	 	 	 	 	 	"eng": "click to open"
- 	 	 	 	 	}
- 	 	 	 	}
- 	 	 	},
- 	 	 	"globalQuest": {
- 	 	 	 	"progressTitle": {
- 	 	 	 	 	"trans": "SL-Data fortress خرق",
- 	 	 	 	 	"eng": "SL-Data Fortress Breach"
- 	 	 	 	},
- 	 	 	 	"infoBox": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "الفضاء الإلكتروني القرصنة في التقدم",
- 	 	 	 	 	 	"eng": "Cyberspace breach in progress"
- 	 	 	 	 	},
- 	 	 	 	 	"subtitle": {
- 	 	 	 	 	 	"trans": "Join forces with other Netrunners to breach the SL-Data Fortress to grant all players a buff",
- 	 	 	 	 	 	"eng": "Join forces with other Netrunners to breach the SL-Data Fortress to grant all players with buff"
- 	 	 	 	 	}
- 	 	 	 	},
- 	 	 	 	"completeBox": {
- 	 	 	 	 	"title": {
- 	 	 	 	 	 	"trans": "انتهت عملية الاختراق",
- 	 	 	 	 	 	"eng": "Breach operation completed"
- 	 	 	 	 	},
- 	 	 	 	 	"subtitle": {
- 	 	 	 	 	 	"trans": "استغلال عن بعد للنشر، يرجى الانتظار ...",
- 	 	 	 	 	 	"eng": "Remote exploit deploying, please wait..."
- 	 	 	 	 	}
- 	 	 	 	}
+ 	 	"error": {
+ 	 	 	"levelTooLow": {
+ 	 	 	 	"vars": [
+ 	 	 	 	 	"level"
+ 	 	 	 	],
+ 	 	 	 	"trans": "يجب أن تكون على مستوى ${level} للوصول إلى هذه الميزة",
+ 	 	 	 	"eng": "You need to be level ${level} to access this feature"
  	 	 	}
  	 	},
  	 	"mobileQuestPage": {
@@ -2423,6 +2422,10 @@
  	 	 	"ai": {
  	 	 	 	"trans": "الذكاء الاصطناعي",
  	 	 	 	"eng": "Artificial Intelligence"
+ 	 	 	},
+ 	 	 	"dataFortress": {
+ 	 	 	 	"trans": "قلعة بيانات SL",
+ 	 	 	 	"eng": "SL-Data Fortress"
  	 	 	}
  	 	},
  	 	"unlockContainerPage": {
@@ -2813,6 +2816,10 @@
  	 	 	"trans": "برعاية:",
  	 	 	"eng": "Hosted by:"
  	 	},
+ 	 	"subtitleMulti": {
+ 	 	 	"trans": "إضغط لعرض مُضيفي الحفلات:",
+ 	 	 	"eng": "Click to view party hosts:"
+ 	 	},
  	 	"button,": {
  	 	 	"vars": [
  	 	 	 	"playerName"
@@ -7551,6 +7558,36 @@
  	 	 	 	"eng": "Jin"
  	 	 	}
  	 	},
+ 	 	"party": {
+ 	 	 	"defaultLines": {
+ 	 	 	 	"trans": [
+ 	 	 	 	 	"Hey choom, ready to chip in for the next 24-hour global party? We're just a few units short!",
+ 	 	 	 	 	"Ready to make an impact? Your contribution could launch the biggest party on the grid!",
+ 	 	 	 	 	"Looking to start the party? We're pooling funds now for a round-the-clock celebration.",
+ 	 	 	 	 	"If you’re aiming to see the city light up, help us fill the party meter. Every bit counts!",
+ 	 	 	 	 	"Hey, choomba! Here to plan another blockbuster event? Let's dive in!"
+ 	 	 	 	],
+ 	 	 	 	"eng": [
+ 	 	 	 	 	"Hey choom, ready to chip in for the next 24-hour global party? We're just a few units short!",
+ 	 	 	 	 	"Ready to make an impact? Your contribution could launch the biggest party on the grid!",
+ 	 	 	 	 	"Looking to start the party? We're pooling funds now for a round-the-clock celebration.",
+ 	 	 	 	 	"If you’re aiming to see the city light up, help us fill the party meter. Every bit counts!",
+ 	 	 	 	 	"Hey, choomba! Here to plan another blockbuster event? Let's dive in!"
+ 	 	 	 	]
+ 	 	 	},
+ 	 	 	"name": {
+ 	 	 	 	"trans": "حانة بارتيلين",
+ 	 	 	 	"eng": "Partyline Pub"
+ 	 	 	},
+ 	 	 	"canAccessError": {
+ 	 	 	 	"trans": "يجب أن تكون على الأقل في المستوى ١٠ للوصول إلى بارتيلين باب",
+ 	 	 	 	"eng": "You need to be at least level 10 to access partyline pub"
+ 	 	 	},
+ 	 	 	"npcName": {
+ 	 	 	 	"trans": "جيون",
+ 	 	 	 	"eng": "Jieun"
+ 	 	 	}
+ 	 	},
  	 	"recycleMachine": {
  	 	 	"name": {
  	 	 	 	"trans": "recycler التلقائي",
@@ -9699,6 +9736,23 @@
  	 	 	}
  	 	}
  	},
+ 	"globalPartyPage": {
+ 	 	"hint": {
+ 	 	 	"trans": "تستطيع المساهمة في الحفلة العالمية عن طريق شراء حزب جزئي. ستبدأ الحفلة عندما يصل التقدم إلى 100%.",
+ 	 	 	"eng": "You can contribute to the global party by purchasing a partial party. The party will start when the progress reaches 100%."
+ 	 	},
+ 	 	"startParty": {
+ 	 	 	"trans": "إقامة حفلة",
+ 	 	 	"eng": "Host Party"
+ 	 	},
+ 	 	"contribute": {
+ 	 	 	"vars": [
+ 	 	 	 	"percent"
+ 	 	 	],
+ 	 	 	"trans": "ساهم بنسبة ${percent}%",
+ 	 	 	"eng": "Contribute ${percent}%"
+ 	 	}
+ 	},
  	"itemFilterSettingPage": {
  	 	"title": {
  	 	 	"trans": "إعداد مرشح",
@@ -10246,6 +10300,32 @@
  	 	 	"eng": "name length must be greater then 4, less then or equal to 16 and only contains English characters, numbers or \\'_\\'"
  	 	}
  	},
+ 	"globalParty": {
+ 	 	"notEnoughUnit": {
+ 	 	 	"trans": "ما عندكش وحدات كافية عشان تدخل حفلة عالمية",
+ 	 	 	"eng": "You do not have enough Unit to join global party"
+ 	 	},
+ 	 	"alreadyActive": {
+ 	 	 	"trans": "الحفلة العالمية قائمة بالفعل، يرجى الانتظار حتى تنتهي",
+ 	 	 	"eng": "Global party is already active, please wait til it ends"
+ 	 	},
+ 	 	"announcement": {
+ 	 	 	"vars": [
+ 	 	 	 	"players"
+ 	 	 	],
+ 	 	 	"trans": "🎉 وقت الحفلة! 🥳 تم تنشيطها بواسطة ${players}",
+ 	 	 	"eng": "🎉Its Party Time!🥳 activated by ${players}"
+ 	 	},
+ 	 	"contribute": {
+ 	 	 	"vars": [
+ 	 	 	 	"playerName",
+ 	 	 	 	"cred",
+ 	 	 	 	"percent"
+ 	 	 	],
+ 	 	 	"trans": "${playerName} ساهم في تقدم الحفل العالمي، امنح هذا الأسطورة بعض الاعتراف في الشوارع! [الصندوق الحالي: ${percent}%] ${cred}",
+ 	 	 	"eng": "${playerName} has contributed to global party progress, give the legend some street cred! [current fund: ${percent}%] ${cred}"
+ 	 	}
+ 	},
  	"skip": {
  	 	"skipRewardMail": {
  	 	 	"1": {