troido
/
Asciifarm
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made goblins green, halved attack speed, fixed health bug, stoped listening after ^C

This commit is contained in:
troido 2017-10-27 18:13:24 +02:00
parent fdfee4d0d9
commit 577ab9a9e0
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmaps/default.json
View File

@ -18,7 +18,7 @@
"stairup": ["<",7],
"dummy": ["d", 3],
"spikes": ["^",7],
"goblin": ["g",1],
"goblin": ["g",2],
"seed": [":",10],
"plant": ["Y",10],
"youngplant": ["v",10],

2
charmaps/fullwidth.json
View File

@ -18,7 +18,7 @@
"stairup": ["＜",7],
"dummy": ["ｄ",3],
"spikes": ["＾",7],
"goblin": ["ｇ",1],
"goblin": ["ｇ",2],
"seed": ["：",10],
"plant": ["Ｙ",10],
"youngplant": ["ｖ",10],

1
client/__init__.py
View File

@ -33,6 +33,7 @@ def main(name, socketType, address, keybindings, characters, colours=False):
client.start()
except KeyboardInterrupt:
caught_ctrl_c = True
client.keepAlive = False
curses.wrapper(start)

4
docs/charactermaps.md
View File

@ -36,7 +36,9 @@ These colours can differ per terminal, but in most terminals they look like this
On terminals that have more than 8 colours, the next 8 colours will be the lighter version of the same colour.
On terminals that only have 8 colours, the next 8 colours will be the same as the first 8 (colour = colour % 8).
run the script test/colourpairs.py to see how the colour combinations look in your terminal.
Run the script test/colourpairs.py to see how the colour combinations look in your terminal.
The combination 0,0 will always produce the default colour pair for the terminal (which usually looks like 7,0)
## default

1
docs/client.md
View File

@ -1,3 +1,2 @@
# Client side architecture
The client most probably needs a full rewrite

4
server/gameobjects.py
View File

@ -79,7 +79,7 @@ entities["spiketrap"] = makeSpikeTrap
def makeGoblin():
return Entity(sprite="goblin", height=1.2, components={
"move": Move(slowness=4),
"fighter": Fighter(maxHealth=25, strength=5, slowness=3),
"fighter": Fighter(maxHealth=25, strength=5, slowness=6),
"alignment": Alignment(faction.EVIL),
"controller": MonsterAi(viewDist=8, moveChance=0.01),
"loot": Loot([("seed", .5), ("seed", .1)])
@ -89,7 +89,7 @@ entities["goblin"] = makeGoblin
def makeTroll():
return Entity(sprite="troll", height=1.8, components={
"move": Move(slowness=5),
"fighter": Fighter(maxHealth=125, strength=12, slowness=5),
"fighter": Fighter(maxHealth=125, strength=12, slowness=10),
"alignment": Alignment(faction.EVIL),
"controller": MonsterAi(viewDist=8, moveChance=0.01),
"loot": Loot([("stone", 1), ("stone", .3), ("pebble", .5), ("pebble", .5), ("pebble", .5)])

5
server/player.py
View File

@ -53,9 +53,9 @@ class Player:
"inventory": self.inventory,
"move": Move(slowness=2),
"controller": InputController(),
"fighter": Fighter(self.maxHealth, 5, slowness=2, health=self.health or self.maxHealth),
"fighter": Fighter(self.maxHealth, 5, slowness=4, health=self.health or self.maxHealth),
"alignment": Alignment(faction.GOOD),
"heal": Healing(interval=30),
"heal": Healing(interval=50),
"target": Target()
})
self.entity.construct(room.getRoomData())
@ -98,6 +98,7 @@ class Player:
self.entity = None
self.roomname = None
self.place = None
self.health = self.maxHealth
def control(self, action):