From 15a08e8b9f55184291bd9b9ce513ce2d577f8b02 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sun, 27 Aug 2023 03:04:12 -0500
Subject: [PATCH] Added Attack Range indicators

---
 olcCodeJam2023Entry/Image.h                    |   1 +
 olcCodeJam2023Entry/Unit.cpp                   |  11 ++++++++++-
 olcCodeJam2023Entry/Unit.h                     |   1 +
 olcCodeJam2023Entry/VirusAttack.cpp            |   5 +++++
 olcCodeJam2023Entry/assets/range_indicator.png | Bin 0 -> 736 bytes
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 olcCodeJam2023Entry/assets/range_indicator.png

diff --git a/olcCodeJam2023Entry/Image.h b/olcCodeJam2023Entry/Image.h
index c36ec41..5fbecc7 100644
--- a/olcCodeJam2023Entry/Image.h
+++ b/olcCodeJam2023Entry/Image.h
@@ -17,5 +17,6 @@ enum Image{
 	CORRUPTER,
 	UNIT_ALLOCATOR,
 	RAM_BANK,
+	RANGE_INDICATOR
 };
 
diff --git a/olcCodeJam2023Entry/Unit.cpp b/olcCodeJam2023Entry/Unit.cpp
index 9aeae8c..8f0e411 100644
--- a/olcCodeJam2023Entry/Unit.cpp
+++ b/olcCodeJam2023Entry/Unit.cpp
@@ -184,7 +184,16 @@ Unit::Unit(std::vector<Memory>memory,vf2d pos,Renderable&img,bool friendly,bool
 	}
 }
 
-
+void Unit::DrawRangeIndicator(PixelGameEngine*pge,TileTransformedView&game,std::map<Image,std::unique_ptr<Renderable>>&IMAGES){
+	float dist=geom2d::line<float>(game.ScreenToWorld(pge->GetMousePos()),GetPos()).length();
+	float range=12*(GetRange()+1);
+	if(IsSelected()){
+		game.DrawRotatedDecal(GetPos(),IMAGES[RANGE_INDICATOR]->Decal(),0,IMAGES[RANGE_INDICATOR]->Sprite()->Size()/2,{range/12,range/12},{0,196,0,128});
+	}else
+	if(dist<range*2){
+		game.DrawRotatedDecal(GetPos(),IMAGES[RANGE_INDICATOR]->Decal(),0,IMAGES[RANGE_INDICATOR]->Sprite()->Size()/2,{range/12,range/12},{0,196,0,uint8_t((1.f-(dist/(range*2)))*128)});
+	}
+}
 
 void Unit::Draw(TileTransformedView&game,std::map<Image,std::unique_ptr<Renderable>>&IMAGES){
 	game.DrawRotatedDecal(ghostPos,img.Decal(),0,img.Sprite()->Size()/2,{1,1},friendly?Pixel{192,192,255}:Pixel{255,192,192});
diff --git a/olcCodeJam2023Entry/Unit.h b/olcCodeJam2023Entry/Unit.h
index 4376203..0b5d11c 100644
--- a/olcCodeJam2023Entry/Unit.h
+++ b/olcCodeJam2023Entry/Unit.h
@@ -55,6 +55,7 @@ public:
 	vf2d GetGhostPos();
 	void _Update(PixelGameEngine*pge);
 	bool IsMoveable();
+	void DrawRangeIndicator(PixelGameEngine*pge,TileTransformedView&game,std::map<Image,std::unique_ptr<Renderable>>&IMAGES);
 
 	std::vector<bool>& operator <<=(const int n){
 		for(int i=0;i<GetMemorySize()-1;i++){
diff --git a/olcCodeJam2023Entry/VirusAttack.cpp b/olcCodeJam2023Entry/VirusAttack.cpp
index d8493bd..f3dbe51 100644
--- a/olcCodeJam2023Entry/VirusAttack.cpp
+++ b/olcCodeJam2023Entry/VirusAttack.cpp
@@ -31,6 +31,7 @@ void VirusAttack::InitializeImages(){
 	LoadImage(CORRUPTER,"assets/corrupter.png");
 	LoadImage(UNIT_ALLOCATOR,"assets/shell.png");
 	LoadImage(RAM_BANK,"assets/ram_bank.png");
+	LoadImage(RANGE_INDICATOR,"assets/range_indicator.png");
 }
 
 bool VirusAttack::OnUserCreate(){
@@ -318,6 +319,10 @@ bool VirusAttack::OnUserUpdate(float fElapsedTime){
 	}
 	game.DrawPartialDecal({0,0},CONSTANT::WORLD_SIZE*CONSTANT::TILE_SIZE,IMAGES[TILE]->Decal(),{0,0},CONSTANT::WORLD_SIZE*CONSTANT::TILE_SIZE,DARK_GREEN);
 
+	for(auto&u:units){
+		u->DrawRangeIndicator(this,game,IMAGES);
+	}
+
 	for(auto&u:units){
 		u->Draw(game,IMAGES);
 	}
diff --git a/olcCodeJam2023Entry/assets/range_indicator.png b/olcCodeJam2023Entry/assets/range_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..a959b652522022f2667ce077bddd8ee8d772ccd3
GIT binary patch
literal 736
zcmV<60w4W}P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^J4t5ahkfFM07Zq`oDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_)x}BCMN0f%QfLw5!Ery{-Fw`<1B7Oksb<d{plX(p
zPQ=ArepL*-B8UhA7)L~6rk>0!X5l%$?&0I>U5saWpZjz4D+QAQK9P8i>4rtTK|Hf*
z>74h8!>lYR#OK5l23?T&k?XR{Z=6dG3p_JyWYhD+VPdh=#c~(3vY`@B6Gs(QqkJLf
zvch?bvs$gQ_C5IvLj`Rm!*!Y?NMH#`q#!~@9TikzAx5i4iitGs$36VRjz2{%nOqex
zax9<*6_Voz|AXJ%n#HL}Hz^bcdS7h&V-yJN0<DH^e;?a+>jdyW16NwdUuy!hpQJZB
zTJ#7Q*aj}HJDR))T<!ovPr77Cj^w8)6pO(78GTb87`z4g*4*CO`#607veeb`4RCM>
zjFl*R-Q(TC?%w`A)9&vF(>Zd@N@U)m00006VoOIv00000008+zyMF)x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=Lj1IFDA94vCsej02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{006j2L_t(Y$Guib4#Xe~!-yy4|1Zd&m{TPNnQWrXjg;6S
zYtaHS=bTIr0G{m#f{J(NL<Yl9T27Ra;1c+e1Q)?6Nk4#V1^CI=Uv3P~HSrpDR{>xc
zMzR?y`R+P09M5EZ`Y9w9Ko2H%^)>|j<f12IE97hzL{C<Trz;bbB}yPcU7BEzv68b%
zgusZXmZ{rl?d?WmB^v2?KCa2Ilftl*eWJcTuD@M4pRCNx(qAhpwe)ZPw)_A%o^OZE
Sn*>Y%0000<MNUMnLSTYvP%_v6

literal 0
HcmV?d00001