From: adrianna <adrianna.pinska@gmail.com>
Date: Sat, 10 Sep 2016 20:50:19 +0000 (+0200)
Subject: added more stuff to help
X-Git-Tag: tabakrolletjie-v1.0.0~39^2~2
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=ab730f79ba451af8143fe7b7a6c7a33a4c31c9da;p=tabakrolletjie.git
added more stuff to help
---
diff --git a/data/images/48/circle.png b/data/images/48/circle.png
new file mode 100644
index 0000000..7ed598c
Binary files /dev/null and b/data/images/48/circle.png differ
diff --git a/data/images/48/square.png b/data/images/48/square.png
new file mode 100644
index 0000000..38dba77
Binary files /dev/null and b/data/images/48/square.png differ
diff --git a/data/images/Makefile b/data/images/Makefile
index 3b92dcb..08ea9db 100644
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -7,10 +7,11 @@ MOULD=eyeballA eyeballB eyeballC eyelid
LIGHT=spotlight lamp laser
LIGHT_MASK=light_mask_2_1 light_mask_2_2 light_mask_3_1 light_mask_3_2 light_mask_3_3
CONTROLS=night default_cursor exit pause play day
+BLANKS=circle square
IMG16=$(MOULD_BODY)
IMG32=$(MOULD_BODY) $(MOULD) $(LIGHT) $(SEED) $(LIGHT_MASK) $(CONTROLS)
-IMG48=$(LIGHT) $(TURNIP) $(LIGHT_MASK)
+IMG48=$(LIGHT) $(TURNIP) $(LIGHT_MASK) $(BLANKS)
IMG64=$(MOULD_BODY)
CURSORS=$(SEED) $(LIGHT)
diff --git a/sources/vector/circle.svg b/sources/vector/circle.svg
new file mode 100644
index 0000000..19cabeb
--- /dev/null
+++ b/sources/vector/circle.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100mm"
+ height="100mm"
+ viewBox="0 0 354.33071 354.33071"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="circle.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="89.927834"
+ inkscape:cy="168.74492"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1264"
+ inkscape:window-height="720"
+ inkscape:window-x="102"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:object-nodes="true"
+ inkscape:snap-smooth-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4423"
+ units="mm"
+ spacingx="3.543307"
+ spacingy="3.543307" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-698.0315)">
+ <circle
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path5236"
+ cx="177.16536"
+ cy="875.19684"
+ r="159.44882" />
+ </g>
+</svg>
diff --git a/sources/vector/square.svg b/sources/vector/square.svg
new file mode 100644
index 0000000..88176f4
--- /dev/null
+++ b/sources/vector/square.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100mm"
+ height="100mm"
+ viewBox="0 0 354.33071 354.33071"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="square.svg">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="89.927834"
+ inkscape:cy="168.74492"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1264"
+ inkscape:window-height="720"
+ inkscape:window-x="102"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:object-nodes="true"
+ inkscape:snap-smooth-nodes="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4423"
+ units="mm"
+ spacingx="3.543307"
+ spacingy="3.543307" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-698.0315)">
+ <rect
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect5276"
+ width="318.89764"
+ height="318.89764"
+ x="17.716536"
+ y="715.74805" />
+ </g>
+</svg>
diff --git a/tabakrolletjie/scenes/help.py b/tabakrolletjie/scenes/help.py
index c58fea5..46c176d 100644
--- a/tabakrolletjie/scenes/help.py
+++ b/tabakrolletjie/scenes/help.py
@@ -61,17 +61,35 @@ class HelpScene(BaseScene):
"This is a space turnip, the most valuable vegetable in the"
" universe. A crucial ingredient of longevity serum, space"
" navigator tonic and a pink sweet that everyone loves.")),
- HelpItem(("64", "mouldA.png"), (
- "This is Boyd the space mould. He loves turnips. You've"
- " disinfected your ship a thousand times, but somehow he shows"
- " up on every planet at night to devour your crop. He is"
- " vulnerable to light, but beware -- he builds up a resistance"
- " if you overuse the same colour.")),
+ ]
+
+ mould = HelpItem(("64", "mouldA.png"), (
+ "This is Boyd the space mould. He loves turnips. You've"
+ " disinfected your ship a thousand times, but somehow he shows"
+ " up on every planet at night to devour your crop. He is"
+ " vulnerable to light, but beware -- he builds up a resistance"
+ " if you overuse the same colour."))
+
+ mould._img.blit(
+ loader.load_image("32", "mouldB.png").convert_alpha(),
+ (30, 30), None)
+ mould._img.blit(
+ loader.load_image("32", "eyeballA.png").convert_alpha(),
+ (10, 10), None)
+ mould._img.blit(
+ loader.load_image("32", "eyelid.png").convert_alpha(),
+ (10, 10), None)
+
+ items.append(mould)
+
+ items.extend([
HelpItem(("32", "seed.png"), (
"This is a turnip seed. You get a limited number of these at"
" the start of a level. You can plant them, and you can use"
" them to buy lights to protect your crop. Turnips which"
- " survive to harvest yield more seeds.")),
+ " survive to harvest yield more seeds. Click on the icon that"
+ " looks like this to start planting seeds. It takes three nights"
+ " for a turnip to mature.")),
HelpItem(("48", "lamp.png"), (
"This is a lamp. It comes in many colours, and has some other"
" varying properties. It is powered by your farm's battery"
@@ -95,18 +113,41 @@ class HelpScene(BaseScene):
" skip to the next day. Or you can keep playing with your lights."
" If you have no power left either, or you are completely"
" bankrupt, the night will end automatically.")),
- ]
-
- # Special mould assembly
- items[1]._img.blit(
- loader.load_image("32", "mouldB.png").convert_alpha(),
- (30, 30), None)
- items[1]._img.blit(
- loader.load_image("32", "eyeballA.png").convert_alpha(),
- (10, 10), None)
- items[1]._img.blit(
- loader.load_image("32", "eyelid.png").convert_alpha(),
- (10, 10), None)
+ HelpItem(("32", "spotlight.png"), (
+ "Click on a light icon like this to get a menu of colour options"
+ " available on your level.")),
+ HelpItem(("32", "spotlight.png"), (
+ "Once you have selected a colour option, you will be able to"
+ " place the light."),
+ transform=Multiply(colour=COLOURS["magenta"])),
+ HelpItem(("32", "exit.png"), (
+ "Click this icon to quit the level in disgust and return to the"
+ " menu.")),
+ ])
+
+ soil = HelpItem(("48", "square.png"), (
+ "This is soil. You can plant seeds in it and position lights on"
+ " it. Lights and plants can't overlap with each other."))
+ soil._img.blit(
+ loader.load_image("textures", "soil.png").convert_alpha(),
+ (0, 0), None, pgl.BLEND_RGBA_MULT)
+ items.append(soil)
+
+ stone = HelpItem(("48", "square.png"), (
+ "This is a stone wall. It gets in your way. On the other hand, it"
+ " also gets in Boyd's way."))
+ stone._img.blit(
+ loader.load_image("textures", "stone.png").convert_alpha(),
+ (0, 0), None, pgl.BLEND_RGBA_MULT)
+ items.append(stone)
+
+ shrub = HelpItem(("48", "circle.png"), (
+ "This is a shrub. It works exactly like a wall, except that it's"
+ " round."))
+ shrub._img.blit(
+ loader.load_image("textures", "shrub.png").convert_alpha(),
+ (0, 0), None, pgl.BLEND_RGBA_MULT)
+ items.append(shrub)
return items
@@ -124,7 +165,7 @@ class HelpScene(BaseScene):
height += max(
item._img_size, item.FONT.get_height() * len(item._text))
height += 5
- if height > SCREEN_SIZE[1]:
+ if height > SCREEN_SIZE[1] - 50:
height = 50
x_offset = SCREEN_SIZE[0] / 2