Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

New materials/weapons #1213

Merged
merged 4 commits into from

1 participant

@didory123
Owner

Added new weapons boneclub and throwingaxe.

Added ember material to black caverns, ember + leaf now makes fire.

@didory123 didory123 merged commit 4cac8c2 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
BIN  src/images/materials/ember.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/weapons/boneclub.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/weapons/throwingaxe.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
5 src/items/materials/ember.lua
@@ -0,0 +1,5 @@
+return{
+ name = 'ember',
+ type = 'material',
+ MAX_ITEMS = 1,
+}
View
30 src/items/recipes.lua
@@ -11,6 +11,36 @@ return {
{ type='weapon', name='throwingknife' },
},
{
+ { type='material', name='ember' },
+ { type='material', name='leaf' },
+ { type='material', name='fire' },
+ },
+ {
+ { type='material', name='bone' },
+ { type='material', name='bone' },
+ { type='weapon', name='boneclub' },
+ },
+ {
+ { type='material', name='fire' },
+ { type='material', name='stick' },
+ { type='weapon', name='torch' },
+ },
+ {
+ { type='material', name='rock' },
+ { type='material', name='rock' },
+ { type='material', name='stone' },
+ },
+ {
+ { type='material', name='stone' },
+ { type='material', name='stick' },
+ { type='weapon', name='throwingaxe' },
+ },
+ {
+ { type='material', name='stone' },
+ { type='material', name='stone' },
+ { type='material', name='boulder' },
+ },
+ {
{ type='material', name='bone' },
{ type='material', name='crystal' },
{ type='weapon', name='icicle' }
View
11 src/items/weapons/boneclub.lua
@@ -0,0 +1,11 @@
+-----------------------------------------------
+-- clubItem.lua
+-- The code for the club, when it is in the player's inventory.
+-- Created by NimbusBP1729
+-----------------------------------------------
+
+return{
+ name = 'boneclub',
+ type = 'weapon',
+ subtype = 'melee',
+}
View
12 src/items/weapons/throwingaxe.lua
@@ -0,0 +1,12 @@
+-----------------------------------------------
+-- throwingKnifeItem.lua
+-- The code for the throwing knife, when it in the players inventory.
+-- Created by HazardousPeach
+-----------------------------------------------
+return{
+ name = "throwingaxe",
+ type = "weapon",
+ subtype = "projectile",
+ MAX_ITEMS = 12,
+ quantity = 4,
+}
View
4 src/items/weapons/throwingknife.lua
@@ -7,6 +7,6 @@ return{
name = "throwingknife",
type = "weapon",
subtype = "projectile",
- MAX_ITEMS = 8,
- quantity = 4,
+ MAX_ITEMS = 15,
+ quantity = 5,
}
View
2  src/maps/black-caverns-2.tmx
@@ -708,6 +708,8 @@
<property name="to" value="exit"/>
</properties>
</object>
+ <object name="ember" type="material" x="1080" y="192" width="24" height="24"/>
+ <object name="ember" type="material" x="2040" y="432" width="24" height="24"/>
</objectgroup>
<objectgroup name="block" width="125" height="37">
<object x="2208" y="456" width="72" height="120"/>
View
13 src/maps/black-caverns.tmx
@@ -22,7 +22,7 @@
</layer>
<layer name="features" width="170" height="90">
<data encoding="base64" compression="zlib">
- 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
+ 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
</data>
</layer>
<objectgroup color="#f9f9ff" name="nodes" width="170" height="90">
@@ -2857,6 +2857,17 @@
<property name="sprite" value="images/grapedrink.png"/>
</properties>
</object>
+ <object name="ember" type="material" x="288" y="1776" width="24" height="24"/>
+ <object name="ember" type="material" x="1224" y="1824" width="24" height="24"/>
+ <object name="ember" type="material" x="576" y="1416" width="24" height="24"/>
+ <object name="ember" type="material" x="1008" y="1008" width="24" height="24"/>
+ <object name="ember" type="material" x="2256" y="984" width="24" height="24"/>
+ <object name="ember" type="material" x="2688" y="696" width="24" height="24"/>
+ <object name="ember" type="material" x="1896" y="456" width="24" height="24"/>
+ <object name="ember" type="material" x="2352" y="2088" width="24" height="24"/>
+ <object name="ember" type="material" x="2472" y="2088" width="24" height="24"/>
+ <object name="ember" type="material" x="2424" y="2088" width="24" height="24"/>
+ <object name="ember" type="material" x="2736" y="1440" width="24" height="24"/>
</objectgroup>
<objectgroup color="#a4250c" name="block" width="170" height="90">
<object x="0" y="1536" width="168" height="624"/>
View
7 src/maps/valley.tmx
@@ -299,6 +299,13 @@
<property name="enemytype" value="trombonist"/>
</properties>
</object>
+ <object name="bone" type="material" x="2448" y="432" width="24" height="24"/>
+ <object name="bone" type="material" x="1896" y="408" width="24" height="24"/>
+ <object name="bone" type="material" x="4512" y="384" width="24" height="24"/>
+ <object name="bone" type="material" x="5424" y="336" width="24" height="24"/>
+ <object name="bone" type="material" x="6264" y="168" width="24" height="24"/>
+ <object name="bone" type="material" x="7416" y="216" width="24" height="24"/>
+ <object name="bone" type="material" x="8040" y="168" width="24" height="24"/>
</objectgroup>
<objectgroup color="#a41c0a" name="block" width="360" height="22">
<object x="1128" y="408" width="192" height="120"/>
View
31 src/nodes/projectiles/throwingaxe.lua
@@ -0,0 +1,31 @@
+local game = require 'game'
+return{
+ name = 'throwingaxe',
+ type = 'projectile',
+ bounceFactor = -1,
+ friction = 0.01 * game.step,
+ width = 16,
+ height = 16,
+ frameWidth = 24,
+ frameHeight = 24,
+ playerCanPickUp = false,
+ velocity = { x = 0, y = -500 }, --initial velocity
+ throwVelocityX = 400,
+ throwVelocityY = -550,
+ stayOnScreen = false,
+ thrown = true,
+ damage = 2,
+ horizontalLimit = 300,
+ animations = {
+ default = {'once', {'1,1'}, 1},
+ thrown = {'loop', {'1,1', '2,1','3,1','4,1','5,1','6,1','7,1'}, 0.15},
+ finish = {'once', {'3,1'}, 1},
+ },
+ collide = function(node, dt, mtv_x, mtv_y,projectile)
+ if node.isPlayer then return end
+ if node.hurt then
+ node:hurt(projectile.damage)
+ projectile:die()
+ end
+ end,
+}
View
28 src/nodes/weapons/boneclub.lua
@@ -0,0 +1,28 @@
+-----------------------------------------------
+-- boneclub.lua
+-- Represents a boneclub that a player can wield or pick up
+-----------------------------------------------
+
+--
+-- Creates a new club object
+-- @return the club object created
+return{
+ hand_x = 24,
+ hand_y = 30,
+ frameAmt = 3,
+ width = 50,
+ height = 40,
+ damage = 2,
+ dead = false,
+ bbox_width = 30,
+ bbox_height = 30,
+ bbox_offset_x = {21,21,21},
+ bbox_offset_y = {3,3,3},
+ unuseAudioClip = 'sword_sheathed',
+ hitAudioClip = 'punch',
+ swingAudioClip = 'sword_air',
+ animations = {
+ default = {'once', {'1,1'}, 1},
+ wield = {'once', {'1,1','2,1','3,1'},0.11},
+ }
+}
View
10 src/suppliers/blacksmith.lua
@@ -6,19 +6,23 @@ local healthImage = love.graphics.newImage( "images/tokens/health.png" )
return {
weapons = {
- {"mallet",2,80},
+ {"mallet",2,350},
{"torch",3,120},
{"sword",3,100},
{"longsword",1,300},
{"mace",1,500},
{"battleaxe",2,500},
{"club",6,50},
+ {"boneclub",6,55},
{"throwingknife",12,30},
+ {"throwingaxe",8,60},
},
materials = {
- {"leaf",30,20},
- {"rock",30,15},
+ {"leaf",30,30},
+ {"rock",30,20},
+ {"stone",30,35},
{"stick",30,15},
{"bone",30,50},
+ {"ember",30,70},
},
}
Something went wrong with that request. Please try again.