Skip to content
Snippets Groups Projects
Commit d3396e1a authored by Trandinh Thien's avatar Trandinh Thien
Browse files

Added archer and mage class implementations. Classes are now unable to counter... 

Added archer and mage class implementations. Classes are now unable to counter attack if not in range
parent 96d54309
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Doc/SRS/SRS.aux 0 → 100644
+ 0
− 0
View file @ d3396e1a
Doc/SRS/SRS.log 0 → 100644
+ 441
− 0
View file @ d3396e1a
This is pdfTeX, Version 3.14159265-2.6-1.40.17 (MiKTeX 2.9) (preloaded format=pdflatex 2016.9.23) 13 NOV 2016 19:46
entering extended mode
**./SRS.tex
(SRS.tex
LaTeX2e <2016/03/31> patch level 3
Babel <3.9r> and hyphenation patterns for 75 language(s) loaded.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\base\article.cls"
Document Class: article 2014/09/29 v1.4h Standard LaTeX document class
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\base\size10.clo"
File: size10.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
)
\c@part=\count79
\c@section=\count80
\c@subsection=\count81
\c@subsubsection=\count82
\c@paragraph=\count83
\c@subparagraph=\count84
\c@figure=\count85
\c@table=\count86
\abovecaptionskip=\skip41
\belowcaptionskip=\skip42
\bibindent=\dimen102
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\xcolor\xcolor.sty"
Package: xcolor 2016/05/11 v2.12 LaTeX color extensions (UK)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\00miktex\color.cfg"
File: color.cfg 2016/01/02 v1.6 sample color configuration
)
Package xcolor Info: Driver file: pdftex.def on input line 225.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics-def\pdftex.def"
File: pdftex.def 2016/07/10 v0.06j Graphics/color for pdfTeX
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\infwarerr.sty"
Package: infwarerr 2016/05/16 v1.4 Providing info/warning/error messages (HO)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\ltxcmds.sty"
Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
)
\Gread@gobject=\count87
)
Package xcolor Info: Model `cmy' substituted by `cmy0' on input line 1348.
Package xcolor Info: Model `hsb' substituted by `rgb' on input line 1352.
Package xcolor Info: Model `RGB' extended on input line 1364.
Package xcolor Info: Model `HTML' substituted by `rgb' on input line 1366.
Package xcolor Info: Model `Hsb' substituted by `hsb' on input line 1367.
Package xcolor Info: Model `tHsb' substituted by `hsb' on input line 1368.
Package xcolor Info: Model `HSB' substituted by `hsb' on input line 1369.
Package xcolor Info: Model `Gray' substituted by `gray' on input line 1370.
Package xcolor Info: Model `wave' substituted by `hsb' on input line 1371.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\dvipsnam.def"
File: dvipsnam.def 2016/06/17 v3.0m Driver-dependent file (DPC,SPQR)
))
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\booktabs\booktabs.sty"
Package: booktabs 2005/04/14 v1.61803 publication quality tables
\heavyrulewidth=\dimen103
\lightrulewidth=\dimen104
\cmidrulewidth=\dimen105
\belowrulesep=\dimen106
\belowbottomsep=\dimen107
\aboverulesep=\dimen108
\abovetopsep=\dimen109
\cmidrulesep=\dimen110
\cmidrulekern=\dimen111
\defaultaddspace=\dimen112
\@cmidla=\count88
\@cmidlb=\count89
\@aboverulesep=\dimen113
\@belowrulesep=\dimen114
\@thisruleclass=\count90
\@lastruleclass=\count91
\@thisrulewidth=\dimen115
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\graphicx.sty"
Package: graphicx 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\keyval.sty"
Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
\KV@toks@=\toks14
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\graphics.sty"
Package: graphics 2016/07/10 v1.0t Standard LaTeX Graphics (DPC,SPQR)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\trig.sty"
Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\00miktex\graphics.cfg"
File: graphics.cfg 2016/06/04 v1.11 sample graphics configuration
)
Package graphics Info: Driver file: pdftex.def on input line 99.
)
\Gin@req@height=\dimen116
\Gin@req@width=\dimen117
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\tools\tabularx.sty"
Package: tabularx 2016/02/03 v2.11 `tabularx' package (DPC)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\tools\array.sty"
Package: array 2014/10/28 v2.4c Tabular extension package (FMi)
\col@sep=\dimen118
\extrarowheight=\dimen119
\NC@list=\toks15
\extratabsurround=\skip43
\backup@length=\skip44
)
\TX@col@width=\dimen120
\TX@old@table=\dimen121
\TX@old@col=\dimen122
\TX@target=\dimen123
\TX@delta=\dimen124
\TX@cols=\count92
\TX@ftn=\toks16
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\mdframed\mdframed.sty"
Package: mdframed 2013/07/01 1.9b: mdframed
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\kvoptions.sty"
Package: kvoptions 2016/05/16 v3.12 Key value format for package options (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\kvsetkeys.sty"
Package: kvsetkeys 2016/05/16 v1.17 Key value parser (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\etexcmds.sty"
Package: etexcmds 2016/05/16 v1.6 Avoid name clashes with e-TeX commands (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\ifluatex.sty"
Package: ifluatex 2016/05/16 v1.4 Provides the ifluatex switch (HO)
Package ifluatex Info: LuaTeX not detected.
)
Package etexcmds Info: Could not find \expanded.
(etexcmds) That can mean that you are not using pdfTeX 1.50 or
(etexcmds) that some package has redefined \expanded.
(etexcmds) In the latter case, load this package earlier.
)))
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\l3packages\xparse\xparse.sty"
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\l3kernel\expl3.sty"
Package: expl3 2016/05/18 v6512 L3 programming layer (loader)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\l3kernel\expl3-code.tex"
Package: expl3 2016/05/18 v6512 L3 programming layer (code)
L3 Module: l3bootstrap 2016/02/12 v6412 L3 Bootstrap code
L3 Module: l3names 2016/03/11 v6433 L3 Namespace for primitives
L3 Module: l3basics 2015/11/22 v6315 L3 Basic definitions
L3 Module: l3expan 2015/09/10 v5983 L3 Argument expansion
L3 Module: l3tl 2016/03/26 v6465 L3 Token lists
L3 Module: l3str 2016/03/24 v6441 L3 Strings
L3 Module: l3seq 2015/08/05 v5777 L3 Sequences and stacks
L3 Module: l3int 2016/03/24 v6441 L3 Integers
\c_max_int=\count93
\l_tmpa_int=\count94
\l_tmpb_int=\count95
\g_tmpa_int=\count96
\g_tmpb_int=\count97
L3 Module: l3quark 2015/08/17 v5855 L3 Quarks
L3 Module: l3prg 2015/11/01 v6216 L3 Control structures
\g__prg_map_int=\count98
L3 Module: l3clist 2015/09/02 v5901 L3 Comma separated lists
L3 Module: l3token 2016/04/03 v6470 L3 Experimental token manipulation
L3 Module: l3prop 2016/01/05 v6366 L3 Property lists
L3 Module: l3msg 2016/03/26 v6464 L3 Messages
L3 Module: l3file 2016/03/25 v6458 L3 File and I/O operations
\l_iow_line_count_int=\count99
\l__iow_target_count_int=\count100
\l__iow_current_line_int=\count101
\l__iow_current_word_int=\count102
\l__iow_current_indentation_int=\count103
L3 Module: l3skip 2016/01/05 v6366 L3 Dimensions and skips
\c_zero_dim=\dimen125
\c_max_dim=\dimen126
\l_tmpa_dim=\dimen127
\l_tmpb_dim=\dimen128
\g_tmpa_dim=\dimen129
\g_tmpb_dim=\dimen130
\c_zero_skip=\skip45
\c_max_skip=\skip46
\l_tmpa_skip=\skip47
\l_tmpb_skip=\skip48
\g_tmpa_skip=\skip49
\g_tmpb_skip=\skip50
\c_zero_muskip=\muskip10
\c_max_muskip=\muskip11
\l_tmpa_muskip=\muskip12
\l_tmpb_muskip=\muskip13
\g_tmpa_muskip=\muskip14
\g_tmpb_muskip=\muskip15
L3 Module: l3keys 2015/11/17 v6284 L3 Key-value interfaces
\g__keyval_level_int=\count104
\l_keys_choice_int=\count105
L3 Module: l3fp 2016/03/26 v6465 L3 Floating points
\c__fp_leading_shift_int=\count106
\c__fp_middle_shift_int=\count107
\c__fp_trailing_shift_int=\count108
\c__fp_big_leading_shift_int=\count109
\c__fp_big_middle_shift_int=\count110
\c__fp_big_trailing_shift_int=\count111
\c__fp_Bigg_leading_shift_int=\count112
\c__fp_Bigg_middle_shift_int=\count113
\c__fp_Bigg_trailing_shift_int=\count114
L3 Module: l3box 2015/08/09 v5822 L3 Experimental boxes
\c_empty_box=\box26
\l_tmpa_box=\box27
\l_tmpb_box=\box28
\g_tmpa_box=\box29
\g_tmpb_box=\box30
L3 Module: l3coffins 2016/05/17 v6508 L3 Coffin code layer
\l__coffin_internal_box=\box31
\l__coffin_internal_dim=\dimen131
\l__coffin_offset_x_dim=\dimen132
\l__coffin_offset_y_dim=\dimen133
\l__coffin_x_dim=\dimen134
\l__coffin_y_dim=\dimen135
\l__coffin_x_prime_dim=\dimen136
\l__coffin_y_prime_dim=\dimen137
\c_empty_coffin=\box32
\l__coffin_aligned_coffin=\box33
\l__coffin_aligned_internal_coffin=\box34
\l_tmpa_coffin=\box35
\l_tmpb_coffin=\box36
\l__coffin_display_coffin=\box37
\l__coffin_display_coord_coffin=\box38
\l__coffin_display_pole_coffin=\box39
\l__coffin_display_offset_dim=\dimen138
\l__coffin_display_x_dim=\dimen139
\l__coffin_display_y_dim=\dimen140
L3 Module: l3color 2014/08/23 v5354 L3 Experimental color support
L3 Module: l3sys 2015/09/25 v6087 L3 Experimental system/runtime functions
L3 Module: l3candidates 2016/05/13 v6484 L3 Experimental additions to l3kernel
\l__box_top_dim=\dimen141
\l__box_bottom_dim=\dimen142
\l__box_left_dim=\dimen143
\l__box_right_dim=\dimen144
\l__box_top_new_dim=\dimen145
\l__box_bottom_new_dim=\dimen146
\l__box_left_new_dim=\dimen147
\l__box_right_new_dim=\dimen148
\l__box_internal_box=\box40
\l__coffin_bounding_shift_dim=\dimen149
\l__coffin_left_corner_dim=\dimen150
\l__coffin_right_corner_dim=\dimen151
\l__coffin_bottom_corner_dim=\dimen152
\l__coffin_top_corner_dim=\dimen153
\l__coffin_scaled_total_height_dim=\dimen154
\l__coffin_scaled_width_dim=\dimen155
L3 Module: l3luatex 2016/03/26 v6465 L3 Experimental LuaTeX-specific functions
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\l3kernel\l3pdfmode.def"
File: l3pdfmode.def 2016/03/26 v6465 L3 Experimental driver: PDF mode
\l__driver_color_stack_int=\count115
\l__driver_tmp_box=\box41
))
Package: xparse 2016/05/18 v6512 L3 Experimental document command parser
\l__xparse_current_arg_int=\count116
\l__xparse_m_args_int=\count117
\l__xparse_mandatory_args_int=\count118
\l__xparse_processor_int=\count119
\l__xparse_v_nesting_int=\count120
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\etoolbox\etoolbox.sty"
Package: etoolbox 2015/08/02 v2.2a e-TeX tools for LaTeX (JAW)
\etb@tempcnta=\count121
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\zref-abspage.sty"
Package: zref-abspage 2016/05/21 v2.26 Module abspage for zref (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\zref-base.sty"
Package: zref-base 2016/05/21 v2.26 Module base for zref (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\kvdefinekeys.sty"
Package: kvdefinekeys 2016/05/16 v1.4 Define keys (HO)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\pdftexcmds.sty"
Package: pdftexcmds 2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\ifpdf.sty"
Package: ifpdf 2016/05/14 v3.1 Provides the ifpdf switch
)
Package pdftexcmds Info: LuaTeX not detected.
Package pdftexcmds Info: \pdf@primitive is available.
Package pdftexcmds Info: \pdf@ifprimitive is available.
Package pdftexcmds Info: \pdfdraftmode found.
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\auxhook.sty"
Package: auxhook 2016/05/16 v1.4 Hooks for auxiliary files (HO)
)
Package zref Info: New property list: main on input line 759.
Package zref Info: New property: default on input line 760.
Package zref Info: New property: page on input line 761.
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\atbegshi.sty"
Package: atbegshi 2016/06/09 v1.18 At begin shipout hook (HO)
)
\c@abspage=\count122
Package zref Info: New property: abspage on input line 62.
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\needspace\needspace.sty"
Package: needspace 2010/09/12 v1.3d reserve vertical space
)
\mdf@templength=\skip51
\c@mdf@globalstyle@cnt=\count123
\mdf@skipabove@length=\skip52
\mdf@skipbelow@length=\skip53
\mdf@leftmargin@length=\skip54
\mdf@rightmargin@length=\skip55
\mdf@innerleftmargin@length=\skip56
\mdf@innerrightmargin@length=\skip57
\mdf@innertopmargin@length=\skip58
\mdf@innerbottommargin@length=\skip59
\mdf@splittopskip@length=\skip60
\mdf@splitbottomskip@length=\skip61
\mdf@outermargin@length=\skip62
\mdf@innermargin@length=\skip63
\mdf@linewidth@length=\skip64
\mdf@innerlinewidth@length=\skip65
\mdf@middlelinewidth@length=\skip66
\mdf@outerlinewidth@length=\skip67
\mdf@roundcorner@length=\skip68
\mdf@footenotedistance@length=\skip69
\mdf@userdefinedwidth@length=\skip70
\mdf@needspace@length=\skip71
\mdf@frametitleaboveskip@length=\skip72
\mdf@frametitlebelowskip@length=\skip73
\mdf@frametitlerulewidth@length=\skip74
\mdf@frametitleleftmargin@length=\skip75
\mdf@frametitlerightmargin@length=\skip76
\mdf@shadowsize@length=\skip77
\mdf@extratopheight@length=\skip78
\mdf@subtitleabovelinewidth@length=\skip79
\mdf@subtitlebelowlinewidth@length=\skip80
\mdf@subtitleaboveskip@length=\skip81
\mdf@subtitlebelowskip@length=\skip82
\mdf@subtitleinneraboveskip@length=\skip83
\mdf@subtitleinnerbelowskip@length=\skip84
\mdf@subsubtitleabovelinewidth@length=\skip85
\mdf@subsubtitlebelowlinewidth@length=\skip86
\mdf@subsubtitleaboveskip@length=\skip87
\mdf@subsubtitlebelowskip@length=\skip88
\mdf@subsubtitleinneraboveskip@length=\skip89
\mdf@subsubtitleinnerbelowskip@length=\skip90
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\mdframed\md-frame-0.mdf"
File: md-frame-0.mdf 2013/07/01\ 1.9b: md-frame-0
)
\mdf@frametitlebox=\box42
\mdf@footnotebox=\box43
\mdf@splitbox@one=\box44
\mdf@splitbox@two=\box45
\mdf@splitbox@save=\box46
\mdfsplitboxwidth=\skip91
\mdfsplitboxtotalwidth=\skip92
\mdfsplitboxheight=\skip93
\mdfsplitboxdepth=\skip94
\mdfsplitboxtotalheight=\skip95
\mdfframetitleboxwidth=\skip96
\mdfframetitleboxtotalwidth=\skip97
\mdfframetitleboxheight=\skip98
\mdfframetitleboxdepth=\skip99
\mdfframetitleboxtotalheight=\skip100
\mdffootnoteboxwidth=\skip101
\mdffootnoteboxtotalwidth=\skip102
\mdffootnoteboxheight=\skip103
\mdffootnoteboxdepth=\skip104
\mdffootnoteboxtotalheight=\skip105
\mdftotallinewidth=\skip106
\mdfboundingboxwidth=\skip107
\mdfboundingboxtotalwidth=\skip108
\mdfboundingboxheight=\skip109
\mdfboundingboxdepth=\skip110
\mdfboundingboxtotalheight=\skip111
\mdf@freevspace@length=\skip112
\mdf@horizontalwidthofbox@length=\skip113
\mdf@verticalmarginwhole@length=\skip114
\mdf@horizontalspaceofbox=\skip115
\mdfsubtitleheight=\skip116
\mdfsubsubtitleheight=\skip117
\c@mdfcountframes=\count124
****** mdframed patching \endmdf@trivlist
****** -- success******
.................................................
. LaTeX info: "xparse/define-command"
.
. Defining command \newmdtheoremenv with sig. 'O{} m o m o ' on line 601.
.................................................
.................................................
. LaTeX info: "xparse/define-command"
.
. Defining command \mdtheorem with sig. ' O{} m o m o ' on line 701.
.................................................
\mdf@envdepth=\count125
\c@mdf@env@i=\count126
\c@mdf@env@ii=\count127
\c@mdf@zref@counter=\count128
Package zref Info: New property: mdf@pagevalue on input line 895.
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\tabto\tabto.sty"
Package: tabto 2013/03/25 v 1.3 Another tabbing mechanism
\CurrentLineWidth=\dimen156
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\enumitem\enumitem.sty"
Package: enumitem 2011/09/28 v3.5.2 Customized lists
\labelindent=\skip118
\enit@outerparindent=\dimen157
\enit@toks=\toks17
\enit@inbox=\box47
\enitdp@description=\count129
)
\c@reqNum=\count130
No file SRS.aux.
\openout1 = `SRS.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 76.
LaTeX Font Info: ... okay on input line 76.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 76.
LaTeX Font Info: ... okay on input line 76.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 76.
LaTeX Font Info: ... okay on input line 76.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 76.
LaTeX Font Info: ... okay on input line 76.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 76.
LaTeX Font Info: ... okay on input line 76.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 76.
LaTeX Font Info: ... okay on input line 76.
("C:\Program Files (x86)\MiKTeX 2.9\tex\context\base\supp-pdf.mkii"
[Loading MPS to PDF converter (version 2006.09.02).]
\scratchcounter=\count131
\scratchdimen=\dimen158
\scratchbox=\box48
\nofMPsegments=\count132
\nofMParguments=\count133
\everyMPshowfont=\toks18
\MPscratchCnt=\count134
\MPscratchDim=\dimen159
\MPnumerator=\count135
\makeMPintoPDFobject=\count136
\everyMPtoPDFconvers
\ No newline at end of file
Doc/SRS/SRS.synctex.gz(busy) 0 → 100644
+ 0
− 0
View file @ d3396e1a
src/Blaze-Brigade/Blaze_Brigade/Archer.cs
+ 1
− 1
View file @ d3396e1a
......@@ -188,7 +188,7 @@ namespace Model
*/
public UnitType getClass()
{
return UnitType.Warrior;
return UnitType.Archer;
}
/**
......
src/Blaze-Brigade/Blaze_Brigade/Game.cs
+ 35
− 8
View file @ d3396e1a
......@@ -116,8 +116,8 @@ namespace Controller
// load character sprite and set position
player1.addUnit(getNewUnit(UnitType.Warrior, new Vector2(4 * 32f, 6 * 32f), 1));
player1.addUnit(getNewUnit(UnitType.Mage, new Vector2(4 * 32f, 6 * 32f), 1));
player2.addUnit(getNewUnit(UnitType.Warrior, new Vector2(8 * 32f, 6 * 32f), 2));
GameState.currentPlayer = (player1);
......@@ -468,8 +468,35 @@ namespace Controller
{
Debug.WriteLine("game over");
Vector2 gameOverLocation = new Vector2(-370, -300);
spriteBatch.DrawString(largestFont,"Game Over", new Vector2(350, 200), Color.DarkRed, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f); //draws Game Over Text
spriteBatch.DrawString(largestFont,"Game Over", new Vector2(350, 200), Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 0f); //draws Game Over Text
spriteBatch.Draw(gameOver, Vector2.Zero, null, Color.White, 0, gameOverLocation, 1f, SpriteEffects.None, 0f);
spriteBatch.Draw(backGround, Vector2.Zero, null, Color.Black * 0.5f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.9f);
#region Player 1 Units
// draws units for player 1
for (int i = 0; i < player1.getNumOfUnits(); i++)
{
Unit unit = player1.getUnits().ElementAt(i); //gets unit at i
if (unit.Alive)
{
spriteBatch.Draw(unit.getSpriteImage(), unit.PixelCoordinates,
unit.getCurrentFrame(), Color.Black*0.5f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
}
}
#endregion
#region Player 2 Units
// draws units for player 2
for (int i = 0; i < player2.getNumOfUnits(); i++)
{
Unit unit = player2.getUnits().ElementAt(i);
if (unit.Alive)
{
spriteBatch.Draw(unit.getSpriteImage(), unit.PixelCoordinates,
unit.getCurrentFrame(), Color.Black*0.5f, 0, Vector2.Zero, 1f, SpriteEffects.None, 0.8f);
}
}
#endregion
}
spriteBatch.Draw(backGround, Vector2.Zero, null, Color.White, 0, Vector2.Zero, 1f, SpriteEffects.None, 1);
......@@ -494,11 +521,11 @@ namespace Controller
if (player == 1)
{
if (unitType == UnitType.Warrior)
if (unitType == UnitType.Mage)
{
Unit unit = new Warrior(Content.Load<Texture2D>("warrior"), attackButton, moveButton,
itemButton, waitButton, attackConfirmButton, Content.Load<Texture2D>("warrior_stats"), Content.Load<Texture2D>("warrior_attack"), unitPosition, 1);
Weapon startingWeap = new BronzeSword();
Unit unit = new Mage(Content.Load<Texture2D>("mage"), attackButton, moveButton,
itemButton, waitButton, attackConfirmButton, Content.Load<Texture2D>("mage_stats"), Content.Load<Texture2D>("mage_attack"), unitPosition, 1);
Weapon startingWeap = new BronzeBow();
unit.equippedWeapon = startingWeap;
graph.getNode(unitPosition).unitOnNode = (unit);
return unit;
......@@ -510,7 +537,7 @@ namespace Controller
{
Unit unit = new Warrior(Content.Load<Texture2D>("2warrior"), attackButton, moveButton,
itemButton, waitButton, attackConfirmButton, Content.Load<Texture2D>("2warrior_stats"), Content.Load<Texture2D>("2warrior_attack"), unitPosition, 2);
Weapon startingWeap = new BronzeSword();
Weapon startingWeap = new BronzeBow();
unit.equippedWeapon = startingWeap;
graph.getNode(unitPosition).unitOnNode = (unit);
return unit;
......
src/Blaze-Brigade/Blaze_Brigade/Mage.cs
+ 1
− 1
View file @ d3396e1a
......@@ -188,7 +188,7 @@ namespace Model
*/
public UnitType getClass()
{
return UnitType.Warrior;
return UnitType.Mage;
}
/**
......
src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+ 4
− 3
View file @ d3396e1a
......@@ -81,7 +81,7 @@ namespace Controller
{
Button menuButton = getMenuButtonClicked(mouseClickCoordinates);
Debug.WriteLine(getMenuButtonClicked(mouseClickCoordinates).getButtonType());
buttonAction(menuButton);
buttonAction(menuButton, graph);
return;
}
......@@ -358,7 +358,7 @@ namespace Controller
}
// sets which menu option is selected
private static void buttonAction(Button button)
private static void buttonAction(Button button, Graph graph)
{
// take action corresponding to which button was clicked
Unit unit = GameState.selectedUnit;
......@@ -399,7 +399,8 @@ namespace Controller
attackAnimation(attackDirection, unit);
int damageDealt = DamageCalculations.finalDamage(unit, unit2, false);
unit2.Hp = unit2.Hp - damageDealt;
if (unit2.Alive) //if unit 2 is still alive, perform a counter attack
if (unit2.Alive && (GameFunction.isEnemyUnitInRange(graph, unit2, unit))) //if unit 2 is still alive, perform a counter attack
{
Thread.Sleep(750);
attackAnimation(counterAttackDirection, unit2);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment