Merge from master into xampp-less

.gitattributes

@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+*.as linguist-language=ActionScript

Club Penguin Speedrunning Client.ahk

@@ -264,15 +264,14 @@ RegRead, firewall_status, HKLM, SYSTEM\ControlSet001\Services\SharedAccess\Param
 If (!InStr(firewall_status, "Enabled"))
 	RegWrite, REG_SZ, HKLM, SYSTEM\ControlSet001\Services\SharedAccess\Parameters\FirewallPolicy\StandardProfile\AuthorizedApplications\List, [C:\xampp\php\php.exe], [C:\xampp\php\php.exe]:*:Enabled:[PHP]
 
-FileCopy, C:\xampp\htdocs\index.html.copy, C:\xampp\htdocs\index.html, 1
 FileDelete, C:\xampp\htdocs\index.php
 FileCopy, C:\xampp\htdocs\php.ini, C:\xampp\php, 1
 
 
 
 Menu, Tray, Icon, %A_WorkingDir%\favicon.ico,,1
 Run, run.vbs
-Run, http://localhost/play/load.swf
+Run, http://localhost/
 
 OnExit, ExitSub  
 return

Kitsune/ClubPenguin/Plugins/Commands/Commands.php

@@ -11,7 +11,7 @@ final class Commands extends Plugin {
 	//public $dependencies = array("PatchedItems" => "loadPatchedItems");
 	public $dependencies = array(
 		"PatchedItems" => "loadPatchedItems",
-		"AntiAd" => "loadAntiAd"
+		//"AntiAd" => "loadAntiAd"
 	);
 
 	public $worldHandlers = array(
@@ -76,7 +76,7 @@ final class Commands extends Plugin {
 	private $mutedPenguins = array();
 
 	private $patchedItems;
-    private $antiAd;
+    //private $antiAd;
 
     public $partyServicePacket = '%xt%partyservice%2%{"partySettings":{"partyIglooItems":[0],"numOfDaysInParty":14,"unlockDayIndex":14},"questSettingList":[{"roomIds":[800,809,300,100],"questItemIndex":0,"unlockDay":0,"memberItemIds":[1967,24245],"nonmemberItemId":5509},{"roomIds":[800,809,300,801,100],"questItemIndex":1,"unlockDay":0,"memberItemIds":[1965,24243],"nonmemberItemId":5508},{"roomIds":[800,809,801],"questItemIndex":2,"unlockDay":1,"memberItemIds":[1968,24246],"nonmemberItemId":5510},{"roomIds":[800,801,300],"questItemIndex":3,"unlockDay":1,"memberItemIds":[1969,24247],"nonmemberItemId":5516},{"roomIds":[891],"questItemIndex":4,"unlockDay":2,"memberItemIds":[1966,24244],"nonmemberItemId":9291}],"swordsList":[{"rewardId":0,"points":20,"itemId":2327,"type":"FURNITURE"},{"rewardId":1,"points":50,"itemId":5512,"type":"PAPER_ITEM"},{"rewardId":2,"points":100,"itemId":5515,"type":"PAPER_ITEM"},{"rewardId":3,"points":200,"itemId":5513,"type":"PAPER_ITEM"},{"rewardId":4,"points":350,"itemId":83,"type":"IGLOO"},{"rewardId":5,"points":600,"itemId":0,"type":"PAPER_ITEM"}],"kananLightsaber":{"unlockDay":2,"itemId":5511},"inquisitorPrizeItems":{"memberItemId":[24248,5514],"nonMemberItemId":1970}}%';
 
@@ -92,9 +92,9 @@ public function loadPatchedItems() {
 		$this->patchedItems = $this->server->loadedPlugins["PatchedItems"];
 	}
 
-	public function loadAntiAd() {
-		$this->antiAd = $this->server->loadedPlugins["AntiAd"];
-	}
+	//public function loadAntiAd() {
+	//	$this->antiAd = $this->server->loadedPlugins["AntiAd"];
+	//}
 
 	public function handleRefreshClient($penguin) {
         $penguin->room->refreshRoom($penguin);

README.md

@@ -1,30 +1,5 @@
-# CPSC
-Club Penguin Singleplayer Client Beta 4
+# CPSC has been superseded by [Waddle Forever](https://waddleforever.com/)
+[Waddle Forever repo](https://github.com/nhaar/Waddle-Forever)
 
-This is a singleplayer client for Club Penguin, designed for speedrunning.
-It requires this version of XAMPP and it must be installed before installing CPSC.
-
-
-https://www.apachefriends.org/xampp-files/5.6.33/xampp-win32-5.6.33-0-VC11-installer.exe
-
-
-Download this as a zip and extract it to C:\xampp\htdocs.
-
-
-CPSC is in Beta, more specifically Beta 4
-It uses a lot of code from Kitsune (https://github.com/widd/kitsune) and Zaseth's modified Kitsune (https://github.com/Zaseth/KITSUNE-MODIFIED)
-
-
-Older Versions:
-
-
-Beta 2: https://drive.google.com/open?id=1g2_Eippr5DkHbER-Qba6DD7d3WCJvon4
-
-
-Beta 1:https://drive.google.com/open?id=1PEophHubpKOGesErZYtuzmScPPn7Aos1
-
-[Installation guide](https://pastebin.com/raw/BEKLhdc1)
-
-[Guia de instalação em português](https://pastebin.com/raw/P3dYCLiP)
-
-For more info you can message @Thestickman391#0391 on Discord or join the [CPSC discord server](https://discord.gg/tGDZeyK)
+[Waddle Forever Discord](https://discord.gg/URHXm3cFv5)
+## This repo has been left available as an archive. Do not use this software!