Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Game_jam19
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Leevi Grönlund
Game_jam19
Commits
97734498
Commit
97734498
authored
6 years ago
by
Kimi Heinonen
Browse files
Options
Downloads
Patches
Plain Diff
Lisatty City scriptia
parent
681b6f00
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Assets/Scripts/City.cs
+21
-8
21 additions, 8 deletions
Assets/Scripts/City.cs
Assets/Scripts/ResourcePool.cs
+8
-4
8 additions, 4 deletions
Assets/Scripts/ResourcePool.cs
with
29 additions
and
12 deletions
Assets/Scripts/City.cs
+
21
−
8
View file @
97734498
...
...
@@ -17,7 +17,7 @@ public class City : MonoBehaviour
* Kayttaa resurssia r, maaran 'amount' verran (amount >= 0).
* Voidaan kayttaa maximissaan sen verran resursseja mita niita on kaytossa.
*/
public
void
u
seResource
(
Resource
r
,
int
amount
)
public
void
U
seResource
(
Resource
r
,
int
amount
)
{
if
(
amount
<
0
)
{
...
...
@@ -26,12 +26,13 @@ public class City : MonoBehaviour
ResourcePool
[]
lista
=
gameObject
.
GetComponents
<
ResourcePool
>();
for
(
int
i
=
0
;
i
<
lista
.
Length
;
i
++)
{
if
(
lista
[
i
].
g
etResource
().
GetType
().
Equals
(
r
.
GetType
()))
if
(
lista
[
i
].
G
etResource
().
GetType
().
Equals
(
r
.
GetType
()))
{
lista
[
i
].
u
seResource
(
amount
);
lista
[
i
].
U
seResource
(
amount
);
}
}
}
/**
* Lisaa resurssia r, maaran 'amount' verran (amount >= 0).
...
...
@@ -39,7 +40,7 @@ public class City : MonoBehaviour
* ts. jos nykyinen resurssimaara + lisatty maara >= maximikapasiteetti
* niin uusi resurssimaara = maximikapasiteetti
*/
public
void
a
ddResource
(
Resource
r
,
int
amount
)
public
void
A
ddResource
(
Resource
r
,
int
amount
)
{
if
(
amount
<
0
)
{
...
...
@@ -49,14 +50,26 @@ public class City : MonoBehaviour
for
(
int
i
=
0
;
i
<
lista
.
Length
;
i
++)
{
if
(
lista
[
i
].
g
etResource
().
GetType
().
Equals
(
r
.
GetType
()))
if
(
lista
[
i
].
G
etResource
().
GetType
().
Equals
(
r
.
GetType
()))
{
lista
[
i
].
a
ddResource
(
amount
);
lista
[
i
].
A
ddResource
(
amount
);
return
;
}
}
ResourcePool
respool
=
gameObject
.
AddComponent
<
ResourcePool
>();
respool
.
setResource
(
r
);
respool
.
addResource
(
amount
);
respool
.
SetResource
(
r
);
respool
.
AddResource
(
amount
);
}
/**
* Lisaa kaikkien resurssipoolien maxKapasiteettia x:n verran
*/
public
void
IncreaseCapacity
(
int
x
)
{
ResourcePool
[]
lista
=
gameObject
.
GetComponents
<
ResourcePool
>();
for
(
int
i
=
0
;
i
<
lista
.
Length
;
i
++)
{
lista
[
i
].
SetCapacity
(
x
);
}
}
}
This diff is collapsed.
Click to expand it.
Assets/Scripts/ResourcePool.cs
+
8
−
4
View file @
97734498
...
...
@@ -18,19 +18,19 @@ public class ResourcePool : MonoBehaviour
void
Start
()
{
}
public
void
s
etResource
(
Resource
r
)
public
void
S
etResource
(
Resource
r
)
{
this
.
r
=
r
;
}
public
Resource
g
etResource
()
public
Resource
G
etResource
()
{
return
r
;
}
/**
* Kayttaa resurssia maaran X verran
*/
public
void
u
seResource
(
int
x
)
public
void
U
seResource
(
int
x
)
{
if
(
this
.
amount
-
x
<=
0
)
{
...
...
@@ -44,7 +44,7 @@ public class ResourcePool : MonoBehaviour
/**
* Lisaa resurssia maaran X verran
*/
public
void
a
ddResource
(
int
x
)
public
void
A
ddResource
(
int
x
)
{
if
(
this
.
amount
+
x
>=
this
.
maxCapacity
)
{
...
...
@@ -55,4 +55,8 @@ public class ResourcePool : MonoBehaviour
this
.
amount
+=
x
;
}
}
public
void
SetCapacity
(
int
x
)
{
this
.
maxCapacity
+=
x
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment