Skip to content

Commit 9fba4b2

Browse files
committed
The piece of update#12
1 parent ed57144 commit 9fba4b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3463
-416
lines changed

forgedArmor.png

10.5 KB
Loading

forgedsword.png

4.12 KB
Loading

hero/initHeroes.json

+13
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,21 @@
55
"kind":"materials/iron",
66
"quantity":100
77
},
8+
{
9+
"kind":"materials/leather",
10+
"quantity":100
11+
},
12+
{
13+
"kind":"materials/cloth"
14+
},
15+
{
16+
"kind":"materials/fireElmntCore"
17+
},
818
{
919
"kind": "TestItem"
20+
},
21+
{
22+
"kind":"materials/steel"
1023
}
1124
],
1225
"str":9,

hero/initHeroesD.json

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"common": {
3+
"items": [
4+
{
5+
"kind":"materials/iron",
6+
"quantity":100
7+
},
8+
{
9+
"kind":"materials/leather",
10+
"quantity":100
11+
},
12+
{
13+
"kind":"materials/cloth"
14+
},
15+
{
16+
"kind":"materials/fireElmntCore"
17+
},
18+
{
19+
"kind": "TestItem"
20+
},
21+
{
22+
"kind":"materials/steel"
23+
},
24+
{
25+
"kind":"PotionOfExperience",
26+
"quantity":100
27+
}
28+
],
29+
"str":9,
30+
"hp": 10,
31+
"magicAffinity": "Common",
32+
"sp": 1,
33+
"maxSp": 1
34+
},
35+
"non_expert": {
36+
"items": [
37+
{
38+
"kind": "Gold",
39+
"quantity":100
40+
}
41+
]
42+
},
43+
"WARRIOR": {
44+
"str": 1,
45+
"sp":1,
46+
"maxSp":1,
47+
"knownItems": [
48+
{
49+
"kind": "PotionOfStrength"
50+
},
51+
{
52+
"kind": "ScrollOfUpgrade"
53+
}
54+
],
55+
"isSpellUser": true,
56+
"magicAffinity": "Combat"
57+
},
58+
"LICH": {
59+
"immunities": [
60+
"Paralysis",
61+
"ToxicGas",
62+
"Terror",
63+
"Death",
64+
"Amok",
65+
"Blindness",
66+
"Sleep",
67+
"Poison",
68+
"Vertigo",
69+
"Bleeding"
70+
]
71+
}
72+
}

initHeroesD.json

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"common": {
3+
"items": [
4+
{
5+
"kind":"materials/iron",
6+
"quantity":100
7+
},
8+
{
9+
"kind":"materials/leather",
10+
"quantity":100
11+
},
12+
{
13+
"kind":"materials/cloth"
14+
},
15+
{
16+
"kind": "TestItem"
17+
},
18+
{
19+
"kind":"materials/steel"
20+
},
21+
{
22+
"kind":"PotionOfExperience",
23+
"quantity":100
24+
}
25+
],
26+
"str":9,
27+
"hp": 10,
28+
"magicAffinity": "Common",
29+
"sp": 1,
30+
"maxSp": 1
31+
},
32+
"non_expert": {
33+
"items": [
34+
{
35+
"kind": "Gold",
36+
"quantity":100
37+
}
38+
]
39+
},
40+
"WARRIOR": {
41+
"str": 1,
42+
"sp":1,
43+
"maxSp":1,
44+
"knownItems": [
45+
{
46+
"kind": "PotionOfStrength"
47+
},
48+
{
49+
"kind": "ScrollOfUpgrade"
50+
}
51+
],
52+
"isSpellUser": true,
53+
"magicAffinity": "Combat"
54+
},
55+
"LICH": {
56+
"immunities": [
57+
"Paralysis",
58+
"ToxicGas",
59+
"Terror",
60+
"Death",
61+
"Amok",
62+
"Blindness",
63+
"Sleep",
64+
"Poison",
65+
"Vertigo",
66+
"Bleeding"
67+
]
68+
}
69+
}

items/forgedArmor.png

-3.89 KB
Binary file not shown.

items/forgedAxe.png

3.76 KB
Loading

items/forgedBow.png

3.38 KB
Loading

items/forgedCrossbow.png

4.3 KB
Loading

items/forgedDagger.png

1.98 KB
Loading

items/forgedHalberd.png

3.61 KB
Loading

items/forgedHammer.png

3 KB
Loading

items/forgedLongsword.png

4.77 KB
Loading

items/forgedMace.png

3.05 KB
Loading

items/forgedSpear.png

2.18 KB
Loading

items/forgedSword.png

4.12 KB
Loading

items/materials.png

1.59 KB
Loading

items/ranged.png

-24 Bytes
Loading

levelsDesc/Shop_2021_03.json

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
"kind": "Dagger",
2323
"identified": true
2424
},
25+
{
26+
"kind":"Spear",
27+
"identified":true
28+
},
2529
{
2630
"kind": "WoodenStaff",
2731
"identified": true

levelsDesc/Treasury.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
"decayFactor":2,
55
"probabilities" : {
66
"SHIELD" : 8,
7-
"WEAPON" : 100,
8-
"ARMOR" : 10,
7+
"WEAPON" : 15,
8+
"ARMOR" : 15,
99
"POTION" : 50,
1010
"SCROLL" : 40,
1111
"WAND" : 4,
1212
"RING" : 2,
1313
"SEED" : 10,
1414
"FOOD" : 1,
15-
"GOLD" : 50,
16-
"RANGED" : 2,
17-
"BULLETS": 10,
15+
"GOLD" : 40,
16+
"RANGED" : 10,
17+
"BULLETS": 15,
1818
"UNIQUE" : 2
1919
}
2020
},
@@ -49,10 +49,10 @@
4949
"RANGED": {
5050
"CompoundBow": 3,
5151
"CompositeCrossbow": 3,
52-
"RubyCrossbow": 1,
53-
"WoodenBow": 3,
54-
"WoodenCrossbow": 4,
55-
"RubyBow": 1,
52+
"RubyCrossbow": 0.5,
53+
"WoodenBow": 4,
54+
"WoodenCrossbow": 3,
55+
"RubyBow": 0.5,
5656
"WoodenStaff": 3,
5757
"StudentStaff": 5,
5858
"CompositeScepter": 3,
@@ -166,7 +166,7 @@
166166
"Sai": 1,
167167
"Gasock": 1,
168168
"Tonfa": 1,
169-
"Ry":0.1,
169+
"Ry":0.01,
170170
"ElvenDagger": 0,
171171
"GnollTamahawk":0
172172
},

rpgitems.png

1.43 KB
Loading

scripts/buffs/FastAttacks.lua scripts/buffs/FastSoulsMarks.lua

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
local RPD = require "scripts/lib/commonClasses"
77

88
local hero = RPD.Dungeon.hero
9+
local a = "soulstormentor"
910
local buff = require "scripts/lib/buff"
11+
local storage = require "scripts/lib/storage"
1012

1113
return buff.init{
1214
desc = function ()
@@ -15,10 +17,5 @@ return buff.init{
1517
name = "FastAttacksN",
1618
info = "FastAttacksD",
1719
}
18-
end,
19-
20-
attackProc = function(self,buff,enemy,damage)
21-
buff.target:spend(-math.min(0.8,buff:level()*0.05))
22-
return damage
2320
end
2421
}

scripts/buffs/FlameAttacksBuff.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@ return buff.init{
2626

2727
attackProc = function(self,buff,enemy,damage)
2828
hero = RPD.Dungeon.hero
29+
local weaponA = hero:getBelongings().weapon
30+
local weaponB = hero:getBelongings().leftHand
31+
local weaponRoll = (weaponA:dmgRoll(hero) + weaponB:dmgRoll(hero))/2
32+
2933
if enemy:buffLevel("FlameMark") > 0 then
30-
RPG.damage(enemy,math.ceil(3+4*Spell.lvl + RPG.magStr()*0.1 + hero:ht()*0.15),type,elmnt)
34+
RPG.damage(enemy,RPG.smartInt(3+4*Spell.lvl +RPG.magStr()*0.1 +hero:ht()*0.05 +weaponRoll*0.2),type,elmnt)
3135
enemy:getSprite():showStatus(0xffff00,RPD.textById("boom"))
3236
else
3337
RPG.damage(enemy,math.ceil(5+5*Spell.lvl + RPG.magStr()*0.1 + hero:ht()*0.05),type,elmnt)

scripts/buffs/FlameShieldBuff.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ local level
1919

2020
return buff.init{
2121
desc = function ()
22-
shield = math.ceil(10+10*Spell.lvl+hero:ht()*0.2)
22+
shield = RPG.smartInt(12+2.5*Spell.lvl+hero:ht()*0.2)
2323
shield2 = shield
2424
return {
2525
icon = 57,
@@ -56,7 +56,7 @@ charAct = function(self,buff)
5656
end,
5757

5858
defenceProc = function(self, buff, enemy, damage)
59-
shield = shield - damage
59+
shield = shield -(damage +buff.target:dr()*0.8)
6060
if shield <= 0 then
6161
buff:detach()
6262
return shield

scripts/buffs/PoisonBuff.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ return buff.init{
2626

2727
charAct = function(self,buff)
2828
local Spell = storage.gameGet(a) or {}
29-
RPG.damage(enemy,math.ceil(buff:level()*(0.2 + scale*0.04)), type,elmnt)
29+
RPG.damage(buff.target,RPG.smartInt(buff:level()*(0.2 + scale*0.025)), type,elmnt)
3030
scale = scale +1
3131
end
3232
}

scripts/buffs/PoisonedBlood.lua

+10-6
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,27 @@ return buff.init{
2626
RPD.BuffIndicator:refreshHero()
2727
end,
2828

29+
2930
name = function()
3031
return RPD.textById("PoisonedBloodN").."("..tostring(Spell.staks)..")"
3132
end,
3233

34+
3335
detach = function(self,buff)
3436
Spell = storage.gameGet(a) or {}
3537
local hero = RPD.Dungeon.hero
3638
hero:ht(hero:ht() +Spell.bp)
3739

3840
storage.gamePut(a,{exp = Spell.exp, expMax = Spell.expMax, lvl = Spell.lvl, bp = Spell.bp, staks = 0})
3941
end,
42+
43+
4044
icon = function()
41-
Spell = storage.gameGet(a) or {}
42-
if tonumber(Spell.staks) == 5 then
43-
return 60
44-
else
45-
return 59
45+
Spell = storage.gameGet(a) or {}
46+
if tonumber(Spell.staks) == 5 then
47+
return 60
48+
else
49+
return 59
50+
end
4651
end
47-
end
4852
}

0 commit comments

Comments
 (0)