Menu
▾
▴
crossfire-cvs — List for CVS update messages only.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(187) |
Dec
(318) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(268) |
Feb
(231) |
Mar
(251) |
Apr
(372) |
May
(258) |
Jun
(197) |
Jul
(85) |
Aug
(175) |
Sep
(77) |
Oct
(213) |
Nov
(108) |
Dec
(53) |
| 2002 |
Jan
(38) |
Feb
(50) |
Mar
(32) |
Apr
(30) |
May
(34) |
Jun
(24) |
Jul
(42) |
Aug
(29) |
Sep
(58) |
Oct
(57) |
Nov
(73) |
Dec
(51) |
| 2003 |
Jan
(98) |
Feb
(64) |
Mar
(39) |
Apr
(38) |
May
(67) |
Jun
(39) |
Jul
(80) |
Aug
(21) |
Sep
(82) |
Oct
(85) |
Nov
(48) |
Dec
(30) |
| 2004 |
Jan
(29) |
Feb
(82) |
Mar
(43) |
Apr
(54) |
May
(60) |
Jun
(41) |
Jul
(23) |
Aug
(35) |
Sep
(55) |
Oct
(53) |
Nov
(18) |
Dec
(22) |
| 2005 |
Jan
(49) |
Feb
(28) |
Mar
(112) |
Apr
(60) |
May
(120) |
Jun
(67) |
Jul
(129) |
Aug
(67) |
Sep
(173) |
Oct
(221) |
Nov
(126) |
Dec
(198) |
| 2006 |
Jan
(172) |
Feb
(141) |
Mar
(54) |
Apr
(15) |
May
(60) |
Jun
(50) |
Jul
(79) |
Aug
(118) |
Sep
(114) |
Oct
(78) |
Nov
(56) |
Dec
(106) |
| 2007 |
Jan
(80) |
Feb
(268) |
Mar
(238) |
Apr
(222) |
May
(198) |
Jun
(178) |
Jul
(114) |
Aug
(234) |
Sep
(202) |
Oct
(141) |
Nov
(182) |
Dec
(446) |
| 2008 |
Jan
(260) |
Feb
(143) |
Mar
(210) |
Apr
(158) |
May
(342) |
Jun
(195) |
Jul
(309) |
Aug
(99) |
Sep
(154) |
Oct
(279) |
Nov
(555) |
Dec
(327) |
| 2009 |
Jan
(182) |
Feb
(289) |
Mar
(30) |
Apr
(51) |
May
(59) |
Jun
(304) |
Jul
(95) |
Aug
(50) |
Sep
(16) |
Oct
(44) |
Nov
(57) |
Dec
(27) |
| 2010 |
Jan
(59) |
Feb
(178) |
Mar
(220) |
Apr
(272) |
May
(297) |
Jun
(75) |
Jul
(104) |
Aug
(157) |
Sep
(247) |
Oct
(105) |
Nov
(100) |
Dec
(75) |
| 2011 |
Jan
(61) |
Feb
(32) |
Mar
(47) |
Apr
(79) |
May
(68) |
Jun
(247) |
Jul
(174) |
Aug
(98) |
Sep
(127) |
Oct
(198) |
Nov
(627) |
Dec
(421) |
| 2012 |
Jan
(521) |
Feb
(372) |
Mar
(489) |
Apr
(256) |
May
(143) |
Jun
(132) |
Jul
(74) |
Aug
(38) |
Sep
(42) |
Oct
(18) |
Nov
(58) |
Dec
(21) |
| 2013 |
Jan
(10) |
Feb
(10) |
Mar
(68) |
Apr
(50) |
May
(33) |
Jun
(17) |
Jul
(100) |
Aug
(111) |
Sep
(107) |
Oct
(21) |
Nov
(63) |
Dec
(53) |
| 2014 |
Jan
(29) |
Feb
(20) |
Mar
(39) |
Apr
(86) |
May
(122) |
Jun
(87) |
Jul
(7) |
Aug
(35) |
Sep
(40) |
Oct
(39) |
Nov
(21) |
Dec
(18) |
| 2015 |
Jan
(6) |
Feb
(56) |
Mar
(67) |
Apr
(24) |
May
(86) |
Jun
(5) |
Jul
(2) |
Aug
(17) |
Sep
(2) |
Oct
(14) |
Nov
(80) |
Dec
(97) |
| 2016 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
(2) |
May
(45) |
Jun
(9) |
Jul
(5) |
Aug
(21) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2017 |
Jan
(9) |
Feb
|
Mar
(7) |
Apr
|
May
(24) |
Jun
(35) |
Jul
(60) |
Aug
(44) |
Sep
(22) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2018 |
Jan
(21) |
Feb
(6) |
Mar
(1) |
Apr
(1) |
May
(11) |
Jun
(2) |
Jul
(1) |
Aug
(5) |
Sep
(11) |
Oct
(15) |
Nov
(4) |
Dec
(55) |
| 2019 |
Jan
(41) |
Feb
(9) |
Mar
(23) |
Apr
(25) |
May
(55) |
Jun
(82) |
Jul
(19) |
Aug
(81) |
Sep
(15) |
Oct
(11) |
Nov
(12) |
Dec
(37) |
| 2020 |
Jan
(11) |
Feb
(34) |
Mar
(77) |
Apr
(24) |
May
(6) |
Jun
(14) |
Jul
(4) |
Aug
(76) |
Sep
(141) |
Oct
(62) |
Nov
(46) |
Dec
(116) |
| 2021 |
Jan
(188) |
Feb
(134) |
Mar
(38) |
Apr
(55) |
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
|
2
|
3
(2) |
4
|
5
|
6
|
7
(2) |
|
8
(2) |
9
(1) |
10
|
11
(3) |
12
(4) |
13
(1) |
14
|
|
15
|
16
|
17
(1) |
18
(6) |
19
(3) |
20
|
21
(3) |
|
22
(3) |
23
(3) |
24
(2) |
25
(3) |
26
|
27
(1) |
28
(1) |
|
29
(2) |
30
(3) |
|
|
|
|
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-30 20:54:43
|
Revision: 21574
http://sourceforge.net/p/crossfire/code/21574
Author: akirschbaum
Date: 2020-11-30 20:54:42 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Increase inventory size to 20x6 items
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/src/skins/src/main/resources/com/realtime/crossfire/jxclient/skins/ragnorok/inventory.skin
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2020-11-30 19:01:04 UTC (rev 21573)
+++ jxclient/trunk/ChangeLog 2020-11-30 20:54:42 UTC (rev 21574)
@@ -1,3 +1,7 @@
+2020-11-30 Andreas Kirschbaum
+
+ * Increase inventory size to 20x6 items.
+
2020-11-22 Andreas Kirschbaum
* Report correct command names in error messages for "issue take"
Modified: jxclient/trunk/src/skins/src/main/resources/com/realtime/crossfire/jxclient/skins/ragnorok/inventory.skin
===================================================================
--- jxclient/trunk/src/skins/src/main/resources/com/realtime/crossfire/jxclient/skins/ragnorok/inventory.skin 2020-11-30 19:01:04 UTC (rev 21573)
+++ jxclient/trunk/src/skins/src/main/resources/com/realtime/crossfire/jxclient/skins/ragnorok/inventory.skin 2020-11-30 20:54:42 UTC (rev 21574)
@@ -87,7 +87,7 @@
horizontal begin par
begin seq
- inv 480
+ inv 640
begin par
slider_up
slider_down
@@ -105,7 +105,7 @@
vertical begin seq
begin par
- inv 128
+ inv 192
begin seq
slider_up
gap
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-30 19:01:12
|
Revision: 21573
http://sourceforge.net/p/crossfire/code/21573
Author: rjtanner
Date: 2020-11-30 19:01:04 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Syncrhonize Spell_Shellf with Trunk archetypes - new ranger class and graphics, new composite bow graphic, fix for lampost graphics, fix for Purple Worm archetype, fix Lamia graphic hair color, fix for lightbulb archetype
Modified Paths:
--------------
arch/branches/Spell_shuffle/ChangeLog
arch/branches/Spell_shuffle/light/light_bulb.arc
arch/branches/Spell_shuffle/monster/animal/giant_worm/purple_worm.face
arch/branches/Spell_shuffle/monster/misc/lamia/lamia.base.x31.png
arch/branches/Spell_shuffle/monster/misc/lamia/lamia.base.x32.png
arch/branches/Spell_shuffle/weapon/bow/compositebow.base.111.png
Added Paths:
-----------
arch/branches/Spell_shuffle/light/lampost.clsc.111.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.arc
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png
arch/branches/Spell_shuffle/player/class/Warrior/ranger.trs
arch/branches/Spell_shuffle/player/class/Warrior/ranger_class.face
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png
arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.face
arch/branches/Spell_shuffle/readable/guide/guide_ranged.arc
arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png
Modified: arch/branches/Spell_shuffle/ChangeLog
===================================================================
--- arch/branches/Spell_shuffle/ChangeLog 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/ChangeLog 2020-11-30 19:01:04 UTC (rev 21573)
@@ -1,3 +1,102 @@
+Make the light bulb invisible lighting arches have no_pick
+so that spells can't push them around.
+light/light_bulb.arc
+Daniel Hawkins 2020-11-21
+
+Add guide to Ranged Combat so that the Ranger class can start with a guide.
+readable/guide/guide_ranged.arc
+player/class/Warrior/ranger.trs
+Daniel Hawkins 2020-11-13
+
+New image for composite bow. Move the old image to the classic tileset.
+weapon/bow/compositebow.base.111.png
+weapon/bow/compositebow.clsc.111.png
+Daniel Hawkins 2020-11-12
+
+Add new player class -- ranger
+This is intended to allow better early-game focus on missile weapons.
+Also include special handling so the elf race image is also used as
+the elf ranger image.
+player/class/Warrior/ranger.*
+player/class/Warrior/ranger_class.face
+player/race/elf_player_class_ranger.*
+Daniel Hawkins 2020-11-10
+
+Add subtype 2 to guide to Close Combat
+readable/guide/guide_melee.arc
+Daniel Hawkins 2020-10-28
+
+Add descriptions to all skill objects.
+This annotates each skill with flavour text and information about what the
+skill's passive, active, and crafting effects (if any) are.
+Note that this information is not actually visible in-game prior to server
+version r21515.
+skill/*.arc
+Rebecca Kelly 2020-10-20
+
+Start to move crafting-specific materials out of misc and into crafting
+crafting/Materials/leathers.arc
+crafting/Materials/leather.face
+crafting/Materials/leather.base.111.png
+crafting/Materials/leather_black.base.111.png
+crafting/Materials/leather_white.base.111.png
+crafting/Materials/leather_strips.base.111.png
+crafting/Tools/b_slicingknife.base.111.png
+crafting/Tools/b_slicingknife.face
+crafting/Tools/slicingknife.arc
+crafting/Tools/slicingknife.base.111.png
+crafting/Tools/slicingknife.face
+crafting/Container/*
+Daniel Hawkins 2020-10-12
+
+Fix weirdness involving repeated races on dwarves.
+races
+Daniel Hawkins 2020-10-12
+
+Make aggravation a castable spell, and give it level-scaling
+The code to prevent charm monsters abuse
+from like 2010 appears to have caused the lvl 1
+aggravation horns to be essentially useless.
+Also, make the horns that spawn w/ aggravation have reasonable levels.
+Add the aggravation spell to the random spell list for sorcery.
+spell/MoodChange/spell_aggravation.arc
+spell/SpellBook/sorcerer_book.trs
+artifacts
+Daniel Hawkins 2020-10-10
+
+Add the file as a random drop.
+treasures.trs
+Daniel Hawkins 2020-10-09
+
+Add formulae for crafting weapons of Silvered Edge
+from the newly-added silver filings.
+Also added scythe to the list of valid weapons to silver.
+formulae
+artifacts
+Daniel Hawkins 2020-10-09
+
+Add silver filings as the first item creatable from
+the nee file crafting tool.
+formulae
+crafting/Materials/silver_filings.arc
+crafting/Materials/silver_filings.base.111.png
+crafting/Materials/silver_filings.face
+Daniel Hawkins 2020-10-09
+
+Add crafting tool "file".
+Can be used to powderize metal bars (well, that's the plan anyway).
+crafting/Tools/file.arc
+crafting/Tools/file.base.111.png
+crafting/Tools/file.face
+crafting/README
+Daniel Hawkins 2020-10-09
+
+Add artifact entry for silvered weapons.
+Ensure it is restricted to stabbing and slicing weapons, since bludgeoning with
+silver doesn't seem like it would make much difference.
+artifacts
+Daniel Hawkins 2020-10-09
+
Make the trident imagery less bright, using the W3C green rather than XPM green.
This put the green hue at half the previous brightness.
Move the bright green trident to the classic image set.
@@ -366,7 +465,7 @@
Patch #270 New Items - 6 different items
* Patch accepted with changes as summarized in the patch entry
-at Sourceforge. Basically, changes for clarity and removed
+at Sourceforge. Basically, changes for clarity and removed
duplicate and conflicting item properties identified by
Gridarta for Crossfire
armour/helmet/bone_helm.arc
@@ -383,7 +482,7 @@
weapon/sword/giants_knife.base.111.png
Rick Tanner 2017-03-19
-Patch #267 New Items - 7 different items
+Patch #267 New Items - 7 different items
* Changed attacktype of the Order Sword to remove GodPower, now uses
Magic, Physical and WeaponMagic instead
* Changed attacketype of Bloodreaver Axe to remove GodPower and disease
@@ -575,11 +674,11 @@
random/randomWeal.arc
random/randomWeap.arc
random/random_ore.arc
-random/random_tree.arc
+random/random_tree.arc
RJT 2014-09-08
New graphic and face for random_ore tile, it was using the same
-face as random_mineral before.
+face as random_mineral before.
random/randomOre.base.111.png
random/randomOre.face
random/random_ore.arc
@@ -1182,7 +1281,7 @@
RJT 2012-09-21
New Graphic and archetype for West Guild building and West Guild Storage building.
-Based on existing guild graphics but with a sign or banner on the front.
+Based on existing guild graphics but with a sign or banner on the front.
construct/town/guild2storage_west.base.x11.png
construct/town/guild2storage_west.arc
construct/town/guild2_west.arc
Added: arch/branches/Spell_shuffle/light/lampost.clsc.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/light/lampost.clsc.111.png
===================================================================
--- arch/branches/Spell_shuffle/light/lampost.clsc.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/light/lampost.clsc.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/light/lampost.clsc.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: arch/branches/Spell_shuffle/light/light_bulb.arc
===================================================================
--- arch/branches/Spell_shuffle/light/light_bulb.arc 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/light/light_bulb.arc 2020-11-30 19:01:04 UTC (rev 21573)
@@ -1,6 +1,7 @@
Object light1
name light
face light_bulb_1.111
+no_pick 1
glow_radius 1
invisible 1
end
@@ -7,6 +8,7 @@
Object light2
name light
face light_bulb_2.111
+no_pick 1
glow_radius 2
invisible 1
end
@@ -13,6 +15,7 @@
Object light3
name light
face light_bulb_3.111
+no_pick 1
glow_radius 3
invisible 1
end
@@ -19,6 +22,7 @@
Object light4
name light
face light_bulb_4.111
+no_pick 1
glow_radius 4
invisible 1
end
Modified: arch/branches/Spell_shuffle/monster/animal/giant_worm/purple_worm.face
===================================================================
--- arch/branches/Spell_shuffle/monster/animal/giant_worm/purple_worm.face 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/monster/animal/giant_worm/purple_worm.face 2020-11-30 19:01:04 UTC (rev 21573)
@@ -5,4 +5,4 @@
purple_worm.x31
purple_worm.x71
mina
-
+end
Modified: arch/branches/Spell_shuffle/monster/misc/lamia/lamia.base.x31.png
===================================================================
(Binary files differ)
Modified: arch/branches/Spell_shuffle/monster/misc/lamia/lamia.base.x32.png
===================================================================
(Binary files differ)
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.arc
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.arc (rev 0)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.arc 2020-11-30 19:01:04 UTC (rev 21573)
@@ -0,0 +1,25 @@
+Object ranger_class
+name ranger
+randomitems ranger_class_items
+anim_suffix class_ranger
+face ranger.151
+animation ranger_class
+msg
+Skills: 1H Weapons, Woodsman, Missile Weapons, Hiding
+Items: hunter's bow & arrows, dagger
+---
+Straddling the gaps between wild places and civilization, you feel equally comfortable in both an inn and a forest. Your frequent use of bow and arrow to procure food has given you a hunter's cunning, stealth, and speed, but has not allowed you to devote time to learn to command magic nor to following any particular diety. You're also a bit terse and straightforward, which is generally offputting to the wealthier folks in town, but most commoners don't seem to mind.
+You're no stranger to goblin raids, and have defended your hauls from them on many occasions.
+endmsg
+is_animated 1
+anim_speed -1
+type 37
+level 1
+Str 1
+Dex 2
+Con -1
+Int 2
+Wis 0
+Pow -4
+Cha -1
+end
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.111.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.112.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.131.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.132.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.151.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.152.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.171.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.base.172.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.111.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.112.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.131.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.132.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.151.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.152.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.171.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.clsc.172.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger.trs
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger.trs (rev 0)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger.trs 2020-11-30 19:01:04 UTC (rev 21573)
@@ -0,0 +1,25 @@
+treasure ranger_class_items
+ arch huntersbow
+ more
+ arch arrow
+ nrof 400
+ more
+ arch quiver
+ more
+ arch b_dagger
+ more
+ arch skill_woodsman
+ more
+ arch skill_missile_weapon
+ more
+ arch skill_hide
+ more
+ arch skill_one_handed_weapon
+ more
+ list basic_skills
+ more
+ arch leather_armour
+ more
+ arch guide_ranged
+ end
+
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger.trs
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/class/Warrior/ranger_class.face
===================================================================
--- arch/branches/Spell_shuffle/player/class/Warrior/ranger_class.face (rev 0)
+++ arch/branches/Spell_shuffle/player/class/Warrior/ranger_class.face 2020-11-30 19:01:04 UTC (rev 21573)
@@ -0,0 +1,11 @@
+animation ranger_class
+facings 4
+ranger.111
+ranger.112
+ranger.131
+ranger.132
+ranger.151
+ranger.152
+ranger.171
+ranger.172
+mina
Property changes on: arch/branches/Spell_shuffle/player/class/Warrior/ranger_class.face
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.111.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.112.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.131.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.132.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.151.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.152.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.171.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.base.172.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.111.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.112.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.131.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.132.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.151.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.152.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.171.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.clsc.172.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.face
===================================================================
--- arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.face (rev 0)
+++ arch/branches/Spell_shuffle/player/race/elf_player_class_ranger.face 2020-11-30 19:01:04 UTC (rev 21573)
@@ -0,0 +1,12 @@
+animation elf_player_class_ranger
+facings 4
+elf_player_class_ranger.111
+elf_player_class_ranger.112
+elf_player_class_ranger.131
+elf_player_class_ranger.132
+elf_player_class_ranger.151
+elf_player_class_ranger.152
+elf_player_class_ranger.171
+elf_player_class_ranger.172
+mina
+
Added: arch/branches/Spell_shuffle/readable/guide/guide_ranged.arc
===================================================================
--- arch/branches/Spell_shuffle/readable/guide/guide_ranged.arc (rev 0)
+++ arch/branches/Spell_shuffle/readable/guide/guide_ranged.arc 2020-11-30 19:01:04 UTC (rev 21573)
@@ -0,0 +1,18 @@
+Object guide_ranged
+name guide to Ranged Combat
+msg
+o You can change how you fire arrows with the "bowmode" command. Depending on your combat situation, different modes will be useful at different times.
+o Most bows require strength to draw and hold at the ready. Be on the lookout for equipment that increases strength.
+o Dexterity will help you maneuver around monsters to keep them at a distance, as well as make you harder to hit should they actually reach you. Potions and gear that increase Dexterity may prove invaluable.
+o Quivers of Holding Arrows or Bolts are important, so that you can carry large quantities of arrows without weighing yourself down.
+o Don't forget to retrieve your arrows after you've cleaned up a room! Running out of arrows mid-fight is embarassing and sometimes lethal.
+o Having some spells to replenish your arsenal, such as "create missile", can prove invaluable. Arrows will break occasionally when they are used and will need to be replaced over time.
+endmsg
+nrof 1
+face book_red.111
+type 8
+subtype 2
+skill literacy
+material 1
+weight 4000
+end
Modified: arch/branches/Spell_shuffle/weapon/bow/compositebow.base.111.png
===================================================================
(Binary files differ)
Added: arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png
===================================================================
(Binary files differ)
Index: arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png
===================================================================
--- arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png 2020-11-30 02:04:44 UTC (rev 21572)
+++ arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png 2020-11-30 19:01:04 UTC (rev 21573)
Property changes on: arch/branches/Spell_shuffle/weapon/bow/compositebow.clsc.111.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-30 02:04:46
|
Revision: 21572
http://sourceforge.net/p/crossfire/code/21572
Author: silvernexus
Date: 2020-11-30 02:04:44 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Make the lamia's hair color match in both facings
Before it was green when facing to the right and yellow when facing to the left.
Modified Paths:
--------------
arch/trunk/monster/misc/lamia/lamia.base.x31.png
arch/trunk/monster/misc/lamia/lamia.base.x32.png
Modified: arch/trunk/monster/misc/lamia/lamia.base.x31.png
===================================================================
(Binary files differ)
Modified: arch/trunk/monster/misc/lamia/lamia.base.x32.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-29 07:58:34
|
Revision: 21571
http://sourceforge.net/p/crossfire/code/21571
Author: rjtanner
Date: 2020-11-29 07:58:27 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
Layout changes to A Small Shop (brest/shops/a_small_shop) to add more cosmetic changes to the map exterior, teleporter adjustments and world map entrance (world/world_107_123) update
Modified Paths:
--------------
maps/trunk/brest/shops/a_small_shop
maps/trunk/world/world_107_123
Modified: maps/trunk/brest/shops/a_small_shop
===================================================================
--- maps/trunk/brest/shops/a_small_shop 2020-11-29 06:49:16 UTC (rev 21570)
+++ maps/trunk/brest/shops/a_small_shop 2020-11-29 07:58:27 UTC (rev 21571)
@@ -2,13 +2,13 @@
name A Small Shop
difficulty 20
region brest
-width 15
-height 15
-enter_x 11
+width 17
+height 17
+enter_x 12
enter_y 12
msg
Created: 2007-03-11 Gene Alexander (poof, Galahad)
-Modified: 2008-11-20 Rick Tanner
+Modified: 2020-11-29 Rick Tanner
endmsg
end
arch woods
@@ -65,205 +65,112 @@
y 13
elevation 1582
end
-arch flagstone
+arch brush
y 14
+elevation 1582
end
-arch woods
-x 1
+arch flagstone
+y 15
end
-arch dungeon_magic
-x 1
-y 1
+arch flagstone
+y 16
end
-arch woodfloor2
+arch woods
x 1
-y 1
end
-arch wwall_2_2_2
+arch woods
x 1
y 1
end
-arch dungeon_magic
+arch brush
x 1
y 2
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 2
-end
-arch wwall_2_1_1
-x 1
-y 2
-end
-arch dungeon_magic
-x 1
y 3
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 3
-end
-arch wwall_win1
-x 1
-y 3
-end
-arch dungeon_magic
-x 1
y 4
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 4
-end
-arch wwall_2_1_1
-x 1
-y 4
-end
-arch dungeon_magic
-x 1
y 5
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 5
-end
-arch wwall_3_2
-x 1
-y 5
-end
-arch dungeon_magic
-x 1
y 6
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 6
-end
-arch wwall_2_1_1
-x 1
-y 6
-end
-arch dungeon_magic
-x 1
y 7
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 7
-end
-arch wwall_2_1_1
-x 1
-y 7
-end
-arch dungeon_magic
-x 1
y 8
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 8
-end
-arch wwall_2_1_1
-x 1
-y 8
-end
-arch dungeon_magic
-x 1
y 9
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 9
-end
-arch wwall_3_2
-x 1
-y 9
-end
-arch dungeon_magic
-x 1
y 10
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 10
-end
-arch wwall_2_1_1
-x 1
-y 10
-end
-arch dungeon_magic
-x 1
y 11
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 11
-end
-arch wwall_2_1_1
-x 1
-y 11
-end
-arch dungeon_magic
-x 1
y 12
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 12
-end
-arch wwall_2_1_1
-x 1
-y 12
-end
-arch dungeon_magic
-x 1
y 13
+elevation 1582
end
-arch woodfloor2
+arch brush
x 1
-y 13
+y 14
+elevation 1582
end
-arch wwall_2_2_1
+arch flagstone
x 1
-y 13
+y 15
end
arch flagstone
x 1
-y 14
+y 16
end
arch woods
x 2
end
-arch dungeon_magic
+arch woods
x 2
y 1
end
-arch woodfloor2
-x 2
-y 1
-end
-arch wwall_2_1_2
-x 2
-y 1
-end
arch dungeon_magic
x 2
y 2
end
-arch lbulletwall_4
-name Mana Crystal
+arch woodfloor2
x 2
y 2
-speed 0
-level 107
-invisible 1
-connected 2
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_2_2_2
x 2
y 2
end
@@ -275,103 +182,118 @@
x 2
y 3
end
+arch wwall_2_1_1
+x 2
+y 3
+end
arch dungeon_magic
x 2
y 4
end
-arch lbulletwall_4
-name Mana Crystal
-direction 2
+arch woodfloor2
x 2
y 4
-speed 0
-level 107
-invisible 1
-connected 2
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_win1
x 2
y 4
end
+arch dungeon_magic
+x 2
+y 5
+end
arch woodfloor2
x 2
y 5
end
-arch wwall_2_1_2
+arch wwall_2_1_1
x 2
y 5
end
+arch dungeon_magic
+x 2
+y 6
+end
arch woodfloor2
x 2
y 6
end
-arch chair_2.1
+arch wwall_3_2
x 2
y 6
end
+arch dungeon_magic
+x 2
+y 7
+end
arch woodfloor2
x 2
y 7
end
+arch wwall_2_1_1
+x 2
+y 7
+end
+arch dungeon_magic
+x 2
+y 8
+end
arch woodfloor2
x 2
y 8
end
-arch chair_2.3
+arch wwall_2_1_1
x 2
y 8
end
+arch dungeon_magic
+x 2
+y 9
+end
arch woodfloor2
x 2
y 9
end
-arch wwall_2_1_2
+arch wwall_2_1_1
x 2
y 9
end
+arch dungeon_magic
+x 2
+y 10
+end
arch woodfloor2
x 2
y 10
end
-arch lightningwall_3
-name cancellation
+arch wwall_3_2
x 2
y 10
-speed 0.04
-level 300
-arch spell_cancellation
end
+arch dungeon_magic
+x 2
+y 11
end
arch woodfloor2
x 2
y 11
end
-arch lightningwall_3
-name cancellation
+arch wwall_2_1_1
x 2
y 11
-speed 0.04
-level 300
-arch spell_cancellation
end
+arch dungeon_magic
+x 2
+y 12
end
arch woodfloor2
x 2
y 12
end
-arch lightningwall_3
-name cancellation
+arch wwall_2_1_1
x 2
y 12
-speed 0.04
-level 300
-arch spell_cancellation
end
-end
arch dungeon_magic
x 2
y 13
@@ -380,26 +302,34 @@
x 2
y 13
end
-arch wwall_2_1_2
+arch wwall_2_1_1
x 2
y 13
end
-arch flagstone
+arch dungeon_magic
x 2
y 14
end
-arch woods
-x 3
+arch woodfloor2
+x 2
+y 14
end
-arch dungeon_magic
-x 3
-y 1
+arch wwall_2_2_1
+x 2
+y 14
end
-arch woodfloor2
+arch flagstone
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch woods
x 3
-y 1
end
-arch wwall_2_1_2
+arch woods
x 3
y 1
end
@@ -411,28 +341,30 @@
x 3
y 2
end
-arch magic_mouth
-msg
-Use this Mana Crystal at your own risk. We are not responsible if you die from overuse of the crystal.
-endmsg
+arch wwall_2_1_2
x 3
-y 3
+y 2
end
arch dungeon_magic
x 3
y 3
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 3
y 3
+speed 0
+level 107
+invisible 1
+connected 2
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch button_lever
-name Mana Crystal
-face power_crystal.111
-animation power_crystal
+end
+arch woodfloor2
x 3
y 3
-connected 2
end
arch dungeon_magic
x 3
@@ -446,11 +378,21 @@
x 3
y 5
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 3
y 5
+speed 0
+level 107
+direction 2
+invisible 1
+connected 2
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch wwall_win2
+end
+arch woodfloor2
x 3
y 5
end
@@ -458,7 +400,7 @@
x 3
y 6
end
-arch chair_2.1
+arch wwall_2_1_2
x 3
y 6
end
@@ -466,11 +408,11 @@
x 3
y 7
end
-arch woodfloor2
+arch chair_2.1
x 3
-y 8
+y 7
end
-arch chair_2.3
+arch woodfloor2
x 3
y 8
end
@@ -478,7 +420,7 @@
x 3
y 9
end
-arch wwall_1_3
+arch chair_2.3
x 3
y 9
end
@@ -486,7 +428,7 @@
x 3
y 10
end
-arch director_3
+arch wwall_2_1_2
x 3
y 10
end
@@ -494,46 +436,65 @@
x 3
y 11
end
-arch director_3
+arch lightningwall_3
+name cancellation
x 3
y 11
+speed 0.04
+level 300
+arch spell_cancellation
end
+end
arch woodfloor2
x 3
y 12
end
-arch director_3
+arch lightningwall_3
+name cancellation
x 3
y 12
+speed 0.04
+level 300
+arch spell_cancellation
end
-arch dungeon_magic
-x 3
-y 13
end
arch woodfloor2
x 3
y 13
end
-arch wwall_win2
+arch lightningwall_3
+name cancellation
x 3
y 13
+speed 0.04
+level 300
+arch spell_cancellation
end
-arch flagstone
+end
+arch dungeon_magic
x 3
y 14
end
-arch woods
-x 4
+arch woodfloor2
+x 3
+y 14
end
-arch dungeon_magic
-x 4
-y 1
+arch wwall_2_1_2
+x 3
+y 14
end
-arch woodfloor2
+arch flagstone
+x 3
+y 15
+end
+arch flagstone
+x 3
+y 16
+end
+arch woods
x 4
-y 1
end
-arch wwall_2_1_2
+arch woods
x 4
y 1
end
@@ -541,21 +502,11 @@
x 4
y 2
end
-arch lbulletwall_4
-name Mana Crystal
-direction 6
+arch woodfloor2
x 4
y 2
-speed 0
-level 107
-invisible 1
-connected 2
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_2_1_2
x 4
y 2
end
@@ -567,154 +518,137 @@
x 4
y 3
end
-arch perm_magic_portal
-name Exit
-slaying a_small_shop
-hp 6
-sp 3
+arch magic_mouth
+msg
+Use this Mana Crystal at your own risk. We are not responsible if you die from overuse of the crystal.
+endmsg
x 4
-y 3
+y 4
end
arch dungeon_magic
x 4
y 4
end
-arch lbulletwall_4
-name Mana Crystal
-direction 8
+arch woodfloor2
x 4
y 4
-speed 0
-level 107
-invisible 1
-connected 2
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch button_lever
+name Mana Crystal
+face power_crystal.111
+animation power_crystal
x 4
y 4
+connected 2
end
-arch woodfloor2
+arch dungeon_magic
x 4
y 5
end
-arch wwall_2_1_2
+arch woodfloor2
x 4
y 5
end
-arch altar_trigger
-slaying money
-exp 120
-food 25000
+arch dungeon_magic
x 4
y 6
-connected 4
end
arch woodfloor2
x 4
y 6
end
-arch barrel
+arch wwall_win2
x 4
y 6
-material 0
-move_block 0
-no_pick 1
end
arch woodfloor2
x 4
y 7
end
+arch chair_2.1
+x 4
+y 7
+end
arch woodfloor2
x 4
y 8
end
-arch button_small
-x 4
-y 9
-invisible 1
-connected 6
-end
arch woodfloor2
x 4
y 9
end
-arch grate_closed_1
+arch chair_2.3
x 4
y 9
-connected 6
-no_magic 1
-damned 1
end
-arch dungeon_magic
+arch woodfloor2
x 4
y 10
end
-arch button_small
+arch wwall_1_3
x 4
y 10
-invisible 1
-connected 6
end
arch woodfloor2
x 4
-y 10
+y 11
end
-arch dungeon_magic
+arch director_3
x 4
y 11
end
arch woodfloor2
x 4
-y 11
+y 12
end
-arch dungeon_magic
+arch director_3
x 4
y 12
end
arch woodfloor2
x 4
-y 12
+y 13
end
-arch dungeon_magic
+arch director_3
x 4
y 13
end
+arch dungeon_magic
+x 4
+y 14
+end
arch woodfloor2
x 4
-y 13
+y 14
end
-arch wwall_2_1_2
+arch wwall_win2
x 4
-y 13
+y 14
end
arch flagstone
x 4
-y 14
+y 15
end
+arch flagstone
+x 4
+y 16
+end
arch woods
x 5
end
-arch dungeon_magic
+arch woods
x 5
y 1
end
-arch woodfloor2
+arch dungeon_magic
x 5
-y 1
+y 2
end
-arch wwall_3_3
-x 5
-y 1
-end
arch woodfloor2
x 5
y 2
end
-arch wwall_2_1_1
+arch wwall_2_1_2
x 5
y 2
end
@@ -722,62 +656,91 @@
x 5
y 3
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 5
y 3
+speed 0
+level 107
+direction 6
+invisible 1
+connected 2
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch wwall_win1
+end
+arch woodfloor2
x 5
y 3
end
+arch dungeon_magic
+x 5
+y 4
+end
arch woodfloor2
x 5
y 4
end
-arch wwall_2_1_1
+arch perm_magic_portal
+name Exit
+slaying a_small_shop
+hp 7
+sp 4
x 5
y 4
end
-arch woodfloor2
+arch dungeon_magic
x 5
y 5
end
-arch wwall_2_2_4
+arch lbulletwall_4
+name Mana Crystal
x 5
y 5
+speed 0
+level 107
+direction 8
+invisible 1
+connected 2
+move_block 0
+blocksview 0
+arch spell_transference
end
+end
arch woodfloor2
x 5
+y 5
+end
+arch woodfloor2
+x 5
y 6
end
-arch sign
-name Mana Crystal West Room
-msg
-Please drop 500 platinum coins in the barrel to enter the Mana Crystal West Room.
-
--= Warning =-
-Standing on or near a mana crystal for too long can be fatal to your health.
-endmsg
+arch wwall_2_1_2
x 5
y 6
end
-arch woodfloor2
+arch altar_trigger
+slaying money
+exp 120
+food 25000
x 5
y 7
+connected 4
end
arch woodfloor2
x 5
-y 8
+y 7
end
-arch sign
-name Cancellation Booth
-msg
-Please drop 1500 platinum coins in the barrel to enter the Cancellation Booth.
-
--= Warning =-
-Do not carry any equipment in the cancellation booth that you don't intend to have adjusted.
-endmsg
+arch barrel
x 5
+y 7
+material 0
+move_block 0
+no_pick 1
+end
+arch woodfloor2
+x 5
y 8
end
arch woodfloor2
@@ -784,31 +747,42 @@
x 5
y 9
end
-arch wwall_1_4
+arch button_small
x 5
-y 9
+y 10
+invisible 1
+connected 6
end
arch woodfloor2
x 5
y 10
end
-arch director_7
+arch grate_closed_1
x 5
y 10
+connected 6
+no_magic 1
+damned 1
end
-arch woodfloor2
+arch dungeon_magic
x 5
y 11
end
-arch director_7
+arch button_small
x 5
y 11
+invisible 1
+connected 6
end
arch woodfloor2
x 5
+y 11
+end
+arch dungeon_magic
+x 5
y 12
end
-arch director_7
+arch woodfloor2
x 5
y 12
end
@@ -820,26 +794,30 @@
x 5
y 13
end
-arch wwall_win2
+arch dungeon_magic
x 5
-y 13
+y 14
end
-arch flagstone
+arch woodfloor2
x 5
y 14
end
-arch woods
-x 6
+arch wwall_2_1_2
+x 5
+y 14
end
-arch dungeon_magic
-x 6
-y 1
+arch flagstone
+x 5
+y 15
end
-arch woodfloor2
+arch flagstone
+x 5
+y 16
+end
+arch woods
x 6
-y 1
end
-arch wwall_2_1_2
+arch woods
x 6
y 1
end
@@ -851,19 +829,15 @@
x 6
y 2
end
-arch dungeon_magic
+arch wwall_3_3
x 6
-y 3
+y 2
end
arch woodfloor2
x 6
y 3
end
-arch perm_magic_portal
-name Enter
-slaying a_small_shop
-hp 4
-sp 3
+arch wwall_2_1_1
x 6
y 3
end
@@ -871,66 +845,61 @@
x 6
y 4
end
-arch button_trigger
+arch woodfloor2
x 6
y 4
-invisible 1
-connected 4
end
-arch woodfloor2
+arch wwall_win1
x 6
y 4
end
-arch button_trigger
-x 6
-y 5
-invisible 1
-connected 4
-end
arch woodfloor2
x 6
y 5
end
-arch grate_closed_1
+arch wwall_2_1_1
x 6
y 5
-connected 4
-no_magic 1
-damned 1
end
arch woodfloor2
x 6
y 6
end
+arch wwall_2_2_4
+x 6
+y 6
+end
arch woodfloor2
x 6
y 7
end
-arch altar_trigger
-slaying money
-exp 120
-food 75000
+arch sign
+name Mana Crystal West Room
+msg
+Please drop 500 platinum coins in the barrel to enter the Mana Crystal West Room.
+
+-= Warning =-
+Standing on or near a mana crystal for too long can be fatal to your health.
+endmsg
x 6
-y 8
-invisible 1
-connected 6
+y 7
end
arch woodfloor2
x 6
y 8
end
-arch barrel
-x 6
-y 8
-material 0
-move_block 0
-no_pick 1
-end
arch woodfloor2
x 6
y 9
end
-arch wwall_2_1_2
+arch sign
+name Cancellation Booth
+msg
+Please drop 1500 platinum coins in the barrel to enter the Cancellation Booth.
+
+-= Warning =-
+Do not carry any equipment in the cancellation booth that you don't intend to have adjusted.
+endmsg
x 6
y 9
end
@@ -938,72 +907,61 @@
x 6
y 10
end
-arch lightningwall_7
-name cancellation
+arch wwall_1_4
x 6
y 10
-speed 0.04
-level 300
-arch spell_cancellation
end
-end
arch woodfloor2
x 6
y 11
end
-arch lightningwall_7
-name cancellation
+arch director_7
x 6
y 11
-speed 0.04
-level 300
-arch spell_cancellation
end
-end
arch woodfloor2
x 6
y 12
end
-arch lightningwall_7
-name cancellation
+arch director_7
x 6
y 12
-speed 0.04
-level 300
-arch spell_cancellation
end
+arch woodfloor2
+x 6
+y 13
end
-arch dungeon_magic
+arch director_7
x 6
y 13
end
+arch dungeon_magic
+x 6
+y 14
+end
arch woodfloor2
x 6
-y 13
+y 14
end
-arch wwall_2_1_2
+arch wwall_win2
x 6
-y 13
+y 14
end
arch flagstone
x 6
-y 14
+y 15
end
+arch flagstone
+x 6
+y 16
+end
arch woods
x 7
end
-arch dungeon_magic
+arch woods
x 7
y 1
end
-arch woodfloor2
-x 7
-y 1
-end
-arch wwall_3_3
-x 7
-y 1
-end
arch dungeon_magic
x 7
y 2
@@ -1012,7 +970,7 @@
x 7
y 2
end
-arch wwall_2_1_1
+arch wwall_2_1_2
x 7
y 2
end
@@ -1024,10 +982,6 @@
x 7
y 3
end
-arch wwall_win1
-x 7
-y 3
-end
arch dungeon_magic
x 7
y 4
@@ -1036,24 +990,47 @@
x 7
y 4
end
-arch wwall_2_1_1
+arch perm_magic_portal
+name Enter
+slaying a_small_shop
+hp 5
+sp 4
x 7
y 4
end
-arch woodfloor2
+arch dungeon_magic
x 7
y 5
end
-arch wwall_1_2
+arch button_trigger
x 7
y 5
+invisible 1
+connected 4
end
arch woodfloor2
x 7
+y 5
+end
+arch button_trigger
+x 7
y 6
+invisible 1
+connected 4
end
arch woodfloor2
x 7
+y 6
+end
+arch grate_closed_1
+x 7
+y 6
+connected 4
+no_magic 1
+damned 1
+end
+arch woodfloor2
+x 7
y 7
end
arch woodfloor2
@@ -1060,19 +1037,30 @@
x 7
y 8
end
+arch altar_trigger
+slaying money
+exp 120
+food 75000
+x 7
+y 9
+invisible 1
+connected 6
+end
arch woodfloor2
x 7
y 9
end
-arch wwall_3_3
+arch barrel
x 7
y 9
+material 0
+move_block 0
end
arch woodfloor2
x 7
y 10
end
-arch wwall_2_1_1
+arch wwall_2_1_2
x 7
y 10
end
@@ -1080,46 +1068,65 @@
x 7
y 11
end
-arch wwall_2_1_1
+arch lightningwall_7
+name cancellation
x 7
y 11
+speed 0.04
+level 300
+arch spell_cancellation
end
+end
arch woodfloor2
x 7
y 12
end
-arch wwall_2_1_1
+arch lightningwall_7
+name cancellation
x 7
y 12
+speed 0.04
+level 300
+arch spell_cancellation
end
-arch dungeon_magic
-x 7
-y 13
end
arch woodfloor2
x 7
y 13
end
-arch wwall_3_1
+arch lightningwall_7
+name cancellation
x 7
y 13
+speed 0.04
+level 300
+arch spell_cancellation
end
-arch flagstone
+end
+arch dungeon_magic
x 7
y 14
end
-arch woods
-x 8
+arch woodfloor2
+x 7
+y 14
end
-arch dungeon_magic
-x 8
-y 1
+arch wwall_2_1_2
+x 7
+y 14
end
-arch woodfloor2
+arch flagstone
+x 7
+y 15
+end
+arch flagstone
+x 7
+y 16
+end
+arch woods
x 8
-y 1
end
-arch wwall_2_1_2
+arch woods
x 8
y 1
end
@@ -1131,6 +1138,10 @@
x 8
y 2
end
+arch wwall_3_3
+x 8
+y 2
+end
arch dungeon_magic
x 8
y 3
@@ -1139,11 +1150,7 @@
x 8
y 3
end
-arch perm_magic_portal
-name Enter
-slaying a_small_shop
-hp 10
-sp 3
+arch wwall_2_1_1
x 8
y 3
end
@@ -1151,37 +1158,34 @@
x 8
y 4
end
-arch button_trigger
+arch woodfloor2
x 8
y 4
-invisible 1
-connected 5
end
-arch woodfloor2
+arch wwall_win1
x 8
y 4
end
-arch button_trigger
+arch dungeon_magic
x 8
y 5
-invisible 1
-connected 5
end
arch woodfloor2
x 8
y 5
end
-arch grate_closed_1
+arch wwall_2_1_1
x 8
y 5
-connected 5
-no_magic 1
-damned 1
end
arch woodfloor2
x 8
y 6
end
+arch wwall_1_2
+x 8
+y 6
+end
arch woodfloor2
x 8
y 7
@@ -1194,11 +1198,11 @@
x 8
y 9
end
-arch wwall_2_1_2
+arch woodfloor2
x 8
-y 9
+y 10
end
-arch woodfloor2
+arch wwall_3_3
x 8
y 10
end
@@ -1206,62 +1210,62 @@
x 8
y 11
end
-arch merchant
-name Qint
-title the shop keeper
-msg
-@match mana|crystal
-The mana crystal booths are used to recharge the mana crystals you may carry in your inventory. Go in the booth, stand over the crystal to gain mana, then transfer the mana to the crystals you carry by applying them. Beware that standing on or near the mana crystal too long can be fatal to your health.
-@match cancellation
-The cancellation booth is used to remove negative damage from your equipment. Enter the booth, stand between the directors and check your negative damaged equipment. Eventually all negative damage will be removed. Beware that the cancellation will also remove bonuses from your equipment. Do not carry any equipment in the cancellation booth that you don't intend to have adjusted.
-@match *
-Welcome to my shop. We have two mana crystal booths and a cancellation booth. Please feel free to ask me about them.
-endmsg
+arch wwall_2_1_1
x 8
y 11
-level 150
-randomitems none
end
arch woodfloor2
x 8
y 12
end
-arch dungeon_magic
+arch wwall_2_1_1
x 8
-y 13
+y 12
end
arch woodfloor2
x 8
y 13
end
-arch wwall_2_1_2
+arch wwall_2_1_1
x 8
y 13
end
-arch flagstone
+arch dungeon_magic
x 8
y 14
end
+arch woodfloor2
+x 8
+y 14
+end
+arch wwall_3_1
+x 8
+y 14
+end
+arch flagstone
+x 8
+y 15
+end
+arch flagstone
+x 8
+y 16
+end
arch woods
x 9
end
-arch dungeon_magic
+arch woods
x 9
y 1
end
-arch woodfloor2
+arch dungeon_magic
x 9
-y 1
+y 2
end
-arch wwall_3_3
-x 9
-y 1
-end
arch woodfloor2
x 9
y 2
end
-arch wwall_2_1_1
+arch wwall_2_1_2
x 9
y 2
end
@@ -1273,41 +1277,53 @@
x 9
y 3
end
-arch wwall_win1
+arch dungeon_magic
x 9
-y 3
+y 4
end
arch woodfloor2
x 9
y 4
end
-arch wwall_2_1_1
+arch perm_magic_portal
+name Enter
+slaying a_small_shop
+hp 11
+sp 4
x 9
y 4
end
-arch woodfloor2
+arch dungeon_magic
x 9
y 5
end
-arch wwall_2_2_1
+arch button_trigger
x 9
y 5
+invisible 1
+connected 5
end
arch woodfloor2
x 9
+y 5
+end
+arch button_trigger
+x 9
y 6
+invisible 1
+connected 5
end
-arch sign
-name Mana Crystal East Room
-msg
-Please drop 500 platinum coins in the barrel to enter the Mana Crystal East Room.
-
--= Warning =-
-Standing on or near a mana crystal for too long can be fatal to your health.
-endmsg
+arch woodfloor2
x 9
y 6
end
+arch grate_closed_1
+x 9
+y 6
+connected 5
+no_magic 1
+damned 1
+end
arch woodfloor2
x 9
y 7
@@ -1320,105 +1336,86 @@
x 9
y 9
end
-arch wwall_2_1_2
-x 9
-y 9
-end
arch woodfloor2
x 9
y 10
end
-arch longtable_1_1
-name counter
+arch wwall_2_1_2
x 9
y 10
-move_block all
end
arch woodfloor2
x 9
y 11
end
-arch longtable_2_1_1
-name counter
-x 9
-y 11
-move_block all
-end
arch woodfloor2
x 9
y 12
end
-arch longtable_1_2
-name counter
+arch merchant
+name Qint
+title the shop keeper
+msg
+@match mana|crystal
+The mana crystal booths are used to recharge the mana crystals you may carry in your inventory. Go in the booth, stand over the crystal to gain mana, then transfer the mana to the crystals you carry by applying them. Beware that standing on or near the mana crystal too long can be fatal to your health.
+@match cancellation
+The cancellation booth is used to remove negative damage from your equipment. Enter the booth, stand between the directors and check your negative damaged equipment. Eventually all negative damage will be removed. Beware that the cancellation will also remove bonuses from your equipment. Do not carry any equipment in the cancellation booth that you don't intend to have adjusted.
+@match *
+Welcome to my shop. We have two mana crystal booths and a cancellation booth. Please feel free to ask me about them.
+endmsg
x 9
y 12
-move_block all
+level 150
+randomitems none
end
-arch dungeon_magic
+arch woodfloor2
x 9
y 13
end
+arch dungeon_magic
+x 9
+y 14
+end
arch woodfloor2
x 9
-y 13
+y 14
end
-arch wwall_win2
+arch wwall_2_1_2
x 9
-y 13
+y 14
end
arch flagstone
x 9
-y 14
+y 15
end
+arch flagstone
+x 9
+y 16
+end
arch woods
x 10
end
-arch dungeon_magic
+arch woods
x 10
y 1
end
-arch woodfloor2
-x 10
-y 1
-end
-arch wwall_2_1_2
-x 10
-y 1
-end
arch dungeon_magic
x 10
y 2
end
-arch lbulletwall_4
-name Mana Crystal
+arch woodfloor2
x 10
y 2
-speed 0
-level 107
-invisible 1
-connected 3
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_3_3
x 10
y 2
end
-arch dungeon_magic
-x 10
-y 3
-end
arch woodfloor2
x 10
y 3
end
-arch perm_magic_portal
-name Exit
-slaying a_small_shop
-hp 8
-sp 3
+arch wwall_2_1_1
x 10
y 3
end
@@ -1426,21 +1423,11 @@
x 10
y 4
end
-arch lbulletwall_4
-name Mana Crystal
-direction 2
+arch woodfloor2
x 10
y 4
-speed 0
-level 107
-invisible 1
-connected 3
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_win1
x 10
y 4
end
@@ -1448,38 +1435,32 @@
x 10
y 5
end
-arch wwall_2_1_2
+arch wwall_2_1_1
x 10
y 5
end
-arch altar_trigger
-slaying money
-exp 120
-food 25000
-x 10
-y 6
-connected 5
-end
arch woodfloor2
x 10
y 6
end
-arch barrel
+arch wwall_2_2_1
x 10
y 6
-material 0
-move_block 0
-no_pick 1
end
arch woodfloor2
x 10
y 7
end
-arch button_small
+arch sign
+name Mana Crystal East Room
+msg
+Please drop 500 platinum coins in the barrel to enter the Mana Crystal East Room.
+
+-= Warning =-
+Standing on or near a mana crystal for too long can be fatal to your health.
+endmsg
x 10
-y 8
-invisible 1
-connected 7
+y 7
end
arch woodfloor2
x 10
@@ -1489,17 +1470,11 @@
x 10
y 9
end
-arch wwall_1_3
+arch woodfloor2
x 10
-y 9
-end
-arch button_small
-x 10
y 10
-invisible 1
-connected 7
end
-arch woodfloor2
+arch wwall_2_1_2
x 10
y 10
end
@@ -1507,55 +1482,56 @@
x 10
y 11
end
-arch button_small
+arch longtable_1_1
+name counter
x 10
-y 12
-invisible 1
-connected 8
+y 11
+move_block all
end
arch woodfloor2
x 10
y 12
end
-arch dungeon_magic
+arch longtable_2_1_1
+name counter
x 10
-y 13
+y 12
+move_block all
end
arch woodfloor2
x 10
y 13
end
-arch wwall_1_3
+arch longtable_1_2
+name counter
x 10
y 13
+move_block all
end
-arch invis_exit
-slaying /world/world_107_123
-hp 21
-sp 29
+arch dungeon_magic
x 10
y 14
end
-arch dungeon_magic
+arch woodfloor2
x 10
y 14
end
-arch flagstone
+arch wwall_win2
x 10
y 14
end
-arch woods
-x 11
+arch flagstone
+x 10
+y 15
end
-arch dungeon_magic
-x 11
-y 1
+arch flagstone
+x 10
+y 16
end
-arch woodfloor2
+arch woods
x 11
-y 1
end
-arch wwall_2_1_2
+arch woods
x 11
y 1
end
@@ -1567,28 +1543,30 @@
x 11
y 2
end
-arch magic_mouth
-msg
-Use this Mana Crystal at your own risk. We are not responsible if you die from overuse of the crystal.
-endmsg
+arch wwall_2_1_2
x 11
-y 3
+y 2
end
arch dungeon_magic
x 11
y 3
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 11
y 3
+speed 0
+level 107
+invisible 1
+connected 3
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch button_lever
-name Mana Crystal
-face power_crystal.111
-animation power_crystal
+end
+arch woodfloor2
x 11
y 3
-connected 3
end
arch dungeon_magic
x 11
@@ -1598,15 +1576,33 @@
x 11
y 4
end
+arch perm_magic_portal
+name Exit
+slaying a_small_shop
+hp 9
+sp 4
+x 11
+y 4
+end
arch dungeon_magic
x 11
y 5
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 11
y 5
+speed 0
+level 107
+direction 2
+invisible 1
+connected 3
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch wwall_win2
+end
+arch woodfloor2
x 11
y 5
end
@@ -1614,19 +1610,27 @@
x 11
y 6
end
-arch chair_2.1
+arch wwall_2_1_2
x 11
y 6
end
+arch altar_trigger
+slaying money
+exp 120
+food 25000
+x 11
+y 7
+connected 5
+end
arch woodfloor2
x 11
y 7
end
-arch button_small
+arch barrel
x 11
-y 8
-invisible 1
-connected 7
+y 7
+material 0
+move_block 0
end
arch woodfloor2
x 11
@@ -1642,60 +1646,49 @@
x 11
y 9
end
-arch mdoor_closed_1
+arch woodfloor2
x 11
-y 9
-connected 7
+y 10
end
+arch wwall_1_3
+x 11
+y 10
+end
arch button_small
x 11
-y 10
+y 11
invisible 1
connected 7
end
arch woodfloor2
x 11
-y 10
+y 11
end
arch woodfloor2
x 11
-y 11
+y 12
end
arch button_small
x 11
-y 12
+y 13
invisible 1
connected 8
end
arch woodfloor2
x 11
-y 12
-end
-arch invis_exit
-slaying /world/world_107_123
-hp 21
-sp 29
-x 11
y 13
end
arch dungeon_magic
x 11
-y 13
+y 14
end
-arch button_small
-x 11
-y 13
-invisible 1
-connected 8
-end
arch woodfloor2
x 11
-y 13
+y 14
end
-arch mdoor_closed_1
+arch wwall_1_3
x 11
-y 13
-connected 8
+y 14
end
arch invis_exit
slaying /world/world_107_123
@@ -1702,50 +1695,36 @@
hp 21
sp 29
x 11
-y 14
+y 15
end
arch dungeon_magic
x 11
-y 14
+y 15
end
arch flagstone
x 11
-y 14
+y 15
end
+arch flagstone
+x 11
+y 16
+end
arch woods
x 12
end
-arch dungeon_magic
+arch woods
x 12
y 1
end
-arch woodfloor2
-x 12
-y 1
-end
-arch wwall_2_1_2
-x 12
-y 1
-end
arch dungeon_magic
x 12
y 2
end
-arch lbulletwall_4
-name Mana Crystal
-direction 6
+arch woodfloor2
x 12
y 2
-speed 0
-level 107
-invisible 1
-connected 3
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch wwall_2_1_2
x 12
y 2
end
@@ -1757,41 +1736,46 @@
x 12
y 3
end
+arch magic_mouth
+msg
+Use this Mana Crystal at your own risk. We are not responsible if you die from overuse of the crystal.
+endmsg
+x 12
+y 4
+end
arch dungeon_magic
x 12
y 4
end
-arch lbulletwall_4
+arch woodfloor2
+x 12
+y 4
+end
+arch button_lever
name Mana Crystal
-direction 8
+face power_crystal.111
+animation power_crystal
x 12
y 4
-speed 0
-level 107
-invisible 1
connected 3
-move_block 0
-blocksview 0
-arch spell_transference
end
-end
-arch woodfloor2
+arch dungeon_magic
x 12
-y 4
+y 5
end
arch woodfloor2
x 12
y 5
end
-arch wwall_2_1_2
+arch dungeon_magic
x 12
-y 5
+y 6
end
arch woodfloor2
x 12
y 6
end
-arch chair_2.1
+arch wwall_win2
x 12
y 6
end
@@ -1799,21 +1783,21 @@
x 12
y 7
end
-arch button_small
+arch chair_2.1
x 12
-y 8
-invisible 1
-connected 7
+y 7
end
arch woodfloor2
x 12
y 8
end
-arch woodfloor2
+arch button_small
x 12
y 9
+invisible 1
+connected 7
end
-arch wwall_1_4
+arch woodfloor2
x 12
y 9
end
@@ -1827,36 +1811,60 @@
x 12
y 10
end
-arch woodfloor2
+arch mdoor_closed_1
x 12
+y 10
+connected 7
+end
+arch button_small
+x 12
y 11
+invisible 1
+connected 7
end
-arch palm
-name house palm
+arch woodfloor2
x 12
y 11
end
+arch woodfloor2
+x 12
+y 12
+end
arch button_small
x 12
-y 12
+y 13
invisible 1
connected 8
end
arch woodfloor2
x 12
-y 12
+y 13
end
+arch invis_exit
+slaying /world/world_107_123
+hp 21
+sp 29
+x 12
+y 14
+end
arch dungeon_magic
x 12
-y 13
+y 14
end
+arch button_small
+x 12
+y 14
+invisible 1
+connected 8
+end
arch woodfloor2
x 12
-y 13
+y 14
end
-arch wwall_1_4
+arch mdoor_closed_1
x 12
-y 13
+y 14
+connected 8
end
arch invis_exit
slaying /world/world_107_123
@@ -1863,31 +1871,27 @@
hp 21
sp 29
x 12
-y 14
+y 15
end
arch dungeon_magic
x 12
-y 14
+y 15
end
arch flagstone
x 12
-y 14
+y 15
end
+arch flagstone
+x 12
+y 16
+end
arch woods
x 13
end
-arch dungeon_magic
+arch woods
x 13
y 1
end
-arch woodfloor2
-x 13
-y 1
-end
-arch wwall_2_2_3
-x 13
-y 1
-end
arch dungeon_magic
x 13
y 2
@@ -1896,7 +1900,7 @@
x 13
y 2
end
-arch wwall_2_1_1
+arch wwall_2_1_2
x 13
y 2
end
@@ -1904,11 +1908,21 @@
x 13
y 3
end
-arch woodfloor2
+arch lbulletwall_4
+name Mana Crystal
x 13
y 3
+speed 0
+level 107
+direction 6
+invisible 1
+connected 3
+move_block 0
+blocksview 0
+arch spell_transference
end
-arch wwall_win1
+end
+arch woodfloor2
x 13
y 3
end
@@ -1920,178 +1934,428 @@
x 13
y 4
end
-arch wwall_2_1_1
+arch dungeon_magic
x 13
-y 4
+y 5
end
-arch dungeon_magic
+arch lbulletwall_4
+name Mana Crystal
x 13
y 5
+speed 0
+level 107
+direction 8
+invisible 1
+connected 3
+move_block 0
+blocksview 0
+arch spell_transference
end
+end
arch woodfloor2
x 13
y 5
end
-arch wwall_3_4
+arch woodfloor2
x 13
-y 5
+y 6
end
-arch dungeon_magic
+arch wwall_2_1_2
x 13
y 6
end
arch woodfloor2
x 13
-y 6
+y 7
end
-arch wwall_2_1_1
+arch chair_2.1
x 13
-y 6
+y 7
end
+arch woodfloor2
+x 13
+y 8
+end
+arch button_small
+x 13
+y 9
+invisible 1
+connected 7
+end
+arch woodfloor2
+x 13
+y 9
+end
+arch woodfloor2
+x 13
+y 10
+end
+arch wwall_1_4
+x 13
+y 10
+end
+arch button_small
+x 13
+y 11
+invisible 1
+connected 7
+end
+arch woodfloor2
+x 13
+y 11
+end
+arch woodfloor2
+x 13
+y 12
+end
+arch palm
+name house palm
+x 13
+y 12
+end
+arch button_small
+x 13
+y 13
+invisible 1
+connected 8
+end
+arch woodfloor2
+x 13
+y 13
+end
arch dungeon_magic
x 13
-y 7
+y 14
end
arch woodfloor2
x 13
+y 14
+end
+arch wwall_1_4
+x 13
+y 14
+end
+arch invis_exit
+slaying /world/world_107_123
+hp 21
+sp 29
+x 13
+y 15
+end
+arch dungeon_magic
+x 13
+y 15
+end
+arch flagstone
+x 13
+y 15
+end
+arch flagstone
+x 13
+y 16
+end
+arch woods
+x 14
+end
+arch woods
+x 14
+y 1
+end
+arch dungeon_magic
+x 14
+y 2
+end
+arch woodfloor2
+x 14
+y 2
+end
+arch wwall_2_2_3
+x 14
+y 2
+end
+arch dungeon_magic
+x 14
+y 3
+end
+arch woodfloor2
+x 14
+y 3
+end
+arch wwall_2_1_1
+x 14
+y 3
+end
+arch dungeon_magic
+x 14
+y 4
+end
+arch woodfloor2
+x 14
+y 4
+end
+arch wwall_win1
+x 14
+y 4
+end
+arch dungeon_magic
+x 14
+y 5
+end
+arch woodfloor2
+x 14
+y 5
+end
+arch wwall_2_1_1
+x 14
+y 5
+end
+arch dungeon_magic
+x 14
+y 6
+end
+arch woodfloor2
+x 14
+y 6
+end
+arch wwall_3_4
+x 14
+y 6
+end
+arch dungeon_magic
+x 14
y 7
end
+arch woodfloor2
+x 14
+y 7
+end
arch wwall_2_1_1
-x 13
+x 14
y 7
end
arch dungeon_magic
-x 13
+x 14
y 8
end
arch woodfloor2
-x 13
+x 14
y 8
end
arch wwall_2_1_1
-x 13
+x 14
y 8
end
arch dungeon_magic
-x 13
+x 14
y 9
end
arch woodfloor2
-x 13
+x 14
y 9
end
-arch wwall_3_4
-x 13
+arch wwall_2_1_1
+x 14
y 9
end
arch dungeon_magic
-x 13
+x 14
y 10
end
arch woodfloor2
-x 13
+x 14
y 10
end
-arch wwall_2_1_1
-x 13
+arch wwall_3_4
+x 14
y 10
end
arch dungeon_magic
-x 13
+x 14
y 11
end
arch woodfloor2
-x 13
+x 14
y 11
end
-arch wwall_win1
-x 13
+arch wwall_2_1_1
+x 14
y 11
end
arch dungeon_magic
-x 13
+x 14
y 12
end
arch woodfloor2
-x 13
+x 14
y 12
end
-arch wwall_2_1_1
-x 13
+arch wwall_win1
+x 14
y 12
end
arch dungeon_magic
-x 13
+x 14
y 13
end
arch woodfloor2
-x 13
+x 14
y 13
end
-arch wwall_2_2_4
-x 13
+arch wwall_2_1_1
+x 14
y 13
end
-arch flagstone
-x 13
+arch dungeon_magic
+x 14
y 14
end
+arch woodfloor2
+x 14
+y 14
+end
+arch wwall_2_2_4
+x 14
+y 14
+end
arch flagstone
x 14
+y 15
end
arch flagstone
x 14
+y 16
+end
+arch flagstone
+x 15
+end
+arch flagstone
+x 15
y 1
end
arch flagstone
-x 14
+x 15
y 2
end
arch flagstone
-x 14
+x 15
y 3
end
arch flagstone
-x 14
+x 15
y 4
end
arch flagstone
-x 14
+x 15
y 5
end
arch flagstone
-x 14
+x 15
y 6
end
arch flagstone
-x 14
+x 15
y 7
end
arch flagstone
-x 14
+x 15
y 8
end
arch flagstone
-x 14
+x 15
y 9
end
arch flagstone
-x 14
+x 15
y 10
end
arch flagstone
-x 14
+x 15
y 11
end
arch flagstone
-x 14
+x 15
y 12
end
arch flagstone
-x 14
+x 15
y 13
end
arch flagstone
-x 14
+x 15
y 14
end
+arch flagstone
+x 15
+y 15
+end
+arch flagstone
+x 15
+y 16
+end
+arch flagstone
+x 16
+end
+arch flagstone
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch flagstone
+x 16
+y 3
+end
+arch flagstone
+x 16
+y 4
+end
+arch flagstone
+x 16
+y 5
+end
+arch flagstone
+x 16
+y 6
+end
+arch flagstone
+x 16
+y 7
+end
+arch flagstone
+x 16
+y 8
+end
+arch flagstone
+x 16
+y 9
+end
+arch flagstone
+x 16
+y 10
+end
+arch flagstone
+x 16
+y 11
+end
+arch flagstone
+x 16
+y 12
+end
+arch flagstone
+x 16
+y 13
+end
+arch flagstone
+x 16
+y 14
+end
+arch flagstone
+x 16
+y 15
+end
+arch flagstone
+x 16
+y 16
+end
Modified: maps/trunk/world/world_107_123
===================================================================
--- maps/trunk/world/world_107_123 2020-11-29 06:49:16 UTC (rev 21570)
+++ maps/trunk/world/world_107_123 2020-11-29 07:58:27 UTC (rev 21571)
@@ -8,7 +8,7 @@
enter_x 1
enter_y 1
msg
-Modified: 2019-06-30 Rick Tanner
+Modified: 2020-11-29 Rick Tanner
endmsg
outdoor 1
tile_path_1 world_107_122
@@ -5707,7 +5707,7 @@
arch minihouse
name A Small Shop
slaying /brest/shops/a_small_shop
-hp 11
+hp 12
sp 12
x 21
y 29
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-29 06:49:22
|
Revision: 21570
http://sourceforge.net/p/crossfire/code/21570
Author: rjtanner
Date: 2020-11-29 06:49:16 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
Update Rainbow Islands (pup_land/rainbow/islands) map to have the same width and height as Pup Land world map for proper alignment and tiling in Mapper, no functional changes
Modified Paths:
--------------
maps/trunk/pup_land/rainbow/islands
Modified: maps/trunk/pup_land/rainbow/islands
===================================================================
--- maps/trunk/pup_land/rainbow/islands 2020-11-28 16:16:25 UTC (rev 21569)
+++ maps/trunk/pup_land/rainbow/islands 2020-11-29 06:49:16 UTC (rev 21570)
@@ -2,11 +2,11 @@
name Rainbow Islands
difficulty 1
region pupland
-width 38
-height 29
+width 45
+height 37
msg
Created: 1996-05-30
-Modified: 2020-10-01 SilverNexus
+Modified: 2020-11-29 Rick Tanner
endmsg
outdoor 1
tile_path_1 ../world
@@ -98,6 +98,30 @@
y 28
end
arch sea
+y 29
+end
+arch sea
+y 30
+end
+arch sea
+y 31
+end
+arch sea
+y 32
+end
+arch sea
+y 33
+end
+arch sea
+y 34
+end
+arch sea
+y 35
+end
+arch sea
+y 36
+end
+arch sea
x 1
end
arch sea
@@ -213,6 +237,38 @@
y 28
end
arch sea
+x 1
+y 29
+end
+arch sea
+x 1
+y 30
+end
+arch sea
+x 1
+y 31
+end
+arch sea
+x 1
+y 32
+end
+arch sea
+x 1
+y 33
+end
+arch sea
+x 1
+y 34
+end
+arch sea
+x 1
+y 35
+end
+arch sea
+x 1
+y 36
+end
+arch sea
x 2
end
arch sea
@@ -328,6 +384,38 @@
y 28
end
arch sea
+x 2
+y 29
+end
+arch sea
+x 2
+y 30
+end
+arch sea
+x 2
+y 31
+end
+arch sea
+x 2
+y 32
+end
+arch sea
+x 2
+y 33
+end
+arch sea
+x 2
+y 34
+end
+arch sea
+x 2
+y 35
+end
+arch sea
+x 2
+y 36
+end
+arch sea
x 3
end
arch sea
@@ -447,6 +535,38 @@
y 28
end
arch sea
+x 3
+y 29
+end
+arch sea
+x 3
+y 30
+end
+arch sea
+x 3
+y 31
+end
+arch sea
+x 3
+y 32
+end
+arch sea
+x 3
+y 33
+end
+arch sea
+x 3
+y 34
+end
+arch sea
+x 3
+y 35
+end
+arch sea
+x 3
+y 36
+end
+arch sea
x 4
end
arch sea
@@ -582,6 +702,38 @@
y 28
end
arch sea
+x 4
+y 29
+end
+arch sea
+x 4
+y 30
+end
+arch sea
+x 4
+y 31
+end
+arch sea
+x 4
+y 32
+end
+arch sea
+x 4
+y 33
+end
+arch sea
+x 4
+y 34
+end
+arch sea
+x 4
+y 35
+end
+arch sea
+x 4
+y 36
+end
+arch sea
x 5
speed_left -0.900000
end
@@ -708,6 +860,38 @@
y 28
end
arch sea
+x 5
+y 29
+end
+arch sea
+x 5
+y 30
+end
+arch sea
+x 5
+y 31
+end
+arch sea
+x 5
+y 32
+end
+arch sea
+x 5
+y 33
+end
+arch sea
+x 5
+y 34
+end
+arch sea
+x 5
+y 35
+end
+arch sea
+x 5
+y 36
+end
+arch sea
x 6
end
arch sea
@@ -827,6 +1011,38 @@
y 28
end
arch sea
+x 6
+y 29
+end
+arch sea
+x 6
+y 30
+end
+arch sea
+x 6
+y 31
+end
+arch sea
+x 6
+y 32
+end
+arch sea
+x 6
+y 33
+end
+arch sea
+x 6
+y 34
+end
+arch sea
+x 6
+y 35
+end
+arch sea
+x 6
+y 36
+end
+arch sea
x 7
end
arch sea
@@ -946,6 +1162,38 @@
y 28
end
arch sea
+x 7
+y 29
+end
+arch sea
+x 7
+y 30
+end
+arch sea
+x 7
+y 31
+end
+arch sea
+x 7
+y 32
+end
+arch sea
+x 7
+y 33
+end
+arch sea
+x 7
+y 34
+end
+arch sea
+x 7
+y 35
+end
+arch sea
+x 7
+y 36
+end
+arch sea
x 8
end
arch sea
@@ -1065,6 +1313,38 @@
y 28
end
arch sea
+x 8
+y 29
+end
+arch sea
+x 8
+y 30
+end
+arch sea
+x 8
+y 31
+end
+arch sea
+x 8
+y 32
+end
+arch sea
+x 8
+y 33
+end
+arch sea
+x 8
+y 34
+end
+arch sea
+x 8
+y 35
+end
+arch sea
+x 8
+y 36
+end
+arch sea
x 9
end
arch sea
@@ -1184,6 +1464,38 @@
y 28
end
arch sea
+x 9
+y 29
+end
+arch sea
+x 9
+y 30
+end
+arch sea
+x 9
+y 31
+end
+arch sea
+x 9
+y 32
+end
+arch sea
+x 9
+y 33
+end
+arch sea
+x 9
+y 34
+end
+arch sea
+x 9
+y 35
+end
+arch sea
+x 9
+y 36
+end
+arch sea
x 10
end
arch grass
@@ -1335,6 +1647,38 @@
y 28
end
arch sea
+x 10
+y 29
+end
+arch sea
+x 10
+y 30
+end
+arch sea
+x 10
+y 31
+end
+arch sea
+x 10
+y 32
+end
+arch sea
+x 10
+y 33
+end
+arch sea
+x 10
+y 34
+end
+arch sea
+x 10
+y 35
+end
+arch sea
+x 10
+y 36
+end
+arch sea
x 11
end
arch grass
@@ -1465,6 +1809,38 @@
x 11
y 28
end
+arch sea
+x 11
+y 29
+end
+arch sea
+x 11
+y 30
+end
+arch sea
+x 11
+y 31
+end
+arch sea
+x 11
+y 32
+end
+arch sea
+x 11
+y 33
+end
+arch sea
+x 11
+y 34
+end
+arch sea
+x 11
+y 35
+end
+arch sea
+x 11
+y 36
+end
arch dungeon_magic
x 12
end
@@ -1608,6 +1984,38 @@
y 28
end
arch sea
+x 12
+y 29
+end
+arch sea
+x 12
+y 30
+end
+arch sea
+x 12
+y 31
+end
+arch sea
+x 12
+y 32
+end
+arch sea
+x 12
+y 33
+end
+arch sea
+x 12
+y 34
+end
+arch sea
+x 12
+y 35
+end
+arch sea
+x 12
+y 36
+end
+arch sea
x 13
end
arch woods
@@ -1775,6 +2183,38 @@
y 28
end
arch sea
+x 13
+y 29
+end
+arch sea
+x 13
+y 30
+end
+arch sea
+x 13
+y 31
+end
+arch sea
+x 13
+y 32
+end
+arch sea
+x 13
+y 33
+end
+arch sea
+x 13
+y 34
+end
+arch sea
+x 13
+y 35
+end
+arch sea
+x 13
+y 36
+end
+arch sea
x 14
end
arch grass
@@ -1933,6 +2373,38 @@
x 14
y 28
end
+arch sea
+x 14
+y 29
+end
+arch sea
+x 14
+y 30
+end
+arch sea
+x 14
+y 31
+end
+arch sea
+x 14
+y 32
+end
+arch sea
+x 14
+y 33
+end
+arch sea
+x 14
+y 34
+end
+arch sea
+x 14
+y 35
+end
+arch sea
+x 14
+y 36
+end
arch grass
x 15
end
@@ -2088,6 +2560,38 @@
x 15
y 28
end
+arch sea
+x 15
+y 29
+end
+arch sea
+x 15
+y 30
+end
+arch sea
+x 15
+y 31
+end
+arch sea
+x 15
+y 32
+end
+arch sea
+x 15
+y 33
+end
+arch sea
+x 15
+y 34
+end
+arch sea
+x 15
+y 35
+end
+arch sea
+x 15
+y 36
+end
arch grass
x 16
end
@@ -2227,6 +2731,38 @@
x 16
y 28
end
+arch sea
+x 16
+y 29
+end
+arch sea
+x 16
+y 30
+end
+arch sea
+x 16
+y 31
+end
+arch sea
+x 16
+y 32
+end
+arch sea
+x 16
+y 33
+end
+arch sea
+x 16
+y 34
+end
+arch sea
+x 16
+y 35
+end
+arch sea
+x 16
+y 36
+end
arch grass
x 17
end
@@ -2375,6 +2911,38 @@
y 28
end
arch sea
+x 17
+y 29
+end
+arch sea
+x 17
+y 30
+end
+arch sea
+x 17
+y 31
+end
+arch sea
+x 17
+y 32
+end
+arch sea
+x 17
+y 33
+end
+arch sea
+x 17
+y 34
+end
+arch sea
+x 17
+y 35
+end
+arch sea
+x 17
+y 36
+end
+arch sea
x 18
end
arch sea
@@ -2505,6 +3073,38 @@
x 18
y 28
end
+arch sea
+x 18
+y 29
+end
+arch sea
+x 18
+y 30
+end
+arch sea
+x 18
+y 31
+end
+arch sea
+x 18
+y 32
+end
+arch sea
+x 18
+y 33
+end
+arch sea
+x 18
+y 34
+end
+arch sea
+x 18
+y 35
+end
+arch sea
+x 18
+y 36
+end
arch dungeon_magic
x 19
end
@@ -2663,6 +3263,38 @@
x 19
y 28
end
+arch sea
+x 19
+y 29
+end
+arch sea
+x 19
+y 30
+end
+arch sea
+x 19
+y 31
+end
+arch sea
+x 19
+y 32
+end
+arch sea
+x 19
+y 33
+end
+arch sea
+x 19
+y 34
+end
+arch sea
+x 19
+y 35
+end
+arch sea
+x 19
+y 36
+end
arch grass
x 20
end
@@ -2820,6 +3452,38 @@
x 20
y 28
end
+arch sea
+x 20
+y 29
+end
+arch sea
+x 20
+y 30
+end
+arch sea
+x 20
+y 31
+end
+arch sea
+x 20
+y 32
+end
+arch sea
+x 20
+y 33
+end
+arch sea
+x 20
+y 34
+end
+arch sea
+x 20
+y 35
+end
+arch sea
+x 20
+y 36
+end
arch grass
x 21
end
@@ -2981,6 +3645,38 @@
x 21
y 28
end
+arch sea
+x 21
+y 29
+end
+arch sea
+x 21
+y 30
+end
+arch sea
+x 21
+y 31
+end
+arch sea
+x 21
+y 32
+end
+arch sea
+x 21
+y 33
+end
+arch sea
+x 21
+y 34
+end
+arch sea
+x 21
+y 35
+end
+arch sea
+x 21
+y 36
+end
arch grass
x 22
end
@@ -3124,6 +3820,38 @@
x 22
y 28
end
+arch sea
+x 22
+y 29
+end
+arch sea
+x 22
+y 30
+end
+arch sea
+x 22
+y 31
+end
+arch sea
+x 22
+y 32
+end
+arch sea
+x 22
+y 33
+end
+arch sea
+x 22
+y 34
+end
+arch sea
+x 22
+y 35
+end
+arch sea
+x 22
+y 36
+end
arch grass
x 23
end
@@ -3271,6 +3999,38 @@
x 23
y 28
end
+arch sea
+x 23
+y 29
+end
+arch sea
+x 23
+y 30
+end
+arch sea
+x 23
+y 31
+end
+arch sea
+x 23
+y 32
+end
+arch sea
+x 23
+y 33
+end
+arch sea
+x 23
+y 34
+end
+arch sea
+x 23
+y 35
+end
+arch sea
+x 23
+y 36
+end
arch grass
x 24
end
@@ -3410,6 +4170,38 @@
x 24
y 28
end
+arch sea
+x 24
+y 29
+end
+arch sea
+x 24
+y 30
+end
+arch sea
+x 24
+y 31
+end
+arch sea
+x 24
+y 32
+end
+arch sea
+x 24
+y 33
+end
+arch sea
+x 24
+y 34
+end
+arch sea
+x 24
+y 35
+end
+arch sea
+x 24
+y 36
+end
arch dungeon_magic
x 25
end
@@ -3544,6 +4336,38 @@
x 25
y 28
end
+arch sea
+x 25
+y 29
+end
+arch sea
+x 25
+y 30
+end
+arch sea
+x 25
+y 31
+end
+arch sea
+x 25
+y 32
+end
+arch sea
+x 25
+y 33
+end
+arch sea
+x 25
+y 34
+end
+arch sea
+x 25
+y 35
+end
+arch sea
+x 25
+y 36
+end
arch dungeon_magic
x 26
end
@@ -3702,6 +4526,38 @@
x 26
y 28
end
+arch sea
+x 26
+y 29
+end
+arch sea
+x 26
+y 30
+end
+arch sea
+x 26
+y 31
+end
+arch sea
+x 26
+y 32
+end
+arch sea
+x 26
+y 33
+end
+arch sea
+x 26
+y 34
+end
+arch sea
+x 26
+y 35
+end
+arch sea
+x 26
+y 36
+end
arch dungeon_magic
x 27
end
@@ -3933,6 +4789,38 @@
x 27
y 28
end
+arch sea
+x 27
+y 29
+end
+arch sea
+x 27
+y 30
+end
+arch sea
+x 27
+y 31
+end
+arch sea
+x 27
+y 32
+end
+arch sea
+x 27
+y 33
+end
+arch sea
+x 27
+y 34
+end
+arch sea
+x 27
+y 35
+end
+arch sea
+x 27
+y 36
+end
arch grass
x 28
end
@@ -4097,6 +4985,38 @@
x 28
y 28
end
+arch sea
+x 28
+y 29
+end
+arch sea
+x 28
+y 30
+end
+arch sea
+x 28
+y 31
+end
+arch sea
+x 28
+y 32
+end
+arch sea
+x 28
+y 33
+end
+arch sea
+x 28
+y 34
+end
+arch sea
+x 28
+y 35
+end
+arch sea
+x 28
+y 36
+end
arch grass
x 29
end
@@ -4237,6 +5157,38 @@
x 29
y 28
end
+arch sea
+x 29
+y 29
+end
+arch sea
+x 29
+y 30
+end
+arch sea
+x 29
+y 31
+end
+arch sea
+x 29
+y 32
+end
+arch sea
+x 29
+y 33
+end
+arch sea
+x 29
+y 34
+end
+arch sea
+x 29
+y 35
+end
+arch sea
+x 29
+y 36
+end
arch cobblestones
x 30
end
@@ -4372,6 +5324,38 @@
x 30
y 28
end
+arch sea
+x 30
+y 29
+end
+arch sea
+x 30
+y 30
+end
+arch sea
+x 30
+y 31
+end
+arch sea
+x 30
+y 32
+end
+arch sea
+x 30
+y 33
+end
+arch sea
+x 30
+y 34
+end
+arch sea
+x 30
+y 35
+end
+arch sea
+x 30
+y 36
+end
arch grass
x 31
end
@@ -4497,6 +5481,38 @@
x 31
y 28
end
+arch sea
+x 31
+y 29
+end
+arch sea
+x 31
+y 30
+end
+arch sea
+x 31
+y 31
+end
+arch sea
+x 31
+y 32
+end
+arch sea
+x 31
+y 33
+end
+arch sea
+x 31
+y 34
+end
+arch sea
+x 31
+y 35
+end
+arch sea
+x 31
+y 36
+end
arch grass
x 32
end
@@ -4616,6 +5632,38 @@
x 32
y 28
end
+arch sea
+x 32
+y 29
+end
+arch sea
+x 32
+y 30
+end
+arch sea
+x 32
+y 31
+end
+arch sea
+x 32
+y 32
+end
+arch sea
+x 32
+y 33
+end
+arch sea
+x 32
+y 34
+end
+arch sea
+x 32
+y 35
+end
+arch sea
+x 32
+y 36
+end
arch grass
x 33
end
@@ -4735,6 +5783,38 @@
x 33
y 28
end
+arch sea
+x 33
+y 29
+end
+arch sea
+x 33
+y 30
+end
+arch sea
+x 33
+y 31
+end
+arch sea
+x 33
+y 32
+end
+arch sea
+x 33
+y 33
+end
+arch sea
+x 33
+y 34
+end
+arch sea
+x 33
+y 35
+end
+arch sea
+x 33
+y 36
+end
arch brush
x 34
end
@@ -4854,6 +5934,38 @@
x 34
y 28
end
+arch sea
+x 34
+y 29
+end
+arch sea
+x 34
+y 30
+end
+arch sea
+x 34
+y 31
+end
+arch sea
+x 34
+y 32
+end
+arch sea
+x 34
+y 33
+end
+arch sea
+x 34
+y 34
+end
+arch sea
+x 34
+y 35
+end
+arch sea
+x 34
+y 36
+end
arch grass
x 35
end
@@ -4977,6 +6089,38 @@
x 35
y 28
end
+arch sea
+x 35
+y 29
+end
+arch sea
+x 35
+y 30
+end
+arch sea
+x 35
+y 31
+end
+arch sea
+x 35
+y 32
+end
+arch sea
+x 35
+y 33
+end
+arch sea
+x 35
+y 34
+end
+arch sea
+x 35
+y 35
+end
+arch sea
+x 35
+y 36
+end
arch brush
x 36
end
@@ -5096,6 +6240,38 @@
x 36
y 28
end
+arch sea
+x 36
+y 29
+end
+arch sea
+x 36
+y 30
+end
+arch sea
+x 36
+y 31
+end
+arch sea
+x 36
+y 32
+end
+arch sea
+x 36
+y 33
+end
+arch sea
+x 36
+y 34
+end
+arch sea
+x 36
+y 35
+end
+arch sea
+x 36
+y 36
+end
arch grass
x 37
end
@@ -5215,3 +6391,1064 @@
x 37
y 28
end
+arch sea
+x 37
+y 29
+end
+arch sea
+x 37
+y 30
+end
+arch sea
+x 37
+y 31
+end
+arch sea
+x 37
+y 32
+end
+arch sea
+x 37
+y 33
+end
+arch sea
+x 37
+y 34
+end
+arch sea
+x 37
+y 35
+end
+arch sea
+x 37
+y 36
+end
+arch blocked
+x 38
+end
+arch blocked
+x 38
+y 1
+end
+arch blocked
+x 38
+y 2
+end
+arch blocked
+x 38
+y 3
+end
+arch blocked
+x 38
+y 4
+end
+arch blocked
+x 38
+y 5
+end
+arch blocked
+x 38
+y 6
+end
+arch blocked
+x 38
+y 7
+end
+arch blocked
+x 38
+y 8
+end
+arch blocked
+x 38
+y 9
+end
+arch blocked
+x 38
+y 10
+end
+arch blocked
+x 38
+y 11
+end
+arch blocked
+x 38
+y 12
+end
+arch blocked
+x 38
+y 13
+end
+arch blocked
+x 38
+y 14
+end
+arch blocked
+x 38
+y 15
+end
+arch blocked
+x 38
+y 16
+end
+arch blocked
+x 38
+y 17
+end
+arch blocked
+x 38
+y 18
+end
+arch blocked
+x 38
+y 19
+end
+arch blocked
+x 38
+y 20
+end
+arch blocked
+x 38
+y 21
+end
+arch blocked
+x 38
+y 22
+end
+arch blocked
+x 38
+y 23
+end
+arch blocked
+x 38
+y 24
+end
+arch blocked
+x 38
+y 25
+end
+arch blocked
+x 38
+y 26
+end
+arch blocked
+x 38
+y 27
+end
+arch blocked
+x 38
+y 28
+end
+arch blocked
+x 38
+y 29
+end
+arch blocked
+x 38
+y 30
+end
+arch blocked
+x 38
+y 31
+end
+arch blocked
+x 38
+y 32
+end
+arch blocked
+x 38
+y 33
+end
+arch blocked
+x 38
+y 34
+end
+arch blocked
+x 38
+y 35
+end
+arch blocked
+x 38
+y 36
+end
+arch blocked
+x 39
+end
+arch blocked
+x 39
+y 1
+end
+arch blocked
+x 39
+y 2
+end
+arch blocked
+x 39
+y 3
+end
+arch blocked
+x 39
+y 4
+end
+arch blocked
+x 39
+y 5
+end
+arch blocked
+x 39
+y 6
+end
+arch blocked
+x 39
+y 7
+end
+arch blocked
+x 39
+y 8
+end
+arch blocked
+x 39
+y 9
+end
+arch blocked
+x 39
+y 10
+end
+arch blocked
+x 39
+y 11
+end
+arch blocked
+x 39
+y 12
+end
+arch blocked
+x 39
+y 13
+end
+arch blocked
+x 39
+y 14
+end
+arch blocked
+x 39
+y 15
+end
+arch blocked
+x 39
+y 16
+end
+arch blocked
+x 39
+y 17
+end
+arch blocked
+x 39
+y 18
+end
+arch blocked
+x 39
+y 19
+end
+arch blocked
+x 39
+y 20
+end
+arch blocked
+x 39
+y 21
+end
+arch blocked
+x 39
+y 22
+end
+arch blocked
+x 39
+y 23
+end
+arch blocked
+x 39
+y 24
+end
+arch blocked
+x 39
+y 25
+end
+arch blocked
+x 39
+y 26
+end
+arch blocked
+x 39
+y 27
+end
+arch blocked
+x 39
+y 28
+end
+arch blocked
+x 39
+y 29
+end
+arch blocked
+x 39
+y 30
+end
+arch blocked
+x 39
+y 31
+end
+arch blocked
+x 39
+y 32
+end
+arch blocked
+x 39
+y 33
+end
+arch blocked
+x 39
+y 34
+end
+arch blocked
+x 39
+y 35
+end
+arch blocked
+x 39
+y 36
+end
+arch blocked
+x 40
+end
+arch blocked
+x 40
+y 1
+end
+arch blocked
+x 40
+y 2
+end
+arch blocked
+x 40
+y 3
+end
+arch blocked
+x 40
+y 4
+end
+arch blocked
+x 40
+y 5
+end
+arch blocked
+x 40
+y 6
+end
+arch blocked
+x 40
+y 7
+end
+arch blocked
+x 40
+y 8
+end
+arch blocked
+x 40
+y 9
+end
+arch blocked
+x 40
+y 10
+end
+arch blocked
+x 40
+y 11
+end
+arch blocked
+x 40
+y 12
+end
+arch blocked
+x 40
+y 13
+end
+arch blocked
+x 40
+y 14
+end
+arch blocked
+x 40
+y 15
+end
+arch blocked
+x 40
+y 16
+end
+arch blocked
+x 40
+y 17
+end
+arch blocked
+x 40
+y 18
+end
+arch blocked
+x 40
+y 19
+end
+arch blocked
+x 40
+y 20
+end
+arch blocked
+x 40
+y 21
+end
+arch blocked
+x 40
+y 22
+end
+arch blocked
+x 40
+y 23
+end
+arch blocked
+x 40
+y 24
+end
+arch blocked
+x 40
+y 25
+end
+arch blocked
+x 40
+y 26
+end
+arch blocked
+x 40
+y 27
+end
+arch blocked
+x 40
+y 28
+end
+arch blocked
+x 40
+y 29
+end
+arch blocked
+x 40
+y 30
+end
+arch blocked
+x 40
+y 31
+end
+arch blocked
+x 40
+y 32
+end
+arch blocked
+x 40
+y 33
+end
+arch blocked
+x 40
+y 34
+end
+arch blocked
+x 40
+y 35
+end
+arch blocked
+x 40
+y 36
+end
+arch blocked
+x 41
+end
+arch blocked
+x 41
+y 1
+end
+arch blocked
+x 41
+y 2
+end
+arch blocked
+x 41
+y 3
+end
+arch blocked
+x 41
+y 4
+end
+arch blocked
+x 41
+y 5
+end
+arch blocked
+x 41
+y 6
+end
+arch blocked
+x 41
+y 7
+end
+arch blocked
+x 41
+y 8
+end
+arch blocked
+x 41
+y 9
+end
+arch blocked
+x 41
+y 10
+end
+arch blocked
+x 41
+y 11
+end
+arch blocked
+x 41
+y 12
+end
+arch blocked
+x 41
+y 13
+end
+arch blocked
+x 41
+y 14
+end
+arch blocked
+x 41
+y 15
+end
+arch blocked
+x 41
+y 16
+end
+arch blocked
+x 41
+y 17
+end
+arch blocked
+x 41
+y 18
+end
+arch blocked
+x 41
+y 19
+end
+arch blocked
+x 41
+y 20
+end
+arch blocked
+x 41
+y 21
+end
+arch blocked
+x 41
+y 22
+end
+arch blocked
+x 41
+y 23
+end
+arch blocked
+x 41
+y 24
+end
+arch blocked
+x 41
+y 25
+end
+arch blocked
+x 41
+y 26
+end
+arch blocked
+x 41
+y 27
+end
+arch blocked
+x 41
+y 28
+end
+arch blocked
+x 41
+y 29
+end
+arch blocked
+x 41
+y 30
+end
+arch blocked
+x 41
+y 31
+end
+arch blocked
+x 41
+y 32
+end
+arch blocked
+x 41
+y 33
+end
+arch blocked
+x 41
+y 34
+end
+arch blocked
+x 41
+y 35
+end
+arch blocked
+x 41
+y 36
+end
+arch blocked
+x 42
+end
+arch blocked
+x 42
+y 1
+end
+arch blocked
+x 42
+y 2
+end
+arch blocked
+x 42
+y 3
+end
+arch blocked
+x 42
+y 4
+end
+arch blocked
+x 42
+y 5
+end
+arch blocked
+x 42
+y 6
+end
+arch blocked
+x 42
+y 7
+end
+arch blocked
+x 42
+y 8
+end
+arch blocked
+x 42
+y 9
+end
+arch blocked
+x 42
+y 10
+end
+arch blocked
+x 42
+y 11
+end
+arch blocked
+x 42
+y 12
+end
+arch blocked
+x 42
+y 13
+end
+arch blocked
+x 42
+y 14
+end
+arch blocked
+x 42
+y 15
+end
+arch blocked
+x 42
+y 16
+end
+arch blocked
+x 42
+y 17
+end
+arch blocked
+x 42
+y 18
+end
+arch blocked
+x 42
+y 19
+end
+arch blocked
+x 42
+y 20
+end
+arch blocked
+x 42
+y 21
+end
+arch blocked
+x 42
+y 22
+end
+arch blocked
+x 42
+y 23
+end
+arch blocked
+x 42
+y 24
+end
+arch blocked
+x 42
+y 25
+end
+arch blocked
+x 42
+y 26
+end
+arch blocked
+x 42
+y 27
+end
+arch blocked
+x 42
+y 28
+end
+arch blocked
+x 42
+y 29
+end
+arch blocked
+x 42
+y 30
+end
+arch blocked
+x 42
+y 31
+end
+arch blocked
+x 42
+y 32
+end
+arch blocked
+x 42
+y 33
+end
+arch blocked
+x 42
+y 34
+end
+arch blocked
+x 42
+y 35
+end
+arch blocked
+x 42
+y 36
+end
+arch blocked
+x 43
+end
+arch blocked
+x 43
+y 1
+end
+arch blocked
+x 43
+y 2
+end
+arch blocked
+x 43
+y 3
+end
+arch blocked
+x 43
+y 4
+end
+arch blocked
+x 43
+y 5
+end
+arch blocked
+x 43
+y 6
+end
+arch blocked
+x 43
+y 7
+end
+arch blocked
+x 43
+y 8
+end
+arch blocked
+x 43
+y 9
+end
+arch blocked
+x 43
+y 10
+end
+arch blocked
+x 43
+y 11
+end
+arch blocked
+x 43
+y 12
+end
+arch blocked
+x 43
+y 13
+end
+arch blocked
+x 43
+y 14
+end
+arch blocked
+x 43
+y 15
+end
+arch blocked
+x 43
+y 16
+end
+arch blocked
+x 43
+y 17
+end
+arch blocked
+x 43
+y 18
+end
+arch blocked
+x 43
+y 19
+end
+arch blocked
+x 43
+y 20
+end
+arch blocked
+x 43
+y 21
+end
+arch blocked
+x 43
+y 22
+end
+arch blocked
+x 43
+y 23
+end
+arch blocked
+x 43
+y 24
+end
+arch blocked
+x 43
+y 25
+end
+arch blocked
+x 43
+y 26
+end
+arch blocked
+x 43
+y 27
+end
+arch blocked
+x 43
+y 28
+end
+arch blocked
+x 43
+y 29
+end
+arch blocked
+x 43
+y 30
+end
+arch blocked
+x 43
+y 31
+end
+arch blocked
+x 43
+y 32
+end
+arch blocked
+x 43
+y 33
+end
+arch blocked
+x 43
+y 34
+end
+arch blocked
+x 43
+y 35
+end
+arch blocked
+x 43
+y 36
+end
+arch blocked
+x 44
+end
+arch blocked
+x 44
+y 1
+end
+arch blocked
+x 44
+y 2
+end
+arch blocked
+x 44
+y 3
+end
+arch blocked
+x 44
+y 4
+end
+arch blocked
+x 44
+y 5
+end
+arch blocked
+x 44
+y 6
+end
+arch blocked
+x 44
+y 7
+end
+arch blocked
+x 44
+y 8
+end
+arch blocked
+x 44
+y 9
+end
+arch blocked
+x 44
+y 10
+end
+arch blocked
+x 44
+y 11
+end
+arch blocked
+x 44
+y 12
+end
+arch blocked
+x 44
+y 13
+end
+arch blocked
+x 44
+y 14
+end
+arch blocked
+x 44
+y 15
+end
+arch blocked
+x 44
+y 16
+end
+arch blocked
+x 44
+y 17
+end
+arch blocked
+x 44
+y 18
+end
+arch blocked
+x 44
+y 19
+end
+arch blocked
+x 44
+y 20
+end
+arch blocked
+x 44
+y 21
+end
+arch blocked
+x 44
+y 22
+end
+arch blocked
+x 44
+y 23
+end
+arch blocked
+x 44
+y 24
+end
+arch blocked
+x 44
+y 25
+end
+arch blocked
+x 44
+y 26
+end
+arch blocked
+x 44
+y 27
+end
+arch blocked
+x 44
+y 28
+end
+arch blocked
+x 44
+y 29
+end
+arch blocked
+x 44
+y 30
+end
+arch blocked
+x 44
+y 31
+end
+arch blocked
+x 44
+y 32
+end
+arch blocked
+x 44
+y 33
+end
+arch blocked
+x 44
+y 34
+end
+arch blocked
+x 44
+y 35
+end
+arch blocked
+x 44
+y 36
+end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-28 16:16:28
|
Revision: 21569
http://sourceforge.net/p/crossfire/code/21569
Author: silvernexus
Date: 2020-11-28 16:16:25 +0000 (Sat, 28 Nov 2020)
Log Message:
-----------
Make spell flavor text not appear on unidentified items. Also fix lack of book name when examining an unidentified spellbook.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/server/c_object.c
server/trunk/types/spellbook/spellbook.c
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2020-11-27 15:39:44 UTC (rev 21568)
+++ server/trunk/ChangeLog 2020-11-28 16:16:25 UTC (rev 21569)
@@ -1,3 +1,9 @@
+2020-11-28 Daniel Hawkins
+ * types/spellbook/spellbook.c: Make sure an unidentified spellbook at least tells you
+ what you can already see in the viewport, rather than "That is: " without a name.
+ * server/c_object.c: Prevent the flavor text for magic to appear when the item is not
+ yet identified.
+
2020-11-27 Daniel Hawkins
* server/skills.c: Make trapped doors detonate traps when lockpicked on the first attempt.
Modified: server/trunk/server/c_object.c
===================================================================
--- server/trunk/server/c_object.c 2020-11-27 15:39:44 UTC (rev 21568)
+++ server/trunk/server/c_object.c 2020-11-28 16:16:25 UTC (rev 21569)
@@ -1574,7 +1574,8 @@
"Unfortunately the scroll is damaged and unreadable.");
break;
}
- if (skill->clone.msg) {
+ // Only print the flavor text once we have identified.
+ if (is_identified(tmp) && skill->clone.msg) {
StringBuffer *sb = stringbuffer_new();
stringbuffer_append_string(sb, skill->clone.msg);
stringbuffer_trim_whitespace(sb);
@@ -1592,7 +1593,8 @@
case WAND:
case ROD:
case POTION:
- if (tmp->inv && tmp->inv->msg) {
+ // Only print the flavor text once we have identified.
+ if (is_identified(tmp) && tmp->inv && tmp->inv->msg) {
// If the embedded spell has a msg, display it here so that the
// player knows what it does before they actually read/use the item.
// Strip trailing newlines so that the output of examine() is
@@ -1644,24 +1646,22 @@
}
/* Where to wear this item */
for (i = 0; i < NUM_BODY_LOCATIONS; i++) {
- if (tmp->body_info[i] < -1) {
- if (op->body_info[i])
- draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
- "It goes %s (%d)",
+ if (tmp->body_info[i]) {
+ if (op->body_info[i]) {
+ if (tmp->body_info[i] < -1) {
+ draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
+ "%s %s (%d)", tmp->nrof > 1 ? "They go" : "It goes",
body_locations[i].use_name, -tmp->body_info[i]);
- else
- draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
- "It goes %s",
- body_locations[i].nonuse_name);
- } else if (tmp->body_info[i]) {
- if (op->body_info[i])
- draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
- "It goes %s",
+ } else {
+ draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
+ "%s %s", tmp->nrof > 1 ? "They go" : "It goes",
body_locations[i].use_name);
- else
+ }
+ } else {
draw_ext_info_format(NDI_UNIQUE, 0, op, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_EXAMINE,
- "It goes %s",
+ "%s %s", tmp->nrof > 1 ? "They go" : "It goes",
body_locations[i].nonuse_name);
+ }
}
}
Modified: server/trunk/types/spellbook/spellbook.c
===================================================================
--- server/trunk/types/spellbook/spellbook.c 2020-11-27 15:39:44 UTC (rev 21568)
+++ server/trunk/types/spellbook/spellbook.c 2020-11-28 16:16:25 UTC (rev 21569)
@@ -150,7 +150,16 @@
static void spellbook_type_describe(
const ob_methods *context, const object *book, const object *observer,
const int use_media_tags, char *buf, size_t size) {
- if (!is_identified(book)) return;
+ if (!is_identified(book)) {
+ /* Without querying the name, spellbooks end up examining
+ * as "That is:", with no name at all
+ * This should tell the player just as little as the inventory view.
+ *
+ * SilverNexus 2020-11-28
+ */
+ query_name(book, buf, size-1);
+ return;
+ }
size_t len;
/* TODO check if this generates the "of foo" so we don't end up with
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-27 15:39:47
|
Revision: 21568
http://sourceforge.net/p/crossfire/code/21568
Author: silvernexus
Date: 2020-11-27 15:39:44 +0000 (Fri, 27 Nov 2020)
Log Message:
-----------
Make doors denotate traps and runes when successfully lockpicked on the first attempt.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/server/skills.c
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2020-11-25 21:02:53 UTC (rev 21567)
+++ server/trunk/ChangeLog 2020-11-27 15:39:44 UTC (rev 21568)
@@ -1,3 +1,6 @@
+2020-11-27 Daniel Hawkins
+ * server/skills.c: Make trapped doors detonate traps when lockpicked on the first attempt.
+
2020-11-23 Nicolas Weeger
* common/anim.c: change function prototype.
* server/attack.c: use a default "attack" anim_suffix for attacks. Apply
Modified: server/trunk/server/skills.c
===================================================================
--- server/trunk/server/skills.c 2020-11-25 21:02:53 UTC (rev 21567)
+++ server/trunk/server/skills.c 2020-11-27 15:39:44 UTC (rev 21568)
@@ -359,11 +359,13 @@
* the map level difficulty.
*/
number = (die_roll(2, 40, pl, PREFER_LOW)-2)/2;
+ // Spring traps even if the lock is picked.
+ if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) { /* set off any traps? */
+ spring_trap(door->inv, pl);
+ }
if (number < pl->stats.Dex + skill->level*2 - difficulty ) {
remove_door(door);
success = difficulty;
- } else if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) { /* set off any traps? */
- spring_trap(door->inv, pl);
}
return success;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-25 21:02:54
|
Revision: 21567
http://sourceforge.net/p/crossfire/code/21567
Author: partmedia
Date: 2020-11-25 21:02:53 +0000 (Wed, 25 Nov 2020)
Log Message:
-----------
Fix copy/paste error
Modified Paths:
--------------
client/trunk/gtk-v2/src/map.c
Modified: client/trunk/gtk-v2/src/map.c
===================================================================
--- client/trunk/gtk-v2/src/map.c 2020-11-25 20:43:22 UTC (rev 21566)
+++ client/trunk/gtk-v2/src/map.c 2020-11-25 21:02:53 UTC (rev 21567)
@@ -277,7 +277,7 @@
}
if (weightC > 0) {
- draw_smooth_pixmap(cr, pixmaps[smoothface], weightC, 0, picx, picy);
+ draw_smooth_pixmap(cr, pixmaps[smoothface], weightC, 1, picx, picy);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-25 20:43:23
|
Revision: 21566
http://sourceforge.net/p/crossfire/code/21566
Author: partmedia
Date: 2020-11-25 20:43:22 +0000 (Wed, 25 Nov 2020)
Log Message:
-----------
Fix Pixmap renderer smoothing
Modified Paths:
--------------
client/trunk/gtk-v2/src/map.c
Modified: client/trunk/gtk-v2/src/map.c
===================================================================
--- client/trunk/gtk-v2/src/map.c 2020-11-25 17:42:21 UTC (rev 21565)
+++ client/trunk/gtk-v2/src/map.c 2020-11-25 20:43:22 UTC (rev 21566)
@@ -136,11 +136,23 @@
* @param ay Map cell on-screen y-coordinate
*/
static void draw_pixmap(cairo_t *cr, PixmapInfo *pixmap, int ax, int ay) {
- cairo_set_source_surface(cr, pixmap->map_image,
- ax * map_image_size, ay * map_image_size);
+ const int dest_x = ax * map_image_size;
+ const int dest_y = ay * map_image_size;
+ cairo_set_source_surface(cr, pixmap->map_image, dest_x, dest_y);
cairo_paint(cr);
}
+static void draw_smooth_pixmap(cairo_t* cr, PixmapInfo* pixmap,
+ const int sx, const int sy, const int dx, const int dy) {
+ const int src_x = map_image_size * sx;
+ const int src_y = map_image_size * sy;
+ const int dest_x = map_image_size * dx;
+ const int dest_y = map_image_size * dy;
+ cairo_set_source_surface(cr, pixmap->map_image, dest_x - src_x, dest_y - src_y);
+ cairo_rectangle(cr, dest_x, dest_y, map_image_size, map_image_size);
+ cairo_fill(cr);
+}
+
int display_mapscroll(int dx, int dy) {
#ifdef HAVE_SDL
if (use_config[CONFIG_DISPLAYMODE] == CFG_DM_SDL) {
@@ -260,29 +272,12 @@
continue; /*don't have the picture associated*/
}
- // @todo Fix smoothing here.
if (weight > 0) {
- draw_pixmap(cr, pixmaps[smoothface], picx, picy);
-
- /*
- draw_pixmap(
- weight*map_image_size, 0,
- picx, picy,
- picx-weight*map_image_size, picy,
- pixmaps[smoothface]->map_mask, pixmaps[smoothface]->map_image, map_image_size, map_image_size);
- */
+ draw_smooth_pixmap(cr, pixmaps[smoothface], weight, 0, picx, picy);
}
if (weightC > 0) {
- draw_pixmap(cr, pixmaps[smoothface], picx, picy);
-
- /*
- draw_pixmap(
- weightC*map_image_size, map_image_size,
- picx, picy,
- picx-weightC*map_image_size, picy+map_image_size,
- pixmaps[smoothface]->map_mask, pixmaps[smoothface]->map_image, map_image_size, map_image_size);
- */
+ draw_smooth_pixmap(cr, pixmaps[smoothface], weightC, 0, picx, picy);
}
}
}
@@ -290,31 +285,27 @@
/**
* Draw a single map layer to the given cairo context.
*/
-static void map_draw_layer(cairo_t *cr, int layer) {
+static void map_draw_layer(cairo_t *cr, int layer, int pass) {
for (int x = 0; x < use_config[CONFIG_MAPWIDTH]; x++) {
for (int y = 0; y < use_config[CONFIG_MAPHEIGHT]; y++) {
// Translate on-screen coordinates to virtual map coordinates.
int mx = pl_pos.x + x, my = pl_pos.y + y;
- // Skip current cell if not visible and not using fog of war.
- if (!use_config[CONFIG_FOGWAR] && mapdata_cell(mx, my)->cleared) {
- continue;
- }
+ if (pass == 0) {
+ // Skip current cell if not visible and not using fog of war.
+ if (!use_config[CONFIG_FOGWAR] && mapdata_cell(mx, my)->cleared) {
+ continue;
+ }
- int dx, dy, face = mapdata_face_info(mx, my, layer, &dx, &dy);
- if (face > 0 && pixmaps[face]->map_image != NULL) {
- draw_pixmap(cr, pixmaps[face], x + dx, y + dy);
+ int dx, dy, face = mapdata_face_info(mx, my, layer, &dx, &dy);
+ if (face > 0 && pixmaps[face]->map_image != NULL) {
+ draw_pixmap(cr, pixmaps[face], x + dx, y + dy);
+ }
+ } else if (pass == 1) {
+ if (use_config[CONFIG_SMOOTH]) {
+ drawsmooth(cr, mx, my, layer, x, y);
+ }
}
- /*
- * Sometimes, it may happens we need to draw the smooth while there
- * is nothing to draw at that layer (but there was something at
- * lower layers). This is handled here. The else part is to take
- * into account cases where the smooth as already been handled 2
- * code lines before
- */
- if (use_config[CONFIG_SMOOTH]) {
- drawsmooth(cr, mx, my, layer, x * map_image_size, y * map_image_size);
- }
}
}
}
@@ -360,7 +351,8 @@
cairo_fill(cr);
for (int layer = 0; layer < MAXLAYERS; layer++) {
- map_draw_layer(cr, layer);
+ map_draw_layer(cr, layer, 0);
+ map_draw_layer(cr, layer, 1);
}
for (int x = 0; x < use_config[CONFIG_MAPWIDTH]; x++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-25 17:42:23
|
Revision: 21565
http://sourceforge.net/p/crossfire/code/21565
Author: partmedia
Date: 2020-11-25 17:42:21 +0000 (Wed, 25 Nov 2020)
Log Message:
-----------
Don't crash on NULL
Modified Paths:
--------------
client/trunk/gtk-v2/src/config.c
Modified: client/trunk/gtk-v2/src/config.c
===================================================================
--- client/trunk/gtk-v2/src/config.c 2020-11-24 22:07:54 UTC (rev 21564)
+++ client/trunk/gtk-v2/src/config.c 2020-11-25 17:42:21 UTC (rev 21565)
@@ -83,7 +83,7 @@
*/
tmp = gtk_rc_get_default_files();
i = 0;
- while (tmp[i]) {
+ while (tmp && tmp[i]) {
i++;
}
/*
@@ -101,7 +101,7 @@
* ${HOME}/.gtkrc.en, etc.
*/
i = 0;
- while (tmp[i]) {
+ while (tmp && tmp[i]) {
default_files[i] = g_strdup(tmp[i]);
i++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-24 22:08:02
|
Revision: 21564
http://sourceforge.net/p/crossfire/code/21564
Author: partmedia
Date: 2020-11-24 22:07:54 +0000 (Tue, 24 Nov 2020)
Log Message:
-----------
Adjust standard theme background colors
The colors are more muted, somewhat lighter, to give better contrast on
the default light colored background.
Submitted by: DraugTheWhopper (patch #372)
Modified Paths:
--------------
client/trunk/gtk-v2/themes/Standard
Modified: client/trunk/gtk-v2/themes/Standard
===================================================================
--- client/trunk/gtk-v2/themes/Standard 2020-11-24 22:07:50 UTC (rev 21563)
+++ client/trunk/gtk-v2/themes/Standard 2020-11-24 22:07:54 UTC (rev 21564)
@@ -154,13 +154,15 @@
style "inv_cursed"
{
- base[NORMAL] = "red"
+ # "tomato" is a more muted color than "red", better contrast --DTW
+ base[NORMAL] = "tomato"
}
widget_class "inv_cursed" style "inv_cursed"
style "inv_magical"
{
- base[NORMAL] = "blue"
+ # "skyblue" is more muted than "blue", *far* better contrast --DTW
+ base[NORMAL] = "skyblue"
}
widget_class "inv_magical" style "inv_magical"
@@ -167,7 +169,9 @@
# You owe gold for these
style "inv_unpaid"
{
- text[NORMAL] = "gold"
+ # Not only is "wheat" more muted than "gold",
+ # but I changed it to color the background, not the text. --DTW
+ base[NORMAL] = "wheat"
}
widget_class "inv_unpaid" style "inv_unpaid"
@@ -191,7 +195,8 @@
#
style "spell_denied"
{
- base[NORMAL] = "red"
+ # "tomato" is more muted than "red", better contrast --DTW
+ base[NORMAL] = "tomato"
}
widget_class "spell_denied" style "spell_denied"
@@ -203,7 +208,8 @@
style "spell_attuned"
{
- base[NORMAL] = "green"
+ # "lightgreen" is more muted than "green", better contrast --DTW
+ base[NORMAL] = "lightgreen"
}
widget_class "spell_attuned" style "spell_attuned"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-24 22:07:51
|
Revision: 21563
http://sourceforge.net/p/crossfire/code/21563
Author: partmedia
Date: 2020-11-24 22:07:50 +0000 (Tue, 24 Nov 2020)
Log Message:
-----------
Report relative coordinates for 'request map pos'
Modified Paths:
--------------
client/trunk/common/mapdata.c
client/trunk/common/mapdata.h
client/trunk/common/script.c
Modified: client/trunk/common/mapdata.c
===================================================================
--- client/trunk/common/mapdata.c 2020-11-23 14:18:12 UTC (rev 21562)
+++ client/trunk/common/mapdata.c 2020-11-24 22:07:50 UTC (rev 21563)
@@ -25,6 +25,12 @@
#include "mapdata.h"
/**
+ * Position of a player on the map, relative to the coordinates received
+ * after a 'newmap' command. These are kept to for reporting to client scripts.
+ */
+PlayerPosition script_pos;
+
+/**
* Size of virtual map.
*/
#define FOG_MAP_SIZE 512
@@ -914,6 +920,8 @@
void mapdata_scroll(int dx, int dy)
{
+ script_pos.x += dx;
+ script_pos.y += dy;
int x, y;
recenter_virtual_map_view(dx, dy);
@@ -987,6 +995,8 @@
void mapdata_newmap(void)
{
+ script_pos.x = 0;
+ script_pos.y = 0;
int x, y;
/* Clear the_map.cells[]. */
Modified: client/trunk/common/mapdata.h
===================================================================
--- client/trunk/common/mapdata.h 2020-11-23 14:18:12 UTC (rev 21562)
+++ client/trunk/common/mapdata.h 2020-11-24 22:07:50 UTC (rev 21563)
@@ -151,4 +151,6 @@
gint16 mapdata_bigface_head(int x, int y, int layer, int *ww, int *hh);
void mapdata_animation(void);
+extern PlayerPosition script_pos;
+
#endif
Modified: client/trunk/common/script.c
===================================================================
--- client/trunk/common/script.c 2020-11-23 14:18:12 UTC (rev 21562)
+++ client/trunk/common/script.c 2020-11-24 22:07:50 UTC (rev 21563)
@@ -1369,7 +1369,8 @@
if (strncmp(c, "pos", 3) == 0) {
char buf[1024];
- snprintf(buf, sizeof(buf), "request map pos %d %d\n", pl_pos.x+use_config[CONFIG_MAPWIDTH]/2, pl_pos.y+use_config[CONFIG_MAPHEIGHT]/2);
+ snprintf(buf, sizeof(buf), "request map pos %d %d\n",
+ script_pos.x, script_pos.y);
write(scripts[i].out_fd, buf, strlen(buf));
} else if (strncmp(c, "near", 4) == 0) {
for (y = 0; y < 3; ++y)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-23 14:18:15
|
Revision: 21562
http://sourceforge.net/p/crossfire/code/21562
Author: ryo_saeba
Date: 2020-11-23 14:18:12 +0000 (Mon, 23 Nov 2020)
Log Message:
-----------
Allow anim_suffix for monsters when attacking, add a default 'attack' animation.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/server/attack.c
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2020-11-23 14:12:29 UTC (rev 21561)
+++ server/trunk/ChangeLog 2020-11-23 14:18:12 UTC (rev 21562)
@@ -1,5 +1,7 @@
2020-11-23 Nicolas Weeger
* common/anim.c: change function prototype.
+ * server/attack.c: use a default "attack" anim_suffix for attacks. Apply
+ anim_suffix to monsters too.
2020-11-11 Daniel Hawkins and Kevin Zheng
* socket/request.c,
Modified: server/trunk/server/attack.c
===================================================================
--- server/trunk/server/attack.c 2020-11-23 14:12:29 UTC (rev 21561)
+++ server/trunk/server/attack.c 2020-11-23 14:18:12 UTC (rev 21562)
@@ -752,6 +752,7 @@
int simple_attack, roll, dam;
uint32_t type;
tag_t op_tag, hitter_tag;
+ const char *anim_suffix = NULL;
if (get_attack_mode(&op, &hitter, &simple_attack))
return 1;
@@ -765,12 +766,21 @@
if (execute_event(hitter->current_weapon, EVENT_ATTACKS,
hitter, op, NULL, SCRIPT_FIX_ALL) != 0)
return 0;
- if (hitter->current_weapon->anim_suffix)
- apply_anim_suffix(hitter, hitter->current_weapon->anim_suffix);
- } else if (hitter->chosen_skill && hitter->chosen_skill->anim_suffix)
- /* if no weapon, then skill (karate, wraith feed) attack */
- apply_anim_suffix(hitter, hitter->chosen_skill->anim_suffix);
+ }
}
+
+ if (hitter->current_weapon) {
+ anim_suffix = hitter->current_weapon->anim_suffix;
+ } else if (hitter->chosen_skill) {
+ anim_suffix = hitter->chosen_skill->anim_suffix;
+ }
+
+ if (!anim_suffix) {
+ anim_suffix = "attack";
+ }
+ apply_anim_suffix(hitter, anim_suffix);
+
+
op_tag = op->count;
hitter_tag = hitter->count;
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-23 14:12:31
|
Revision: 21561
http://sourceforge.net/p/crossfire/code/21561
Author: ryo_saeba
Date: 2020-11-23 14:12:29 +0000 (Mon, 23 Nov 2020)
Log Message:
-----------
Change function prototype.
Modified Paths:
--------------
server/trunk/ChangeLog
server/trunk/common/anim.c
server/trunk/include/libproto.h
Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog 2020-11-23 00:37:39 UTC (rev 21560)
+++ server/trunk/ChangeLog 2020-11-23 14:12:29 UTC (rev 21561)
@@ -1,3 +1,6 @@
+2020-11-23 Nicolas Weeger
+ * common/anim.c: change function prototype.
+
2020-11-11 Daniel Hawkins and Kevin Zheng
* socket/request.c,
server/player.c: Make the handling to prevent createplayer command abuse
Modified: server/trunk/common/anim.c
===================================================================
--- server/trunk/common/anim.c 2020-11-23 00:37:39 UTC (rev 21560)
+++ server/trunk/common/anim.c 2020-11-23 14:12:29 UTC (rev 21561)
@@ -315,7 +315,7 @@
* @param suffix
* animation suffix to apply. Must not be NULL.
*/
-void apply_anim_suffix(object *who, sstring suffix) {
+void apply_anim_suffix(object *who, const char *suffix) {
const Animations *anim;
object *head, *orig;
char buf[MAX_BUF];
Modified: server/trunk/include/libproto.h
===================================================================
--- server/trunk/include/libproto.h 2020-11-23 00:37:39 UTC (rev 21560)
+++ server/trunk/include/libproto.h 2020-11-23 14:12:29 UTC (rev 21561)
@@ -4,7 +4,7 @@
extern const Animations *find_animation(const char *name);
extern const Animations *try_find_animation(const char *name);
extern void animate_object(object *op, int dir);
-extern void apply_anim_suffix(object *who, sstring suffix);
+extern void apply_anim_suffix(object *who, const char *suffix);
extern void dump_animations(void);
/* arch.c */
extern archetype *find_archetype_by_object_name(const char *name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-23 00:37:43
|
Revision: 21560
http://sourceforge.net/p/crossfire/code/21560
Author: partmedia
Date: 2020-11-23 00:37:39 +0000 (Mon, 23 Nov 2020)
Log Message:
-----------
Document object_set_msg() for settting msg
Modified Paths:
--------------
server/trunk/include/object.h
Modified: server/trunk/include/object.h
===================================================================
--- server/trunk/include/object.h 2020-11-22 10:44:47 UTC (rev 21559)
+++ server/trunk/include/object.h 2020-11-23 00:37:39 UTC (rev 21560)
@@ -319,7 +319,8 @@
const char *slaying; /**< Which race to do double damage to.
* If this is an exit, this is the filename */
const char *skill; /**< Name of the skill this object uses/grants */
- const char *msg; /**< If this is a book/sign/magic mouth/etc */
+ const char* msg; /**< If this is a book/sign/magic mouth/etc. Modify with
+ object_set_msg() to preserve invariants. */
const char *lore; /**< Obscure information about this object,
* to get put into books and the like. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-22 10:44:50
|
Revision: 21559
http://sourceforge.net/p/crossfire/code/21559
Author: akirschbaum
Date: 2020-11-22 10:44:47 +0000 (Sun, 22 Nov 2020)
Log Message:
-----------
Report correct command names in error messages for "issue take" or "issue drop" script commands
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2020-11-22 10:44:29 UTC (rev 21558)
+++ jxclient/trunk/ChangeLog 2020-11-22 10:44:47 UTC (rev 21559)
@@ -1,3 +1,8 @@
+2020-11-22 Andreas Kirschbaum
+
+ * Report correct command names in error messages for "issue take"
+ or "issue drop" script commands.
+
2020-09-15 Andreas Kirschbaum
* Fix possible NullPointerException with --debug-gui.
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java 2020-11-22 10:44:29 UTC (rev 21558)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/scripts/AbstractScriptProcess.java 2020-11-22 10:44:47 UTC (rev 21559)
@@ -587,14 +587,16 @@
}
/**
- * Processes a "issue move" command from the script process.
+ * Processes an "issue take" or "issue drop" command from the script
+ * process.
* @param params the command arguments
* @param destTag the destination tag to move to
+ * @param commandName the command name for error messages
*/
- private void cmdIssueMove(@NotNull final String params, final int destTag) {
+ private void cmdIssueMove(@NotNull final String params, final int destTag, @NotNull final String commandName) {
final String[] tmp = params.split(" +", 2);
if (tmp.length != 1 && tmp.length != 2) {
- reportError("syntax error: issue move "+params);
+ reportError("syntax error: issue "+commandName+" "+params);
return;
}
final int tag;
@@ -603,7 +605,7 @@
tag = Integer.parseInt(tmp[0]);
count = tmp.length < 2 ? 0 : Integer.parseInt(tmp[1]);
} catch (final NumberFormatException ignored) {
- reportError("syntax error: issue move "+params);
+ reportError("syntax error: issue "+commandName+" "+params);
return;
}
crossfireServerConnection.sendMove(destTag, tag, count);
@@ -730,9 +732,9 @@
} else if (tmp[1].startsWith("lock ")) {
cmdIssueLock(tmp[1].substring(5));
} else if (tmp[1].startsWith("take ")) {
- cmdIssueMove(tmp[1].substring(5), itemSet.getPlayer().getTag());
+ cmdIssueMove(tmp[1].substring(5), itemSet.getPlayer().getTag(), "take");
} else if (tmp[1].startsWith("drop ")) {
- cmdIssueMove(tmp[1].substring(5), 0);
+ cmdIssueMove(tmp[1].substring(5), 0, "drop");
} else if (tmp[1].startsWith("apply ")) {
cmdIssueApply(tmp[1].substring(6));
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-22 10:44:34
|
Revision: 21558
http://sourceforge.net/p/crossfire/code/21558
Author: akirschbaum
Date: 2020-11-22 10:44:29 +0000 (Sun, 22 Nov 2020)
Log Message:
-----------
Fix Javadoc issues
Modified Paths:
--------------
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/gui/list/GUISpellList.java
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/skin/GuiFactory.java
jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/guistate/GuiStateManager.java
jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/stats/Stats.java
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/gui/list/GUISpellList.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/gui/list/GUISpellList.java 2020-11-22 10:44:04 UTC (rev 21557)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/gui/list/GUISpellList.java 2020-11-22 10:44:29 UTC (rev 21558)
@@ -142,7 +142,7 @@
/**
* Return a text with the keybindings for the spell.
* @param spell what to search bindings for
- * @param prefix invocation prefix, "cast " or "invoke ", to search for
+ * @param prefix invocation prefix, "cast " or "invoke ", to search for
* @param legend the text before the binding(s)
* @return empty string if no matching bindings, else text in the form
* "legend (binding 1) ; (binding 2) ; ..."
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java 2020-11-22 10:44:04 UTC (rev 21557)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java 2020-11-22 10:44:29 UTC (rev 21558)
@@ -1344,8 +1344,7 @@
* Parses a "horizontal" command.
* @param args the command arguments
* @param gui the gui
- * @param lnr the line number reader to read more lines @throws IOException
- * if the command cannot be parsed
+ * @param lnr the line number reader to read more lines
* @param isDialog whether a "dialog" command has been executed
* @throws JXCSkinException if the command cannot be parsed
* @throws IOException if the command cannot be parsed
@@ -2186,8 +2185,7 @@
* Parses a "vertical" command.
* @param args the command arguments
* @param gui the gui
- * @param lnr the line number reader to read more lines @throws IOException
- * if the command cannot be parsed
+ * @param lnr the line number reader to read more lines
* @param isDialog whether a "dialog" command has been executed
* @throws JXCSkinException if the command cannot be parsed
* @throws IOException if the command cannot be parsed
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/skin/GuiFactory.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/skin/GuiFactory.java 2020-11-22 10:44:04 UTC (rev 21557)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/skin/GuiFactory.java 2020-11-22 10:44:29 UTC (rev 21558)
@@ -72,7 +72,7 @@
}
/**
- * Returns an element's absolute screen coordinate.
+ * Returns an element's absolute screen coordinate.
* @param element the element
* @return the element's absolute x coordinate
*/
Modified: jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/guistate/GuiStateManager.java
===================================================================
--- jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/guistate/GuiStateManager.java 2020-11-22 10:44:04 UTC (rev 21557)
+++ jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/guistate/GuiStateManager.java 2020-11-22 10:44:29 UTC (rev 21558)
@@ -182,7 +182,7 @@
}
/**
- * Disconnects from the Crossfire server.
+ * Disconnects from the Crossfire server.
*/
public void disconnect() {
changeGUI(GuiState.METASERVER);
Modified: jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/stats/Stats.java
===================================================================
--- jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/stats/Stats.java 2020-11-22 10:44:04 UTC (rev 21557)
+++ jxclient/trunk/src/model/src/main/java/com/realtime/crossfire/jxclient/stats/Stats.java 2020-11-22 10:44:29 UTC (rev 21558)
@@ -447,7 +447,7 @@
public static final int CS_NUM_SKILLS = 50;
/**
- * CS_STAT_SKILLINFO is used as the starting index point. Skill
+ * CS_STAT_SKILLINFO is used as the starting index point. Skill
* number->name map is generated dynamically for the client, so a bunch
* of entries will be used here.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-22 10:44:09
|
Revision: 21557
http://sourceforge.net/p/crossfire/code/21557
Author: akirschbaum
Date: 2020-11-22 10:44:04 +0000 (Sun, 22 Nov 2020)
Log Message:
-----------
Remove debug code
Modified Paths:
--------------
jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java
Modified: jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java
===================================================================
--- jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java 2020-11-21 21:58:53 UTC (rev 21556)
+++ jxclient/trunk/src/gui/src/main/java/com/realtime/crossfire/jxclient/skin/io/JXCSkinLoader.java 2020-11-22 10:44:04 UTC (rev 21557)
@@ -803,17 +803,6 @@
}
assert gui != null || !definedGUIElements.iterator().hasNext();
-
- //if (gui != null) {
- // gui.validate();
- // final JFrame frame = new JFrame(dialogName);
- // frame.setLayout(new BorderLayout());
- // frame.add(gui, BorderLayout.CENTER);
- // frame.setSize(800, 600);
- // frame.setBackground(new Color(192, 0, 0));
- // frame.setVisible(true);
- // //ComponentDumper.dump(gui);
- //}
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-21 21:58:56
|
Revision: 21556
http://sourceforge.net/p/crossfire/code/21556
Author: silvernexus
Date: 2020-11-21 21:58:53 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Fix config dialog faceset selection.
Fixes bug 877
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/src/config.c
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2020-11-21 17:22:56 UTC (rev 21555)
+++ client/trunk/ChangeLog 2020-11-21 21:58:53 UTC (rev 21556)
@@ -4,6 +4,7 @@
**Fixed**
Add '--script=...' command-line option to pre-launch scripts.
Config window displayed last faceset as active regardless of desired faceset.
+Config dialog now allows to set the faceset for the client next run. It was broken and did nothing previously.
Prevent compiler errors on GCC 10 by disallowing multiple inclusions of src/gtk-v2/main.h.
Do not attempt to redraw map widget when disconnected.
Removed vestigal 0/0 next to food, xp, grace, sp, and hp bars.
Modified: client/trunk/gtk-v2/src/config.c
===================================================================
--- client/trunk/gtk-v2/src/config.c 2020-11-21 17:22:56 UTC (rev 21555)
+++ client/trunk/gtk-v2/src/config.c 2020-11-21 21:58:53 UTC (rev 21556)
@@ -647,13 +647,30 @@
want_config[CONFIG_SMOOTH] = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(config_button_smoothing));
- gchar *buf;
-
- buf = gtk_combo_box_text_get_active_text(config_combobox_faceset);
- if (buf) {
- free(face_info.want_faceset);
- face_info.want_faceset = g_strdup(buf);
- g_free(buf);
+ gchar *buf = 0;
+ GtkTreeIter iter;
+ /**
+ * Since the combo box does not have the "has-entry" property set to TRUE, we cannot use
+ * gtk_combo_box_text_get_active_text to get the currently selected option.
+ * Since we really have no good reason to turn that on and open up the box for
+ * arbitrary faceset strings, we can treat it more like a regular combo box.
+ * We need to use an iterator retrieval and gtk_tree_model_get to fetch the text,
+ * which is significantly more of a pain in the posterior.
+ *
+ * Daniel Hawkins -- 2020-11-21
+ */
+ if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(config_combobox_faceset), &iter)) {
+ // We have an active selection in our iterator. Now we get the string from the tree model.
+ GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(config_combobox_faceset));
+ gtk_tree_model_get(model, &iter, 0, &buf, -1);
+ if (buf) {
+ free(face_info.want_faceset);
+ face_info.want_faceset = g_strdup(buf);
+ g_free(buf);
+ }
+ else {
+ LOG(LOG_ERROR, "read_config_dialog", "Failed to get face set string from GTK Widget.");
+ }
}
want_config[CONFIG_DISPLAYMODE] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-21 17:23:04
|
Revision: 21555
http://sourceforge.net/p/crossfire/code/21555
Author: silvernexus
Date: 2020-11-21 17:22:56 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Make Harfbuzz word wrapping wrap on characters when the word is too long to wrap in the message window.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/src/info.c
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2020-11-21 16:42:33 UTC (rev 21554)
+++ client/trunk/ChangeLog 2020-11-21 17:22:56 UTC (rev 21555)
@@ -8,6 +8,7 @@
Do not attempt to redraw map widget when disconnected.
Removed vestigal 0/0 next to food, xp, grace, sp, and hp bars.
Reapeated logins do not perpetually associate additional instances of the mouse button events to the map area.
+Long words no longer send Harfbuzz on a wild goose chase when the message window is too narrow to fit the word.
**Changed**
- Allow for the client to handle face sets of any reasonable size. 24x24 has been currently tested.
Modified: client/trunk/gtk-v2/src/info.c
===================================================================
--- client/trunk/gtk-v2/src/info.c 2020-11-21 16:42:33 UTC (rev 21554)
+++ client/trunk/gtk-v2/src/info.c 2020-11-21 17:22:56 UTC (rev 21555)
@@ -644,7 +644,7 @@
GTK_WIDGET(gtk_builder_get_object(window_xml, widget_name));
gtk_text_view_set_wrap_mode(
- GTK_TEXT_VIEW(info_pane[i].textview), GTK_WRAP_WORD);
+ GTK_TEXT_VIEW(info_pane[i].textview), GTK_WRAP_WORD_CHAR);
info_pane[i].textbuffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(info_pane[i].textview));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-21 16:42:35
|
Revision: 21554
http://sourceforge.net/p/crossfire/code/21554
Author: silvernexus
Date: 2020-11-21 16:42:33 +0000 (Sat, 21 Nov 2020)
Log Message:
-----------
Make invisible lighting not be pushed around by spells.
Modified Paths:
--------------
arch/trunk/ChangeLog
arch/trunk/light/light_bulb.arc
Modified: arch/trunk/ChangeLog
===================================================================
--- arch/trunk/ChangeLog 2020-11-19 21:48:00 UTC (rev 21553)
+++ arch/trunk/ChangeLog 2020-11-21 16:42:33 UTC (rev 21554)
@@ -1,3 +1,8 @@
+Make the light bulb invisible lighting arches have no_pick
+so that spells can't push them around.
+light/light_bulb.arc
+Daniel Hawkins 2020-11-21
+
Add guide to Ranged Combat so that the Ranger class can start with a guide.
readable/guide/guide_ranged.arc
player/class/Warrior/ranger.trs
Modified: arch/trunk/light/light_bulb.arc
===================================================================
--- arch/trunk/light/light_bulb.arc 2020-11-19 21:48:00 UTC (rev 21553)
+++ arch/trunk/light/light_bulb.arc 2020-11-21 16:42:33 UTC (rev 21554)
@@ -1,6 +1,7 @@
Object light1
name light
face light_bulb_1.111
+no_pick 1
glow_radius 1
invisible 1
end
@@ -7,6 +8,7 @@
Object light2
name light
face light_bulb_2.111
+no_pick 1
glow_radius 2
invisible 1
end
@@ -13,6 +15,7 @@
Object light3
name light
face light_bulb_3.111
+no_pick 1
glow_radius 3
invisible 1
end
@@ -19,6 +22,7 @@
Object light4
name light
face light_bulb_4.111
+no_pick 1
glow_radius 4
invisible 1
end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-19 21:48:01
|
Revision: 21553
http://sourceforge.net/p/crossfire/code/21553
Author: ryo_saeba
Date: 2020-11-19 21:48:00 +0000 (Thu, 19 Nov 2020)
Log Message:
-----------
Fix turning boat not able to move where it should.
Modified Paths:
--------------
server/trunk/server/move.c
Modified: server/trunk/server/move.c
===================================================================
--- server/trunk/server/move.c 2020-11-19 17:26:05 UTC (rev 21552)
+++ server/trunk/server/move.c 2020-11-19 21:48:00 UTC (rev 21553)
@@ -91,7 +91,7 @@
if (get_map_flags(part->map, &m, part->x+freearr_x[dir], part->y+freearr_y[dir], &x, &y)&P_OUT_OF_MAP)
return 0;
- if (!QUERY_FLAG(op, FLAG_WIZPASS) && blocked_link(op, m, x, y))
+ if (!QUERY_FLAG(op, FLAG_WIZPASS) && blocked_link(op->type == TRANSPORT ? part : op, m, x, y))
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-19 17:26:08
|
Revision: 21552
http://sourceforge.net/p/crossfire/code/21552
Author: ryo_saeba
Date: 2020-11-19 17:26:05 +0000 (Thu, 19 Nov 2020)
Log Message:
-----------
Remove unused macro.
Modified Paths:
--------------
server/trunk/include/define.h
Modified: server/trunk/include/define.h
===================================================================
--- server/trunk/include/define.h 2020-11-19 15:15:01 UTC (rev 21551)
+++ server/trunk/include/define.h 2020-11-19 17:26:05 UTC (rev 21552)
@@ -433,7 +433,6 @@
((type != 0) && (ob1->move_type&type) == ob1->move_type)
/*@}*/
-#define SET_GENERATE_TYPE(xyz, va) (xyz)->stats.sp = (va)
#define GENERATE_TYPE(xyz) ((xyz)->stats.sp)
#define GENERATE_SPEED(xyz) ((xyz)->stats.maxsp) /* if(!RANDOM()%<speed>) */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-19 15:15:07
|
Revision: 21551
http://sourceforge.net/p/crossfire/code/21551
Author: ryo_saeba
Date: 2020-11-19 15:15:01 +0000 (Thu, 19 Nov 2020)
Log Message:
-----------
Tentatively fix crash in plugin when weird stuff was done to our poor NPC.
Modified Paths:
--------------
server/trunk/plugins/citylife/citylife.c
Modified: server/trunk/plugins/citylife/citylife.c
===================================================================
--- server/trunk/plugins/citylife/citylife.c 2020-11-18 20:12:18 UTC (rev 21550)
+++ server/trunk/plugins/citylife/citylife.c 2020-11-19 15:15:01 UTC (rev 21551)
@@ -771,7 +771,7 @@
int rv = 1;
va_list args;
/*char *buf;*/
- object *ground, *who/*, *activator, *third, *event*/;
+ object *ground, *who/*, *activator, *third*/, *event;
/*int fix;*/
const char *value;
@@ -782,12 +782,24 @@
/*third =*/ va_arg(args, object *);
/*buf =*/ va_arg(args, char *);
/*fix =*/ va_arg(args, int);
- /*event =*/ va_arg(args, object *);
+ event = va_arg(args, object *);
va_arg(args, talk_info *); /* ignored for now */
va_end(args);
object *inv;
value = cf_object_get_key(who, FIRST_MOVE_KEY);
+ if (!value) {
+ /**
+ * If the key doesn't exist, it means 'who' wasn't created by us,
+ * since we do set the key each time.
+ * So play it safe and totally remove the event.
+ */
+ if (event) {
+ cf_log(llevInfo, "citylife: removing event from object which we didn't generate\n");
+ cf_object_remove(event);
+ }
+ return rv;
+ }
// Set the flag regardless of whether we tried to move through an exit
if (strcmp(value, "1") == 0) {
cf_object_set_key(who, FIRST_MOVE_KEY, "0", 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2020-11-18 20:12:19
|
Revision: 21550
http://sourceforge.net/p/crossfire/code/21550
Author: ryo_saeba
Date: 2020-11-18 20:12:18 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
Add feedback message to (client-issues) lock command, to be coherent with the 'lock' command the player can use.
Modified Paths:
--------------
server/trunk/socket/item.c
Modified: server/trunk/socket/item.c
===================================================================
--- server/trunk/socket/item.c 2020-11-18 18:53:55 UTC (rev 21549)
+++ server/trunk/socket/item.c 2020-11-18 20:12:18 UTC (rev 21550)
@@ -674,6 +674,7 @@
int flag, tag;
object *op;
object *tmp;
+ char name[HUGE_BUF];
if (len != 5) {
LOG(llevDebug, "Player '%s' sent bogus lock_item_cmd information\n", pl->ob->name);
@@ -700,10 +701,16 @@
return;
}
- if (!flag)
+ query_short_name(op, name, HUGE_BUF);
+ if (!flag) {
CLEAR_FLAG(op, FLAG_INV_LOCKED);
- else
+ draw_ext_info_format(NDI_UNIQUE, 0, pl->ob, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_FAILURE,
+ "Unlocked %s.", name);
+ } else {
SET_FLAG(op, FLAG_INV_LOCKED);
+ draw_ext_info_format(NDI_UNIQUE, 0, pl->ob, MSG_TYPE_COMMAND, MSG_TYPE_COMMAND_FAILURE,
+ "Locked %s.", name);
+ }
tmp = object_merge(op, NULL);
if (tmp == NULL) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
