Half part of Reinfected

Author: Bamcane

CMakeLists.txt

@@ -877,6 +877,7 @@ set(EXPECTED_DATA
   editor/checker.png
   editor/cursor.png
   editor/entities.png
+  editor/entities/reinfected.png
   emoticons.png
   fonts/DejaVuSans.ttf
   fonts/SourceHanSans.ttc
@@ -1110,6 +1111,7 @@ set(EXPECTED_DATA
   ui/gametypes/lts.png
   ui/gametypes/mod.png
   ui/gametypes/race.png
+  ui/gametypes/reinfected.png
   ui/gametypes/tdm.png
   ui/gui_buttons.png
   ui/gui_cursor.png
@@ -1617,6 +1619,8 @@ set_src(GAME_SERVER GLOB_RECURSE src/game/server
   gamemodes/lts.h
   gamemodes/mod.cpp
   gamemodes/mod.h
+  gamemodes/reinfected.cpp
+  gamemodes/reinfected.h
   gamemodes/tdm.cpp
   gamemodes/tdm.h
   gameworld.cpp

datasrc/editor/entities/reinfected.png

@@ -26,6 +26,8 @@ Authors:	android272, Chi11y (chi1), Crises, Daniel, Echchouik, Fisico,
 			red_com, serpis, SkizZ, somerunce, Sonix, Stephanator, teetow,
 			Ubu, Zatline
 
+Teeworlds Archive Project: Bamcane
+
 ------------------------------------------------------------------------
 
 IMPORTANT NOTE! The source under src/engine/external are stripped

datasrc/ui/gametypes/reinfected.png

@@ -90,7 +90,10 @@ enum
 	SERVERINFO_VERSION_CURRENT, // add extend player info
 
 	MAX_CLIENTS=64,
+	/*
 	MAX_PLAYERS=16,
+	*/
+	MAX_PLAYERS=64,
 
 	MAX_INPUT_SIZE=128,
 	MAX_SNAPSHOT_PACKSIZE=900,

license.txt

@@ -3027,6 +3027,11 @@ void CEditor::FilelistPopulate(int StorageType)
 		Item.m_IsLink = true;
 		Item.m_StorageType = IStorage::TYPE_ALL;
 		m_CompleteFileList.add(Item);
+
+		str_copy(Item.m_aFilename, "entities/reinfected.png", sizeof(Item.m_aFilename));
+		str_copy(Item.m_aName, "Reinfected", sizeof(Item.m_aName));
+		Item.m_StorageType = IStorage::TYPE_ALL;
+		m_CompleteFileList.add(Item);
 	}
 	Storage()->ListDirectory(StorageType, m_pFileDialogPath, EditorListdirCallback, this);
 	RefreshFilteredFileList();

maps/reinfected1.map

@@ -8,7 +8,9 @@
 #include <game/server/player.h>
 
 #include "character.h"
+/*
 #include "laser.h"
+*/
 #include "projectile.h"
 
 //input count
@@ -253,18 +255,23 @@ void CCharacter::FireWeapon()
 	DoWeaponSwitch();
 	vec2 Direction = normalize(vec2(m_LatestInput.m_TargetX, m_LatestInput.m_TargetY));
 
+	/*
 	bool FullAuto = false;
 	if(m_ActiveWeapon == WEAPON_GRENADE || m_ActiveWeapon == WEAPON_SHOTGUN || m_ActiveWeapon == WEAPON_LASER)
 		FullAuto = true;
-
+	*/
 
 	// check if we gonna fire
 	bool WillFire = false;
 	if(CountInput(m_LatestPrevInput.m_Fire, m_LatestInput.m_Fire).m_Presses)
 		WillFire = true;
 
+	/*
 	if(FullAuto && (m_LatestInput.m_Fire&1) && m_aWeapons[m_ActiveWeapon].m_Ammo)
 		WillFire = true;
+	*/
+	if(GameServer()->m_pController->CanCharacterWeaponFullAuto(this, m_ActiveWeapon) && (m_LatestInput.m_Fire&1) && m_aWeapons[m_ActiveWeapon].m_Ammo)
+		WillFire = true;
 
 	if(!WillFire)
 		return;
@@ -282,7 +289,9 @@ void CCharacter::FireWeapon()
 		return;
 	}
 
+	/*
 	vec2 ProjStartPos = m_Pos+Direction*GetProximityRadius()*0.75f;
+	*/
 
 	if(Config()->m_Debug)
 	{
@@ -291,6 +300,7 @@ void CCharacter::FireWeapon()
 		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 	}
 
+	/*
 	switch(m_ActiveWeapon)
 	{
 		case WEAPON_HAMMER:
@@ -396,14 +406,18 @@ void CCharacter::FireWeapon()
 		} break;
 
 	}
+	*/
 
 	m_AttackTick = Server()->Tick();
 
 	if(m_aWeapons[m_ActiveWeapon].m_Ammo > 0) // -1 == unlimited
 		m_aWeapons[m_ActiveWeapon].m_Ammo--;
 
+	m_ReloadTimer = GameServer()->m_pController->OnCharacterFireWeapon(this, Direction, m_ActiveWeapon);
+	/*
 	if(!m_ReloadTimer)
 		m_ReloadTimer = g_pData->m_Weapons.m_aId[m_ActiveWeapon].m_Firedelay * Server()->TickSpeed() / 1000;
+	*/
 }
 
 void CCharacter::HandleWeapons()
@@ -477,6 +491,14 @@ void CCharacter::SetEmote(int Emote, int Tick)
 	m_EmoteStop = Tick;
 }
 
+void CCharacter::DoNinjaFire(vec2 Direction, int MoveTime)
+{
+	m_NumObjectsHit = 0;
+	m_Ninja.m_ActivationDir = Direction;
+	m_Ninja.m_CurrentMoveTime = MoveTime;
+	m_Ninja.m_OldVelAmount = length(m_Core.m_Vel);
+}
+
 void CCharacter::OnPredictedInput(CNetObj_PlayerInput *pNewInput)
 {
 	// check for changes

src/engine/shared/protocol.h

@@ -63,6 +63,8 @@ class CCharacter : public CEntity
 	bool IsAlive() const { return m_Alive; }
 	class CPlayer *GetPlayer() { return m_pPlayer; }
 
+	// need this hook for gamecontroller to call ninja fire
+	void DoNinjaFire(vec2 Direction, int MoveTime);
 private:
 	// player controlling this character
 	class CPlayer *m_pPlayer;

src/game/editor/editor.cpp

@@ -2,6 +2,7 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <generated/server_data.h>
 #include <game/server/gamecontext.h>
+#include <game/server/gamecontroller.h>
 #include <game/server/player.h>
 
 #include "character.h"
@@ -43,6 +44,9 @@ void CPickup::Tick()
 	}
 	// Check if a player intersected us
 	CCharacter *pChr = (CCharacter *)GameWorld()->ClosestEntity(m_Pos, 20.0f, CGameWorld::ENTTYPE_CHARACTER, 0);
+	if(pChr && !GameServer()->m_pController->CanCharacterPickup(pChr))
+		return;
+
 	if(pChr && pChr->IsAlive())
 	{
 		// player picked us up, is someone was hooking us, let them go